changeset 10844:1438734a46e3

8196802: 3D unit tests listed as pass although they are actually skipped Reviewed-by: kcr
author rkamath
date Sat, 17 Feb 2018 08:47:36 -0800
parents 03d6c4487f90
children 808d535c4e15
files tests/system/src/test/java/test/robot/test3d/AABalanceFlipTest.java tests/system/src/test/java/test/robot/test3d/MeshCompareTest.java tests/system/src/test/java/test/robot/test3d/NearAndFarClipTest.java tests/system/src/test/java/test/robot/test3d/RT35019Test.java tests/system/src/test/java/test/robot/test3d/Snapshot3DTest.java tests/system/src/test/java/test/robot/test3d/TriangleMeshPNTValidationTest.java tests/system/src/test/java/test/robot/test3d/TriangleMeshValidationTest.java
diffstat 7 files changed, 71 insertions(+), 206 deletions(-) [+]
line wrap: on
line diff
--- a/tests/system/src/test/java/test/robot/test3d/AABalanceFlipTest.java	Fri Feb 16 16:16:52 2018 -0800
+++ b/tests/system/src/test/java/test/robot/test3d/AABalanceFlipTest.java	Sat Feb 17 08:47:36 2018 -0800
@@ -40,9 +40,12 @@
 import javafx.scene.shape.MeshView;
 import javafx.scene.shape.TriangleMesh;
 import javafx.stage.Stage;
+import org.junit.Before;
 import org.junit.Test;
 import test.robot.testharness.VisualTestBase;
 
