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

Merge branch 'bug5085' of ssh://sapsailing.com/home/trac/git into bug5085

Browse Source
This commit is contained in:
Thomas Wiese committed 2019-10-14 17:16:16 +02:00
2 parents d818940ff6 37b75db28a
commit 31ccd92b61
4 files changed
+65 -32
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/regatta/RegattaApi.java
+1 -1
View File
@@ -104,7 +104,7 @@ public class RegattaApi {
final String url = REGATTAS + "/" + regattaName + ADD_RACE_COLUMN_URL;
final Map<String, String> queryParams = new TreeMap<>();
queryParams.put("prefix", prefix);
queryParams.put("numberOfRaces", numberOfRaces != null ? numberOfRaces.toString() : null);
queryParams.put("numberofraces", numberOfRaces != null ? numberOfRaces.toString() : null);
final JSONArray json = ctx.post(url, queryParams);
final RaceColumn[] result = new RaceColumn[json.size()];
for (int i = 0; i < json.size(); i++) {
java/com.sap.sailing.selenium.test/src/com/sap/sailing/selenium/api/test/CourseConfigurationTest.java
+31
View File
@@ -13,6 +13,7 @@ import static org.junit.Assert.assertTrue;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -374,6 +375,36 @@ public class CourseConfigurationTest extends AbstractSeleniumTest {
assertEquals(startboatConfigurationResult.getMarkPropertiesId(), createdMarkProperties.getId());
assertEquals(pinEndName, createdMarkProperties.getName());
}
@Test
public void testGetEmptyCourseWithPredefinedMarks() {
final ApiContext ctx = createAdminApiContext(getContextRoot(), SERVER_CONTEXT);
final String regattaName = "test";
eventApi.createEvent(ctx, regattaName, "", CompetitorRegistrationType.CLOSED, "");
final RaceColumn[] races = regattaApi.addRaceColumn(ctx, regattaName, /* prefix */ null, 2);
final RaceColumn race1 = races[0];
final RaceColumn race2 = races[1];
String markName = "some mark";
MarkConfiguration mark = MarkConfiguration.createFreestyle(null, null, null, markName, null, null,
null, null, MarkType.BUOY.name());
WaypointWithMarkConfiguration wp = new WaypointWithMarkConfiguration(null, null, PassingInstruction.Starboard,
Arrays.asList(mark.getId()));
CourseConfiguration courseConfiguration = new CourseConfiguration("my-freestyle-course", Arrays.asList(mark),
Arrays.asList(wp));
courseConfigurationApi.createCourse(ctx, courseConfiguration, regattaName, race1.getRaceName(), "Default");
CourseConfiguration courseConfigurationForRace2 = courseConfigurationApi.createCourseConfigurationFromCourse(ctx, regattaName, race2.getRaceName(), "Default", Collections.emptySet());
assertEquals(1, Util.size(courseConfigurationForRace2.getMarkConfigurations()));
assertEquals(0, Util.size(courseConfigurationForRace2.getWaypoints()));
MarkConfiguration previouslyDefinedMark = courseConfigurationForRace2.getMarkConfigurations().iterator().next();
assertEquals(markName, previouslyDefinedMark.getEffectiveProperties().getName());
}
@Test
public void testCreateCourseConfigurationFromTemplate() {