Merge branch 'mrschmidt/droparray' into mrschmidt/droprest

schmidt-sebastian · schmidt-sebastian · commit 3d2eadd560d7 · 2020-02-05T16:27:46.000-08:00
diff --git a/firebase-firestore/ktx/src/test/java/com/google/firebase/firestore/testutil/TestUtil.java b/firebase-firestore/ktx/src/test/java/com/google/firebase/firestore/testutil/TestUtil.java
@@ -41,7 +41,7 @@ public static FieldValue wrap(Object value) {
 
   public static ObjectValue wrapObject(Map<String, Object> value) {
     // Cast is safe here because value passed in is a map
-    return (ObjectValue) wrap(value);
+    return new ObjectValue(wrap(value).getProto());
   }
 
   public static DocumentKey key(String key) {

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ public static FieldValue wrap(Object value) {`
`41`	`41`
`42`	`42`	`public static ObjectValue wrapObject(Map<String, Object> value) {`
`43`	`43`	`// Cast is safe here because value passed in is a map`
`44`		`- return (ObjectValue) wrap(value);`
	`44`	`+ return new ObjectValue(wrap(value).getProto());`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`public static DocumentKey key(String key) {`