2525import androidx .lifecycle .Lifecycle ;
2626import androidx .lifecycle .testing .TestLifecycleOwner ;
2727import androidx .loader .app .test .DelayLoader ;
28- import androidx .loader .app .test .DummyLoaderCallbacks ;
28+ import androidx .loader .app .test .ImmediateLoaderCallbacks ;
2929import androidx .loader .content .Loader ;
3030import androidx .test .annotation .UiThreadTest ;
3131import 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 );
0 commit comments