@@ -22,6 +22,7 @@ import com.owncloud.android.ui.interfaces.UnifiedSearchCurrentDirItemAction
2222import com.owncloud.android.ui.interfaces.UnifiedSearchListInterface
2323import com.owncloud.android.ui.unifiedsearch.ProviderID
2424import com.owncloud.android.ui.unifiedsearch.UnifiedSearchSection
25+ import com.owncloud.android.utils.MimeType
2526import com.owncloud.android.utils.ScreenshotTest
2627import com.owncloud.android.utils.overlay.OverlayManager
2728import org.junit.Before
@@ -40,6 +41,7 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
4041 }
4142
4243 // region Fake Data
44+
4345 private fun makeFolderEntry () = SearchResultEntry (
4446 thumbnailUrl = " " ,
4547 title = " My Folder" ,
@@ -209,10 +211,9 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
209211 @ScreenshotTest
210212 fun showEmptyAdapter () {
211213 launchActivity<FileDisplayActivity >().use { scenario ->
212- scenario.onActivity { sut ->
213- setupAdapterOnActivity(sut)
214- screenshot(sut, " emptyAdapter" )
215- }
214+ scenario.onActivity { sut -> setupAdapterOnActivity(sut) }
215+ waitForIdle()
216+ scenario.onActivity { sut -> screenshot(sut, " emptyAdapter" ) }
216217 }
217218 }
218219
@@ -229,8 +230,9 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
229230 sut,
230231 sections = makeSections(" Contacts" to listOf (makeContactEntry()))
231232 )
232- screenshot(sut, " contactEntry" )
233233 }
234+ waitForIdle()
235+ scenario.onActivity { sut -> screenshot(sut, " contactEntry" ) }
234236 }
235237 }
236238
@@ -243,8 +245,9 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
243245 sut,
244246 sections = makeSections(" Calendar" to listOf (makeCalendarEntry()))
245247 )
246- screenshot(sut, " calendarEntry" )
247248 }
249+ waitForIdle()
250+ scenario.onActivity { sut -> screenshot(sut, " calendarEntry" ) }
248251 }
249252 }
250253
@@ -257,8 +260,9 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
257260 sut,
258261 sections = makeSections(" Apps" to listOf (makeAppEntry()))
259262 )
260- screenshot(sut, " appEntry" )
261263 }
264+ waitForIdle()
265+ scenario.onActivity { sut -> screenshot(sut, " appEntry" ) }
262266 }
263267 }
264268
@@ -275,8 +279,9 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
275279 sut,
276280 sections = makeSections(" Files" to listOf (makeFileEntry()))
277281 )
278- screenshot(sut, " fileEntry" )
279282 }
283+ waitForIdle()
284+ scenario.onActivity { sut -> screenshot(sut, " fileEntry" ) }
280285 }
281286 }
282287
@@ -286,16 +291,16 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
286291 launchActivity<FileDisplayActivity >().use { scenario ->
287292 scenario.onActivity { sut ->
288293 val folder = OCFile (" /Documents/My Folder" ).apply {
289- mimeType = " inode/directory"
294+ mimeType = MimeType .DIRECTORY
295+ remoteId = " 0001"
296+ setFolder()
290297 }
291298 sut.storageManager.saveFile(folder)
292-
293299 setupAdapterOnActivity(
294300 sut,
295301 sections = makeSections(" Files" to listOf (makeFolderEntry()))
296302 )
297303 }
298-
299304 waitForIdle()
300305 scenario.onActivity { sut -> screenshot(sut, " folderEntry" ) }
301306 }
@@ -310,8 +315,9 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
310315 sut,
311316 sections = makeSections(" Files" to listOf (makeEntryWithoutSubline()))
312317 )
313- screenshot(sut, " entryWithoutSubline" )
314318 }
319+ waitForIdle()
320+ scenario.onActivity { sut -> screenshot(sut, " entryWithoutSubline" ) }
315321 }
316322 }
317323
@@ -332,8 +338,9 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
332338 " Calendar" to listOf (makeCalendarEntry())
333339 )
334340 )
335- screenshot(sut, " multipleSections" )
336341 }
342+ waitForIdle()
343+ scenario.onActivity { sut -> screenshot(sut, " multipleSections" ) }
337344 }
338345 }
339346
@@ -349,8 +356,9 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
349356 " Contacts" to listOf (makeContactEntry())
350357 )
351358 )
352- screenshot(sut, " sectionsWithLoadMoreFooter" )
353359 }
360+ waitForIdle()
361+ scenario.onActivity { sut -> screenshot(sut, " sectionsWithLoadMoreFooter" ) }
354362 }
355363 }
356364
@@ -364,22 +372,24 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
364372 launchActivity<FileDisplayActivity >().use { scenario ->
365373 scenario.onActivity { sut ->
366374 val file1 = OCFile (" /Documents/report.pdf" ).apply {
367- mimeType = " application/pdf"
375+ mimeType = MimeType .PDF
376+ remoteId = " 0002"
368377 fileLength = 1024 * 512
369378 modificationTimestamp = System .currentTimeMillis()
370379 }
371380 val file2 = OCFile (" /Documents/photo.jpg" ).apply {
372- mimeType = " image/jpeg"
381+ mimeType = MimeType .JPEG
382+ remoteId = " 0003"
373383 fileLength = 1024 * 1024
374384 modificationTimestamp = System .currentTimeMillis()
375385 }
376-
377386 setupAdapterOnActivity(
378387 sut,
379388 currentDirItems = listOf (file1, file2)
380389 )
381- screenshot(sut, " currentDirectoryItems" )
382390 }
391+ waitForIdle()
392+ scenario.onActivity { sut -> screenshot(sut, " currentDirectoryItems" ) }
383393 }
384394 }
385395
@@ -393,14 +403,14 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
393403 fileLength = 1024
394404 modificationTimestamp = System .currentTimeMillis()
395405 }
396-
397406 setupAdapterOnActivity(
398407 sut,
399408 sections = makeSections(" Files" to listOf (makeFileEntry())),
400409 currentDirItems = listOf (localFile)
401410 )
402- screenshot(sut, " currentDirItemsWithUnifiedSections" )
403411 }
412+ waitForIdle()
413+ scenario.onActivity { sut -> screenshot(sut, " currentDirItemsWithUnifiedSections" ) }
404414 }
405415 }
406416
@@ -424,7 +434,6 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
424434 attributes = mapOf (" fileId" to " $i " )
425435 )
426436 }
427-
428437 val contactEntries = (1 .. 5 ).map { i ->
429438 SearchResultEntry (
430439 thumbnailUrl = " https://cloud.example.com/avatar/user$i " ,
@@ -436,16 +445,16 @@ class UnifiedSearchListAdapterIT : AbstractIT() {
436445 attributes = emptyMap()
437446 )
438447 }
439-
440448 setupAdapterOnActivity(
441449 sut,
442450 sections = makeSections(
443451 " Files" to fileEntries,
444452 " Contacts" to contactEntries
445453 )
446454 )
447- screenshot(sut, " manyEntriesScrollStress" )
448455 }
456+ waitForIdle()
457+ scenario.onActivity { sut -> screenshot(sut, " manyEntriesScrollStress" ) }
449458 }
450459 }
451460
0 commit comments