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

Refactor directory of broadcast radio unit tests

Browse Source 
Refactored directory of broadcast radio unit tests so that
default-access methods in android.hardware.radio can be directly
tested in unit tests.

Bug: 262583864
Test: atest android.hardware.radio
Change-Id: I3f4870386cda070a5ab23feea5310c66fce42d29
This commit is contained in:
Weilin Xu
2023-01-13 01:18:24 +00:00
parent 5d479ad660
commit 9a146d94bb
9 changed files with 13 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
core/tests/BroadcastRadioTests/AndroidManifest.xml
View File

@@ -15,7 +15,7 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="android.hardware.radio.tests">
package="com.android.frameworks.broadcastradiotests">
<uses-permission android:name="android.permission.ACCESS_BROADCAST_RADIO" />
@@ -25,7 +25,7 @@
<instrumentation
android:name="androidx.test.runner.AndroidJUnitRunner"
android:targetPackage="android.hardware.radio.tests"
android:targetPackage="com.android.frameworks.broadcastradiotests"
android:label="Tests for Broadcast Radio APIs" >
</instrumentation>
</manifest>

2
core/tests/BroadcastRadioTests/AndroidTest.xml
View File

@@ -25,7 +25,7 @@
<option name="test-tag" value="BroadcastRadioTests" />
<test class="com.android.tradefed.testtype.AndroidJUnitTest" >
<option name="package" value="android.hardware.radio.tests" />
<option name="package" value="com.android.frameworks.broadcastradiotests" />
<option name="runner" value="androidx.test.runner.AndroidJUnitRunner" />
<option name="hidden-api-checks" value="false"/>
</test>

18
core/tests/BroadcastRadioTests/src/android/hardware/radio/tests/unittests/DefaultRadioTunerTest.java → core/tests/BroadcastRadioTests/src/android/hardware/radio/DefaultRadioTunerTest.java
View File

