Skip to content

Commit b6f9e69

Browse files
macgillsmacgills
committed
#3529 Captions/depictions are not saved to Commons - fix test
1 parent 3a6ad68 commit b6f9e69

File tree

1 file changed

+46
-56
lines changed

1 file changed

+46
-56
lines changed

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

+46-56
Original file line numberDiff line numberDiff line change
@@ -2,141 +2,131 @@ package fr.free.nrw.commons.delete
22

33
import android.content.Context
44
import com.nhaarman.mockitokotlin2.eq
5+
import com.nhaarman.mockitokotlin2.mock
56
import com.nhaarman.mockitokotlin2.verify
7+
import com.nhaarman.mockitokotlin2.whenever
68
import fr.free.nrw.commons.Media
79
import fr.free.nrw.commons.actions.PageEditClient
8-
import fr.free.nrw.commons.notification.NotificationHelper
9-
import fr.free.nrw.commons.utils.ViewUtilWrapper
1010
import io.reactivex.Observable
11-
import org.junit.Assert.*
11+
import org.junit.Assert.assertNotNull
12+
import org.junit.Assert.assertTrue
1213
import org.junit.Before
1314
import org.junit.Test
1415
import org.mockito.ArgumentMatchers
15-
import org.mockito.InjectMocks
1616
import org.mockito.Mock
17-
import org.mockito.Mockito.`when`
1817
import org.mockito.MockitoAnnotations
19-
import javax.inject.Inject
20-
import javax.inject.Named
2118

