diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-07-29 23:20:25 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-07-29 23:20:25 +0000 |
| commit | 0bcbd4d02b7e6918d0a2ed03ac3e5dee726dd728 (patch) | |
| tree | 03e29c929f6b2ac96f2b38a797c617ce5b7a4121 | |
| parent | e0162f13332abd153732c567d4210e27f6c5d7a5 (diff) | |
| parent | fd2d6a42253de2d156181db18f3b1c294fcf0968 (diff) | |
| download | DeskClock-0bcbd4d02b7e6918d0a2ed03ac3e5dee726dd728.tar.gz | |
Merge "AOSP DeskClock: unit test fix" am: c4a1eccbdb am: 95496cbaf7 am: fd2d6a4225
Original change: https://android-review.googlesource.com/c/platform/packages/apps/DeskClock/+/1780410
Change-Id: I347e3db4d4362fd7946c2446662ab44fd69f767e
| -rw-r--r-- | src/com/android/deskclock/ItemAdapter.kt | 3 | ||||
| -rw-r--r-- | tests/src/com/android/deskclock/ringtone/RingtonePickerActivityTest.java | 19 |
2 files changed, 13 insertions, 9 deletions
diff --git a/src/com/android/deskclock/ItemAdapter.kt b/src/com/android/deskclock/ItemAdapter.kt index 585ea4530..8d9bd4c8c 100644 --- a/src/com/android/deskclock/ItemAdapter.kt +++ b/src/com/android/deskclock/ItemAdapter.kt @@ -85,8 +85,7 @@ class ItemAdapter<T : ItemHolder<*>> : RecyclerView.Adapter<ItemViewHolder<T>>() /** * 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`. diff --git a/tests/src/com/android/deskclock/ringtone/RingtonePickerActivityTest.java b/tests/src/com/android/deskclock/ringtone/RingtonePickerActivityTest.java index 1e7bf28ae..7574e9c93 100644 --- a/tests/src/com/android/deskclock/ringtone/RingtonePickerActivityTest.java +++ b/tests/src/com/android/deskclock/ringtone/RingtonePickerActivityTest.java @@ -74,7 +74,12 @@ public class RingtonePickerActivityTest { 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 @@ public class RingtonePickerActivityTest { 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 class RingtonePickerActivityTest { 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 @@ public class RingtonePickerActivityTest { 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 @@ public class RingtonePickerActivityTest { 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(); |