Merge "Update rename ui tests to expect rename without name change not to fail and added a new test to verify it is a no-op." into arc-apps

1 files changed, 14 insertions, 3 deletions

diff --git a/tests/functional/com/android/documentsui/RenameDocumentUiTest.java b/tests/functional/com/android/documentsui/RenameDocumentUiTest.java
index c761cad53..90f1a828e 100644
--- a/tests/functional/com/android/documentsui/RenameDocumentUiTest.java
+++ b/tests/functional/com/android/documentsui/RenameDocumentUiTest.java
@@ -107,6 +107,18 @@ public class RenameDocumentUiTest extends ActivityTest<FilesActivity> {
         bots.directory.assertDocumentsCount(4);
     }
 
+    public void testRenameWithoutChangeIsNoOp() throws Exception {
+        bots.directory.selectDocument(fileName1, 1);
+
+        clickRename();
+
+        device.waitForIdle();
+        bots.keyboard.pressEnter();
+
+        bots.directory.waitForDocument(fileName1);
+        bots.directory.assertDocumentsCount(4);
+    }
+
     public void testRenameFile_Cancel() throws Exception {
         bots.directory.selectDocument(fileName1, 1);
 
@@ -170,9 +182,8 @@ public class RenameDocumentUiTest extends ActivityTest<FilesActivity> {
 
         bots.main.assertDialogText(fileName1);
         assertFalse(bots.main.findRenameErrorMessage().exists());
-        bots.keyboard.pressEnter();
-        assertTrue(bots.main.findRenameErrorMessage().exists());
         bots.main.setDialogText(fileName2);
+        bots.keyboard.pressEnter();
         assertTrue(bots.main.findRenameErrorMessage().exists());
     }
 
@@ -183,4 +194,4 @@ public class RenameDocumentUiTest extends ActivityTest<FilesActivity> {
         bots.main.clickActionbarOverflowItem("Rename");
         device.waitForIdle();
     }
-}
+}
\ No newline at end of file