Small style stuff

[zxing.git] / core / test / src / com / google / zxing / client / result / GeoParsedResultTestCase.java

diff --git a/core/test/src/com/google/zxing/client/result/GeoParsedResultTestCase.java b/core/test/src/com/google/zxing/client/result/GeoParsedResultTestCase.java
index f10820e..de911d6 100644 (file)
--- a/core/test/src/com/google/zxing/client/result/GeoParsedResultTestCase.java
+++ b/core/test/src/com/google/zxing/client/result/GeoParsedResultTestCase.java
@@ -18,28 +18,39 @@ package com.google.zxing.client.result;
 
 import com.google.zxing.BarcodeFormat;
 import com.google.zxing.Result;
-import junit.framework.TestCase;
+import org.junit.Assert;
+import org.junit.Test;
 
 /**
  * Tests {@link com.google.zxing.client.result.GeoParsedResult}.
  *
  * @author Sean Owen
  */
-public final class GeoParsedResultTestCase extends TestCase {
+public final class GeoParsedResultTestCase extends Assert {
 
+  private static final double EPSILON = 0.0000000001;
+
+  @Test
   public void testGeo() {
-    doTest("geo:1,2", 1.0, 2.0, 0.0);
-    doTest("geo:100.33,-32.3344,3.35", 100.33, -32.3344, 3.35);
+    doTest("geo:1,2", 1.0, 2.0, 0.0, null);
+    doTest("geo:80.33,-32.3344,3.35", 80.33, -32.3344, 3.35, null);
+    doTest("geo:-20.33,132.3344,0.01", -20.33, 132.3344, 0.01, null);
+    doTest("geo:-20.33,132.3344,0.01?q=foobar", -20.33, 132.3344, 0.01, "q=foobar");
   }
 
-  private static void doTest(String contents, double latitude, double longitude, double altitude) {
+  private static void doTest(String contents,
+                             double latitude,
+                             double longitude,
+                             double altitude,
+                             String query) {
     Result fakeResult = new Result(contents, null, null, BarcodeFormat.QR_CODE);
     ParsedResult result = ResultParser.parseResult(fakeResult);
     assertSame(ParsedResultType.GEO, result.getType());
     GeoParsedResult geoResult = (GeoParsedResult) result;
-    assertEquals(latitude, geoResult.getLatitude());
-    assertEquals(longitude, geoResult.getLongitude());
-    assertEquals(altitude, geoResult.getAltitude());
+    assertEquals(latitude, geoResult.getLatitude(), EPSILON);
+    assertEquals(longitude, geoResult.getLongitude(), EPSILON);
+    assertEquals(altitude, geoResult.getAltitude(), EPSILON);
+    assertEquals(query, geoResult.getQuery());
   }
 
 }
\ No newline at end of file