Converted dependency to test and updated assert

Signed-off-by: Abhijeet Shukla <abhijeetshuklaoist@gmail.com>
googleapis · Jan 25, 2021 · c544d7c · c544d7c
1 parent 1c298f2
commit c544d7c
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 7 deletions.
diff --git a/google-cloud-firestore/pom.xml b/google-cloud-firestore/pom.xml
@@ -109,10 +109,6 @@
       <groupId>com.google.code.gson</groupId>
       <artifactId>gson</artifactId>
     </dependency>
-    <dependency>
-      <groupId>com.google.code.gson</groupId>
-      <artifactId>gson</artifactId>
-    </dependency>
     <dependency>
       <groupId>com.google.protobuf</groupId>
       <artifactId>protobuf-java-util</artifactId>
@@ -136,6 +132,11 @@
       <version>1.10.19</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>com.google.code.gson</groupId>
+      <artifactId>gson</artifactId>
+      <scope>test</scope>
+    </dependency>
     <!-- Need testing utility classes for generated gRPC clients tests -->
     <dependency>
       <groupId>com.google.api</groupId>

diff --git a/google-cloud-firestore/src/test/java/com/google/cloud/firestore/MapperTest.java b/google-cloud-firestore/src/test/java/com/google/cloud/firestore/MapperTest.java
@@ -972,6 +972,15 @@ private static void assertExceptionContains(String partialMessage, Runnable run)
     }
   }
 
+  private static void assertExceptionThrows(Runnable run) {
+    try {
+      run.run();
+      fail("Expected exception not thrown");
+    } catch (RuntimeException ignored) {
+     // no-op catch
+    }
+  }
+
   private static <T> T convertToCustomClass(
       Object object, Class<T> clazz, DocumentReference docRef) {
     return CustomClassMapper.convertToCustomClass(object, clazz, docRef);
@@ -1213,9 +1222,7 @@ public void primitiveDeserializeLong() {
 
   @Test
   public void primitiveDeserializeWrongTypeMap() {
-    assertExceptionContains(
-        "Failed to convert value of type com.google.gson.internal.LinkedTreeMap to String "
-            + "(found in field 'value')",
+    assertExceptionThrows(
         new Runnable() {
           @Override
           public void run() {