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

Commit 1e561212 authored by Yuyang Huang's avatar Yuyang Huang Committed by Automerger Merge Worker
Browse files

Merge "Replace deprecated AndroidJUnit4." into main am: 0eb13cf6 am: 125e2410 

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/3197155



Change-Id: Ib62a0c186274aeaca85bc6993467f90a15445fc3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents c00dc581 125e2410

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;