eclipse-sailing-analytics/sailing-analytics
1
0
Fork 0
mirror of https://github.com/eclipse-sailing-analytics/sailing-analytics.git synced 2026-09-24 14:38:45 +00:00
Code Activity

changed interface of GPSFixImporter, so that the importer generates the device identifier

Browse Source
This commit is contained in:
Fredrik Teschke
2014-06-02 22:05:31 +02:00
parent 3b4f71114b
commit 696484f194
8 changed files with 41 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files
java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/RouteConverterGpx11ExtensionsTest.java
+3 -7
View File
@@ -7,7 +7,6 @@ import static org.mockito.Mockito.spy;
import java.io.InputStream;
import java.util.List;
import java.util.Map;
import org.junit.Test;
import org.mockito.invocation.InvocationOnMock;
@@ -17,6 +16,7 @@ import org.w3c.dom.Element;
import slash.navigation.base.BaseNavigationPosition;
import slash.navigation.gpx.binding11.WptType;
import com.sap.sailing.domain.racelog.tracking.DeviceIdentifier;
import com.sap.sailing.domain.tracking.GPSFix;
import com.sap.sailing.server.trackfiles.impl.BaseRouteConverterGPSFixImporterImpl;
import com.sap.sailing.server.trackfiles.impl.RouteConverterGPSFixImporterImpl;
@@ -49,13 +49,9 @@ public class RouteConverterGpx11ExtensionsTest {
importer.importFixes(in, new com.sap.sailing.domain.trackimport.GPSFixImporter.Callback() {
@Override
public void startTrack(String name, Map<String, String> properties) {
public void addFix(GPSFix fix, DeviceIdentifier device) {
}
@Override
public void addFix(GPSFix fix) {
}
}, false);
}, false, "source");
assertTrue(extensionsFound);
}
java/com.sap.sailing.server.trackfiles.test/src/com/sap/sailing/server/trackfiles/test/TrackFileImportTest.java
+5 -13
View File
@@ -4,11 +4,11 @@ import static org.junit.Assert.assertTrue;
import java.io.IOException;
import java.io.InputStream;
import java.util.Map;
import org.junit.Before;
import org.junit.Test;
import com.sap.sailing.domain.racelog.tracking.DeviceIdentifier;
import com.sap.sailing.domain.trackimport.FormatNotSupportedException;
import com.sap.sailing.domain.trackimport.GPSFixImporter.Callback;
import com.sap.sailing.domain.tracking.GPSFix;
@@ -28,16 +28,12 @@ public class TrackFileImportTest {
InputStream in = getClass().getResourceAsStream("/Cardiff Race17 - COMPETITORS.gpx");
new RouteConverterGPSFixImporterImpl().importFixes(in, new Callback() {
@Override
public void addFix(GPSFix fix) {
public void addFix(GPSFix fix, DeviceIdentifier device) {
if (fix instanceof GPSFixMoving) {
callbackCalled = true;
}
}
@Override
public void startTrack(String name, Map<String, String> properties) {
}
}, false);
}, false, "source");
assertTrue(callbackCalled);
}
@@ -46,16 +42,12 @@ public class TrackFileImportTest {
InputStream in = getClass().getResourceAsStream("/sam002903 - COMPETITORS.kml");
new RouteConverterGPSFixImporterImpl().importFixes(in, new Callback() {
@Override
public void startTrack(String name, Map<String, String> properties) {
}
@Override
public void addFix(GPSFix fix) {
public void addFix(GPSFix fix, DeviceIdentifier device) {
if (fix instanceof GPSFix) {
callbackCalled = true;
}
}
}, false);
}, false, "source");
assertTrue(callbackCalled);
}
}