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

Commit b91392d3 authored by Winson Chung's avatar Winson Chung
Browse files

Support running WMShellUnitTests from studio 

- Remove unnecessary @Presubmit annotation
- Fix issue with test activity referencing wrong resources
- Disable protolog requirement for tests when running under studio
  (like we do for SysUI studio builds)
- Ensure all tests extend ShellTestCase

Test: Run tests from studio, and also from atest WMShellUnitTests
Bug: 238444377
Change-Id: I60a96dfcbbf119d6736e96193f5a7d41611e2fd1
parent 98ae6356

libs/WindowManager/Shell/tests/unittest/Android.bp

+8 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ android_test { 
        "**/*.java",

        "**/*.kt",

    ],

    resource_dirs: [

        "res",

    ],



    static_libs: [

        "WindowManager-Shell",
@@ -65,4 +68,9 @@ android_test { 
    optimize: {

        enabled: false,

    },



    aaptflags: [

        "--extra-packages",

        "com.android.wm.shell.tests",

    ],

}

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/ShellTaskOrganizerTests.java

+1 −1
Original line number Diff line number Diff line
@@ -76,7 +76,7 @@ import java.util.Optional; 
 */

@SmallTest

@RunWith(AndroidJUnit4.class)

public class ShellTaskOrganizerTests {

public class ShellTaskOrganizerTests extends ShellTestCase {



    @Mock

    private ITaskOrganizerController mTaskOrganizerController;

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/ShellTestCase.java

+5 −0
Original line number Diff line number Diff line
@@ -24,6 +24,8 @@ import android.testing.TestableContext; 


import androidx.test.platform.app.InstrumentationRegistry;



import com.android.internal.protolog.common.ProtoLog;



import org.junit.After;

import org.junit.Before;

import org.mockito.MockitoAnnotations;
@@ -37,6 +39,9 @@ public abstract class ShellTestCase { 


    @Before

    public void shellSetup() {

        // Disable protolog tool when running the tests from studio

        ProtoLog.REQUIRE_PROTOLOGTOOL = false;



        MockitoAnnotations.initMocks(this);

        final Context context =

                InstrumentationRegistry.getInstrumentation().getTargetContext();

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/back/BackAnimationControllerTest.java

+2 −1
Original line number Diff line number Diff line
@@ -57,6 +57,7 @@ import androidx.test.filters.SmallTest; 
import androidx.test.platform.app.InstrumentationRegistry;



import com.android.internal.util.test.FakeSettingsProvider;

import com.android.wm.shell.ShellTestCase;

import com.android.wm.shell.TestShellExecutor;



import org.junit.Before;
@@ -74,7 +75,7 @@ import org.mockito.MockitoAnnotations; 
@TestableLooper.RunWithLooper

@SmallTest

@RunWith(AndroidTestingRunner.class)

public class BackAnimationControllerTest {

public class BackAnimationControllerTest extends ShellTestCase {



    private static final String ANIMATION_ENABLED = "1";

    private final TestShellExecutor mShellExecutor = new TestShellExecutor();

libs/WindowManager/Shell/tests/unittest/src/com/android/wm/shell/bubbles/BubblesTestActivity.java

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ import android.app.Activity; 
import android.content.Intent;

import android.os.Bundle;



import com.android.wm.shell.R;

import com.android.wm.shell.tests.R;



/**

 * Referenced by NotificationTestHelper#makeBubbleMetadata