+import static org.junit.Assume.assumeTrue;
+
 public class AABalanceFlipTest extends VisualTestBase {
 
     private Stage testStage;
@@ -52,6 +55,11 @@
 
     WritableImage selfIllumMap;
 
+    @Before
+    public void setupEach() {
+        assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
+    }
+
     @Test(timeout = 5000)
     public void testAABalanceFlip() {
         final int WIDTH = 600;
@@ -75,13 +83,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
-
             Color color;
             Color blackColor = new Color(0, 0, 0, 1);
             Color whiteColor = new Color(1, 1, 1, 1);
--- a/tests/system/src/test/java/test/robot/test3d/MeshCompareTest.java	Fri Feb 16 16:16:52 2018 -0800
+++ b/tests/system/src/test/java/test/robot/test3d/MeshCompareTest.java	Sat Feb 17 08:47:36 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -28,7 +28,6 @@
 import com.sun.javafx.geom.Vec3f;
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.concurrent.atomic.AtomicBoolean;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.scene.AmbientLight;
@@ -46,11 +45,14 @@
 import javafx.scene.shape.TriangleMesh;
 import javafx.scene.shape.VertexFormat;
 import javafx.stage.Stage;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import test.robot.testharness.VisualTestBase;
 
+import static org.junit.Assume.assumeTrue;
+
 /**
  * 3D Snapshot validation tests.
  */
@@ -291,20 +293,17 @@
         assertColorEquals(exColor, sColor, TOLERANCE);
     }
 
+    @Before
+    public void setupEach() {
+        assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
+    }
+
     // -------------------------------------------------------------
     // Tests
     // -------------------------------------------------------------
 
     @Test(timeout=5000)
     public void testSnapshot3D() {
-        final AtomicBoolean scene3dSupported = new AtomicBoolean();
-        runAndWait(() -> scene3dSupported.set(Platform.isSupported(ConditionalFeature.SCENE3D)));
-        if (!scene3dSupported.get()) {
-            System.out.println("*************************************************************");
-            System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-            System.out.println("*************************************************************");
-            return;
-        }
 
         runAndWait(() -> {
             testStage = getStage();
--- a/tests/system/src/test/java/test/robot/test3d/NearAndFarClipTest.java	Fri Feb 16 16:16:52 2018 -0800
+++ b/tests/system/src/test/java/test/robot/test3d/NearAndFarClipTest.java	Sat Feb 17 08:47:36 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -33,9 +33,12 @@
 import javafx.scene.paint.Color;
 import javafx.scene.shape.Rectangle;
 import javafx.stage.Stage;
+import org.junit.Before;
 import org.junit.Test;
 import test.robot.testharness.VisualTestBase;
 
+import static org.junit.Assume.assumeTrue;
+
 /**
  * Basic visual near and far clipping tests using glass Robot to sample pixels.
  */
@@ -47,6 +50,11 @@
     private static final double TOLERANCE = 0.07;
     private static final double OFFSET_PERCENT = 0.01; // 1 percent tolerance
 
+    @Before
+    public void setupEach() {
+        assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
+    }
+
     @Test(timeout=5000)
     public void testNearAndFarClips() {
         final int WIDTH = 500;
@@ -118,13 +126,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
-
             Color color;
             // Verify Near Clip
             color = getColor(testScene, WIDTH / 2, HEIGHT / 2);
--- a/tests/system/src/test/java/test/robot/test3d/RT35019Test.java	Fri Feb 16 16:16:52 2018 -0800
+++ b/tests/system/src/test/java/test/robot/test3d/RT35019Test.java	Sat Feb 17 08:47:36 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2014, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -25,6 +25,8 @@
 
 package test.robot.test3d;
 
+import javafx.application.ConditionalFeature;
+import javafx.application.Platform;
 import javafx.scene.Group;
 import javafx.scene.PerspectiveCamera;
 import javafx.scene.Scene;
@@ -33,9 +35,12 @@
 import javafx.scene.text.Text;
 import javafx.scene.transform.Rotate;
 import javafx.stage.Stage;
+import org.junit.Before;
 import org.junit.Test;
 import test.robot.testharness.VisualTestBase;
 
+import static org.junit.Assume.assumeTrue;
+
 /**
  * Test 2D shapes rendered with a 3D transform where some of the shapes
  * have empty bounds.
@@ -47,6 +52,11 @@
 
     private static final double TOLERANCE = 0.07;
 
+    @Before
+    public void setupEach() {
+        assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
+    }
+
     @Test(timeout=5000)
     public void testEmptyShapes() {
         final int WIDTH = 400;
--- a/tests/system/src/test/java/test/robot/test3d/Snapshot3DTest.java	Fri Feb 16 16:16:52 2018 -0800
+++ b/tests/system/src/test/java/test/robot/test3d/Snapshot3DTest.java	Sat Feb 17 08:47:36 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -27,7 +27,6 @@
 
 import java.util.ArrayList;
 import java.util.Collection;
-import java.util.concurrent.atomic.AtomicBoolean;
 import javafx.application.ConditionalFeature;
 import javafx.application.Platform;
 import javafx.scene.AmbientLight;
@@ -42,11 +41,14 @@
 import javafx.scene.shape.Shape3D;
 import javafx.scene.shape.Sphere;
 import javafx.stage.Stage;
+import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
 import test.robot.testharness.VisualTestBase;
 
+import static org.junit.Assume.assumeTrue;
+
 /**
  * 3D Snapshot validation tests.
  */
@@ -148,20 +150,17 @@
         assertColorEquals(exColor, sColor, TOLERANCE);
     }
 
+    @Before
+    public void setupEach() {
+        assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
+    }
+
     // -------------------------------------------------------------
     // Tests
     // -------------------------------------------------------------
 
     @Test(timeout=5000)
     public void testSnapshot3D() {
-        final AtomicBoolean scene3dSupported = new AtomicBoolean();
-        runAndWait(() -> scene3dSupported.set(Platform.isSupported(ConditionalFeature.SCENE3D)));
-        if (!scene3dSupported.get()) {
-            System.out.println("*************************************************************");
-            System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-            System.out.println("*************************************************************");
-            return;
-        }
 
         runAndWait(() -> {
             testStage = getStage();
--- a/tests/system/src/test/java/test/robot/test3d/TriangleMeshPNTValidationTest.java	Fri Feb 16 16:16:52 2018 -0800
+++ b/tests/system/src/test/java/test/robot/test3d/TriangleMeshPNTValidationTest.java	Sat Feb 17 08:47:36 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -35,9 +35,12 @@
 import javafx.scene.shape.TriangleMesh;
 import javafx.scene.shape.VertexFormat;
 import javafx.stage.Stage;
+import org.junit.Before;
 import org.junit.Test;
 import test.robot.testharness.VisualTestBase;
 
+import static org.junit.Assume.assumeTrue;
+
 /**
  * Basic TriangleMesh validation tests.
  */
@@ -55,6 +58,11 @@
     private static final int HEIGHT = 800;
     private Color bgColor = Color.rgb(10, 10, 40);
 
+    @Before
+    public void setupEach() {
+        assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
+    }
+
     @Test(timeout = 5000)
     public void testInvalidNormalsLength() {
         runAndWait(() -> {
@@ -74,12 +82,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             // Rendering nothing. Should receive warning from validatePoints
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(bgColor, color, TOLERANCE);
@@ -103,12 +105,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(Color.RED, color, TOLERANCE);
 
@@ -117,12 +113,7 @@
         });
         waitFirstFrame();
         runAndWait(() -> {
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
+
             // Rendering nothing because faces is invalid.
             // Should receive warning from validateFaces
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
@@ -147,12 +138,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             // Rendering 2 Triangles that form a square
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(Color.RED, color, TOLERANCE);
@@ -164,12 +149,6 @@
         });
         waitFirstFrame();
         runAndWait(() -> {
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
 
             Color color = getColor(testScene, WIDTH / 2 + 10, WIDTH / 2 + 10);
             assertColorEquals(Color.BLACK, color, TOLERANCE);
@@ -194,12 +173,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             // Rendering 2 Triangles that form a square
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(Color.RED, color, TOLERANCE);
@@ -215,12 +188,6 @@
         });
         waitFirstFrame();
         runAndWait(() -> {
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
 
             Color color = getColor(testScene, WIDTH / 2 + 10, WIDTH / 2 + 10);
             assertColorEquals(bgColor, color, TOLERANCE);
--- a/tests/system/src/test/java/test/robot/test3d/TriangleMeshValidationTest.java	Fri Feb 16 16:16:52 2018 -0800
+++ b/tests/system/src/test/java/test/robot/test3d/TriangleMeshValidationTest.java	Sat Feb 17 08:47:36 2018 -0800
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2013, 2018, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -36,9 +36,12 @@
 import javafx.scene.shape.MeshView;
 import javafx.scene.shape.TriangleMesh;
 import javafx.stage.Stage;
+import org.junit.Before;
 import org.junit.Test;
 import test.robot.testharness.VisualTestBase;
 
+import static org.junit.Assume.assumeTrue;
+
 /**
  * Basic TriangleMesh validation tests.
  */
@@ -56,6 +59,11 @@
     private static final int HEIGHT = 800;
     private Color bgColor = Color.rgb(10, 10, 40);
 
+    @Before
+    public void setupEach() {
+        assumeTrue(Platform.isSupported(ConditionalFeature.SCENE3D));
+    }
+
     @Test(timeout=5000)
     public void testEmptyMesh() {
         runAndWait(() -> {
@@ -73,12 +81,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             // No warning. Rendering nothing.
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(bgColor, color, TOLERANCE);
@@ -111,12 +113,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             // Rendering nothing. Should receive warning from validatePoints
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(bgColor, color, TOLERANCE);
@@ -145,12 +141,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             // Rendering nothing. Should receive warning from validateTexcoords
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(bgColor, color, TOLERANCE);
@@ -187,12 +177,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             // Rendering nothing. Should receive warning from validateFaces
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(bgColor, color, TOLERANCE);
@@ -228,12 +212,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             // Rendering nothing. Should receive warning from validateFaces
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(bgColor, color, TOLERANCE);
@@ -259,12 +237,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             // Rendering nothing. Should receive warning from validateFacesSmoothingGroups
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(bgColor, color, TOLERANCE);
@@ -288,12 +260,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(Color.RED, color, TOLERANCE);
 
@@ -302,12 +268,7 @@
         });
         waitFirstFrame();
         runAndWait(() -> {
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
+
             // Rendering nothing because faces is invalid.
             // Should receive warning from validateFaces
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
@@ -332,12 +293,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(Color.RED, color, TOLERANCE);
 
@@ -346,12 +301,7 @@
         });
         waitFirstFrame();
         runAndWait(() -> {
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
+
             // Rendering nothing because faces is invalid.
             // Should receive warning from validateFaces
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
@@ -376,12 +326,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             Color color = getColor(testScene, WIDTH / 4, WIDTH / 4);
             assertColorEquals(Color.RED, color, TOLERANCE);
 
@@ -391,12 +335,7 @@
         });
         waitFirstFrame();
         runAndWait(() -> {
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
+
             // Rendering nothing because faceSmoothingGroups is invalid.
             // Should receive warning from validateFacesSmoothingGroups
             Color color = getColor(testScene, WIDTH / 4, WIDTH / 4);
@@ -406,12 +345,7 @@
         });
         waitFirstFrame();
         runAndWait(() -> {
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
+
             // Rendering a triangle
             Color color = getColor(testScene, WIDTH / 4, WIDTH / 4);
             assertColorEquals(Color.RED, color, TOLERANCE);
@@ -436,12 +370,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(Color.RED, color, TOLERANCE);
 
@@ -449,12 +377,7 @@
         });
         waitFirstFrame();
         runAndWait(() -> {
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
+
             // Empty Sm should not affect rendering
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(Color.RED, color, TOLERANCE);
@@ -478,12 +401,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             // Rendering nothing. Should receive warning from validatePoints
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(Color.RED, color, TOLERANCE);
@@ -508,12 +425,7 @@
         });
         waitFirstFrame();
         runAndWait(() -> {
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
+
             Color color = getColor(testScene, WIDTH / 5, WIDTH / 5);
             assertColorEquals(Color.RED, color, TOLERANCE);
         });
@@ -536,12 +448,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             // Rendering 2 Triangles that form a square
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(Color.RED, color, TOLERANCE);
@@ -555,12 +461,6 @@
         });
         waitFirstFrame();
         runAndWait(() -> {
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
 
             // Should render 1 Triangle
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
@@ -588,12 +488,6 @@
         waitFirstFrame();
         runAndWait(() -> {
 
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
             // Rendering 2 Triangles that form a square
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);
             assertColorEquals(Color.RED, color, TOLERANCE);
@@ -609,12 +503,6 @@
         });
         waitFirstFrame();
         runAndWait(() -> {
-            if (!Platform.isSupported(ConditionalFeature.SCENE3D)) {
-                System.out.println("*************************************************************");
-                System.out.println("*      Platform isn't SCENE3D capable, skipping 3D test.    *");
-                System.out.println("*************************************************************");
-                return;
-            }
 
             // Should render 1 Triangle
             Color color = getColor(testScene, WIDTH / 3, WIDTH / 3);