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

Commit 868e619d 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 --\
 --module-arg FrameworksCoreTests:include-filter:android.net \
 --module-arg FrameworksCoreTests:instrumentation-arg:annotation:=android.platform.test.annotations.Presubmit \
 --module-arg FrameworksCoreTests:instrumentation-arg:notAnnotation:=android.support.test.filters.FlakyTest,androidx.test.filters.FlakyTest
Flag: TEST_ONLY
Change-Id: Idf0d91782ffcef28495a8875176b5a9bdfaea0f5
parent 37d1bca6

core/tests/coretests/src/android/net/NetworkKeyTest.java

+1 −1
Original line number Diff line number Diff line
@@ -25,7 +25,7 @@ import android.net.wifi.ScanResult; 
import android.net.wifi.WifiInfo;

import android.net.wifi.WifiManager;



import androidx.test.runner.AndroidJUnit4;

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



import org.junit.Before;

import org.junit.Test;

core/tests/coretests/src/android/net/NetworkRecommendationProviderTest.java

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import static org.mockito.Matchers.eq; 
import android.Manifest.permission;

import android.content.Context;



import androidx.test.runner.AndroidJUnit4;

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



import org.junit.Before;

import org.junit.Test;

core/tests/coretests/src/android/net/SSLCertificateSocketFactoryTest.java

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ package android.net; 
import static org.junit.Assert.assertTrue;

import static org.junit.Assert.fail;



import androidx.test.runner.AndroidJUnit4;

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



import org.junit.Test;

import org.junit.runner.RunWith;

core/tests/coretests/src/android/net/ScoredNetworkTest.java

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ import static org.junit.Assert.fail; 
import android.os.Bundle;

import android.os.Parcel;



import androidx.test.runner.AndroidJUnit4;

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



import org.junit.Test;

import org.junit.runner.RunWith;

core/tests/coretests/src/android/net/SntpClientTest.java

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ import android.net.sntp.Timestamp64; 
import android.platform.test.annotations.Presubmit;

import android.util.Log;



import androidx.test.runner.AndroidJUnit4;

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



import libcore.util.HexEncoding;