eclipse-sailing-analytics/sailing-analytics
1
0 Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-10-17 01:31:01 +00:00
Code Activity

Fix further errors after merge.

Browse Source
This commit is contained in:
Christopher Ronnewinkel (D036654) committed 2013-03-21 17:29:43 +01:00
1 parent bf00fafee5
commit 9e59647df1
20 files changed
+80 -211
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/PathGeneratorTracTracTest.java
+1 -1
View File
@@ -7,8 +7,8 @@ import junit.framework.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
import com.sap.sailing.domain.base.impl.MeterDistance;
import com.sap.sailing.domain.common.Distance;
import com.sap.sailing.domain.common.impl.MeterDistance;
import com.sap.sailing.simulator.Path;
import com.sap.sailing.simulator.impl.PathGeneratorTracTrac;
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/SerializationUtilsTest.java
+1 -1
View File
@@ -4,7 +4,7 @@ import junit.framework.Assert;
import org.junit.Test;
import com.sap.sailing.simulator.util.SerializationUtils;
import com.sap.sailing.simulator.impl.SerializationUtils;
public class SerializationUtilsTest {
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/analysis/TestRacingEventPersistence.java
+8 -3
View File
@@ -21,7 +21,6 @@ import com.sap.sailing.domain.tracking.GPSFixMoving;
import com.sap.sailing.domain.tracking.GPSFixTrack;
import com.sap.sailing.domain.tracking.RacesHandle;
import com.sap.sailing.domain.tracking.TrackedRace;
import com.sap.sailing.domain.tracking.impl.EmptyWindStore;
import com.sap.sailing.server.impl.RacingEventServiceImpl;
public class TestRacingEventPersistence {
@@ -53,11 +52,14 @@ public class TestRacingEventPersistence {
URI liveURI = new URI(liveURIStr);
URI storedURI = new URI(storedURIStr);
//TODO: Fix raceHandle
/*
raceHandle = service.addTracTracRace(paramURL, liveURI, storedURI, EmptyWindStore.INSTANCE, 60000, this);
synchronized (this) {
this.wait();
}
}*/
System.out.println("Done synchronizing");
@@ -68,8 +70,11 @@ public class TestRacingEventPersistence {
for (RaceDefinition r : races) {
RaceIdentifier raceIdentifier = new RegattaNameAndRaceName(regatta, r.getName());
TrackedRace tr = service.getExistingTrackedRace(raceIdentifier);
//TODO: Fix raceHandle
/*
TrackedRace tr = service.getExistingTrackedRace(raceIdentifier);
racesList.add(tr);
*/
}
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/analysis/TestTimeComparison.java
+1 -1
View File
@@ -235,7 +235,7 @@ public class TestTimeComparison {
this.turnPoints, true, false);
final ResponseTotalTimeDTO receiveData = simulatorService.getTotalTime_new(requestData);
final ResponseTotalTimeDTO receiveData = simulatorService.getTotalTime(requestData);
averageWind = simulatorService.getAverageWind();
result += ", " + receiveData.totalTimeSeconds;
}
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/RaceDataAccessTest.java
+7 -3
View File
@@ -94,13 +94,16 @@ public class RaceDataAccessTest {
service = new RacingEventServiceImpl();
logger.info("Calling service.addTracTracRace");
Object obj = new Object();
raceHandle = service.addTracTracRace(paramUrl, liveUri, storedUri, EmptyWindStore.INSTANCE, /* timeoutInMilliseconds */60000, obj);
//TODO: Fix raceHandle
/*
raceHandle = service.addTracTracRace(paramUrl, liveUri, storedUri, EmptyWindStore.INSTANCE, 60000, obj);
logger.info("Calling raceHandle.getRaces(): " + raceHandle);
synchronized (obj) {
obj.wait();
}
*/
Set<RaceDefinition> races = raceHandle.getRaces(); // wait for RaceDefinition to be completely wired in Regatta
logger.info("Obtained races: " + races.size());
@@ -112,7 +115,8 @@ public class RaceDataAccessTest {
System.out.println("Race: \"" + race.getName() + "\", \"" + regatta + "\"");
RaceIdentifier raceIdentifier = new RegattaNameAndRaceName(regatta, race.getName());
TrackedRace tr = service.getExistingTrackedRace(raceIdentifier);
//TODO: fix getTrackedRace
TrackedRace tr = null; //service.getExistingTrackedRace(raceIdentifier);
System.out.println("Competitors:");
Iterable<Competitor> competitors = tr.getRace().getCompetitors();
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/TracTracReaderFromURLs.java
+4 -2
View File
@@ -63,7 +63,8 @@ public class TracTracReaderFromURLs implements TracTracReader {
for( String paramURLStr : tracTracParamURLs ) {
URL paramURL = new URL(paramURLStr);
RacesHandle raceHandle = service.addTracTracRace(paramURL, liveURI, storedURI, EmptyWindStore.INSTANCE, 60000, this);
//TODO: fix getTrackedRace
RacesHandle raceHandle = null; //service.addTracTracRace(paramURL, liveURI, storedURI, EmptyWindStore.INSTANCE, 60000, this);
synchronized (this) {
this.wait();
}
@@ -72,7 +73,8 @@ public class TracTracReaderFromURLs implements TracTracReader {
for (RaceDefinition r : races) {
RaceIdentifier raceIdentifier = new RegattaNameAndRaceName(regatta, r.getName());
TrackedRace tr = service.getExistingTrackedRace(raceIdentifier);
//TODO: fix getTrackedRace
TrackedRace tr = null; //service.getExistingTrackedRace(raceIdentifier);
racesList.add(tr);
}
}
java/com.sap.sailing.simulator.test/src/com/sap/sailing/simulator/test/util/TracTracWriter.java
+4 -2
View File
@@ -38,7 +38,8 @@ public class TracTracWriter {
for( String paramURLStr : sources ) {
URL paramURL = new URL(paramURLStr);
RacesHandle raceHandle = service.addTracTracRace(paramURL, liveURI, storedURI, EmptyWindStore.INSTANCE, 60000, this);
//TODO: fix getTrackedRace
RacesHandle raceHandle = null; //service.addTracTracRace(paramURL, liveURI, storedURI, EmptyWindStore.INSTANCE, 60000, this);
synchronized (this) {
this.wait();
}
@@ -50,7 +51,8 @@ public class TracTracWriter {
for (RaceDefinition r : races) {
RaceIdentifier raceIdentifier = new RegattaNameAndRaceName(regatta, r.getName());
TrackedRace tr = service.getExistingTrackedRace(raceIdentifier);
//TODO: fix getTrackedRace
TrackedRace tr = null; //service.getExistingTrackedRace(raceIdentifier);
racesList.add(tr);
}
System.out.println("start writing");