From 75fe5305f5fd10aa55e8a930709207ca8121fc63 Mon Sep 17 00:00:00 2001
From: Sebastian Schmidt <mrschmidt@google.com>
Date: Fri, 2 Nov 2018 15:59:04 -0700
Subject: [PATCH] Validate that at least one argument is provided for Cursor

---
 .../com/google/cloud/firestore/Query.java     |   3 +++
 .../cloud/firestore/ConformanceTest.java      |  24 +++++++++++++-----
 .../src/test/resources/test-suite.binproto    | Bin 37901 -> 55916 bytes
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java
index aaa67f730cc7..1f72da177ce4 100644
--- a/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java
+++ b/google-cloud-clients/google-cloud-firestore/src/main/java/com/google/cloud/firestore/Query.java
@@ -336,6 +336,9 @@ private Cursor createCursor(
   private Cursor createCursor(List<FieldOrder> order, Object[] fieldValues, boolean before) {
     Cursor.Builder result = Cursor.newBuilder();
 
+    Preconditions.checkState(
+        fieldValues.length != 0, "At least one cursor value must be specified.");
+
     Preconditions.checkState(
         fieldValues.length <= order.size(),
         "Too many cursor values specified. The specified values must match the "
diff --git a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
index 2d3b118a5bdb..8342b4b611f0 100644
--- a/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
+++ b/google-cloud-clients/google-cloud-firestore/src/test/java/com/google/cloud/firestore/ConformanceTest.java
@@ -106,6 +106,9 @@ private interface ConformanceTestCase extends Test, Describable {}
   /** If non-empty, only runs tests included in this set. */
   private final Set<String> includedTests = Collections.emptySet();
 
+  /** If true, prints debug information to System.out. */
+  private final boolean DEBUG_MODE = !includedTests.isEmpty();
+
   @Captor private ArgumentCaptor<CommitRequest> commitCapture;
 
   @Captor private ArgumentCaptor<BatchGetDocumentsRequest> getAllCapture;
@@ -331,11 +334,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. */
@@ -378,8 +389,9 @@ public void run(TestResult testResult) {
             new Protectable() {
               @Override
               public void protect() throws Throwable {
-                // Uncomment to print the test protobuf:
-                // System.out.println(testDefinition);
+                if (DEBUG_MODE) {
+                  System.out.println(testDefinition);
+                }
 
                 switch (testDefinition.getTestCase()) {
                   case GET:
diff --git a/google-cloud-clients/google-cloud-firestore/src/test/resources/test-suite.binproto b/google-cloud-clients/google-cloud-firestore/src/test/resources/test-suite.binproto
index c3a4962d0cf41125163a5b1ebd0ae28198d7b229..6e3ce397375224cab4ee93e9ae05495a182bc983 100644
GIT binary patch
delta 8222
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
O=c_?}a^&Ps;Qs+!z7SUc

delta 317
zcmV-D0mA<5v;&Q(0<by)lTrdGlTUIOvw8wq1G8`kGy$_H3qS!1-vSCJV{&C-bY+w8
zDIv2j4>th>kpT)blV2DjlRp-2lUo?2ldTqkk{Oe;;Ti`9vwk8i0ka_{IRUfiDO&-P
z+c1%n5i_EbY%zY5vonyhi#6y0lVA-72nPxQViE!n0+WF^`wnLk0uTcV2MPgZ5&{qe
zvx+!08w9oj3L%r;QW&#fR~-Sf3tLD5v;SUd0h2Lil#_F4rIW>Gfs+_%le7717Y?(c
zd_4iPb%0C(vvq`S0h7Orn3EEYsRV-o3NVwujvtepG7*!Dj8c=kj+e8jkRJuJl9qG_
zvjm{`4g`h)3MZ2qt{RgQu;H@`vJV&n+Xs^y$|3@{2a|EOMU$Y-3A2sLAOVwczdMtV
P%L%iu%mo6os?Wj-iwAVA