Update JUnit

vlc-android/androidTest/org/videolan/vlc/database/BrowserFavDaoTest.kt

@@ -20,7 +20,7 @@
 
 package org.videolan.vlc.database
 
-import androidx.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.*
 import org.junit.Test

vlc-android/androidTest/org/videolan/vlc/database/ConvertersTest.kt

@@ -21,7 +21,7 @@
 package org.videolan.vlc.database
 
 import android.net.Uri
-import androidx.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import junit.framework.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith

vlc-android/androidTest/org/videolan/vlc/database/CustomDirectoryDaoTest.kt

@@ -1,6 +1,6 @@
 package org.videolan.vlc.database
 
-import androidx.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.hamcrest.CoreMatchers.hasItem
 import org.hamcrest.core.Is.`is`
 import org.junit.Assert.assertThat

vlc-android/androidTest/org/videolan/vlc/database/ExternalSubDaoTest.kt

@@ -20,7 +20,7 @@
 
 package org.videolan.vlc.database
 
-import androidx.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.hamcrest.Matchers.*
 import org.junit.Assert.assertThat
 import org.junit.Test

vlc-android/androidTest/org/videolan/vlc/database/MigrationTest.kt

@@ -27,7 +27,7 @@ import androidx.room.testing.MigrationTestHelper
 import android.net.Uri
 import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.test.InstrumentationRegistry
-import androidx.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.hamcrest.CoreMatchers.`is`
 import org.hamcrest.CoreMatchers.hasItem
 import org.junit.Assert.*

vlc-android/androidTest/org/videolan/vlc/database/SlaveDaoTest.kt

@@ -20,7 +20,7 @@
 
 package org.videolan.vlc.database
 
-import androidx.test.runner.AndroidJUnit4
+import androidx.test.ext.junit.runners.AndroidJUnit4
 import org.hamcrest.MatcherAssert.assertThat
 import org.hamcrest.Matchers.*
 import org.junit.Test

vlc-android/build.gradle

@@ -269,11 +269,12 @@ dependencies {
     androidTestImplementation "androidx.room:room-testing:$rootProject.ext.roomVersion"
     testImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
     androidTestImplementation "androidx.arch.core:core-testing:$rootProject.ext.archVersion"
-    androidTestImplementation "androidx.test:runner:$rootProject.ext.supportTest"
+    androidTestImplementation "androidx.test.ext:junit:$rootProject.ext.supportTest"
     androidTestUtil "androidx.test:orchestrator:$rootProject.ext.supportTest"
     testImplementation "org.mockito:mockito-core:$rootProject.ext.mockito"
     testImplementation "org.powermock:powermock-api-mockito2:$rootProject.ext.powerMock"
     testImplementation "org.powermock:powermock-module-junit4:$rootProject.ext.powerMock"
+    androidTestImplementation 'androidx.test:rules:1.3.0-alpha01'
 }
 
 static def buildTime() {