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

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

Update SysuiTestCase to use the new SetFlagsRule.ClassRule 

Bug: 336768870
Change-Id: I4989bce74d6fd39f53b783f3b42cd86684346f94
Test: atest SystemUITests
Test: atest SystemUiRoboTests
Flag: test_only
parent 9d555c41

packages/SystemUI/tests/utils/src/com/android/systemui/SysuiTestCase.java

+15 −4
Original line number Original line Diff line number Diff line
@@ -15,8 +15,6 @@ 
 */

 */

package com.android.systemui;

package com.android.systemui;





import static android.platform.test.flag.junit.SetFlagsRule.DefaultInitValueType.DEVICE_DEFAULT;



import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.when;
@@ -99,8 +97,21 @@ public abstract class SysuiTestCase { 
            .setProvideMainThread(true)

            .setProvideMainThread(true)

            .build();

            .build();





    @Rule

    @ClassRule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT);

    public static final SetFlagsRule.ClassRule mSetFlagsClassRule =

            new SetFlagsRule.ClassRule(

                    android.app.Flags.class,

                    android.hardware.biometrics.Flags.class,

                    android.multiuser.Flags.class,

                    android.net.platform.flags.Flags.class,

                    android.os.Flags.class,

                    android.service.controls.flags.Flags.class,

                    com.android.server.notification.Flags.class,

                    com.android.systemui.Flags.class);



    // TODO(b/339471826): Fix Robolectric to execute the @ClassRule correctly

    @Rule public final SetFlagsRule mSetFlagsRule =

            isRobolectricTest() ? new SetFlagsRule() : mSetFlagsClassRule.createSetFlagsRule();





    @Rule(order = 10)

    @Rule(order = 10)

    public final SceneContainerRule mSceneContainerRule = new SceneContainerRule();

    public final SceneContainerRule mSceneContainerRule = new SceneContainerRule();