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

Commit 2937f5f1 authored by Eric Lin's avatar Eric Lin
Browse files

Replace deprecated AndroidJUnit4. 

AndroidJUnit4 from `androidx.test.runner` is deprecated, use
`androidx.test.ext.junit.runners.AndroidJUnit4` instead. See https://
developer.android.com/reference/androidx/test/runner/AndroidJUnit4 for
more details.

Bug: 354063239
Test: atest FrameworksCoreTests
Test: atest WmTests:SurfaceControlTests WmTests:CombinationKeyTests
Flag: TEST_ONLY
Change-Id: I9622c21427d9df2c0692b8c935d78cd807eb9743
parent 029499c8

core/tests/coretests/src/android/view/WindowInfoTest.java

+1 −1
Original line number Diff line number Diff line
@@ -34,8 +34,8 @@ import android.platform.test.annotations.Presubmit; 
import android.text.TextUtils;

import android.view.accessibility.AccessibilityNodeInfo;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;

core/tests/coretests/src/android/view/WindowInsetsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -26,8 +26,8 @@ import android.graphics.Insets; 
import android.graphics.Rect;

import android.platform.test.annotations.Presubmit;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Test;

import org.junit.runner.RunWith;

core/tests/coretests/src/android/view/WindowManagerTests.java

+1 −1
Original line number Diff line number Diff line
@@ -25,8 +25,8 @@ import static org.junit.Assume.assumeTrue; 
import android.platform.test.annotations.Presubmit;

import android.platform.test.flag.junit.SetFlagsRule;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Rule;

import org.junit.Test;

core/tests/coretests/src/android/view/WindowMetricsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -27,9 +27,9 @@ import android.hardware.display.DisplayManager; 
import android.os.Handler;

import android.platform.test.annotations.Presubmit;



import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.filters.SmallTest;

import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Before;

import org.junit.Test;

core/tests/coretests/src/android/window/SystemPerformanceHinterTests.java

+2 −2
Original line number Diff line number Diff line
@@ -30,8 +30,8 @@ import static android.window.SystemPerformanceHinter.HINT_SF_FRAME_RATE; 
import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertThrows;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyInt;

import static org.mockito.ArgumentMatchers.eq;

import static org.mockito.Mockito.never;

import static org.mockito.Mockito.reset;
@@ -42,8 +42,8 @@ import android.platform.test.annotations.Presubmit; 
import android.view.SurfaceControl;



import androidx.annotation.NonNull;

import androidx.test.ext.junit.runners.AndroidJUnit4;

import androidx.test.platform.app.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Before;

import org.junit.Test;