[Android] Update JUnit

[Duncan McNamara]

vlc-android | branch: master | Duncan McNamara <dcn.mcnamara at gmail.com> | Tue May 14 14:32:41 2019 +0200| [8ee5cd045e43f557e4070bb104a0e5bdd53ddd14] | committer: Duncan McNamara

Update JUnit

> https://code.videolan.org/videolan/vlc-android/commit/8ee5cd045e43f557e4070bb104a0e5bdd53ddd14
---

 vlc-android/androidTest/org/videolan/vlc/database/BrowserFavDaoTest.kt | 2 +-
 vlc-android/androidTest/org/videolan/vlc/database/ConvertersTest.kt    | 2 +-
 .../androidTest/org/videolan/vlc/database/CustomDirectoryDaoTest.kt    | 2 +-
 .../androidTest/org/videolan/vlc/database/ExternalSubDaoTest.kt        | 2 +-
 vlc-android/androidTest/org/videolan/vlc/database/MigrationTest.kt     | 2 +-
 vlc-android/androidTest/org/videolan/vlc/database/SlaveDaoTest.kt      | 2 +-
 vlc-android/build.gradle                                               | 3 ++-
 7 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/vlc-android/androidTest/org/videolan/vlc/database/BrowserFavDaoTest.kt b/vlc-android/androidTest/org/videolan/vlc/database/BrowserFavDaoTest.kt
index 87c4f87e4..7edde6950 100644
--- a/vlc-android/androidTest/org/videolan/vlc/database/BrowserFavDaoTest.kt
+++ b/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
diff --git a/vlc-android/androidTest/org/videolan/vlc/database/ConvertersTest.kt b/vlc-android/androidTest/org/videolan/vlc/database/ConvertersTest.kt
index 202646686..09fc1fa51 100644
--- a/vlc-android/androidTest/org/videolan/vlc/database/ConvertersTest.kt
+++ b/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
diff --git a/vlc-android/androidTest/org/videolan/vlc/database/CustomDirectoryDaoTest.kt b/vlc-android/androidTest/org/videolan/vlc/database/CustomDirectoryDaoTest.kt
index 83792a58b..f5c39e3c9 100644
--- a/vlc-android/androidTest/org/videolan/vlc/database/CustomDirectoryDaoTest.kt
+++ b/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
diff --git a/vlc-android/androidTest/org/videolan/vlc/database/ExternalSubDaoTest.kt b/vlc-android/androidTest/org/videolan/vlc/database/ExternalSubDaoTest.kt
index 8856c7da5..e966b02db 100644
--- a/vlc-android/androidTest/org/videolan/vlc/database/ExternalSubDaoTest.kt
+++ b/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
diff --git a/vlc-android/androidTest/org/videolan/vlc/database/MigrationTest.kt b/vlc-android/androidTest/org/videolan/vlc/database/MigrationTest.kt
index 87f8b7c5e..366d91ac2 100644
--- a/vlc-android/androidTest/org/videolan/vlc/database/MigrationTest.kt
+++ b/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.*
diff --git a/vlc-android/androidTest/org/videolan/vlc/database/SlaveDaoTest.kt b/vlc-android/androidTest/org/videolan/vlc/database/SlaveDaoTest.kt
index a5a103083..1a06a05d6 100644
--- a/vlc-android/androidTest/org/videolan/vlc/database/SlaveDaoTest.kt
+++ b/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
diff --git a/vlc-android/build.gradle b/vlc-android/build.gradle
index 02d743e80..c4c461361 100644
--- a/vlc-android/build.gradle
+++ b/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() {