Preserve query in geo URI

[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 d40e0f5..9ae2e76 100644 (file)
--- a/core/test/src/com/google/zxing/client/result/GeoParsedResultTestCase.java
+++ b/core/test/src/com/google/zxing/client/result/GeoParsedResultTestCase.java
@@ -16,9 +16,9 @@
 
 package com.google.zxing.client.result;
 
-import junit.framework.TestCase;
-import com.google.zxing.Result;
 import com.google.zxing.BarcodeFormat;
+import com.google.zxing.Result;
+import junit.framework.TestCase;
 
 /**
  * Tests {@link com.google.zxing.client.result.GeoParsedResult}.
@@ -28,14 +28,20 @@ import com.google.zxing.BarcodeFormat;
 public final class GeoParsedResultTestCase extends TestCase {
 
   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);
-    assertEquals(ParsedResultType.GEO, result.getType());
+    assertSame(ParsedResultType.GEO, result.getType());
     GeoParsedResult geoResult = (GeoParsedResult) result;
     assertEquals(latitude, geoResult.getLatitude());
     assertEquals(longitude, geoResult.getLongitude());