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

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

Merge changes I3f487038,I4d3213ae 

* changes:
  Refactor directory of broadcast radio unit tests
  Remove broadcast radio functional test
parents aabc5676 9a146d94

core/tests/BroadcastRadioTests/AndroidManifest.xml

+2 −2
Original line number Diff line number Diff line
@@ -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>

core/tests/BroadcastRadioTests/AndroidTest.xml

+1 −1
Original line number Diff line number Diff line
@@ -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>

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

+4 −14
Original line number Diff line number Diff line
@@ -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");

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

+1 −9
Original line number Diff line number Diff line
@@ -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;

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

+1 −3
Original line number Diff line number Diff line
@@ -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;