2219
/**
2320
* Tests for delete helper
2421
*/
2522
class DeleteHelperTest {
2623

2724
@Mock
28-
@field:[Inject Named("commons-page-edit")]
29-
internal var pageEditClient: PageEditClient? = null
25+
internal lateinit var pageEditClient: PageEditClient
3026

3127
@Mock
32-
internal var context: Context? = null
28+
internal lateinit var context: Context
3329

3430
@Mock
35-
internal var notificationHelper: NotificationHelper? = null
31+
internal lateinit var media: Media
3632

37-
@Mock
38-
internal var viewUtil: ViewUtilWrapper? = null
39-
40-
@Mock
41-
internal var media: Media? = null
42-
43-
@InjectMocks
44-
var deleteHelper: DeleteHelper? = null
33+
lateinit var deleteHelper: DeleteHelper
4534

4635
/**
4736
* Init mocks for test
4837
*/
4938
@Before
5039
fun setup() {
5140
MockitoAnnotations.initMocks(this)
41+
deleteHelper = DeleteHelper(mock(), pageEditClient, mock(), "")
5242
}
5343

5444
/**
5545
* Make a successful deletion
5646
*/
5747
@Test
5848
fun makeDeletion() {
59-
`when`(pageEditClient?.prependEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
49+
whenever(pageEditClient.prependEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
6050
.thenReturn(Observable.just(true))
61-
`when`(pageEditClient?.appendEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
51+
whenever(pageEditClient.appendEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
6252
.thenReturn(Observable.just(true))
63-
`when`(pageEditClient?.edit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
53+
whenever(pageEditClient.edit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
6454
.thenReturn(Observable.just(true))
6555

66-
`when`(media?.displayTitle).thenReturn("Test file")
67-
media?.filename="Test file.jpg"
56+
whenever(media.displayTitle).thenReturn("Test file")
6857

6958
val creatorName = "Creator"
70-
`when`(media?.getCreator()).thenReturn("$creatorName (page does not exist)")
59+
whenever(media.creator).thenReturn("$creatorName (page does not exist)")
60+
whenever(media.filename).thenReturn("Test file.jpg")
7161

72-
val makeDeletion = deleteHelper?.makeDeletion(context, media, "Test reason")?.blockingGet()
62+
val makeDeletion = deleteHelper.makeDeletion(context, media, "Test reason")?.blockingGet()
7363
assertNotNull(makeDeletion)
7464
assertTrue(makeDeletion!!)
75-
verify(pageEditClient)?.appendEdit(eq("User_Talk:$creatorName"), ArgumentMatchers.anyString(), ArgumentMatchers.anyString())
65+
verify(pageEditClient).appendEdit(eq("User_Talk:$creatorName"), ArgumentMatchers.anyString(), ArgumentMatchers.anyString())
7666
}
7767

7868
/**
7969
* Test a failed deletion
8070
*/
8171
@Test(expected = RuntimeException::class)
8272
fun makeDeletionForPrependEditFailure() {
83-
`when`(pageEditClient?.prependEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
73+
whenever(pageEditClient.prependEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
8474
.thenReturn(Observable.just(false))
85-
`when`(pageEditClient?.appendEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
75+
whenever(pageEditClient.appendEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
8676
.thenReturn(Observable.just(true))
87-
`when`(pageEditClient?.edit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
77+
whenever(pageEditClient.edit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
8878
.thenReturn(Observable.just(true))
89-
`when`(media?.displayTitle).thenReturn("Test file")
90-
`when`(media?.filename).thenReturn("Test file.jpg")
91-
`when`(media?.creator).thenReturn("Creator (page does not exist)")
79+
whenever(media.displayTitle).thenReturn("Test file")
80+
whenever(media.filename).thenReturn("Test file.jpg")
81+
whenever(media.creator).thenReturn("Creator (page does not exist)")
9282

93-
deleteHelper?.makeDeletion(context, media, "Test reason")?.blockingGet()
83+
deleteHelper.makeDeletion(context, media, "Test reason")?.blockingGet()
9484
}
9585

9686
@Test(expected = RuntimeException::class)
9787
fun makeDeletionForEditFailure() {
98-
`when`(pageEditClient?.prependEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
88+
whenever(pageEditClient.prependEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
9989
.thenReturn(Observable.just(true))
100-
`when`(pageEditClient?.appendEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
90+
whenever(pageEditClient.appendEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
10191
.thenReturn(Observable.just(true))
102-
`when`(pageEditClient?.edit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
92+
whenever(pageEditClient.edit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
10393
.thenReturn(Observable.just(false))
104-
`when`(media?.displayTitle).thenReturn("Test file")
105-
`when`(media?.filename).thenReturn("Test file.jpg")
106-
`when`(media?.creator).thenReturn("Creator (page does not exist)")
94+
whenever(media.displayTitle).thenReturn("Test file")
95+
whenever(media.filename).thenReturn("Test file.jpg")
96+
whenever(media.creator).thenReturn("Creator (page does not exist)")
10797

108-
deleteHelper?.makeDeletion(context, media, "Test reason")?.blockingGet()
98+
deleteHelper.makeDeletion(context, media, "Test reason")?.blockingGet()
10999
}
110100

111101
@Test(expected = RuntimeException::class)
112102
fun makeDeletionForAppendEditFailure() {
113-
`when`(pageEditClient?.prependEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
103+
whenever(pageEditClient.prependEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
114104
.thenReturn(Observable.just(true))
115-
`when`(pageEditClient?.appendEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
105+
whenever(pageEditClient.appendEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
116106
.thenReturn(Observable.just(false))
117-
`when`(pageEditClient?.edit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
107+
whenever(pageEditClient.edit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
118108
.thenReturn(Observable.just(true))
119-
`when`(media?.displayTitle).thenReturn("Test file")
120-
`when`(media?.filename).thenReturn("Test file.jpg")
121-
`when`(media?.creator).thenReturn("Creator (page does not exist)")
109+
whenever(media.displayTitle).thenReturn("Test file")
110+
whenever(media.filename).thenReturn("Test file.jpg")
111+
whenever(media.creator).thenReturn("Creator (page does not exist)")
122112

123-
deleteHelper?.makeDeletion(context, media, "Test reason")?.blockingGet()
113+
deleteHelper.makeDeletion(context, media, "Test reason")?.blockingGet()
124114
}
125115

126116
@Test(expected = RuntimeException::class)
127117
fun makeDeletionForEmptyCreatorName() {
128-
`when`(pageEditClient?.prependEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
118+
whenever(pageEditClient.prependEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
129119
.thenReturn(Observable.just(true))
130-
`when`(pageEditClient?.appendEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
120+
whenever(pageEditClient.appendEdit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
131121
.thenReturn(Observable.just(true))
132-
`when`(pageEditClient?.edit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
122+
whenever(pageEditClient.edit(ArgumentMatchers.anyString(), ArgumentMatchers.anyString(), ArgumentMatchers.anyString()))
133123
.thenReturn(Observable.just(true))
134124

135-
`when`(media?.displayTitle).thenReturn("Test file")
136-
media?.filename="Test file.jpg"
125+
whenever(media.displayTitle).thenReturn("Test file")
126+
media.filename ="Test file.jpg"
137127

138-
`when`(media?.getCreator()).thenReturn(null)
128+
whenever(media.creator).thenReturn(null)
139129

140-
deleteHelper?.makeDeletion(context, media, "Test reason")?.blockingGet()
130+
deleteHelper.makeDeletion(context, media, "Test reason")?.blockingGet()
141131
}
142-
}
132+
}

0 commit comments

Comments
 (0)