Fix failing qa_fast test cases

Bug: 218705153
Test: AndroidDepTest - https://fusion2.corp.google.com/invocations/98cfdc62-56dc-4e43-ba33-0143dbcfb383/
JavaDepTest - https://fusion2.corp.google.com/invocations/4b7c95d1-a5f9-439d-87ee-d23312643fa5/targets
AddBenchmarkModuleTest - https://fusion2.corp.google.com/invocations/2ad978cd-a483-4541-b4b5-86f3f9b19611/targets
InferNullityTest - https://fusion2.corp.google.com/invocations/42dead95-8bf9-4865-a835-9b0f6695f595/targets
ImportMlModelTest - https://fusion2.corp.google.com/invocations/3a1ad645-13ff-4d05-810a-e297ed213901/targets

Change-Id: Ia2809503b36842d58904a503e4a166d981e59d21

5 files changed, 46 insertions, 13 deletions

diff --git a/android-uitests/testSrc/com/android/tools/idea/tests/gui/benchmark/AddBenchmarkModuleTest.kt b/android-uitests/testSrc/com/android/tools/idea/tests/gui/benchmark/AddBenchmarkModuleTest.kt
index 388777c77b3..2534f326e63 100644
--- a/android-uitests/testSrc/com/android/tools/idea/tests/gui/benchmark/AddBenchmarkModuleTest.kt
+++ b/android-uitests/testSrc/com/android/tools/idea/tests/gui/benchmark/AddBenchmarkModuleTest.kt
@@ -26,15 +26,15 @@ import com.android.tools.idea.wizard.template.Language.Kotlin
 import com.google.common.truth.Truth.assertThat
 import com.intellij.testGuiFramework.framework.GuiTestRemoteRunner
 import org.fest.swing.timing.Wait
-import org.junit.Ignore
 import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
