fix test

Signed-off-by: parneet-guraya <[email protected]>
commons-app · Oct 23, 2024 · b22ffe4 · b22ffe4
1 parent e328efa
commit b22ffe4
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 8 deletions.
diff --git a/app/src/main/java/fr/free/nrw/commons/actions/ThanksClient.kt b/app/src/main/java/fr/free/nrw/commons/actions/ThanksClient.kt
@@ -25,14 +25,14 @@ class ThanksClient
          * @param revisionId The revision ID the user would like to thank someone for
          * @return if thanks was successfully sent to intended recipient
          */
-        fun thank(revisionId: Long): Observable<Boolean> =
+        fun thank(revisionId: Long, application: CommonsApplication): Observable<Boolean> =
             try {
                 service
                     .thank(
                         revisionId.toString(), // Rev
                         null, // Log
                         csrfTokenClient.getTokenBlocking(), // Token
-                        CommonsApplication.instance!!.userAgent, // Source
+                        application.userAgent, // Source
                     ).map { mwThankPostResponse ->
                         mwThankPostResponse.result?.success == 1
                     }

diff --git a/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java b/app/src/main/java/fr/free/nrw/commons/media/MediaDetailFragment.java
@@ -780,7 +780,7 @@ void sendThanks(Context context, MwQueryPage.Revision firstRevision) {
         }
 
         Observable.defer((Callable<ObservableSource<Boolean>>) () -> thanksClient.thank(
-                firstRevision.getRevisionId()))
+                firstRevision.getRevisionId(), CommonsApplication.getInstance()))
             .subscribeOn(Schedulers.io())
             .observeOn(AndroidSchedulers.mainThread())
             .subscribe(result -> {

diff --git a/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java b/app/src/main/java/fr/free/nrw/commons/review/ReviewController.java
@@ -157,7 +157,8 @@ void sendThanks(@NonNull Activity activity) {
             return;
         }
 
-        Observable.defer((Callable<ObservableSource<Boolean>>) () -> thanksClient.thank(firstRevision.getRevisionId()))
+        Observable.defer((Callable<ObservableSource<Boolean>>) () ->
+                thanksClient.thank(firstRevision.getRevisionId(), CommonsApplication.getInstance()))
                 .subscribeOn(Schedulers.io())
                 .observeOn(AndroidSchedulers.mainThread())
             .subscribe(result -> {

diff --git a/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/actions/ThanksClientTest.kt
@@ -29,7 +29,6 @@ class ThanksClientTest {
     private lateinit var commonsApplication: CommonsApplication
 
     private lateinit var thanksClient: ThanksClient
-    private lateinit var mockedApplication: MockedStatic<CommonsApplication>
 
     /**
      * initial setup, test environment
@@ -38,8 +37,6 @@ class ThanksClientTest {
     @Throws(Exception::class)
     fun setUp() {
         MockitoAnnotations.openMocks(this)
-        mockedApplication = Mockito.mockStatic(CommonsApplication::class.java)
-        `when`(CommonsApplication.instance).thenReturn(commonsApplication)
         thanksClient = ThanksClient(csrfTokenClient, service)
     }
 
@@ -50,7 +47,7 @@ class ThanksClientTest {
     fun testThanks() {
         `when`(csrfTokenClient.getTokenBlocking()).thenReturn("test")
         `when`(commonsApplication.userAgent).thenReturn("test")
-        thanksClient.thank(1L)
+        thanksClient.thank(1L, commonsApplication)
         verify(service).thank(ArgumentMatchers.anyString(), ArgumentMatchers.any(), eq("test"), eq("test"))
     }
 }