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

Commit 0fab9710 authored by Julia Tuttle's avatar Julia Tuttle Committed by Android (Google) Code Review
Browse files

Merge "Force refactor flag disabled in some unittests" into main

parents 703c9787 118c1073

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/NotificationInterruptStateProviderWrapperTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.statusbar.notification.interruption 


import android.testing.AndroidTestingRunner

import androidx.test.filters.SmallTest

import com.android.systemui.Flags

import com.android.systemui.statusbar.notification.collection.NotificationEntryBuilder

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider.FullScreenIntentDecision

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProvider.FullScreenIntentDecision.FSI_DEVICE_NOT_INTERACTIVE
@@ -37,7 +36,7 @@ import org.junit.runner.RunWith 
@RunWith(AndroidTestingRunner::class)

class NotificationInterruptStateProviderWrapperTest : VisualInterruptionDecisionProviderTestBase() {

    init {

        setFlagsRule.disableFlags(Flags.FLAG_VISUAL_INTERRUPTIONS_REFACTOR)

        mSetFlagsRule.disableFlags(VisualInterruptionRefactor.FLAG_NAME)

    }



    override val provider by lazy {

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderImplTest.kt

+1 −2
Original line number Diff line number Diff line
@@ -18,7 +18,6 @@ package com.android.systemui.statusbar.notification.interruption 


import android.testing.AndroidTestingRunner

import androidx.test.filters.SmallTest

import com.android.systemui.Flags

import com.android.systemui.statusbar.notification.collection.NotificationEntry

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionType.BUBBLE

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionType.PEEK
@@ -30,7 +29,7 @@ import org.junit.runner.RunWith 
@RunWith(AndroidTestingRunner::class)

class VisualInterruptionDecisionProviderImplTest : VisualInterruptionDecisionProviderTestBase() {

    init {

        setFlagsRule.enableFlags(Flags.FLAG_VISUAL_INTERRUPTIONS_REFACTOR)

        mSetFlagsRule.enableFlags(VisualInterruptionRefactor.FLAG_NAME)

    }



    override val provider by lazy {

packages/SystemUI/tests/src/com/android/systemui/statusbar/notification/interruption/VisualInterruptionDecisionProviderTestBase.kt

+0 −6
Original line number Diff line number Diff line
@@ -44,7 +44,6 @@ import android.graphics.drawable.Icon 
import android.hardware.display.FakeAmbientDisplayConfiguration

import android.os.Looper

import android.os.PowerManager

import android.platform.test.flag.junit.SetFlagsRule

import android.provider.Settings.Global.HEADS_UP_NOTIFICATIONS_ENABLED

import android.provider.Settings.Global.HEADS_UP_OFF

import android.provider.Settings.Global.HEADS_UP_ON
@@ -84,15 +83,10 @@ import junit.framework.Assert.assertFalse 
import junit.framework.Assert.assertTrue

import org.junit.Assert.assertEquals

import org.junit.Before

import org.junit.Rule

import org.junit.Test

import org.mockito.Mockito.`when` as whenever



abstract class VisualInterruptionDecisionProviderTestBase : SysuiTestCase() {

    @JvmField

    @Rule

    val setFlagsRule = SetFlagsRule(SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT)



    private val fakeLogBuffer =

        LogBuffer(

            name = "FakeLog",

packages/SystemUI/tests/src/com/android/systemui/statusbar/phone/CentralSurfacesImplTest.java

+3 −0
Original line number Diff line number Diff line
@@ -157,6 +157,7 @@ import com.android.systemui.statusbar.notification.interruption.NotificationInte 
import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProviderImpl;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProviderWrapper;

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionDecisionProvider;

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionRefactor;

import com.android.systemui.statusbar.notification.row.NotificationGutsManager;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayout;

import com.android.systemui.statusbar.notification.stack.NotificationStackScrollLayoutController;
@@ -347,6 +348,8 @@ public class CentralSurfacesImplTest extends SysuiTestCase { 
        mFeatureFlags.set(Flags.ZJ_285570694_LOCKSCREEN_TRANSITION_FROM_AOD, true);

        when(mDozeParameters.getAlwaysOn()).thenReturn(true);

        mSetFlagsRule.disableFlags(com.android.systemui.Flags.FLAG_DEVICE_ENTRY_UDFPS_REFACTOR);

        // TODO: b/312476335 - Update to check flag and instantiate old or new implementation.

        mSetFlagsRule.disableFlags(VisualInterruptionRefactor.FLAG_NAME);



        IThermalService thermalService = mock(IThermalService.class);

        mPowerManager = new PowerManager(mContext, mPowerManagerService, thermalService,

packages/SystemUI/tests/src/com/android/systemui/wmshell/BubblesTest.java

+4 −0
Original line number Diff line number Diff line
@@ -146,6 +146,7 @@ import com.android.systemui.statusbar.notification.collection.render.Notificatio 
import com.android.systemui.statusbar.notification.interruption.KeyguardNotificationVisibilityProvider;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptLogger;

import com.android.systemui.statusbar.notification.interruption.NotificationInterruptStateProviderWrapper;

import com.android.systemui.statusbar.notification.interruption.VisualInterruptionRefactor;

import com.android.systemui.statusbar.notification.row.ExpandableNotificationRow;

import com.android.systemui.statusbar.notification.row.NotificationTestHelper;

import com.android.systemui.statusbar.notification.stack.domain.interactor.SharedNotificationContainerInteractor;
@@ -366,6 +367,9 @@ public class BubblesTest extends SysuiTestCase { 
    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);



        // TODO: b/312476335 - Update to check flag and instantiate old or new implementation.

        mSetFlagsRule.disableFlags(VisualInterruptionRefactor.FLAG_NAME);



        if (Transitions.ENABLE_SHELL_TRANSITIONS) {

            doReturn(true).when(mTransitions).isRegistered();

        }