From c5e060df17c1538f57ea8b7b6cdbc16f5185cdcf Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Wed, 10 Oct 2018 08:47:21 +0200
Subject: [PATCH] disable UI DSL test on Window since no separate TC build
 configuration for Windows

---
 .../testSrc/com/intellij/ui/layout/UiDslTest.kt               | 4 ++--
 platform/platform-tests/testSrc/com/intellij/ui/uiTestUtil.kt | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/platform/platform-tests/testSrc/com/intellij/ui/layout/UiDslTest.kt b/platform/platform-tests/testSrc/com/intellij/ui/layout/UiDslTest.kt
index 54adb1766fe8..cf9f22350d89 100644
--- a/platform/platform-tests/testSrc/com/intellij/ui/layout/UiDslTest.kt
+++ b/platform/platform-tests/testSrc/com/intellij/ui/layout/UiDslTest.kt
@@ -2,7 +2,6 @@
 package com.intellij.ui.layout
 
 import com.intellij.openapi.application.invokeAndWaitIfNeed
-import com.intellij.openapi.util.SystemInfo
 import com.intellij.openapi.util.SystemInfoRt
 import com.intellij.testFramework.PlatformTestUtil
 import com.intellij.testFramework.UsefulTestCase
@@ -47,7 +46,8 @@ class UiDslTest {
   @Before
   fun beforeMethod() {
     if (UsefulTestCase.IS_UNDER_TEAMCITY) {
-      assumeTrue("macOS or Windows 10 are required", SystemInfoRt.isMac || SystemInfo.isWin10OrNewer)
+      // let's for now to see how it is going on macOS
+      assumeTrue("macOS or Windows 10 are required", SystemInfoRt.isMac /* || SystemInfo.isWin10OrNewer */)
     }
 
     System.setProperty("idea.ui.comment.copyable", "false")
diff --git a/platform/platform-tests/testSrc/com/intellij/ui/uiTestUtil.kt b/platform/platform-tests/testSrc/com/intellij/ui/uiTestUtil.kt
index 311ab3ae3ac1..edd01f9e5e6d 100644
--- a/platform/platform-tests/testSrc/com/intellij/ui/uiTestUtil.kt
+++ b/platform/platform-tests/testSrc/com/intellij/ui/uiTestUtil.kt
@@ -31,7 +31,6 @@ import java.awt.Container
 import java.awt.GraphicsEnvironment
 import java.awt.image.BufferedImage
 import java.io.File
-import java.lang.AssertionError
 import java.nio.file.Path
 import javax.swing.AbstractButton
 import javax.swing.JLabel
@@ -207,7 +206,7 @@ internal fun dumpComponentBounds(component: Container): Map<String, IntArray> {
 }
 
 internal fun getComponentKey(c: Component, index: Int): String {
-  if (c is JLabel && c.text.isNotEmpty()) {
+  if (c is JLabel && !c.text.isNullOrEmpty()) {
     return StringUtil.removeHtmlTags(c.text)
   }
   if (c is AbstractButton && c.text.isNotEmpty()) {