mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-14 22:43:57 +00:00
Merge branch 'master' into bug5004
This commit is contained in:
commit
0955d203a1
2 files changed
+85
-1
No files matched your search
+6
-1
@@ -244,11 +244,16 @@ public abstract class OnlineTracTracBasedTest extends AbstractTracTracLiveTest i
|
||||
protected void setUpWithoutLaunchingController(String regattaName, String raceId, final URI liveUri,
|
||||
final URI storedUri) throws MalformedURLException, FileNotFoundException, URISyntaxException,
|
||||
SubscriberInitializationException, CreateModelException {
|
||||
final URL paramUrl = new URL("http://" + TracTracConnectionConstants.HOST_NAME + "/events/"+regattaName+"/"+raceId+".txt");
|
||||
final URL paramUrl = getParamUrl(regattaName, raceId);
|
||||
setUpWithoutLaunchingController(paramUrl, liveUri, storedUri);
|
||||
}
|
||||
|
||||
|
||||
protected URL getParamUrl(String regattaName, String raceId) throws MalformedURLException {
|
||||
return new URL("http://" + TracTracConnectionConstants.HOST_NAME + "/events/"+regattaName+"/"+raceId+".txt");
|
||||
}
|
||||
|
||||
|
||||
protected void setUpWithoutLaunchingController(final URL paramUrl, final URI liveUri, final URI storedUri)
|
||||
throws FileNotFoundException, MalformedURLException, URISyntaxException, SubscriberInitializationException, CreateModelException {
|
||||
super.setUp(paramUrl, liveUri, storedUri);
|
||||
|
||||
+79
@@ -0,0 +1,79 @@
|
||||
package com.sap.sailing.domain.test;
|
||||
|
||||
import static org.junit.Assert.assertEquals;
|
||||
|
||||
import java.io.IOException;
|
||||
import java.net.MalformedURLException;
|
||||
import java.net.URI;
|
||||
import java.net.URISyntaxException;
|
||||
import java.net.URL;
|
||||
import java.text.ParseException;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Test;
|
||||
|
||||
import com.sap.sailing.domain.base.Competitor;
|
||||
import com.sap.sailing.domain.common.WindSourceType;
|
||||
import com.sap.sailing.domain.common.impl.DegreePosition;
|
||||
import com.sap.sailing.domain.common.impl.KnotSpeedWithBearingImpl;
|
||||
import com.sap.sailing.domain.common.impl.WindImpl;
|
||||
import com.sap.sailing.domain.common.impl.WindSourceImpl;
|
||||
import com.sap.sailing.domain.tractracadapter.ReceiverType;
|
||||
import com.sap.sse.common.impl.DegreeBearingImpl;
|
||||
import com.sap.sse.common.impl.MillisecondsTimePoint;
|
||||
import com.tractrac.model.lib.api.event.CreateModelException;
|
||||
import com.tractrac.subscription.lib.api.SubscriberInitializationException;
|
||||
|
||||
/**
|
||||
* See bug 5004
|
||||
*
|
||||
* @author Axel Uhl (d043530)
|
||||
*
|
||||
*/
|
||||
public class SteadyRankingForBiasedFinishLineTest extends OnlineTracTracBasedTest {
|
||||
final static MillisecondsTimePoint TIME_14_30_00 = new MillisecondsTimePoint(1555849800000l);
|
||||
final static MillisecondsTimePoint TIME_14_30_12 = new MillisecondsTimePoint(1555849812000l);
|
||||
|
||||
public SteadyRankingForBiasedFinishLineTest() throws MalformedURLException, URISyntaxException {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected String getExpectedEventName() {
|
||||
return "Sailing World Cup Genoa 2019";
|
||||
}
|
||||
|
||||
@Override
|
||||
protected URL getParamUrl(String regattaName, String raceId) throws MalformedURLException {
|
||||
// TODO adjust once TracTrac has migrated this to the regular back-end
|
||||
return new URL("http://aws.tractrac.com/events/"+regattaName+"/clientparams.php?event="+regattaName+"&race="+raceId);
|
||||
}
|
||||
|
||||
@Before
|
||||
public void setUp() throws MalformedURLException, IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
super.setUp();
|
||||
super.setUp("event_20190412_SailingWor",
|
||||
/* raceId */ "0fb18f50-45d7-0137-24dd-021d89ada30e",
|
||||
/* liveUri */ null, /* storedUri */ null,
|
||||
new ReceiverType[] { ReceiverType.MARKPASSINGS, ReceiverType.RACECOURSE, ReceiverType.RAWPOSITIONS, ReceiverType.MARKPOSITIONS, ReceiverType.RACECOURSE,
|
||||
ReceiverType.RACESTARTFINISH });
|
||||
getTrackedRace().recordWind(new WindImpl(/* position */ new DegreePosition(44.37670797575265, 8.925960855558515), TIME_14_30_00,
|
||||
new KnotSpeedWithBearingImpl(7.5, new DegreeBearingImpl(246).reverse())), new WindSourceImpl(WindSourceType.WEB));
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testVadnaiLead() {
|
||||
Competitor vadnai = getCompetitorByName("Benjamin Vadnai");
|
||||
Competitor lewis = getCompetitorByName("Andrew Lewis");
|
||||
Competitor lynch = getCompetitorByName("Finn Lynch");
|
||||
Competitor blanco = getCompetitorByName("Joaquín Blanco");
|
||||
assertEquals(1, getTrackedRace().getRank(vadnai, TIME_14_30_00));
|
||||
assertEquals(2, getTrackedRace().getRank(lewis, TIME_14_30_00));
|
||||
assertEquals(3, getTrackedRace().getRank(lynch, TIME_14_30_00));
|
||||
assertEquals(4, getTrackedRace().getRank(blanco, TIME_14_30_00));
|
||||
assertEquals(1, getTrackedRace().getRank(vadnai, TIME_14_30_12));
|
||||
assertEquals(2, getTrackedRace().getRank(lewis, TIME_14_30_12));
|
||||
assertEquals(3, getTrackedRace().getRank(lynch, TIME_14_30_12));
|
||||
assertEquals(4, getTrackedRace().getRank(blanco, TIME_14_30_12));
|
||||
}
|
||||
|
||||
}
|
||||
Reference in new issue
Block a user