diff options
Diffstat (limited to 'tests/robotests')
| -rw-r--r-- | tests/robotests/Android.bp | 3 | ||||
| -rw-r--r-- | tests/robotests/src/com/android/customization/model/clock/BaseClockManagerTest.java | 2 | ||||
| -rw-r--r-- | tests/robotests/src/com/android/customization/model/grid/GridOptionsManagerTest.java | 2 | ||||
| -rw-r--r-- | tests/robotests/src/com/android/customization/picker/clock/ui/fragment/ClockCustomDemoFragmentTest.kt (renamed from tests/robotests/src/com/android/customization/picker/clock/ClockCustomDemoFragmentTest.kt) | 58 |
4 files changed, 22 insertions, 43 deletions
diff --git a/tests/robotests/Android.bp b/tests/robotests/Android.bp index e0a37c29..4416e1c4 100644 --- a/tests/robotests/Android.bp +++ b/tests/robotests/Android.bp @@ -13,5 +13,8 @@ android_robolectric_test { "androidx.test.core", "androidx.test.runner", ], + + upstream: true, + instrumentation_for: "ThemePicker", } diff --git a/tests/robotests/src/com/android/customization/model/clock/BaseClockManagerTest.java b/tests/robotests/src/com/android/customization/model/clock/BaseClockManagerTest.java index c96e7f8b..eeff5317 100644 --- a/tests/robotests/src/com/android/customization/model/clock/BaseClockManagerTest.java +++ b/tests/robotests/src/com/android/customization/model/clock/BaseClockManagerTest.java @@ -20,7 +20,7 @@ import static junit.framework.TestCase.fail; import static org.junit.Assert.assertEquals; import static org.mockito.ArgumentMatchers.eq; -import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/customization/model/grid/GridOptionsManagerTest.java b/tests/robotests/src/com/android/customization/model/grid/GridOptionsManagerTest.java index 89ca6761..04ac0241 100644 --- a/tests/robotests/src/com/android/customization/model/grid/GridOptionsManagerTest.java +++ b/tests/robotests/src/com/android/customization/model/grid/GridOptionsManagerTest.java @@ -17,7 +17,7 @@ package com.android.customization.model.grid; import static junit.framework.TestCase.fail; -import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Mockito.anyBoolean; import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; diff --git a/tests/robotests/src/com/android/customization/picker/clock/ClockCustomDemoFragmentTest.kt b/tests/robotests/src/com/android/customization/picker/clock/ui/fragment/ClockCustomDemoFragmentTest.kt index ad3dd1ce..0a543123 100644 --- a/tests/robotests/src/com/android/customization/picker/clock/ClockCustomDemoFragmentTest.kt +++ b/tests/robotests/src/com/android/customization/picker/clock/ui/fragment/ClockCustomDemoFragmentTest.kt @@ -1,23 +1,21 @@ -package com.android.customization.picker.clock +package com.android.customization.picker.clock.ui.fragment -import android.os.Handler -import android.os.UserHandle import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView -import com.android.systemui.plugins.ClockId import com.android.systemui.plugins.ClockMetadata -import com.android.systemui.plugins.ClockProvider -import com.android.systemui.plugins.ClockProviderPlugin +import com.android.systemui.plugins.ClockSettings import com.android.systemui.plugins.PluginManager import com.android.systemui.shared.clocks.ClockRegistry import org.junit.Assert import org.junit.Before +import org.junit.Ignore import org.junit.Test import org.junit.runner.RunWith import org.mockito.Mock -import org.mockito.Mockito +import org.mockito.Mockito.verify +import org.mockito.Mockito.`when` as whenever import org.mockito.MockitoAnnotations import org.robolectric.Robolectric import org.robolectric.RobolectricTestRunner @@ -26,55 +24,33 @@ import org.robolectric.annotation.Config /** Tests of [ClockCustomDemoFragment]. */ @RunWith(RobolectricTestRunner::class) @Config(manifest = Config.NONE) +@Ignore("b/270606895") class ClockCustomDemoFragmentTest { private lateinit var mActivity: AppCompatActivity private var mClockCustomDemoFragment: ClockCustomDemoFragment? = null - private lateinit var registry: ClockRegistry + @Mock private lateinit var registry: ClockRegistry @Mock private lateinit var mockPluginManager: PluginManager - @Mock private lateinit var mockHandler: Handler - @Mock private lateinit var fakePlugin: ClockProviderPlugin - @Mock private lateinit var defaultClockProvider: ClockProvider - private var settingValue: String = "" + private var settingValue: ClockSettings? = null @Before fun setUp() { MockitoAnnotations.initMocks(this) mActivity = Robolectric.buildActivity(AppCompatActivity::class.java).get() mClockCustomDemoFragment = ClockCustomDemoFragment() - Mockito.`when`(defaultClockProvider.getClocks()) - .thenReturn(listOf(ClockMetadata("DEFAULT", "Default Clock"))) - registry = - object : - ClockRegistry( - mActivity, - mockPluginManager, - mockHandler, - isEnabled = true, - userHandle = UserHandle.USER_ALL, - defaultClockProvider = defaultClockProvider - ) { - override var currentClockId: ClockId - get() = settingValue - set(value) { - settingValue = value - } - - override fun getClocks(): List<ClockMetadata> { - return defaultClockProvider.getClocks() + - listOf( - ClockMetadata("CLOCK_1", "Clock 1"), - ClockMetadata("CLOCK_2", "Clock 2"), - ClockMetadata("CLOCK_NOT_IN_USE", "Clock not in use") - ) - } - } + whenever(registry.getClocks()) + .thenReturn( + listOf( + ClockMetadata("CLOCK_1", "Clock 1"), + ClockMetadata("CLOCK_2", "Clock 2"), + ClockMetadata("CLOCK_NOT_IN_USE", "Clock not in use") + ) + ) mClockCustomDemoFragment!!.clockRegistry = registry mClockCustomDemoFragment!!.recyclerView = RecyclerView(mActivity) mClockCustomDemoFragment!!.recyclerView.layoutManager = LinearLayoutManager(mActivity, RecyclerView.VERTICAL, false) - mClockCustomDemoFragment!!.pluginListener.onPluginConnected(fakePlugin, mActivity) } @Test @@ -94,6 +70,6 @@ class ClockCustomDemoFragmentTest { .findViewHolderForAdapterPosition(testPosition) ?.itemView ?.performClick() - Assert.assertEquals("CLOCK_1", settingValue) + verify(registry).currentClockId = "CLOCK_1" } } |