Merge branch 'master' of github.com:firebase/firebase-android-sdk into floc-master

Author: diwu-arete

firebase-abt/firebase-abt.gradle

@@ -14,26 +14,50 @@
 
 plugins {
     id 'firebase-library'
+    id 'com.google.protobuf'
 }
 
 firebaseLibrary {
     testLab.enabled = false
     publishSources = true
 }
 
+// TODO(issue/568): Remove this once legacy logic is removed from Remote Config.
+protobuf {
+    protoc {
+        artifact = 'com.google.protobuf:protoc:3.4.0'
+    }
+    plugins {
+        javalite {
+            artifact = 'com.google.protobuf:protoc-gen-javalite:3.0.0'
+        }
+    }
+    generateProtoTasks {
+        all().each { task ->
+            task.builtins {
+                remove java
+            }
+            task.plugins {
+                javalite {}
+            }
+        }
+    }
+}
+
 android {
 
     lintOptions {
         abortOnError false
     }
     sourceSets {
         main {
-            java {
-            }
-        }
-        test {
-            java {
+            proto {
+                srcDir 'src/proto'
             }
+
+	    resources {
+	        srcDir 'src/proto/com/google/protos'
+	    }
         }
     }
 
@@ -61,6 +85,7 @@ dependencies {
     implementation ('com.google.firebase:firebase-measurement-connector:18.0.0') {
         exclude group: "com.google.firebase", module: "firebase-common"
     }
+    implementation 'com.google.protobuf:protobuf-lite:3.0.1'
     testImplementation 'org.mockito:mockito-core:2.25.0'
     testImplementation 'com.google.truth:truth:0.44'
     testImplementation 'junit:junit:4.13-beta-2'

firebase-config/src/proto/com/google/protos/developers/mobile/abt/proto/experiment_payload.proto renamed to firebase-abt/src/proto/com/google/protos/developers/mobile/abt/proto/experiment_payload.proto

@@ -50,11 +50,6 @@ protobuf {
     }
 }
 
-firebaseLibrary {
-    testLab.enabled = true
-    publishSources = true
-}
-
 android {
     compileSdkVersion project.targetSdkVersion
     defaultConfig {

firebase-config/firebase-config.gradle

@@ -41,7 +41,33 @@ the source root.
 Make sure you have created a Firestore instance for your project, before
 you proceed.
 
-### Run on Local Emulator
+By default, integration tests run against the Firestore emulator.
+
+### Setting up the Firestore Emulator
+
+The integration tests require that the Firestore emulator is running on port
+8080, which is default when running it via CLI.
+
+  * [Install the Firebase CLI](https://firebase.google.com/docs/cli/).
+    ```
+    npm install -g firebase-tools
+    ```
+  * [Install the Firestore
+    emulator](https://firebase.google.com/docs/firestore/security/test-rules-emulator#install_the_emulator).
+    ```
+    firebase setup:emulators:firestore
+    ```
+  * Run the emulator
+    ```
+    firebase serve --only firestore
+    ```
+  * Select the `Firestore Integration Tests (Firestore Emulator)` run
+    configuration to run all integration tests.
+
+To run the integration tests against prod, select `FirestoreProdIntegrationTest`
+run configuration.
+
+### Run on Local Android Emulator
 
 Then simply run:
 ```bash

firebase-firestore/README.md

@@ -14,6 +14,7 @@
 
 package com.google.firebase.firestore;
 
+import static com.google.firebase.firestore.testutil.IntegrationTestUtil.isRunningAgainstEmulator;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.querySnapshotToIds;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.querySnapshotToValues;
 import static com.google.firebase.firestore.testutil.IntegrationTestUtil.testCollection;
@@ -38,7 +39,7 @@
 import java.util.Map;
 import java.util.concurrent.Semaphore;
 import org.junit.After;
-import org.junit.Ignore;
+import org.junit.Assume;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -428,33 +429,33 @@ public void testQueriesCanUseArrayContainsFilters() {
     // much of anything else interesting to test.
   }
 
-  // TODO(in-queries): Re-enable once emulator support is added to travis.
+  // TODO(in-queries): Re-enable in prod once feature lands in backend.
   @Test
-  @Ignore
   public void testQueriesCanUseInFilters() {
-    Map<String, Object> docA = map("zip", 98101);
-    Map<String, Object> docB = map("zip", 91102);
-    Map<String, Object> docC = map("zip", 98103);
-    Map<String, Object> docD = map("zip", asList(98101));
-    Map<String, Object> docE = map("zip", asList("98101", map("zip", 98101)));
-    Map<String, Object> docF = map("zip", map("code", 500));
+    Assume.assumeTrue(isRunningAgainstEmulator());
+    Map<String, Object> docA = map("zip", 98101L);
+    Map<String, Object> docB = map("zip", 91102L);
+    Map<String, Object> docC = map("zip", 98103L);
+    Map<String, Object> docD = map("zip", asList(98101L));
+    Map<String, Object> docE = map("zip", asList("98101", map("zip", 98101L)));
+    Map<String, Object> docF = map("zip", map("code", 500L));
     CollectionReference collection =
         testCollectionWithDocs(
             map("a", docA, "b", docB, "c", docC, "d", docD, "e", docE, "f", docF));
 
     // Search for zips matching [98101, 98103].
-    QuerySnapshot snapshot = waitFor(collection.whereIn("zip", asList(98101, 98103)).get());
+    QuerySnapshot snapshot = waitFor(collection.whereIn("zip", asList(98101L, 98103L)).get());
     assertEquals(asList(docA, docC), querySnapshotToValues(snapshot));
 
     // With objects.
-    snapshot = waitFor(collection.whereIn("zip", asList(map("code", 500))).get());
+    snapshot = waitFor(collection.whereIn("zip", asList(map("code", 500L))).get());
     assertEquals(asList(docF), querySnapshotToValues(snapshot));
   }
 
-  // TODO(in-queries): Re-enable once emulator support is added to travis.
+  // TODO(in-queries): Re-enable in prod once feature lands in backend.
   @Test
-  @Ignore
   public void testQueriesCanUseArrayContainsAnyFilters() {
+    Assume.assumeTrue(isRunningAgainstEmulator());
     Map<String, Object> docA = map("array", asList(42L));
     Map<String, Object> docB = map("array", asList("a", 42L, "c"));
     Map<String, Object> docC = map("array", asList(41.999, "42", map("a", asList(42))));

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/QueryTest.java

@@ -701,11 +701,6 @@ public void queriesFilteredByDocumentIDMustUseStringsOrDocumentReferences() {
             + "a valid String or DocumentReference, but it was of type: java.lang.Integer";
     expectError(() -> collection.whereGreaterThanOrEqualTo(FieldPath.documentId(), 1), reason);
 
-    reason =
-        "Invalid query. When querying with FieldPath.documentId() you must provide "
-            + "a valid String or DocumentReference, but it was of type: java.util.Arrays$ArrayList";
-    expectError(() -> collection.whereIn(FieldPath.documentId(), asList(1, 2)), reason);
-
     reason =
         "Invalid query. When querying a collection group by FieldPath.documentId(), the value "
             + "provided must result in a valid document path, but 'foo' is not because it has "
@@ -726,6 +721,38 @@ public void queriesFilteredByDocumentIDMustUseStringsOrDocumentReferences() {
         () -> collection.whereArrayContainsAny(FieldPath.documentId(), asList(1, 2)), reason);
   }
 
+  @Test
+  public void queriesUsingInAndDocumentIdMustHaveProperDocumentReferencesInArray() {
+    CollectionReference collection = testCollection();
+    collection.whereIn(FieldPath.documentId(), asList(collection.getPath()));
+
+    String reason =
+        "Invalid query. When querying with FieldPath.documentId() you must provide "
+            + "a valid document ID, but it was an empty string.";
+    expectError(() -> collection.whereIn(FieldPath.documentId(), asList("")), reason);
+
+    reason =
+        "Invalid query. When querying a collection by FieldPath.documentId() you must provide "
+            + "a plain document ID, but 'foo/bar/baz' contains a '/' character.";
+    expectError(() -> collection.whereIn(FieldPath.documentId(), asList("foo/bar/baz")), reason);
+
+    reason =
+        "Invalid query. When querying with FieldPath.documentId() you must provide "
+            + "a valid String or DocumentReference, but it was of type: java.lang.Integer";
+    expectError(() -> collection.whereIn(FieldPath.documentId(), asList(1, 2)), reason);
+
+    reason =
+        "Invalid query. When querying a collection group by FieldPath.documentId(), the value "
+            + "provided must result in a valid document path, but 'foo' is not because it has "
+            + "an odd number of segments (1).";
+    expectError(
+        () ->
+            testFirestore()
+                .collectionGroup("collection")
+                .whereIn(FieldPath.documentId(), asList("foo")),
+        reason);
+  }
+
   // Helpers
 
   /** Performs a write using each write API and makes sure it fails with the expected reason. */

firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ValidationTest.java

@@ -422,4 +422,8 @@ public static Map<String, Object> toDataMap(QuerySnapshot qrySnap) {
     }
     return result;
   }
+
+  public static boolean isRunningAgainstEmulator() {
+    return CONNECT_TO_EMULATOR;
+  }
 }