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

Commit 552cbc57 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Update test for Truth8 deprecation." into main

parents a25e0481 fe9f4704

framework/tests/bumble/Android.bp

+1 −1
Original line number Diff line number Diff line
@@ -35,7 +35,7 @@ android_test_helper_app { 
        "opencensus-java-contrib-grpc-metrics",

        "pandora-grpc-java",

        "pandora-proto-java",

        "truth-java8-extension",

        "truth",

    ],



    // Include all test java and kotlin files.

framework/tests/bumble/build.gradle.kts

+2 −2
Original line number Diff line number Diff line
@@ -65,8 +65,8 @@ dependencies { 
    implementation(files("$out/cts/common/device-side/util-axt/compatibility-device-util-axt/android_common/combined/compatibility-device-util-axt.jar"))

    // Test Parameter Injector

    implementation(files("$out/external/TestParameterInjector/TestParameterInjector/android_common/combined/TestParameterInjector.jar"))

    // TruthJava8

    implementation(files("$out/external/truth/truth-java8-extension/android_common/combined/truth-java8-extension.jar"))

    // Truth

    implementation(files("$out/external/truth/truth/android_common/combined/truth.jar"))

    // OkHttp

    implementation(files("$out/external/grpc-grpc-java/grpc-java-okhttp-client-lite/android_common/combined/grpc-java-okhttp-client-lite.jar"))

    // Mockito

framework/tests/bumble/src/android/bluetooth/GattClientTest.java

+0 −1
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ import static android.bluetooth.BluetoothGatt.GATT_SUCCESS; 
import static android.bluetooth.BluetoothProfile.STATE_CONNECTED;



import static com.google.common.truth.Truth.assertThat;

import static com.google.common.truth.Truth8.assertThat;



import static org.mockito.Mockito.any;

import static org.mockito.Mockito.anyInt;