mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-10-09 13:50:57 +00:00
Merge branch 'master' into tracapi
Conflicts: java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/FlorianopolisMarkPassingTest.java java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/KW470MarkPassingTest.java java/com.sap.sailing.domain.test/src/com/sap/sailing/domain/test/markpassing/OBMR2012VRMarkPassingTest.java
This commit is contained in:
Axel Uhl committed
commit
774584fc13
3 files changed
+95
-136
No files matched your search
+51
-78
@@ -18,15 +18,6 @@ public class FlorianopolisMarkPassingTest extends AbstractMarkPassingTest {
|
||||
|
||||
@Test
|
||||
public void testRace1() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("1");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace2() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("2");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace3() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("3");
|
||||
}
|
||||
@@ -36,75 +27,57 @@ public class FlorianopolisMarkPassingTest extends AbstractMarkPassingTest {
|
||||
testRace("4");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace5() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("5");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace6() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("6");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace7() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("7");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace8() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("8");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace10() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("10");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace11() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("11");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace12() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("12");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace13() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("13");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace14() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("14");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace16() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("16");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace17() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("17");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace19() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("19");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace22() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("22");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace24() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("24");
|
||||
}
|
||||
/*
|
||||
* Test ignored on master branch to quicken the hudson build.
|
||||
*
|
||||
* @Test public void testRace1() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("1"); }
|
||||
*
|
||||
* @Test public void testRace2() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("2"); }
|
||||
*
|
||||
* @Test public void testRace5() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("5"); }
|
||||
*
|
||||
* @Test public void testRace6() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("6"); }
|
||||
*
|
||||
* @Test public void testRace7() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("7"); }
|
||||
*
|
||||
* @Test public void testRace8() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("8"); }
|
||||
*
|
||||
* @Test public void testRace10() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("10"); }
|
||||
*
|
||||
* @Test public void testRace11() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("11"); }
|
||||
*
|
||||
* @Test public void testRace12() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("12"); }
|
||||
*
|
||||
* @Test public void testRace13() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("13"); }
|
||||
*
|
||||
* @Test public void testRace14() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("14"); }
|
||||
*
|
||||
* @Test public void testRace16() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("16"); }
|
||||
*
|
||||
* @Test public void testRace17() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("17"); }
|
||||
*
|
||||
* @Test public void testRace19() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("19"); }
|
||||
*
|
||||
* @Test public void testRace22() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("22"); }
|
||||
*
|
||||
* @Test public void testRace24() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("24"); }
|
||||
*/
|
||||
|
||||
/*
|
||||
* Alinghi acting wierd
|
||||
|
||||
+10
-10
@@ -20,16 +20,16 @@ public class KW470MarkPassingTest extends AbstractMarkPassingTest {
|
||||
public void testRace4() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("4");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace5() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("5");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRace6() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("6");
|
||||
}
|
||||
|
||||
/*
|
||||
* Ignored on master branch
|
||||
*
|
||||
* @Test public void testRace5() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("5"); }
|
||||
*
|
||||
* @Test public void testRace6() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("6"); }
|
||||
*/
|
||||
|
||||
@Override
|
||||
protected String getFileName() {
|
||||
|
||||
+34
-48
@@ -12,7 +12,7 @@ import com.tractrac.subscription.lib.api.SubscriberInitializationException;
|
||||
|
||||
public class OBMR2012VRMarkPassingTest extends AbstractMarkPassingTest {
|
||||
|
||||
public OBMR2012VRMarkPassingTest() throws MalformedURLException, URISyntaxException {
|
||||
public OBMR2012VRMarkPassingTest() throws MalformedURLException, URISyntaxException {
|
||||
super();
|
||||
}
|
||||
|
||||
@@ -20,57 +20,43 @@ public class OBMR2012VRMarkPassingTest extends AbstractMarkPassingTest {
|
||||
public void testRaceFr11() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("Fr_Fleet_1_1");
|
||||
}
|
||||
|
||||
|
||||
@Test
|
||||
public void testRaceFr12() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("Fr_Fleet_1_2");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRaceFr13() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("Fr_Fleet_1_3");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRaceFr21() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("Fr_Fleet_2_1");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRaceFr22() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("Fr_Fleet_2_2");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRaceFr23() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("Fr_Fleet_2_3");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRaceSaVm11() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("Sa-Vm_Fleet_1_1");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRaceSaVm12() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("Sa-Vm_Fleet_1_2");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRaceSaVm13() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("Sa-Vm_Fleet_1_3");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRaceSaVm21() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("Sa-Vm_Fleet_2_1");
|
||||
}
|
||||
|
||||
@Test
|
||||
public void testRaceSaVm22() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
testRace("Sa-Vm_Fleet_2_2");
|
||||
}
|
||||
|
||||
|
||||
/*
|
||||
* Ignored on master branch.
|
||||
*
|
||||
* @Test public void testRaceFr13() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("Fr_Fleet_1_3"); }
|
||||
*
|
||||
* @Test public void testRaceFr21() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("Fr_Fleet_2_1"); }
|
||||
*
|
||||
* @Test public void testRaceFr22() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("Fr_Fleet_2_2"); }
|
||||
*
|
||||
* @Test public void testRaceFr23() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("Fr_Fleet_2_3"); }
|
||||
*
|
||||
* @Test public void testRaceSaVm11() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("Sa-Vm_Fleet_1_1"); }
|
||||
*
|
||||
* @Test public void testRaceSaVm12() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("Sa-Vm_Fleet_1_2"); }
|
||||
*
|
||||
* @Test public void testRaceSaVm13() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("Sa-Vm_Fleet_1_3"); }
|
||||
*
|
||||
* @Test public void testRaceSaVm21() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("Sa-Vm_Fleet_2_1"); }
|
||||
*
|
||||
* @Test public void testRaceSaVm22() throws IOException, InterruptedException, URISyntaxException, ParseException, SubscriberInitializationException, CreateModelException {
|
||||
* testRace("Sa-Vm_Fleet_2_2"); }
|
||||
*/
|
||||
|
||||
@Override
|
||||
protected String getExpectedEventName() {
|
||||
return "OBMR 2012";
|
||||
|
||||
Reference in new issue
Block a user