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

Commit b7b428cc authored by Paul Colța's avatar Paul Colța Committed by Android (Google) Code Review
Browse files

Merge "HDMI: Run android.hardware.hdmi in presubmits"

parents fcceec1f 7f65c4bc

core/java/android/app/TEST_MAPPING

+17 −0
Original line number Diff line number Diff line
@@ -218,6 +218,23 @@ 
            "file_patterns": [

                "(/|^)GameManager[^/]*", "(/|^)GameMode[^/]*"

            ]

        },

        {

            "name": "HdmiCecTests",

            "options": [

                {

                    "exclude-annotation": "androidx.test.filters.FlakyTest"

                },

                {

                    "exclude-annotation": "org.junit.Ignore"

                },

                {

                    "include-filter": "android.hardware.hdmi"

                }

            ],

            "file_patterns": [

                "(/|^)DeviceFeature[^/]*", "(/|^)Hdmi[^/]*"

            ]

        }

    ],

    "presubmit-large": [

core/tests/coretests/src/android/hardware/hdmi/HdmiUtilsTest.java

+3 −0
Original line number Diff line number Diff line
@@ -17,12 +17,15 @@ package android.hardware.hdmi; 


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



import android.platform.test.annotations.Presubmit;



import androidx.test.filters.SmallTest;



import org.junit.Test;

import org.junit.runner.RunWith;

import org.junit.runners.JUnit4;



@Presubmit

@SmallTest

@RunWith(JUnit4.class)

/** Tests for {@link HdmiUtils} class. */

core/tests/hdmitests/Android.bp

+2 −0
Original line number Diff line number Diff line
@@ -29,9 +29,11 @@ android_test { 
        "androidx.test.rules",

        "frameworks-base-testutils",

        "guava-android-testlib",

        "platform-test-annotations",

        "truth-prebuilt",

    ],

    libs: ["android.test.runner"],

    platform_apis: true,

    certificate: "platform",

    test_suites: ["device-tests"],

}

core/tests/hdmitests/AndroidTest.xml

+4 −0
Original line number Diff line number Diff line
@@ -22,6 +22,9 @@ 
        <option name="cleanup-apks" value="true" />

        <option name="test-file-name" value="HdmiCecTests.apk" />

    </target_preparer>

    <target_preparer class="com.android.tradefed.targetprep.RootTargetPreparer">

        <option name="force-root" value="true" />

    </target_preparer>



    <option name="test-suite-tag" value="apct"/>

    <option name="test-tag" value="HdmiTests"/>
@@ -30,5 +33,6 @@ 
        <option name="package" value="android.hardware.hdmi" />

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

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

        <option name="test-filter-dir" value="/data/data/android.hardware.hdmi" />

    </test>

</configuration>
 
 No newline at end of file

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

+3 −0
Original line number Diff line number Diff line
@@ -22,6 +22,8 @@ import static android.hardware.hdmi.DeviceFeatures.FEATURE_SUPPORT_UNKNOWN; 


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



import android.platform.test.annotations.Presubmit;



import androidx.test.filters.SmallTest;



import com.google.common.testing.EqualsTester;
@@ -31,6 +33,7 @@ import org.junit.runner.RunWith; 
import org.junit.runners.JUnit4;



/** Tests for {@link DeviceFeatures} */

@Presubmit

@RunWith(JUnit4.class)

@SmallTest

public class DeviceFeaturesTest {