commit caf59966f58db3eaf3972babf7ad2af86d0f1373
author Santiago Etchebehere <santie@google.com> Wed Jan 26 15:50:54 2022 -0800
committer Alexandre Koukarine <koukarine@google.com> Wed Feb 16 20:15:15 2022 +0000
tree 81116ccea5fd680d3f09aff8b54a81a8fe8ecca9
parent 05a7d1b11961d24e603e1e3fb67aa59f35e211f6

Fix Tests

Fixes: 219976983
Test: manual run all tests.
Change-Id: I85f74dd786ba1503e2bf664a29d686b7632c5b9e

robolectric_tests/src/com/android/customization/model/clock/ClockManagerTest.java

diff --git a/robolectric_tests/src/com/android/customization/model/clock/ClockManagerTest.java b/robolectric_tests/src/com/android/customization/model/clock/ClockManagerTest.java
index f431006..574548a 100644
--- a/robolectric_tests/src/com/android/customization/model/clock/ClockManagerTest.java
+++ b/robolectric_tests/src/com/android/customization/model/clock/ClockManagerTest.java
@@ -18,8 +18,8 @@
 import static junit.framework.TestCase.fail;
 
 import static org.junit.Assert.assertEquals;
+import static org.mockito.Mockito.doAnswer;
 import static org.mockito.Mockito.verify;
-import static org.mockito.Mockito.when;
 
 import android.content.ContentResolver;
 import android.provider.Settings.Secure;
@@ -86,7 +86,9 @@
 
     @Test
     public void testApply_whenJSONExceptionOccurs_callsOnError() {
-        when(mMockClockface.getId()).thenThrow(JSONException.class);
+        doAnswer((invocation) -> {
+            throw new JSONException("Fake Test Excepton");
+        }).when(mMockClockface).getId();
 
         mManager.apply(mMockClockface, mMockCallback);
 

robolectric_tests/src/com/android/customization/model/grid/GridOptionsManagerTest.java

diff --git a/robolectric_tests/src/com/android/customization/model/grid/GridOptionsManagerTest.java b/robolectric_tests/src/com/android/customization/model/grid/GridOptionsManagerTest.java
index 64a8389..4268725 100644
--- a/robolectric_tests/src/com/android/customization/model/grid/GridOptionsManagerTest.java
+++ b/robolectric_tests/src/com/android/customization/model/grid/GridOptionsManagerTest.java
@@ -31,7 +31,6 @@
 import org.junit.runner.RunWith;
 import org.mockito.Mock;
 import org.mockito.MockitoAnnotations;
-import org.robolectric.Robolectric;
 import org.robolectric.RobolectricTestRunner;
 
 @RunWith(RobolectricTestRunner.class)
@@ -69,7 +68,6 @@
     @Test
     public void testFetch_backgroundThread() {
         mManager.fetchOptions(null, false);
-        Robolectric.flushBackgroundThreadScheduler();
         verify(mProvider).fetch(anyBoolean());
     }
 }