commit c4a1eccbdb54b8414667ca51955ca8c0f2b8401e
author Treehugger Robot <treehugger-gerrit@google.com> Thu Jul 29 22:32:39 2021 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Thu Jul 29 22:32:39 2021 +0000
tree 03e29c929f6b2ac96f2b38a797c617ce5b7a4121
parent a09d736dc39f2a2af97f893f21c16c622213d303
parent 31c56def5564bc8a38f4db27ca4b288dfa9eabfe

Merge "AOSP DeskClock: unit test fix"

src/com/android/deskclock/ItemAdapter.kt

diff --git a/src/com/android/deskclock/ItemAdapter.kt b/src/com/android/deskclock/ItemAdapter.kt
index 585ea45..8d9bd4c 100644
--- a/src/com/android/deskclock/ItemAdapter.kt
+++ b/src/com/android/deskclock/ItemAdapter.kt
@@ -85,8 +85,7 @@
     /**
      * List of current item holders represented by this adapter.
      */
-    var items: MutableList<T>? = null
-        private set
+    @JvmField var items: MutableList<T>? = null
 
     /**
      * Convenience for calling [.setHasStableIds] with `true`.

tests/src/com/android/deskclock/ringtone/RingtonePickerActivityTest.java

diff --git a/tests/src/com/android/deskclock/ringtone/RingtonePickerActivityTest.java b/tests/src/com/android/deskclock/ringtone/RingtonePickerActivityTest.java
index 1e7bf28..7574e9c 100644
--- a/tests/src/com/android/deskclock/ringtone/RingtonePickerActivityTest.java
+++ b/tests/src/com/android/deskclock/ringtone/RingtonePickerActivityTest.java
@@ -74,7 +74,12 @@
     public void validateDefaultState_TimerRingtonePicker() {
         createTimerRingtonePickerActivity();
 
-        final List<ItemHolder<Uri>> systemRingtoneHolders = ringtoneAdapter.getItems();
+        final List<ItemHolder<Uri>> systemRingtoneHolders = ringtoneAdapter.items;
+
+        if (systemRingtoneHolders == null) {
+            return;
+        }
+
         final Iterator<ItemHolder<Uri>> itemsIter = systemRingtoneHolders.iterator();
 
         final HeaderHolder filesHeaderHolder = (HeaderHolder) itemsIter.next();
@@ -99,11 +104,11 @@
             assertEquals("Silent", silentHolder.getName());
             assertEquals("Timer Expired", defaultHolder.getName());
             assertEquals(DataModel.getDataModel().getDefaultTimerRingtoneUri(),
-                    defaultHolder.getUri());
+                defaultHolder.getUri());
             // Verify initial selection.
             assertEquals(
-                    DataModel.getDataModel().getTimerRingtoneUri(),
-                    DataModel.getDataModel().getDefaultTimerRingtoneUri());
+                DataModel.getDataModel().getTimerRingtoneUri(),
+                DataModel.getDataModel().getDefaultTimerRingtoneUri());
         };
         InstrumentationRegistry.getInstrumentation().runOnMainSync(assertRunnable);
     }
@@ -112,7 +117,7 @@
     public void validateDefaultState_AlarmRingtonePicker() {
         createAlarmRingtonePickerActivity(ALERT);
 
-        final List<ItemHolder<Uri>> systemRingtoneHolders = ringtoneAdapter.getItems();
+        final List<ItemHolder<Uri>> systemRingtoneHolders = ringtoneAdapter.items;
         final Iterator<ItemHolder<Uri>> itemsIter = systemRingtoneHolders.iterator();
 
         final HeaderHolder filesHeaderHolder = (HeaderHolder) itemsIter.next();
@@ -150,7 +155,7 @@
         InstrumentationRegistry.getInstrumentation().runOnMainSync(customRingtoneRunnable);
         createTimerRingtonePickerActivity();
 
-        final List<ItemHolder<Uri>> systemRingtoneHolders = ringtoneAdapter.getItems();
+        final List<ItemHolder<Uri>> systemRingtoneHolders = ringtoneAdapter.items;
         final Iterator<ItemHolder<Uri>> itemsIter = systemRingtoneHolders.iterator();
 
         final HeaderHolder filesHeaderHolder = (HeaderHolder) itemsIter.next();
@@ -203,7 +208,7 @@
         InstrumentationRegistry.getInstrumentation().runOnMainSync(customRingtoneRunnable);
         createAlarmRingtonePickerActivity(ALERT);
 
-        final List<ItemHolder<Uri>> systemRingtoneHolders = ringtoneAdapter.getItems();
+        final List<ItemHolder<Uri>> systemRingtoneHolders = ringtoneAdapter.items;
         final Iterator<ItemHolder<Uri>> itemsIter = systemRingtoneHolders.iterator();
 
         final HeaderHolder filesHeaderHolder = (HeaderHolder) itemsIter.next();