commit aea650e53f53802eb8f4b7b11c4613d2ab762b16
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> Wed May 15 22:38:35 2024 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed May 15 22:38:35 2024 +0000
tree 054d91ec4fd8e5b38c98c4392f3dc7d35bfbc4ce
parent 79fa40918bdf8c3635dcb3759cab44b199941988
parent 4777c8930a59352d7ca5dcea1d68774a00626f80

Merge "Removes use of deprecated runTestBlocking" into main

src_override/com/android/wallpaper/picker/di/modules/EffectsModule.kt

diff --git a/src_override/com/android/wallpaper/picker/di/modules/EffectsModule.kt b/src_override/com/android/wallpaper/picker/di/modules/EffectsModule.kt
index f49a273..4fc0fbb 100644
--- a/src_override/com/android/wallpaper/picker/di/modules/EffectsModule.kt
+++ b/src_override/com/android/wallpaper/picker/di/modules/EffectsModule.kt
@@ -26,7 +26,7 @@
 /** This class provides the singleton scoped effects controller for wallpaper picker. */
 @InstallIn(SingletonComponent::class)
 @Module
-internal abstract class EffectsModule {
+abstract class EffectsModule {
 
     @Binds
     @Singleton

tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt

diff --git a/tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt b/tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt
index f847aaa..a705af2 100644
--- a/tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt
+++ b/tests/module/src/com/android/wallpaper/ThemePickerTestModule.kt
@@ -24,12 +24,15 @@
 import com.android.customization.module.logging.ThemesUserEventLogger
 import com.android.customization.testing.TestCustomizationInjector
 import com.android.customization.testing.TestDefaultCustomizationPreferences
+import com.android.wallpaper.effects.EffectsController
+import com.android.wallpaper.effects.FakeEffectsController
 import com.android.wallpaper.module.Injector
 import com.android.wallpaper.module.PartnerProvider
 import com.android.wallpaper.module.WallpaperPreferences
 import com.android.wallpaper.module.logging.TestUserEventLogger
 import com.android.wallpaper.module.logging.UserEventLogger
 import com.android.wallpaper.modules.ThemePickerAppModule
+import com.android.wallpaper.picker.di.modules.EffectsModule
 import com.android.wallpaper.picker.preview.data.util.DefaultLiveWallpaperDownloader
 import com.android.wallpaper.picker.preview.data.util.LiveWallpaperDownloader
 import com.android.wallpaper.picker.preview.ui.util.DefaultImageEffectDialogUtil
@@ -45,7 +48,10 @@
 import javax.inject.Singleton
 
 @Module
-@TestInstallIn(components = [SingletonComponent::class], replaces = [ThemePickerAppModule::class])
+@TestInstallIn(
+    components = [SingletonComponent::class],
+    replaces = [EffectsModule::class, ThemePickerAppModule::class]
+)
 abstract class ThemePickerTestModule {
     //// WallpaperPicker2 prod
 
@@ -95,6 +101,10 @@
         impl: DefaultImageEffectDialogUtil
     ): ImageEffectDialogUtil
 
+    @Binds
+    @Singleton
+    abstract fun bindEffectsController(impl: FakeEffectsController): EffectsController
+
     companion object {
         @Provides
         @Singleton