[Android] Fix dependencies in tests

[Geoffrey Métais]

vlc-android | branch: master | Geoffrey Métais <geoffrey.metais at gmail.com> | Thu Jan 30 16:24:14 2020 +0100| [d672130be466d581155602cece0b4e984423ddf0] | committer: Nicolas Pomepuy

Fix dependencies in tests

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

 .../vlc-android/test-common/org/videolan/vlc/util/TestUtil.kt        | 4 ++--
 .../vlc-android/test/org/videolan/vlc/util/ModelsHelperTest.kt       | 5 ++---
 .../test/org/videolan/vlc/viewmodels/SubtitlesModelTest.kt           | 2 +-
 .../test/org/videolan/vlc/viewmodels/browser/NetworkModelTest.kt     | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/application/vlc-android/test-common/org/videolan/vlc/util/TestUtil.kt b/application/vlc-android/test-common/org/videolan/vlc/util/TestUtil.kt
index 3c59e1394..6f72ee5af 100644
--- a/application/vlc-android/test-common/org/videolan/vlc/util/TestUtil.kt
+++ b/application/vlc-android/test-common/org/videolan/vlc/util/TestUtil.kt
@@ -24,8 +24,8 @@ import android.net.Uri
 import org.videolan.libvlc.interfaces.IMedia
 import org.videolan.resources.TYPE_LOCAL_FAV
 import org.videolan.resources.TYPE_NETWORK_FAV
-import org.videolan.resources.api.OpenSubtitle
-import org.videolan.resources.api.QueryParameters
+import org.videolan.resources.opensubtitles.OpenSubtitle
+import org.videolan.resources.opensubtitles.QueryParameters
 import org.videolan.vlc.gui.dialogs.State
 import org.videolan.vlc.gui.dialogs.SubtitleItem
 
diff --git a/application/vlc-android/test/org/videolan/vlc/util/ModelsHelperTest.kt b/application/vlc-android/test/org/videolan/vlc/util/ModelsHelperTest.kt
index 9a4b450a0..4da8ad1ce 100644
--- a/application/vlc-android/test/org/videolan/vlc/util/ModelsHelperTest.kt
+++ b/application/vlc-android/test/org/videolan/vlc/util/ModelsHelperTest.kt
@@ -2,13 +2,12 @@ package org.videolan.vlc.util
 
 import kotlinx.coroutines.ExperimentalCoroutinesApi
 import kotlinx.coroutines.ObsoleteCoroutinesApi
-import org.videolan.vlc.BaseTest
-
-import org.junit.Assert.*
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.videolan.medialibrary.MLServiceLocator
 import org.videolan.medialibrary.interfaces.Medialibrary
 import org.videolan.medialibrary.stubs.StubDataSource
+import org.videolan.vlc.BaseTest
 import org.videolan.vlc.util.ModelsHelper.getHeader
 
 @ExperimentalCoroutinesApi
diff --git a/application/vlc-android/test/org/videolan/vlc/viewmodels/SubtitlesModelTest.kt b/application/vlc-android/test/org/videolan/vlc/viewmodels/SubtitlesModelTest.kt
index 1e1f6668c..0c26d57ac 100644
--- a/application/vlc-android/test/org/videolan/vlc/viewmodels/SubtitlesModelTest.kt
+++ b/application/vlc-android/test/org/videolan/vlc/viewmodels/SubtitlesModelTest.kt
@@ -15,7 +15,7 @@ import org.junit.rules.TemporaryFolder
 import org.videolan.tools.FileUtils
 import org.videolan.vlc.BaseTest
 import org.videolan.vlc.R
-import org.videolan.resources.api.NoConnectivityException
+import org.videolan.resources.util.NoConnectivityException
 import org.videolan.vlc.database.ExternalSubDao
 import org.videolan.vlc.gui.dialogs.State
 import org.videolan.vlc.repository.ExternalSubRepository
diff --git a/application/vlc-android/test/org/videolan/vlc/viewmodels/browser/NetworkModelTest.kt b/application/vlc-android/test/org/videolan/vlc/viewmodels/browser/NetworkModelTest.kt
index 86eee5c30..dced4f89e 100644
--- a/application/vlc-android/test/org/videolan/vlc/viewmodels/browser/NetworkModelTest.kt
+++ b/application/vlc-android/test/org/videolan/vlc/viewmodels/browser/NetworkModelTest.kt
@@ -18,12 +18,12 @@ import org.videolan.libvlc.util.MediaBrowser
 import org.videolan.medialibrary.interfaces.media.MediaWrapper
 import org.videolan.medialibrary.media.MediaLibraryItem
 import org.videolan.medialibrary.media.MediaWrapperImpl
+import org.videolan.tools.CoroutineContextProvider
+import org.videolan.tools.Settings
 import org.videolan.vlc.BaseTest
 import org.videolan.vlc.database.BrowserFavDao
 import org.videolan.vlc.providers.BrowserProvider
 import org.videolan.vlc.repository.BrowserFavRepository
-import org.videolan.tools.CoroutineContextProvider
-import org.videolan.vlc.util.Settings
 import org.videolan.vlc.util.TestCoroutineContextProvider
 import org.videolan.vlc.util.applyMock