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

Commit 91f2ff97 authored by Amy's avatar Amy Committed by Amy Zhang
Browse files

Add Tuner Resource Manager Test as Presubmit test 

Trm tests have already been part of FrameworksServicesTests.
No TEST_MAPPING needed since per test, the TEST_MAPPING in
parent dir covers the child ones.
Adding Presubmit annotation should enable TRM unit tests as presubmit tests.

The bp and manifest files are to make trm tests be able to be compiled and
run independently.

Test: atest --test-mapping under frameworks/base
Bug: 151186028
Change-Id: I1f1b52cb1f14f844024293f726e145b2ef2fee53
parent a7aededa

services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/Android.bp

0 → 100644
+37 −0
Original line number Diff line number Diff line 
android_test {

    name: "TunerResourceManagerTests",



    // Include all test java files.

    srcs: [

        "*.java",

    ],



    static_libs: [

        "frameworks-base-testutils",

        "services.core",

        "services.devicepolicy",

        "guava",

        "androidx.test.core",

        "androidx.test.ext.truth",

        "androidx.test.runner",

        "androidx.test.rules",

        "mockito-target-minus-junit4",

        "platform-test-annotations",

        "truth-prebuilt",

        "testables",

        "testng",

        "servicestests-utils",

        "service-permission",



    ],



    libs: [

        "android.test.mock",

        "android.test.base",

        "android.test.runner",

    ],



    platform_apis: true,

    test_suites: ["general-tests", "device-tests"],

    compile_multilib: "both",

}
 
 No newline at end of file

services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/AndroidManifest.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright 2020 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->



<manifest xmlns:android="http://schemas.android.com/apk/res/android"

        package="com.android.server.tv.tunerresourcemanager">

    <application>

        <uses-library android:name="android.test.runner" />

    </application>

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

                     android:targetPackage="com.android.server.tv.tunerresourcemanager"

                     android:label="Tuner Resource Manager Test Cases">

    </instrumentation>

</manifest>

services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/AndroidTest.xml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright 2020 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.

     You may obtain a copy of the License at



          http://www.apache.org/licenses/LICENSE-2.0



     Unless required by applicable law or agreed to in writing, software

     distributed under the License is distributed on an "AS IS" BASIS,

     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

     See the License for the specific language governing permissions and

     limitations under the License.

-->

<configuration description="Runs Tests for Tuner Resource Manager">

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

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

    </target_preparer>



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

    <option name="test-suite-tag" value="framework-base-presubmit" />

    <option name="test-tag" value="TunerResourceManagerTests" />

    <test class="com.android.tradefed.testtype.AndroidJUnitTest" >

        <option name="package" value="com.android.server.tv.tunerresourcemanager" />

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

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

    </test>

</configuration>
 
 No newline at end of file

services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/TunerResourceManagerServiceTest.java

+2 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ import android.media.tv.tunerresourcemanager.TunerFrontendInfo; 
import android.media.tv.tunerresourcemanager.TunerFrontendRequest;

import android.media.tv.tunerresourcemanager.TunerResourceManager;

import android.os.RemoteException;

import android.platform.test.annotations.Presubmit;



import androidx.test.InstrumentationRegistry;

import androidx.test.filters.SmallTest;
@@ -54,6 +55,7 @@ import java.util.Map; 
 * Tests for {@link TunerResourceManagerService} class.

 */

@SmallTest

@Presubmit

@RunWith(JUnit4.class)

public class TunerResourceManagerServiceTest {

    private static final String TAG = "TunerResourceManagerServiceTest";

services/tests/servicestests/src/com/android/server/tv/tunerresourcemanager/UseCasePriorityHintsTest.java

+2 −0
Original line number Diff line number Diff line
@@ -18,6 +18,7 @@ package com.android.server.tv.tunerresourcemanager; 
import static com.google.common.truth.Truth.assertThat;



import android.media.tv.TvInputService;

import android.platform.test.annotations.Presubmit;

import android.util.Slog;



import androidx.test.filters.SmallTest;
@@ -36,6 +37,7 @@ import java.nio.charset.StandardCharsets; 
 * Tests for {@link UseCasePriorityHints} class.

 */

@SmallTest

@Presubmit

@RunWith(JUnit4.class)

public class UseCasePriorityHintsTest {

    private static final String TAG = "UseCasePriorityHintsTest";