Skip to content

Commit 43b125e

Browse files
Update Loader tests to comply with Android's inclusive language guidance
See https://source.android.com/setup/contribute/respectful-code for reference BUG=161896447 Test: tests still pass Change-Id: I81adcf60161a3c5babf551dde1dd042f8658da93
1 parent 1f33430 commit 43b125e

6 files changed

Lines changed: 33 additions & 29 deletions

File tree

‎loader/loader/src/androidTest/java/androidx/loader/app/LoaderInfoTest.java‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
import androidx.lifecycle.Lifecycle;
2626
import androidx.lifecycle.testing.TestLifecycleOwner;
2727
import androidx.loader.app.test.DelayLoader;
28-
import androidx.loader.app.test.DummyLoaderCallbacks;
28+
import androidx.loader.app.test.ImmediateLoaderCallbacks;
2929
import androidx.loader.content.Loader;
3030
import androidx.test.annotation.UiThreadTest;
3131
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -52,7 +52,8 @@ public void setup() {
5252

5353
@Test
5454
public void testIsCallbackWaitingForData() throws Throwable {
55-
final DummyLoaderCallbacks loaderCallback = new DummyLoaderCallbacks(mock(Context.class));
55+
final ImmediateLoaderCallbacks loaderCallback =
56+
new ImmediateLoaderCallbacks(mock(Context.class));
5657
final CountDownLatch deliverResultLatch = new CountDownLatch(1);
5758
Loader<Boolean> delayLoader = new DelayLoader(mock(Context.class),
5859
deliverResultLatch);
@@ -87,7 +88,8 @@ public void run() {
8788
@UiThreadTest
8889
@Test
8990
public void testSetCallback() {
90-
final DummyLoaderCallbacks loaderCallback = new DummyLoaderCallbacks(mock(Context.class));
91+
final ImmediateLoaderCallbacks loaderCallback =
92+
new ImmediateLoaderCallbacks(mock(Context.class));
9193
Loader<Boolean> loader = loaderCallback.onCreateLoader(0, null);
9294
final LoaderManagerImpl.LoaderInfo<Boolean> loaderInfo = new LoaderManagerImpl.LoaderInfo<>(
9395
0, null, loader, null);
@@ -102,7 +104,8 @@ public void testSetCallback() {
102104
@UiThreadTest
103105
@Test
104106
public void testSetCallback_replace() {
105-
final DummyLoaderCallbacks initialCallback = new DummyLoaderCallbacks(mock(Context.class));
107+
final ImmediateLoaderCallbacks initialCallback =
108+
new ImmediateLoaderCallbacks(mock(Context.class));
106109
Loader<Boolean> loader = initialCallback.onCreateLoader(0, null);
107110
LoaderManagerImpl.LoaderInfo<Boolean> loaderInfo = new LoaderManagerImpl.LoaderInfo<>(
108111
0, null, loader, null);
@@ -113,8 +116,8 @@ public void testSetCallback_replace() {
113116
assertTrue("onLoadFinished for initial should be called after setCallback initial",
114117
initialCallback.mOnLoadFinished);
115118

116-
final DummyLoaderCallbacks replacementCallback =
117-
new DummyLoaderCallbacks(mock(Context.class));
119+
final ImmediateLoaderCallbacks replacementCallback =
120+
new ImmediateLoaderCallbacks(mock(Context.class));
118121
initialCallback.mOnLoadFinished = false;
119122

120123
loaderInfo.setCallback(mOwner, replacementCallback);
@@ -129,8 +132,8 @@ public void testSetCallback_replace() {
129132
@UiThreadTest
130133
@Test
131134
public void testMarkForRedelivery() {
132-
DummyLoaderCallbacks loaderCallback =
133-
new DummyLoaderCallbacks(mock(Context.class));
135+
ImmediateLoaderCallbacks loaderCallback =
136+
new ImmediateLoaderCallbacks(mock(Context.class));
134137
Loader<Boolean> loader = loaderCallback.onCreateLoader(0, null);
135138
LoaderManagerImpl.LoaderInfo<Boolean> loaderInfo = new LoaderManagerImpl.LoaderInfo<>(
136139
0, null, loader, null);
@@ -152,8 +155,8 @@ public void testMarkForRedelivery() {
152155
@UiThreadTest
153156
@Test
154157
public void testMarkForRedelivery_replace() {
155-
DummyLoaderCallbacks initialCallback =
156-
new DummyLoaderCallbacks(mock(Context.class));
158+
ImmediateLoaderCallbacks initialCallback =
159+
new ImmediateLoaderCallbacks(mock(Context.class));
157160
Loader<Boolean> loader = initialCallback.onCreateLoader(0, null);
158161
LoaderManagerImpl.LoaderInfo<Boolean> loaderInfo = new LoaderManagerImpl.LoaderInfo<>(
159162
0, null, loader, null);
@@ -168,8 +171,8 @@ public void testMarkForRedelivery_replace() {
168171
initialCallback.mOnLoadFinished);
169172

170173
// Replace the callback
171-
final DummyLoaderCallbacks replacementCallback =
172-
new DummyLoaderCallbacks(mock(Context.class));
174+
final ImmediateLoaderCallbacks replacementCallback =
175+
new ImmediateLoaderCallbacks(mock(Context.class));
173176
loaderInfo.setCallback(mOwner, replacementCallback);
174177

175178
mOwner.handleLifecycleEvent(Lifecycle.Event.ON_START);
@@ -184,7 +187,8 @@ public void testMarkForRedelivery_replace() {
184187
@UiThreadTest
185188
@Test
186189
public void testDestroy() {
187-
final DummyLoaderCallbacks loaderCallback = new DummyLoaderCallbacks(mock(Context.class));
190+
final ImmediateLoaderCallbacks loaderCallback =
191+
new ImmediateLoaderCallbacks(mock(Context.class));
188192
final Loader<Boolean> loader = loaderCallback.onCreateLoader(0, null);
189193
final LoaderManagerImpl.LoaderInfo<Boolean> loaderInfo = new LoaderManagerImpl.LoaderInfo<>(
190194
0, null, loader, null);

‎loader/loader/src/androidTest/java/androidx/loader/app/LoaderManagerTest.java‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
import androidx.lifecycle.ViewModelStore;
2929
import androidx.lifecycle.testing.TestLifecycleOwner;
3030
import androidx.loader.app.test.DelayLoaderCallbacks;
31-
import androidx.loader.app.test.DummyLoaderCallbacks;
31+
import androidx.loader.app.test.ImmediateLoaderCallbacks;
3232
import androidx.loader.content.Loader;
3333
import androidx.test.annotation.UiThreadTest;
3434
import androidx.test.ext.junit.runners.AndroidJUnit4;
@@ -60,7 +60,7 @@ public void testDestroyFromOnCreateLoader() throws Throwable {
6060
@Override
6161
public void run() {
6262
mLoaderManager.initLoader(65, null,
63-
new DummyLoaderCallbacks(mock(Context.class)) {
63+
new ImmediateLoaderCallbacks(mock(Context.class)) {
6464
@NonNull
6565
@Override
6666
public Loader<Boolean> onCreateLoader(int id, Bundle args) {
@@ -91,7 +91,7 @@ public void testDestroyFromOnLoadFinished() throws Throwable {
9191
@Override
9292
public void run() {
9393
mLoaderManager.initLoader(43, null,
94-
new DummyLoaderCallbacks(mock(Context.class)) {
94+
new ImmediateLoaderCallbacks(mock(Context.class)) {
9595
@Override
9696
public void onLoadFinished(@NonNull Loader<Boolean> loader,
9797
Boolean data) {
@@ -294,13 +294,13 @@ public void onLoaderReset(@NonNull Loader<Object> loader) {
294294
@Test(expected = IllegalStateException.class)
295295
public void enforceOnMainThread_initLoader() {
296296
mLoaderManager.initLoader(-1, null,
297-
new DummyLoaderCallbacks(mock(Context.class)));
297+
new ImmediateLoaderCallbacks(mock(Context.class)));
298298
}
299299

300300
@Test(expected = IllegalStateException.class)
301301
public void enforceOnMainThread_restartLoader() {
302302
mLoaderManager.restartLoader(-1, null,
303-
new DummyLoaderCallbacks(mock(Context.class)));
303+
new ImmediateLoaderCallbacks(mock(Context.class)));
304304
}
305305

306306
@Test(expected = IllegalStateException.class)

‎loader/loader/src/androidTest/java/androidx/loader/app/LoaderObserverTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222

2323
import android.content.Context;
2424

25-
import androidx.loader.app.test.DummyLoaderCallbacks;
25+
import androidx.loader.app.test.ImmediateLoaderCallbacks;
2626
import androidx.loader.content.Loader;
2727
import androidx.test.filters.SmallTest;
2828

@@ -36,7 +36,7 @@ public class LoaderObserverTest {
3636

3737
@Test
3838
public void testOnChanged() {
39-
DummyLoaderCallbacks callback = new DummyLoaderCallbacks(mock(Context.class));
39+
ImmediateLoaderCallbacks callback = new ImmediateLoaderCallbacks(mock(Context.class));
4040
@SuppressWarnings("unchecked")
4141
LoaderManagerImpl.LoaderObserver<Boolean> observer = new LoaderManagerImpl.LoaderObserver<>(
4242
mock(Loader.class), callback);
@@ -55,7 +55,7 @@ public void testOnChanged() {
5555

5656
@Test
5757
public void testReset() {
58-
DummyLoaderCallbacks callback = new DummyLoaderCallbacks(mock(Context.class));
58+
ImmediateLoaderCallbacks callback = new ImmediateLoaderCallbacks(mock(Context.class));
5959
@SuppressWarnings("unchecked")
6060
LoaderManagerImpl.LoaderObserver<Boolean> observer = new LoaderManagerImpl.LoaderObserver<>(
6161
mock(Loader.class), callback);
@@ -69,7 +69,7 @@ public void testReset() {
6969

7070
@Test
7171
public void testResetWithOnChanged() {
72-
DummyLoaderCallbacks callback = new DummyLoaderCallbacks(mock(Context.class));
72+
ImmediateLoaderCallbacks callback = new ImmediateLoaderCallbacks(mock(Context.class));
7373
@SuppressWarnings("unchecked")
7474
LoaderManagerImpl.LoaderObserver<Boolean> observer = new LoaderManagerImpl.LoaderObserver<>(
7575
mock(Loader.class), callback);

‎loader/loader/src/androidTest/java/androidx/loader/app/LoaderViewModelTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
import android.content.Context;
2525

26-
import androidx.loader.app.test.DummyLoader;
26+
import androidx.loader.app.test.ImmediateLoader;
2727
import androidx.loader.content.Loader;
2828
import androidx.test.filters.MediumTest;
2929

@@ -68,7 +68,7 @@ private class AlwaysRunningLoaderInfo extends LoaderManagerImpl.LoaderInfo<Boole
6868
boolean mDestroyed = false;
6969

7070
AlwaysRunningLoaderInfo(Context context) {
71-
super(0, null, new DummyLoader(context), null);
71+
super(0, null, new ImmediateLoader(context), null);
7272
}
7373

7474
@Override

loader/loader/src/androidTest/java/androidx/loader/app/test/DummyLoader.java renamed to loader/loader/src/androidTest/java/androidx/loader/app/test/ImmediateLoader.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@
2020

2121
import androidx.loader.content.Loader;
2222

23-
public class DummyLoader extends Loader<Boolean> {
24-
public DummyLoader(Context context) {
23+
public class ImmediateLoader extends Loader<Boolean> {
24+
public ImmediateLoader(Context context) {
2525
super(context);
2626
}
2727

loader/loader/src/androidTest/java/androidx/loader/app/test/DummyLoaderCallbacks.java renamed to loader/loader/src/androidTest/java/androidx/loader/app/test/ImmediateLoaderCallbacks.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,20 @@
2323
import androidx.loader.app.LoaderManager;
2424
import androidx.loader.content.Loader;
2525

26-
public class DummyLoaderCallbacks implements LoaderManager.LoaderCallbacks<Boolean> {
26+
public class ImmediateLoaderCallbacks implements LoaderManager.LoaderCallbacks<Boolean> {
2727
private final Context mContext;
2828

2929
public boolean mOnLoadFinished;
3030
public boolean mOnLoaderReset;
3131

32-
public DummyLoaderCallbacks(Context context) {
32+
public ImmediateLoaderCallbacks(Context context) {
3333
mContext = context;
3434
}
3535

3636
@NonNull
3737
@Override
3838
public Loader<Boolean> onCreateLoader(int id, Bundle args) {
39-
return new DummyLoader(mContext);
39+
return new ImmediateLoader(mContext);
4040
}
4141

4242
@Override

0 commit comments

Comments
 (0)