mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-27 12:53:55 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix:5175 Upgraded Minimum SDK Version, Compile and Target SDK Version (#5177)

Browse source 
* Kotlin Version Upgraded to 1.6.10

* Kotlin Version Upgraded to 1.6.20

* Kotlin Version Upgraded to 1.7.20

* Fix:5175 Upgraded Minimum SDK Version, Compile and Target SDK Version
This commit is contained in:
Kartikay Kaushik 2023-03-16 02:02:35 -07:00 • committed by GitHub
parent 66e15a17ef
commit 9b0b936c62
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 110 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/src/test/kotlin/fr/free/nrw/commons/OkHttpJsonApiClientTests.kt
View file

@ -63,7 +63,7 @@ class OkHttpJsonApiClientTests {
@Test
fun testGetNearbyPlacesCustomQuery() {
Mockito.`when`(response.message()).thenReturn("test")
Mockito.`when`(response.message).thenReturn("test")
try {
okHttpJsonApiClient.getNearbyPlaces(latLng, "test", 10.0, true, "test")
} catch (e: Exception) {
@ -76,7 +76,7 @@ class OkHttpJsonApiClientTests {
@Test
fun testGetNearbyPlaces() {
Mockito.`when`(response.message()).thenReturn("test")
Mockito.`when`(response.message).thenReturn("test")
try {
okHttpJsonApiClient.getNearbyPlaces(latLng, "test", 10.0, true)
} catch (e: Exception) {

1
app/src/test/kotlin/fr/free/nrw/commons/TestCommonsApplication.kt
View file

@ -6,7 +6,6 @@ import android.content.Context
import androidx.collection.LruCache
import com.google.gson.Gson
import com.nhaarman.mockitokotlin2.mock
import com.squareup.leakcanary.RefWatcher
import fr.free.nrw.commons.auth.AccountUtil
import fr.free.nrw.commons.data.DBOpenHelper
import fr.free.nrw.commons.di.CommonsApplicationComponent

42
app/src/test/kotlin/fr/free/nrw/commons/media/CustomOkHttpNetworkFetcherUnitTest.kt
View file

@ -149,9 +149,9 @@ class CustomOkHttpNetworkFetcherUnitTest {
@Test
@Throws(Exception::class)
fun testOnFetchResponseCaseReturn() {
whenever(response.body()).thenReturn(body)
whenever(response.body).thenReturn(body)
whenever(response.isSuccessful).thenReturn(false)
whenever(call.isCanceled).thenReturn(true)
whenever(call.isCanceled()).thenReturn(true)
val method: Method = CustomOkHttpNetworkFetcher::class.java.getDeclaredMethod(
"onFetchResponse",
CustomOkHttpNetworkFetcher.OkHttpNetworkFetchState::class.java,
@ -167,11 +167,22 @@ class CustomOkHttpNetworkFetcherUnitTest {
@Test
@Throws(Exception::class)
fun testOnFetchResponse() {
whenever(response.body()).thenReturn(body)
whenever(response.body).thenReturn(body)
whenever(response.isSuccessful).thenReturn(true)
whenever(response.header("Content-Range")).thenReturn("bytes 200-1000/67589")
whenever(call.isCanceled).thenReturn(true)
whenever(call.isCanceled()).thenReturn(true)
whenever(body.contentLength()).thenReturn(-1)
// Build Response object with Content-Range header
val responseBuilder = Response.Builder()
.request(Request.Builder().url("http://example.com").build())
.protocol(Protocol.HTTP_1_1)
.code(200)
.message("OK")
.header("Content-Range", "bytes 200-1000/67589")
.body(body)
whenever(call.execute()).thenReturn(responseBuilder.build())
val method: Method = CustomOkHttpNetworkFetcher::class.java.getDeclaredMethod(
"onFetchResponse",
CustomOkHttpNetworkFetcher.OkHttpNetworkFetchState::class.java,
@ -180,18 +191,29 @@ class CustomOkHttpNetworkFetcherUnitTest {
NetworkFetcher.Callback::class.java,
)
method.isAccessible = true
method.invoke(fetcher, state, call, response, callback)
method.invoke(fetcher, state, call, responseBuilder.build(), callback)
verify(callback).onResponse(null, 0)
}
@Test
@Throws(Exception::class)
fun testOnFetchResponseCaseException() {
whenever(response.body()).thenReturn(body)
whenever(response.body).thenReturn(body)
whenever(response.isSuccessful).thenReturn(true)
whenever(response.header("Content-Range")).thenReturn("test")
whenever(call.isCanceled).thenReturn(false)
whenever(call.isCanceled()).thenReturn(false)
whenever(body.contentLength()).thenReturn(-1)
// Build Response object with Content-Range header
val responseBuilder = Response.Builder()
.request(Request.Builder().url("http://example.com").build())
.protocol(Protocol.HTTP_1_1)
.code(200)
.message("OK")
.header("Content-Range", "Test")
.body(body)
whenever(call.execute()).thenReturn(responseBuilder.build())
val method: Method = CustomOkHttpNetworkFetcher::class.java.getDeclaredMethod(
"onFetchResponse",
CustomOkHttpNetworkFetcher.OkHttpNetworkFetchState::class.java,
@ -200,7 +222,7 @@ class CustomOkHttpNetworkFetcherUnitTest {
NetworkFetcher.Callback::class.java,
)
method.isAccessible = true
method.invoke(fetcher, state, call, response, callback)
method.invoke(fetcher, state, call, responseBuilder.build(), callback)
verify(callback).onFailure(any())
}

12
app/src/test/kotlin/fr/free/nrw/commons/upload/LanguagesAdapterTest.kt
View file

@ -79,7 +79,10 @@ class LanguagesAdapterTest {
@Test
fun testGetIndexOfUserDefaultLocale() {
languagesAdapter = LanguagesAdapter(context, selectedLanguages)
Assertions.assertEquals(languageCodesList.indexOf(ConfigurationCompat.getLocales(context.resources.configuration)[0].language), languagesAdapter.getIndexOfUserDefaultLocale(context))
Assertions.assertEquals(ConfigurationCompat.getLocales(context.resources.configuration)[0]?.let {
languageCodesList.indexOf(
it.language)
}, languagesAdapter.getIndexOfUserDefaultLocale(context))
}
@Test
@ -105,14 +108,17 @@ class LanguagesAdapterTest {
val constraint = "spa"
languagesAdapter.filter.filter(constraint)
val length: Int = languageNamesList.size
val defaultlanguagecode = languageCodesList.indexOf(ConfigurationCompat.getLocales(context.resources.configuration)[0].language)
val defaultlanguagecode = ConfigurationCompat.getLocales(context.resources.configuration)[0]?.let {
languageCodesList.indexOf(
it.language)
}
var i = 0
var s = 0
while (i < length) {
val key: String = language.codes[i]
val value: String = language.localizedNames[i]
if(value.contains(constraint, true) || Locale(key).getDisplayName(
Locale(language.codes[defaultlanguagecode])).contains(constraint, true))
Locale(language.codes[defaultlanguagecode!!])).contains(constraint, true))
s++
i++
}