Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6ad04ab3 authored by Chris Poultney's avatar Chris Poultney
Browse files

Adds a Hilt module for test dependencies 

See go/picker-test-injection

Bug: b/297021618
Test: verified that tests use deps from test module
Change-Id: Iada1f20cd69d3e7ce3d80eae3bfdfa5edc57e821
parent 8bfcd3a5

Android.bp

+7 −0
Original line number Diff line number Diff line
@@ -35,6 +35,13 @@ filegroup { 
    ],

}



// Production-only files that should be excluded in tests.

filegroup {

    name: "ThemePicker_src_prod",

    visibility: [":__subpackages__"],

    srcs: ["src_override/com/android/customization/picker/CustomizationPickerApplication.java"],

}



filegroup {

    name: "ThemePicker_Manifest",

    srcs: [

tests/Android.bp

+28 −2
Original line number Diff line number Diff line
@@ -20,17 +20,43 @@ package { 
    default_applicable_licenses: ["Android-Apache-2.0"],

}



filegroup {

    name: "ThemePickerTests_srcs",



    visibility: [

        "//visibility:public"

    ],



    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

    ],

}



android_test {

    name: "ThemePickerTests",



    defaults: ["ThemePicker_defaults"],

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

        ":ThemePickerTests_srcs",

        ":WallpaperPicker2Tests_srcs",

        "module/src/com/android/customization/TestModule.kt",

    ],

    exclude_srcs: [":ThemePicker_src_prod"],

    static_libs: [

        "WallpaperPicker2TestLib",

        "WallpaperPicker2TestRunner",

        "ThemePickerTestLib",

        "androidx.test.espresso.core",

        "androidx.test.espresso.contrib",

        "androidx.test.espresso.intents",

        "androidx.test.ext.junit",

        "androidx.test.rules",

        "hamcrest-library",

        "hamcrest",

        "hilt_android",

        "hilt_android_testing",

        "mockito-target-minus-junit4",

        "junit",

        "kotlinx_coroutines_test",

        "truth-prebuilt",

tests/AndroidManifest.xml

+9 −1
Original line number Diff line number Diff line
@@ -18,9 +18,17 @@ 


    <application>

        <uses-library android:name="android.test.runner" />



        <activity android:name="com.android.wallpaper.picker.PreviewActivity"

            android:resizeableActivity="false">

        </activity>



        <activity android:name="com.android.wallpaper.picker.preview.ui.WallpaperPreviewActivity"

            android:resizeableActivity="false">

        </activity>

    </application>



    <instrumentation android:name="androidx.test.runner.AndroidJUnitRunner"

    <instrumentation android:name="com.android.wallpaper.CustomTestRunner"

        android:targetPackage="com.android.wallpaper"

        android:label="Tests for ThemePicker" />

tests/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
    <option name="test-tag" value="ThemePickerTests" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.wallpaper" />

        <option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />

        <option name="runner" value="com.android.wallpaper.CustomTestRunner" />

        <option name="hidden-api-checks" value="false"/>

    </test>

</configuration>

tests/common/src/com/android/customization/testing/TestCustomizationInjector.kt

+5 −4
Original line number Diff line number Diff line
@@ -23,8 +23,10 @@ import javax.inject.Inject 
import javax.inject.Singleton



@Singleton

open class TestCustomizationInjector @Inject constructor() : TestInjector(), CustomizationInjector {

    private var customizationPrefs: CustomizationPreferences? = null

open class TestCustomizationInjector

@Inject

constructor(private val customPrefs: TestDefaultCustomizationPreferences) :

    TestInjector(), CustomizationInjector {

    private var themesUserEventLogger: ThemesUserEventLogger? = null



    /////////////////
@@ -32,8 +34,7 @@ open class TestCustomizationInjector @Inject constructor() : TestInjector(), Cus 
    /////////////////



    override fun getCustomizationPreferences(context: Context): CustomizationPreferences {

        return customizationPrefs

            ?: TestDefaultCustomizationPreferences(context).also { customizationPrefs = it }

        return customPrefs

    }



    override fun getKeyguardQuickAffordancePickerInteractor(