test: attempt to test macOS+JRE8+GUI only class

JMRI · Jun 28, 2020 · 93568b0 · 93568b0
1 parent ccbcbd3
commit 93568b0
Showing 1 changed file with 15 additions and 15 deletions.
diff --git a/java/test/jmri/plaf/macosx/EawtApplicationTest.java b/java/test/jmri/plaf/macosx/EawtApplicationTest.java
@@ -1,14 +1,14 @@
 package jmri.plaf.macosx;
 
-import static org.assertj.core.api.Assertions.assertThat;
-
-import java.awt.Desktop;
 import java.awt.GraphicsEnvironment;
 
-import jmri.util.SystemType;
-
-import org.junit.Assume;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatCode;
+import static org.assertj.core.api.Assumptions.assumeThat;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.*;
+import static org.junit.jupiter.api.condition.JRE.*;
+import static org.junit.jupiter.api.condition.OS.MAC;
 
 /**
  * Tests for the EawtApplication class
@@ -18,25 +18,25 @@
 public class EawtApplicationTest {
 
     @Test
+    @EnabledOnOs(MAC)
+    @EnabledOnJre(JAVA_8)
     public void testCtorMacOSXandJDK8() {
-        Assume.assumeFalse(GraphicsEnvironment.isHeadless());
-        Assume.assumeTrue(SystemType.isMacOSX());
-        Assume.assumeFalse(Desktop.getDesktop().isSupported(Desktop.Action.valueOf("APP_ABOUT")));
+        assumeThat(GraphicsEnvironment.isHeadless()).isFalse();
         assertThat(new EawtApplication()).isNotNull();
     }
 
     @Test
+    @EnabledOnOs(MAC)
+    @EnabledForJreRange(min = JAVA_9)
     public void testCtorMacOSXandJDK9plus() {
-        Assume.assumeFalse(GraphicsEnvironment.isHeadless());
-        Assume.assumeTrue(SystemType.isMacOSX());
-        Assume.assumeTrue(Desktop.getDesktop().isSupported(Desktop.Action.valueOf("APP_ABOUT")));
-        assertThat(new EawtApplication()).isNotNull();
+        assumeThat(GraphicsEnvironment.isHeadless()).isFalse();
+        assertThatCode(() -> new EawtApplication()).isInstanceOf(NoClassDefFoundError.class);
     }
 
     @Test
+    @DisabledOnOs(MAC)
     public void testCtorNotMacOSX() {
-        Assume.assumeFalse(SystemType.isMacOSX());
-        assertThat(new EawtApplication()).isNotNull();
+        assertThatCode(() -> new EawtApplication()).isInstanceOf(RuntimeException.class);
     }
 
 }