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

Commit 509712f1 authored by Eric Lin's avatar Eric Lin Committed by Android (Google) Code Review
Browse files

Merge changes I411a3cc2,I9622c214 into main 

* changes:
  Refactor Mockito init to follow best practices.
  Replace deprecated AndroidJUnit4.
parents 025298b1 ede226fa

core/tests/coretests/src/android/app/activity/ActivityThreadTest.java

+5 −3
Original line number Diff line number Diff line
@@ -90,7 +90,8 @@ import org.junit.Before; 
import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



import java.util.ArrayList;

import java.util.List;
@@ -117,6 +118,9 @@ public class ActivityThreadTest { 
    // few sequence numbers the framework used to launch the test activity.

    private static final int BASE_SEQ = 10000000;



    @Rule

    public final MockitoRule mocks = MockitoJUnit.rule();



    @Rule(order = 0)

    public final ActivityTestRule<TestActivity> mActivityTestRule =

            new ActivityTestRule<>(TestActivity.class, true /* initialTouchMode */,
@@ -133,8 +137,6 @@ public class ActivityThreadTest { 


    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);



        // Keep track of the original controller, so that it can be used to restore in tearDown()

        // when there is override in some test cases.

        mOriginalWindowTokenClientController = WindowTokenClientController.getInstance();

core/tests/coretests/src/android/app/servertransaction/ClientTransactionItemTest.java

+6 −2
Original line number Diff line number Diff line
@@ -47,10 +47,12 @@ import androidx.test.filters.SmallTest; 
import androidx.test.runner.AndroidJUnit4;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



/**

 * Tests for subtypes of {@link ClientTransactionItem}.
@@ -63,6 +65,9 @@ import org.mockito.MockitoAnnotations; 
@Presubmit

public class ClientTransactionItemTest {



    @Rule

    public final MockitoRule mocks = MockitoJUnit.rule();



    @Mock

    private ClientTransactionHandler mHandler;

    @Mock
@@ -89,7 +94,6 @@ public class ClientTransactionItemTest { 


    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mGlobalConfig = new Configuration();

        mConfiguration = new Configuration();

        mActivitiesToBeDestroyed = new ArrayMap<>();

core/tests/coretests/src/android/app/servertransaction/ClientTransactionListenerControllerTest.java

+4 −2
Original line number Diff line number Diff line
@@ -59,7 +59,8 @@ import org.junit.Test; 
import org.junit.runner.RunWith;

import org.mockito.InOrder;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



import java.util.concurrent.RejectedExecutionException;

import java.util.function.BiConsumer;
@@ -75,6 +76,8 @@ import java.util.function.BiConsumer; 
@Presubmit

public class ClientTransactionListenerControllerTest {



    @Rule

    public final MockitoRule mocks = MockitoJUnit.rule();

    @Rule

    public final SetFlagsRule mSetFlagsRule = new SetFlagsRule(DEVICE_DEFAULT);
@@ -100,7 +103,6 @@ public class ClientTransactionListenerControllerTest { 


    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

        mDisplayManager = new DisplayManagerGlobal(mIDisplayManager);

        mHandler = getInstrumentation().getContext().getMainThreadHandler();

        mController = spy(ClientTransactionListenerController

core/tests/coretests/src/android/app/servertransaction/ObjectPoolTests.java

+5 −7
Original line number Diff line number Diff line
@@ -49,12 +49,12 @@ import androidx.test.filters.SmallTest; 


import com.android.window.flags.Flags;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



import java.util.List;

import java.util.function.Supplier;
@@ -81,6 +81,9 @@ public class ObjectPoolTests { 
        return FlagsParameterization.allCombinationsOf(FLAG_DISABLE_OBJECT_POOL);

    }



    @Rule

    public final MockitoRule mocks = MockitoJUnit.rule();



    @Rule

    public SetFlagsRule mSetFlagsRule;
@@ -93,11 +96,6 @@ public class ObjectPoolTests { 
        mSetFlagsRule = new SetFlagsRule(flags);

    }



    @Before

    public void setup() {

        MockitoAnnotations.initMocks(this);

    }



    // 1. Check if two obtained objects from pool are not the same.

    // 2. Check if the state of the object is cleared after recycling.

    // 3. Check if the same object is obtained from pool after recycling.

core/tests/coretests/src/android/app/servertransaction/TransactionExecutorTests.java

+6 −3
Original line number Diff line number Diff line
@@ -57,11 +57,13 @@ import androidx.test.filters.SmallTest; 
import androidx.test.runner.AndroidJUnit4;



import org.junit.Before;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

import org.mockito.InOrder;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.mockito.junit.MockitoJUnit;

import org.mockito.junit.MockitoRule;



import java.util.Arrays;

import java.util.Collections;
@@ -83,6 +85,9 @@ import java.util.stream.Collectors; 
@Presubmit

public class TransactionExecutorTests {



    @Rule

    public final MockitoRule mocks = MockitoJUnit.rule();



    @Mock

    private ClientTransactionHandler mTransactionHandler;

    @Mock
@@ -98,8 +103,6 @@ public class TransactionExecutorTests { 


    @Before

    public void setUp() throws Exception {

        MockitoAnnotations.initMocks(this);



        mClientRecord = new ActivityClientRecord();

        when(mTransactionHandler.getActivityClient(any())).thenReturn(mClientRecord);