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

Commit eb4760c4 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Replace deprecated AndroidJUnit4." into main

parents e5ccbed9 25bcaf2c

core/tests/coretests/src/android/os/BinderDeathRecipientTest.java

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ import android.util.Log; 
import android.util.Pair;



import androidx.test.InstrumentationRegistry;

import androidx.test.runner.AndroidJUnit4;

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



import com.android.frameworks.coretests.bdr_helper_app.TestCommsReceiver;

core/tests/coretests/src/android/os/BinderProxyCountingTest.java

+1 −1
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import android.platform.test.ravenwood.RavenwoodRule; 
import android.util.Log;



import androidx.test.InstrumentationRegistry;

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

import androidx.test.filters.LargeTest;

import androidx.test.runner.AndroidJUnit4;

import androidx.test.uiautomator.UiDevice;



import com.android.frameworks.coretests.aidl.IBpcCallbackObserver;

core/tests/coretests/src/android/os/BinderWorkSourceTest.java

+1 −2
Original line number Diff line number Diff line
@@ -29,13 +29,12 @@ import android.platform.test.annotations.Presubmit; 
import android.platform.test.ravenwood.RavenwoodRule;



import androidx.test.InstrumentationRegistry;

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

import androidx.test.filters.LargeTest;

import androidx.test.filters.Suppress;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Before;

import org.junit.BeforeClass;

import org.junit.Rule;

import org.junit.Test;

import org.junit.runner.RunWith;

core/tests/coretests/src/android/os/BluetoothBatteryStatsTest.java

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ package android.os; 


import static com.google.common.truth.Truth.assertThat;



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/os/BroadcasterTest.java

+1 −1
Original line number Diff line number Diff line
@@ -18,8 +18,8 @@ package android.os; 


import android.platform.test.ravenwood.RavenwoodRule;



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

import androidx.test.filters.MediumTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.Rule;

import org.junit.Test;