summaryrefslogtreecommitdiff
path: root/android-uitests
diff options
context:
space:
mode:
authorSuyog Lokhande <suyoglokhande@google.com>2022-06-28 09:57:34 -0700
committerSuyog Lokhande <suyoglokhande@google.com>2022-06-28 19:55:58 +0000
commit885561f02453b385ab353fd89fd49a197ede9825 (patch)
treee82b14edb8ca2883abd59c80493a093849ffe15f /android-uitests
parent5be08fb62677cb0bd868838c91f16eabd56910af (diff)
downloadidea-885561f02453b385ab353fd89fd49a197ede9825.tar.gz
Fix JavaDepTest and AndroidDepTest
Waiting for idle to click on menu Bug: 218705153 Test: AndroidDepTest - https://fusion2.corp.google.com/invocations/5c04deac-ef23-4bcd-bbec-0a91275cb5d0 JavaDepTest - https://fusion2.corp.google.com/invocations/a08ad57a-e14c-46f0-9920-50fcee2eb63a Change-Id: I4d008adf2fc178b0426bba7b52dbd71105d78fa1
Diffstat (limited to 'android-uitests')
-rw-r--r--android-uitests/testSrc/com/android/tools/idea/tests/gui/projectstructure/AndroidDepTest.java5
-rw-r--r--android-uitests/testSrc/com/android/tools/idea/tests/gui/projectstructure/JavaDepTest.java5
2 files changed, 10 insertions, 0 deletions
diff --git a/android-uitests/testSrc/com/android/tools/idea/tests/gui/projectstructure/AndroidDepTest.java b/android-uitests/testSrc/com/android/tools/idea/tests/gui/projectstructure/AndroidDepTest.java
index c892b65dd7c..e3fcab22442 100644
--- a/android-uitests/testSrc/com/android/tools/idea/tests/gui/projectstructure/AndroidDepTest.java
+++ b/android-uitests/testSrc/com/android/tools/idea/tests/gui/projectstructure/AndroidDepTest.java
@@ -86,6 +86,8 @@ public class AndroidDepTest {
.clickPath(RIGHT_BUTTON, APP_NAME, "app");
guiTest.waitForBackgroundTasks();
+ guiTest.robot().waitForIdle();
+ guiTest.robot().findActivePopupMenu();
ideFrame.invokeMenuPath("Open Module Settings");
ProjectStructureDialogFixture dialogFixture = ProjectStructureDialogFixture.Companion.find(ideFrame);
@@ -98,6 +100,7 @@ public class AndroidDepTest {
dialogFixture.clickOk();
guiTest.waitForBackgroundTasks();
+ guiTest.robot().waitForIdle();
editor.open("/app/src/main/java/android/com/app/MainActivity.java")
.moveBetween("setContentView(R.layout.activity_main);", "")
.enterText("\nGson gson = new Gson();")
@@ -111,12 +114,14 @@ public class AndroidDepTest {
invokeJavaClass(ideFrame).enterName("LibraryClass").clickOk();
guiTest.waitForBackgroundTasks();
+ guiTest.robot().waitForIdle();
editor.open("/library_module/src/main/java/android/com/library_module/LibraryClass.java")
.select("()public class LibraryClass")
.enterText("import com.google.gson.Gson;\n\n");
guiTest.waitForBackgroundTasks();
+ guiTest.robot().waitForIdle();
editor.open("/library_module/src/main/java/android/com/library_module/LibraryClass.java")
.moveBetween("public class LibraryClass {", "")
.enterText("\nGson gson = new Gson();\n");
diff --git a/android-uitests/testSrc/com/android/tools/idea/tests/gui/projectstructure/JavaDepTest.java b/android-uitests/testSrc/com/android/tools/idea/tests/gui/projectstructure/JavaDepTest.java
index 3b83f68360d..ac1cce00936 100644
--- a/android-uitests/testSrc/com/android/tools/idea/tests/gui/projectstructure/JavaDepTest.java
+++ b/android-uitests/testSrc/com/android/tools/idea/tests/gui/projectstructure/JavaDepTest.java
@@ -82,6 +82,8 @@ public class JavaDepTest {
.clickPath(RIGHT_BUTTON, "App", "app");
guiTest.waitForBackgroundTasks();
+ guiTest.robot().waitForIdle();
+ guiTest.robot().findActivePopupMenu();
ideFrame.invokeMenuPath("Open Module Settings");
ProjectStructureDialogFixture dialogFixture = ProjectStructureDialogFixture.Companion.find(ideFrame);
@@ -93,6 +95,9 @@ public class JavaDepTest {
addModuleDependencyFixture.clickOk();
dialogFixture.clickOk();
+ guiTest.waitForBackgroundTasks();
+ guiTest.robot().waitForIdle();
+
editor.open("/app/src/main/java/android/com/app/MainActivity.java")
.moveBetween("setContentView(R.layout.activity_main);", "")
.enterText("\n\t\tGson gson = new Gson();")