Skip to content

Commit 4c99ede

Browse files
adalpariadalpari
committed
Fixing tests
1 parent 6ed850a commit 4c99ede

File tree

3 files changed

+271
-226
lines changed

3 files changed

+271
-226
lines changed

‎WordPress/src/test/java/org/wordpress/android/support/he/repository/HESupportRepositoryTest.kt‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,8 @@ class HESupportRepositoryTest : BaseUnitTest() {
201201
subject = subject,
202202
message = message,
203203
tags = tags,
204-
attachments = attachments
204+
attachments = attachments,
205+
encryptedLogIds = emptyList()
205206
)
206207

207208
// Then
@@ -232,7 +233,8 @@ class HESupportRepositoryTest : BaseUnitTest() {
232233
subject = "Test",
233234
message = "Test",
234235
tags = emptyList(),
235-
attachments = emptyList()
236+
attachments = emptyList(),
237+
encryptedLogIds = emptyList()
236238
)
237239

238240
// Then
@@ -256,7 +258,8 @@ class HESupportRepositoryTest : BaseUnitTest() {
256258
subject = "Test",
257259
message = "Test",
258260
tags = emptyList(),
259-
attachments = emptyList()
261+
attachments = emptyList(),
262+
encryptedLogIds = emptyList()
260263
)
261264

262265
// Then

‎WordPress/src/test/java/org/wordpress/android/support/he/ui/HESupportViewModelTest.kt‎

Lines changed: 69 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ import org.wordpress.android.support.he.model.SupportMessage
2929
import org.wordpress.android.support.he.repository.CreateConversationResult
3030
import org.wordpress.android.support.he.repository.HESupportRepository
3131
import org.wordpress.android.support.he.util.TempAttachmentsUtil
32+
import org.wordpress.android.util.EncryptedLogging
33+
import org.wordpress.android.util.LogFileProviderWrapper
3234
import org.wordpress.android.util.NetworkUtilsWrapper
3335
import java.util.Date
3436

@@ -50,6 +52,12 @@ class HESupportViewModelTest : BaseUnitTest() {
5052
@Mock
5153
private lateinit var tempAttachmentsUtil: TempAttachmentsUtil
5254

55+
@Mock
56+
private lateinit var encryptedLogging: EncryptedLogging
57+
58+
@Mock
59+
private lateinit var logFileProvider: LogFileProviderWrapper
60+
5361
@Mock
5462
private lateinit var application: Application
5563

@@ -92,6 +100,8 @@ class HESupportViewModelTest : BaseUnitTest() {
92100
heSupportRepository = heSupportRepository,
93101
ioDispatcher = UnconfinedTestDispatcher(),
94102
tempAttachmentsUtil = tempAttachmentsUtil,
103+
encryptedLogging = encryptedLogging,
104+
logFileProvider = logFileProvider,
95105
application = application,
96106
accountStore = accountStore,
97107
appLogWrapper = appLogWrapper,
@@ -147,21 +157,24 @@ class HESupportViewModelTest : BaseUnitTest() {
147157
subject = "Test Subject",
148158
message = "Test Message",
149159
tags = listOf("tag1"),
150-
attachments = emptyList()
160+
attachments = emptyList(),
161+
encryptedLogIds = emptyList()
151162
)).thenReturn(CreateConversationResult.Success(newConversation))
152163

153164
viewModel.onSendNewConversation(
154165
subject = "Test Subject",
155166
message = "Test Message",
156167
tags = listOf("tag1"),
168+
includeAppLogs = false,
157169
)
158170
advanceUntilIdle()
159171

160172
verify(heSupportRepository).createConversation(
161173
subject = "Test Subject",
162174
message = "Test Message",
163175
tags = listOf("tag1"),
164-
attachments = emptyList()
176+
attachments = emptyList(),
177+
encryptedLogIds = emptyList()
165178
)
166179
}
167180