+import java.util.concurrent.TimeUnit
 
 @RunWith(GuiTestRemoteRunner::class)
 class AddBenchmarkModuleTest {
   @get:Rule
-  val guiTest = GuiTestRule()
+  val guiTest = GuiTestRule().withTimeout(10, TimeUnit.MINUTES)
 
   @get:Rule
   val flagRule = SetFlagRule(StudioFlags.NPW_NEW_MACRO_BENCHMARK_MODULE, true)
diff --git a/android-uitests/testSrc/com/android/tools/idea/tests/gui/editors/InferNullityTest.java b/android-uitests/testSrc/com/android/tools/idea/tests/gui/editors/InferNullityTest.java
index f1efcccfc55..065c122b7cb 100644
--- a/android-uitests/testSrc/com/android/tools/idea/tests/gui/editors/InferNullityTest.java
+++ b/android-uitests/testSrc/com/android/tools/idea/tests/gui/editors/InferNullityTest.java
@@ -20,10 +20,12 @@ import com.android.tools.idea.tests.gui.framework.RunIn;
 import com.android.tools.idea.tests.gui.framework.TestGroup;
 import com.android.tools.idea.tests.gui.framework.fixture.EditorFixture;
 import com.android.tools.idea.tests.gui.framework.fixture.IdeFrameFixture;
+import com.android.tools.idea.tests.util.WizardUtils;
 import com.intellij.testGuiFramework.framework.GuiTestRemoteRunner;
 import org.fest.swing.fixture.DialogFixture;
 import org.fest.swing.fixture.JButtonFixture;
 import org.fest.swing.timing.Wait;
+import org.junit.Before;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -41,8 +43,15 @@ public class InferNullityTest {
 
   @Rule public final GuiTestRule guiTest = new GuiTestRule().withTimeout(5, TimeUnit.MINUTES);
 
+  protected static final String EMPTY_ACTIVITY_TEMPLATE = "Empty Activity";
   private static String ANALYZE = "Analyze";
 
+  @Before
+  public void setUp() throws Exception {
+    WizardUtils.createNewProject(guiTest, EMPTY_ACTIVITY_TEMPLATE); // Default projects are created with androidx dependencies
+    guiTest.robot().waitForIdle();
+  }
+
   /**
    * Verifies inferring nullity of calling methods and variables that can/cannot return null.
    * <p>
@@ -52,7 +61,7 @@ public class InferNullityTest {
    * <p>
    *   <pre>
    *   Test Steps:
-   *   1. Import Nullity project.
+   *   1. Create Empty Activity project and add the sample methods to MainActivity class
    *   2. Click on Analyze > Infer Nullity.
    *   3. Select Annotations scope as "Whole Project" and click OK.
    *   4. Click OK when prompted to add the support-annotations dependency to the project.
@@ -64,7 +73,17 @@ public class InferNullityTest {
   @Test
   @RunIn(TestGroup.FAT_BAZEL)
   public void inferNullity() throws Exception {
-    IdeFrameFixture ideFrame = guiTest.importProjectAndWaitForProjectSyncToFinish("Nullity", Wait.seconds(120));
+    IdeFrameFixture ideFrame = guiTest.ideFrame();
+    EditorFixture editor = ideFrame.getEditor();
+
+    guiTest.waitForBackgroundTasks();
+
+    editor.open("/app/src/main/java/com/google/myapplication/MainActivity.java")
+      .moveBetween(" }", "")
+      .enterText("\npublic Color myMethod() {\nColor color = null;\nreturn color;\n}\n\npublic Color myMethod1() {\nColor color = new Color();\nreturn color;\n}\n")
+      .select("()public class MainActivity")
+      .enterText("import android.graphics.Color;\n\n");
+
     guiTest.waitForBackgroundTasks();
 
     ideFrame.invokeMenuPath("Code", "Analyze Code", "Infer Nullity...");
@@ -73,9 +92,11 @@ public class InferNullityTest {
       .withTimeout(SECONDS.toMillis(30)).using(guiTest.robot());
     specifyScopeDialog.button(withText(ANALYZE)).click();
 
+    guiTest.waitForBackgroundTasks();
+
     EditorFixture editorFixture = ideFrame
       .getEditor()
-      .open("app/src/main/java/com/android/nullity/MainActivity.java");
+      .open("/app/src/main/java/com/google/myapplication/MainActivity.java");
     String codeContents = editorFixture.getCurrentFileContents();
     assertThat(codeContents).contains("@Nullable");
     assertThat(codeContents).contains("@NonNull");
diff --git a/android-uitests/testSrc/com/android/tools/idea/tests/gui/mlmodels/ImportMlModelTest.java b/android-uitests/testSrc/com/android/tools/idea/tests/gui/mlmodels/ImportMlModelTest.java
index 301de8a73a5..a3f648f1181 100644
--- a/android-uitests/testSrc/com/android/tools/idea/tests/gui/mlmodels/ImportMlModelTest.java
+++ b/android-uitests/testSrc/com/android/tools/idea/tests/gui/mlmodels/ImportMlModelTest.java
@@ -25,6 +25,7 @@ import com.android.tools.idea.tests.gui.framework.fixture.mlmodels.ImportMlModel
 import com.intellij.testGuiFramework.framework.GuiTestRemoteRunner;
 import java.io.File;
 import java.io.IOException;
+import java.util.concurrent.TimeUnit;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
@@ -33,8 +34,9 @@ import org.junit.runner.RunWith;
 
 @RunWith(GuiTestRemoteRunner.class)
 public class ImportMlModelTest {
-  @Rule
-  public GuiTestRule guiTest = new GuiTestRule();
+
+  @Rule public final GuiTestRule guiTest = new GuiTestRule().withTimeout(7, TimeUnit.MINUTES);
+
 
   @Before
   public void setUp() {
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 4602e44237b..c892b65dd7c 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
@@ -83,9 +83,10 @@ public class AndroidDepTest {
 
     ideFrame.getProjectView()
       .selectProjectPane()
-      .clickPath(RIGHT_BUTTON, APP_NAME, "app")
-      .openFromMenu(ProjectStructureDialogFixture.Companion::find, "Open Module Settings");
+      .clickPath(RIGHT_BUTTON, APP_NAME, "app");
 
+    guiTest.waitForBackgroundTasks();
+    ideFrame.invokeMenuPath("Open Module Settings");
 
     ProjectStructureDialogFixture dialogFixture = ProjectStructureDialogFixture.Companion.find(ideFrame);
     DependenciesPerspectiveConfigurableFixture dependenciesFixture =
@@ -96,6 +97,7 @@ public class AndroidDepTest {
     addModuleDependencyFixture.clickOk();
     dialogFixture.clickOk();
 
+    guiTest.waitForBackgroundTasks();
     editor.open("/app/src/main/java/android/com/app/MainActivity.java")
       .moveBetween("setContentView(R.layout.activity_main);", "")
       .enterText("\nGson gson = new Gson();")
@@ -108,12 +110,18 @@ public class AndroidDepTest {
       .clickPath(APP_NAME, "library_module", "src", "main", "java", "android.com.library_module");
 
     invokeJavaClass(ideFrame).enterName("LibraryClass").clickOk();
+    guiTest.waitForBackgroundTasks();
+
     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")
-      .select("public class LibraryClass \\{()")
+      .enterText("import com.google.gson.Gson;\n\n");
+
+    guiTest.waitForBackgroundTasks();
+    editor.open("/library_module/src/main/java/android/com/library_module/LibraryClass.java")
+      .moveBetween("public class LibraryClass {", "")
       .enterText("\nGson gson = new Gson();\n");
 
+
     BuildStatus result = guiTest.ideFrame().invokeProjectMake();
     assertTrue(result.isBuildSuccessful());
   }
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 48f0e314973..3b83f68360d 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
@@ -79,8 +79,10 @@ public class JavaDepTest {
 
     ideFrame.getProjectView()
       .selectProjectPane()
-      .clickPath(RIGHT_BUTTON, "App", "app")
-      .openFromMenu(ProjectStructureDialogFixture.Companion::find, "Open Module Settings");
+      .clickPath(RIGHT_BUTTON, "App", "app");
+
+    guiTest.waitForBackgroundTasks();
+    ideFrame.invokeMenuPath("Open Module Settings");
 
     ProjectStructureDialogFixture dialogFixture = ProjectStructureDialogFixture.Companion.find(ideFrame);
     DependenciesPerspectiveConfigurableFixture dependenciesFixture =