Merge

Author: schmidt-sebastian

firebase-abt/firebase-abt.gradle

@@ -14,50 +14,26 @@
 
 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 {
-            proto {
-                srcDir 'src/proto'
+            java {
+            }
+        }
+        test {
+            java {
             }
-
-	    resources {
-	        srcDir 'src/proto/com/google/protos'
-	    }
         }
     }
 
@@ -85,7 +61,6 @@ 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/firebase-config.gradle

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

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

@@ -0,0 +1,109 @@
+// Copyright 2018 Google LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+syntax = "proto3";
+package developers.mobile.abt;
+
+option java_outer_classname = "FirebaseAbt";
+
+// A lighter version of ExperimentPayload that describes an experiment
+// by only its experimentId. To be used when we don't need
+// to know all the details about the experiment, such as when sending a
+// list of all ongoing experiments.
+message ExperimentLite {
+    // A string of max length 22 characters.
+    // Format: _exp_<origin prefix>_<experiment_id>
+    // Required field.
+    string experiment_id = 1;
+}
+
+// ABT Payload for Firebase Namespace.
+message ExperimentPayload {
+    // A string of max length 22 characters.
+    // Format: _exp_<origin prefix>_<experiment_id>
+    // This is referred to as the tracking id and is different from the
+    // experiment id which is used internally by ABT.
+    // Required field.
+    string experiment_id = 1;
+
+    // A string which has numbers from 0-10.
+    // Required field.
+    string variant_id = 2;
+
+    // Epoch time in milliseconds when the experiment was started; > 0.
+    // Required field.
+    int64 experiment_start_time_millis = 3;
+
+    // The Scion event that causes the experiment to transition to ON state.
+    string trigger_event = 4;
+
+    // Duration in milliseconds that the experiment can stay in STANDBY state.
+    // Valid range is from 1ms to 6 months (current max defined by Scion).
+    // If the value is outside this range the setExperiment call on the client
+    // will fail.
+    // Required field
+    int64 trigger_timeout_millis = 5;
+
+    // Duration in milliseconds that the experiment can stay in ON state (an
+    // experiment becomes ON when it has been triggered, or when it has no
+    // trigger event).
+    // Corresponds to the attribution time in the ABT UI.
+    // Valid range is from 1ms to 6 months (current max defined by Scion).
+    // If the value is outside this range the setExperiment call on the client
+    // will fail.
+    // Required field
+    int64 time_to_live_millis = 6;
+
+    // The event logged when impact service sets the experiment.
+    // Max length = 32 chars
+    string set_event_to_log = 7;
+
+    // The event logged when an experiment goes to the ON state.
+    // Max length = 32 chars
+    string activate_event_to_log = 8;
+
+    // The event logged when an experiment is cleared.
+    // Max length = 32 chars
+    string clear_event_to_log = 9;
+
+    // The event logged when an experiment times out after trigger_timeout_millis
+    // milliseconds.
+    // Max length = 32 chars
+    string timeout_event_to_log = 10;
+
+    // The event logged when an experiment times out after time_to_live_millis
+    // milliseconds.
+    // Max length = 32 chars
+    string ttl_expiry_event_to_log = 11;
+
+    // Policy to use when there are more experiments than the Scion client can
+    // support on a single App for a single service.
+    // As of October 2016, we allow 3 experiments per instance per service
+    // (i.e. 3 each for Config and Notifications).
+    enum ExperimentOverflowPolicy {
+        POLICY_UNSPECIFIED = 0;
+        // Discard oldest experiments (by experiment_start_time) first.
+        DISCARD_OLDEST = 1;
+        // Ignore newest experiments first.
+        IGNORE_NEWEST = 2;
+    }
+    // The overflow policy enum for this experiment payload.
+    ExperimentOverflowPolicy overflow_policy = 12;
+
+    // A list of all other ongoing (started, and not yet stopped) experiments
+    // at the time this experiment was started.
+    // Does not include this experiment; only the others.
+    repeated ExperimentLite ongoing_experiments = 13;
+}
+

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

@@ -14,7 +14,6 @@
 
 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;
@@ -39,7 +38,7 @@
 import java.util.Map;
 import java.util.concurrent.Semaphore;
 import org.junit.After;
-import org.junit.Assume;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
@@ -429,33 +428,33 @@ public void testQueriesCanUseArrayContainsFilters() {
     // much of anything else interesting to test.
   }
 
-  // TODO(in-queries): Re-enable in prod once feature lands in backend.
+  // TODO(in-queries): Re-enable once emulator support is added to travis.
   @Test
+  @Ignore
   public void testQueriesCanUseInFilters() {
-    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));
+    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));
     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(98101L, 98103L)).get());
+    QuerySnapshot snapshot = waitFor(collection.whereIn("zip", asList(98101, 98103)).get());
     assertEquals(asList(docA, docC), querySnapshotToValues(snapshot));
 
     // With objects.
-    snapshot = waitFor(collection.whereIn("zip", asList(map("code", 500L))).get());
+    snapshot = waitFor(collection.whereIn("zip", asList(map("code", 500))).get());
     assertEquals(asList(docF), querySnapshotToValues(snapshot));
   }
 
-  // TODO(in-queries): Re-enable in prod once feature lands in backend.
+  // TODO(in-queries): Re-enable once emulator support is added to travis.
   @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/ValidationTest.java

@@ -701,6 +701,11 @@ 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 "
@@ -721,38 +726,6 @@ 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. */