Merge "Replace MockitoAnnotations with @Rule MockitoJUnit.rule()." into main (05521c1b) · Commits · e / os / android_frameworks_base

libs/WindowManager/Jetpack/tests/unittest/src/androidx/window/extensions/embedding/DividerPresenterTest.java

+5 −2

Original line number	Diff line number	Diff line
		@@ -59,7 +59,8 @@ 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.concurrent.Executor;

		@@ -73,6 +74,9 @@ import java.util.concurrent.Executor;
		@SmallTest
		@RunWith(AndroidJUnit4.class)
		public class DividerPresenterTest {
		@Rule
		public MockitoRule rule = MockitoJUnit.rule();

		@Rule
		public final SetFlagsRule mSetFlagRule = new SetFlagsRule();

		@@ -118,7 +122,6 @@ public class DividerPresenterTest {

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		mSetFlagRule.enableFlags(Flags.FLAG_ACTIVITY_EMBEDDING_INTERACTIVE_DIVIDER_FLAG);

		when(mTaskContainer.getTaskId()).thenReturn(MOCK_TASK_ID);

+6 −2

Original line number	Diff line number	Diff line
		@@ -42,10 +42,12 @@ import androidx.test.ext.junit.runners.AndroidJUnit4;
		import androidx.test.filters.SmallTest;

		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.ArrayList;

		@@ -61,6 +63,9 @@ import java.util.ArrayList;
		@SmallTest
		@RunWith(AndroidJUnit4.class)
		public class JetpackTaskFragmentOrganizerTest {
		@Rule
		public MockitoRule rule = MockitoJUnit.rule();

		@Mock
		private WindowContainerTransaction mTransaction;
		@Mock
		@@ -73,7 +78,6 @@ public class JetpackTaskFragmentOrganizerTest {

		@Before
		public void setup() {
		MockitoAnnotations.initMocks(this);
		mOrganizer = new JetpackTaskFragmentOrganizer(Runnable::run, mCallback);
		mOrganizer.registerOrganizer();
		spyOn(mOrganizer);

+4 −2

Original line number	Diff line number	Diff line
		@@ -81,7 +81,8 @@ 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.ArrayList;
		import java.util.List;
		@@ -98,6 +99,8 @@ import java.util.List;
		@SmallTest
		@RunWith(AndroidJUnit4.class)
		public class OverlayPresentationTest {
		@Rule
		public MockitoRule rule = MockitoJUnit.rule();

		@Rule
		public final SetFlagsRule mSetFlagRule = new SetFlagsRule();
		@@ -126,7 +129,6 @@ public class OverlayPresentationTest {

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		doReturn(new WindowLayoutInfo(new ArrayList<>())).when(mWindowLayoutComponent)
		.getCurrentWindowLayoutInfo(anyInt(), any());
		DeviceStateManagerFoldingFeatureProducer producer =

+5 −2

Original line number	Diff line number	Diff line
		@@ -111,7 +111,8 @@ import org.junit.Test;
		import org.junit.runner.RunWith;
		import org.mockito.ArgumentCaptor;
		import org.mockito.Mock;
		import org.mockito.MockitoAnnotations;
		import org.mockito.junit.MockitoJUnit;
		import org.mockito.junit.MockitoRule;

		import java.util.ArrayList;
		import java.util.Collections;
		@@ -136,6 +137,9 @@ public class SplitControllerTest {
		private static final Intent PLACEHOLDER_INTENT = new Intent().setComponent(
		new ComponentName("test", "placeholder"));

		@Rule
		public MockitoRule rule = MockitoJUnit.rule();

		@Rule
		public final SetFlagsRule mSetFlagRule = new SetFlagsRule();

		@@ -166,7 +170,6 @@ public class SplitControllerTest {

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		doReturn(new WindowLayoutInfo(new ArrayList<>())).when(mWindowLayoutComponent)
		.getCurrentWindowLayoutInfo(anyInt(), any());
		DeviceStateManagerFoldingFeatureProducer producer =

+7 −2

Original line number	Diff line number	Diff line
		@@ -85,10 +85,12 @@ import androidx.window.extensions.layout.WindowLayoutComponentImpl;
		import androidx.window.extensions.layout.WindowLayoutInfo;

		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.ArrayList;

		@@ -106,6 +108,10 @@ import java.util.ArrayList;
		public class SplitPresenterTest {

		private Activity mActivity;

		@Rule
		public MockitoRule rule = MockitoJUnit.rule();

		@Mock
		private Resources mActivityResources;
		@Mock
		@@ -119,7 +125,6 @@ public class SplitPresenterTest {

		@Before
		public void setUp() {
		MockitoAnnotations.initMocks(this);
		doReturn(new WindowLayoutInfo(new ArrayList<>())).when(mWindowLayoutComponent)
		.getCurrentWindowLayoutInfo(anyInt(), any());
		DeviceStateManagerFoldingFeatureProducer producer =