From d860824f18ab05cbc58ad6ed4aebad3afc0fc8a0 Mon Sep 17 00:00:00 2001 From: Vladimir Krivosheev Date: Mon, 9 Apr 2018 16:11:58 +0200 Subject: [PATCH] =?UTF-8?q?UI=20tests=20=E2=80=94=20more=20clear=20`assume?= =?UTF-8?q?`=20message=20and=20condition?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../platform-tests/testSrc/com/intellij/ui/laf/LafTest.kt | 5 +++-- .../testSrc/com/intellij/ui/layout/UiDslTest.kt | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/platform/platform-tests/testSrc/com/intellij/ui/laf/LafTest.kt b/platform/platform-tests/testSrc/com/intellij/ui/laf/LafTest.kt index 972d1741a255..d2aaa2e4231f 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/laf/LafTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/ui/laf/LafTest.kt @@ -48,8 +48,9 @@ class LafTest { @Before fun beforeMethod() { - assumeTrue("Not CI server or not Linux", !UsefulTestCase.IS_UNDER_TEAMCITY || !SystemInfoRt.isLinux) - assumeTrue("Not Windows or Windows 10", !SystemInfoRt.isWindows || SystemInfo.isWin10OrNewer) + if (UsefulTestCase.IS_UNDER_TEAMCITY) { + assumeTrue("macOS or Windows 10 are required", SystemInfoRt.isMac || SystemInfo.isWin10OrNewer) + } changeLafIfNeed(lafName) } 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 d5500e055039..9cced38c1f79 100644 --- a/platform/platform-tests/testSrc/com/intellij/ui/layout/UiDslTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/ui/layout/UiDslTest.kt @@ -47,8 +47,9 @@ class UiDslTest { @Before fun beforeMethod() { - assumeTrue("Not CI server or not Linux", !UsefulTestCase.IS_UNDER_TEAMCITY || !SystemInfoRt.isLinux) - assumeTrue("Not Windows or Windows 10", !SystemInfoRt.isWindows || SystemInfo.isWin10OrNewer) + if (UsefulTestCase.IS_UNDER_TEAMCITY) { + assumeTrue("macOS or Windows 10 are required", SystemInfoRt.isMac || SystemInfo.isWin10OrNewer) + } System.setProperty("idea.ui.comment.copyable", "false") changeLafIfNeed(lafName)