eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-11-13 14:12:11 +00:00
Code Activity

Merge branch 'master' into bug4942

Browse Source
This commit is contained in:
Steffen Schaefer committed 2019-05-27 15:18:49 +02:00
2 parents 821ad1238a 30529fbdcb
commit 39c3d602e9
367 files changed
+21150 -2520
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.selenium.test/com.sap.sailing.selenium.test (Proxy).launch
-16
View File
@@ -1,16 +0,0 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<launchConfiguration type="org.eclipse.jdt.junit.launchconfig">
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_PATHS">
<listEntry value="/com.sap.sailing.selenium.test"/>
</listAttribute>
<listAttribute key="org.eclipse.debug.core.MAPPED_RESOURCE_TYPES">
<listEntry value="4"/>
</listAttribute>
<stringAttribute key="org.eclipse.jdt.junit.CONTAINER" value="=com.sap.sailing.selenium.test"/>
<booleanAttribute key="org.eclipse.jdt.junit.KEEPRUNNING_ATTR" value="false"/>
<stringAttribute key="org.eclipse.jdt.junit.TESTNAME" value=""/>
<stringAttribute key="org.eclipse.jdt.junit.TEST_KIND" value="org.eclipse.jdt.junit.loader.junit4"/>
<stringAttribute key="org.eclipse.jdt.launching.MAIN_TYPE" value=""/>
<stringAttribute key="org.eclipse.jdt.launching.PROJECT_ATTR" value="com.sap.sailing.selenium.test"/>
<stringAttribute key="org.eclipse.jdt.launching.VM_ARGUMENTS" value="-ea -Dselenium.test.environment.configuration=local-test-environment.xml -Dhttp.proxyHost=proxy -Dhttp.proxyPort=8080 -Dwebdriver.firefox.profile=Selenium"/>
</launchConfiguration>
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/test/raceboard/SettingsTest.java
+2 -13
View File
@@ -161,7 +161,6 @@ public class SettingsTest extends AbstractSeleniumTest {
leaderboardSettingsPanelPO.selectDetailsAndDeselectOther(detailsToSelect);
leaderboardSettingsPanelPO.setRefreshInterval(1);
leaderboardSettingsDialog.pressOk(false, false);
mapSettings = raceboard.openMapSettings();
// verify default mode settings override custom user settings
Assert.assertTrue(mapSettings.isWindUp());
@@ -171,12 +170,9 @@ public class SettingsTest extends AbstractSeleniumTest {
Assert.assertFalse(mapSettings.isTransparentHoverlines());
mapSettings.setWindUp(false);
mapSettings.setTransparentHoverlines(false);
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();
@@ -185,38 +181,31 @@ public class SettingsTest extends AbstractSeleniumTest {
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
Assert.assertFalse(mapSettings.isWindUp());
// Verify custom user settings are independent for modes
Assert.assertFalse(mapSettings.isTransparentHoverlines());
//FIXME uncomment when START_ANALYSIS mode can be handled by remote CI server
// verify that custom document settings override mode settings of other modes
// 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_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.TIME_BETWEEN_RACE_START_AND_COMPETITOR_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());
}