diff options
| author | Catherine Liang <cathliang@google.com> | 2023-09-07 14:30:16 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2023-09-07 14:30:16 +0000 |
| commit | bce856e6a45da8d66b4abd130bf9437f2ab07ff6 (patch) | |
| tree | ae37d946131c48c1b8db8275b0eab3c292c5fecf /tests/robotests | |
| parent | 48db6a0b95172604ffb8b005e2947420bb67d902 (diff) | |
| parent | fcdba42181efaa29a390ad739441a2ec9539aeb3 (diff) | |
| download | ThemePicker-bce856e6a45da8d66b4abd130bf9437f2ab07ff6.tar.gz | |
Merge changes from topic "wpp-revamped-ui-clean-up-grid" into main
* changes:
Pre-revamped UI cleanup grid file rename & move (1/2)
Pre-revamped UI grid cleanup
Diffstat (limited to 'tests/robotests')
4 files changed, 13 insertions, 6 deletions
diff --git a/tests/robotests/src/com/android/customization/model/grid/data/repository/FakeGridRepository.kt b/tests/robotests/src/com/android/customization/model/grid/data/repository/FakeGridRepository.kt index 317ad3a2..de68bf07 100644 --- a/tests/robotests/src/com/android/customization/model/grid/data/repository/FakeGridRepository.kt +++ b/tests/robotests/src/com/android/customization/model/grid/data/repository/FakeGridRepository.kt @@ -19,8 +19,9 @@ package com.android.customization.model.grid.data.repository import com.android.customization.model.CustomizationManager import com.android.customization.model.grid.GridOption -import com.android.customization.model.grid.shared.model.GridOptionItemModel -import com.android.customization.model.grid.shared.model.GridOptionItemsModel +import com.android.customization.picker.grid.data.repository.GridRepository +import com.android.customization.picker.grid.shared.model.GridOptionItemModel +import com.android.customization.picker.grid.shared.model.GridOptionItemsModel import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.channels.BufferOverflow import kotlinx.coroutines.flow.Flow diff --git a/tests/robotests/src/com/android/customization/model/grid/domain/interactor/GridInteractorTest.kt b/tests/robotests/src/com/android/customization/model/grid/domain/interactor/GridInteractorTest.kt index f73d5a38..3d6c623a 100644 --- a/tests/robotests/src/com/android/customization/model/grid/domain/interactor/GridInteractorTest.kt +++ b/tests/robotests/src/com/android/customization/model/grid/domain/interactor/GridInteractorTest.kt @@ -19,7 +19,9 @@ package com.android.customization.model.grid.domain.interactor import androidx.test.filters.SmallTest import com.android.customization.model.grid.data.repository.FakeGridRepository -import com.android.customization.model.grid.shared.model.GridOptionItemsModel +import com.android.customization.picker.grid.domain.interactor.GridInteractor +import com.android.customization.picker.grid.domain.interactor.GridSnapshotRestorer +import com.android.customization.picker.grid.shared.model.GridOptionItemsModel import com.android.wallpaper.testing.FakeSnapshotStore import com.android.wallpaper.testing.collectLastValue import com.google.common.truth.Truth.assertThat diff --git a/tests/robotests/src/com/android/customization/model/grid/domain/interactor/GridSnapshotRestorerTest.kt b/tests/robotests/src/com/android/customization/model/grid/domain/interactor/GridSnapshotRestorerTest.kt index c2712b1d..e3f03b7b 100644 --- a/tests/robotests/src/com/android/customization/model/grid/domain/interactor/GridSnapshotRestorerTest.kt +++ b/tests/robotests/src/com/android/customization/model/grid/domain/interactor/GridSnapshotRestorerTest.kt @@ -19,7 +19,9 @@ package com.android.customization.model.grid.domain.interactor import androidx.test.filters.SmallTest import com.android.customization.model.grid.data.repository.FakeGridRepository -import com.android.customization.model.grid.shared.model.GridOptionItemsModel +import com.android.customization.picker.grid.domain.interactor.GridInteractor +import com.android.customization.picker.grid.domain.interactor.GridSnapshotRestorer +import com.android.customization.picker.grid.shared.model.GridOptionItemsModel import com.android.wallpaper.testing.FakeSnapshotStore import com.google.common.truth.Truth.assertThat import kotlinx.coroutines.ExperimentalCoroutinesApi diff --git a/tests/robotests/src/com/android/customization/model/grid/ui/viewmodel/GridScreenViewModelTest.kt b/tests/robotests/src/com/android/customization/model/grid/ui/viewmodel/GridScreenViewModelTest.kt index 58c5d99f..46e914c8 100644 --- a/tests/robotests/src/com/android/customization/model/grid/ui/viewmodel/GridScreenViewModelTest.kt +++ b/tests/robotests/src/com/android/customization/model/grid/ui/viewmodel/GridScreenViewModelTest.kt @@ -20,8 +20,10 @@ package com.android.customization.model.grid.ui.viewmodel import androidx.test.filters.SmallTest import androidx.test.platform.app.InstrumentationRegistry import com.android.customization.model.grid.data.repository.FakeGridRepository -import com.android.customization.model.grid.domain.interactor.GridInteractor -import com.android.customization.model.grid.domain.interactor.GridSnapshotRestorer +import com.android.customization.picker.grid.domain.interactor.GridInteractor +import com.android.customization.picker.grid.domain.interactor.GridSnapshotRestorer +import com.android.customization.picker.grid.ui.viewmodel.GridIconViewModel +import com.android.customization.picker.grid.ui.viewmodel.GridScreenViewModel import com.android.wallpaper.picker.option.ui.viewmodel.OptionItemViewModel import com.android.wallpaper.testing.FakeSnapshotStore import com.android.wallpaper.testing.collectLastValue |