From a78694e9be944aad97fc5d56db7705dc0cb44e99 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Wed, 21 Dec 2016 18:22:34 +0300
Subject: [PATCH] Test fix: spring test for gutter

---
 .../tests/gutter/AbstractSpringClassAnnotatorTest.kt      | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt
index 3da7ba81172..700b20efe15 100644
--- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/gutter/AbstractSpringClassAnnotatorTest.kt
@@ -63,11 +63,13 @@ abstract class AbstractSpringClassAnnotatorTest : KotlinLightCodeInsightFixtureT
             }
 
             val fileName = config.getString("file")
-            val gutterMark = myFixture.findGutter(fileName)!!
-
             val iconName = config.getString("icon")
             val icon = SpringApiIcons::class.java.getField(iconName)[null]
-            assert(gutterMark.icon == icon)
+
+            val gutterMark = myFixture.findGutter(fileName)!!.let {
+                if (it.icon == icon) it
+                else myFixture.findGuttersAtCaret().first { it.icon == icon }
+            }
 
             val tooltip = config.getString("tooltip")
             assert(gutterMark.tooltipText == tooltip)
-- 
GitLab