From 068fbc9860edbc793331aaf67b458b0e766aaabb Mon Sep 17 00:00:00 2001 From: Jack Yu Date: Fri, 7 Feb 2025 13:37:25 -0800 Subject: [PATCH] Removed the tests with flags disabled Flags are enabled already. The flag disabled tests should be removed. Fix: 395131189 Test: atest CellularSecurityNotificationsPreferenceControllerTest Flag: EXEMPT test fix Change-Id: I40d5c56956b714ba563cb545807deb1dee9e8d8a --- ...NotificationsPreferenceControllerTest.java | 48 ------------------- 1 file changed, 48 deletions(-) diff --git a/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceControllerTest.java index fd67b7219f6..27cba35e189 100644 --- a/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/network/telephony/CellularSecurityNotificationsPreferenceControllerTest.java @@ -112,42 +112,6 @@ public class CellularSecurityNotificationsPreferenceControllerTest { assertThat(mController.getAvailabilityStatus()).isEqualTo(UNSUPPORTED_ON_DEVICE); } - @Test - public void setChecked_flagsDisabled_shouldReturnFalse() { - // Flags disabled - enableFlags(false); - - // Hardware support is enabled - doNothing().when(mTelephonyManager).setNullCipherNotificationsEnabled(true); - doNothing().when(mTelephonyManager) - .setEnableCellularIdentifierDisclosureNotifications(true); - assertThat(mController.setChecked(false)).isFalse(); - assertThat(mController.setChecked(true)).isFalse(); - - // Enable 1 flag, make sure it still fails - mSetFlagsRule.enableFlags(Flags.FLAG_ENABLE_MODEM_CIPHER_TRANSPARENCY_UNSOL_EVENTS); - assertThat(mController.setChecked(false)).isFalse(); - assertThat(mController.setChecked(true)).isFalse(); - } - - @Test - public void setChecked_hardwareDisabled_shouldReturnFalse() { - // Flags disabled - enableFlags(false); - - // Hardware support is enabled - doNothing().when(mTelephonyManager).setNullCipherNotificationsEnabled(true); - doNothing().when(mTelephonyManager) - .setEnableCellularIdentifierDisclosureNotifications(true); - assertThat(mController.setChecked(true)).isFalse(); - - // Hardware support is enabled, called with false - doNothing().when(mTelephonyManager).setNullCipherNotificationsEnabled(false); - doNothing().when(mTelephonyManager) - .setEnableCellularIdentifierDisclosureNotifications(false); - assertThat(mController.setChecked(false)).isFalse(); - } - @Test public void setChecked_shouldReturnTrue() { enableFlags(true); @@ -174,18 +138,6 @@ public class CellularSecurityNotificationsPreferenceControllerTest { assertThat(mController.isChecked()).isTrue(); } - @Test - public void isChecked_flagsDisabled_shouldReturnFalse() { - enableFlags(false); - - // Hardware support is enabled - doReturn(true).when(mTelephonyManager).isNullCipherNotificationsEnabled(); - doReturn(true).when(mTelephonyManager) - .isCellularIdentifierDisclosureNotificationsEnabled(); - - assertThat(mController.isChecked()).isFalse(); - } - @Test public void isChecked_hardwareUnsupported_shouldReturnFalse() { enableFlags(true);