Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make TestableFlagResolver part of the 'testables' lib."

Browse Source
This commit is contained in:
Jeff DeCew
2023-02-14 16:19:09 +00:00
committed by Android (Google) Code Review
parent 3aa1da4e07 8944eba6b6
commit 8bb7221393
5 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
services/tests/uiservicestests/src/com/android/server/notification/NotificationManagerServiceTest.java
View File

@@ -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);

3
services/tests/uiservicestests/src/com/android/server/notification/RoleObserverTest.java
View File

@@ -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;

1
tests/testables/src/com/android/internal/config/sysui/OWNERS Normal file
View File

@@ -0,0 +1 @@
include /packages/SystemUI/OWNERS

12
services/tests/uiservicestests/src/com/android/server/notification/TestFlagResolver.java → tests/testables/src/com/android/internal/config/sysui/TestableFlagResolver.java
View File

@@ -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<SystemUiSystemPropertiesFlags.Flag, Boolean> mOverrides = new HashMap<>();
public class TestableFlagResolver implements SystemUiSystemPropertiesFlags.FlagResolver {
private Map<String, Boolean> 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);
}
}

1
tests/testables/tests/com/android/internal/config/sysui/OWNERS Normal file
View File

@@ -0,0 +1 @@
include /packages/SystemUI/OWNERS