lifecycle fix for raceboard and test fail case adjustment

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMap.java

@@ -2922,7 +2922,7 @@ public class RaceMap extends AbstractCompositeComponent<RaceMapSettings> impleme
 
     @Override
     public String getId() {
-        return "RaceMap";
+        return RaceMapLifecycle.ID;
     }
 
 }

java/com.sap.sailing.gwt.ui/src/main/java/com/sap/sailing/gwt/ui/client/shared/racemap/RaceMapLifecycle.java

@@ -4,6 +4,8 @@ import com.sap.sailing.gwt.ui.client.StringMessages;
 import com.sap.sse.gwt.client.shared.components.ComponentLifecycle;
 
 public class RaceMapLifecycle implements ComponentLifecycle<RaceMapSettings, RaceMapSettingsDialogComponent> {
+    public static final String ID = "rml";
+
     private final StringMessages stringMessages;
     
     public RaceMapLifecycle(StringMessages stringMessages) {
@@ -30,7 +32,7 @@ public class RaceMapLifecycle implements ComponentLifecycle<RaceMapSettings, Rac
 
     @Override
     public String getComponentId() {
-        return "rml";
+        return ID;
     }
 
     @Override

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/adminconsole/advanced/MasterDataImportPO.java

@@ -61,7 +61,9 @@ public class MasterDataImportPO extends PageArea {
     }
 
     void waitForAlertAndDispose(WebDriver driver) throws InterruptedException {
-        while (true) {
+        int i = 0;
+        while (i < DEFAULT_WAIT_TIMEOUT_SECONDS) {
+            i++;
             try {
                 Alert alert = driver.switchTo().alert();
                 alert.dismiss();
@@ -71,5 +73,8 @@ public class MasterDataImportPO extends PageArea {
                 continue;
             }
         }
+        if (i >= DEFAULT_WAIT_TIMEOUT_SECONDS) {
+            throw new NoAlertPresentException();
+        }
     }
 }

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/pages/raceboard/MapSettingsPO.java

@@ -34,7 +34,9 @@ public class MapSettingsPO extends PageArea {
     }
 
     void waitForAlertAndDispose(WebDriver driver) throws InterruptedException {
-        while (true) {
+        int i = 0;
+        while (i < DEFAULT_WAIT_TIMEOUT_SECONDS) {
+            i++;
             try {
                 Alert alert = driver.switchTo().alert();
                 alert.dismiss();
@@ -44,6 +46,9 @@ public class MapSettingsPO extends PageArea {
                 continue;
             }
         }
+        if (i >= DEFAULT_WAIT_TIMEOUT_SECONDS) {
+            throw new NoAlertPresentException();
+        }
     }
 
     public boolean isWindChartSelected() {

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SettingsTest.java

@@ -68,7 +68,7 @@ public class SettingsTest extends AbstractSeleniumTest {
         tracTracEvents.setTrackSettings(true, false, false);
         tracTracEvents.startTrackingForRace(this.trackableRace);
         TrackedRacesListPO trackedRacesList = tracTracEvents.getTrackedRacesList();
-        trackedRacesList.waitForTrackedRace(this.trackedRace, Status.FINISHED); // with the TracAPI, REPLAY races
+        trackedRacesList.waitForTrackedRace(this.trackedRace, Status.FINISHED, 600); // with the TracAPI, REPLAY races
         // status FINISHED when done loading
 
         LeaderboardConfigurationPanelPO leaderboard = adminConsole.goToLeaderboardConfiguration();