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

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

Merge "Migrate frameworks/base/core/tests/hdmitests to androidx.test"

parents 29a55d4d 7b8827a0

core/tests/hdmitests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ LOCAL_MODULE_TAGS := tests 
# Include all test java files

LOCAL_SRC_FILES := $(call all-java-files-under, src)



LOCAL_STATIC_JAVA_LIBRARIES := android-support-test frameworks-base-testutils

LOCAL_STATIC_JAVA_LIBRARIES := androidx.test.rules frameworks-base-testutils



LOCAL_JAVA_LIBRARIES := android.test.runner

LOCAL_PACKAGE_NAME := HdmiCecTests

core/tests/hdmitests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        <uses-library android:name="android.test.runner" />

    </application>



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

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

        android:targetPackage="android.hardware.hdmi"

        android:label="HDMI CEC Tests"/>

core/tests/hdmitests/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -29,6 +29,6 @@ 
    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="android.hardware.hdmi" />

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

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

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

    </test>

</configuration>
 
 No newline at end of file

core/tests/hdmitests/src/android/hardware/hdmi/HdmiAudioSystemClientTest.java

+5 −2
Original line number Diff line number Diff line
@@ -18,15 +18,18 @@ package android.hardware.hdmi; 


import android.os.Handler;

import android.os.test.TestLooper;

import android.support.test.filters.SmallTest;

import android.util.Log;

import java.util.List;



import androidx.test.filters.SmallTest;



import org.junit.Assert;

import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;



import java.util.List;



/**

 * Tests for {@link HdmiAudioSystemClient}

 */