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

Commit caef3b3e authored by Jeff DeCew's avatar Jeff DeCew
Browse files

Convert tests to SetFlagsRule annotations and parameterization 

* Adds a method that allows asserting that Log.wtf is called

Bug: 309625167
Test: atest SystemUITests
Flag: NA
Change-Id: Id0b47368af3769146af0e8a161399facd4a7c4cb
parent fd3c3488

packages/SystemUI/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -280,6 +280,7 @@ android_library { 
        "com_android_systemui_flags_lib",

        "com_android_systemui_shared_flags_lib",

        "flag-junit-base",

        "platform-parametric-runner-lib",

        "androidx.viewpager2_viewpager2",

        "androidx.legacy_legacy-support-v4",

        "androidx.recyclerview_recyclerview",

packages/SystemUI/multivalentTests/src/com/android/systemui/scene/domain/startable/SceneContainerStartableTest.kt

+2 −6
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
package com.android.systemui.scene.domain.startable



import android.os.PowerManager

import android.platform.test.annotations.EnableFlags

import android.view.Display

import androidx.test.ext.junit.runners.AndroidJUnit4

import androidx.test.filters.SmallTest
@@ -45,7 +46,6 @@ import kotlinx.coroutines.flow.map 
import kotlinx.coroutines.test.TestScope

import kotlinx.coroutines.test.runCurrent

import kotlinx.coroutines.test.runTest

import org.junit.Before

import org.junit.Test

import org.junit.runner.RunWith

import org.mockito.Mockito.clearInvocations
@@ -55,6 +55,7 @@ import org.mockito.Mockito.verify 


@SmallTest

@RunWith(AndroidJUnit4::class)

@EnableFlags(AconfigFlags.FLAG_SCENE_CONTAINER)

class SceneContainerStartableTest : SysuiTestCase() {



    private val utils = SceneTestUtils(this)
@@ -93,11 +94,6 @@ class SceneContainerStartableTest : SysuiTestCase() { 
            authenticationInteractor = authenticationInteractor,

        )



    @Before

    fun setUp() {

        mSetFlagsRule.enableFlags(AconfigFlags.FLAG_SCENE_CONTAINER)

    }



    @Test

    fun hydrateVisibility() =

        testScope.runTest {

packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuAnimationControllerTest.java

+3 −10
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.accessibility.floatingmenu;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.any;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.mock;
@@ -26,9 +25,7 @@ import static org.mockito.Mockito.verify; 
import static org.mockito.Mockito.verifyZeroInteractions;



import android.graphics.PointF;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.platform.test.annotations.EnableFlags;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.view.View;
@@ -74,10 +71,6 @@ public class MenuAnimationControllerTest extends SysuiTestCase { 
    @Rule

    public MockitoRule mockito = MockitoJUnit.rule();



    @Rule

    public final CheckFlagsRule mCheckFlagsRule =

            DeviceFlagsValueProvider.createCheckFlagsRule();



    @Mock

    private AccessibilityManager mAccessibilityManager;
@@ -233,7 +226,7 @@ public class MenuAnimationControllerTest extends SysuiTestCase { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_FLOATING_MENU_ANIMATED_TUCK)

    @EnableFlags(Flags.FLAG_FLOATING_MENU_ANIMATED_TUCK)

    public void tuck_animates() {

        mMenuAnimationController.cancelAnimations();

        mMenuAnimationController.moveToEdgeAndHide();
@@ -242,7 +235,7 @@ public class MenuAnimationControllerTest extends SysuiTestCase { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_FLOATING_MENU_ANIMATED_TUCK)

    @EnableFlags(Flags.FLAG_FLOATING_MENU_ANIMATED_TUCK)

    public void untuck_animates() {

        mMenuAnimationController.cancelAnimations();

        mMenuAnimationController.moveOutEdgeAndShow();

packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewLayerTest.java

+6 −15
Original line number Diff line number Diff line
@@ -21,11 +21,8 @@ import static android.view.View.VISIBLE; 
import static android.view.WindowInsets.Type.displayCutout;

import static android.view.WindowInsets.Type.ime;

import static android.view.WindowInsets.Type.systemBars;



import static com.android.systemui.accessibility.floatingmenu.MenuViewLayer.LayerIndex;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;
@@ -41,10 +38,8 @@ import android.graphics.PointF; 
import android.graphics.Rect;

import android.os.Build;

import android.os.UserHandle;

import android.platform.test.annotations.RequiresFlagsDisabled;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.platform.test.annotations.DisableFlags;

import android.platform.test.annotations.EnableFlags;

import android.provider.Settings;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;
@@ -103,10 +98,6 @@ public class MenuViewLayerTest extends SysuiTestCase { 
    @Rule

    public MockitoRule mockito = MockitoJUnit.rule();



    @Rule

    public final CheckFlagsRule mCheckFlagsRule =

            DeviceFlagsValueProvider.createCheckFlagsRule();



    @Mock

    private IAccessibilityFloatingMenu mFloatingMenu;
@@ -230,7 +221,7 @@ public class MenuViewLayerTest extends SysuiTestCase { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_FLOATING_MENU_IME_DISPLACEMENT_ANIMATION)

    @DisableFlags(Flags.FLAG_FLOATING_MENU_IME_DISPLACEMENT_ANIMATION)

    public void showingImeInsetsChange_overlapOnIme_menuShownAboveIme_old() {

        mMenuAnimationController.moveAndPersistPosition(new PointF(0, IME_TOP + 100));

        final PointF beforePosition = mMenuView.getMenuPosition();
@@ -243,7 +234,7 @@ public class MenuViewLayerTest extends SysuiTestCase { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_FLOATING_MENU_IME_DISPLACEMENT_ANIMATION)

    @EnableFlags(Flags.FLAG_FLOATING_MENU_IME_DISPLACEMENT_ANIMATION)

    public void showingImeInsetsChange_overlapOnIme_menuShownAboveIme() {

        mMenuAnimationController.moveAndPersistPosition(new PointF(0, IME_TOP + 100));

        final PointF beforePosition = mMenuView.getMenuPosition();
@@ -259,7 +250,7 @@ public class MenuViewLayerTest extends SysuiTestCase { 
    }



    @Test

    @RequiresFlagsDisabled(Flags.FLAG_FLOATING_MENU_IME_DISPLACEMENT_ANIMATION)

    @DisableFlags(Flags.FLAG_FLOATING_MENU_IME_DISPLACEMENT_ANIMATION)

    public void hidingImeInsetsChange_overlapOnIme_menuBackToOriginalPosition_old() {

        mMenuAnimationController.moveAndPersistPosition(new PointF(0, IME_TOP + 200));

        final PointF beforePosition = mMenuView.getMenuPosition();
@@ -271,7 +262,7 @@ public class MenuViewLayerTest extends SysuiTestCase { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_FLOATING_MENU_IME_DISPLACEMENT_ANIMATION)

    @EnableFlags(Flags.FLAG_FLOATING_MENU_IME_DISPLACEMENT_ANIMATION)

    public void hidingImeInsetsChange_overlapOnIme_menuBackToOriginalPosition() {

        mMenuAnimationController.moveAndPersistPosition(new PointF(0, IME_TOP + 200));

        final PointF beforePosition = mMenuView.getMenuPosition();

packages/SystemUI/tests/src/com/android/systemui/accessibility/floatingmenu/MenuViewTest.java

+3 −11
Original line number Diff line number Diff line
@@ -17,9 +17,7 @@ 
package com.android.systemui.accessibility.floatingmenu;



import static android.app.UiModeManager.MODE_NIGHT_YES;



import static com.google.common.truth.Truth.assertThat;



import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;
@@ -27,9 +25,7 @@ import static org.mockito.Mockito.verify; 
import android.app.UiModeManager;

import android.graphics.Rect;

import android.graphics.drawable.GradientDrawable;

import android.platform.test.annotations.RequiresFlagsEnabled;

import android.platform.test.flag.junit.CheckFlagsRule;

import android.platform.test.flag.junit.DeviceFlagsValueProvider;

import android.platform.test.annotations.EnableFlags;

import android.testing.AndroidTestingRunner;

import android.testing.TestableLooper;

import android.view.WindowManager;
@@ -66,10 +62,6 @@ public class MenuViewTest extends SysuiTestCase { 
    @Rule

    public MockitoRule mockito = MockitoJUnit.rule();



    @Rule

    public final CheckFlagsRule mCheckFlagsRule =

            DeviceFlagsValueProvider.createCheckFlagsRule();



    @Mock

    private AccessibilityManager mAccessibilityManager;
@@ -147,7 +139,7 @@ public class MenuViewTest extends SysuiTestCase { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_FLOATING_MENU_RADII_ANIMATION)

    @EnableFlags(Flags.FLAG_FLOATING_MENU_RADII_ANIMATION)

    public void onEdgeChanged_startsRadiiAnimation() {

        final RadiiAnimator radiiAnimator = getRadiiAnimator();

        mMenuView.onEdgeChanged();
@@ -155,7 +147,7 @@ public class MenuViewTest extends SysuiTestCase { 
    }



    @Test

    @RequiresFlagsEnabled(Flags.FLAG_FLOATING_MENU_RADII_ANIMATION)

    @EnableFlags(Flags.FLAG_FLOATING_MENU_RADII_ANIMATION)

    public void onDraggingStart_startsRadiiAnimation() {

        final RadiiAnimator radiiAnimator = getRadiiAnimator();

        mMenuView.onDraggingStart();