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

Commit 1b5dc7ab authored by Chaohui Wang's avatar Chaohui Wang
Browse files

Move ComposeContentTestRuleExt to SpaLibTestUtils 

To use it in SpaTests in the future.

Bug: 259520506
Test: Unit test
Change-Id: Ic5ad78be4e04451cf317a70dfd615293565b488d
parent afe6bcfa

packages/SettingsLib/Spa/build.gradle

+2 −2
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ buildscript { 
    }

}

plugins {

    id 'com.android.application' version '7.3.0' apply false

    id 'com.android.library' version '7.3.0' apply false

    id 'com.android.application' version '7.3.1' apply false

    id 'com.android.library' version '7.3.1' apply false

    id 'org.jetbrains.kotlin.android' version '1.7.20' apply false

}

packages/SettingsLib/Spa/tests/Android.bp

+2 −5
Original line number Diff line number Diff line
@@ -27,13 +27,10 @@ android_test { 
    static_libs: [

        "SpaLib",

        "SpaLibTestUtils",

        "androidx.test.runner",

        "androidx.test.ext.junit",

        "androidx.compose.runtime_runtime",

        "androidx.compose.ui_ui-test-junit4",

        "androidx.compose.ui_ui-test-manifest",

        "androidx.test.ext.junit",

        "androidx.test.runner",

        "mockito-target-minus-junit4",

        "truth-prebuilt",

    ],

    kotlincflags: ["-Xjvm-default=all"],

    min_sdk_version: "31",

packages/SettingsLib/Spa/tests/build.gradle

+1 −4
Original line number Diff line number Diff line
@@ -61,8 +61,5 @@ android { 
dependencies {

    androidTestImplementation project(":spa")

    androidTestImplementation project(":testutils")

    androidTestImplementation "androidx.compose.ui:ui-test-junit4:$jetpack_compose_version"

    androidTestImplementation "com.google.truth:truth:1.1.3"

    androidTestImplementation "org.mockito:mockito-android:3.4.6"

    androidTestDebugImplementation "androidx.compose.ui:ui-test-manifest:$jetpack_compose_version"

    androidTestImplementation "com.linkedin.dexmaker:dexmaker-mockito:2.28.1"

}

packages/SettingsLib/Spa/testutils/Android.bp

+4 −1
Original line number Diff line number Diff line
@@ -24,7 +24,10 @@ android_library { 
    srcs: ["src/**/*.kt"],



    static_libs: [

        "mockito-target-minus-junit4",

        "androidx.compose.ui_ui-test-junit4",

        "androidx.compose.ui_ui-test-manifest",

        "mockito",

        "truth-prebuilt",

    ],

    kotlincflags: [

        "-Xjvm-default=all",

packages/SettingsLib/Spa/testutils/build.gradle

+4 −1
Original line number Diff line number Diff line
@@ -47,5 +47,8 @@ android { 
}



dependencies {

    api "org.mockito:mockito-android:3.4.6"

    api "androidx.compose.ui:ui-test-junit4:$jetpack_compose_version"

    api "com.google.truth:truth:1.1.3"

    api "org.mockito:mockito-core:2.21.0"

    debugApi "androidx.compose.ui:ui-test-manifest:$jetpack_compose_version"

}