Skip to content

Commit bb0f2bc

Browse files
fix-tests
Signed-off-by: parneet-guraya <gurayaparneet@gmail.com>
1 parent 9b027b8 commit bb0f2bc

File tree

2 files changed

+33
-19
lines changed

2 files changed

+33
-19
lines changed

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

+29-18
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ import fr.free.nrw.commons.mwapi.OkHttpJsonApiClient
99
import fr.free.nrw.commons.profile.achievements.FeedbackResponse
1010
import fr.free.nrw.commons.profile.leaderboard.LeaderboardResponse
1111
import fr.free.nrw.commons.profile.leaderboard.UpdateAvatarResponse
12+
import fr.free.nrw.commons.utils.ConfigUtils
1213
import fr.free.nrw.commons.utils.ViewUtilWrapper
1314
import io.reactivex.Observable
1415
import io.reactivex.Single
@@ -55,28 +56,38 @@ class ReasonBuilderTest {
5556

5657
@Test
5758
fun forceLoginWhenAccountIsNull() {
58-
PowerMockito.`when`(context?.getString(R.string.user_not_logged_in))
59-
.thenReturn("Log-in expired. Please log in again.")
60-
61-
reasonBuilder!!.getReason(mock(Media::class.java), "test")
62-
verify(sessionManager, times(1))!!.forceLogin(any(Context::class.java))
59+
if (!ConfigUtils.isBetaFlavour) {
60+
PowerMockito.`when`(context?.getString(R.string.user_not_logged_in))
61+
.thenReturn("Log-in expired. Please log in again.")
62+
reasonBuilder!!.getReason(mock(Media::class.java), "test")
63+
verify(sessionManager, times(1))!!.forceLogin(any(Context::class.java))
64+
}
6365
}
6466

6567
@Test
6668
fun getReason() {
67-
`when`(sessionManager?.userName).thenReturn("Testuser")
68-
`when`(sessionManager?.doesAccountExist()).thenReturn(true)
69-
`when`(okHttpJsonApiClient!!.getAchievements(anyString()))
70-
.thenReturn(Single.just(mock(FeedbackResponse::class.java)))
71-
`when`(okHttpJsonApiClient!!.getLeaderboard(anyString(), anyString(), anyString(), anyString(), anyString()))
72-
.thenReturn(Observable.just(mock(LeaderboardResponse::class.java)))
73-
`when`(okHttpJsonApiClient!!.setAvatar(anyString(), anyString()))
74-
.thenReturn(Single.just(mock(UpdateAvatarResponse::class.java)))
75-
76-
val media = media(filename = "test_file", dateUploaded = Date())
69+
if (!ConfigUtils.isBetaFlavour) {
70+
`when`(sessionManager?.userName).thenReturn("Testuser")
71+
`when`(sessionManager?.doesAccountExist()).thenReturn(true)
72+
`when`(okHttpJsonApiClient!!.getAchievements(anyString()))
73+
.thenReturn(Single.just(mock(FeedbackResponse::class.java)))
74+
`when`(
75+
okHttpJsonApiClient!!.getLeaderboard(
76+
anyString(),
77+
anyString(),
78+
anyString(),
79+
anyString(),
80+
anyString()
81+
)
82+
)
83+
.thenReturn(Observable.just(mock(LeaderboardResponse::class.java)))
84+
`when`(okHttpJsonApiClient!!.setAvatar(anyString(), anyString()))
85+
.thenReturn(Single.just(mock(UpdateAvatarResponse::class.java)))
7786

78-
reasonBuilder!!.getReason(media, "test")
79-
verify(sessionManager, times(0))!!.forceLogin(any(Context::class.java))
80-
verify(okHttpJsonApiClient, times(1))!!.getAchievements(anyString())
87+
val media = media(filename = "test_file", dateUploaded = Date())
88+
reasonBuilder!!.getReason(media, "test")
89+
verify(sessionManager, times(0))!!.forceLogin(any(Context::class.java))
90+
verify(okHttpJsonApiClient, times(1))!!.getAchievements(anyString())
91+
}
8192
}
8293
}

app/src/test/kotlin/fr/free/nrw/commons/media/MediaDetailFragmentUnitTests.kt

+4-1
Original file line numberDiff line numberDiff line change
@@ -162,6 +162,9 @@ class MediaDetailFragmentUnitTests {
162162

163163
private lateinit var _binding: FragmentMediaDetailBinding
164164

165+
@Mock
166+
private lateinit var callback: MediaDetailFragment.Callback
167+
165168
@Before
166169
fun setUp() {
167170
MockitoAnnotations.openMocks(this)
@@ -789,7 +792,7 @@ class MediaDetailFragmentUnitTests {
789792
@Test
790793
@Throws(Exception::class)
791794
fun testForMedia() {
792-
MediaDetailFragment.forMedia(0, true, true, true)
795+
MediaDetailFragment.forMedia(0, true, true, true, callback)
793796
}
794797

795798
@Test

0 commit comments

Comments
 (0)