eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-08 21:30:57 +00:00
Code Activity

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

Browse Source
This commit is contained in:
fmittag committed 2013-09-04 10:43:02 +02:00
2 parents cf1135d12f f245476d41
commit 17d0f286b2
3 files changed
+2 -10
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryTest.java
-8
View File
@@ -47,14 +47,6 @@ public class DomainFactoryTest {
assertThat(raceType.getRaceCode(), is(OlympicRaceCode._470_WOMEN));
}
@Test
public void testGet470WomenBoatClass2() throws Exception {
String raceID = "SAW005_xxx";
RaceType raceType = swissTimingDomainFactory.getRaceTypeFromRaceID(raceID );
assertThat(raceType, is(notNullValue()));
assertThat(raceType.getRaceCode(), is(OlympicRaceCode._470_WOMEN));
}
@Test
public void testDontGetWrongBoatClass() throws Exception {
String raceID = "ABC";
java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SimpleDomainFactoryTest.java
+1 -1
View File
@@ -45,7 +45,7 @@ public class SimpleDomainFactoryTest {
@Test
public void testExtractBoatClassFromRaceIDWithEventID() {
String raceID = "QINSWC12013;SAW005901";
String raceID = "QINSWC12013_SAW005901";
RaceType raceType = DomainFactory.INSTANCE.getRaceTypeFromRaceID(raceID);
assertEquals("470", raceType.getBoatClass().getName());
}
java/com.sap.sailing.domain.swisstimingadapter/src/com/sap/sailing/domain/swisstimingadapter/impl/DomainFactoryImpl.java
+1 -1
View File
@@ -206,7 +206,7 @@ public class DomainFactoryImpl implements DomainFactory {
public RaceType getRaceTypeFromRaceID(String raceID) {
final RaceType result;
if (raceID != null && raceID.length() >= 6) {
final String[] optionalEventIDAndMandatoryRaceID = raceID.split(";");
final String[] optionalEventIDAndMandatoryRaceID = raceID.split("_");
final String swissTimingRaceCode = optionalEventIDAndMandatoryRaceID[optionalEventIDAndMandatoryRaceID.length-1].substring(0, 6).toUpperCase();
RaceType raceType = raceTypeByID.get(swissTimingRaceCode);
if (raceType == null) {