Merge branch 'review' of https://github.com/maskaravivek/apps-android-commons into review

Author: maskaravivek

app/build.gradle

@@ -60,7 +60,8 @@ dependencies {
     testImplementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$KOTLIN_VERSION"
     testImplementation "org.jetbrains.kotlin:kotlin-reflect:$KOTLIN_VERSION"
     testImplementation 'junit:junit:4.12'
-    testImplementation 'org.robolectric:robolectric:3.7.1'
+    testImplementation 'org.robolectric:robolectric:4.3'
+    testImplementation 'androidx.test:core:1.2.0'
     testImplementation 'com.nhaarman:mockito-kotlin:1.5.0'
     testImplementation 'com.squareup.okhttp3:mockwebserver:3.10.0'
 

app/src/test/kotlin/fr/free/nrw/commons/MediaDataExtractorTest.kt

@@ -4,7 +4,7 @@ import fr.free.nrw.commons.mwapi.MediaResult
 import fr.free.nrw.commons.mwapi.MediaWikiApi
 import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient
 import io.reactivex.Single
-import junit.framework.Assert.assertTrue
+import org.junit.Assert.assertTrue
 import org.junit.Before
 import org.junit.Test
 import org.mockito.ArgumentMatchers

app/src/test/kotlin/fr/free/nrw/commons/MediaTest.kt

@@ -7,7 +7,7 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = intArrayOf(21), application = TestCommonsApplication::class)
+@Config(sdk = [21], application = TestCommonsApplication::class)
 class MediaTest {
     @Test
     fun displayTitleShouldStripExtension() {

app/src/test/kotlin/fr/free/nrw/commons/NearbyControllerTest.kt

@@ -2,23 +2,23 @@ package fr.free.nrw.commons
 
 import fr.free.nrw.commons.location.LatLng
 import fr.free.nrw.commons.nearby.NearbyController.loadAttractionsFromLocationToBaseMarkerOptions
+import androidx.test.core.app.ApplicationProvider
 import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 import org.robolectric.RobolectricTestRunner
-import org.robolectric.RuntimeEnvironment
 import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = [21], application = TestCommonsApplication::class)
+@Config(sdk = [21], application = TestCommonsApplication::class)
 class NearbyControllerTest {
 
     @Test
     fun testNullAttractions() {
         val location = LatLng(0.0, 0.0, 0f)
 
         val options = loadAttractionsFromLocationToBaseMarkerOptions(
-                location, null, RuntimeEnvironment.application, null)
+                location, null, ApplicationProvider.getApplicationContext(), null)
 
         assertEquals(0, options.size.toLong())
     }
@@ -28,7 +28,7 @@ class NearbyControllerTest {
         val location = LatLng(0.0, 0.0, 0f)
 
         val options = loadAttractionsFromLocationToBaseMarkerOptions(
-                location, emptyList(), RuntimeEnvironment.application, emptyList())
+                location, emptyList(), ApplicationProvider.getApplicationContext(), emptyList())
 
         assertEquals(0, options.size.toLong())
     }

app/src/test/kotlin/fr/free/nrw/commons/bookmarks/locations/BookMarkLocationDaoTest.kt

@@ -24,7 +24,7 @@ import org.robolectric.RobolectricTestRunner
 import org.robolectric.annotation.Config
 
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = [21], application = TestCommonsApplication::class)
+@Config(sdk = [21], application = TestCommonsApplication::class)
 class BookMarkLocationDaoTest {
     private val columns = arrayOf(COLUMN_NAME,
             COLUMN_DESCRIPTION,

app/src/test/kotlin/fr/free/nrw/commons/bookmarks/pictures/BookmarkPictureDaoTest.kt

@@ -21,7 +21,7 @@ import org.junit.Before
 import org.junit.Test
 
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = [21], application = TestCommonsApplication::class)
+@Config(sdk = [21], application = TestCommonsApplication::class)
 class BookmarkPictureDaoTest {
 
     private val columns = arrayOf(COLUMN_MEDIA_NAME, COLUMN_CREATOR)

app/src/test/kotlin/fr/free/nrw/commons/category/CategoryDaoTest.kt

@@ -21,7 +21,7 @@ import org.robolectric.annotation.Config
 import java.util.*
 
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = [21], application = TestCommonsApplication::class)
+@Config(sdk = [21], application = TestCommonsApplication::class)
 class CategoryDaoTest {
 
     private val columns = arrayOf(COLUMN_ID, COLUMN_NAME, COLUMN_LAST_USED, COLUMN_TIMES_USED)

app/src/test/kotlin/fr/free/nrw/commons/contributions/ContributionDaoTest.kt

@@ -23,7 +23,7 @@ import org.robolectric.annotation.Config
 import java.util.*
 
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = [21], application = TestCommonsApplication::class)
+@Config(sdk = [21], application = TestCommonsApplication::class)
 class ContributionDaoTest {
     private val localUri = "http://example.com/"
     private val client: ContentProviderClient = mock()

app/src/test/kotlin/fr/free/nrw/commons/delete/DeleteHelperTest.kt

@@ -7,7 +7,7 @@ import fr.free.nrw.commons.auth.SessionManager
 import fr.free.nrw.commons.mwapi.MediaWikiApi
 import fr.free.nrw.commons.notification.NotificationHelper
 import fr.free.nrw.commons.utils.ViewUtilWrapper
-import junit.framework.Assert.*
+import org.junit.Assert.*
 import org.junit.Before
 import org.junit.Test
 import org.mockito.InjectMocks

app/src/test/kotlin/fr/free/nrw/commons/explore/recentsearches/RecentSearchesDaoTest.kt

@@ -21,7 +21,7 @@ import org.robolectric.annotation.Config
 import java.util.*
 
 @RunWith(RobolectricTestRunner::class)
-@Config(constants = BuildConfig::class, sdk = [21], application = TestCommonsApplication::class)
+@Config(sdk = [21], application = TestCommonsApplication::class)
 class RecentSearchesDaoTest {
 
     private val columns = arrayOf(COLUMN_ID, COLUMN_NAME, COLUMN_LAST_USED)