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

Commit acd95546 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Clean up obsolete aliases for Truth." into main

parents c320afa7 c81fbcef

tests/anomaly-tester/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ android_test { 
        "androidx.test.rules",

        "mockito-target",

        "androidx.test.uiautomator_uiautomator",

        "truth-prebuilt",

        "truth",

    ],



    srcs: ["**/*.java"],

tests/componenttests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ android_test { 
    ],



    static_libs: [

        "truth-prebuilt",

        "truth",

        "androidx.test.core",

        "androidx.test.espresso.core",

        "androidx.test.espresso.intents-nodeps",

tests/robotests/Android.bp

+5 −2
Original line number Diff line number Diff line
@@ -72,7 +72,10 @@ android_robolectric_test { 
        "ims-common",

    ],



    java_resource_dirs: ["config", "resources"],

    java_resource_dirs: [

        "config",

        "resources",

    ],



    instrumentation_for: "SettingsRoboTestStub",
@@ -97,6 +100,6 @@ java_library { 
        "Robolectric_all-target_upstream",

        "Settings-core",

        "mockito-robolectric-prebuilt",

        "truth-prebuilt",

        "truth",

    ],

}

tests/uitests/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ android_test { 
        "settings-helper",

        "sysui-helper",

        "timeresult-helper-lib",

        "truth-prebuilt",

        "truth",

    ],



    //sdk_version: "current",

tests/unit/Android.bp

+2 −2
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@ android_test { 
        "mockito-target-minus-junit4",

        "platform-test-annotations",

        "platform-test-rules",

        "truth-prebuilt",

        "truth",

        "kotlinx_coroutines_test",

        "flag-junit",

        "Settings-testutils2",
@@ -36,7 +36,7 @@ android_test { 
    ],



    errorprone: {

        javacflags: ["-Xep:CheckReturnValue:WARN"]

        javacflags: ["-Xep:CheckReturnValue:WARN"],

    },

    // Include all test java/kotlin files.

    srcs: [