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

Commit 8d0b3ee4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Running various lifecycle-related tests on main thread" am: 842af183 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1741658

Change-Id: I3a54db9178355ab521299359c9731ed7a93c1471
parents b88af2dd 842af183

packages/SystemUI/tests/src/com/android/systemui/globalactions/GlobalActionsDialogTest.java

+1 −1
Original line number Diff line number Diff line
@@ -89,7 +89,7 @@ import java.util.concurrent.Executor; 


@SmallTest

@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper()

@TestableLooper.RunWithLooper(setAsMainLooper = true)

public class GlobalActionsDialogTest extends SysuiTestCase {

    private GlobalActionsDialog mGlobalActionsDialog;

packages/SystemUI/tests/src/com/android/systemui/qs/tileimpl/QSTileImplTest.java

+1 −1
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;



@RunWith(AndroidTestingRunner.class)

@RunWithLooper

@RunWithLooper(setAsMainLooper = true)

@SmallTest

public class QSTileImplTest extends SysuiTestCase {

packages/SystemUI/tests/src/com/android/systemui/qs/tiles/ScreenRecordTileTest.java

+1 −1
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ import org.mockito.Mock; 
import org.mockito.MockitoAnnotations;



@RunWith(AndroidTestingRunner.class)

@TestableLooper.RunWithLooper()

@TestableLooper.RunWithLooper(setAsMainLooper = true)

@SmallTest

public class ScreenRecordTileTest extends SysuiTestCase {

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

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ import org.junit.runner.RunWith; 
import org.mockito.Mockito;



@RunWith(AndroidTestingRunner.class)

@RunWithLooper()

@RunWithLooper(setAsMainLooper = true)

@SmallTest

public class CollapsedStatusBarFragmentTest extends SysuiBaseFragmentTest {

packages/SystemUI/tests/src/com/android/systemui/statusbar/policy/CallbackControllerTest.java

+1 −1
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.mockito.ArgumentCaptor;



@RunWithLooper

@RunWithLooper(setAsMainLooper = true)

@RunWith(AndroidTestingRunner.class)

@SmallTest

public class CallbackControllerTest extends SysuiTestCase {