@@ -171,13 +184,15 @@ class HESupportViewModelTest : BaseUnitTest() {
171184
subject = "Test Subject",
172185
message = "Test Message",
173186
tags = listOf("tag1"),
174-
attachments = emptyList()
187+
attachments = emptyList(),
188+
encryptedLogIds = emptyList()
175189
)).thenReturn(CreateConversationResult.Error.Forbidden)
176190

177191
viewModel.onSendNewConversation(
178192
subject = "Test Subject",
179193
message = "Test Message",
180194
tags = listOf("tag1"),
195+
includeAppLogs = false,
181196
)
182197
advanceUntilIdle()
183198

@@ -191,13 +206,15 @@ class HESupportViewModelTest : BaseUnitTest() {
191206
subject = "Test Subject",
192207
message = "Test Message",
193208
tags = listOf("tag1"),
194-
attachments = emptyList()
209+
attachments = emptyList(),
210+
encryptedLogIds = emptyList()
195211
)).thenReturn(CreateConversationResult.Error.GeneralError)
196212

197213
viewModel.onSendNewConversation(
198214
subject = "Test Subject",
199215
message = "Test Message",
200216
tags = listOf("tag1"),
217+
includeAppLogs = false,
201218
)
202219
advanceUntilIdle()
203220

@@ -208,13 +225,14 @@ class HESupportViewModelTest : BaseUnitTest() {
208225
@Test
209226
fun `onSendNewConversation resets isSendingNewConversation even when error occurs`() = test {
210227
whenever(heSupportRepository.createConversation(
211-
any(), any(), any(), any()
228+
any(), any(), any(), any(), any()
212229
)).thenReturn(CreateConversationResult.Error.GeneralError)
213230

214231
viewModel.onSendNewConversation(
215232
subject = "Test Subject",
216233
message = "Test Message",
217-
tags = emptyList()
234+
tags = emptyList(),
235+
includeAppLogs = false,
218236
)
219237
advanceUntilIdle()
220238

@@ -228,7 +246,8 @@ class HESupportViewModelTest : BaseUnitTest() {
228246
viewModel.onSendNewConversation(
229247
subject = "Test Subject",
230248
message = "Test Message",
231-
tags = listOf("tag1")
249+
tags = listOf("tag1"),
250+
includeAppLogs = false,
232251
)
233252
advanceUntilIdle()
234253

@@ -243,11 +262,12 @@ class HESupportViewModelTest : BaseUnitTest() {
243262
viewModel.onSendNewConversation(
244263
subject = "Test Subject",
245264
message = "Test Message",
246-
tags = listOf("tag1")
265+
tags = listOf("tag1"),
266+
includeAppLogs = false,
247267
)
248268
advanceUntilIdle()
249269

250-
verify(heSupportRepository, never()).createConversation(any(), any(), any(), any())
270+
verify(heSupportRepository, never()).createConversation(any(), any(), any(), any(), any())
251271
}
252272

253273
// endregion
@@ -272,7 +292,8 @@ class HESupportViewModelTest : BaseUnitTest() {
272292
@Test
273293
fun `onAddMessageToConversation does nothing when no conversation is selected`() = test {
274294
viewModel.onAddMessageToConversation(
275-
message = "Test message"
295+
message = "Test message",
296+
includeAppLogs = false,
276297
)
277298
advanceUntilIdle()
278299

@@ -297,7 +318,8 @@ class HESupportViewModelTest : BaseUnitTest() {
297318
advanceUntilIdle()
298319

299320
viewModel.onAddMessageToConversation(
300-
message = "Test message"
321+
message = "Test message",
322+
includeAppLogs = false,
301323
)
302324
advanceUntilIdle()
303325

@@ -325,7 +347,8 @@ class HESupportViewModelTest : BaseUnitTest() {
325347
advanceUntilIdle()
326348

327349
viewModel.onAddMessageToConversation(
328-
message = "Test message"
350+
message = "Test message",
351+
includeAppLogs = false,
329352
)
330353
advanceUntilIdle()
331354

@@ -346,7 +369,8 @@ class HESupportViewModelTest : BaseUnitTest() {
346369
advanceUntilIdle()
347370

348371
viewModel.onAddMessageToConversation(
349-
message = "Test message"
372+
message = "Test message",
373+
includeAppLogs = false,
350374
)
351375
advanceUntilIdle()
352376

@@ -368,7 +392,8 @@ class HESupportViewModelTest : BaseUnitTest() {
368392
advanceUntilIdle()
369393

370394
viewModel.onAddMessageToConversation(
371-
message = "Test message"
395+
message = "Test message",
396+
includeAppLogs = false,
372397
)
373398
advanceUntilIdle()
374399

@@ -388,7 +413,8 @@ class HESupportViewModelTest : BaseUnitTest() {
388413
advanceUntilIdle()
389414

390415
viewModel.onAddMessageToConversation(
391-
message = "Test message"
416+
message = "Test message",
417+
includeAppLogs = false,
392418
)
393419
advanceUntilIdle()
394420

@@ -408,7 +434,8 @@ class HESupportViewModelTest : BaseUnitTest() {
408434
whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
409435

410436
viewModel.onAddMessageToConversation(
411-
message = "Test message"
437+
message = "Test message",
438+
includeAppLogs = false,
412439
)
413440
advanceUntilIdle()
414441

@@ -429,7 +456,8 @@ class HESupportViewModelTest : BaseUnitTest() {
429456
whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
430457

431458
viewModel.onAddMessageToConversation(
432-
message = "Test message"
459+
message = "Test message",
460+
includeAppLogs = false,
433461
)
434462
advanceUntilIdle()
435463

@@ -449,7 +477,8 @@ class HESupportViewModelTest : BaseUnitTest() {
449477
whenever(networkUtilsWrapper.isNetworkAvailable()).thenReturn(false)
450478

451479
viewModel.onAddMessageToConversation(
452-
message = "Test message"
480+
message = "Test message",
481+
includeAppLogs = false,
453482
)
454483
advanceUntilIdle()
455484

@@ -717,14 +746,16 @@ class HESupportViewModelTest : BaseUnitTest() {
717746
subject = "Test Subject",
718747
message = "Test Message",
719748
tags = listOf("tag1"),
720-
attachments = listOf(tempFile1.path, tempFile2.path)
749+
attachments = listOf(tempFile1.path, tempFile2.path),
750+
encryptedLogIds = emptyList()
721751
)).thenReturn(CreateConversationResult.Success(newConversation))
722752

723753
viewModel.addAttachments(listOf(uri1, uri2))
724754
viewModel.onSendNewConversation(
725755
subject = "Test Subject",
726756
message = "Test Message",
727757
tags = listOf("tag1"),
758+
includeAppLogs = false,
728759
)
729760
advanceUntilIdle()
730761

@@ -733,7 +764,8 @@ class HESupportViewModelTest : BaseUnitTest() {
733764
subject = "Test Subject",
734765
message = "Test Message",
735766
tags = listOf("tag1"),
736-
attachments = listOf(tempFile1.path, tempFile2.path)
767+
attachments = listOf(tempFile1.path, tempFile2.path),
768+
encryptedLogIds = emptyList()
737769
)
738770
verify(tempAttachmentsUtil).removeTempFiles(listOf(tempFile1, tempFile2))
739771
}
@@ -744,7 +776,7 @@ class HESupportViewModelTest : BaseUnitTest() {
744776
val newConversation = createTestConversation(1)
745777

746778
whenever(heSupportRepository.createConversation(
747-
any(), any(), any(), any()
779+
any(), any(), any(), any(), any()
748780
)).thenReturn(CreateConversationResult.Success(newConversation))
749781

750782
viewModel.addAttachments(listOf(uri1))
@@ -755,6 +787,7 @@ class HESupportViewModelTest : BaseUnitTest() {
755787
subject = "Test Subject",
756788
message = "Test Message",
757789
tags = listOf("tag1"),
790+
includeAppLogs = false,
758791
)
759792
advanceUntilIdle()
760793

@@ -766,7 +799,7 @@ class HESupportViewModelTest : BaseUnitTest() {
766799
val uri1 = mock<Uri>()
767800

768801
whenever(heSupportRepository.createConversation(
769-
any(), any(), any(), any()
802+
any(), any(), any(), any(), any()
770803
)).thenReturn(CreateConversationResult.Error.GeneralError)
771804

772805
viewModel.addAttachments(listOf(uri1))
@@ -776,6 +809,7 @@ class HESupportViewModelTest : BaseUnitTest() {
776809
subject = "Test Subject",
777810
message = "Test Message",
778811
tags = listOf("tag1"),
812+
includeAppLogs = false,
779813
)
780814
advanceUntilIdle()
781815

@@ -790,14 +824,15 @@ class HESupportViewModelTest : BaseUnitTest() {
790824
whenever(tempAttachmentsUtil.createTempFilesFrom(listOf(uri1)))
791825
.thenReturn(listOf(tempFile1))
792826
whenever(heSupportRepository.createConversation(
793-
any(), any(), any(), any()
827+
any(), any(), any(), any(), any()
794828
)).thenReturn(CreateConversationResult.Error.GeneralError)
795829

796830
viewModel.addAttachments(listOf(uri1))
797831
viewModel.onSendNewConversation(
798832
subject = "Test Subject",
799833
message = "Test Message",
800834
tags = listOf("tag1"),
835+
includeAppLogs = false,
801836
)
802837
advanceUntilIdle()
803838

@@ -827,7 +862,8 @@ class HESupportViewModelTest : BaseUnitTest() {
827862

828863
viewModel.addAttachments(listOf(uri1))
829864
viewModel.onAddMessageToConversation(
830-
message = "Test message"
865+
message = "Test message",
866+
includeAppLogs = false,
831867
)
832868
advanceUntilIdle()
833869

@@ -859,7 +895,8 @@ class HESupportViewModelTest : BaseUnitTest() {
859895
assertThat(viewModel.attachmentState.value.acceptedUris).containsExactly(uri1)
860896

861897
viewModel.onAddMessageToConversation(
862-
message = "Test message"
898+
message = "Test message",
899+
includeAppLogs = false,
863900
)
864901
advanceUntilIdle()
865902

@@ -883,7 +920,8 @@ class HESupportViewModelTest : BaseUnitTest() {
883920
advanceUntilIdle()
884921

885922
viewModel.onAddMessageToConversation(
886-
message = "Test message"
923+
message = "Test message",
924+
includeAppLogs = false,
887925
)
888926
advanceUntilIdle()
889927

@@ -908,7 +946,8 @@ class HESupportViewModelTest : BaseUnitTest() {
908946

909947
viewModel.addAttachments(listOf(uri1))
910948
viewModel.onAddMessageToConversation(
911-
message = "Test message"
949+
message = "Test message",
950+
includeAppLogs = false,
912951
)
913952
advanceUntilIdle()
914953

@@ -927,6 +966,7 @@ class HESupportViewModelTest : BaseUnitTest() {
927966
subject = "Test Subject",
928967
message = "Test Message",
929968
tags = listOf("tag1"),
969+
includeAppLogs = false,
930970
)
931971
advanceUntilIdle()
932972

@@ -948,7 +988,8 @@ class HESupportViewModelTest : BaseUnitTest() {
948988

949989
viewModel.addAttachments(listOf(uri1))
950990
viewModel.onAddMessageToConversation(
951-
message = "Test message"
991+
message = "Test message",
992+
includeAppLogs = false,
952993
)
953994
advanceUntilIdle()
954995

0 commit comments

Comments
 (0)