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

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

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

parents 3b971911 f1bc8de5

core/tests/BroadcastRadioTests/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ LOCAL_MODULE_TAGS := tests 
# LOCAL_SDK_VERSION := current

LOCAL_PRIVATE_PLATFORM_APIS := true



LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util android-support-test testng

LOCAL_STATIC_JAVA_LIBRARIES := compatibility-device-util androidx.test.rules testng



LOCAL_JAVA_LIBRARIES := android.test.base

core/tests/BroadcastRadioTests/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 
    </application>



    <instrumentation

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

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

        android:targetPackage="android.hardware.radio.tests"

        android:label="Tests for Broadcast Radio APIs" >

    </instrumentation>

core/tests/BroadcastRadioTests/src/android/hardware/radio/tests/functional/RadioTunerTest.java

+18 −20
Original line number Diff line number Diff line
@@ -15,22 +15,29 @@ 
 */

package android.hardware.radio.tests.functional;



import static org.junit.Assert.*;

import static org.junit.Assume.*;

import static org.mockito.Matchers.any;

import static org.mockito.Mockito.after;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.atMost;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.testng.Assert.assertThrows;



import android.Manifest;

import android.content.Context;

import android.content.pm.PackageManager;

import android.hardware.radio.ProgramSelector;

import android.hardware.radio.RadioManager;

import android.hardware.radio.RadioTuner;

import android.support.test.InstrumentationRegistry;

import android.support.test.runner.AndroidJUnit4;

import android.test.suitebuilder.annotation.MediumTest;

import android.util.Log;



import java.lang.reflect.Constructor;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;

import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Before;
@@ -41,19 +48,10 @@ import org.mockito.Mock; 
import org.mockito.Mockito;

import org.mockito.MockitoAnnotations;



import static org.junit.Assert.*;

import static org.junit.Assume.*;

import static org.mockito.Matchers.any;

import static org.mockito.Matchers.anyInt;

import static org.mockito.Mockito.after;

import static org.mockito.Mockito.atLeast;

import static org.mockito.Mockito.atMost;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.timeout;

import static org.mockito.Mockito.times;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;

import static org.testng.Assert.assertThrows;

import java.util.ArrayList;

import java.util.HashMap;

import java.util.List;

import java.util.Map;



/**

 * A test for broadcast radio API.