disable UI DSL test on Window since no separate TC build configuration for Windows

This commit is contained in:
Vladimir Krivosheev
2018-10-10 08:48:08 +02:00
parent b364143f5a
commit c5e060df17
2 changed files with 3 additions and 4 deletions
@@ -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")
@@ -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()) {