From 7fe3d126a30c3a3a285f7013b3a5d0e5cedc6f98 Mon Sep 17 00:00:00 2001 From: Mari Baburina Date: Mon, 27 Aug 2018 19:28:04 +0300 Subject: [PATCH] [gui-tests] changed checkRunGutterIcons() to checkGutterIcons(), now accepting different icons --- .../testGuiFramework/impl/GuiTestCaseExt.kt | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCaseExt.kt b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCaseExt.kt index 65e5cb09f5a9..292d8540498b 100644 --- a/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCaseExt.kt +++ b/platform/testGuiFramework/src/com/intellij/testGuiFramework/impl/GuiTestCaseExt.kt @@ -207,19 +207,21 @@ fun GuiTestCase.checkProjectIsRun(configuration: String, message: String) { } } -fun GuiTestCase.checkRunGutterIcons(expectedNumberOfRunIcons: Int, expectedRunLines: List) { +fun GuiTestCase.checkGutterIcons(gutterIcon: GutterFixture.GutterIcon, + expectedNumberOfIcons: Int, + expectedLines: List) { ideFrame { - logTestStep("Going to check whether $expectedNumberOfRunIcons `Run` gutter icons are present") + logTestStep("Going to check whether $expectedNumberOfIcons $gutterIcon gutter icons are present") editor { waitUntilFileIsLoaded() waitUntilErrorAnalysisFinishes() - gutter.waitUntilIconsShown(mapOf(GutterFixture.GutterIcon.RUN_SCRIPT to expectedNumberOfRunIcons)) - val gutterRunLines = gutter.linesWithGutterIcon(GutterFixture.GutterIcon.RUN_SCRIPT) + gutter.waitUntilIconsShown(mapOf(gutterIcon to expectedNumberOfIcons)) + val gutterLinesWithIcon = gutter.linesWithGutterIcon(gutterIcon) val contents = this@editor.getCurrentFileContents(false)?.lines() ?: listOf() - for ((index, line) in gutterRunLines.withIndex()) { + for ((index, line) in gutterLinesWithIcon.withIndex()) { // line numbers start with 1, but index in the contents list starts with 0 val currentLine = contents[line - 1] - val expectedLine = expectedRunLines[index] + val expectedLine = expectedLines[index] assert(currentLine.contains(expectedLine)) { "At line #$line the actual text is `$currentLine`, but it was expected `$expectedLine`" }