Merge pull request #288 from enviroCar/fix/upload-on-no-obfuscation

fix upload of original track after no obfuscated meaasurements
enviroCar · Jan 26, 2016 · 0fa0231 · 0fa0231
2 parents e0751cd + 3761b9d
commit 0fa0231
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 3 deletions.
diff --git a/android-obd-simulator/build.gradle b/android-obd-simulator/build.gradle
@@ -6,7 +6,7 @@ dependencies {
 
 android {
     compileSdkVersion 23
-    buildToolsVersion "23.0.1"
+    buildToolsVersion "23.0.2"
 
     sourceSets {
         main {

diff --git a/org.envirocar.app/tests/android/java/org/envirocar/app/test/ObfuscationTest.java b/org.envirocar.app/tests/android/java/org/envirocar/app/test/ObfuscationTest.java
@@ -36,6 +36,7 @@
 import org.junit.Test;
 
 import java.util.ArrayList;
+import java.util.Arrays;
 import java.util.List;
 
 public class ObfuscationTest extends InstrumentationTestCase {
@@ -73,6 +74,32 @@ public void testObfuscation() throws JSONException, TrackAlreadyFinishedExceptio
         }
     }
 
+    @Test
+    public void testObfuscationException() throws JSONException, TrackAlreadyFinishedException {
+        start = System.currentTimeMillis();
+        end = System.currentTimeMillis() + 1000*60;
+
+        first = new MeasurementImpl(51.0, 7.0);
+        first.setTime(start);
+        last = new MeasurementImpl(51.03, 7.03);
+        last.setTime(end);
+
+        Track t = new TrackImpl();
+        t.setCar(new CarImpl("id", "man", "mod", Car.FuelType.DIESEL, 1234, 123));
+
+        t.setMeasurements(Arrays.asList(new MeasurementImpl[] {first, last}));
+
+        Exception exception = null;
+        try {
+            TrackUtils.getObfuscatedTrack(t);
+        }
+        catch (NoMeasurementsException e) {
+            exception = e;
+        }
+
+        Assert.assertNotNull(exception);
+    }
+
     private Track createTrack() throws TrackAlreadyFinishedException {
         Track result = new TrackImpl();
         result.setCar(new CarImpl("id", "man", "mod", Car.FuelType.DIESEL, 1234, 123));

diff --git a/org.envirocar.core/src/main/java/org/envirocar/core/utils/TrackUtils.java b/org.envirocar.core/src/main/java/org/envirocar/core/utils/TrackUtils.java
@@ -63,8 +63,8 @@ private static List<Measurement> getNonObfuscatedMeasurements(Track track) throw
             int last = determineLastNonObfuscatedIndex(measurements, track);
 
             if (first == -1 || last == -1) {
-                LOG.warn("Could not determine first/last non-obfuscated measurements. Returning originals");
-                return measurements;
+                LOG.warn("Could not determine first/last non-obfuscated measurements.");
+                throw new NoMeasurementsException("No obfuscated measurements available.");
             }
 
             for (int i = first; i <= last; i++) {