From 93b3e239d730a4a6210992651daada6d27616377 Mon Sep 17 00:00:00 2001 From: parneet-guraya Date: Tue, 18 Feb 2025 22:25:27 +0530 Subject: [PATCH] fix-tests Signed-off-by: parneet-guraya --- .../nrw/commons/delete/ReasonBuilderTest.kt | 47 ++++++++++++------- .../media/MediaDetailFragmentUnitTests.kt | 5 +- 2 files changed, 33 insertions(+), 19 deletions(-) diff --git a/app/src/test/kotlin/fr/free/nrw/commons/delete/ReasonBuilderTest.kt b/app/src/test/kotlin/fr/free/nrw/commons/delete/ReasonBuilderTest.kt index e89a02dec..f8acaf75e 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/delete/ReasonBuilderTest.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/delete/ReasonBuilderTest.kt @@ -9,6 +9,7 @@ import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient import fr.free.nrw.commons.profile.achievements.FeedbackResponse import fr.free.nrw.commons.profile.leaderboard.LeaderboardResponse import fr.free.nrw.commons.profile.leaderboard.UpdateAvatarResponse +import fr.free.nrw.commons.utils.ConfigUtils import fr.free.nrw.commons.utils.ViewUtilWrapper import io.reactivex.Observable import io.reactivex.Single @@ -55,28 +56,38 @@ class ReasonBuilderTest { @Test fun forceLoginWhenAccountIsNull() { - PowerMockito.`when`(context?.getString(R.string.user_not_logged_in)) - .thenReturn("Log-in expired. Please log in again.") - - reasonBuilder!!.getReason(mock(Media::class.java), "test") - verify(sessionManager, times(1))!!.forceLogin(any(Context::class.java)) + if (!ConfigUtils.isBetaFlavour) { + PowerMockito.`when`(context?.getString(R.string.user_not_logged_in)) + .thenReturn("Log-in expired. Please log in again.") + reasonBuilder!!.getReason(mock(Media::class.java), "test") + verify(sessionManager, times(1))!!.forceLogin(any(Context::class.java)) + } } @Test fun getReason() { - `when`(sessionManager?.userName).thenReturn("Testuser") - `when`(sessionManager?.doesAccountExist()).thenReturn(true) - `when`(okHttpJsonApiClient!!.getAchievements(anyString())) - .thenReturn(Single.just(mock(FeedbackResponse::class.java))) - `when`(okHttpJsonApiClient!!.getLeaderboard(anyString(), anyString(), anyString(), anyString(), anyString())) - .thenReturn(Observable.just(mock(LeaderboardResponse::class.java))) - `when`(okHttpJsonApiClient!!.setAvatar(anyString(), anyString())) - .thenReturn(Single.just(mock(UpdateAvatarResponse::class.java))) + if (!ConfigUtils.isBetaFlavour) { + `when`(sessionManager?.userName).thenReturn("Testuser") + `when`(sessionManager?.doesAccountExist()).thenReturn(true) + `when`(okHttpJsonApiClient!!.getAchievements(anyString())) + .thenReturn(Single.just(mock(FeedbackResponse::class.java))) + `when`( + okHttpJsonApiClient!!.getLeaderboard( + anyString(), + anyString(), + anyString(), + anyString(), + anyString() + ) + ) + .thenReturn(Observable.just(mock(LeaderboardResponse::class.java))) + `when`(okHttpJsonApiClient!!.setAvatar(anyString(), anyString())) + .thenReturn(Single.just(mock(UpdateAvatarResponse::class.java))) - val media = media(filename = "test_file", dateUploaded = Date()) - - reasonBuilder!!.getReason(media, "test") - verify(sessionManager, times(0))!!.forceLogin(any(Context::class.java)) - verify(okHttpJsonApiClient, times(1))!!.getAchievements(anyString()) + val media = media(filename = "test_file", dateUploaded = Date()) + reasonBuilder!!.getReason(media, "test") + verify(sessionManager, times(0))!!.forceLogin(any(Context::class.java)) + verify(okHttpJsonApiClient, times(1))!!.getAchievements(anyString()) + } } } diff --git a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt index b6d3c6e28..b3b0b0bfe 100644 --- a/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt +++ b/app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt @@ -162,6 +162,9 @@ class MediaDetailFragmentUnitTests { private lateinit var _binding: FragmentMediaDetailBinding + @Mock + private lateinit var callback: MediaDetailFragment.Callback + @Before fun setUp() { MockitoAnnotations.openMocks(this) @@ -789,7 +792,7 @@ class MediaDetailFragmentUnitTests { @Test @Throws(Exception::class) fun testForMedia() { - MediaDetailFragment.forMedia(0, true, true, true) + MediaDetailFragment.forMedia(0, true, true, true, callback) } @Test