From b3cc3bcce5beb541ed86474fbd2009b4c7018088 Mon Sep 17 00:00:00 2001 From: Sergey Karashevich Date: Mon, 26 Mar 2018 23:20:42 +0300 Subject: [PATCH] [gui-test] turn on ReplaceInPathFocusTest#testReplaceInPathFocus regression test for IDEA-188229 --- .../community/focus/ReplaceInPathFocusTest.kt | 31 ++++++------------- 1 file changed, 9 insertions(+), 22 deletions(-) diff --git a/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/focus/ReplaceInPathFocusTest.kt b/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/focus/ReplaceInPathFocusTest.kt index 5168d29e19d3..93b6d7abf0cc 100644 --- a/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/focus/ReplaceInPathFocusTest.kt +++ b/community-guitests/testSrc/com/intellij/testGuiFramework/tests/community/focus/ReplaceInPathFocusTest.kt @@ -1,7 +1,6 @@ // Copyright 2000-2018 JetBrains s.r.o. Use of this source code is governed by the Apache 2.0 license that can be found in the LICENSE file. package com.intellij.testGuiFramework.tests.community.focus -import com.intellij.ide.IdeBundle import com.intellij.testGuiFramework.fixtures.IdeFrameFixture import com.intellij.testGuiFramework.impl.GuiTestCase import com.intellij.testGuiFramework.tests.community.CommunityProjectCreator @@ -9,16 +8,14 @@ import com.intellij.testGuiFramework.util.Key import com.intellij.testGuiFramework.util.Key.R import com.intellij.testGuiFramework.util.Modifier.* import com.intellij.testGuiFramework.util.plus -import org.fest.swing.exception.ComponentLookupException -import org.fest.swing.exception.WaitTimedOutError import org.fest.swing.timing.Pause -import org.junit.Ignore +import org.junit.Assert import org.junit.Test import java.util.concurrent.TimeUnit class ReplaceInPathFocusTest : GuiTestCase() { - /** + /** * Regression test to catch TypeAhead exception during the DumbMode and calling Replace in Path action. * IDEA-188519 * Fixed by f5002ec244eec48c26be78ccbc6cbb1058581d50 @@ -40,33 +37,23 @@ class ReplaceInPathFocusTest : GuiTestCase() { * IDEA-188229 * Fixed by 6bd20c4a483a78713c08e426316d29d3cfd1f6a5 */ - @Test @Ignore + @Test fun testReplaceInPathFocus() { CommunityProjectCreator.importCommandLineAppAndOpenMain() Pause.pause(1000) ideFrame { replaceInPath() - chooseBaseClassIfNeeded() typeText("main") shortcut(Key.TAB) typeText("test") button("Replace All").click() - Pause.pause(30, TimeUnit.SECONDS) - } - } - - - private fun GuiTestCase.chooseBaseClassIfNeeded() { - try { - val dialogFixture = dialog(IdeBundle.message("prompt.choose.base.class.of.the.hierarchy"), false, 10L) - //this dialog could not close after some Cancel clicks - var attemptsToCancelDialog = 10 - while (dialogFixture.target().isShowing && --attemptsToCancelDialog > 0) { - dialogFixture.button("Cancel").click() - Pause.pause(2000) + message("Replace All") { + button("Replace").click() } - if (attemptsToCancelDialog == 0) throw WaitTimedOutError("Unable to close ${dialogFixture.target().title} in $attemptsToCancelDialog attempts") - } catch (cle: ComponentLookupException) { /*do nothing here */ } + Pause.pause(1000) + val editorCode = editor.getCurrentFileContents(false) ?: throw Exception("Unable to get editor's content") + Assert.assertTrue("Editor shouldn't contain 'main' after replacement in path: Editor's content \n $editorCode", !editorCode.contains("main")) + } } private fun replaceInPath() {