From 8944eba6b64ca0f5a0d69c53a2ed98555fa2e27e Mon Sep 17 00:00:00 2001 From: Jeff DeCew Date: Mon, 13 Feb 2023 21:45:05 +0000 Subject: [PATCH] Make TestableFlagResolver part of the 'testables' lib. Fixes: 268353189 Test: atest NotificationManagerServiceTest Change-Id: I7934971bd84f67233d6a48581bc87ffc9b6030ea --- .../notification/NotificationManagerServiceTest.java | 3 ++- .../server/notification/RoleObserverTest.java | 3 ++- .../src/com/android/internal/config/sysui/OWNERS | 1 + .../internal/config/sysui/TestableFlagResolver.java | 12 +++++------- .../tests/com/android/internal/config/sysui/OWNERS | 1 + 5 files changed, 11 insertions(+), 9 deletions(-) create mode 100644 tests/testables/src/com/android/internal/config/sysui/OWNERS rename services/tests/uiservicestests/src/com/android/server/notification/TestFlagResolver.java => tests/testables/src/com/android/internal/config/sysui/TestableFlagResolver.java (68%) create mode 100644 tests/testables/tests/com/android/internal/config/sysui/OWNERS diff --git a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java index 009b2591ea9dd..687696a03627a 100755 --- a/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java @@ -203,6 +203,7 @@ import androidx.test.InstrumentationRegistry; import com.android.internal.app.IAppOpsService; import com.android.internal.config.sysui.SystemUiDeviceConfigFlags; +import com.android.internal.config.sysui.TestableFlagResolver; import com.android.internal.logging.InstanceIdSequence; import com.android.internal.logging.InstanceIdSequenceFake; import com.android.internal.messages.nano.SystemMessageProto; @@ -376,7 +377,7 @@ public class NotificationManagerServiceTest extends UiServiceTestCase { NotificationRecordLoggerFake mNotificationRecordLogger = new NotificationRecordLoggerFake(); TestableNotificationManagerService.StrongAuthTrackerFake mStrongAuthTracker; - TestFlagResolver mTestFlagResolver = new TestFlagResolver(); + TestableFlagResolver mTestFlagResolver = new TestableFlagResolver(); private InstanceIdSequence mNotificationInstanceIdSequence = new InstanceIdSequenceFake( 1 << 30); diff --git a/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java b/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java index 6f2627a15cf5e..a3977ba141bb1 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java +++ b/services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java @@ -64,6 +64,7 @@ import android.util.Pair; import androidx.test.InstrumentationRegistry; import com.android.internal.app.IAppOpsService; +import com.android.internal.config.sysui.TestableFlagResolver; import com.android.internal.logging.InstanceIdSequence; import com.android.internal.logging.InstanceIdSequenceFake; import com.android.server.LocalServices; @@ -168,7 +169,7 @@ public class RoleObserverTest extends UiServiceTestCase { mock(ActivityManagerInternal.class), mock(MultiRateLimiter.class), mock(PermissionHelper.class), mock(UsageStatsManagerInternal.class), mock (TelecomManager.class), - mock(NotificationChannelLogger.class), new TestFlagResolver()); + mock(NotificationChannelLogger.class), new TestableFlagResolver()); } catch (SecurityException e) { if (!e.getMessage().contains("Permission Denial: not allowed to send broadcast")) { throw e; diff --git a/tests/testables/src/com/android/internal/config/sysui/OWNERS b/tests/testables/src/com/android/internal/config/sysui/OWNERS new file mode 100644 index 0000000000000..2e96c97c8bb35 --- /dev/null +++ b/tests/testables/src/com/android/internal/config/sysui/OWNERS @@ -0,0 +1 @@ +include /packages/SystemUI/OWNERS diff --git a/services/tests/uiservicestests/src/com/android/server/notification/TestFlagResolver.java b/tests/testables/src/com/android/internal/config/sysui/TestableFlagResolver.java similarity index 68% rename from services/tests/uiservicestests/src/com/android/server/notification/TestFlagResolver.java rename to tests/testables/src/com/android/internal/config/sysui/TestableFlagResolver.java index 3b9726ec7cbd9..a8815dc1f0eef 100644 --- a/services/tests/uiservicestests/src/com/android/server/notification/TestFlagResolver.java +++ b/tests/testables/src/com/android/internal/config/sysui/TestableFlagResolver.java @@ -14,22 +14,20 @@ * limitations under the License. */ -package com.android.server.notification; - -import com.android.internal.config.sysui.SystemUiSystemPropertiesFlags; +package com.android.internal.config.sysui; import java.util.HashMap; import java.util.Map; -public class TestFlagResolver implements SystemUiSystemPropertiesFlags.FlagResolver { - private Map mOverrides = new HashMap<>(); +public class TestableFlagResolver implements SystemUiSystemPropertiesFlags.FlagResolver { + private Map mOverrides = new HashMap<>(); @Override public boolean isEnabled(SystemUiSystemPropertiesFlags.Flag flag) { - return mOverrides.getOrDefault(flag, flag.mDefaultValue); + return mOverrides.getOrDefault(flag.mSysPropKey, flag.mDefaultValue); } public void setFlagOverride(SystemUiSystemPropertiesFlags.Flag flag, boolean isEnabled) { - mOverrides.put(flag, isEnabled); + mOverrides.put(flag.mSysPropKey, isEnabled); } } diff --git a/tests/testables/tests/com/android/internal/config/sysui/OWNERS b/tests/testables/tests/com/android/internal/config/sysui/OWNERS new file mode 100644 index 0000000000000..2e96c97c8bb35 --- /dev/null +++ b/tests/testables/tests/com/android/internal/config/sysui/OWNERS @@ -0,0 +1 @@ +include /packages/SystemUI/OWNERS