wip

Signed-off-by: tobiasKaminsky <[email protected]>

Author: tobiasKaminsky

app/src/androidTest/java/com/owncloud/android/ui/dialog/DialogFragmentIT.kt

@@ -99,15 +99,15 @@ class DialogFragmentIT : AbstractIT() {
             OCFile("/Test/"),
             OCFile("/")
         ).run {
-            showDialog(this)
+            showDialog(this, "testRenameFileDialog")
         }
     }
 
     @Test
     @ScreenshotTest
     fun testLoadingDialog() {
         newInstance("Wait…").run {
-            showDialog(this)
+            showDialog(this, "testLoadingDialog")
         }
     }
 
@@ -123,7 +123,7 @@ class DialogFragmentIT : AbstractIT() {
             -1,
             -1
         ).run {
-            showDialog(this)
+            showDialog(this, "testConfirmationDialogWithOneAction")
         }
     }
 
@@ -139,7 +139,7 @@ class DialogFragmentIT : AbstractIT() {
             -1,
             -1
         ).run {
-            showDialog(this)
+            showDialog(this, "testConfirmationDialogWithTwoAction")
         }
     }
 
@@ -155,7 +155,7 @@ class DialogFragmentIT : AbstractIT() {
             R.string.common_confirm,
             -1
         ).run {
-            showDialog(this)
+            showDialog(this, "testConfirmationDialogWithThreeAction")
         }
     }
 
@@ -172,7 +172,7 @@ class DialogFragmentIT : AbstractIT() {
             R.string.common_confirm,
             -1
         ).run {
-            showDialog(this)
+            showDialog(this, "testConfirmationDialogWithThreeActionRTL")
             resetLocale()
         }
     }
@@ -181,7 +181,7 @@ class DialogFragmentIT : AbstractIT() {
     @ScreenshotTest
     fun testRemoveFileDialog() {
         RemoveFilesDialogFragment.newInstance(OCFile("/Test.md")).run {
-            showDialog(this)
+            showDialog(this, "testRemoveFileDialog")
         }
     }
 
@@ -194,14 +194,14 @@ class DialogFragmentIT : AbstractIT() {
         }
 
         val dialog: RemoveFilesDialogFragment = RemoveFilesDialogFragment.newInstance(toDelete)
-        showDialog(dialog)
+        showDialog(dialog, "testRemoveFilesDialog")
     }
 
     @Test
     @ScreenshotTest
     fun testRemoveFolderDialog() {
         val dialog = RemoveFilesDialogFragment.newInstance(OCFile("/Folder/"))
-        showDialog(dialog)
+        showDialog(dialog, "testRemoveFolderDialog")
     }
 
     @Test
@@ -212,7 +212,7 @@ class DialogFragmentIT : AbstractIT() {
         toDelete.add(OCFile("/Documents/"))
 
         val dialog: RemoveFilesDialogFragment = RemoveFilesDialogFragment.newInstance(toDelete)
-        showDialog(dialog)
+        showDialog(dialog, "testRemoveFoldersDialog")
     }
 
     @Test
@@ -222,7 +222,7 @@ class DialogFragmentIT : AbstractIT() {
             Looper.prepare()
         }
         val sut = CreateFolderDialogFragment.newInstance(OCFile("/"))
-        showDialog(sut)
+        showDialog(sut, "testNewFolderDialog")
     }
 
     @Test
@@ -232,7 +232,7 @@ class DialogFragmentIT : AbstractIT() {
             Looper.prepare()
         }
         val sut = newInstance(OCFile("/"), true, false)
-        showDialog(sut)
+        showDialog(sut, "testEnforcedPasswordDialog")
     }
 
     @Test
@@ -242,7 +242,7 @@ class DialogFragmentIT : AbstractIT() {
             Looper.prepare()
         }
         val sut = newInstance(OCFile("/"), true, true)
-        showDialog(sut)
+        showDialog(sut, "testOptionalPasswordDialog")
     }
 
     @Test
@@ -626,7 +626,7 @@ class DialogFragmentIT : AbstractIT() {
         val handler = mockk<SslErrorHandler>(relaxed = true)
 
         newInstanceForEmptySslError(sslError, handler).run {
-            showDialog(this)
+            showDialog(this, "testSslUntrustedCertDialog")
         }
     }
 
@@ -638,7 +638,7 @@ class DialogFragmentIT : AbstractIT() {
         }
 
         val dialog = StoragePermissionDialogFragment()
-        showDialog(dialog)
+        showDialog(dialog, "testStoragePermissionDialog")
     }
 
     @Test
@@ -653,11 +653,11 @@ class DialogFragmentIT : AbstractIT() {
         }
 
         newInstance(ocFile, false).run {
-            showDialog(this)
+            showDialog(this, "testFileActionsBottomSheet")
         }
     }
 
-    private fun showDialog(dialog: DialogFragment) {
+    private fun showDialog(dialog: DialogFragment, testName: String) {
         launchActivity<FileDisplayActivity>().use { scenario ->
             scenario.onActivity { sut ->
                 dialog.show(sut.supportFragmentManager, null)
@@ -670,7 +670,7 @@ class DialogFragmentIT : AbstractIT() {
                 if (viewGroup != null) {
                     hideCursors(viewGroup)
                 }
-                screenshot(dialogInstance.window?.decorView)
+                screenshotViaName(dialogInstance.window?.decorView, "${testClassName}_$testName")
             }
 
             onView(isRoot()).check(matches(isDisplayed()))