Merge branch 'master' into bug2822_boatcolors

Change-Id: I19333a21e5d79726b1409eb319798f55b49faf79
This commit is contained in:
Axel Uhl
2018-03-22 14:45:41 +01:00
55 changed files with 432 additions and 323 deletions
@@ -9,6 +9,7 @@ import java.net.MalformedURLException;
import java.net.URISyntaxException;
import java.net.UnknownHostException;
import java.util.Collections;
import java.util.Optional;
import org.junit.Before;
import org.junit.Test;
@@ -104,7 +105,8 @@ public class TestStoringAndRetrievingWindTracksTest extends AbstractTracTracLive
@Override
public void addRaceDefinition(RaceDefinition race, DynamicTrackedRace trackedRace) {
}
}, /*useMarkPassingCalculator*/ false, mock(RaceLogResolver.class));
}, /*useMarkPassingCalculator*/ false, mock(RaceLogResolver.class),
Optional.empty());
WindSource windSource = new WindSourceImpl(WindSourceType.WEB);
Mongo myFirstMongo = newMongo();
DB firstDatabase = myFirstMongo.getDB(dbConfiguration.getDatabaseName());