Merge "Add missing tests for bcradio conversion utils" into main (d870e6e6) · Commits · e / os / android_frameworks_base

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

+13 −2

Original line number	Diff line number	Diff line
		@@ -254,6 +254,17 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase {
		.that(thrown).hasMessageThat().contains("seek: TIMEOUT");
		}

		@Test
		public void throwOnError_withUnknownErrorCode() {
		int invalidErrorCode = 100;
		ServiceSpecificException halException = new ServiceSpecificException(invalidErrorCode);

		RuntimeException thrown = ConversionUtils.throwOnError(halException, "seek");

		expect.withMessage("Exception thrown for unknown error code")
		.that(thrown).hasMessageThat().contains("seek: unknown error");
		}

		@Test
		public void propertiesFromHalProperties_idsMatch() {
		expect.withMessage("Properties id")
		@@ -296,7 +307,7 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase {
		Map<String, Integer> dabTableExpected = Map.of(DAB_ENTRY_LABEL_1, DAB_ENTRY_FREQUENCY_1,
		DAB_ENTRY_LABEL_2, DAB_ENTRY_FREQUENCY_2);

		expect.withMessage("Supported program types")
		expect.withMessage("DAB frequency table")
		.that(MODULE_PROPERTIES.getDabFrequencyTable())
		.containsExactlyEntriesIn(dabTableExpected);
		}
		@@ -621,7 +632,7 @@ public final class ConversionUtilsTest extends ExtendedRadioMockitoTestCase {
		@Test
		public void programInfoMeetsSdkVersionRequirement_withLowerVersionIdForRelatedContent() {
		RadioManager.ProgramInfo dabProgramInfo = new RadioManager.ProgramInfo(
		TEST_DAB_SELECTOR_LEGACY, TEST_DAB_SID_EXT_ID, TEST_DAB_FREQUENCY_ID,
		TEST_DAB_SELECTOR_LEGACY, TEST_DAB_SID_EXT_LEGACY_ID, TEST_DAB_FREQUENCY_ID,
		List.of(TEST_DAB_SID_EXT_ID), /* infoFlags= */ 0, TEST_SIGNAL_QUALITY,
		new RadioMetadata.Builder().build(), new ArrayMap<>());

core/tests/BroadcastRadioTests/src/com/android/server/broadcastradio/hal2/ConvertTest.java

+16 −0

Original line number	Diff line number	Diff line
		@@ -32,6 +32,7 @@ import android.hardware.radio.Announcement;
		import android.hardware.radio.ProgramSelector;
		import android.hardware.radio.RadioManager;
		import android.hardware.radio.RadioMetadata;
		import android.os.ParcelableException;
		import android.util.ArrayMap;

		import com.google.common.truth.Expect;
		@@ -88,6 +89,15 @@ public final class ConvertTest {
		.hasMessageThat().contains("INVALID_ARGUMENTS");
		}

		@Test
		public void throwOnError_withUnknownErrorCode() {
		ParcelableException thrown = assertThrows(ParcelableException.class, () ->
		Convert.throwOnError("tune", /* result= */ 1000));

		expect.withMessage("Exception for unknown error code").that(thrown)
		.hasMessageThat().contains("unknown error");
		}

		@Test
		public void propertiesFromHalProperties_idsMatch() {
		expect.withMessage("Properties id")
		@@ -231,6 +241,12 @@ public final class ConvertTest {
		.that(Convert.vendorInfoToHal(vendorInfo)).isEmpty();
		}

		@Test
		public void vendorInfoFromHalVendorKeyValues_withNull() {
		expect.withMessage("Null vendor info converted from HAL")
		.that(Convert.vendorInfoFromHal(/* info= */ null)).isEmpty();
		}

		@Test
		public void vendorInfoFromHalVendorKeyValues_withNullElements() {
		VendorKeyValue halVendorInfo = new VendorKeyValue();