commit dc51fc56b6868e864b73075f6c998ce99aa720bc
author Wesley.CW Wang <wesleycwwang@google.com> Wed Dec 18 15:23:00 2019 +0800
committer Wesley.CW Wang <wesleycwwang@google.com> Wed Dec 18 15:42:02 2019 +0800
tree 6e626091132dff8e872e0450db83d1bb7f2b3533
parent 3d983d4fad2372cfef7eec9ecdc10a6beefa8673

Fix broken test case for ClockManagerTest

Test: Manually, tapas RunThemePickerRoboTests & m -j40
Bug: 130021301
Change-Id: Ie4ff70fa388c1a2c9cea8d3b4300b86fefc30aea

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 d2ab43f..11552de 100644
--- a/robolectric_tests/src/com/android/customization/model/clock/ClockManagerTest.java
+++ b/robolectric_tests/src/com/android/customization/model/clock/ClockManagerTest.java
@@ -22,11 +22,14 @@
 
 import android.content.ContentResolver;
 import android.provider.Settings.Secure;
+
 import androidx.annotation.Nullable;
 
 import com.android.customization.model.CustomizationManager.Callback;
-
 import com.android.customization.module.ThemesUserEventLogger;
+
+import org.json.JSONException;
+import org.json.JSONObject;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -39,6 +42,7 @@
 public class ClockManagerTest {
 
     private static final String CLOCK_ID = "id";
+    private static final String CLOCK_FIELD = "clock";
 
     @Mock ClockProvider mProvider;
     @Mock ThemesUserEventLogger mLogger;
@@ -53,7 +57,7 @@
     }
 
     @Test
-    public void testApply() {
+    public void testApply() throws JSONException {
         Clockface clock = new Clockface.Builder().setId(CLOCK_ID).build();
 
         mManager.apply(clock, new Callback() {
@@ -69,7 +73,9 @@
         });
 
         // THEN the clock id is written to secure settings.
-        assertEquals(CLOCK_ID, Secure.getString(mContentResolver, ClockManager.CLOCK_FACE_SETTING));
+        JSONObject json =
+                new JSONObject(Secure.getString(mContentResolver, ClockManager.CLOCK_FACE_SETTING));
+        assertEquals(CLOCK_ID, json.getString(CLOCK_FIELD));
         // AND the event is logged
         verify(mLogger).logClockApplied(clock);
     }