Skip to content

Commit c717de7

Browse files
yifanyangyifanyang
authored
Merge branch 'master' into yifany/coverage
2 parents 44615cc + 7d98d5f commit c717de7

File tree

25 files changed

+122
-94
lines changed

25 files changed

+122
-94
lines changed

‎appcheck/firebase-appcheck-debug-testing/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.1
2-
latestReleasedVersion=16.1.0
1+
version=16.1.2
2+
latestReleasedVersion=16.1.1

‎appcheck/firebase-appcheck-debug/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.1
2-
latestReleasedVersion=16.1.0
1+
version=16.1.2
2+
latestReleasedVersion=16.1.1

‎appcheck/firebase-appcheck-interop/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.1
2-
latestReleasedVersion=16.1.0
1+
version=16.1.2
2+
latestReleasedVersion=16.1.1

‎appcheck/firebase-appcheck-playintegrity/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.1
2-
latestReleasedVersion=16.1.0
1+
version=16.1.2
2+
latestReleasedVersion=16.1.1

‎appcheck/firebase-appcheck-safetynet/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.1
2-
latestReleasedVersion=16.1.0
1+
version=16.1.2
2+
latestReleasedVersion=16.1.1

‎appcheck/firebase-appcheck/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=16.1.1
2-
latestReleasedVersion=16.1.0
1+
version=16.1.2
2+
latestReleasedVersion=16.1.1

‎firebase-abt/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=21.1.1
2-
latestReleasedVersion=21.1.0
1+
version=21.1.2
2+
latestReleasedVersion=21.1.1

‎firebase-annotations/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
version=16.1.1
16-
latestReleasedVersion=16.1.0
15+
version=16.2.1
16+
latestReleasedVersion=16.2.0

‎firebase-common/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=20.2.1
2-
latestReleasedVersion=20.2.0
1+
version=20.3.1
2+
latestReleasedVersion=20.3.0
33
android.enableUnitTestBinaryResources=true

‎firebase-components/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@
1212
# See the License for the specific language governing permissions and
1313
# limitations under the License.
1414

15-
version=17.0.2
16-
latestReleasedVersion=17.0.1
15+
version=17.1.1
16+
latestReleasedVersion=17.1.0

‎firebase-config/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
# limitations under the License.
1515
#
1616

17-
version=21.2.1
18-
latestReleasedVersion=21.2.0
17+
version=21.2.2
18+
latestReleasedVersion=21.2.1
1919
android.enableUnitTestBinaryResources=true
2020

‎firebase-crashlytics-ndk/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=18.3.3
2-
latestReleasedVersion=18.3.2
1+
version=18.3.5
2+
latestReleasedVersion=18.3.4

‎firebase-crashlytics/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=18.3.3
2-
latestReleasedVersion=18.3.2
1+
version=18.3.5
2+
latestReleasedVersion=18.3.4

‎firebase-firestore/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=24.4.2
2-
latestReleasedVersion=24.4.1
1+
version=24.4.4
2+
latestReleasedVersion=24.4.3

‎firebase-firestore/src/proto/google/firestore/v1/query.proto

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,10 +316,47 @@ message StructuredAggregationQuery {
316316
google.protobuf.Int64Value up_to = 1;
317317
}
318318

319+
// Sum of the values of the requested field.
320+
//
321+
// * Only numeric values will be aggregated. All non-numeric values
322+
// including `NULL` are skipped.
323+
//
324+
// * If the aggregated values contain `NaN`, returns `NaN`.
325+
//
326+
// * If the aggregated value set is empty, returns 0.
327+
//
328+
// * Returns a 64-bit integer if the sum result is an integer value and does
329+
// not overflow or underflow. Otherwise, the result is returned as a double.
330+
message Sum {
331+
// The field to aggregate on.
332+
StructuredQuery.FieldReference field = 1;
333+
}
334+
335+
// Average of the values of the requested field.
336+
//
337+
// * Only numeric values will be aggregated. All non-numeric values
338+
// including `NULL` are skipped.
339+
//
340+
// * If the aggregated values contain `NaN`, returns `NaN`.
341+
//
342+
// * If the aggregated value set is empty, returns `NULL`.
343+
//
344+
// * Always returns the result as a double.
345+
message Avg {
346+
// The field to aggregate on.
347+
StructuredQuery.FieldReference field = 1;
348+
}
349+
319350
// The type of aggregation to perform, required.
320351
oneof operator {
321352
// Count aggregator.
322353
Count count = 1;
354+
355+
// Sum aggregator.
356+
Sum sum = 2;
357+
358+
// Average aggregator.
359+
Avg avg = 3;
323360
}
324361

325362
// Required. The name of the field to store the result of the aggregation into.

‎firebase-functions/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=20.2.2
2-
latestReleasedVersion=20.2.1
1+
version=20.2.3
2+
latestReleasedVersion=20.2.2
33
android.enableUnitTestBinaryResources=true

‎firebase-inappmessaging-display/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=20.2.1
2-
latestReleasedVersion=20.2.0
1+
version=20.3.1
2+
latestReleasedVersion=20.3.0

‎firebase-inappmessaging/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=20.3.0
2-
latestReleasedVersion=20.2.0
1+
version=20.3.1
2+
latestReleasedVersion=20.3.0

‎firebase-installations/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
version=17.1.1
2-
latestReleasedVersion=17.1.0
1+
version=17.1.2
2+
latestReleasedVersion=17.1.1

‎firebase-messaging-directboot/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=23.1.1
2-
latestReleasedVersion=23.1.0
1+
version=23.1.2
2+
latestReleasedVersion=23.1.1
33
android.enableUnitTestBinaryResources=true

