() {
+ @Override
+ public Boolean apply(WebDriver t) {
+ try {
+ return raceMapSettingsButton.isDisplayed() && raceMapSettingsButton.getLocation().y > 100;
+ } catch (Exception e) {
+ // RaceMap cause multiple reflows and the element may temporarily not be in the viewport
+ return false;
+ }
+ }
+ });
+ }
+
public MapSettingsPO openMapSettings() {
+ waitUntil(new BooleanSupplier() {
+ @Override
+ public boolean getAsBoolean() {
+ try {
+ return raceMapSettingsButton.isDisplayed() && raceMapSettingsButton.getLocation().y > 100;
+ } catch (Exception e) {
+ // RaceMap cause multiple reflows and the element may temporarily not be in the viewport
+ return false;
+ }
+ }
+ });
raceMapSettingsButton.click();
waitUntil(new BooleanSupplier() {
-
@Override
public boolean getAsBoolean() {
WebElement settingsDialog = null;
try {
settingsDialog = findElementBySeleniumId("raceMapSettings");
+ boolean exists = settingsDialog != null;
+ // exists, and was actually rendered (to apply the values)
+ return (exists && settingsDialog.isDisplayed());
} catch(Exception e) {
}
- boolean exists = settingsDialog != null;
- // exists, and was actually rendered (to apply the values)
- return (exists && settingsDialog.getSize().height > 50);
+ return false;
}
});
return new MapSettingsPO(driver, findElementBySeleniumId("raceMapSettings"));
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java
index a77a7f01b37..de34a683102 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/AbstractSeleniumTest.java
@@ -18,20 +18,23 @@ import org.junit.Rule;
import org.junit.rules.TestWatchman;
import org.junit.runner.RunWith;
import org.junit.runners.model.FrameworkMethod;
+import org.openqa.selenium.By;
import org.openqa.selenium.Cookie;
-import org.openqa.selenium.JavascriptExecutor;
+import org.openqa.selenium.Keys;
import org.openqa.selenium.OutputType;
import org.openqa.selenium.TakesScreenshot;
import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.html5.WebStorage;
import org.openqa.selenium.remote.Augmenter;
import org.openqa.selenium.remote.RemoteWebDriver;
-import com.sap.sse.common.Duration;
-import com.sap.sse.common.impl.MillisecondsTimePoint;
import com.sap.sailing.selenium.core.Managed;
import com.sap.sailing.selenium.core.SeleniumRunner;
import com.sap.sailing.selenium.core.TestEnvironment;
import com.sap.sailing.selenium.core.WindowManager;
+import com.sap.sailing.selenium.pages.PageObject;
+import com.sap.sse.common.Duration;
+import com.sap.sse.common.impl.MillisecondsTimePoint;
/**
* Abstract base class for unit tests with Selenium. This class is already annotated as required to get executed
@@ -83,16 +86,37 @@ public abstract class AbstractSeleniumTest {
} catch (IOException exception) {
throw new RuntimeException(exception);
}
- // clear local storage
+
+ // To be able to access LocalStorage we need to load a page having the target origin
getWebDriver().get(contextRoot);
- ((JavascriptExecutor)getWebDriver()).executeScript("window.localStorage.clear();");
+
+ // clear local storage
+ final WebStorage webStorage = (WebStorage)getWebDriver();
+ webStorage.getLocalStorage().clear();
+
+ // extending the timeout of notifications to 100s to prevent timing failures
+ webStorage.getLocalStorage().setItem("sse.notification.customTimeOutInSeconds",
+ Integer.toString(PageObject.DEFAULT_WAIT_TIMEOUT_SECONDS));
+
+ try {
+ // In IE 11 we sometimes see the problem that IE somehow automatically changes the zoom level to 75%.
+ // Selenium tests with InternetExplorerDriver fail if the zoom level is not set to 100% due to the fact that coordinates determined aren't correct.
+ // With this we enforce a zoom level of 100% before running a test.
+ // To make this work correctly you also need to set InternetExplorerDriver.IGNORE_ZOOM_SETTING to true (this should be pre-configured in local-test-environment.xml when activating IE driver)
+ getWebDriver().findElement(By.tagName("html")).sendKeys(Keys.chord(Keys.CONTROL, "0"));
+ } catch (Exception e) {
+ }
}
protected void setUpAuthenticatedSession() {
+ // To be able to set a cookie we need to load a page having the target origin
+ getWebDriver().get(getContextRoot());
+
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);
+ final Cookie cookieWithoutDomain = new Cookie(sessionCookie.getName(), sessionCookie.getValue(), null, sessionCookie.getPath(), sessionCookie.getExpiry(), sessionCookie.isSecure(), sessionCookie.isHttpOnly());
+ getWebDriver().manage().addCookie(cookieWithoutDomain);
logger.info("...obtained session cookie "+sessionCookie);
}
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java
index 4075640702c..a232724042e 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestRefreshableSelectionModel.java
@@ -13,8 +13,6 @@ import org.openqa.selenium.WebDriver;
import org.openqa.selenium.support.ui.ExpectedCondition;
import org.openqa.selenium.support.ui.WebDriverWait;
-import com.sap.sailing.selenium.core.WebDriverWindow;
-import com.sap.sailing.selenium.core.WindowManager;
import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage;
import com.sap.sailing.selenium.pages.adminconsole.connectors.SmartphoneTrackingEventManagementPanelPO;
import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO;
@@ -36,10 +34,6 @@ import com.sap.sailing.selenium.pages.gwt.DataEntryPO;
import com.sap.sailing.selenium.test.AbstractSeleniumTest;
public class TestRefreshableSelectionModel extends AbstractSeleniumTest {
- private static WindowManager manager;
- private static WebDriverWindow windowForEdit;
- private static WebDriverWindow windowForSelection;
-
// TestMaintenanceOfSelectionAfterDataChanges
private CompetitorEntry competitorEntry;
private CompetitorEntry competitorEntryToSelect;
@@ -66,9 +60,6 @@ public class TestRefreshableSelectionModel extends AbstractSeleniumTest {
@Before
public void setUp() {
clearState(getContextRoot());
- manager = this.environment.getWindowManager();
- windowForEdit = manager.getCurrentWindow();
- windowForSelection = manager.openNewWindow();
super.setUp();
}
@@ -80,85 +71,87 @@ public class TestRefreshableSelectionModel extends AbstractSeleniumTest {
@Test
public void testMaintenanceOfSelectionAfterDataChanges() {
- windowForEdit.switchToWindow();
- final TrackedRacesCompetitorsPanelPO competitorsPanel = goToCompetitorsPanel();
-
- for (int i = 0; i < 2; i++) {
+ this.environment.getWindowManager().withExtraWindow((windowForSelection, windowForEdit) -> {
+ windowForEdit.switchToWindow();
+ final TrackedRacesCompetitorsPanelPO competitorsPanel = goToCompetitorsPanel();
+
+ for (int i = 0; i < 2; i++) {
+ TrackedRacesCompetitorEditDialogPO dialog = competitorsPanel.pushAddCompetitorButton();
+ dialog.setNameTextBox("" + System.currentTimeMillis());
+ dialog.setShortNameTextBox("" + System.currentTimeMillis());
+ dialog.pressOk();
+ }
+
TrackedRacesCompetitorEditDialogPO dialog = competitorsPanel.pushAddCompetitorButton();
- dialog.setNameTextBox("" + System.currentTimeMillis());
- dialog.setShortNameTextBox("" + System.currentTimeMillis());
+ final String name = "" + System.currentTimeMillis();
+ dialog.setNameTextBox(name);
+ final String shortName = "" + System.currentTimeMillis();
+ dialog.setShortNameTextBox(shortName);
dialog.pressOk();
- }
-
- TrackedRacesCompetitorEditDialogPO dialog = competitorsPanel.pushAddCompetitorButton();
- final String name = "" + System.currentTimeMillis();
- dialog.setNameTextBox(name);
- final String shortName = "" + System.currentTimeMillis();
- dialog.setShortNameTextBox(shortName);
- dialog.pressOk();
-
- boolean found = false;
- for (final CompetitorEntry it : competitorsPanel.getCompetitorTable().getEntries()) {
- String itName = it.getName();
- if (itName.equals(name)) {
- found = true;
- competitorEntry = it;
- break;
+
+ boolean found = false;
+ for (final CompetitorEntry it : competitorsPanel.getCompetitorTable().getEntries()) {
+ String itName = it.getName();
+ if (itName.equals(name)) {
+ found = true;
+ competitorEntry = it;
+ break;
+ }
}
- }
- assertTrue(found);
-
- windowForSelection.switchToWindow();
- TrackedRacesCompetitorsPanelPO competitorPanelForSelection = goToCompetitorsPanel();
- found = false;
- for (final CompetitorEntry it : competitorPanelForSelection.getCompetitorTable().getEntries()) {
- String itName = it.getName();
- if (itName.equals(name)) {
- found = true;
- competitorEntryToSelect = it;
- break;
+ assertTrue(found);
+
+ windowForSelection.switchToWindow();
+ TrackedRacesCompetitorsPanelPO competitorPanelForSelection = goToCompetitorsPanel();
+ found = false;
+ for (final CompetitorEntry it : competitorPanelForSelection.getCompetitorTable().getEntries()) {
+ String itName = it.getName();
+ if (itName.equals(name)) {
+ found = true;
+ competitorEntryToSelect = it;
+ break;
+ }
}
- }
- assertTrue(found);
- competitorPanelForSelection.getCompetitorTable().selectEntry(competitorEntryToSelect);
-
- assertEquals(1, competitorPanelForSelection.getCompetitorTable().getSelectedEntries().size());
- assertEquals(name, competitorPanelForSelection.getCompetitorTable().getSelectedEntries().get(0).getName());
- assertEquals(shortName, competitorPanelForSelection.getCompetitorTable().getSelectedEntries().get(0).getShortName());
- // change competitor
- windowForEdit.switchToWindow();
- dialog = competitorEntry.clickEditButton();
- final String changedName = "" + System.currentTimeMillis();
- dialog.setNameTextBox(changedName);
- final String changedShortName = "" + System.currentTimeMillis();
- dialog.setShortNameTextBox(changedShortName);
- dialog.pressOk();
-
- // assert selection
- windowForSelection.switchToWindow();
-
- competitorPanelForSelection.pushRefreshButton();
- WebDriverWait waitTimer = new WebDriverWait(competitorPanelForSelection.driver, 10);
- ExpectedCondition condition = new ExpectedCondition() {
- @Override
- public Boolean apply(WebDriver arg0) {
- return competitorPanelForSelection.getCompetitorTable().getSelectedEntries().size() == 1;
+ assertTrue(found);
+ competitorPanelForSelection.getCompetitorTable().selectEntry(competitorEntryToSelect);
+
+ assertEquals(1, competitorPanelForSelection.getCompetitorTable().getSelectedEntries().size());
+ assertEquals(name, competitorPanelForSelection.getCompetitorTable().getSelectedEntries().get(0).getName());
+ assertEquals(shortName, competitorPanelForSelection.getCompetitorTable().getSelectedEntries().get(0).getShortName());
+ // change competitor
+ windowForEdit.switchToWindow();
+ dialog = competitorEntry.clickEditButton();
+ final String changedName = "" + System.currentTimeMillis();
+ dialog.setNameTextBox(changedName);
+ final String changedShortName = "" + System.currentTimeMillis();
+ dialog.setShortNameTextBox(changedShortName);
+ dialog.pressOk();
+
+ // assert selection
+ windowForSelection.switchToWindow();
+
+ competitorPanelForSelection.pushRefreshButton();
+ WebDriverWait waitTimer = new WebDriverWait(competitorPanelForSelection.driver, 10);
+ ExpectedCondition condition = new ExpectedCondition() {
+ @Override
+ public Boolean apply(WebDriver arg0) {
+ return competitorPanelForSelection.getCompetitorTable().getSelectedEntries().size() == 1;
+ }
+ };
+ waitTimer.until(condition);
+
+ assertEquals(1, competitorPanelForSelection.getCompetitorTable().getSelectedEntries().size());
+ for (final CompetitorEntry it : competitorPanelForSelection.getCompetitorTable().getEntries()) {
+ String itName = it.getName();
+ if (itName.equals(changedName)) {
+ found = true;
+ competitorEntryToSelect = it;
+ break;
+ }
}
- };
- waitTimer.until(condition);
-
- assertEquals(1, competitorPanelForSelection.getCompetitorTable().getSelectedEntries().size());
- for (final CompetitorEntry it : competitorPanelForSelection.getCompetitorTable().getEntries()) {
- String itName = it.getName();
- if (itName.equals(changedName)) {
- found = true;
- competitorEntryToSelect = it;
- break;
- }
- }
- assertTrue(found);
- assertEquals(changedName, competitorPanelForSelection.getCompetitorTable().getSelectedEntries().get(0).getName());
- assertEquals(changedShortName, competitorPanelForSelection.getCompetitorTable().getSelectedEntries().get(0).getShortName());
+ assertTrue(found);
+ assertEquals(changedName, competitorPanelForSelection.getCompetitorTable().getSelectedEntries().get(0).getName());
+ assertEquals(changedShortName, competitorPanelForSelection.getCompetitorTable().getSelectedEntries().get(0).getShortName());
+ });
}
private void setUpTestRefreshOfDependingUIElements() {
@@ -201,62 +194,63 @@ public class TestRefreshableSelectionModel extends AbstractSeleniumTest {
@Test
public void testRefreshOfDependingUIElements() {
- windowForSelection.switchToWindow();
- setUpTestRefreshOfDependingUIElements();
- AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot());
- SmartphoneTrackingEventManagementPanelPO smartphoneTrackingPanel = adminConsole.goToSmartphoneTrackingPanel();
- CellTablePO leaderboards = smartphoneTrackingPanel.getLeaderboardTable();
- // select leaderboard
- DataEntryPO entryToSelect = null;
- for(DataEntryPO entry : leaderboards.getEntries()) {
- if(entry.getColumnContent("Name").equals(LEADERBOARD)) {
- entryToSelect = entry;
- break;
+ this.environment.getWindowManager().withExtraWindow((windowForSelection, windowForEdit) -> {
+ windowForSelection.switchToWindow();
+ setUpTestRefreshOfDependingUIElements();
+ AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot());
+ SmartphoneTrackingEventManagementPanelPO smartphoneTrackingPanel = adminConsole.goToSmartphoneTrackingPanel();
+ CellTablePO leaderboards = smartphoneTrackingPanel.getLeaderboardTable();
+ // select leaderboard
+ DataEntryPO entryToSelect = null;
+ for(DataEntryPO entry : leaderboards.getEntries()) {
+ if(entry.getColumnContent("Name").equals(LEADERBOARD)) {
+ entryToSelect = entry;
+ break;
+ }
}
- }
- assertNotNull(entryToSelect);
- leaderboards.selectEntry(entryToSelect);
-
- RaceColumnTableWrapperPO raceColumnTableWrapper = smartphoneTrackingPanel.getRaceColumnTableWrapper();
- CellTablePO raceColumnTable = raceColumnTableWrapper.getRaceColumnTable();
- final int anzRaceColumns = raceColumnTable.getEntries().size();
- assertEquals(5, anzRaceColumns);
-
- // Open a second window & setup second window
- windowForEdit.switchToWindow();
-
- AdminConsolePage adminConsoleForEdit = AdminConsolePage.goToPage(getWebDriver(), getContextRoot());
- RegattaStructureManagementPanelPO regattaStructure = adminConsoleForEdit.goToRegattaStructure();
-
- RegattaDetailsCompositePO regattaDetails = regattaStructure.getRegattaDetails(this.regatta);
- SeriesEditDialogPO seriesDialog = regattaDetails.editSeries(RegattaStructureManagementPanelPO.DEFAULT_SERIES_NAME);
- seriesDialog.addRaces(6, 7);
- seriesDialog.pressOk();
-
- windowForSelection.switchToWindow();
- adminConsole.goToTracTracEvents();
- smartphoneTrackingPanel = adminConsole.goToSmartphoneTrackingPanel();
- leaderboards = smartphoneTrackingPanel.getLeaderboardTable();
- // select leaderboard
- entryToSelect = null;
- for(DataEntryPO entry : leaderboards.getEntries()) {
- if(entry.getColumnContent("Name").equals(LEADERBOARD)) {
- entryToSelect = entry;
- break;
+ assertNotNull(entryToSelect);
+ leaderboards.selectEntry(entryToSelect);
+
+ RaceColumnTableWrapperPO raceColumnTableWrapper = smartphoneTrackingPanel.getRaceColumnTableWrapper();
+ CellTablePO raceColumnTable = raceColumnTableWrapper.getRaceColumnTable();
+ final int anzRaceColumns = raceColumnTable.getEntries().size();
+ assertEquals(5, anzRaceColumns);
+
+ // Open a second window & setup second window
+ windowForEdit.switchToWindow();
+
+ AdminConsolePage adminConsoleForEdit = AdminConsolePage.goToPage(getWebDriver(), getContextRoot());
+ RegattaStructureManagementPanelPO regattaStructure = adminConsoleForEdit.goToRegattaStructure();
+
+ RegattaDetailsCompositePO regattaDetails = regattaStructure.getRegattaDetails(this.regatta);
+ SeriesEditDialogPO seriesDialog = regattaDetails.editSeries(RegattaStructureManagementPanelPO.DEFAULT_SERIES_NAME);
+ seriesDialog.addRaces(6, 7);
+ seriesDialog.pressOk();
+
+ windowForSelection.switchToWindow();
+ adminConsole.goToTracTracEvents();
+ smartphoneTrackingPanel = adminConsole.goToSmartphoneTrackingPanel();
+ leaderboards = smartphoneTrackingPanel.getLeaderboardTable();
+ // select leaderboard
+ entryToSelect = null;
+ for(DataEntryPO entry : leaderboards.getEntries()) {
+ if(entry.getColumnContent("Name").equals(LEADERBOARD)) {
+ entryToSelect = entry;
+ break;
+ }
}
- }
- assertNotNull(entryToSelect);
- leaderboards.selectEntry(entryToSelect);
-
- raceColumnTableWrapper = smartphoneTrackingPanel.getRaceColumnTableWrapper();
- raceColumnTable = raceColumnTableWrapper.getRaceColumnTable();
- final int newAnzRaceColumns = raceColumnTable.getEntries().size();
- assertEquals(7, newAnzRaceColumns);
+ assertNotNull(entryToSelect);
+ leaderboards.selectEntry(entryToSelect);
+
+ raceColumnTableWrapper = smartphoneTrackingPanel.getRaceColumnTableWrapper();
+ raceColumnTable = raceColumnTableWrapper.getRaceColumnTable();
+ final int newAnzRaceColumns = raceColumnTable.getEntries().size();
+ assertEquals(7, newAnzRaceColumns);
+ });
}
@Test
public void testMaintenanceOfSelectionAfterFilteringTrackedracesOnLeaderboardConfigPanel() {
- windowForSelection.switchToWindow();
setUpTestRefreshOfDependingUIElements();
AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot());
LeaderboardConfigurationPanelPO leaderboardConfiguration = adminConsole.goToLeaderboardConfiguration();
@@ -267,12 +261,7 @@ public class TestRefreshableSelectionModel extends AbstractSeleniumTest {
tracTracEvents.listTrackableRaces(IDM_5O5_2013_JSON_URL);
tracTracEvents.setReggataForTracking(this.regatta);
tracTracEvents.setTrackSettings(false, false, false);
- // TODO: There exists a bug in Selenium with key modifiers (Issue 3734 and 6817), so we can't use multi
- // selection (Firefox on Windows)
- //tracTracEvents.startTrackingForRaces(this.trackableRaces);
- for(int i =0; i<2;i++) {
- tracTracEvents.startTrackingForRace(trackableRaces.get(i));
- }
+ tracTracEvents.startTrackingForRaces(this.trackableRaces);
leaderboardConfiguration = adminConsole.goToLeaderboardConfiguration();
LeaderboardDetailsPanelPO leaderboardDetails = leaderboardConfiguration.getLeaderboardDetails(this.regatta.toString());
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestSmartphoneTrackingEventManagementPanel.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestSmartphoneTrackingEventManagementPanel.java
index e401c6f74ab..75b6bb44e61 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestSmartphoneTrackingEventManagementPanel.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestSmartphoneTrackingEventManagementPanel.java
@@ -15,9 +15,9 @@ import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfig
import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardDetailsPanelPO;
import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardDetailsPanelPO.RaceDescriptor;
import com.sap.sailing.selenium.pages.adminconsole.regatta.RegattaDetailsCompositePO;
+import com.sap.sailing.selenium.pages.adminconsole.regatta.RegattaListCompositePO.RegattaDescriptor;
import com.sap.sailing.selenium.pages.adminconsole.regatta.RegattaStructureManagementPanelPO;
import com.sap.sailing.selenium.pages.adminconsole.regatta.SeriesEditDialogPO;
-import com.sap.sailing.selenium.pages.adminconsole.regatta.RegattaListCompositePO.RegattaDescriptor;
import com.sap.sailing.selenium.pages.adminconsole.tracking.RaceColumnTableWrapperPO;
import com.sap.sailing.selenium.pages.adminconsole.tracking.TrackedRacesListPO;
import com.sap.sailing.selenium.pages.adminconsole.tracking.TrackedRacesListPO.TrackedRaceDescriptor;
@@ -132,11 +132,6 @@ public class TestSmartphoneTrackingEventManagementPanel extends AbstractSelenium
tracTracEvents.listTrackableRaces(IDM_5O5_2013_JSON_URL);
tracTracEvents.setReggataForTracking(this.regatta);
tracTracEvents.setTrackSettings(false, false, false);
- // TODO: There exists a bug in Selenium with key modifiers (Issue 3734 and 6817), so we can't use multi
- // selection (Firefox on Windows)
- //tracTracEvents.startTrackingForRaces(this.trackableRaces);
- for(TrackableRaceDescriptor race : this.trackableRaces) {
- tracTracEvents.startTrackingForRace(race);
- }
+ tracTracEvents.startTrackingForRaces(this.trackableRaces);
}
}
\ No newline at end of file
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java
index 76f8cadf204..509bb5d6a98 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/adminconsole/TestStartAndStopTrackingForTracTracEvents.java
@@ -1,13 +1,10 @@
package com.sap.sailing.selenium.test.adminconsole;
-import static org.hamcrest.Matchers.containsString;
import static org.hamcrest.Matchers.equalTo;
import static org.junit.Assert.assertThat;
import org.junit.Before;
import org.junit.Test;
-import org.openqa.selenium.Alert;
-import org.openqa.selenium.WebDriver.TargetLocator;
import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage;
import com.sap.sailing.selenium.pages.adminconsole.regatta.RegattaListCompositePO.RegattaDescriptor;
@@ -87,13 +84,7 @@ public class TestStartAndStopTrackingForTracTracEvents extends AbstractSeleniumT
tracTracEvents.listTrackableRaces(BMW_CUP_JSON_URL);
tracTracEvents.setReggataForTracking(DEFAULT_REGATTA);
tracTracEvents.setTrackSettings(false, false, false);
- tracTracEvents.startTrackingForRace(this.trackableRace);
- TargetLocator locator = getWebDriver().switchTo();
- Alert alert = locator.alert();
- String text = alert.getText();
- alert.dismiss();
- String message = "There is at least one regatta for the selected boat classes.";
- assertThat(text, containsString(message));
+ tracTracEvents.startTrackingForRacesAndAcceptDefaultRegattaWarning(this.trackableRace);
}
@Test
@@ -108,13 +99,6 @@ public class TestStartAndStopTrackingForTracTracEvents extends AbstractSeleniumT
tracTracEvents.listTrackableRaces(BMW_CUP_JSON_URL);
tracTracEvents.setReggataForTracking(idm2013Descriptor);
tracTracEvents.setTrackSettings(false, false, false);
- tracTracEvents.startTrackingForRace(this.trackableRace);
- TargetLocator locator = getWebDriver().switchTo();
- Alert alert = locator.alert();
- String text = alert.getText();
- alert.dismiss();
- String message = String.format("The selected races contain boat classes which are not the same as " +
- "the boat class '%s' of the selected regatta.", IDM_2013_BOAT_CLASS);
- assertThat(text, containsString(message));
+ tracTracEvents.startTrackingForRaceAndAwaitBoatClassError(this.trackableRace, IDM_2013_BOAT_CLASS);
}
}
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/autoplay/TestAutoPlay.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/autoplay/TestAutoPlay.java
index 52db4e94fde..04023ea3ca8 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/autoplay/TestAutoPlay.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/autoplay/TestAutoPlay.java
@@ -6,12 +6,15 @@ import static org.junit.Assert.assertTrue;
import java.util.Date;
import java.util.List;
+import java.util.function.Function;
import javax.xml.bind.DatatypeConverter;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
+import org.openqa.selenium.WebDriver;
+import org.openqa.selenium.support.ui.WebDriverWait;
import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage;
import com.sap.sailing.selenium.pages.adminconsole.event.EventConfigurationPanelPO;
@@ -117,9 +120,27 @@ public class TestAutoPlay extends AbstractSeleniumTest {
assertTrue("Url does not contain proper title " + url, url.contains("lbwh.saph.title=Leaderboard%3A+BMW+Cup+(J80)"));
assertTrue("Url does not contain proper name " + url, url.contains("name=BMW+Cup+(J80)"));
AutoPlayLeaderboardView autoplayPage = page.goToAutoPlayClassicUrl(getWebDriver(), url);
- LeaderboardTablePO leaderBoard = autoplayPage.getLeaderBoard();
- leaderBoard.waitForLeaderboardToHaveData();
- List races = leaderBoard.getRaceNames();
+ LeaderboardTablePO leaderBoard = autoplayPage.getLeaderBoardWithData();
+ final List races = new WebDriverWait(getWebDriver(), 20).until(new Function>() {
+ @Override
+ public List apply(WebDriver arg0) {
+ try {
+ final List races = leaderBoard.getRaceNames();
+ final List result;
+ if (races != null && !races.isEmpty()) {
+ result = races;
+ } else {
+ // The table may seem to be empty while the leaderboard updates itself
+ result = null;
+ }
+ return result;
+ } catch (Exception e) {
+ // While the leaderboard updates its contents, errors may occur while reading data via selenium
+ // In this case we need to try this in the next loop again
+ return null;
+ }
+ }
+ });
Assert.assertTrue(races.contains("R1"));
Assert.assertTrue(races.contains("R2"));
Assert.assertTrue(races.contains("R3"));
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java
index 80739d87854..d1099f09de1 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestLeaderboardConfiguration.java
@@ -11,8 +11,6 @@ import org.junit.Before;
import org.junit.Ignore;
import org.junit.Test;
-import com.sap.sailing.selenium.core.WebDriverWindow;
-import com.sap.sailing.selenium.core.WindowManager;
import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage;
import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO;
import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardDetailsPanelPO;
@@ -73,117 +71,113 @@ public class TestLeaderboardConfiguration extends AbstractSeleniumTest {
@Test
public void testDynamicRaceLinking() {
- // Open a second window which we use for the leaderboard later
- WindowManager manager = this.environment.getWindowManager();
- WebDriverWindow leaderboardWindow = manager.getCurrentWindow();
- WebDriverWindow adminConsoleWindow = manager.openNewWindow();
-
- // Open the leaderboard and check for "empty" leaderboard
- LeaderboardPage leaderboard = LeaderboardPage.goToPage(getWebDriver(), getContextRoot(), LEADERBOARD, false);
- LeaderboardTablePO table = leaderboard.getLeaderboardTable();
- List races = table.getRaceNames();
-
- assertThat(races.size(), equalTo(5));
- assertThat(table.getEntries().size(), equalTo(28)); // the regatta already has the races linked; regatta leaderboard obtains competitors from regatta
- adminConsoleWindow.switchToWindow();
- AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot());
- LeaderboardConfigurationPanelPO leaderboardConfiguration = adminConsole.goToLeaderboardConfiguration();
- LeaderboardDetailsPanelPO leaderboardDetails = leaderboardConfiguration.getLeaderboardDetails(this.regatta.toString());
-
- Integer[] expectedPointsForFindelJens = new Integer[] {2, 18, 12, 4, 7};
- Integer[] expectedRankForFindelJens = new Integer[] {2, 9, 11, 7, 6}; // Bogacki with no score in R1 expected to end up at end of leaderboard
-
- // Link the races and check the leaderboard again
- for (int i = 0; i < 5; i++) {
- leaderboardDetails.linkRace(this.leaderboardRaces.get(i), this.trackedRaces.get(i));
- leaderboardWindow.switchToWindow();
- leaderboard.refresh();
- List allEntries = table.getEntries();
- LeaderboardEntry findelJens = table.getEntry("8875");
- Integer points = findelJens.getPointsForRace(String.format("D%s", i + 1));
- Integer rank = findelJens.getTotalRank();
- // Assertions
- assertThat("Number of competitors does not match",
- allEntries.size(), equalTo(28));
- assertThat("Points for race 'D" + (i + 1) + "' do not match for competitor '8875' (Findel, Jens)",
- points, equalTo(expectedPointsForFindelJens[i]));
- assertThat("Total rank after " + (i + 1) + " race(s) does not match for competitor '8875' (Findel, Jens)",
- rank, equalTo(expectedRankForFindelJens[i]));
+ this.environment.getWindowManager().withExtraWindow((leaderboardWindow, adminConsoleWindow) -> {
+ // Open the leaderboard and check for "empty" leaderboard
+ LeaderboardPage leaderboard = LeaderboardPage.goToPage(getWebDriver(), getContextRoot(), LEADERBOARD, false);
+ LeaderboardTablePO table = leaderboard.getLeaderboardTable();
+ List races = table.getRaceNames();
+
+ assertThat(races.size(), equalTo(5));
+ assertThat(table.getEntries().size(), equalTo(28)); // the regatta already has the races linked; regatta leaderboard obtains competitors from regatta
adminConsoleWindow.switchToWindow();
- }
+ AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot());
+ LeaderboardConfigurationPanelPO leaderboardConfiguration = adminConsole.goToLeaderboardConfiguration();
+ LeaderboardDetailsPanelPO leaderboardDetails = leaderboardConfiguration.getLeaderboardDetails(this.regatta.toString());
+
+ Integer[] expectedPointsForFindelJens = new Integer[] {2, 18, 12, 4, 7};
+ Integer[] expectedRankForFindelJens = new Integer[] {2, 9, 11, 7, 6}; // Bogacki with no score in R1 expected to end up at end of leaderboard
+
+ // Link the races and check the leaderboard again
+ for (int i = 0; i < 5; i++) {
+ leaderboardDetails.linkRace(this.leaderboardRaces.get(i), this.trackedRaces.get(i));
+ leaderboardWindow.switchToWindow();
+ leaderboard.refresh();
+ List allEntries = table.getEntries();
+ LeaderboardEntry findelJens = table.getEntry("8875");
+ Integer points = findelJens.getPointsForRace(String.format("D%s", i + 1));
+ Integer rank = findelJens.getTotalRank();
+ // Assertions
+ assertThat("Number of competitors does not match",
+ allEntries.size(), equalTo(28));
+ assertThat("Points for race 'D" + (i + 1) + "' do not match for competitor '8875' (Findel, Jens)",
+ points, equalTo(expectedPointsForFindelJens[i]));
+ assertThat("Total rank after " + (i + 1) + " race(s) does not match for competitor '8875' (Findel, Jens)",
+ rank, equalTo(expectedRankForFindelJens[i]));
+ adminConsoleWindow.switchToWindow();
+ }
+ });
}
@Test
public void testDynamicRaceDeletion() {
- WindowManager manager = this.environment.getWindowManager();
- WebDriverWindow adminConsoleWindow = manager.getCurrentWindow();
- WebDriverWindow leaderboardWindow = manager.openNewWindow();
- // Go to the administration console and link all 5 races
- AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot());
- LeaderboardConfigurationPanelPO leaderboardConfiguration = adminConsole.goToLeaderboardConfiguration();
- LeaderboardDetailsPanelPO leaderboardDetails = leaderboardConfiguration.getLeaderboardDetails(this.regatta.toString());
- leaderboardDetails.linkRace(this.leaderboardRaces.get(0), this.trackedRaces.get(0));
- leaderboardDetails.linkRace(this.leaderboardRaces.get(1), this.trackedRaces.get(1));
- leaderboardDetails.linkRace(this.leaderboardRaces.get(2), this.trackedRaces.get(2));
- leaderboardDetails.linkRace(this.leaderboardRaces.get(3), this.trackedRaces.get(3));
- leaderboardDetails.linkRace(this.leaderboardRaces.get(4), this.trackedRaces.get(4));
- // Open the leaderboard in our second window
- leaderboardWindow.switchToWindow();
- LeaderboardPage leaderboard = LeaderboardPage.goToPage(getWebDriver(), getContextRoot(), LEADERBOARD, false);
- LeaderboardTablePO table = leaderboard.getLeaderboardTable();
- // Go back to the administration console and delete third race
- adminConsoleWindow.switchToWindow();
- RegattaStructureManagementPanelPO regattaStructure = adminConsole.goToRegattaStructure();
- RegattaDetailsCompositePO regattaDetails = regattaStructure.getRegattaDetails(this.regatta);
- SeriesEditDialogPO seriesDialog = regattaDetails.editSeries(RegattaStructureManagementPanelPO.DEFAULT_SERIES_NAME);
- seriesDialog.deleteRace("D3");
- seriesDialog.pressOk(true);
- // Now we can check the result with our expectation
- leaderboardWindow.switchToWindow();
- leaderboard.refresh();
- assertThat("Race names do not match after deletion of race 'D3'",
- table.getRaceNames(), equalTo(Arrays.asList("D1", "D2", "D4", "D5")));
+ this.environment.getWindowManager().withExtraWindow((adminConsoleWindow, leaderboardWindow) -> {
+ // Go to the administration console and link all 5 races
+ AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot());
+ LeaderboardConfigurationPanelPO leaderboardConfiguration = adminConsole.goToLeaderboardConfiguration();
+ LeaderboardDetailsPanelPO leaderboardDetails = leaderboardConfiguration.getLeaderboardDetails(this.regatta.toString());
+ leaderboardDetails.linkRace(this.leaderboardRaces.get(0), this.trackedRaces.get(0));
+ leaderboardDetails.linkRace(this.leaderboardRaces.get(1), this.trackedRaces.get(1));
+ leaderboardDetails.linkRace(this.leaderboardRaces.get(2), this.trackedRaces.get(2));
+ leaderboardDetails.linkRace(this.leaderboardRaces.get(3), this.trackedRaces.get(3));
+ leaderboardDetails.linkRace(this.leaderboardRaces.get(4), this.trackedRaces.get(4));
+ // Open the leaderboard in our second window
+ leaderboardWindow.switchToWindow();
+ LeaderboardPage leaderboard = LeaderboardPage.goToPage(getWebDriver(), getContextRoot(), LEADERBOARD, false);
+ LeaderboardTablePO table = leaderboard.getLeaderboardTable();
+ // Go back to the administration console and delete third race
+ adminConsoleWindow.switchToWindow();
+ RegattaStructureManagementPanelPO regattaStructure = adminConsole.goToRegattaStructure();
+ RegattaDetailsCompositePO regattaDetails = regattaStructure.getRegattaDetails(this.regatta);
+ SeriesEditDialogPO seriesDialog = regattaDetails.editSeries(RegattaStructureManagementPanelPO.DEFAULT_SERIES_NAME);
+ seriesDialog.deleteRace("D3");
+ seriesDialog.pressOk(true, false);
+ final List expectedRaces = Arrays.asList("D1", "D2", "D4", "D5");
+ regattaDetails.waitForRacesOfSeries(RegattaStructureManagementPanelPO.DEFAULT_SERIES_NAME, expectedRaces);
+ // Now we can check the result with our expectation
+ leaderboardWindow.switchToWindow();
+ leaderboard.refresh();
+ assertThat("Race names do not match after deletion of race 'D3'", table.getRaceNames(),
+ equalTo(expectedRaces));
+ });
}
@Ignore("This test belongs to bug 1892 and currently fails. It is currently enabled on branch bug1892.")
@Test
public void testDynamicRenamingOfRace() {
- WindowManager manager = this.environment.getWindowManager();
- WebDriverWindow adminConsoleWindow = manager.getCurrentWindow();
- WebDriverWindow leaderboardWindow = manager.openNewWindow();
-
- // Go to the administration console and link all 5 races
- AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot());
- LeaderboardConfigurationPanelPO leaderboardConfiguration = adminConsole.goToLeaderboardConfiguration();
- LeaderboardDetailsPanelPO leaderboardDetails = leaderboardConfiguration.getLeaderboardDetails(this.regatta.toString());
-
- leaderboardDetails.linkRace(this.leaderboardRaces.get(0), this.trackedRaces.get(0));
- leaderboardDetails.linkRace(this.leaderboardRaces.get(1), this.trackedRaces.get(1));
- leaderboardDetails.linkRace(this.leaderboardRaces.get(2), this.trackedRaces.get(2));
- leaderboardDetails.linkRace(this.leaderboardRaces.get(3), this.trackedRaces.get(3));
- leaderboardDetails.linkRace(this.leaderboardRaces.get(4), this.trackedRaces.get(4));
-
- // Open the leaderboard in our second window
- leaderboardWindow.switchToWindow();
-
- LeaderboardPage leaderboard = LeaderboardPage.goToPage(getWebDriver(), getContextRoot(), LEADERBOARD, false);
- LeaderboardTablePO table = leaderboard.getLeaderboardTable();
-
- // Go back to the administration console and rename the first race
- adminConsoleWindow.switchToWindow();
-
- RegattaStructureManagementPanelPO regattaStructure = adminConsole.goToRegattaStructure();
- RegattaDetailsCompositePO regattaDetails = regattaStructure.getRegattaDetails(this.regatta);
- SeriesEditDialogPO seriesDialog = regattaDetails.editSeries(RegattaStructureManagementPanelPO.DEFAULT_SERIES_NAME);
- seriesDialog.renameRace("D1", "Q");
- seriesDialog.pressOk(true);
-
- // Now we can check the result with our expectation
- leaderboardWindow.switchToWindow();
- leaderboard.refresh();
- List races = table.getRaceNames();
- assertThat("Race names do not match after renaming race 'D1' to 'Q'",
- races, equalTo(Arrays.asList("Q", "D2", "D3", "D4", "D5")));
+ this.environment.getWindowManager().withExtraWindow((adminConsoleWindow, leaderboardWindow) -> {
+ // Go to the administration console and link all 5 races
+ AdminConsolePage adminConsole = AdminConsolePage.goToPage(getWebDriver(), getContextRoot());
+ LeaderboardConfigurationPanelPO leaderboardConfiguration = adminConsole.goToLeaderboardConfiguration();
+ LeaderboardDetailsPanelPO leaderboardDetails = leaderboardConfiguration.getLeaderboardDetails(this.regatta.toString());
+
+ leaderboardDetails.linkRace(this.leaderboardRaces.get(0), this.trackedRaces.get(0));
+ leaderboardDetails.linkRace(this.leaderboardRaces.get(1), this.trackedRaces.get(1));
+ leaderboardDetails.linkRace(this.leaderboardRaces.get(2), this.trackedRaces.get(2));
+ leaderboardDetails.linkRace(this.leaderboardRaces.get(3), this.trackedRaces.get(3));
+ leaderboardDetails.linkRace(this.leaderboardRaces.get(4), this.trackedRaces.get(4));
+
+ // Open the leaderboard in our second window
+ leaderboardWindow.switchToWindow();
+
+ LeaderboardPage leaderboard = LeaderboardPage.goToPage(getWebDriver(), getContextRoot(), LEADERBOARD, false);
+ LeaderboardTablePO table = leaderboard.getLeaderboardTable();
+
+ // Go back to the administration console and rename the first race
+ adminConsoleWindow.switchToWindow();
+
+ RegattaStructureManagementPanelPO regattaStructure = adminConsole.goToRegattaStructure();
+ RegattaDetailsCompositePO regattaDetails = regattaStructure.getRegattaDetails(this.regatta);
+ SeriesEditDialogPO seriesDialog = regattaDetails.editSeries(RegattaStructureManagementPanelPO.DEFAULT_SERIES_NAME);
+ seriesDialog.renameRace("D1", "Q");
+ seriesDialog.pressOk(true, false);
+
+ // Now we can check the result with our expectation
+ leaderboardWindow.switchToWindow();
+ leaderboard.refresh();
+ List races = table.getRaceNames();
+ assertThat("Race names do not match after renaming race 'D1' to 'Q'",
+ races, equalTo(Arrays.asList("Q", "D2", "D3", "D4", "D5")));
+ });
}
private void configureLeaderboard() {
@@ -209,20 +203,10 @@ public class TestLeaderboardConfiguration extends AbstractSeleniumTest {
tracTracEvents.listTrackableRaces(IDM_5O5_2013_JSON_URL);
tracTracEvents.setReggataForTracking(this.regatta);
tracTracEvents.setTrackSettings(false, false, false);
- // TODO: There exists a bug in Selenium with key modifiers (Issue 3734 and 6817), so we can't use multi
- // selection (Firefox on Windows)
- //tracTracEvents.startTrackingForRaces(this.trackableRaces);
- for(TrackableRaceDescriptor race : this.trackableRaces) {
- tracTracEvents.startTrackingForRace(race);
- }
+ tracTracEvents.startTrackingForRaces(trackableRaces);
TrackedRacesListPO trackedRacesList = tracTracEvents.getTrackedRacesList();
trackedRacesList.waitForTrackedRaces(this.trackedRaces, Status.FINISHED); // TracAPI puts REPLAY races into FINISHED mode when done loading
- // TODO: There exists a bug in Selenium with key modifiers (Issue 3734 and 6817), so we can't use multi
- // selection (Firefox on Windows)
- //trackedRacesList.stopTracking(this.trackedRaces);
- for (TrackedRaceDescriptor race : this.trackedRaces) {
- trackedRacesList.stopTracking(race);
- }
+ trackedRacesList.stopTracking(this.trackedRaces);
}
}
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java
index ce286462c33..6f8a664a726 100755
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/leaderboard/TestSwitchingOffStartOfRaceInference.java
@@ -11,8 +11,6 @@ import java.util.List;
import org.junit.Before;
import org.junit.Test;
-import com.sap.sailing.selenium.core.WebDriverWindow;
-import com.sap.sailing.selenium.core.WindowManager;
import com.sap.sailing.selenium.pages.adminconsole.AdminConsolePage;
import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardConfigurationPanelPO;
import com.sap.sailing.selenium.pages.adminconsole.leaderboard.LeaderboardDetailsPanelPO;
@@ -62,33 +60,31 @@ public class TestSwitchingOffStartOfRaceInference extends AbstractSeleniumTest {
@Test
public void testCorrectDisplayOfRaceColumnWithAndWithoutStartTimeInference() {
- WindowManager manager = this.environment.getWindowManager();
- WebDriverWindow adminConsoleWindow = manager.getCurrentWindow();
- WebDriverWindow leaderboardWindow = manager.openNewWindow();
- leaderboardWindow.switchToWindow();
- LeaderboardPage leaderboard = LeaderboardPage.goToPage(getWebDriver(), getContextRoot(), LEADERBOARD, /* race details */ false);
- LeaderboardTablePO leaderboardTable = leaderboard.getLeaderboardTable();
- List races = leaderboardTable.getRaceNames();
- assertThat("Expected only D3", races, equalTo(Arrays.asList("D3")));
- int d3ColumnIndex = leaderboardTable.getColumnIndex("D3");
- for (LeaderboardEntry e : leaderboardTable.getEntries()) {
- String raceColumnContent = e.getColumnContent(d3ColumnIndex);
- assertTrue(Integer.parseInt(raceColumnContent) > 0); // all competitors have a positive score in R3
- }
- adminConsoleWindow.switchToWindow();
- // Go to the administration console and unset the "useStartTimeInference" flag
- RegattaStructureManagementPanelPO regattaManagementPanel = adminConsole.goToRegattaStructure();
- RegattaListCompositePO regattaList = regattaManagementPanel.getRegattaList();
- RegattaEditDialogPO regattaEditDialog = regattaList.editRegatta(regatta);
- regattaEditDialog.setUseStartTimeInference(false);
- regattaEditDialog.pressOk();
- leaderboardWindow.switchToWindow();
- leaderboard.refresh();
- for (LeaderboardEntry e : leaderboardTable.getEntries()) {
- String raceColumnContent = e.getColumnContent(d3ColumnIndex);
- assertEquals("", raceColumnContent); // all competitors have an empty score because there is no start time anymore
- }
- leaderboardWindow.close();
+ this.environment.getWindowManager().withExtraWindow((adminConsoleWindow, leaderboardWindow) -> {
+ leaderboardWindow.switchToWindow();
+ LeaderboardPage leaderboard = LeaderboardPage.goToPage(getWebDriver(), getContextRoot(), LEADERBOARD, /* race details */ false);
+ LeaderboardTablePO leaderboardTable = leaderboard.getLeaderboardTable();
+ List races = leaderboardTable.getRaceNames();
+ assertThat("Expected only D3", races, equalTo(Arrays.asList("D3")));
+ int d3ColumnIndex = leaderboardTable.getColumnIndex("D3");
+ for (LeaderboardEntry e : leaderboardTable.getEntries()) {
+ String raceColumnContent = e.getColumnContent(d3ColumnIndex);
+ assertTrue(Integer.parseInt(raceColumnContent) > 0); // all competitors have a positive score in R3
+ }
+ adminConsoleWindow.switchToWindow();
+ // Go to the administration console and unset the "useStartTimeInference" flag
+ RegattaStructureManagementPanelPO regattaManagementPanel = adminConsole.goToRegattaStructure();
+ RegattaListCompositePO regattaList = regattaManagementPanel.getRegattaList();
+ RegattaEditDialogPO regattaEditDialog = regattaList.editRegatta(regatta);
+ regattaEditDialog.setUseStartTimeInference(false);
+ regattaEditDialog.pressOk();
+ leaderboardWindow.switchToWindow();
+ leaderboard.refresh();
+ for (LeaderboardEntry e : leaderboardTable.getEntries()) {
+ String raceColumnContent = e.getColumnContent(d3ColumnIndex);
+ assertEquals("", raceColumnContent); // all competitors have an empty score because there is no start time anymore
+ }
+ });
}
private AdminConsolePage configureRegattaAndLeaderboard() {
diff --git a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SettingsTest.java b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SettingsTest.java
index 79070cb3237..46c078b499e 100644
--- a/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SettingsTest.java
+++ b/java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SettingsTest.java
@@ -77,7 +77,6 @@ public class SettingsTest extends AbstractSeleniumTest {
// Modes settings were formerly patched on the user defaults but are now patched on top of the system defaults.
// In addition, there are now different settigns keys per mode so that settigns for one mode do not have an effect on other modes.
// To verify this, there are new tests below but these do not test ReceBoard's embedded Leaderboard.
- // FIXME uncomment leaderboard test code when selenium infrastructure gets an upgrade
/**
* Verifies the settings storage of the raceboard. Checks the precedences of url, context specific settings, mode
* settings and global settings.
@@ -95,35 +94,29 @@ public class SettingsTest extends AbstractSeleniumTest {
RaceBoardPage raceboard = RaceBoardPage.goToRaceboardUrl(getWebDriver(), getContextRoot(), BMW_CUP_REGATTA,
BMW_CUP_REGATTA, String.format(BMW_RACE, 1), "PLAYER");
- //FIXME uncomment the leaderboard code when selenium on remote build server displays the raceboard properly
+ DetailCheckboxInfo[] detailsToSelect = new DetailCheckboxInfo[] {
+ // Overall details
-// DetailCheckboxInfo[] detailsToSelect = new DetailCheckboxInfo[] {
-// // Overall details
-//
-// // Race details
-// DetailCheckboxInfo.RACE_GAP_TO_LEADER,
-// DetailCheckboxInfo.RACE_CURRENT_SPEED_OVER_GROUND,
-// DetailCheckboxInfo.DISPLAY_LEGS,
-//
-// // Race Start Analysis
-//
-// // Leg Details
-// DetailCheckboxInfo.AVERAGE_SPEED_OVER_GROUND, DetailCheckboxInfo.DISTANCE, DetailCheckboxInfo.RANK_GAIN,
-//
-// // Maneuvers
-// DetailCheckboxInfo.TACK, DetailCheckboxInfo.JIBE,
-// DetailCheckboxInfo.PENALTY_CIRCLE
-//
-// };
-//
-// LeaderboardSettingsDialogPO leaderboardSettingsDialog = raceboard.openLeaderboardSettingsDialog();
-// LeaderboardSettingsPanelPO leaderboardSettingsPanelPO =
-// leaderboardSettingsDialog.getLeaderboardSettingsPanelPO();
-// DetailCheckboxInfo[] selectedDetails = leaderboardSettingsPanelPO.getSelectedDetails();
-// Assert.assertArrayEquals(detailsToSelect, selectedDetails);
-// leaderboardSettingsPanelPO.setRefreshInterval(2);
-// leaderboardSettingsDialog.pressMakeDefault();
-// leaderboardSettingsDialog.pressCancel();
+ // Race details
+ DetailCheckboxInfo.RACE_GAP_TO_LEADER, DetailCheckboxInfo.RACE_CURRENT_SPEED_OVER_GROUND,
+ DetailCheckboxInfo.DISPLAY_LEGS,
+
+ // Leg Details
+ DetailCheckboxInfo.AVERAGE_SPEED_OVER_GROUND, DetailCheckboxInfo.DISTANCE, DetailCheckboxInfo.RANK_GAIN,
+
+ // Maneuvers
+ DetailCheckboxInfo.TACK, DetailCheckboxInfo.JIBE, DetailCheckboxInfo.PENALTY_CIRCLE
+
+ };
+
+ LeaderboardSettingsDialogPO leaderboardSettingsDialog = raceboard.openLeaderboardSettingsDialog();
+ LeaderboardSettingsPanelPO leaderboardSettingsPanelPO = leaderboardSettingsDialog
+ .getLeaderboardSettingsPanelPO();
+ DetailCheckboxInfo[] selectedDetails = leaderboardSettingsPanelPO.getSelectedDetails();
+ Assert.assertArrayEquals(detailsToSelect, selectedDetails);
+ leaderboardSettingsPanelPO.setRefreshInterval(2);
+ leaderboardSettingsDialog.pressMakeDefault();
+ leaderboardSettingsDialog.pressCancel();
MapSettingsPO mapSettings = raceboard.openMapSettings();
// Verify initial mode settings
@@ -136,58 +129,38 @@ public class SettingsTest extends AbstractSeleniumTest {
raceboard = RaceBoardPage.goToRaceboardUrl(getWebDriver(), getContextRoot(), BMW_CUP_REGATTA, BMW_CUP_REGATTA,
String.format(BMW_RACE, 1), "WINNING_LANES");
-// detailsToSelect = new DetailCheckboxInfo[] {
-// // Overall details
-//
-// // Race details
-// DetailCheckboxInfo.RACE_GAP_TO_LEADER, //merged from user settings
-// DetailCheckboxInfo.RACE_DISTANCE,
-// DetailCheckboxInfo.RACE_TIME,
-// DetailCheckboxInfo.RACE_CURRENT_SPEED_OVER_GROUND, //merged from user settings
-// DetailCheckboxInfo.RACE_AVERAGE_ABSOLUTE_CROSS_TRACK_ERROR,
-// DetailCheckboxInfo.RACE_AVERAGE_SIGNED_CROSS_TRACK_ERROR,
-//
-// // Race Start Analysis
-//
-// // Leg Details
-// DetailCheckboxInfo.AVERAGE_SPEED_OVER_GROUND, DetailCheckboxInfo.DISTANCE, DetailCheckboxInfo.RANK_GAIN,
-//
-// // Maneuvers
-// DetailCheckboxInfo.TACK, DetailCheckboxInfo.JIBE,
-// DetailCheckboxInfo.PENALTY_CIRCLE
-//
-// };
-//
-//
-// leaderboardSettingsDialog = raceboard.openLeaderboardSettingsDialog();
-// leaderboardSettingsPanelPO = leaderboardSettingsDialog.getLeaderboardSettingsPanelPO();
-// selectedDetails = leaderboardSettingsPanelPO.getSelectedDetails();
-// Assert.assertArrayEquals(detailsToSelect, selectedDetails);
-//
-// detailsToSelect = new DetailCheckboxInfo[] {
-// // Overall details
-//
-// // Race details
-// DetailCheckboxInfo.RACE_GAP_TO_LEADER,
-// DetailCheckboxInfo.RACE_DISTANCE,
-// DetailCheckboxInfo.RACE_TIME,
-// DetailCheckboxInfo.RACE_CURRENT_SPEED_OVER_GROUND,
-// DetailCheckboxInfo.RACE_RATIO_BETWEEN_TIME_SINCE_LAST_POSITION_FIX_AND_AVERAGE_SAMPLING_INTERVAL, //new value
-// DetailCheckboxInfo.DISPLAY_LEGS, //new value which should override mode settings
-//
-// // Race Start Analysis
-//
-// // Leg Details
-// DetailCheckboxInfo.AVERAGE_SPEED_OVER_GROUND, DetailCheckboxInfo.DISTANCE, DetailCheckboxInfo.RANK_GAIN,
-//
-// // Maneuvers
-// DetailCheckboxInfo.TACK, DetailCheckboxInfo.JIBE,
-// DetailCheckboxInfo.PENALTY_CIRCLE
-//
-// };
-// leaderboardSettingsPanelPO.selectDetailsAndDeselectOther(detailsToSelect);
-// leaderboardSettingsPanelPO.setRefreshInterval(1);
-// leaderboardSettingsDialog.pressOk();
+ detailsToSelect = new DetailCheckboxInfo[] {
+ // Race details
+ DetailCheckboxInfo.RACE_DISTANCE, DetailCheckboxInfo.RACE_TIME,
+ DetailCheckboxInfo.RACE_AVERAGE_ABSOLUTE_CROSS_TRACK_ERROR,
+ DetailCheckboxInfo.RACE_AVERAGE_SIGNED_CROSS_TRACK_ERROR,
+ // Leg Details
+ DetailCheckboxInfo.AVERAGE_SPEED_OVER_GROUND, DetailCheckboxInfo.DISTANCE, DetailCheckboxInfo.RANK_GAIN,
+ // Maneuvers
+ DetailCheckboxInfo.TACK, DetailCheckboxInfo.JIBE, DetailCheckboxInfo.PENALTY_CIRCLE
+
+ };
+
+ leaderboardSettingsDialog = raceboard.openLeaderboardSettingsDialog();
+ leaderboardSettingsPanelPO = leaderboardSettingsDialog.getLeaderboardSettingsPanelPO();
+ selectedDetails = leaderboardSettingsPanelPO.getSelectedDetails();
+ Assert.assertArrayEquals(detailsToSelect, selectedDetails);
+
+ detailsToSelect = new DetailCheckboxInfo[] {
+ // Race details
+ DetailCheckboxInfo.RACE_GAP_TO_LEADER, DetailCheckboxInfo.RACE_DISTANCE, DetailCheckboxInfo.RACE_TIME,
+ DetailCheckboxInfo.RACE_CURRENT_SPEED_OVER_GROUND,
+ DetailCheckboxInfo.RACE_RATIO_BETWEEN_TIME_SINCE_LAST_POSITION_FIX_AND_AVERAGE_SAMPLING_INTERVAL,
+ DetailCheckboxInfo.DISPLAY_LEGS,
+ // Leg Details
+ DetailCheckboxInfo.AVERAGE_SPEED_OVER_GROUND, DetailCheckboxInfo.DISTANCE, DetailCheckboxInfo.RANK_GAIN,
+ // Maneuvers
+ DetailCheckboxInfo.TACK, DetailCheckboxInfo.JIBE, DetailCheckboxInfo.PENALTY_CIRCLE
+
+ };
+ leaderboardSettingsPanelPO.selectDetailsAndDeselectOther(detailsToSelect);
+ leaderboardSettingsPanelPO.setRefreshInterval(1);
+ leaderboardSettingsDialog.pressOk(false, false);
mapSettings = raceboard.openMapSettings();
// verify default mode settings override custom user settings
@@ -198,21 +171,22 @@ public class SettingsTest extends AbstractSeleniumTest {
Assert.assertFalse(mapSettings.isTransparentHoverlines());
mapSettings.setWindUp(false);
mapSettings.setTransparentHoverlines(false);
- mapSettings.pressOk();
+
+ mapSettings.pressOk(false, false);
raceboard = RaceBoardPage.goToRaceboardUrl(getWebDriver(), getContextRoot(), BMW_CUP_REGATTA, BMW_CUP_REGATTA,
String.format(BMW_RACE, 1), "WINNING_LANES");
-// leaderboardSettingsDialog = raceboard.openLeaderboardSettingsDialog();
-// leaderboardSettingsPanelPO = leaderboardSettingsDialog.getLeaderboardSettingsPanelPO();
-// selectedDetails = leaderboardSettingsPanelPO.getSelectedDetails();
-//
-// //verify highest precedence of document settings
-// Assert.assertArrayEquals(detailsToSelect, selectedDetails);
-// //verify that document settings are able to override custom user settings by a system default value
-// Assert.assertEquals(1, leaderboardSettingsPanelPO.getRefreshInterval());
-//
-// leaderboardSettingsDialog.pressCancel();
+ leaderboardSettingsDialog = raceboard.openLeaderboardSettingsDialog();
+ leaderboardSettingsPanelPO = leaderboardSettingsDialog.getLeaderboardSettingsPanelPO();
+ selectedDetails = leaderboardSettingsPanelPO.getSelectedDetails();
+
+ // verify highest precedence of document settings
+ Assert.assertArrayEquals(detailsToSelect, selectedDetails);
+ // verify that document settings are able to override custom user settings by a system default value
+ Assert.assertEquals(1, leaderboardSettingsPanelPO.getRefreshInterval());
+
+ leaderboardSettingsDialog.pressCancel();
mapSettings = raceboard.openMapSettings();
// Verify that mode settings are overridden by document settings
@@ -222,35 +196,29 @@ public class SettingsTest extends AbstractSeleniumTest {
//FIXME uncomment when START_ANALYSIS mode can be handled by remote CI server
// verify that custom document settings override mode settings of other modes
-// raceboard = RaceBoardPage.goToRaceboardUrl(getWebDriver(), getContextRoot(), BMW_CUP_REGATTA,
-// BMW_CUP_REGATTA,
-// String.format(BMW_RACE, 1), "START_ANALYSIS");
-// leaderboardSettingsDialog = raceboard.openLeaderboardSettingsDialog();
-// leaderboardSettingsPanelPO = leaderboardSettingsDialog.getLeaderboardSettingsPanelPO();
-// selectedDetails = leaderboardSettingsPanelPO.getSelectedDetails();
-//
-// detailsToSelect = new DetailCheckboxInfo[] {
-// DetailCheckboxInfo.RACE_GAP_TO_LEADER, //start analysis mode
-// DetailCheckboxInfo.RACE_CURRENT_SPEED_OVER_GROUND, //user settings
-// DetailCheckboxInfo.DISPLAY_LEGS, //document settings which override mode settings
-// DetailCheckboxInfo.RACE_RATIO_BETWEEN_TIME_SINCE_LAST_POSITION_FIX_AND_AVERAGE_SAMPLING_INTERVAL, //document settings
-// DetailCheckboxInfo.RACE_DISTANCE_TO_START_FIVE_SECONDS_BEFORE_START, //start analysis mode
-// DetailCheckboxInfo.RACE_SPEED_OVER_GROUND_FIVE_SECONDS_BEFORE_START, //start analysis mode
-// DetailCheckboxInfo.DISTANCE_TO_START_AT_RACE_START, //start analysis mode
-// DetailCheckboxInfo.SPEED_OVER_GROUND_AT_RACE_START, //start analysis mode
-// DetailCheckboxInfo.SPEED_OVER_GROUND_WHEN_STARTING, //start analysis mode
-// DetailCheckboxInfo.DISTANCE_TO_STARBOARD_END_OF_STARTLINE_WHEN_STARTING, //start analysis mode
-// DetailCheckboxInfo.START_TACK, //start analysis mode
-//
-// DetailCheckboxInfo.AVERAGE_SPEED_OVER_GROUND, DetailCheckboxInfo.DISTANCE, DetailCheckboxInfo.RANK_GAIN,
-//
-// DetailCheckboxInfo.TACK, DetailCheckboxInfo.JIBE, DetailCheckboxInfo.PENALTY_CIRCLE
-// };
-// Assert.assertArrayEquals(detailsToSelect, selectedDetails);
-// leaderboardSettingsDialog.pressCancel();
-//
-// mapSettings = raceboard.openMapSettings();
-// Assert.assertFalse(mapSettings.isWindUp());
+ raceboard = RaceBoardPage.goToRaceboardUrl(getWebDriver(), getContextRoot(), BMW_CUP_REGATTA, BMW_CUP_REGATTA,
+ String.format(BMW_RACE, 1), "START_ANALYSIS");
+ leaderboardSettingsDialog = raceboard.openLeaderboardSettingsDialog();
+ leaderboardSettingsPanelPO = leaderboardSettingsDialog.getLeaderboardSettingsPanelPO();
+ selectedDetails = leaderboardSettingsPanelPO.getSelectedDetails();
+
+ detailsToSelect = new DetailCheckboxInfo[] { DetailCheckboxInfo.RACE_GAP_TO_LEADER, // start analysis mode
+ DetailCheckboxInfo.RACE_DISTANCE_TO_START_FIVE_SECONDS_BEFORE_START, // start analysis mode
+ DetailCheckboxInfo.RACE_SPEED_OVER_GROUND_FIVE_SECONDS_BEFORE_START, // start analysis mode
+ DetailCheckboxInfo.DISTANCE_TO_START_AT_RACE_START, // start analysis mode
+ DetailCheckboxInfo.SPEED_OVER_GROUND_AT_RACE_START, // start analysis mode
+ DetailCheckboxInfo.SPEED_OVER_GROUND_WHEN_STARTING, // start analysis mode
+ DetailCheckboxInfo.DISTANCE_TO_STARBOARD_END_OF_STARTLINE_WHEN_STARTING, // start analysis mode
+ DetailCheckboxInfo.START_TACK, // start analysis mode
+
+ DetailCheckboxInfo.AVERAGE_SPEED_OVER_GROUND, DetailCheckboxInfo.DISTANCE, DetailCheckboxInfo.RANK_GAIN,
+
+ DetailCheckboxInfo.TACK, DetailCheckboxInfo.JIBE, DetailCheckboxInfo.PENALTY_CIRCLE };
+ Assert.assertArrayEquals(detailsToSelect, selectedDetails);
+ leaderboardSettingsDialog.pressCancel();
+
+ mapSettings = raceboard.openMapSettings();
+ Assert.assertTrue(mapSettings.isWindUp());
}
/**
@@ -687,7 +655,7 @@ public class SettingsTest extends AbstractSeleniumTest {
// open settings dialog of configurated leaderboard with default values
LeaderboardSettingsDialogPO leaderboardSettingsDialog = leaderboardPage.getLeaderboardSettings();
- LeaderboardSettingsPanelPO leaderboardSettingsPanel = leaderboardPage.getLeaderboardSettings()
+ LeaderboardSettingsPanelPO leaderboardSettingsPanel = leaderboardSettingsDialog
.getLeaderboardSettingsPanelPO();
// store default values for checks later
diff --git a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EstimationDataSerializationDeserializationTest.java b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EstimationDataSerializationDeserializationTest.java
index fa01070bb1b..b82873b29dc 100644
--- a/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EstimationDataSerializationDeserializationTest.java
+++ b/java/com.sap.sailing.server.gateway.serialization.test/src/com/sap/sailing/server/gateway/serialization/test/EstimationDataSerializationDeserializationTest.java
@@ -130,14 +130,14 @@ public class EstimationDataSerializationDeserializationTest {
Bearing relativeBearingToNextMarkAfterManeuver = new DegreeBearingImpl(10.01);
boolean markPassing = true;
Distance closestDistanceToMark = new MeterDistance(3.0);
- Double deviationFromTargetTackAngle = 23.30;
- Double deviationFromTargetJibeAngle = 22.30;
+ Double targetTackAngle = 23.30;
+ Double targetJibeAngle = 22.30;
CompleteManeuverCurveWithEstimationData toSerialize = new CompleteManeuverCurveWithEstimationDataImpl(
maneuverPosition, mainCurve, curve, wind, tackingCount, jibingCount,
maneuverStartsByRunningAwayFromWind, relativeBearingToNextMarkBeforeManeuver,
- relativeBearingToNextMarkAfterManeuver, markPassing, closestDistanceToMark,
- deviationFromTargetTackAngle, deviationFromTargetJibeAngle);
+ relativeBearingToNextMarkAfterManeuver, markPassing, closestDistanceToMark, targetTackAngle,
+ targetJibeAngle);
CompleteManeuverCurveWithEstimationDataJsonSerializer serializer = new CompleteManeuverCurveWithEstimationDataJsonSerializer(
new ManeuverMainCurveWithEstimationDataJsonSerializer(),
new ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataJsonSerializer(),
@@ -149,10 +149,8 @@ public class EstimationDataSerializationDeserializationTest {
new ManeuverWindJsonDeserializer(), new PositionJsonDeserializer());
CompleteManeuverCurveWithEstimationData deserialized = deserializer.deserialize(json);
- assertEquals(deviationFromTargetJibeAngle,
- deserialized.getDeviationOfManeuverAngleFromTargetJibeAngleInDegrees());
- assertEquals(deviationFromTargetTackAngle,
- deserialized.getDeviationOfManeuverAngleFromTargetTackAngleInDegrees());
+ assertEquals(targetJibeAngle, deserialized.getTargetJibeAngleInDegrees());
+ assertEquals(targetTackAngle, deserialized.getTargetTackAngleInDegrees());
assertEquals(closestDistanceToMark, deserialized.getDistanceToClosestMark());
assertEquals(maneuverPosition, deserialized.getPosition());
assertEquals(tackingCount, deserialized.getTackingCount());
@@ -310,14 +308,14 @@ public class EstimationDataSerializationDeserializationTest {
boolean markPassing = false;
DegreePosition maneuverPosition = new DegreePosition(50.325246, 11.148556);
Distance closestDistanceToMark = null;
- Double deviationFromTargetTackAngle = null;
- Double deviationFromTargetJibeAngle = null;
+ Double targetTackAngle = null;
+ Double targetJibeAngle = null;
CompleteManeuverCurveWithEstimationData toSerialize = new CompleteManeuverCurveWithEstimationDataImpl(
maneuverPosition, mainCurve, curve, wind, tackingCount, jibingCount,
maneuverStartsByRunningAwayFromWind, relativeBearingToNextMarkBeforeManeuver,
- relativeBearingToNextMarkAfterManeuver, markPassing, closestDistanceToMark,
- deviationFromTargetTackAngle, deviationFromTargetJibeAngle);
+ relativeBearingToNextMarkAfterManeuver, markPassing, closestDistanceToMark, targetTackAngle,
+ targetJibeAngle);
CompleteManeuverCurveWithEstimationDataJsonSerializer serializer = new CompleteManeuverCurveWithEstimationDataJsonSerializer(
new ManeuverMainCurveWithEstimationDataJsonSerializer(),
new ManeuverCurveWithUnstableCourseAndSpeedWithEstimationDataJsonSerializer(),
@@ -329,10 +327,8 @@ public class EstimationDataSerializationDeserializationTest {
new ManeuverWindJsonDeserializer(), new PositionJsonDeserializer());
CompleteManeuverCurveWithEstimationData deserialized = deserializer.deserialize(json);
- assertEquals(deviationFromTargetJibeAngle,
- deserialized.getDeviationOfManeuverAngleFromTargetJibeAngleInDegrees());
- assertEquals(deviationFromTargetTackAngle,
- deserialized.getDeviationOfManeuverAngleFromTargetTackAngleInDegrees());
+ assertEquals(targetJibeAngle, deserialized.getTargetJibeAngleInDegrees());
+ assertEquals(targetTackAngle, deserialized.getTargetTackAngleInDegrees());
assertEquals(closestDistanceToMark, deserialized.getDistanceToClosestMark());
assertEquals(maneuverPosition, deserialized.getPosition());
assertEquals(tackingCount, deserialized.getTackingCount());
diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompleteManeuverCurveWithEstimationDataJsonDeserializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompleteManeuverCurveWithEstimationDataJsonDeserializer.java
index 886f0e3c745..fb80f6228cd 100644
--- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompleteManeuverCurveWithEstimationDataJsonDeserializer.java
+++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/deserialization/impl/CompleteManeuverCurveWithEstimationDataJsonDeserializer.java
@@ -67,16 +67,15 @@ public class CompleteManeuverCurveWithEstimationDataJsonDeserializer
CompleteManeuverCurveWithEstimationDataJsonSerializer.RELATIVE_BEARING_TO_NEXT_MARK_AFTER_MANEUVER);
Double closestDistanceToMarkInMeters = (Double) object
.get(CompleteManeuverCurveWithEstimationDataJsonSerializer.CLOSEST_DISTANCE_TO_MARK);
- Double deviationFromTargetTackAngle = (Double) object
- .get(CompleteManeuverCurveWithEstimationDataJsonSerializer.DEVIATION_FROM_TARGET_TACK_ANGLE);
- Double deviationFromTargetJibeAngle = (Double) object
- .get(CompleteManeuverCurveWithEstimationDataJsonSerializer.DEVIATION_FROM_TARGET_JIBE_ANGLE);
+ Double targetTackAngle = (Double) object
+ .get(CompleteManeuverCurveWithEstimationDataJsonSerializer.TARGET_TACK_ANGLE);
+ Double targetJibeAngle = (Double) object
+ .get(CompleteManeuverCurveWithEstimationDataJsonSerializer.TARGET_JIBE_ANGLE);
return new CompleteManeuverCurveWithEstimationDataImpl(position, mainCurve, curveWithUnstableCourseAndSpeed,
wind, tackingCount, jibingCount, maneuverStartsByRunningAwayFromWind,
convertBearing(relativeBearingToNextMarkBeforeManeuver),
convertBearing(relativeBearingToNextMarkAfterManeuver), markPassing,
- convertDistance(closestDistanceToMarkInMeters), deviationFromTargetTackAngle,
- deviationFromTargetJibeAngle);
+ convertDistance(closestDistanceToMarkInMeters), targetTackAngle, targetJibeAngle);
}
private Bearing convertBearing(Double degrees) {
diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompetitorTrackWithEstimationDataJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompetitorTrackWithEstimationDataJsonSerializer.java
index eb2089ea0d5..7b7d9032416 100644
--- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompetitorTrackWithEstimationDataJsonSerializer.java
+++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompetitorTrackWithEstimationDataJsonSerializer.java
@@ -26,7 +26,7 @@ import com.sap.sse.common.impl.MillisecondsDurationImpl;
*
*/
public class CompetitorTrackWithEstimationDataJsonSerializer extends AbstractTrackedRaceDataJsonSerializer {
- public static final String elements = "elements";
+ public static final String ELEMENTS = "elements";
public static final String BOAT_CLASS = "boatClass";
public static final String COMPETITOR_NAME = "competitorName";
public static final String AVG_INTERVAL_BETWEEN_FIXES_IN_SECONDS = "avgIntervalBetweenFixesInSeconds";
@@ -67,27 +67,27 @@ public class CompetitorTrackWithEstimationDataJsonSerializer extends AbstractTra
for (Competitor competitor : trackedRace.getRace().getCompetitors()) {
ManeuverDetectorImpl maneuverDetector = new ManeuverDetectorImpl(trackedRace, competitor);
TrackTimeInfo trackTimeInfo = maneuverDetector.getTrackTimeInfo();
- TimePoint from = null;
- TimePoint to = null;
- if (startBeforeStartLineInSeconds != null) {
- from = trackTimeInfo.getTrackStartTimePoint()
- .minus(new MillisecondsDurationImpl(startBeforeStartLineInSeconds * 1000L));
- } else if (startAfterFinishLineInSeconds != null) {
- from = trackTimeInfo.getTrackEndTimePoint()
- .plus(new MillisecondsDurationImpl(startAfterFinishLineInSeconds * 1000L));
- } else {
- from = trackTimeInfo.getTrackStartTimePoint();
- }
- if (endAfterFinishLineInSeconds != null) {
- to = trackTimeInfo.getTrackEndTimePoint()
- .plus(new MillisecondsDurationImpl(endAfterFinishLineInSeconds * 1000L));
- } else if (endBeforeStartLineInSeconds != null) {
- to = trackTimeInfo.getTrackStartTimePoint()
- .minus(new MillisecondsDurationImpl(endBeforeStartLineInSeconds * 1000L));
- } else {
- to = trackTimeInfo.getTrackEndTimePoint();
- }
if (trackTimeInfo != null) {
+ TimePoint from = null;
+ TimePoint to = null;
+ if (startBeforeStartLineInSeconds != null) {
+ from = trackTimeInfo.getTrackStartTimePoint()
+ .minus(new MillisecondsDurationImpl(startBeforeStartLineInSeconds * 1000L));
+ } else if (startAfterFinishLineInSeconds != null) {
+ from = trackTimeInfo.getTrackEndTimePoint()
+ .plus(new MillisecondsDurationImpl(startAfterFinishLineInSeconds * 1000L));
+ } else {
+ from = trackTimeInfo.getTrackStartTimePoint();
+ }
+ if (endAfterFinishLineInSeconds != null) {
+ to = trackTimeInfo.getTrackEndTimePoint()
+ .plus(new MillisecondsDurationImpl(endAfterFinishLineInSeconds * 1000L));
+ } else if (endBeforeStartLineInSeconds != null) {
+ to = trackTimeInfo.getTrackStartTimePoint()
+ .minus(new MillisecondsDurationImpl(endBeforeStartLineInSeconds * 1000L));
+ } else {
+ to = trackTimeInfo.getTrackEndTimePoint();
+ }
final JSONObject forCompetitorJson = new JSONObject();
byCompetitorJson.add(forCompetitorJson);
forCompetitorJson.put(COMPETITOR_NAME, competitor.getName());
@@ -111,7 +111,7 @@ public class CompetitorTrackWithEstimationDataJsonSerializer extends AbstractTra
: trackTimeInfo.getTrackEndTimePoint().asMillis());
forCompetitorJson.put(MARK_PASSINGS_COUNT, getMarkPassingsCount(trackedRace, competitor));
forCompetitorJson.put(WAYPOINTS_COUNT, getWaypointsCount(trackedRace));
- forCompetitorJson.put(elements,
+ forCompetitorJson.put(ELEMENTS,
elementsJsonSerializer.serialize(trackedRace, competitor, from, to, trackTimeInfo));
}
}
diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompleteManeuverCurveWithEstimationDataJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompleteManeuverCurveWithEstimationDataJsonSerializer.java
index e1b807cf388..a00ac2d01b8 100644
--- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompleteManeuverCurveWithEstimationDataJsonSerializer.java
+++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/CompleteManeuverCurveWithEstimationDataJsonSerializer.java
@@ -24,8 +24,8 @@ public class CompleteManeuverCurveWithEstimationDataJsonSerializer
public static final String RELATIVE_BEARING_TO_NEXT_MARK_BEFORE_MANEUVER = "relativeBearingToNextMarkBeforeManeuver";
public static final String RELATIVE_BEARING_TO_NEXT_MARK_AFTER_MANEUVER = "relativeBearingToNextMarkAfterManeuver";
public static final String CLOSEST_DISTANCE_TO_MARK = "closestDistanceToMarkInMeters";
- public static final String DEVIATION_FROM_TARGET_TACK_ANGLE = "deviationFromTargetTackAngleInDegrees";
- public static final String DEVIATION_FROM_TARGET_JIBE_ANGLE = "deviationFromTargetJibeAngleInDegrees";
+ public static final String TARGET_TACK_ANGLE = "targetTackAngleInDegrees";
+ public static final String TARGET_JIBE_ANGLE = "targetJibeAngleInDegrees";
private final ManeuverCurveBoundariesJsonSerializer mainCurveSerializer;
private final ManeuverCurveBoundariesJsonSerializer curveWithUnstableCourseAndSpeedSerializer;
@@ -64,10 +64,8 @@ public class CompleteManeuverCurveWithEstimationDataJsonSerializer
: maneuverWithEstimationData.getRelativeBearingToNextMarkAfterManeuver().getDegrees());
result.put(CLOSEST_DISTANCE_TO_MARK, maneuverWithEstimationData.getDistanceToClosestMark() == null ? null
: maneuverWithEstimationData.getDistanceToClosestMark().getMeters());
- result.put(DEVIATION_FROM_TARGET_TACK_ANGLE,
- maneuverWithEstimationData.getDeviationOfManeuverAngleFromTargetTackAngleInDegrees());
- result.put(DEVIATION_FROM_TARGET_JIBE_ANGLE,
- maneuverWithEstimationData.getDeviationOfManeuverAngleFromTargetJibeAngleInDegrees());
+ result.put(TARGET_TACK_ANGLE, maneuverWithEstimationData.getTargetTackAngleInDegrees());
+ result.put(TARGET_JIBE_ANGLE, maneuverWithEstimationData.getTargetJibeAngleInDegrees());
return result;
}
diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GPSFixMovingJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GPSFixMovingJsonSerializer.java
index 9abbbd260c0..7cbdef8ecb1 100644
--- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GPSFixMovingJsonSerializer.java
+++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GPSFixMovingJsonSerializer.java
@@ -2,19 +2,25 @@ package com.sap.sailing.server.gateway.serialization.impl;
import org.json.simple.JSONObject;
+import com.sap.sailing.domain.common.SpeedWithBearing;
import com.sap.sailing.domain.common.tracking.GPSFixMoving;
import com.sap.sailing.server.gateway.deserialization.TypeBasedJsonDeserializer;
import com.sap.sailing.server.gateway.deserialization.impl.GPSFixMovingJsonDeserializer;
import com.sap.sailing.server.gateway.serialization.JsonSerializer;
public class GPSFixMovingJsonSerializer implements JsonSerializer {
+
@Override
public JSONObject serialize(GPSFixMoving object) {
+ return serialize(object, object.getSpeed());
+ }
+
+ public JSONObject serialize(GPSFixMoving object, SpeedWithBearing speedWithCourse) {
JSONObject result = new GPSFixJsonSerializer().serialize(object);
result.put(TypeBasedJsonDeserializer.FIELD_TYPE, GPSFixMovingJsonDeserializer.TYPE);
- result.put(GPSFixMovingJsonDeserializer.FIELD_BEARING_DEG, object.getSpeed().getBearing().getDegrees());
- result.put(GPSFixMovingJsonDeserializer.FIELD_SPEED_KNOTS, object.getSpeed().getKnots());
+ result.put(GPSFixMovingJsonDeserializer.FIELD_BEARING_DEG, speedWithCourse.getBearing().getDegrees());
+ result.put(GPSFixMovingJsonDeserializer.FIELD_SPEED_KNOTS, speedWithCourse.getKnots());
return result;
}
diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GpsFixesWithEstimationDataJsonSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GpsFixesWithEstimationDataJsonSerializer.java
index a4dbff6c389..684004762c7 100644
--- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GpsFixesWithEstimationDataJsonSerializer.java
+++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/GpsFixesWithEstimationDataJsonSerializer.java
@@ -62,7 +62,9 @@ public class GpsFixesWithEstimationDataJsonSerializer implements CompetitorTrack
track.lockForRead();
try {
for (GPSFixMoving gpsFix : track.getFixes(from, true, to, true)) {
- JSONObject serializedGpsFix = gpsFixMovingJsonSerializer.serialize(gpsFix);
+ SpeedWithBearing speedWithBearing = smoothFixes ? track.getEstimatedSpeed(gpsFix.getTimePoint())
+ : gpsFix.getSpeed();
+ JSONObject serializedGpsFix = gpsFixMovingJsonSerializer.serialize(gpsFix, speedWithBearing);
if (addWind) {
Wind wind = trackedRace.getWind(gpsFix.getPosition(), gpsFix.getTimePoint());
JSONObject serializedWind = wind == null ? null : windJsonSerializer.serialize(wind);
@@ -71,8 +73,6 @@ public class GpsFixesWithEstimationDataJsonSerializer implements CompetitorTrack
if (addNextWaypoint) {
Distance closestDistanceToMark = estimationDataSupportDecoratorImpl
.getClosestDistanceToMark(gpsFix.getTimePoint());
- SpeedWithBearing speedWithBearing = smoothFixes ? track.getEstimatedSpeed(gpsFix.getTimePoint())
- : gpsFix.getSpeed();
Bearing relativeBearingToNextMark = speedWithBearing == null ? null
: estimationDataSupportDecoratorImpl.getRelativeBearingToNextMark(gpsFix.getTimePoint(),
speedWithBearing.getBearing());
diff --git a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceStateSerializer.java b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceStateSerializer.java
index 5ad592fbc2b..0b87b9c86e4 100644
--- a/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceStateSerializer.java
+++ b/java/com.sap.sailing.server.gateway.serialization/src/com/sap/sailing/server/gateway/serialization/impl/RaceStateSerializer.java
@@ -45,7 +45,7 @@ public class RaceStateSerializer implements JsonSerializer result;
if (leaderboard instanceof HasRegattaLike && raceLog != null) {
- ReadonlyRaceState state = ReadonlyRaceStateImpl.create(/* race log resolver */ this, raceLog);
+ ReadonlyRaceState state = ReadonlyRaceStateImpl.getOrCreate(/* race log resolver */ this, raceLog);
result = new com.sap.sse.common.Util.Triple(state.getStartTime(),
raceLog.getCurrentPassId(), state.getRacingProcedure().getType());
} else {
@@ -3652,7 +3652,7 @@ public class RacingEventServiceImpl implements RacingEventService, ClearStateTes
Leaderboard leaderboard = getLeaderboardByName(leaderboardName);
final Triple result;
if (leaderboard instanceof HasRegattaLike && raceLog != null) {
- ReadonlyRaceState state = ReadonlyRaceStateImpl.create(/* race log resolver */ this, raceLog);
+ ReadonlyRaceState state = ReadonlyRaceStateImpl.getOrCreate(/* race log resolver */ this, raceLog);
result = new com.sap.sse.common.Util.Triple<>(state.getFinishingTime(), state.getFinishedTime(),
raceLog.getCurrentPassId());
} else {
diff --git a/java/com.sap.sailing.simulator.test/.project b/java/com.sap.sailing.simulator.test/.project
index 348d1ccbb59..6e91001fe19 100644
--- a/java/com.sap.sailing.simulator.test/.project
+++ b/java/com.sap.sailing.simulator.test/.project
@@ -22,12 +22,12 @@
- com.google.gdt.eclipse.core.webAppProjectValidator
+ com.gwtplugins.gdt.eclipse.core.webAppProjectValidator
- com.google.gwt.eclipse.core.gwtProjectValidator
+ com.gwtplugins.gwt.eclipse.core.gwtProjectValidator
@@ -35,6 +35,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
- com.google.gwt.eclipse.core.gwtNature
+ com.gwtplugins.gwt.eclipse.core.gwtNature
diff --git a/java/com.sap.sailing.simulator/.project b/java/com.sap.sailing.simulator/.project
index 3f09d9050b0..f86820f24df 100644
--- a/java/com.sap.sailing.simulator/.project
+++ b/java/com.sap.sailing.simulator/.project
@@ -21,12 +21,12 @@
- com.google.gdt.eclipse.core.webAppProjectValidator
+ com.gwtplugins.gdt.eclipse.core.webAppProjectValidator
- com.google.gwt.eclipse.core.gwtProjectValidator
+ com.gwtplugins.gwt.eclipse.core.gwtProjectValidator
@@ -34,6 +34,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
- com.google.gwt.eclipse.core.gwtNature
+ com.gwtplugins.gwt.eclipse.core.gwtNature
diff --git a/java/com.sap.sailing.www/release_notes_admin.html b/java/com.sap.sailing.www/release_notes_admin.html
index daafe6c3709..f5a4d1f5b0d 100755
--- a/java/com.sap.sailing.www/release_notes_admin.html
+++ b/java/com.sap.sailing.www/release_notes_admin.html
@@ -22,6 +22,15 @@
Release Notes - Administration Console
+
July 2018
+
+ - The mark passing editor now uses a full date/time format for the mark passing time points.
+ - The TracTrac connector panel no longer shows a password visibly but uses a password text field.
+ - The SwissTiming connector can now handle an "Update URL" together with username/password access
+ credentials which are used, if present, to send feedback requests about start times, race status
+ and course changes to that URL.
+
+
July 2018
- When adding a YouTube video for tracked races ("Manage Media" in RaceBoard.html or "Tracked Races > Audio & Video" in AdminConsole.html) the respective video metadata is now read using YouTube API v3.
@@ -32,6 +41,23 @@
leaving the value empty and confirming the dialog.
- Up to 15 discards can now be configured for series and leaderboards. This enables, e.g., "Wednesday Night" scenarios
where over the season, say, 20 races are run but due to changing participation only, say, the five best ones shall be scored.
+ - There is a new scoring scheme available to be selected upon regatta creation.
+ The scoring scheme is named "Low Point System, First with two wins in medals is winner" and introduces the following specifics compared to the standard low point scheme:
+
+ - Medal series does not feature doubling of points in the medal series by default.
+ - A competitor having two wins in the medal series is treated as overall winner.
+ If there is a carry forward column in the medal series, having one point there also counts as a win which means the best competitor in the qualification needs a win less than any other finalist to be the overall winner.
+ - If the medal series isn't started yet or no competitor has collected two wins, scoring by points is used.
+ This also applies if the regatta is aborted (e.g. due to weather conditions) before any competitor could win two races in the medal series.
+ - If two competitors have the same amount of points in the medal series the tie breaking criteria is the carry forward column of the medal series.
+ If there is no carry forward column in the medal series, the last medal race is used as tie breaking criteria.
+ For any non-medal series, the standard low point rules apply.
+
+
+ - A TracAPI upgrade from version 3.10.1 to 3.11.0 unifies the handling of course updates and solves an issue
+ observed with updating mark passing instructions.
+ - Bug fix for mark position editor, now providing consistent behavior during adding of new mark fixes
+ - Data Mining now more aggressively terminates running queries if needed.
June 2018
diff --git a/java/com.sap.sse.common/.project b/java/com.sap.sse.common/.project
index 8aff8541cda..c28bb7a5e5a 100644
--- a/java/com.sap.sse.common/.project
+++ b/java/com.sap.sse.common/.project
@@ -21,12 +21,12 @@
- com.google.gdt.eclipse.core.webAppProjectValidator
+ com.gwtplugins.gdt.eclipse.core.webAppProjectValidator
- com.google.gwt.eclipse.core.gwtProjectValidator
+ com.gwtplugins.gwt.eclipse.core.gwtProjectValidator
@@ -34,6 +34,6 @@
org.eclipse.pde.PluginNature
org.eclipse.jdt.core.javanature
- com.google.gwt.eclipse.core.gwtNature
+ com.gwtplugins.gwt.eclipse.core.gwtNature
diff --git a/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestAbortingHeavyLoadQuery.java b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestAbortingHeavyLoadQuery.java
new file mode 100644
index 00000000000..3e6a5494596
--- /dev/null
+++ b/java/com.sap.sse.datamining.test/src/com/sap/sse/datamining/impl/TestAbortingHeavyLoadQuery.java
@@ -0,0 +1,524 @@
+package com.sap.sse.datamining.impl;
+
+import static org.hamcrest.Matchers.is;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertThat;
+import static org.junit.Assert.assertTrue;
+
+import java.lang.reflect.Method;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.Date;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.ConcurrentHashMap;
+import java.util.concurrent.ConcurrentLinkedQueue;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.FutureTask;
+import java.util.concurrent.RunnableFuture;
+import java.util.concurrent.TimeUnit;
+import java.util.function.Consumer;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+
+import com.sap.sse.datamining.Query;
+import com.sap.sse.datamining.QueryState;
+import com.sap.sse.datamining.components.AdditionalResultDataBuilder;
+import com.sap.sse.datamining.components.Processor;
+import com.sap.sse.datamining.components.ProcessorInstruction;
+import com.sap.sse.datamining.components.ProcessorInstructionHandler;
+import com.sap.sse.datamining.data.QueryResult;
+import com.sap.sse.datamining.impl.components.AbstractParallelProcessor;
+import com.sap.sse.datamining.impl.components.AbstractProcessorInstruction;
+import com.sap.sse.datamining.impl.components.AbstractRetrievalProcessor;
+import com.sap.sse.datamining.impl.components.GroupedDataEntry;
+import com.sap.sse.datamining.impl.components.ProcessorInstructionPriority;
+import com.sap.sse.datamining.impl.components.aggregators.ParallelGroupedDataCollectingAsSetProcessor;
+import com.sap.sse.datamining.shared.GroupKey;
+import com.sap.sse.datamining.shared.data.QueryResultState;
+import com.sap.sse.datamining.shared.impl.GenericGroupKey;
+import com.sap.sse.datamining.test.util.components.StatefulBlockingInstruction;
+import com.sap.sse.datamining.test.util.components.StatefulProcessorInstruction;
+
+/**
+ * Integration test aborting a query with simulated heavy load instructions. Uses a highly customized processor chain
+ * (based on the processors/instructions used in production) that allows detailed introspection and logging of the
+ * execution process. The test is used to verify the behavior of processors, if such a heavy load query is aborted
+ * during the process. For example that no instructions are scheduled after the query was aborted and the behavior of
+ * already scheduled instructions that may or may not have been started.
+ *
+ * The test is configurable regarding the number of threads for the executor, the number of data elements/heavy load
+ * instructions, the duration of heavy load instructions, the time to wait before the query is aborted and the time
+ * given to the executor to finish the remaining instructions. Note that the test can fail for some configurations, due
+ * to race conditions that would be very hard to check for.
+ *
+ * The test optionally records the process in order of the execution (using a concurrent message queue), which is
+ * printed to the console before assertions are performed. This isn't used by the assertions, but can be used to get a
+ * better understanding of what happens during the execution.
+ *
+ * See {@link #initialize()} for more details about the processor chain.
+ *
+ * @author Lennart Hensler
+ */
+public class TestAbortingHeavyLoadQuery {
+
+ // Test Configuration ----------------------------------------------------------------------------------------
+ /**
+ * Number of threads in the executor. Determines the number of elements (and thus heavy load instructions)
+ * retrieved for each group. This means that each group should have a runtime of {@value #HeavyLoadInstructionTotalDuration}ms,
+ * since the single instructions are executed concurrently.
+ */
+ private static final int ExecutorPoolSize = Math.max(3, Runtime.getRuntime().availableProcessors());
+
+ /** The number of groups contained in the initial data source. */
+ private static final int DataSourceSize = 2000;
+ private static final String GroupKeyPrefix = "G";
+
+ /** The time a step of a heavy load instruction blocks the executing thread (using {@link Thread#sleep(long)}). */
+ private static final long HeavyLoadInstructionStepDuration = 50;
+ /** The number of steps a heavy load instruction performs */
+ private static final int HeavyLoadInstructionNumberOfSteps = 10;
+ /** The total time a heavy load instruction blocks the executing thread (using {@link Thread#sleep(long)}). */
+ private static final long HeavyLoadInstructionTotalDuration = HeavyLoadInstructionStepDuration * HeavyLoadInstructionNumberOfSteps;
+
+ /** The number of milliseconds to wait before {@link Query#abort()} is called. */
+ private static final long AbortQueryDelay = (long) (HeavyLoadInstructionTotalDuration * 5.45);
+ /** The time given to the executor to complete all unfinished instructions */
+ private static final long TerminationTimeout = HeavyLoadInstructionStepDuration * 2;
+ //------------------------------------------------------------------------------------------------------------
+
+ // Execution Recording Configuration -------------------------------------------------------------------------
+ /** Enables concurrent logging of the query execution and prints the current record before assertions. */
+ private static final boolean RecordExecution = true;
+ private static final SimpleDateFormat DateFormatter = new SimpleDateFormat("HH:mm:ss.SSS");
+ private ConcurrentLinkedQueue
executionRecord;
+ //------------------------------------------------------------------------------------------------------------
+
+ // Test State - Initialized in initialize() ------------------------------------------------------------------
+ private ExecutorService executor;
+ private Query> query;
+ private Collection> processors;
+ private Set> unfinishedInstructions;
+ //------------------------------------------------------------------------------------------------------------
+
+ @Test
+ public void testAbortingHeavyLoadQuery() throws InterruptedException, ExecutionException {
+ // Executing query in separate thread
+ RunnableFuture>> queryTask = new FutureTask<>(() -> {
+ logExecution("Starting query execution");
+ long start = System.currentTimeMillis();
+ QueryResult> result = query.run();
+ long duration = System.currentTimeMillis() - start;
+ logExecution("Finished query in " + duration + "ms");
+ return result;
+ });
+ Thread worker = new Thread(queryTask, "Worker");
+ worker.start();
+ do {
+ Thread.sleep(10);
+ } while (query.getState() != QueryState.RUNNING);
+
+ // Aborting query and waiting for completion
+ Thread.sleep(AbortQueryDelay);
+ logExecution("Aborting query");
+ query.abort();
+ QueryResult> result = queryTask.get();
+
+ // The query execution returned, so all processors are aborted (checked below).
+ // The number of unfinished instructions mustn't change after this point
+ int unfinishedInstructionsCount = unfinishedInstructions.size();
+ boolean unfinishedInstructionWasFinished = false;
+ Set> runningInstructions = new HashSet<>();
+ Set> notStartedInstructions = new HashSet<>();
+ for (StatefulProcessorInstruction instruction : unfinishedInstructions) {
+ if (instruction.runWasCalled()) {
+ runningInstructions.add(instruction);
+ } else {
+ notStartedInstructions.add(instruction);
+ }
+ unfinishedInstructionWasFinished |= instruction.computeResultWasFinished();
+ }
+ logExecution(unfinishedInstructionsCount + " unfinished instructions left - " +
+ runningInstructions.size() + " running, " + notStartedInstructions.size() + " not started");
+ printExecutionRecord();
+ assertThat("Number of unfinished instructions changed", runningInstructions.size() + notStartedInstructions.size(), is(unfinishedInstructionsCount));
+ assertFalse("Unfinished instructions expected, but at least one was completed", unfinishedInstructionWasFinished);
+
+ // Checking query, result and processor chain state
+ assertThat(query.getState(), is(QueryState.ABORTED));
+ assertThat(result.getState(), is(QueryResultState.ABORTED));
+ assertTrue("The result is not empty", result.isEmpty());
+ for (Processor processor : processors) {
+ assertTrue("Processor wasn't aborted", processor.isAborted());
+ }
+
+ // Execution of unfinished instructions
+ executor.shutdown();
+ boolean terminated = executor.awaitTermination(TerminationTimeout, TimeUnit.MILLISECONDS);
+ printExecutionRecord();
+ assertTrue("The executor didn't terminate in the given time", terminated);
+
+ // Verify that the collection of unfinished instructions didn't change
+ assertThat("Number of unfinished instructions changed", unfinishedInstructions.size(), is(unfinishedInstructionsCount));
+ for (StatefulProcessorInstruction instruction : unfinishedInstructions) {
+ boolean previouslyContained = runningInstructions.contains(instruction) || notStartedInstructions.contains(instruction);
+ assertTrue("A new instruction has been scheduled after aborting the query", previouslyContained);
+ }
+ for (StatefulProcessorInstruction instruction : runningInstructions) {
+ assertTrue("A previously running instruction was removed from unfinished instructions", unfinishedInstructions.contains(instruction));
+ }
+ for (StatefulProcessorInstruction instruction : notStartedInstructions) {
+ assertTrue("A previously unstarted instruction was removed from unfinished instructions", unfinishedInstructions.contains(instruction));
+ }
+
+ // Checking state of unfinished instructions
+ for (StatefulProcessorInstruction instruction : runningInstructions) {
+ assertTrue("computeResult() of a running unfinished instruction wasn't called", instruction.computeResultWasCalled());
+ assertTrue("computeResult() of a running unfinished instruction didn't finish", instruction.computeResultWasFinished());
+ if (instruction instanceof StatefulBlockingInstruction) {
+ StatefulBlockingInstruction blockingInstruction = (StatefulBlockingInstruction) instruction;
+ assertTrue("computeResult() of a running heavy load instruction wasn't aborted", blockingInstruction.computeResultWasAborted());
+ }
+ }
+ for (StatefulProcessorInstruction instruction : notStartedInstructions) {
+ assertTrue("run() of an unstarted unfinished instruction wasn't called", instruction.runWasCalled());
+
+ assertFalse("computeResult() of an unstarted unfinished instruction was called", instruction.computeResultWasCalled());
+ assertFalse("computeResult() of an unstarted unfinished instruction was finished", instruction.computeResultWasFinished());
+ }
+ }
+
+ private void printExecutionRecord() {
+ if (RecordExecution) {
+ Collection snapshot = new ArrayList<>(executionRecord);
+ executionRecord.clear();
+ for (String string : snapshot) {
+ System.out.println(string);
+ }
+ }
+ }
+
+ private void logExecution(String message) {
+ if (RecordExecution) {
+ String timeString = DateFormatter.format(new Date());
+ executionRecord.add(timeString + " - " + Thread.currentThread().getName() + ": " + message);
+ }
+ }
+
+ /**
+ * Initializes the {@link ExecutorService}, the execution record, helper collections (e.g. the processors in the
+ * chain or the unfinished instructions) and most importantly the processor chain for the query, which works as
+ * follows:
+ *
+ * -
+ * The initial data source is a collection of strings from {@value #GroupKeyPrefix}
n to
+ * {@value #GroupKeyPrefix}n-1, denoting a group. n is specified in {@link #DataSourceSize}.
+ *
+ * -
+ *
x (specified by {@link #ExecutorPoolSize}) {@link Element elements} are retrieved for each
+ * group, where the elements name is set to the received string and the elements value is the current value
+ * of x.
+ *
+ * -
+ * A heavy load instruction for each element is scheduled, which blocks the running thread for
+ * {@value #HeavyLoadInstructionTotalDuration}ms.
+ *
+ * -
+ * Each element is grouped by its name and its value is used as value for the {@link GroupedDataEntry}.
+ *
+ * - The grouped data is collected as set.
+ *
+ * This results in n * x data elements (and heavy load instructions), with x instructions
+ * executed concurrently.
+ *
+ * Each processor creates {@link StatefulProcessorInstruction} or uses {@link StatefulInstructionWrapper}, which allows
+ * to verify if instruction.run() was called, its computation started and its computation finished.
+ *
+ * A concurrent set ({@link ConcurrentHashMap#newKeySet()}) is used to track the unfinished instructions. An instruction
+ * is added to the set upon its construction and is removed when the instruction finished callback method is called.
+ */
+ @Before
+ @SuppressWarnings("unchecked")
+ public void initialize() {
+ if (RecordExecution) {
+ executionRecord = new ConcurrentLinkedQueue<>();
+ }
+
+ executor = new DataMiningExecutorService(ExecutorPoolSize);
+// executor = new ThreadPoolExecutor(ExecutorPoolSize, ExecutorPoolSize, 0, TimeUnit.MILLISECONDS, new PriorityBlockingQueue<>());
+// executor = new ThreadPoolExecutor(ExecutorPoolSize, ExecutorPoolSize, 0, TimeUnit.MILLISECONDS, new LinkedBlockingQueue<>());
+ processors = new ArrayList<>();
+ unfinishedInstructions = ConcurrentHashMap.newKeySet();
+
+ Class> dataSourceType = (Class>)(Class) Iterable.class;
+ Class> groupedType = (Class>)(Class) GroupedDataEntry.class;
+ Class> resultType = (Class>)(Class) HashSet.class;
+
+ Collection dataSource = new ArrayList<>(DataSourceSize);
+ for (int i = 0; i < DataSourceSize; i++) {
+ dataSource.add(GroupKeyPrefix + i);
+ }
+ query = new ProcessorQuery, Iterable>(dataSource, resultType) {
+ @Override
+ protected Processor, ?> createChainAndReturnFirstProcessor(Processor>, Void> resultReceiver) {
+ Processor, Map>> aggregator = new ParallelGroupedDataCollectingAsSetProcessor(executor, Collections.singleton(resultReceiver)) {
+ @Override
+ protected ProcessorInstruction>> createInstruction(GroupedDataEntry element) {
+ AbstractProcessorInstruction>> instruction = (AbstractProcessorInstruction>>) super.createInstruction(element);
+ StatefulProcessorInstruction>> statefulInstruction = new StatefulInstructionWrapper<>(instruction);
+ unfinishedInstructions.add(statefulInstruction);
+ return statefulInstruction;
+ }
+
+ @Override
+ protected void storeElement(GroupedDataEntry element) {
+ logExecution("Storing " + element);
+ super.storeElement(element);
+ }
+
+ @Override
+ public void afterInstructionFinished(ProcessorInstruction>> instruction) {
+ super.afterInstructionFinished(instruction);
+ if(canProcessElements()) unfinishedInstructions.remove(instruction);
+ }
+ };
+
+ Processor> grouper = new AbstractParallelProcessor>(Element.class, groupedType, executor, Collections.singleton(aggregator)) {
+ @Override
+ protected ProcessorInstruction> createInstruction(Element element) {
+ StatefulProcessorInstruction> instruction = new StatefulProcessorInstruction>(this, ProcessorInstructionPriority.Grouping) {
+ @Override
+ protected GroupedDataEntry internalComputeResult() throws Exception {
+ logExecution("Grouping " + element);
+ return new GroupedDataEntry<>(new GenericGroupKey<>(element.getName()), element.getValue());
+ }
+ };
+ unfinishedInstructions.add(instruction);
+ return instruction;
+ }
+
+ @Override
+ public void afterInstructionFinished(ProcessorInstruction> instruction) {
+ super.afterInstructionFinished(instruction);
+ if(canProcessElements()) unfinishedInstructions.remove(instruction);
+ }
+
+ @Override
+ protected void setAdditionalData(AdditionalResultDataBuilder additionalDataBuilder) { }
+ };
+
+ Processor heavyLoadProcessor = new AbstractParallelProcessor