diff --git a/firebase-common/ktx/src/test/kotlin/com/google/firebase/ktx/Tests.kt b/firebase-common/ktx/src/test/kotlin/com/google/firebase/ktx/Tests.kt index 1b19c4ef4f8..4a51563b420 100644 --- a/firebase-common/ktx/src/test/kotlin/com/google/firebase/ktx/Tests.kt +++ b/firebase-common/ktx/src/test/kotlin/com/google/firebase/ktx/Tests.kt @@ -53,7 +53,7 @@ class KtxTests { @Test fun `Firebase#app should delegate to FirebaseApp#getInstance()`() { withApp(FirebaseApp.DEFAULT_APP_NAME) { - assertThat(Firebase.app).isSameAs(FirebaseApp.getInstance()) + assertThat(Firebase.app).isSameInstanceAs(FirebaseApp.getInstance()) } } @@ -61,14 +61,14 @@ class KtxTests { fun `Firebase#app(String) should delegate to FirebaseApp#getInstance(String)`() { val appName = "testApp" withApp(appName) { - assertThat(Firebase.app(appName)).isSameAs(FirebaseApp.getInstance(appName)) + assertThat(Firebase.app(appName)).isSameInstanceAs(FirebaseApp.getInstance(appName)) } } @Test fun `Firebase#options should delegate to FirebaseApp#getInstance()#options`() { withApp(FirebaseApp.DEFAULT_APP_NAME) { - assertThat(Firebase.options).isSameAs(FirebaseApp.getInstance().options) + assertThat(Firebase.options).isSameInstanceAs(FirebaseApp.getInstance().options) } } @@ -79,8 +79,8 @@ class KtxTests { try { assertThat(app).isNotNull() assertThat(app.name).isEqualTo(FirebaseApp.DEFAULT_APP_NAME) - assertThat(app.options).isSameAs(options) - assertThat(app.applicationContext).isSameAs(RuntimeEnvironment.application) + assertThat(app.options).isSameInstanceAs(options) + assertThat(app.applicationContext).isSameInstanceAs(RuntimeEnvironment.application) } finally { app.delete() } @@ -94,8 +94,8 @@ class KtxTests { try { assertThat(app).isNotNull() assertThat(app.name).isEqualTo(name) - assertThat(app.options).isSameAs(options) - assertThat(app.applicationContext).isSameAs(RuntimeEnvironment.application) + assertThat(app.options).isSameInstanceAs(options) + assertThat(app.applicationContext).isSameInstanceAs(RuntimeEnvironment.application) } finally { app.delete() } diff --git a/firebase-common/src/androidTest/java/com/google/firebase/FirebaseAppTest.java b/firebase-common/src/androidTest/java/com/google/firebase/FirebaseAppTest.java index 4c9775d6745..e6fd041cb6d 100644 --- a/firebase-common/src/androidTest/java/com/google/firebase/FirebaseAppTest.java +++ b/firebase-common/src/androidTest/java/com/google/firebase/FirebaseAppTest.java @@ -349,18 +349,18 @@ public void testInitializeApp_shouldDiscoverAndInitializeComponents() { Context appContext = mockContext.getApplicationContext(); - assertThat(firebaseApp.get(Context.class)).isSameAs(appContext); - assertThat(firebaseApp.get(FirebaseApp.class)).isSameAs(firebaseApp); + assertThat(firebaseApp.get(Context.class)).isSameInstanceAs(appContext); + assertThat(firebaseApp.get(FirebaseApp.class)).isSameInstanceAs(firebaseApp); TestComponentOne one = firebaseApp.get(TestComponentOne.class); assertThat(one).isNotNull(); - assertThat(one.getContext()).isSameAs(appContext); + assertThat(one.getContext()).isSameInstanceAs(appContext); TestComponentTwo two = firebaseApp.get(TestComponentTwo.class); assertThat(two).isNotNull(); - assertThat(two.getApp()).isSameAs(firebaseApp); - assertThat(two.getOptions()).isSameAs(firebaseApp.getOptions()); - assertThat(two.getOne()).isSameAs(one); + assertThat(two.getApp()).isSameInstanceAs(firebaseApp); + assertThat(two.getOptions()).isSameInstanceAs(firebaseApp.getOptions()); + assertThat(two.getOne()).isSameInstanceAs(one); } @Test diff --git a/firebase-common/src/androidTest/java/com/google/firebase/FirebaseOptionsTest.java b/firebase-common/src/androidTest/java/com/google/firebase/FirebaseOptionsTest.java index f79dc6c922e..9140b7d5cee 100644 --- a/firebase-common/src/androidTest/java/com/google/firebase/FirebaseOptionsTest.java +++ b/firebase-common/src/androidTest/java/com/google/firebase/FirebaseOptionsTest.java @@ -79,7 +79,7 @@ public void createOptionsWithAppIdMissing() { @Test public void checkToBuilderCreatesNewEquivalentInstance() { FirebaseOptions allValuesOptionsCopy = new FirebaseOptions.Builder(ALL_VALUES_OPTIONS).build(); - assertThat(allValuesOptionsCopy).isNotSameAs(ALL_VALUES_OPTIONS); + assertThat(allValuesOptionsCopy).isNotSameInstanceAs(ALL_VALUES_OPTIONS); assertThat(allValuesOptionsCopy).isEqualTo(ALL_VALUES_OPTIONS); } } diff --git a/firebase-common/src/test/java/com/google/firebase/components/ComponentRuntimeTest.java b/firebase-common/src/test/java/com/google/firebase/components/ComponentRuntimeTest.java index ba081e8abe7..42265dbf628 100644 --- a/firebase-common/src/test/java/com/google/firebase/components/ComponentRuntimeTest.java +++ b/firebase-common/src/test/java/com/google/firebase/components/ComponentRuntimeTest.java @@ -114,7 +114,7 @@ public void container_withValidDependencyGraph_shouldProperlyInjectComponents() ComponentTwo componentTwo = runtime.get(ComponentTwo.class); assertThat(componentTwo.getOne()).isNotNull(); - assertThat(componentTwo.getOne().getTracker()).isSameAs(initTracker); + assertThat(componentTwo.getOne().getTracker()).isSameInstanceAs(initTracker); assertThat(initTracker.isInitialized()).isTrue(); } @@ -193,7 +193,7 @@ public void container_withCyclicProviderDependency_shouldProperlyInitialize() { assertThat(one.cyclicTwo).isNotNull(); Provider oneProvider = one.cyclicTwo.cyclicOne; assertThat(oneProvider).isNotNull(); - assertThat(oneProvider.get()).isSameAs(one); + assertThat(oneProvider.get()).isSameInstanceAs(one); } @Test @@ -230,8 +230,8 @@ public void container_shouldExposeAllProvidedInterfacesOfAComponent() { Provider parent = runtime.getProvider(Parent.class); assertThat(parent).isNotNull(); - assertThat(child).isSameAs(parent); - assertThat(child.get()).isSameAs(parent.get()); + assertThat(child).isSameInstanceAs(parent); + assertThat(child.get()).isSameInstanceAs(parent.get()); } @Test diff --git a/firebase-common/src/test/java/com/google/firebase/components/ComponentTest.java b/firebase-common/src/test/java/com/google/firebase/components/ComponentTest.java index 33cb06b8dc9..a9f34cd79c2 100644 --- a/firebase-common/src/test/java/com/google/firebase/components/ComponentTest.java +++ b/firebase-common/src/test/java/com/google/firebase/components/ComponentTest.java @@ -42,7 +42,7 @@ public void of_withMultipleInterfaces_shouldSetCorrectDefaults() { assertThat(component.isAlwaysEager()).isFalse(); assertThat(component.isEagerInDefaultApp()).isFalse(); assertThat(component.getDependencies()).isEmpty(); - assertThat(component.getFactory().create(null)).isSameAs(testClass); + assertThat(component.getFactory().create(null)).isSameInstanceAs(testClass); } @Test @@ -193,6 +193,6 @@ public void build_withNoFactoryProvided_shouldThrow() { public void getFactory_shouldReturnFactorySetInBuilder() { Component component = Component.builder(TestClass.class).factory(nullFactory).build(); - assertThat(component.getFactory()).isSameAs(nullFactory); + assertThat(component.getFactory()).isSameInstanceAs(nullFactory); } } diff --git a/firebase-common/src/test/java/com/google/firebase/components/LazyTest.java b/firebase-common/src/test/java/com/google/firebase/components/LazyTest.java index 6b5ef83d6da..4f93378b6f0 100644 --- a/firebase-common/src/test/java/com/google/firebase/components/LazyTest.java +++ b/firebase-common/src/test/java/com/google/firebase/components/LazyTest.java @@ -46,7 +46,7 @@ public void get_whenLazyIsInitializedWithValue_shouldReturnTheValue() { Object instance = new Object(); Lazy lazy = new Lazy<>(instance); - assertThat(lazy.get()).isSameAs(instance); + assertThat(lazy.get()).isSameInstanceAs(instance); } @Test @@ -56,7 +56,7 @@ public void get_shouldDelegateToFactory() { when(mockProvider.get()).thenReturn(instance); - assertThat(lazy.get()).isSameAs(instance); + assertThat(lazy.get()).isSameInstanceAs(instance); verify(mockProvider, times(1)).get(); } diff --git a/firebase-common/src/test/java/com/google/firebase/components/RestrictedComponentContainerTest.java b/firebase-common/src/test/java/com/google/firebase/components/RestrictedComponentContainerTest.java index 6989e440ab8..6edb19ff15f 100644 --- a/firebase-common/src/test/java/com/google/firebase/components/RestrictedComponentContainerTest.java +++ b/firebase-common/src/test/java/com/google/firebase/components/RestrictedComponentContainerTest.java @@ -57,7 +57,7 @@ public void get_withAllowedClass_shouldReturnAnInstanceOfThatClass() { Float value = 1.0f; when(delegate.get(Float.class)).thenReturn(value); - assertThat(container.get(Float.class)).isSameAs(value); + assertThat(container.get(Float.class)).isSameInstanceAs(value); verify(delegate).get(Float.class); } @@ -96,7 +96,7 @@ public void getProvider_withAllowedClass_shouldReturnAnInstanceOfThatClass() { Double value = 3.0d; when(delegate.getProvider(Double.class)).thenReturn(new Lazy<>(value)); - assertThat(container.getProvider(Double.class).get()).isSameAs(value); + assertThat(container.getProvider(Double.class).get()).isSameInstanceAs(value); verify(delegate).getProvider(Double.class); } @@ -125,7 +125,7 @@ public void setOf_withAllowedClass_shouldReturnExpectedSet() { Set set = Collections.emptySet(); when(delegate.setOf(Long.class)).thenReturn(set); - assertThat(container.setOf(Long.class)).isSameAs(set); + assertThat(container.setOf(Long.class)).isSameInstanceAs(set); verify(delegate).setOf(Long.class); } @@ -144,7 +144,7 @@ public void setOfProvider_withAllowedClass_shouldReturnExpectedSet() { Set set = Collections.emptySet(); when(delegate.setOfProvider(Boolean.class)).thenReturn(new Lazy<>(set)); - assertThat(container.setOfProvider(Boolean.class).get()).isSameAs(set); + assertThat(container.setOfProvider(Boolean.class).get()).isSameInstanceAs(set); verify(delegate).setOfProvider(Boolean.class); } diff --git a/firebase-firestore/ktx/src/test/kotlin/com/google/firebase/firestore/ktx/FirestoreTests.kt b/firebase-firestore/ktx/src/test/kotlin/com/google/firebase/firestore/ktx/FirestoreTests.kt index ffb44440c21..1f00da59c8a 100644 --- a/firebase-firestore/ktx/src/test/kotlin/com/google/firebase/firestore/ktx/FirestoreTests.kt +++ b/firebase-firestore/ktx/src/test/kotlin/com/google/firebase/firestore/ktx/FirestoreTests.kt @@ -75,13 +75,13 @@ class FirestoreTests : BaseTestCase() { @Test fun `firestore should delegate to FirebaseFirestore#getInstance()`() { - assertThat(Firebase.firestore).isSameAs(FirebaseFirestore.getInstance()) + assertThat(Firebase.firestore).isSameInstanceAs(FirebaseFirestore.getInstance()) } @Test fun `FirebaseApp#firestore should delegate to FirebaseFirestore#getInstance(FirebaseApp)`() { val app = Firebase.app(EXISTING_APP) - assertThat(Firebase.firestore(app)).isSameAs(FirebaseFirestore.getInstance(app)) + assertThat(Firebase.firestore(app)).isSameInstanceAs(FirebaseFirestore.getInstance(app)) } } diff --git a/firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/ktx/FunctionsTests.kt b/firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/ktx/FunctionsTests.kt index 57c6032763f..4370b6de87e 100644 --- a/firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/ktx/FunctionsTests.kt +++ b/firebase-functions/ktx/src/test/kotlin/com/google/firebase/functions/ktx/FunctionsTests.kt @@ -68,26 +68,26 @@ class FunctionsTests : BaseTestCase() { @Test fun `functions should delegate to FirebaseFunctions#getInstance()`() { - assertThat(Firebase.functions).isSameAs(FirebaseFunctions.getInstance()) + assertThat(Firebase.functions).isSameInstanceAs(FirebaseFunctions.getInstance()) } @Test fun `FirebaseApp#functions should delegate to FirebaseFunctions#getInstance(FirebaseApp)`() { val app = Firebase.app(EXISTING_APP) - assertThat(Firebase.functions(app)).isSameAs(FirebaseFunctions.getInstance(app)) + assertThat(Firebase.functions(app)).isSameInstanceAs(FirebaseFunctions.getInstance(app)) } @Test fun `Firebase#functions should delegate to FirebaseFunctions#getInstance(region)`() { val region = "valid_region" - assertThat(Firebase.functions(region)).isSameAs(FirebaseFunctions.getInstance(region)) + assertThat(Firebase.functions(region)).isSameInstanceAs(FirebaseFunctions.getInstance(region)) } @Test fun `Firebase#functions should delegate to FirebaseFunctions#getInstance(FirebaseApp, region)`() { val app = Firebase.app(EXISTING_APP) val region = "valid_region" - assertThat(Firebase.functions(app, region)).isSameAs(FirebaseFunctions.getInstance(app, region)) + assertThat(Firebase.functions(app, region)).isSameInstanceAs(FirebaseFunctions.getInstance(app, region)) } } diff --git a/root-project.gradle b/root-project.gradle index b0d63dcaa47..1d519f9278f 100644 --- a/root-project.gradle +++ b/root-project.gradle @@ -46,7 +46,7 @@ ext { supportAnnotationsVersion = '28.0.0' errorproneVersion = '2.3.2' errorproneJavacVersion = '9+181-r4173-1' - googleTruthVersion = '0.40' + googleTruthVersion = '0.45' robolectricVersion = '4.1' } diff --git a/smoke-tests/build.gradle b/smoke-tests/build.gradle index 90694fe15a7..55b7f1d3aac 100644 --- a/smoke-tests/build.gradle +++ b/smoke-tests/build.gradle @@ -88,7 +88,7 @@ apply from: "configure.gradle" dependencies { // Common api "androidx.test:runner:1.2.0" - api "com.google.truth:truth:0.44" + api "com.google.truth:truth:0.45" api "junit:junit:4.12" implementation "androidx.test:rules:1.2.0"