@@ -14,17 +14,13 @@
* limitations under the License.
*/
package android.hardware.radio.tests.unittests;
package android.hardware.radio;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.assertThrows;
import android.graphics.Bitmap;
import android.hardware.radio.ProgramList;
import android.hardware.radio.ProgramSelector;
import android.hardware.radio.RadioManager;
import android.hardware.radio.RadioTuner;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
@@ -167,9 +163,7 @@ public final class DefaultRadioTunerTest {
@Test
public void setConfigFlag_forRadioTuner_throwsException() {
UnsupportedOperationException thrown = assertThrows(UnsupportedOperationException.class,
() -> {
DEFAULT_RADIO_TUNER.setConfigFlag(/* flag= */ 1, /* value= */ false);
});
() -> DEFAULT_RADIO_TUNER.setConfigFlag(/* flag= */ 1, /* value= */ false));
assertWithMessage("Exception for setting config flag on default radio tuner")
.that(thrown).hasMessageThat().contains("Setting config flag is not supported");
@@ -178,9 +172,7 @@ public final class DefaultRadioTunerTest {
@Test
public void setParameters_forRadioTuner_throwsException() {
UnsupportedOperationException thrown = assertThrows(UnsupportedOperationException.class,
() -> {
DEFAULT_RADIO_TUNER.setParameters(Map.of("testKey", "testValue"));
});
() -> DEFAULT_RADIO_TUNER.setParameters(Map.of("testKey", "testValue")));
assertWithMessage("Exception for setting parameters from default radio tuner")
.that(thrown).hasMessageThat().contains("Setting parameters is not supported");
@@ -189,9 +181,7 @@ public final class DefaultRadioTunerTest {
@Test
public void getParameters_forRadioTuner_throwsException() {
UnsupportedOperationException thrown = assertThrows(UnsupportedOperationException.class,
() -> {
DEFAULT_RADIO_TUNER.getParameters(List.of("testKey"));
});
() -> DEFAULT_RADIO_TUNER.getParameters(List.of("testKey")));
assertWithMessage("Exception for getting parameters from default radio tuner")
.that(thrown).hasMessageThat().contains("Getting parameters is not supported");

10
core/tests/BroadcastRadioTests/src/android/hardware/radio/tests/unittests/ProgramListTest.java → core/tests/BroadcastRadioTests/src/android/hardware/radio/ProgramListTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.hardware.radio.tests.unittests;
package android.hardware.radio;
import static com.google.common.truth.Truth.assertWithMessage;
@@ -29,14 +29,6 @@ import static org.mockito.Mockito.timeout;
import static org.mockito.Mockito.verify;
import android.content.Context;
import android.hardware.radio.IRadioService;
import android.hardware.radio.ITuner;
import android.hardware.radio.ITunerCallback;
import android.hardware.radio.ProgramList;
import android.hardware.radio.ProgramSelector;
import android.hardware.radio.RadioManager;
import android.hardware.radio.RadioMetadata;
import android.hardware.radio.RadioTuner;
import android.os.Parcel;
import android.os.RemoteException;
import android.util.ArraySet;

4
core/tests/BroadcastRadioTests/src/android/hardware/radio/tests/unittests/ProgramSelectorTest.java → core/tests/BroadcastRadioTests/src/android/hardware/radio/ProgramSelectorTest.java
View File

@@ -14,15 +14,13 @@
* limitations under the License.
*/
package android.hardware.radio.tests.unittests;
package android.hardware.radio;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.assertThrows;
import android.annotation.Nullable;
import android.hardware.radio.ProgramSelector;
import android.hardware.radio.RadioManager;
import android.os.Parcel;
import org.junit.Test;

4
core/tests/BroadcastRadioTests/src/android/hardware/radio/tests/unittests/RadioAnnouncementTest.java → core/tests/BroadcastRadioTests/src/android/hardware/radio/RadioAnnouncementTest.java
View File

@@ -14,14 +14,12 @@
* limitations under the License.
*/
package android.hardware.radio.tests.unittests;
package android.hardware.radio;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.assertThrows;
import android.hardware.radio.Announcement;
import android.hardware.radio.ProgramSelector;
import android.os.Parcel;
import android.util.ArrayMap;

10
core/tests/BroadcastRadioTests/src/android/hardware/radio/tests/unittests/RadioManagerTest.java → core/tests/BroadcastRadioTests/src/android/hardware/radio/RadioManagerTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.hardware.radio.tests.unittests;
package android.hardware.radio;
import static com.google.common.truth.Truth.assertWithMessage;
@@ -30,14 +30,6 @@ import static org.mockito.Mockito.when;
import android.annotation.Nullable;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.hardware.radio.Announcement;
import android.hardware.radio.IAnnouncementListener;
import android.hardware.radio.ICloseHandle;
import android.hardware.radio.IRadioService;
import android.hardware.radio.ProgramSelector;
import android.hardware.radio.RadioManager;
import android.hardware.radio.RadioMetadata;
import android.hardware.radio.RadioTuner;
import android.os.Build;
import android.os.Parcel;
import android.os.RemoteException;

3
core/tests/BroadcastRadioTests/src/android/hardware/radio/tests/unittests/RadioMetadataTest.java → core/tests/BroadcastRadioTests/src/android/hardware/radio/RadioMetadataTest.java
View File

@@ -14,14 +14,13 @@
* limitations under the License.
*/
package android.hardware.radio.tests.unittests;
package android.hardware.radio;
import static com.google.common.truth.Truth.assertWithMessage;
import static org.junit.Assert.assertThrows;
import android.graphics.Bitmap;
import android.hardware.radio.RadioMetadata;
import android.os.Parcel;
import org.junit.Test;

9
core/tests/BroadcastRadioTests/src/android/hardware/radio/tests/unittests/TunerAdapterTest.java → core/tests/BroadcastRadioTests/src/android/hardware/radio/TunerAdapterTest.java
View File

@@ -14,7 +14,7 @@
* limitations under the License.
*/
package android.hardware.radio.tests.unittests;
package android.hardware.radio;
import static com.google.common.truth.Truth.assertWithMessage;
@@ -32,13 +32,6 @@ import static org.mockito.Mockito.when;
import android.content.Context;
import android.content.pm.ApplicationInfo;
import android.graphics.Bitmap;
import android.hardware.radio.IRadioService;
import android.hardware.radio.ITuner;
import android.hardware.radio.ITunerCallback;
import android.hardware.radio.ProgramSelector;
import android.hardware.radio.RadioManager;
import android.hardware.radio.RadioMetadata;
import android.hardware.radio.RadioTuner;
import android.os.Build;
import android.os.RemoteException;