-
Notifications
You must be signed in to change notification settings - Fork 1
Expand file tree
/
Copy pathtestLib.patch
More file actions
247 lines (205 loc) · 11.8 KB
/
Copy pathtestLib.patch
File metadata and controls
247 lines (205 loc) · 11.8 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
diff --git a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/context/ContentProviderMockContext.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/context/ContentProviderMockContext.java
index bf4abda..9135b17 100755
--- a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/context/ContentProviderMockContext.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/context/ContentProviderMockContext.java
@@ -18,11 +18,13 @@ package com.twofortyfouram.test.context;
import android.content.ContentProvider;
import android.content.ContentResolver;
import android.content.Context;
import android.content.ContextWrapper;
-import android.support.annotation.NonNull;
+
+import androidx.annotation.NonNull;
+
import android.test.mock.MockContentResolver;
import net.jcip.annotations.NotThreadSafe;
import java.util.Map;
diff --git a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/context/FeatureContextWrapper.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/context/FeatureContextWrapper.java
index 1640452..d8e9d24 100755
--- a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/context/FeatureContextWrapper.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/context/FeatureContextWrapper.java
@@ -20,13 +20,13 @@ package com.twofortyfouram.test.context;
import android.content.ComponentName;
import android.content.Context;
import android.content.ContextWrapper;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import net.jcip.annotations.Immutable;
import java.util.Arrays;
/**
diff --git a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/context/ReceiverContextWrapper.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/context/ReceiverContextWrapper.java
index ab0bf67..1cd3f7b 100755
--- a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/context/ReceiverContextWrapper.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/context/ReceiverContextWrapper.java
@@ -23,14 +23,14 @@ import android.content.Context;
import android.content.ContextWrapper;
import android.content.Intent;
import android.os.Bundle;
import android.os.Handler;
import android.os.UserHandle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
import android.util.Log;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
import net.jcip.annotations.Immutable;
import net.jcip.annotations.NotThreadSafe;
import java.util.Collection;
import java.util.LinkedList;
diff --git a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/espresso/UiTestPrerequesites.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/espresso/UiTestPrerequesites.java
index 6b7d049..fcb965d 100755
--- a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/espresso/UiTestPrerequesites.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/espresso/UiTestPrerequesites.java
@@ -18,11 +18,12 @@ package com.twofortyfouram.test.espresso;
import android.annotation.TargetApi;
import android.content.Context;
import android.os.Build;
import android.os.PowerManager;
-import android.support.test.InstrumentationRegistry;
+
+import androidx.test.InstrumentationRegistry;
import net.jcip.annotations.ThreadSafe;
import org.junit.Before;
diff --git a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/matcher/ClassImmutableMatcher.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/matcher/ClassImmutableMatcher.java
index ba33c5d..dcfcfd1 100755
--- a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/matcher/ClassImmutableMatcher.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/matcher/ClassImmutableMatcher.java
@@ -14,25 +14,23 @@
* specific language governing permissions and limitations under the License.
*/
package com.twofortyfouram.test.matcher;
-
-import android.support.annotation.NonNull;
-
-import net.jcip.annotations.ThreadSafe;
-
import org.hamcrest.Description;
import org.hamcrest.TypeSafeDiagnosingMatcher;
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
import java.util.Collection;
import java.util.LinkedList;
import java.util.List;
import java.util.Locale;
+import androidx.annotation.NonNull;
+import net.jcip.annotations.ThreadSafe;
+
import static com.twofortyfouram.assertion.Assertions.assertNotNull;
/**
* Matcher to verify that a class is probably immutable. Typical use case is for model objects
* with final fields. Does not verify that mutable fields are correctly encapsulated.
diff --git a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/matcher/ClassNotInstantiableMatcher.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/matcher/ClassNotInstantiableMatcher.java
index ba5d8df..10c09e8 100755
--- a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/matcher/ClassNotInstantiableMatcher.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/matcher/ClassNotInstantiableMatcher.java
@@ -14,21 +14,19 @@
* specific language governing permissions and limitations under the License.
*/
package com.twofortyfouram.test.matcher;
-
-import android.support.annotation.NonNull;
-
-import net.jcip.annotations.ThreadSafe;
-
import org.hamcrest.Description;
import org.hamcrest.TypeSafeDiagnosingMatcher;
import java.lang.reflect.Constructor;
import java.lang.reflect.InvocationTargetException;
+import androidx.annotation.NonNull;
+import net.jcip.annotations.ThreadSafe;
+
import static com.twofortyfouram.assertion.Assertions.assertNotNull;
/**
* Matcher to verify that a class is not instantiable. Typical use case is for utility classes
* that have a private default constructor that throws an {@link AssertionError}.
diff --git a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/provider/MockableContentProvider.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/provider/MockableContentProvider.java
index 4f439da..6d5c864 100755
--- a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/provider/MockableContentProvider.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/provider/MockableContentProvider.java
@@ -22,16 +22,17 @@ import android.content.ContentValues;
import android.content.Context;
import android.content.pm.ProviderInfo;
import android.database.Cursor;
import android.net.Uri;
import android.os.Bundle;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.test.InstrumentationRegistry;
import com.twofortyfouram.test.context.ContentProviderMockContext;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.test.InstrumentationRegistry;
+
import net.jcip.annotations.Immutable;
import net.jcip.annotations.NotThreadSafe;
import java.util.Collections;
import java.util.LinkedList;
diff --git a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/rule/UtcRule.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/rule/UtcRule.java
index 2ff7656..322ff3e 100755
--- a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/rule/UtcRule.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/rule/UtcRule.java
@@ -14,12 +14,11 @@
* specific language governing permissions and limitations under the License.
*/
package com.twofortyfouram.test.rule;
-import android.support.annotation.NonNull;
-
+import androidx.annotation.NonNull;
import net.jcip.annotations.Immutable;
import org.junit.rules.TestWatcher;
import org.junit.runner.Description;
diff --git a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/ui/activity/ActivityTestUtil.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/ui/activity/ActivityTestUtil.java
index d3a5557..f65ea9c 100755
--- a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/ui/activity/ActivityTestUtil.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/ui/activity/ActivityTestUtil.java
@@ -19,14 +19,14 @@ package com.twofortyfouram.test.ui.activity;
import android.app.Activity;
import android.app.Instrumentation;
import android.content.Intent;
import android.os.Looper;
-import android.support.annotation.MainThread;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.annotation.MainThread;
import net.jcip.annotations.ThreadSafe;
import java.lang.reflect.Field;
import java.util.concurrent.atomic.AtomicInteger;
import java.util.concurrent.atomic.AtomicReference;
diff --git a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/util/FirebaseTestLabUtil.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/util/FirebaseTestLabUtil.java
index 21bee46..0c489f9 100755
--- a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/util/FirebaseTestLabUtil.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/util/FirebaseTestLabUtil.java
@@ -16,12 +16,12 @@
package com.twofortyfouram.test.util;
import android.content.Context;
import android.provider.Settings;
-import android.support.annotation.NonNull;
+import androidx.annotation.NonNull;
import net.jcip.annotations.ThreadSafe;
import static com.twofortyfouram.assertion.Assertions.assertNotNull;
diff --git a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/util/TestButlerUtil.java b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/util/TestButlerUtil.java
index 775f17f..2c98c0f 100755
--- a/repos/android-test-master/testLib/src/main/java/com/twofortyfouram/test/util/TestButlerUtil.java
+++ b/android-locale-plugin-libraries/android-locale-plugin-libraries/testLib/src/main/java/com/twofortyfouram/test/util/TestButlerUtil.java
@@ -15,15 +15,17 @@
*/
package com.twofortyfouram.test.util;
import android.content.pm.PackageManager;
-import android.support.annotation.NonNull;
-import android.support.test.InstrumentationRegistry;
+
+import androidx.annotation.NonNull;
+import androidx.test.InstrumentationRegistry;
import net.jcip.annotations.ThreadSafe;
+
/**
* Utility class for Test Butler. This class is safe to use even if Test Butler is not a
* dependency of the client using this library.
*/
@ThreadSafe