From 4baa513ca2a0fa980ddec5aa8bb5ebf40d9620ba Mon Sep 17 00:00:00 2001 From: Fabian Schwarz-Fritz Date: Thu, 3 Nov 2011 11:32:42 +0100 Subject: [PATCH] corrected test column swapping of Fabian --- .../sap/sailing/gwt/ui/test/TestColumnSwapping.java | 10 ++-------- java/com.sap.sailing.gwt.ui/SailingGWT.launch | 2 +- 2 files changed, 3 insertions(+), 9 deletions(-) diff --git a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java index 4b8a8be0400..f65c61cba4d 100755 --- a/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java +++ b/java/com.sap.sailing.gwt.ui.test/src/com/sap/sailing/gwt/ui/test/TestColumnSwapping.java @@ -37,8 +37,6 @@ public class TestColumnSwapping { service = new SailingServiceImplMock(); 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); @@ -112,7 +110,7 @@ public class TestColumnSwapping { @Test public void testColumnSwappingFabian() { - service.moveLeaderboardColumnDown(LEADERBOARDNAME, "Race3"); + service.moveLeaderboardColumnUp(LEADERBOARDNAME, "Race3"); try { leaderboardDAO = service.getLeaderboardByName(LEADERBOARDNAME, leaderboardCreationDate, leglist); } catch (Exception e) { @@ -122,18 +120,14 @@ public class TestColumnSwapping { // check if leaderboardDAO an dleaderboardOriginalDAO same List leaderboardList = leaderboardDAO.getRaceList(); - ; List 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); + assert leaderboardDAO.raceIsTracked(string) == leaderboardOriginalDAO.raceIsTracked(string); } } } diff --git a/java/com.sap.sailing.gwt.ui/SailingGWT.launch b/java/com.sap.sailing.gwt.ui/SailingGWT.launch index 661dfa84bfe..2dbbd973f02 100755 --- a/java/com.sap.sailing.gwt.ui/SailingGWT.launch +++ b/java/com.sap.sailing.gwt.ui/SailingGWT.launch @@ -19,7 +19,7 @@ - +