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

Commit 8944eba6 authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Make TestableFlagResolver part of the 'testables' lib. 

Fixes: 268353189
Test: atest NotificationManagerServiceTest
Change-Id: I7934971bd84f67233d6a48581bc87ffc9b6030ea
parent dc6ec7e8

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

+2 −1
Original line number Diff line number Diff line
@@ -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);

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

+2 −1
Original line number Diff line number Diff line
@@ -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;

tests/testables/src/com/android/internal/config/sysui/OWNERS

0 → 100644
+1 −0
Original line number Diff line number Diff line 
include /packages/SystemUI/OWNERS

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

+5 −7
Original line number Diff line number Diff line
@@ -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);

    }

}

tests/testables/tests/com/android/internal/config/sysui/OWNERS

0 → 100644
+1 −0
Original line number Diff line number Diff line 
include /packages/SystemUI/OWNERS