Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix Tuner Unit Tests permission and add a feature checker in the test"

Browse Source
This commit is contained in:
Amy Zhang
2020-12-15 20:43:10 +00:00
committed by Android (Google) Code Review
parent 599aa30dd7 12ab2a65c9
commit c389cd5abc
3 changed files with 20 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
media/tests/TunerTest/Android.bp
View File

@@ -10,6 +10,7 @@ android_test {
static_libs: [
"androidx.test.rules",
"compatibility-device-util-axt",
"testng"
],

5
media/tests/TunerTest/AndroidManifest.xml
View File

@@ -17,7 +17,12 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.android.mediatunertest">
<uses-permission android:name="android.permission.ACCESS_TV_DESCRAMBLER" />
<uses-permission android:name="android.permission.ACCESS_TV_TUNER" />
<uses-permission android:name="android.permission.CREATE_USERS"/>
<uses-permission android:name="android.permission.INTERACT_ACROSS_USERS"/>
<uses-permission android:name="android.permission.MANAGE_USERS"/>
<uses-permission android:name="android.permission.TUNER_RESOURCE_ACCESS" />
<application android:label="@string/app_name">
<uses-library android:name="android.test.runner" />

16
media/tests/TunerTest/src/com/android/mediatunertest/TunerTest.java
View File

@@ -19,6 +19,8 @@ package com.android.mediatunertest;
import static org.junit.Assert.assertNotNull;
import android.content.Context;
import android.content.pm.PackageManager;
import android.media.tv.TvInputService;
import android.media.tv.tuner.Descrambler;
import android.media.tv.tuner.Tuner;
@@ -26,16 +28,24 @@ import androidx.test.InstrumentationRegistry;
import androidx.test.filters.SmallTest;
import androidx.test.runner.AndroidJUnit4;
import com.android.compatibility.common.util.RequiredFeatureRule;
import org.junit.After;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
@RunWith(AndroidJUnit4.class)
@SmallTest
// TODO: (b/174500129) add TEST_MAPPING on TunerTest when TunerService is ready
public class TunerTest {
private static final String TAG = "MediaTunerTest";
@Rule
public RequiredFeatureRule featureRule = new RequiredFeatureRule(
PackageManager.FEATURE_TUNER);
private Context mContext;
@Before
@@ -49,13 +59,15 @@ public class TunerTest {
@Test
public void testTunerConstructor() throws Exception {
Tuner tuner = new Tuner(mContext, "123", 1);
Tuner tuner = new Tuner(mContext, null,
TvInputService.PRIORITY_HINT_USE_CASE_TYPE_BACKGROUND);
assertNotNull(tuner);
}
@Test
public void testOpenDescrambler() throws Exception {
Tuner tuner = new Tuner(mContext, "123", 1);
Tuner tuner = new Tuner(mContext, null,
TvInputService.PRIORITY_HINT_USE_CASE_TYPE_BACKGROUND);
Descrambler descrambler = tuner.openDescrambler();
assertNotNull(descrambler);
}