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

Data client simplification / removal (#5507)

Browse source 
* Removed unused code from the data client module

* Move remaining code out of the data-client and remove it
This commit is contained in:
Paul Hawke 2024-02-02 19:26:06 -06:00 • committed by GitHub
parent 72a6fd2c90
commit 0c3085257d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
337 changed files with 964 additions and 31321 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -12,7 +12,6 @@ import org.mockito.Mock
import org.mockito.Mockito.`when`
import org.mockito.Mockito.mock
import org.mockito.MockitoAnnotations
import org.wikipedia.dataclient.mwapi.MwQueryResponse
/**
* Test methods in media data extractor

2
app/src/test/kotlin/fr/free/nrw/commons/MockWebServerTest.java
View file

@ -14,7 +14,7 @@ import org.junit.After;
import org.junit.Before;
import org.junit.runner.RunWith;
import org.robolectric.RobolectricTestRunner;
import org.wikipedia.json.GsonUtil;
import fr.free.nrw.commons.wikidata.GsonUtil;
import retrofit2.Retrofit;
import retrofit2.converter.gson.GsonConverterFactory;

2
app/src/test/kotlin/fr/free/nrw/commons/ModelFunctions.kt
View file

@ -8,7 +8,7 @@ import fr.free.nrw.commons.nearby.Place
import fr.free.nrw.commons.nearby.Sitelinks
import fr.free.nrw.commons.upload.structure.depictions.DepictedItem
import fr.free.nrw.commons.wikidata.model.DepictSearchItem
import org.wikipedia.wikidata.*
import fr.free.nrw.commons.wikidata.model.*
import java.util.*
fun depictedItem(

35
app/src/test/kotlin/fr/free/nrw/commons/TestConnectionFactory.kt
View file

@ -1,10 +1,41 @@
package fr.free.nrw.commons
import okhttp3.Interceptor
import okhttp3.OkHttpClient
import org.wikipedia.dataclient.okhttp.TestStubInterceptor
import org.wikipedia.dataclient.okhttp.UnsuccessfulResponseInterceptor
import okhttp3.Response
import fr.free.nrw.commons.OkHttpConnectionFactory.HttpStatusException
import java.io.IOException
fun createTestClient(): OkHttpClient = OkHttpClient.Builder()
.addInterceptor(UnsuccessfulResponseInterceptor())
.addInterceptor(TestStubInterceptor())
.build()
private class TestStubInterceptor : Interceptor {
interface Callback {
@Throws(IOException::class)
fun getResponse(request: Interceptor.Chain): Response
}
@Throws(IOException::class)
override fun intercept(chain: Interceptor.Chain): Response {
return if (CALLBACK != null) {
CALLBACK!!.getResponse(chain)
} else chain.proceed(chain.request())
}
companion object {
var CALLBACK: Callback? = null
}
}
private class UnsuccessfulResponseInterceptor : Interceptor {
@Throws(IOException::class)
override fun intercept(chain: Interceptor.Chain): Response {
val rsp = chain.proceed(chain.request())
if (rsp.isSuccessful) {
return rsp
}
throw HttpStatusException(rsp)
}
}

2
app/src/test/kotlin/fr/free/nrw/commons/actions/PageEditClientTest.kt
View file

@ -10,7 +10,7 @@ import org.mockito.Mock
import org.mockito.Mockito
import org.mockito.MockitoAnnotations
import fr.free.nrw.commons.auth.csrf.CsrfTokenClient
import org.wikipedia.edit.Edit
import fr.free.nrw.commons.wikidata.model.edit.Edit
class PageEditClientTest {
@Mock

4
app/src/test/kotlin/fr/free/nrw/commons/auth/csrf/CsrfTokenClientTest.kt
View file

@ -11,8 +11,8 @@ import org.mockito.ArgumentMatchers.isA
import org.mockito.Mockito.mock
import org.mockito.Mockito.never
import org.mockito.Mockito.verify
import org.wikipedia.dataclient.mwapi.MwException
import org.wikipedia.dataclient.okhttp.HttpStatusException
import fr.free.nrw.commons.wikidata.mwapi.MwException
import fr.free.nrw.commons.OkHttpConnectionFactory.HttpStatusException
class CsrfTokenClientTest : MockWebServerTest() {
private val cb = mock(CsrfTokenClient.Callback::class.java)

25
app/src/test/kotlin/fr/free/nrw/commons/auth/login/UserExtendedInfoClientTest.kt
View file

@ -7,13 +7,13 @@ import fr.free.nrw.commons.MockWebServerTest
import io.reactivex.observers.TestObserver
import org.junit.Before
import org.junit.Test
import org.wikipedia.dataclient.WikiSite
import org.wikipedia.dataclient.mwapi.MwQueryResponse
import org.wikipedia.json.NamespaceTypeAdapter
import org.wikipedia.json.PostProcessingTypeAdapter
import org.wikipedia.json.UriTypeAdapter
import org.wikipedia.json.WikiSiteTypeAdapter
import org.wikipedia.page.Namespace
import fr.free.nrw.commons.wikidata.model.WikiSite
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
import fr.free.nrw.commons.wikidata.json.NamespaceTypeAdapter
import fr.free.nrw.commons.wikidata.json.PostProcessingTypeAdapter
import fr.free.nrw.commons.wikidata.json.UriTypeAdapter
import fr.free.nrw.commons.wikidata.json.WikiSiteTypeAdapter
import fr.free.nrw.commons.wikidata.model.page.Namespace
import retrofit2.Retrofit
import retrofit2.adapter.rxjava2.RxJava2CallAdapterFactory
import retrofit2.converter.gson.GsonConverterFactory
@ -22,9 +22,14 @@ class UserExtendedInfoClientTest : MockWebServerTest() {
private var apiService: LoginInterface? = null
private val observer = TestObserver<MwQueryResponse>()
private val gson = GsonBuilder()
.registerTypeHierarchyAdapter(Uri::class.java, UriTypeAdapter().nullSafe())
.registerTypeHierarchyAdapter(Namespace::class.java, NamespaceTypeAdapter().nullSafe())
.registerTypeAdapter(WikiSite::class.java, WikiSiteTypeAdapter().nullSafe())
.registerTypeHierarchyAdapter(Uri::class.java, UriTypeAdapter()
.nullSafe())
.registerTypeHierarchyAdapter(
Namespace::class.java, NamespaceTypeAdapter()
.nullSafe())
.registerTypeAdapter(
WikiSite::class.java, WikiSiteTypeAdapter()
.nullSafe())
.registerTypeAdapterFactory(PostProcessingTypeAdapter())
.create()

6
app/src/test/kotlin/fr/free/nrw/commons/category/CategoryClientTest.kt
View file

@ -10,9 +10,9 @@ import org.mockito.InjectMocks
import org.mockito.Mock
import org.mockito.Mockito.mock
import org.mockito.MockitoAnnotations
import org.wikipedia.dataclient.mwapi.MwQueryPage
import org.wikipedia.dataclient.mwapi.MwQueryResponse
import org.wikipedia.dataclient.mwapi.MwQueryResult
import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult
class CategoryClientTest {
@Mock

2
app/src/test/kotlin/fr/free/nrw/commons/explore/depictions/DepictsClientTest.kt
View file

@ -15,7 +15,7 @@ import org.junit.Before
import org.junit.Test
import org.mockito.Mock
import org.mockito.MockitoAnnotations
import org.wikipedia.wikidata.*
import fr.free.nrw.commons.wikidata.model.*
import java.lang.reflect.Method
class DepictsClientTest {

8
app/src/test/kotlin/fr/free/nrw/commons/explore/media/MediaConverterTest.kt
View file

@ -11,10 +11,10 @@ import org.mockito.ArgumentMatchers
import org.mockito.Mock
import org.mockito.Mockito
import org.mockito.MockitoAnnotations
import org.wikipedia.dataclient.mwapi.MwQueryPage
import org.wikipedia.gallery.ExtMetadata
import org.wikipedia.gallery.ImageInfo
import org.wikipedia.wikidata.Entities
import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage
import fr.free.nrw.commons.wikidata.model.gallery.ExtMetadata
import fr.free.nrw.commons.wikidata.model.gallery.ImageInfo
import fr.free.nrw.commons.wikidata.model.Entities
import java.lang.IllegalArgumentException
class MediaConverterTest {

10
app/src/test/kotlin/fr/free/nrw/commons/media/MediaClientTest.kt
View file

@ -13,11 +13,11 @@ import org.junit.Test
import org.mockito.ArgumentMatchers
import org.mockito.Mock
import org.mockito.MockitoAnnotations
import org.wikipedia.dataclient.mwapi.MwQueryPage
import org.wikipedia.dataclient.mwapi.MwQueryResponse
import org.wikipedia.dataclient.mwapi.MwQueryResult
import org.wikipedia.gallery.ImageInfo
import org.wikipedia.wikidata.Entities
import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult
import fr.free.nrw.commons.wikidata.model.gallery.ImageInfo
import fr.free.nrw.commons.wikidata.model.Entities
class MediaClientTest {

9
app/src/test/kotlin/fr/free/nrw/commons/mwapi/UserClientTest.kt
View file

@ -6,11 +6,10 @@ import org.junit.Assert.assertTrue
import org.junit.Before
import org.junit.Test
import org.mockito.*
import org.wikipedia.dataclient.mwapi.MwQueryPage
import org.wikipedia.dataclient.mwapi.MwQueryResponse
import org.wikipedia.dataclient.mwapi.MwQueryResult
import org.wikipedia.dataclient.mwapi.UserInfo
import org.wikipedia.util.DateUtil
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult
import fr.free.nrw.commons.wikidata.mwapi.UserInfo
import fr.free.nrw.commons.utils.DateUtil
import java.util.*
class UserClientTest{

8
app/src/test/kotlin/fr/free/nrw/commons/notification/NotificationClientTest.kt
View file

@ -18,10 +18,10 @@ import org.mockito.MockitoAnnotations
import org.robolectric.annotation.Config
import org.robolectric.annotation.LooperMode
import fr.free.nrw.commons.auth.csrf.CsrfTokenClient
import org.wikipedia.dataclient.mwapi.MwQueryResponse
import org.wikipedia.dataclient.mwapi.MwQueryResult
import org.wikipedia.json.GsonUtil
import org.wikipedia.notifications.Notification
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult
import fr.free.nrw.commons.wikidata.GsonUtil
import fr.free.nrw.commons.wikidata.model.notifications.Notification
@RunWith(AndroidJUnit4::class)
@Config(sdk = [21], application = TestCommonsApplication::class)

2
app/src/test/kotlin/fr/free/nrw/commons/review/ReviewControllerTest.kt
View file

@ -30,7 +30,7 @@ import org.robolectric.annotation.Config
import org.robolectric.annotation.LooperMode
import org.robolectric.shadows.ShadowNotificationManager
import org.robolectric.shadows.ShadowToast
import org.wikipedia.dataclient.mwapi.MwQueryPage
import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage
import java.lang.reflect.Method
import java.util.*

6
app/src/test/kotlin/fr/free/nrw/commons/review/ReviewHelperTest.kt
View file

@ -16,9 +16,9 @@ import org.mockito.InjectMocks
import org.mockito.Mock
import org.mockito.Mockito.*
import org.mockito.MockitoAnnotations
import org.wikipedia.dataclient.mwapi.MwQueryPage
import org.wikipedia.dataclient.mwapi.MwQueryResponse
import org.wikipedia.dataclient.mwapi.MwQueryResult
import fr.free.nrw.commons.wikidata.mwapi.MwQueryPage
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult
import java.util.concurrent.Callable
/**

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

@ -19,7 +19,7 @@ import org.mockito.MockitoAnnotations
import org.robolectric.RobolectricTestRunner
import org.robolectric.annotation.Config
import org.robolectric.annotation.LooperMode
import org.wikipedia.language.AppLanguageLookUpTable
import fr.free.nrw.commons.language.AppLanguageLookUpTable
import java.util.*
@RunWith(RobolectricTestRunner::class)

6
app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataClientTest.kt
View file

@ -14,9 +14,9 @@ import org.mockito.Mock
import org.mockito.Mockito.`when`
import org.mockito.Mockito.mock
import org.mockito.MockitoAnnotations
import org.wikipedia.dataclient.mwapi.MwQueryResponse
import org.wikipedia.dataclient.mwapi.MwQueryResult
import org.wikipedia.wikidata.Statement_partial
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResponse
import fr.free.nrw.commons.wikidata.mwapi.MwQueryResult
import fr.free.nrw.commons.wikidata.model.Statement_partial
class WikidataClientTest {

2
app/src/test/kotlin/fr/free/nrw/commons/wikidata/WikidataEditServiceTest.kt
View file

@ -17,7 +17,7 @@ import org.mockito.Mock
import org.mockito.Mockito
import org.mockito.Mockito.verifyNoInteractions
import org.mockito.MockitoAnnotations
import org.wikipedia.wikidata.EditClaim
import fr.free.nrw.commons.wikidata.model.EditClaim
class WikidataEditServiceTest {
@Mock