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

Commit b96896d6 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Switch to mockito-extended"

parents d26b8bc7 a7a66956

services/tests/wmtests/Android.mk

+6 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    services.core \

    androidx.test.runner \

    androidx.test.rules \

    mockito-target-minus-junit4 \

    mockito-target-extended-minus-junit4 \

    platform-test-annotations \

    truth-prebuilt \

    testables \
@@ -30,6 +30,11 @@ LOCAL_JAVA_LIBRARIES := \ 
    android.test.base \

    android.test.runner \



# These are not normally accessible from apps so they must be explicitly included.

LOCAL_JNI_SHARED_LIBRARIES := \

    libdexmakerjvmtiagent \

    libstaticjvmtiagent \



LOCAL_PACKAGE_NAME := WmTests

LOCAL_PRIVATE_PLATFORM_APIS := true

LOCAL_COMPATIBILITY_SUITE := device-tests

services/tests/wmtests/AndroidManifest.xml

+2 −1
Original line number Diff line number Diff line
@@ -35,7 +35,8 @@ 
    <uses-permission android:name="android.permission.ACCESS_SURFACE_FLINGER" />

    <uses-permission android:name="android.permission.READ_FRAME_BUFFER" />



    <application android:testOnly="true">

    <application android:debuggable="true"

                 android:testOnly="true">

        <activity android:name="com.android.server.wm.TaskStackChangedListenerTest$ActivityA" />

        <activity android:name="com.android.server.wm.TaskStackChangedListenerTest$ActivityB" />

        <activity android:name="com.android.server.wm.TaskStackChangedListenerTest$ActivityRequestedOrientationChange" />

services/tests/wmtests/src/com/android/server/policy/PhoneWindowManagerTestBase.java

+7 −6
Original line number Diff line number Diff line
@@ -28,10 +28,13 @@ import static android.view.ViewGroup.LayoutParams.MATCH_PARENT; 
import static android.view.WindowManager.LayoutParams.TYPE_NAVIGATION_BAR;

import static android.view.WindowManager.LayoutParams.TYPE_STATUS_BAR;



import static com.android.server.wm.utils.CoordinateTransforms.transformPhysicalToLogicalCoordinates;

import static androidx.test.platform.app.InstrumentationRegistry.getInstrumentation;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock;

import static com.android.server.wm.utils.CoordinateTransforms

        .transformPhysicalToLogicalCoordinates;



import static org.junit.Assert.assertEquals;

import static org.mockito.Mockito.mock;



import android.content.Context;

import android.content.ContextWrapper;
@@ -55,8 +58,6 @@ import android.view.WindowManagerGlobal; 
import android.view.accessibility.AccessibilityManager;

import android.view.accessibility.IAccessibilityManager;



import androidx.test.InstrumentationRegistry;



import com.android.server.policy.keyguard.KeyguardServiceDelegate;

import com.android.server.wm.DisplayFrames;

import com.android.server.wm.WindowTestUtils.TestDisplayContent;
@@ -83,7 +84,7 @@ class PhoneWindowManagerTestBase { 


    @Before

    public void setUpBase() {

        mContext = new TestContextWrapper(InstrumentationRegistry.getTargetContext());

        mContext = new TestContextWrapper(getInstrumentation().getTargetContext());

        mContext.getResourceMocker().addOverride(

                com.android.internal.R.dimen.status_bar_height_portrait, STATUS_BAR_HEIGHT);

        mContext.getResourceMocker().addOverride(
@@ -259,7 +260,7 @@ class PhoneWindowManagerTestBase { 


        public static TestablePhoneWindowManager create(Context context) {

            TestablePhoneWindowManager[] policy = new TestablePhoneWindowManager[1];

            InstrumentationRegistry.getInstrumentation().runOnMainSync(() -> {

            getInstrumentation().runOnMainSync(() -> {

                policy[0] = new TestablePhoneWindowManager();

                policy[0].mContext = context;

                policy[0].mKeyguardDelegate = mock(KeyguardServiceDelegate.class);

services/tests/wmtests/src/com/android/server/wm/ActivityDisplayTests.java

+5 −5
Original line number Diff line number Diff line
@@ -23,17 +23,17 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED; 
import static android.content.pm.ActivityInfo.FLAG_ALWAYS_FOCUSABLE;

import static android.content.pm.ActivityInfo.FLAG_SHOW_WHEN_LOCKED;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.doReturn;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.never;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.reset;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.spy;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify;

import static com.android.server.wm.ActivityStackSupervisor.ON_TOP;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertNull;

import static org.junit.Assert.assertTrue;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.reset;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.verify;



import android.platform.test.annotations.Presubmit;

services/tests/wmtests/src/com/android/server/wm/ActivityMetricsLaunchObserverTests.java

+4 −4
Original line number Diff line number Diff line
@@ -21,11 +21,12 @@ import static android.app.ActivityManager.START_TASK_TO_FRONT; 
import static android.app.WindowConfiguration.ACTIVITY_TYPE_STANDARD;

import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;



import static com.android.dx.mockito.inline.extended.ExtendedMockito.mock;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.verify;

import static com.android.dx.mockito.inline.extended.ExtendedMockito.verifyNoMoreInteractions;



import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.verifyNoMoreInteractions;



import android.content.Intent;

import android.os.SystemClock;
@@ -34,7 +35,6 @@ import android.util.SparseIntArray; 


import androidx.test.filters.FlakyTest;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Before;

import org.junit.Test;