Merge branch 'up_down' of ssh://kielweek.web4sap.com:22/home/trac/git into up_down

Conflicts:
	java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java

java/com.sap.sailing.gwt.ui.test/META-INF/MANIFEST.MF

@@ -6,4 +6,5 @@ Bundle-Version: 1.0.0.qualifier
 Bundle-Vendor: SAP
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: com.sap.sailing.gwt.ui,
- org.junit4;bundle-version="4.8.1"
+ org.junit4;bundle-version="4.8.1",
+ javax.servlet;bundle-version="2.5.0"

java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java

@@ -1,11 +1,15 @@
 package com.sap.sailing.gwt.ui.test;
 
+import static org.junit.Assert.*;
 
+import java.util.ArrayList;
+import java.util.Collection;
 import java.util.Date;
+import java.util.List;
 
-import junit.framework.TestCase;
+import org.junit.Before;
-
 import org.junit.Test;
+import junit.framework.TestCase;
 
 import com.sap.sailing.gwt.ui.server.SailingServiceImpl;
 import com.sap.sailing.gwt.ui.shared.LeaderboardDAO;
@@ -13,15 +17,49 @@ import com.sap.sailing.gwt.ui.shared.LeaderboardDAO;
 public class TestColumnSwapping extends TestCase {
 	
 	private LeaderboardDAO lb = null;
+	private static final String LEADERBOARDNAME = "test"; 
+	private SailingServiceImpl service;
+	private LeaderboardDAO leaderboardOriginalDAO;
+	private LeaderboardDAO leaderboardDAO;
+	private Collection<String> leglist;
+	private Date leaderboardCreationDate;
 	private SailingServiceImpl sailingService = null;
 	
 	//Test-Data
 	private final String TEST_LEADERBOARD_NAME = "test_board";
 	private final String[] races = {"1","2","3"};
 	private final boolean[] isMedalRace = {false,false,true};
+
+	
+	@Before
+	public void prepareColumnSwapping(){
+		service = new SailingServiceImpl();
+		int[] disc = {5,8,9,0,7,5,43};
+    	service.createLeaderboard(LEADERBOARDNAME, disc);
+    	service.addColumnToLeaderboard("Rank", LEADERBOARDNAME, false);
+    	service.addColumnToLeaderboard("Competitor", LEADERBOARDNAME, false);
+    	service.addColumnToLeaderboard("Race1", LEADERBOARDNAME, true);
+    	service.addColumnToLeaderboard("Race2", LEADERBOARDNAME, true);
+    	service.addColumnToLeaderboard("Race3", LEADERBOARDNAME, true);
+    	leglist = new ArrayList<String>();
+    	leglist.add("Race1");
+    	leglist.add("Race2");
+    	leglist.add("Race3");
+    	leaderboardCreationDate = new Date();
+    	try {
+    		// get Leaderboard with name and current date
+			leaderboardOriginalDAO = new LeaderboardDAO();
+			leaderboardOriginalDAO.addRace("Race1", true, false);
+			leaderboardOriginalDAO.addRace("Race3", true, false);
+			leaderboardOriginalDAO.addRace("Race2", true, false);
+		} catch (Exception e) {
+			e.printStackTrace();
+		}
+	}
 	
     @Test
     public void testColumnSwapping() {
+    testColumnSwappingFabian();
     	testLeaderBoardDAOMethods();
         testSailingService();
     }
@@ -69,4 +107,33 @@ public class TestColumnSwapping extends TestCase {
     	for (int i = 0; i < lb.getRaceList().size(); i++)
     		assertTrue("Race[" + i + "] = " + s[i],lb.getRaceList().get(i).equals(s[i]));
     }
+    
+    @Test
+    public void testColumnSwappingFabian() {
+    	service.moveLeaderboardColumnDown(LEADERBOARDNAME, "Race3");
+    	try {
+    		leaderboardDAO = service.getLeaderboardByName(LEADERBOARDNAME, leaderboardCreationDate, leglist);
+		} catch (Exception e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+    	
+    	// check if leaderboardDAO an dleaderboardOriginalDAO same
+    	List<String> leaderboardList = leaderboardDAO.getRaceList();;
+    	List<String> leaderboardOriginalList = leaderboardOriginalDAO.getRaceList();
+    	
+    	// ??????? assert races in list
+    	assertArrayEquals(leaderboardList.toArray(), leaderboardOriginalList.toArray());
+    	
+    	System.out.println(leaderboardList.toArray().toString());
+    	System.out.println(leaderboardOriginalList.toArray().toString());
+    	
+    	
+    	for (String string : leaderboardOriginalList) {
+			assert leaderboardDAO.raceIsMedalRace(string) == leaderboardOriginalDAO.raceIsMedalRace(string);
+			// assert leaderboardDAO.raceIsTracked(string) == leaderboardOriginalDAO.raceIsTracked(string);
+		}
+    }
+}
+
 }