Merge pull request #7186 from nextcloud/screenshots

Update Screenshots

src/androidTest/java/com/nextcloud/client/etm/EtmActivityTest.kt

@@ -25,7 +25,6 @@ package com.nextcloud.client.etm
 import android.app.Activity
 import androidx.test.espresso.intent.rule.IntentsTestRule
 import androidx.test.internal.runner.junit4.statement.UiThreadStatement
-import com.facebook.testing.screenshot.Screenshot
 import com.owncloud.android.AbstractIT
 import com.owncloud.android.lib.resources.status.OwnCloudVersion
 import com.owncloud.android.utils.ScreenshotTest
@@ -55,7 +54,7 @@ class EtmActivityTest : AbstractIT() {
 
         waitForIdleSync()
 
-        Screenshot.snapActivity(sut).record()
+        screenshot(sut)
     }
 
     @Test
@@ -65,7 +64,7 @@ class EtmActivityTest : AbstractIT() {
 
         UiThreadStatement.runOnUiThread { sut.vm.onPageSelected(0) }
 
-        Screenshot.snapActivity(sut).record()
+        screenshot(sut)
     }
 
     @Test
@@ -75,6 +74,6 @@ class EtmActivityTest : AbstractIT() {
 
         UiThreadStatement.runOnUiThread { sut.vm.onPageSelected(1) }
 
-        Screenshot.snapActivity(sut).record()
+        screenshot(sut)
     }
 }

src/androidTest/java/com/owncloud/android/ui/activity/NotificationsActivityIT.kt

@@ -22,7 +22,6 @@
 package com.owncloud.android.ui.activity
 
 import androidx.test.espresso.intent.rule.IntentsTestRule
-import com.facebook.testing.screenshot.Screenshot
 import com.owncloud.android.AbstractIT
 import com.owncloud.android.lib.resources.notifications.models.Action
 import com.owncloud.android.lib.resources.notifications.models.Notification
@@ -41,7 +40,7 @@ class NotificationsActivityIT : AbstractIT() {
     fun loading() {
         val sut: NotificationsActivity = activityRule.launchActivity(null)
 
-        Screenshot.snapActivity(sut).record()
+        screenshot(sut)
     }
 
     @Test

src/androidTest/java/com/owncloud/android/ui/activity/UploadFilesActivityIT.kt

@@ -22,7 +22,6 @@
 package com.owncloud.android.ui.activity
 
 import androidx.test.espresso.intent.rule.IntentsTestRule
-import com.facebook.testing.screenshot.Screenshot
 import com.owncloud.android.AbstractIT
 import org.junit.Rule
 import org.junit.Test
@@ -36,6 +35,6 @@ class UploadFilesActivityIT : AbstractIT() {
     fun open() {
         val sut: UploadFilesActivity = activityRule.launchActivity(null)
 
-        Screenshot.snapActivity(sut).record()
+        screenshot(sut)
     }
 }

src/androidTest/java/com/owncloud/android/ui/fragment/OCFileListFragmentStaticServerIT.kt

@@ -49,8 +49,8 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
     fun showFiles() {
         val sut = testActivityRule.launchActivity(null)
 
-        val textFile = OCFile("/1.md", "00000001")
-        textFile.mimeType = "text/markdown"
+        val textFile = OCFile("/1.png", "00000001")
+        textFile.mimeType = "image/png"
         textFile.fileLength = 1024000
         textFile.modificationTimestamp = 1188206955000
         textFile.parentId = sut.storageManager.getFileByEncryptedRemotePath("/").fileId
@@ -185,13 +185,13 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
         folder.setFolder()
         sut.storageManager.saveFile(folder)
 
-        val textFile = OCFile("/test/Readme.md", "00000001")
-        textFile.mimeType = "text/markdown"
-        textFile.fileLength = 1024000
-        textFile.modificationTimestamp = 1188206955000
-        textFile.parentId = sut.storageManager.getFileByEncryptedRemotePath("/test/").fileId
-        textFile.storagePath = getFile("java.md").absolutePath
-        sut.storageManager.saveFile(textFile)
+        val imageFile = OCFile("/test/image.png", "00000001")
+        imageFile.mimeType = "image/png"
+        imageFile.fileLength = 1024000
+        imageFile.modificationTimestamp = 1188206955000
+        imageFile.parentId = sut.storageManager.getFileByEncryptedRemotePath("/test/").fileId
+        imageFile.storagePath = getFile("java.md").absolutePath
+        sut.storageManager.saveFile(imageFile)
 
         sut.addFragment(fragment)
         val testFolder: OCFile = sut.storageManager.getFileByEncryptedRemotePath("/test/")
@@ -199,6 +199,8 @@ class OCFileListFragmentStaticServerIT : AbstractIT() {
 
         sut.runOnUiThread { fragment.listDirectory(testFolder, false, false) }
 
+        shortSleep()
+
         screenshot(sut)
     }
 

src/androidTest/java/com/owncloud/android/ui/trashbin/TrashbinActivityIT.kt

@@ -22,7 +22,6 @@
 package com.owncloud.android.ui.trashbin
 
 import androidx.test.espresso.intent.rule.IntentsTestRule
-import com.facebook.testing.screenshot.Screenshot
 import com.owncloud.android.AbstractIT
 import com.owncloud.android.utils.ScreenshotTest
 import org.junit.Rule
@@ -49,7 +48,7 @@ class TrashbinActivityIT : AbstractIT() {
 
         shortSleep()
 
-        Screenshot.snapActivity(sut).record()
+        screenshot(sut)
     }
 
     @Test
@@ -65,6 +64,7 @@ class TrashbinActivityIT : AbstractIT() {
 
         waitForIdleSync()
         shortSleep()
+        shortSleep()
 
         screenshot(sut)
     }
@@ -82,6 +82,6 @@ class TrashbinActivityIT : AbstractIT() {
 
         shortSleep()
 
-        Screenshot.snapActivity(sut).record()
+        screenshot(sut)
     }
 }

src/androidTest/java/com/owncloud/android/ui/trashbin/TrashbinLocalRepository.kt

@@ -47,10 +47,10 @@ class TrashbinLocalRepository(val testCase: TrashbinActivityIT.TestCase) : Trash
                 val files = ArrayList<Any>()
                 files.add(
                     TrashbinFile(
-                        "test.md",
-                        "text/markdown",
-                        "/trashbin/test.md",
-                        "subFolder/test.md",
+                        "test.png",
+                        "image/png",
+                        "/trashbin/test.png",
+                        "subFolder/test.png",
                         1395847838, // random date
                         1395847908 // random date
                     )