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

and cleanup of last test using CompetitorAndBoat class

Browse Source
This commit is contained in:
Frank Mittag committed 2018-01-11 15:55:20 +01:00
1 parent 9ad514909f
commit bbf68c4ed5
1 file changed
+8 -7
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/WindByRaceLogTest.java
+8 -7
View File
@@ -21,15 +21,16 @@ import com.sap.sailing.domain.abstractlog.race.impl.RaceLogWindFixEventImpl;
import com.sap.sailing.domain.base.Boat;
import com.sap.sailing.domain.base.BoatClass;
import com.sap.sailing.domain.base.Competitor;
import com.sap.sailing.domain.base.CompetitorAndBoat;
import com.sap.sailing.domain.base.CompetitorWithBoat;
import com.sap.sailing.domain.base.DomainFactory;
import com.sap.sailing.domain.base.Fleet;
import com.sap.sailing.domain.base.RaceColumn;
import com.sap.sailing.domain.base.RaceDefinition;
import com.sap.sailing.domain.base.Regatta;
import com.sap.sailing.domain.base.Waypoint;
import com.sap.sailing.domain.base.impl.CompetitorAndBoatImpl;
import com.sap.sailing.domain.base.impl.CompetitorWithBoatImpl;
import com.sap.sailing.domain.base.impl.CourseImpl;
import com.sap.sailing.domain.base.impl.DynamicBoat;
import com.sap.sailing.domain.base.impl.PersonImpl;
import com.sap.sailing.domain.base.impl.RaceDefinitionImpl;
import com.sap.sailing.domain.base.impl.RegattaImpl;
@@ -83,7 +84,7 @@ public class WindByRaceLogTest {
// FIXME use master DomainFactory; see bug 592
final DomainFactory masterDomainFactory = service.getBaseDomainFactory();
BoatClass boatClass = masterDomainFactory.getOrCreateBoatClass(boatClassName, /* typicallyStartsUpwind */true);
CompetitorAndBoat competitorAndBoat = createCompetitorAndBoat(masterDomainFactory, boatClass);
CompetitorWithBoat competitor = createCompetitorWithBoat(masterDomainFactory, boatClass);
int[] discardThreshold = {1, 2};
CreateFlexibleLeaderboard createLeaderboardOperation = new CreateFlexibleLeaderboard("Test Leaderboard", "Test", discardThreshold, new LowPoint(), null);
service.apply(createLeaderboardOperation);
@@ -97,7 +98,7 @@ public class WindByRaceLogTest {
final String raceName = "Test Race";
final CourseImpl masterCourse = new CourseImpl("Test Course", new ArrayList<Waypoint>());
final Map<Competitor, Boat> competitorsAndBoats = new HashMap<>();
competitorsAndBoats.put(competitorAndBoat.getCompetitor(), competitorAndBoat.getBoat());
competitorsAndBoats.put(competitor, competitor.getBoat());
RaceDefinition race = new RaceDefinitionImpl(raceName, masterCourse, boatClass, competitorsAndBoats);
AddRaceDefinition addRaceOperation = new AddRaceDefinition(new RegattaName(regatta.getName()), race);
service.apply(addRaceOperation);
@@ -110,13 +111,13 @@ public class WindByRaceLogTest {
defaultFleet = Util.get(raceColumn.getFleets(), 0);
}
private CompetitorAndBoat createCompetitorAndBoat(final DomainFactory masterDomainFactory, final BoatClass boatClass) {
private CompetitorWithBoat createCompetitorWithBoat(final DomainFactory masterDomainFactory, final BoatClass boatClass) {
Competitor competitor = masterDomainFactory.getOrCreateCompetitor("GER 61", "Sailor", "S", Color.RED, "noone@nowhere.de", null, new TeamImpl("Sailor",
(List<PersonImpl>) Arrays.asList(new PersonImpl[] { new PersonImpl("Sailor 1", DomainFactory.INSTANCE.getOrCreateNationality("GER"), null, null)}),
new PersonImpl("Sailor 2", DomainFactory.INSTANCE.getOrCreateNationality("NED"), null, null)),
/* timeOnTimeFactor */ null, /* timeOnDistanceAllowanceInSecondsPerNauticalMile */ null, null);
Boat boat = masterDomainFactory.getOrCreateBoat("boat", "GER 61", boatClass, "GER 61", null);
return new CompetitorAndBoatImpl(competitor, boat);
DynamicBoat boat = (DynamicBoat) masterDomainFactory.getOrCreateBoat("boat", "GER 61", boatClass, "GER 61", null);
return new CompetitorWithBoatImpl(competitor, boat);
}
private void attachTrackedRaceToRaceColumn() {