‎firebase-messaging/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
version=23.1.1
2-
latestReleasedVersion=23.1.0
1+
version=23.1.2
2+
latestReleasedVersion=23.1.1
33
android.enableUnitTestBinaryResources=true

‎firebase-ml-modeldownloader/gradle.properties

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
version=24.1.2
1+
version=24.1.3
2+
latestReleasedVersion=24.1.2

‎firebase-perf/gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#
1616
#
1717

18-
version=20.3.1
19-
latestReleasedVersion=20.3.0
18+
version=20.3.2
19+
latestReleasedVersion=20.3.1
2020
android.enableUnitTestBinaryResources=true
2121

‎firebase-storage/src/test/java/com/google/firebase/storage/UploadTest.java

Lines changed: 40 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.google.android.gms.tasks.OnCompleteListener;
2727
import com.google.android.gms.tasks.OnFailureListener;
2828
import com.google.android.gms.tasks.OnSuccessListener;
29+
import com.google.android.gms.tasks.RuntimeExecutionException;
2930
import com.google.android.gms.tasks.Task;
3031
import com.google.android.gms.tasks.Tasks;
3132
import com.google.firebase.FirebaseApp;
@@ -43,6 +44,7 @@
4344
import java.util.concurrent.Executors;
4445
import java.util.concurrent.Semaphore;
4546
import java.util.concurrent.TimeUnit;
47+
import java.util.concurrent.atomic.AtomicReference;
4648
import org.junit.After;
4749
import org.junit.Assert;
4850
import org.junit.Before;
@@ -128,56 +130,44 @@ public void fileUploadWith500() throws Exception {
128130
TestUtil.verifyTaskStateChanges("fileUploadWith500", task.getResult().toString());
129131
}
130132

131-
// TODO(b/269131915): Fix this flaky test
132-
// @Test
133-
// public void cantUploadToRoot() throws Exception {
134-
// System.out.println("Starting test cantUploadToRoot.");
135-
//
136-
// StorageReference storage =
137-
// FirebaseStorage.getInstance().getReferenceFromUrl("gs://fooey.appspot.com");
138-
//
139-
// AtomicReference<Exception> taskException = new AtomicReference<>();
140-
//
141-
// final UploadTask task = storage.putBytes(new byte[] {});
142-
//
143-
// try {
144-
// task.getResult();
145-
// Assert.fail();
146-
// } catch (IllegalStateException ignore) {
147-
// // Task is not yet done.
148-
// }
149-
//
150-
// Assert.assertNull(task.getException());
151-
//
152-
// task.addOnFailureListener(
153-
// (exception) -> {
154-
// Assert.assertEquals(
155-
// "Cannot upload to getRoot. You should upload to a storage location such as "
156-
// + ".getReference('image.png').putFile...",
157-
// exception.getCause().getMessage());
158-
// taskException.set(exception);
159-
// });
160-
//
161-
// // TODO(mrschmidt): Lower the timeout
162-
// TestUtil.await(task, 1, TimeUnit.MINUTES);
163-
//
164-
// try {
165-
// task.getResult();
166-
// Assert.fail();
167-
// } catch (RuntimeExecutionException e) {
168-
// // Note: This test can be flaky due to the fact that the second .getCause() may be null.
169-
// Assert.assertEquals(taskException.get().getCause(), e.getCause().getCause());
170-
// }
171-
//
172-
// try {
173-
// task.getResult(StorageException.class);
174-
// Assert.fail();
175-
// } catch (StorageException e) {
176-
// Assert.assertEquals(taskException.get().getCause(), e.getCause());
177-
// }
178-
//
179-
// Assert.assertEquals(taskException.get().getCause(), task.getException().getCause());
180-
// }
133+
@Test
134+
public void cantUploadToRoot() throws Exception {
135+
System.out.println("Starting test cantUploadToRoot.");
136+
137+
StorageReference storage =
138+
FirebaseStorage.getInstance().getReferenceFromUrl("gs://fooey.appspot.com");
139+
140+
AtomicReference<Exception> taskException = new AtomicReference<>();
141+
142+
final UploadTask task = storage.putBytes(new byte[] {});
143+
144+
task.addOnFailureListener(taskException::set);
145+
146+
// TODO(mrschmidt): Lower the timeout
147+
TestUtil.await(task, 1, TimeUnit.MINUTES);
148+
149+
try {
150+
task.getResult();
151+
Assert.fail();
152+
} catch (RuntimeExecutionException e) {
153+
Assert.assertEquals(taskException.get().getCause(), e.getCause().getCause());
154+
}
155+
156+
try {
157+
task.getResult(StorageException.class);
158+
Assert.fail();
159+
} catch (StorageException e) {
160+
Assert.assertEquals(taskException.get().getCause(), e.getCause());
161+
}
162+
163+
Assert.assertEquals(taskException.get().getCause(), task.getException().getCause());
164+
Assert.assertTrue(
165+
taskException
166+
.get()
167+
.getCause()
168+
.getMessage()
169+
.contains("Cannot upload to getRoot. You should upload to a storage location"));
170+
}
181171

182172
@Test
183173
public void addAndRemoveListeners() throws Exception {

‎firebase-storage/src/testUtil/java/com/google/firebase/storage/ControllableSchedulerHelper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public synchronized void resume() {
6060
}
6161

6262
/** Verify that all callbacks run on the same thread. */
63-
public void verifyCallbackThread() {
63+
public synchronized void verifyCallbackThread() {
6464
if (callbackThread == null) {
6565
callbackThread = Thread.currentThread().getId();
6666
}

0 commit comments

Comments
 (0)