Skip to content

Commit 3632086

Browse files
vkryachkovkryachko
committed
Remove deprecated warnings.
1 parent 9b2c63a commit 3632086

21 files changed

+33
-32
lines changed

‎firebase-firestore/firebase-firestore.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,7 @@ dependencies {
130130
androidTestImplementation "androidx.annotation:annotation:1.1.0"
131131
androidTestImplementation 'androidx.test:runner:1.2.0'
132132
androidTestImplementation 'androidx.test:rules:1.2.0'
133+
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
133134
}
134135

135136
gradle.projectsEvaluated {

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsServerApplicationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import static java.util.Arrays.asList;
2323
import static org.junit.Assert.assertEquals;
2424

25-
import androidx.test.runner.AndroidJUnit4;
25+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2626
import com.google.firebase.firestore.FirebaseFirestoreException.Code;
2727
import org.junit.Before;
2828
import org.junit.Test;

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ArrayTransformsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import static org.junit.Assert.assertEquals;
2222
import static org.junit.Assert.assertFalse;
2323

24-
import androidx.test.runner.AndroidJUnit4;
24+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2525
import com.google.firebase.firestore.testutil.EventAccumulator;
2626
import com.google.firebase.firestore.testutil.IntegrationTestUtil;
2727
import java.util.Map;

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/CursorTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import static org.junit.Assert.assertEquals;
2727
import static org.junit.Assert.assertTrue;
2828

29-
import androidx.test.runner.AndroidJUnit4;
29+
import androidx.test.ext.junit.runners.AndroidJUnit4;
3030
import com.google.firebase.Timestamp;
3131
import com.google.firebase.firestore.Query.Direction;
3232
import com.google.firebase.firestore.testutil.IntegrationTestUtil;

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FieldsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import static org.junit.Assert.assertEquals;
2626
import static org.junit.Assert.assertNull;
2727

28-
import androidx.test.runner.AndroidJUnit4;
28+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2929
import com.google.android.gms.tasks.Task;
3030
import com.google.android.gms.tasks.Tasks;
3131
import com.google.firebase.Timestamp;

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/FirestoreTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
import static org.junit.Assert.assertTrue;
3636
import static org.junit.Assert.fail;
3737

38-
import androidx.test.runner.AndroidJUnit4;
38+
import androidx.test.ext.junit.runners.AndroidJUnit4;
3939
import com.google.android.gms.tasks.Task;
4040
import com.google.android.gms.tasks.TaskCompletionSource;
4141
import com.google.firebase.Timestamp;

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ListenerRegistrationTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222

2323
import android.app.Activity;
2424
import androidx.fragment.app.FragmentActivity;
25+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2526
import androidx.test.rule.ActivityTestRule;
26-
import androidx.test.runner.AndroidJUnit4;
2727
import com.google.firebase.firestore.testutil.IntegrationTestUtil;
2828
import java.util.concurrent.Semaphore;
2929
import org.junit.After;

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/NumericTransformsTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
import static org.junit.Assert.assertEquals;
2121
import static org.junit.Assert.assertFalse;
2222

23-
import androidx.test.runner.AndroidJUnit4;
23+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2424
import com.google.android.gms.tasks.Tasks;
2525
import com.google.firebase.firestore.testutil.EventAccumulator;
2626
import com.google.firebase.firestore.testutil.IntegrationTestUtil;

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/POJOTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import static com.google.firebase.firestore.testutil.TestUtil.map;
2222
import static org.junit.Assert.assertEquals;
2323

24-
import androidx.test.runner.AndroidJUnit4;
24+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2525
import com.google.android.gms.tasks.Task;
2626
import com.google.android.gms.tasks.Tasks;
2727
import com.google.firebase.Timestamp;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import static org.junit.Assert.assertNull;
2929
import static org.junit.Assert.assertTrue;
3030

31-
import androidx.test.runner.AndroidJUnit4;
31+
import androidx.test.ext.junit.runners.AndroidJUnit4;
3232
import com.google.android.gms.tasks.Task;
3333
import com.google.firebase.firestore.Query.Direction;
3434
import com.google.firebase.firestore.testutil.EventAccumulator;

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/ServerTimestampTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import static org.junit.Assert.assertTrue;
2727
import static org.junit.Assert.fail;
2828

29-
import androidx.test.runner.AndroidJUnit4;
29+
import androidx.test.ext.junit.runners.AndroidJUnit4;
3030
import com.google.android.gms.tasks.Task;
3131
import com.google.firebase.Timestamp;
3232
import com.google.firebase.firestore.DocumentSnapshot.ServerTimestampBehavior;

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SmokeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import static org.junit.Assert.assertFalse;
2222
import static org.junit.Assert.assertTrue;
2323

24-
import androidx.test.runner.AndroidJUnit4;
24+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2525
import com.google.android.gms.tasks.Task;
2626
import com.google.android.gms.tasks.Tasks;
2727
import com.google.firebase.firestore.Query.Direction;

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/SourceTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import static org.junit.Assert.assertNull;
2828
import static org.junit.Assert.assertTrue;
2929

30-
import androidx.test.runner.AndroidJUnit4;
30+
import androidx.test.ext.junit.runners.AndroidJUnit4;
3131
import com.google.android.gms.tasks.Task;
3232
import com.google.android.gms.tasks.TaskCompletionSource;
3333
import com.google.firebase.firestore.testutil.IntegrationTestUtil;

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TransactionTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
import static org.junit.Assert.assertTrue;
2525
import static org.junit.Assert.fail;
2626

27-
import androidx.test.runner.AndroidJUnit4;
27+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2828
import com.google.android.gms.tasks.Task;
2929
import com.google.android.gms.tasks.TaskCompletionSource;
3030
import com.google.android.gms.tasks.Tasks;

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/TypeTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
import static org.junit.Assert.assertNull;
2323
import static org.junit.Assert.assertTrue;
2424

25-
import androidx.test.runner.AndroidJUnit4;
25+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2626
import com.google.firebase.Timestamp;
2727
import com.google.firebase.firestore.testutil.IntegrationTestUtil;
2828
import java.util.Arrays;

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
import static org.junit.Assert.assertTrue;
3131
import static org.junit.Assert.fail;
3232

33-
import androidx.test.InstrumentationRegistry;
34-
import androidx.test.runner.AndroidJUnit4;
33+
import androidx.test.core.app.ApplicationProvider;
34+
import androidx.test.ext.junit.runners.AndroidJUnit4;
3535
import com.google.android.gms.tasks.TaskCompletionSource;
3636
import com.google.firebase.FirebaseApp;
3737
import com.google.firebase.FirebaseOptions;
@@ -98,7 +98,7 @@ public void firestoreGetInstanceWithNonNullAppReturnsNonNullInstance() {
9898
private static void withApp(String name, Consumer<FirebaseApp> toRun) {
9999
FirebaseApp app =
100100
FirebaseApp.initializeApp(
101-
InstrumentationRegistry.getContext(),
101+
ApplicationProvider.getApplicationContext(),
102102
new FirebaseOptions.Builder()
103103
.setApiKey("key")
104104
.setApplicationId("appId")

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/WriteBatchTest.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
import static org.junit.Assert.assertNotNull;
2828
import static org.junit.Assert.assertTrue;
2929

30-
import androidx.test.runner.AndroidJUnit4;
30+
import androidx.test.ext.junit.runners.AndroidJUnit4;
3131
import com.google.firebase.Timestamp;
3232
import com.google.firebase.firestore.FirebaseFirestoreException.Code;
3333
import com.google.firebase.firestore.testutil.EventAccumulator;

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/remote/RemoteStoreTest.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@
1616

1717
import static com.google.firebase.firestore.testutil.IntegrationTestUtil.waitFor;
1818

19-
import androidx.test.InstrumentationRegistry;
20-
import androidx.test.runner.AndroidJUnit4;
19+
import androidx.test.core.app.ApplicationProvider;
20+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2121
import com.google.firebase.database.collection.ImmutableSortedSet;
2222
import com.google.firebase.firestore.auth.User;
2323
import com.google.firebase.firestore.core.OnlineState;
@@ -44,7 +44,7 @@ public void testRemoteStoreStreamStopsWhenNetworkUnreachable() {
4444
IntegrationTestUtil.testEnvDatabaseInfo(),
4545
testQueue,
4646
null,
47-
InstrumentationRegistry.getContext());
47+
ApplicationProvider.getApplicationContext());
4848
Semaphore networkChangeSemaphore = new Semaphore(0);
4949
RemoteStore.RemoteStoreCallback callback =
5050
new RemoteStore.RemoteStoreCallback() {

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/remote/StreamTest.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@
2222
import static org.junit.Assert.assertFalse;
2323
import static org.junit.Assert.assertTrue;
2424

25-
import androidx.test.InstrumentationRegistry;
26-
import androidx.test.runner.AndroidJUnit4;
25+
import androidx.test.core.app.ApplicationProvider;
26+
import androidx.test.ext.junit.runners.AndroidJUnit4;
2727
import com.google.android.gms.tasks.Task;
2828
import com.google.firebase.firestore.auth.EmptyCredentialsProvider;
2929
import com.google.firebase.firestore.model.SnapshotVersion;
@@ -109,7 +109,7 @@ private WriteStream createAndOpenWriteStream(
109109
IntegrationTestUtil.testEnvDatabaseInfo(),
110110
testQueue,
111111
new EmptyCredentialsProvider(),
112-
InstrumentationRegistry.getContext());
112+
ApplicationProvider.getApplicationContext());
113113
final WriteStream writeStream = datastore.createWriteStream(callback);
114114
waitForWriteStreamOpen(testQueue, writeStream, callback);
115115
return writeStream;
@@ -132,7 +132,7 @@ public void testWatchStreamStopBeforeHandshake() throws Exception {
132132
IntegrationTestUtil.testEnvDatabaseInfo(),
133133
testQueue,
134134
new EmptyCredentialsProvider(),
135-
InstrumentationRegistry.getContext());
135+
ApplicationProvider.getApplicationContext());
136136
StreamStatusCallback streamCallback = new StreamStatusCallback() {};
137137
final WatchStream watchStream = datastore.createWatchStream(streamCallback);
138138

@@ -152,7 +152,7 @@ public void testWriteStreamStopAfterHandshake() throws Exception {
152152
IntegrationTestUtil.testEnvDatabaseInfo(),
153153
testQueue,
154154
new EmptyCredentialsProvider(),
155-
InstrumentationRegistry.getContext());
155+
ApplicationProvider.getApplicationContext());
156156
final WriteStream[] writeStreamWrapper = new WriteStream[1];
157157
StreamStatusCallback streamCallback =
158158
new StreamStatusCallback() {
@@ -198,7 +198,7 @@ public void testWriteStreamStopPartial() throws Exception {
198198
IntegrationTestUtil.testEnvDatabaseInfo(),
199199
testQueue,
200200
new EmptyCredentialsProvider(),
201-
InstrumentationRegistry.getContext());
201+
ApplicationProvider.getApplicationContext());
202202
StreamStatusCallback streamCallback = new StreamStatusCallback() {};
203203
final WriteStream writeStream = datastore.createWriteStream(streamCallback);
204204

@@ -277,7 +277,7 @@ public void testStreamRefreshesTokenUponExpiration() throws Exception {
277277
IntegrationTestUtil.testEnvDatabaseInfo(),
278278
testQueue,
279279
mockCredentialsProvider,
280-
InstrumentationRegistry.getContext());
280+
ApplicationProvider.getApplicationContext());
281281
StreamStatusCallback callback = new StreamStatusCallback();
282282
WriteStream writeStream = datastore.createWriteStream(callback);
283283
waitForWriteStreamOpen(testQueue, writeStream, callback);

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/IntegrationTestUtil.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
import android.content.Context;
2222
import android.net.SSLCertificateSocketFactory;
2323
import android.os.StrictMode;
24-
import androidx.test.InstrumentationRegistry;
24+
import androidx.test.core.app.ApplicationProvider;
2525
import com.google.android.gms.tasks.Task;
2626
import com.google.android.gms.tasks.TaskCompletionSource;
2727
import com.google.android.gms.tasks.Tasks;
@@ -242,7 +242,7 @@ public static FirebaseFirestore testFirestore(
242242
// TODO: Remove this once this is ready to ship.
243243
Persistence.INDEXING_SUPPORT_ENABLED = true;
244244

245-
Context context = InstrumentationRegistry.getContext();
245+
Context context = ApplicationProvider.getApplicationContext();
246246
DatabaseId databaseId = DatabaseId.forDatabase(projectId, DatabaseId.DEFAULT_DATABASE_ID);
247247

248248
ensureStrictMode();

‎firebase-firestore/src/androidTest/java/com/google/firebase/firestore/testutil/prod_provider/FirestoreProvider.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
package com.google.firebase.firestore.testutil.provider;
1616

1717
import android.content.Context;
18-
import androidx.test.InstrumentationRegistry;
18+
import androidx.test.core.app.ApplicationProvider;
1919
import com.google.firebase.firestore.R;
2020

2121
/**
@@ -28,7 +28,7 @@ public final class FirestoreProvider {
2828
private final Context context;
2929

3030
public FirestoreProvider() {
31-
this(InstrumentationRegistry.getContext());
31+
this(ApplicationProvider.getApplicationContext());
3232
}
3333

3434
public FirestoreProvider(Context context) {

0 commit comments

Comments
 (0)