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

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

Merge "Replace deprecated AndroidJUnit4." into main

parents 767ee832 6914daa9

core/tests/coretests/src/android/database/CursorWindowTest.java

+1 −1
Original line number Diff line number Diff line
@@ -23,8 +23,8 @@ import static org.junit.Assert.assertTrue; 
import android.database.sqlite.SQLiteException;

import android.platform.test.ravenwood.RavenwoodRule;



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/database/DatabaseUtilsTest.java

+4 −5
Original line number Diff line number Diff line
@@ -16,20 +16,19 @@ 


package android.database;



import static android.database.DatabaseUtils.bindSelection;

import static android.database.DatabaseUtils.getSqlStatementType;

import static android.database.DatabaseUtils.getSqlStatementTypeExtended;

import static android.database.DatabaseUtils.STATEMENT_COMMENT;

import static android.database.DatabaseUtils.STATEMENT_CREATE;

import static android.database.DatabaseUtils.STATEMENT_DDL;

import static android.database.DatabaseUtils.STATEMENT_OTHER;

import static android.database.DatabaseUtils.STATEMENT_SELECT;

import static android.database.DatabaseUtils.STATEMENT_UPDATE;

import static android.database.DatabaseUtils.STATEMENT_WITH;

import static android.database.DatabaseUtils.bindSelection;

import static android.database.DatabaseUtils.getSqlStatementType;

import static android.database.DatabaseUtils.getSqlStatementTypeExtended;



import static org.junit.Assert.assertEquals;



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/database/RedactingCursorTest.java

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ import android.content.Context; 
import android.net.Uri;



import androidx.test.InstrumentationRegistry;

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/database/SQLiteOpenHelperTest.java

+1 −1
Original line number Diff line number Diff line
@@ -29,8 +29,8 @@ import android.database.sqlite.SQLiteOpenHelper; 
import android.util.Log;



import androidx.test.InstrumentationRegistry;

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

import androidx.test.filters.SmallTest;

import androidx.test.runner.AndroidJUnit4;



import org.junit.After;

import org.junit.Before;

core/tests/coretests/src/android/database/sqlite/SQLiteCantOpenDatabaseExceptionTest.java

+1 −3
Original line number Diff line number Diff line
@@ -20,14 +20,12 @@ import static org.junit.Assert.assertTrue; 
import static org.junit.Assert.fail;



import android.content.Context;

import android.database.sqlite.SQLiteCantOpenDatabaseException;

import android.database.sqlite.SQLiteDatabase;

import android.database.sqlite.SQLiteDatabase.OpenParams;

import android.util.Log;



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

import org.junit.runner.RunWith;