SecurityService is now properly cleared (clearState()) at the beginning of Selenium test case executions

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java

@@ -84,14 +84,24 @@ public abstract class AbstractSeleniumTest {
         }
     }
     
-    @Before
-    public void setUpAuthenticatedSession() {
+    protected void setUpAuthenticatedSession() {
         logger.info("Authenticating session...");
         Cookie sessionCookie = authenticate(getContextRoot());
         getWebDriver().get(getContextRoot() + "index.html"); // initialize web driver so setting a cookie for the local domain is possible
         getWebDriver().manage().addCookie(sessionCookie);
         logger.info("...obtained session cookie "+sessionCookie);
     }
+
+    /**
+     * If subclasses want to clear the state using {@link #clearState(String)}, they must re-define this method and
+     * first invoke {@link #clearState(String)} before calling this implementation using <code>super.setUp()</code>.
+     * This is important because {@link #clearState(String)} will also clear all session state that has been constructed
+     * by {@link #setUpAuthenticatedSession()}.
+     */
+    @Before
+    public void setUp() {
+        setUpAuthenticatedSession();
+    }
     
     /**
      * Obtains a session cookie for a session authenticated using the default admin user.

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardCreation.java

@@ -18,9 +18,11 @@ import com.sap.sailing.selenium.test.AbstractSeleniumTest;
  *   D049941
  */
 public class TestLeaderboardCreation extends AbstractSeleniumTest {
+    @Override
     @Before
-    public void clearDatabase() {
+    public void setUp() {
         clearState(getContextRoot());
+        super.setUp();
     }
     
     @Test

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestLeaderboardFilterInLeaderboardGroupConfig.java

@@ -18,9 +18,11 @@ import com.sap.sailing.selenium.pages.gwt.DataEntryPO;
 import com.sap.sailing.selenium.test.AbstractSeleniumTest;
 
 public class TestLeaderboardFilterInLeaderboardGroupConfig extends AbstractSeleniumTest {
+    @Override
     @Before
-    public void clearDatabase() {
+    public void setUp() {
         clearState(getContextRoot());
+        super.setUp();
     }
     
     @Test

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java

@@ -47,11 +47,13 @@ public class TestStartAndStopTrackingForTracTracEvents extends AbstractSeleniumT
     
 //    private static final String BMW_CUP_RACE_8 = "BMW Cup Race 8";
     
+    @Override
     @Before
     public void setUp() {
         this.trackableRace = new TrackableRaceDescriptor(BMW_CUP_EVENT, String.format(RACE, 1), BMW_CUP_BOAT_CLASS);
         this.trackedRace = new TrackedRaceDescriptor(BMW_CUP_REGATTA, BMW_CUP_BOAT_CLASS, String.format(RACE, 1));
         clearState(getContextRoot());
+        super.setUp();
     }
     
     /**

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestColumnsInLeaderboard.java

@@ -45,6 +45,7 @@ public class TestColumnsInLeaderboard extends AbstractSeleniumTest {
     private RaceDescriptor raceColumn;
     
     
+    @Override
     @Before
     public void setUp() {
         this.regatta = new RegattaDescriptor(REGATTA, BOAT_CLASS);
@@ -52,6 +53,7 @@ public class TestColumnsInLeaderboard extends AbstractSeleniumTest {
         this.trackedRace = new TrackedRaceDescriptor(this.regatta.toString(), BOAT_CLASS, RACE);
         this.raceColumn = new RaceDescriptor("R1", "Default", false, false, 0.0);
         clearState(getContextRoot());
+        super.setUp();
         configureLeaderboard();
     }
     

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java

@@ -49,6 +49,7 @@ public class TestLeaderboardConfiguration extends AbstractSeleniumTest {
     private List<TrackedRaceDescriptor> trackedRaces;
     private List<RaceDescriptor> leaderboardRaces;
     
+    @Override
     @Before
     public void setUp() {
         this.regatta = new RegattaDescriptor(REGATTA, BOAT_CLASS);
@@ -66,6 +67,7 @@ public class TestLeaderboardConfiguration extends AbstractSeleniumTest {
             this.leaderboardRaces.add(leaderboardRace);
         }
         clearState(getContextRoot());
+        super.setUp();
         configureLeaderboard();
     }
     

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java

@@ -48,6 +48,7 @@ public class TestSwitchingOffStartOfRaceInference extends AbstractSeleniumTest {
     private RaceDescriptor raceColumn;
     private AdminConsolePage adminConsole;
     
+    @Override
     @Before
     public void setUp() {
         this.regatta = new RegattaDescriptor(REGATTA, BOAT_CLASS);
@@ -55,6 +56,7 @@ public class TestSwitchingOffStartOfRaceInference extends AbstractSeleniumTest {
         this.trackedRace = new TrackedRaceDescriptor(this.regatta.toString(), BOAT_CLASS, RACE);
         this.raceColumn = new RaceDescriptor("R3", "Default", false, false, 0.0);
         clearState(getContextRoot());
+        super.setUp();
         adminConsole = configureRegattaAndLeaderboard();
     }
     

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboardedit/TestLeaderboardEditing.java

@@ -35,11 +35,13 @@ public class TestLeaderboardEditing extends AbstractSeleniumTest {
             BMW_CUP_REGATTA + " (" + BMW_CUP_BOAT_CLASS + ")", BMW_CUP_BOAT_CLASS, BMW_CUP_RACE_8);
     private static final RaceDescriptor RACE_COLUMN = new RaceDescriptor("R1", "Default", false, false, 0.0);
     
+    @Override
     @Before
-    public void clearDatabase() {
+    public void setUp() {
         clearState(getContextRoot());
+        super.setUp();
     }
-    
+
     @Test
     public void testSimpleLeaderboardEditing() {
         createNewLeaderboardLoadRaceAndLink(LEADERBOARD);