From 04f1ae19df7898a579c19fb989b06cf73e3e95cf Mon Sep 17 00:00:00 2001
From: Axel Uhl <axel.uhl@sap.com>
Date: Mon, 14 Nov 2011 09:14:27 +0100
Subject: [PATCH] fixed SwissTiming tests

---
 .../persistence/SwissTimingAdapterPersistence.java       | 2 ++
 .../impl/SwissTimingAdapterPersistenceImpl.java          | 6 +++++-
 .../test/SailMasterConnectivityTest.java                 | 9 ++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/SwissTimingAdapterPersistence.java b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/SwissTimingAdapterPersistence.java
index 771d37886e3..7464e0aa920 100644
--- a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/SwissTimingAdapterPersistence.java
+++ b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/SwissTimingAdapterPersistence.java
@@ -43,5 +43,7 @@ public interface SwissTimingAdapterPersistence extends RaceSpecificMessageLoader
     void storeSailMasterMessage(SailMasterMessage message);
 
     void storeRace(Race race);
+    
+    void dropAllRaceMasterData();
 
 }
diff --git a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
index 533d7fd8efd..b4b474932bb 100644
--- a/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
+++ b/java/com.sap.sailing.domain.swisstimingadapter.persistence/src/com/sap/sailing/domain/swisstimingadapter/persistence/impl/SwissTimingAdapterPersistenceImpl.java
@@ -232,6 +232,10 @@ public class SwissTimingAdapterPersistenceImpl implements SwissTimingAdapterPers
         result.put(FieldNames.RACE_STARTTIME.name(), race.getStartTime() == null ? null : new Long(race.getStartTime().asMillis()));
         racesCollection.update(query, result, /* upsrt */ true, /* multi */ false);
     }
-    
 
+    @Override
+    public void dropAllRaceMasterData() {
+        DBCollection racesCollection = database.getCollection(CollectionNames.RACES_MASTERDATA.name());
+        racesCollection.drop();
+    }
 }
diff --git a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java
index a5d879b7912..2d5e7f1875b 100755
--- a/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java
+++ b/java/com.sap.sailing.domain.swisstimingadapter.test/src/com/sap/sailing/domain/swisstimingadapter/test/SailMasterConnectivityTest.java
@@ -49,14 +49,13 @@ public class SailMasterConnectivityTest {
     public void setUp() throws InterruptedException, ParseException {
         startSailMasterDummy();
         SwissTimingAdapterPersistence swissTimingPersistence = SwissTimingAdapterPersistence.INSTANCE;
-        Race raceW4702 = new RaceImpl("W4702", "W4702");
-        Race race4711 = new RaceImpl("4711", "4711");
-        Race race4712 = new RaceImpl("4712", "4712");
-        swissTimingPersistence.storeRace(raceW4702);
+        swissTimingPersistence.dropAllRaceMasterData();
+        Race race4711 = new RaceImpl("4711", "A wonderful test race");
+        Race race4712 = new RaceImpl("4712", "Not such a wonderful race");
         swissTimingPersistence.storeRace(race4711);
         swissTimingPersistence.storeRace(race4712);
         connector = SwissTimingFactory.INSTANCE.getOrCreateSailMasterConnector("localhost", port, swissTimingPersistence);
-        connector.trackRace(raceW4702.getRaceID());
+        connector.trackRace("W4702");
         connector.trackRace(race4711.getRaceID());
         connector.trackRace(race4712.getRaceID());
     }