summaryrefslogtreecommitdiff
path: root/android-uitests
diff options
context:
space:
mode:
authorVihasith Patnana <vihasith@google.com>2022-06-24 15:59:10 -0700
committerVihasith Patnana <vihasith@google.com>2022-06-25 00:19:06 +0000
commited1626faa846568de0a1cc03817024feecc29e1d (patch)
tree4b45f4439d82c93d4e04be699d23c6a9626ae86f /android-uitests
parent57b10bca4a9cacc3c1b77a89e88d86a36c44e4d6 (diff)
downloadidea-ed1626faa846568de0a1cc03817024feecc29e1d.tar.gz
Fix JavaToKotlin test issue in the UI tests in Fast
Increased dynamic wait times Bug: 217805224 Test: JavaToKotlinConversionTest - https://fusion2.corp.google.com/invocations/8849029d-a99c-4814-add8-a31068b54167 Change-Id: If6f34b3c51c602f3578059b32c5c07bb36852a01
Diffstat (limited to 'android-uitests')
-rw-r--r--android-uitests/testSrc/com/android/tools/idea/tests/gui/kotlin/JavaToKotlinConversionTest.java11
1 files changed, 8 insertions, 3 deletions
diff --git a/android-uitests/testSrc/com/android/tools/idea/tests/gui/kotlin/JavaToKotlinConversionTest.java b/android-uitests/testSrc/com/android/tools/idea/tests/gui/kotlin/JavaToKotlinConversionTest.java
index 04489dd08ff..e33546dba60 100644
--- a/android-uitests/testSrc/com/android/tools/idea/tests/gui/kotlin/JavaToKotlinConversionTest.java
+++ b/android-uitests/testSrc/com/android/tools/idea/tests/gui/kotlin/JavaToKotlinConversionTest.java
@@ -84,6 +84,7 @@ public class JavaToKotlinConversionTest {
//Need to add gradle wait time
guiTest.waitForBackgroundTasks();
+ //Changing Kotlin version according to build file
ConversionTestUtil.changeKotlinVersionForSimpleApplication(guiTest);
// Doing it twice because after the first time we have only added Kotlin support to the project
@@ -95,20 +96,24 @@ public class JavaToKotlinConversionTest {
* this conversion. Do you want to find such code and correct it too?'
*/
DialogFixture convertCodeFromJavaDialog = findDialog(withTitle("Convert Java to Kotlin"))
- .withTimeout(SECONDS.toMillis(120)).using(guiTest.robot());
+ .withTimeout(SECONDS.toMillis(300)).using(guiTest.robot());
convertCodeFromJavaDialog.button(withText("Yes")).click();
+ guiTest.waitForBackgroundTasks();
+
EditorFixture editor = ideFrameFixture.getEditor();
- Wait.seconds(20).expecting("Wait for kt file is generated.")
+ Wait.seconds(60).expecting("Wait for kt file is generated.")
.until(() -> "MyActivity.kt".equals(editor.getCurrentFileName()));
assertThat(editor.getCurrentFileContents()).contains("class MyActivity : Activity() {");
ideFrameFixture.requestProjectSyncAndWaitForSyncToFinish();
- ideFrameFixture.invokeAndWaitForBuildAction(Wait.seconds(240), "Build", "Rebuild Project");
+ guiTest.waitForBackgroundTasks();
+
+ ideFrameFixture.invokeAndWaitForBuildAction(Wait.seconds(300), "Build", "Rebuild Project");
}
private static void openJavaAndPressConvertToKotlin(@NotNull IdeFrameFixture ideFrameFixture) {