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

Commit f7b1b556 authored by Weilin Xu's avatar Weilin Xu
Browse files

Use SetFlagsRule in broadcast radio unit tests 

Used SetFlagsRule instead of CheckFlagsRule in broadcast radio unit
tests to run all tests with and without feature flag enabled every
time.

Bug: 312527860
Test: atest BroadcastRadioTests
Change-Id: I37ddc7907484e983090ecfe495dc631ef02b9bfd
parent bfbd7ae9

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

+4 −6
Original line number Original line Diff line number Diff line
@@ -34,9 +34,7 @@ import android.content.pm.ApplicationInfo; 
import android.os.Build;

import android.os.Build;

import android.os.Parcel;

import android.os.Parcel;

import android.os.RemoteException;

import android.os.RemoteException;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.SetFlagsRule;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.util.ArraySet;

import android.util.ArraySet;





import com.google.common.truth.Expect;

import com.google.common.truth.Expect;
@@ -150,7 +148,7 @@ public final class ProgramListTest { 
    @Rule

    @Rule

    public final Expect mExpect = Expect.create();

    public final Expect mExpect = Expect.create();

    @Rule

    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();





    @Test

    @Test

    public void getIdentifierTypes_forFilter() {

    public void getIdentifierTypes_forFilter() {
@@ -631,8 +629,8 @@ public final class ProgramListTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void getProgramInfos() throws Exception {

    public void getProgramInfos() throws Exception {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        createRadioTuner();

        createRadioTuner();

        mProgramList = mRadioTuner.getDynamicProgramList(TEST_FILTER);

        mProgramList = mRadioTuner.getDynamicProgramList(TEST_FILTER);

        registerListCallbacks(/* numCallbacks= */ 1);

        registerListCallbacks(/* numCallbacks= */ 1);
@@ -648,8 +646,8 @@ public final class ProgramListTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void getProgramInfos_withIdNotFound() throws Exception {

    public void getProgramInfos_withIdNotFound() throws Exception {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        createRadioTuner();

        createRadioTuner();

        mProgramList = mRadioTuner.getDynamicProgramList(TEST_FILTER);

        mProgramList = mRadioTuner.getDynamicProgramList(TEST_FILTER);

        registerListCallbacks(/* numCallbacks= */ 1);

        registerListCallbacks(/* numCallbacks= */ 1);

core/tests/BroadcastRadioTests/src/android/hardware/radio/RadioManagerTest.java

+8 −7
Original line number Original line Diff line number Diff line
@@ -32,9 +32,7 @@ import android.content.Context; 
import android.content.pm.ApplicationInfo;

import android.content.pm.ApplicationInfo;

import android.os.Parcel;

import android.os.Parcel;

import android.os.RemoteException;

import android.os.RemoteException;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.SetFlagsRule;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.util.ArrayMap;

import android.util.ArrayMap;





import org.junit.Rule;

import org.junit.Rule;
@@ -168,7 +166,7 @@ public final class RadioManagerTest { 
    private ICloseHandle mCloseHandleMock;

    private ICloseHandle mCloseHandleMock;





    @Rule

    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();





    @Test

    @Test

    public void getType_forBandDescriptor() {

    public void getType_forBandDescriptor() {
@@ -962,22 +960,25 @@ public final class RadioManagerTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void isSignalAcquired_forProgramInfo() {

    public void isSignalAcquired_forProgramInfo() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);



        assertWithMessage("Signal acquisition status for HD program info")

        assertWithMessage("Signal acquisition status for HD program info")

                .that(HD_PROGRAM_INFO.isSignalAcquired()).isTrue();

                .that(HD_PROGRAM_INFO.isSignalAcquired()).isTrue();

    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void isHdSisAvailable_forProgramInfo() {

    public void isHdSisAvailable_forProgramInfo() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);



        assertWithMessage("SIS information acquisition status for HD program")

        assertWithMessage("SIS information acquisition status for HD program")

                .that(HD_PROGRAM_INFO.isHdSisAvailable()).isTrue();

                .that(HD_PROGRAM_INFO.isHdSisAvailable()).isTrue();

    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void isHdAudioAvailable_forProgramInfo() {

    public void isHdAudioAvailable_forProgramInfo() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);



        assertWithMessage("Audio acquisition status for HD program")

        assertWithMessage("Audio acquisition status for HD program")

                .that(HD_PROGRAM_INFO.isHdAudioAvailable()).isFalse();

                .that(HD_PROGRAM_INFO.isHdAudioAvailable()).isFalse();

    }

    }

core/tests/BroadcastRadioTests/src/android/hardware/radio/RadioMetadataTest.java

+13 −15
Original line number Original line Diff line number Diff line
@@ -22,10 +22,7 @@ import static org.junit.Assert.assertThrows; 




import android.graphics.Bitmap;

import android.graphics.Bitmap;

import android.os.Parcel;

import android.os.Parcel;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.flag.junit.SetFlagsRule;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;





import org.junit.Rule;

import org.junit.Rule;

import org.junit.Test;

import org.junit.Test;
@@ -52,7 +49,7 @@ public final class RadioMetadataTest { 
    private Bitmap mBitmapValue;

    private Bitmap mBitmapValue;





    @Rule

    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();





    @Test

    @Test

    public void describeContents_forClock() {

    public void describeContents_forClock() {
@@ -128,8 +125,8 @@ public final class RadioMetadataTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void putStringArray_withIllegalKey_throwsException() {

    public void putStringArray_withIllegalKey_throwsException() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        String invalidStringArrayKey = RadioMetadata.METADATA_KEY_HD_STATION_NAME_LONG;

        String invalidStringArrayKey = RadioMetadata.METADATA_KEY_HD_STATION_NAME_LONG;





        IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class, () -> {

        IllegalArgumentException thrown = assertThrows(IllegalArgumentException.class, () -> {
@@ -142,8 +139,9 @@ public final class RadioMetadataTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void putStringArray_withNullKey_throwsException() {

    public void putStringArray_withNullKey_throwsException() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);



        NullPointerException thrown = assertThrows(NullPointerException.class, () -> {

        NullPointerException thrown = assertThrows(NullPointerException.class, () -> {

            mBuilder.putStringArray(/* key= */ null, UFIDS_VALUE);

            mBuilder.putStringArray(/* key= */ null, UFIDS_VALUE);

        });

        });
@@ -153,8 +151,9 @@ public final class RadioMetadataTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void putStringArray_withNullString_throwsException() {

    public void putStringArray_withNullString_throwsException() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);



        NullPointerException thrown = assertThrows(NullPointerException.class, () -> {

        NullPointerException thrown = assertThrows(NullPointerException.class, () -> {

            mBuilder.putStringArray(RadioMetadata.METADATA_KEY_UFIDS, /* value= */ null);

            mBuilder.putStringArray(RadioMetadata.METADATA_KEY_UFIDS, /* value= */ null);

        });

        });
@@ -281,8 +280,8 @@ public final class RadioMetadataTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void getStringArray_withKeyInMetadata() {

    public void getStringArray_withKeyInMetadata() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        String key = RadioMetadata.METADATA_KEY_UFIDS;

        String key = RadioMetadata.METADATA_KEY_UFIDS;

        RadioMetadata metadata = mBuilder.putStringArray(key, UFIDS_VALUE).build();

        RadioMetadata metadata = mBuilder.putStringArray(key, UFIDS_VALUE).build();
@@ -291,8 +290,8 @@ public final class RadioMetadataTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void getStringArray_withKeyNotInMetadata() {

    public void getStringArray_withKeyNotInMetadata() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        String key = RadioMetadata.METADATA_KEY_UFIDS;

        String key = RadioMetadata.METADATA_KEY_UFIDS;

        RadioMetadata metadata = mBuilder.build();

        RadioMetadata metadata = mBuilder.build();
@@ -305,8 +304,8 @@ public final class RadioMetadataTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void getStringArray_withNullKey() {

    public void getStringArray_withNullKey() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        RadioMetadata metadata = mBuilder.build();

        RadioMetadata metadata = mBuilder.build();





        NullPointerException thrown = assertThrows(NullPointerException.class, () -> {

        NullPointerException thrown = assertThrows(NullPointerException.class, () -> {
@@ -318,8 +317,8 @@ public final class RadioMetadataTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void getStringArray_withInvalidKey() {

    public void getStringArray_withInvalidKey() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        String invalidClockKey = RadioMetadata.METADATA_KEY_HD_STATION_NAME_LONG;

        String invalidClockKey = RadioMetadata.METADATA_KEY_HD_STATION_NAME_LONG;

        RadioMetadata metadata = mBuilder.build();

        RadioMetadata metadata = mBuilder.build();
@@ -413,7 +412,6 @@ public final class RadioMetadataTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsDisabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void writeToParcel_forRadioMetadata() {

    public void writeToParcel_forRadioMetadata() {

        RadioMetadata metadataExpected = mBuilder

        RadioMetadata metadataExpected = mBuilder

                .putInt(RadioMetadata.METADATA_KEY_RDS_PI, INT_KEY_VALUE)

                .putInt(RadioMetadata.METADATA_KEY_RDS_PI, INT_KEY_VALUE)
@@ -430,8 +428,8 @@ public final class RadioMetadataTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void writeToParcel_forRadioMetadata_withStringArrayTypeMetadata() {

    public void writeToParcel_forRadioMetadata_withStringArrayTypeMetadata() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        RadioMetadata metadataExpected = mBuilder

        RadioMetadata metadataExpected = mBuilder

                .putInt(RadioMetadata.METADATA_KEY_RDS_PI, INT_KEY_VALUE)

                .putInt(RadioMetadata.METADATA_KEY_RDS_PI, INT_KEY_VALUE)

                .putString(RadioMetadata.METADATA_KEY_ARTIST, ARTIST_KEY_VALUE)

                .putString(RadioMetadata.METADATA_KEY_ARTIST, ARTIST_KEY_VALUE)
@@ -443,7 +441,7 @@ public final class RadioMetadataTest { 
        parcel.setDataPosition(0);

        parcel.setDataPosition(0);





        RadioMetadata metadataFromParcel = RadioMetadata.CREATOR.createFromParcel(parcel);

        RadioMetadata metadataFromParcel = RadioMetadata.CREATOR.createFromParcel(parcel);

        assertWithMessage("Radio metadata created from parcel")

        assertWithMessage("Radio metadata created from parcel with string array type metadata")

                .that(metadataFromParcel).isEqualTo(metadataExpected);

                .that(metadataFromParcel).isEqualTo(metadataExpected);

    }

    }

}
 
}

core/tests/BroadcastRadioTests/src/android/hardware/radio/TunerAdapterTest.java

+8 −11
Original line number Original line Diff line number Diff line
@@ -36,10 +36,7 @@ import android.content.pm.ApplicationInfo; 
import android.graphics.Bitmap;

import android.graphics.Bitmap;

import android.os.Build;

import android.os.Build;

import android.os.RemoteException;

import android.os.RemoteException;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.flag.junit.SetFlagsRule;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;





import org.junit.After;

import org.junit.After;

import org.junit.Before;

import org.junit.Before;
@@ -84,7 +81,7 @@ public final class TunerAdapterTest { 
    private RadioTuner.Callback mCallbackMock;

    private RadioTuner.Callback mCallbackMock;





    @Rule

    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();





    @Before

    @Before

    public void setUp() throws Exception {

    public void setUp() throws Exception {
@@ -613,9 +610,9 @@ public final class TunerAdapterTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void isConfigFlagSet_withForceAnalogWhenFmForceAnalogSupported()

    public void isConfigFlagSet_withForceAnalogWhenFmForceAnalogSupported()

            throws Exception {

            throws Exception {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);

        when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);

        when(mTunerMock.isConfigFlagSet(RadioManager.CONFIG_FORCE_ANALOG_FM))

        when(mTunerMock.isConfigFlagSet(RadioManager.CONFIG_FORCE_ANALOG_FM))

                .thenReturn(true);

                .thenReturn(true);
@@ -626,9 +623,9 @@ public final class TunerAdapterTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void isConfigFlagSet_withForceAnalogWhenFmForceAnalogNotSupported()

    public void isConfigFlagSet_withForceAnalogWhenFmForceAnalogNotSupported()

            throws Exception {

            throws Exception {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        when(mTunerMock.isConfigFlagSupported(RadioManager.CONFIG_FORCE_ANALOG_FM))

        when(mTunerMock.isConfigFlagSupported(RadioManager.CONFIG_FORCE_ANALOG_FM))

                .thenReturn(false);

                .thenReturn(false);

        when(mTunerMock.isConfigFlagSupported(RadioManager.CONFIG_FORCE_ANALOG)).thenReturn(true);

        when(mTunerMock.isConfigFlagSupported(RadioManager.CONFIG_FORCE_ANALOG)).thenReturn(true);
@@ -640,9 +637,9 @@ public final class TunerAdapterTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsDisabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void isConfigFlagSet_withForceAnalogWhenHdRadioImprovedFeatureNotEnabled()

    public void isConfigFlagSet_withForceAnalogWhenHdRadioImprovedFeatureNotEnabled()

            throws Exception {

            throws Exception {

        mSetFlagsRule.disableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);

        when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);

        when(mTunerMock.isConfigFlagSet(RadioManager.CONFIG_FORCE_ANALOG)).thenReturn(false);

        when(mTunerMock.isConfigFlagSet(RadioManager.CONFIG_FORCE_ANALOG)).thenReturn(false);
@@ -683,8 +680,8 @@ public final class TunerAdapterTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void setConfigFlag_withForceAnalogWhenFmForceAnalogSupported() throws Exception {

    public void setConfigFlag_withForceAnalogWhenFmForceAnalogSupported() throws Exception {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);

        when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);





        mRadioTuner.setConfigFlag(RadioManager.CONFIG_FORCE_ANALOG, /* value= */ false);

        mRadioTuner.setConfigFlag(RadioManager.CONFIG_FORCE_ANALOG, /* value= */ false);
@@ -695,8 +692,8 @@ public final class TunerAdapterTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void setConfigFlag_withForceAnalogWhenFmForceAnalogNotSupported() throws Exception {

    public void setConfigFlag_withForceAnalogWhenFmForceAnalogNotSupported() throws Exception {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);

        when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);

        when(mTunerMock.isConfigFlagSupported(RadioManager.CONFIG_FORCE_ANALOG_FM))

        when(mTunerMock.isConfigFlagSupported(RadioManager.CONFIG_FORCE_ANALOG_FM))

                .thenReturn(false);

                .thenReturn(false);
@@ -709,9 +706,9 @@ public final class TunerAdapterTest { 
    }

    }





    @Test

    @Test

    @RequiresFlagsDisabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void setConfigFlag_withForceAnalogWhenHdRadioImprovedFeatureNotEnabled()

    public void setConfigFlag_withForceAnalogWhenHdRadioImprovedFeatureNotEnabled()

            throws Exception {

            throws Exception {

        mSetFlagsRule.disableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);

        when(mTunerMock.isConfigFlagSupported(anyInt())).thenReturn(true);





        mRadioTuner.setConfigFlag(RadioManager.CONFIG_FORCE_ANALOG, /* value= */ false);

        mRadioTuner.setConfigFlag(RadioManager.CONFIG_FORCE_ANALOG, /* value= */ false);

core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/aidl/ConversionUtilsTest.java

+16 −14
Original line number Original line Diff line number Diff line
@@ -40,10 +40,7 @@ import android.hardware.radio.RadioManager; 
import android.hardware.radio.RadioMetadata;

import android.hardware.radio.RadioMetadata;

import android.hardware.radio.UniqueProgramIdentifier;

import android.hardware.radio.UniqueProgramIdentifier;

import android.os.ServiceSpecificException;

import android.os.ServiceSpecificException;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.flag.junit.SetFlagsRule;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;





import com.android.dx.mockito.inline.extended.StaticMockitoSessionBuilder;

import com.android.dx.mockito.inline.extended.StaticMockitoSessionBuilder;

import com.android.server.broadcastradio.ExtendedRadioMockitoTestCase;

import com.android.server.broadcastradio.ExtendedRadioMockitoTestCase;
@@ -159,7 +156,7 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase { 
    @Rule

    @Rule

    public final Expect expect = Expect.create();

    public final Expect expect = Expect.create();

    @Rule

    @Rule

    public final CheckFlagsRule mCheckFlagsRule = DeviceFlagsValueProvider.createCheckFlagsRule();

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule();





    @Override

    @Override

    protected void initializeSession(StaticMockitoSessionBuilder builder) {

    protected void initializeSession(StaticMockitoSessionBuilder builder) {
@@ -317,9 +314,10 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void identifierToHalProgramIdentifier_withFlagEnabled() {

    public void identifierToHalProgramIdentifier_withFlagEnabled() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        ProgramSelector.Identifier hdLocationId = createHdStationLocationIdWithFlagEnabled();

        ProgramSelector.Identifier hdLocationId = createHdStationLocationIdWithFlagEnabled();



        ProgramIdentifier halHdLocationId =

        ProgramIdentifier halHdLocationId =

                ConversionUtils.identifierToHalProgramIdentifier(hdLocationId);

                ConversionUtils.identifierToHalProgramIdentifier(hdLocationId);
@@ -336,10 +334,11 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void identifierFromHalProgramIdentifier_withFlagEnabled() {

    public void identifierFromHalProgramIdentifier_withFlagEnabled() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        ProgramSelector.Identifier hdLocationIdExpected =

        ProgramSelector.Identifier hdLocationIdExpected =

                createHdStationLocationIdWithFlagEnabled();

                createHdStationLocationIdWithFlagEnabled();



        ProgramSelector.Identifier hdLocationId =

        ProgramSelector.Identifier hdLocationId =

                ConversionUtils.identifierFromHalProgramIdentifier(TEST_HAL_HD_STATION_LOCATION_ID);

                ConversionUtils.identifierFromHalProgramIdentifier(TEST_HAL_HD_STATION_LOCATION_ID);
@@ -348,8 +347,9 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase { 
    }

    }





    @Test

    @Test

    @RequiresFlagsDisabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void identifierFromHalProgramIdentifier_withFlagDisabled_returnsNull() {

    public void identifierFromHalProgramIdentifier_withFlagDisabled_returnsNull() {

        mSetFlagsRule.disableFlags(Flags.FLAG_HD_RADIO_IMPROVED);



        ProgramSelector.Identifier hdLocationId =

        ProgramSelector.Identifier hdLocationId =

                ConversionUtils.identifierFromHalProgramIdentifier(TEST_HAL_HD_STATION_LOCATION_ID);

                ConversionUtils.identifierFromHalProgramIdentifier(TEST_HAL_HD_STATION_LOCATION_ID);
@@ -432,8 +432,8 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void programSelectorMeetsSdkVersionRequirement_withLowerVersionSecondaryId() {

    public void programSelectorMeetsSdkVersionRequirement_withLowerVersionSecondaryId() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        ProgramSelector hdSelector = createHdSelectorWithFlagEnabled();

        ProgramSelector hdSelector = createHdSelectorWithFlagEnabled();





        expect.withMessage("Selector %s with secondary id requiring higher-version SDK version",

        expect.withMessage("Selector %s with secondary id requiring higher-version SDK version",
@@ -449,8 +449,8 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void programSelectorMeetsSdkVersionRequirement_withRequiredVersionAndFlagEnabled() {

    public void programSelectorMeetsSdkVersionRequirement_withRequiredVersionAndFlagEnabled() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        ProgramSelector hdSelector = createHdSelectorWithFlagEnabled();

        ProgramSelector hdSelector = createHdSelectorWithFlagEnabled();





        expect.withMessage("Selector %s with required SDK version and feature flag enabled",

        expect.withMessage("Selector %s with required SDK version and feature flag enabled",
@@ -548,8 +548,8 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void configFlagMeetsSdkVersionRequirement_withRequiredSdkVersionAndFlagEnabled() {

    public void configFlagMeetsSdkVersionRequirement_withRequiredSdkVersionAndFlagEnabled() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        int halForceAmAnalogFlag = ConfigFlag.FORCE_ANALOG_FM;

        int halForceAmAnalogFlag = ConfigFlag.FORCE_ANALOG_FM;





        expect.withMessage("Force Analog FM flag with required SDK version and feature flag"

        expect.withMessage("Force Analog FM flag with required SDK version and feature flag"
@@ -558,8 +558,8 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase { 
    }

    }





    @Test

    @Test

    @RequiresFlagsDisabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void configFlagMeetsSdkVersionRequirement_withRequiredSdkVersionAndFlagDisabled() {

    public void configFlagMeetsSdkVersionRequirement_withRequiredSdkVersionAndFlagDisabled() {

        mSetFlagsRule.disableFlags(Flags.FLAG_HD_RADIO_IMPROVED);

        int halForceAmAnalogFlag = ConfigFlag.FORCE_ANALOG_FM;

        int halForceAmAnalogFlag = ConfigFlag.FORCE_ANALOG_FM;





        expect.withMessage("Force Analog FM with required SDK version and with feature flag"

        expect.withMessage("Force Analog FM with required SDK version and with feature flag"
@@ -586,8 +586,9 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase { 
    }

    }





    @Test

    @Test

    @RequiresFlagsEnabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void radioMetadataFromHalMetadata_withFlagEnabled() {

    public void radioMetadataFromHalMetadata_withFlagEnabled() {

        mSetFlagsRule.enableFlags(Flags.FLAG_HD_RADIO_IMPROVED);



        RadioMetadata convertedMetadata = ConversionUtils.radioMetadataFromHalMetadata(

        RadioMetadata convertedMetadata = ConversionUtils.radioMetadataFromHalMetadata(

                new Metadata[]{TEST_HAL_SONG_TITLE, TEST_HAL_HD_SUBCHANNELS, TEST_HAL_ALBUM_ART});

                new Metadata[]{TEST_HAL_SONG_TITLE, TEST_HAL_HD_SUBCHANNELS, TEST_HAL_ALBUM_ART});
@@ -605,8 +606,9 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase { 
    }

    }





    @Test

    @Test

    @RequiresFlagsDisabled(Flags.FLAG_HD_RADIO_IMPROVED)

    public void radioMetadataFromHalMetadata_withFlagDisabled() {

    public void radioMetadataFromHalMetadata_withFlagDisabled() {

        mSetFlagsRule.disableFlags(Flags.FLAG_HD_RADIO_IMPROVED);



        RadioMetadata convertedMetadata = ConversionUtils.radioMetadataFromHalMetadata(

        RadioMetadata convertedMetadata = ConversionUtils.radioMetadataFromHalMetadata(

                new Metadata[]{TEST_HAL_SONG_TITLE, TEST_HAL_HD_SUBCHANNELS, TEST_HAL_ALBUM_ART});

                new Metadata[]{TEST_HAL_SONG_TITLE, TEST_HAL_HD_SUBCHANNELS, TEST_HAL_ALBUM_ART});