---

schmidt-sebastian · schmidt-sebastian · commit 13408c60668f · 2018-09-19T20:59:43.000-07:00
yaml --- r: 10181 b: refs/heads/mrschmidt-arrayuniontests c: 98e5ed4 h: refs/heads/master i: 10179: aab2bf9
diff --git a/[refs] b/[refs]
@@ -127,4 +127,4 @@ refs/heads/autosynth-videointelligence: 955e9dcf213b4ac806177f552cf3590d0d14f657
 refs/heads/dupes: 3478c5d81fd242d0e985656645a679420a2060c2
 refs/heads/elharo-patch-4: 83538c7aa8a40cba7dd996ade653072cc67b3b65
 refs/heads/grpc: da780702593d72aa71d0223b3fa11add95062a0b
-refs/heads/mrschmidt-arrayuniontests: e8cff3f90645c38723d08a8fecfacb8635fe64ea
+refs/heads/mrschmidt-arrayuniontests: 98e5ed4411344fa5e3735e59b1d6a4da7333f241
diff --git a/branches/mrschmidt-arrayuniontests/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java b/branches/mrschmidt-arrayuniontests/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
@@ -331,11 +331,19 @@ public int compare(QueryDocumentSnapshot o1, QueryDocumentSnapshot o2) {
   }
 
   /** Helper function to convert test values in a list to Firestore API types. */
-  private List<Object> convertArray(List<Object> list) {
-    for (int i = 0; i < list.size(); ++i) {
-      list.set(i, convertValue(list.get(i)));
+  private Object convertArray(List<Object> list) {
+    if (!list.isEmpty() && list.get(0).equals("ArrayUnion")) {
+      return FieldValue.arrayUnion(
+          ((List<Object>) convertArray(list.subList(1, list.size()))).toArray());
+    } else if (!list.isEmpty() && list.get(0).equals("ArrayRemove")) {
+      return FieldValue.arrayRemove(
+          ((List<Object>) convertArray(list.subList(1, list.size()))).toArray());
+    } else {
+      for (int i = 0; i < list.size(); ++i) {
+        list.set(i, convertValue(list.get(i)));
+      }
+      return list;
     }
-    return list;
   }
 
   /** Reads the test definition from the Proto file. */
diff --git a/branches/mrschmidt-arrayuniontests/google-cloud-clients/google-cloud-firestore/src/test/resources/test-suite.binproto b/branches/mrschmidt-arrayuniontests/google-cloud-clients/google-cloud-firestore/src/test/resources/test-suite.binproto
