From 592be88cbd95424743411893c5cc4e6cc1da653d Mon Sep 17 00:00:00 2001 From: nik Date: Wed, 3 Jun 2015 22:02:05 +0300 Subject: [PATCH] ignore JavaFX tests on Mac properly --- .../javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java | 6 +++--- .../plugins/javaFX/fxml/JavaFXHighlightingTest.java | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java index 82d6587ffce9..cd35b387d6eb 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXCollapseSubtagToAttributeTest.java @@ -31,9 +31,9 @@ import java.util.List; public class JavaFXCollapseSubtagToAttributeTest extends DaemonAnalyzerTestCase { @Override - protected void setUp() throws Exception { - super.setUp(); - Assume.assumeFalse(SystemInfo.isMac); + protected void runTest() throws Throwable { + Assume.assumeFalse(SystemInfo.isLinux); + super.runTest(); } @Override diff --git a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java index 30d55c65297a..0003739f1c66 100644 --- a/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java +++ b/plugins/javaFX/javaFX-CE/testSrc/org/jetbrains/plugins/javaFX/fxml/JavaFXHighlightingTest.java @@ -32,9 +32,9 @@ import org.junit.Assume; */ public class JavaFXHighlightingTest extends AbstractJavaFXTestCase { @Override - protected void setUp() throws Exception { - super.setUp(); - Assume.assumeFalse(SystemInfo.isMac); + protected void runTest() throws Throwable { + Assume.assumeFalse(SystemInfo.isLinux); + super.runTest(); } public void testLoginForm() throws Exception {