eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-22 21:55:39 +00:00
Code Activity

Merge remote-tracking branch 'origin/master' into bug4469

Browse Source
This commit is contained in:
Robin Kuck
2018-05-29 22:34:52 +02:00
parent 56b23f92b5 3c1bb568c3
commit 97d6eb4655
101 changed files with 1917 additions and 481 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/CompetitorStoreTest.java
+2 -2
View File
@@ -113,7 +113,7 @@ public class CompetitorStoreTest {
DynamicTeam differentTeam = (DynamicTeam) AbstractLeaderboardTest.createCompetitorWithBoat("Test Competitor").getTeam();
differentTeam.setNationality(DomainFactory.INSTANCE.getOrCreateNationality("GHA")); // Ghana
CompetitorWithBoat competitor3 = persistentStore2.getOrCreateCompetitorWithBoat(template.getId(), template.getName(), template.getShortName(),
DynamicCompetitorWithBoat competitor3 = persistentStore2.getOrCreateCompetitorWithBoat(template.getId(), template.getName(), template.getShortName(),
template.getColor(), template.getEmail(), template.getFlagImage(), differentTeam, /* timeOnTimeFactor */
null, /* timeOnDistanceAllowanceInSecondsPerNauticalMile */null, null, template.getBoat());
assertSame(competitor2, competitor3); // use existing competitor despite the different team
@@ -124,7 +124,7 @@ public class CompetitorStoreTest {
persistentStore2.allowCompetitorResetToDefaults(competitor2);
CompetitorWithBoat competitor4 = persistentStore2.getOrCreateCompetitorWithBoat(template.getId(), template.getName(), template.getShortName(),
template.getColor(), template.getEmail(), template.getFlagImage(), differentTeam, /* timeOnTimeFactor */
null, /* timeOnDistanceAllowanceInSecondsPerNauticalMile */null, null, template.getBoat());
null, /* timeOnDistanceAllowanceInSecondsPerNauticalMile */null, null, competitor3.getBoat());
assertSame(competitor2, competitor4); // expecting an in-place update
assertEquals(differentTeam.getNationality(), competitor4.getTeam().getNationality());
}
java/com.sap.sailing.server.test/src/com/sap/sailing/server/test/RaceTrackerTest.java
+1 -1
View File
@@ -103,7 +103,7 @@ public class RaceTrackerTest {
@Override
public void raceRemoved(TrackedRace trackedRace) {
}
}, Optional.empty());
}, Optional.empty(), /* synchronous */ false);
synchronized (trackedRaces) {
if (trackedRaces[0] == null) {
trackedRaces.wait();