Bug 1150 - Fix unit tests: Use same definition as in GLProfile for 'disableOpenGLARBContext', i.e. exclude OSX

Also add 'TestGLProfileXXNEWTPost',
run w/o any properties after TestGLProfile*NoARBCtx
to be sure follow-up unit tests are tested under default conditions.

2 files changed, 70 insertions, 2 deletions

diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLProfile0XBase.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLProfile0XBase.java
index 00508bc08..7fd3488ba 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLProfile0XBase.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/GLProfile0XBase.java
@@ -42,6 +42,7 @@ import org.junit.Assert;
 import org.junit.FixMethodOrder;
 import org.junit.runners.MethodSorters;
 
+import com.jogamp.common.os.Platform;
 import com.jogamp.newt.opengl.GLWindow;
 import com.jogamp.opengl.JoglVersion;
 import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
@@ -875,7 +876,9 @@ public abstract class GLProfile0XBase extends UITestCase {
 
         glWindow.display();
         Thread.sleep(100);
-        final boolean disableOpenGLARBContext = null != System.getProperty("jogl.disable.openglarbcontext");
+        // Same definition as in GLProfile for 'disableOpenGLARBContext'
+        final boolean isOSX = Platform.OSType.MACOS == Platform.getOSType();
+        final boolean disableOpenGLARBContext = null != System.getProperty("jogl.disable.openglarbcontext") && !isOSX;
         if( disableOpenGLARBContext ) {
             Assert.assertFalse("Property 'jogl.disable.openglarbcontext' set, but created w/ ARB",
                                glWindow.getContext().isCreatedWithARBMethod());
@@ -910,7 +913,9 @@ public abstract class GLProfile0XBase extends UITestCase {
         });
         glad.display();
         Thread.sleep(100);
-        final boolean disableOpenGLARBContext = null != System.getProperty("jogl.disable.openglarbcontext");
+        // Same definition as in GLProfile for 'disableOpenGLARBContext'
+        final boolean isOSX = Platform.OSType.MACOS == Platform.getOSType();
+        final boolean disableOpenGLARBContext = null != System.getProperty("jogl.disable.openglarbcontext") && !isOSX;
         if( disableOpenGLARBContext ) {
             Assert.assertFalse("Property 'jogl.disable.openglarbcontext' set, but created w/ ARB",
                                glad.getContext().isCreatedWithARBMethod());
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfileXXNEWTPost.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfileXXNEWTPost.java
new file mode 100644
index 000000000..e185eee0a
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfileXXNEWTPost.java
@@ -0,0 +1,63 @@
+/**
+ * Copyright 2010 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ *
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ *
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ *
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ *
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+
+package com.jogamp.opengl.test.junit.jogl.acore;
+
+import java.io.IOException;
+
+import com.jogamp.opengl.GLCapabilities;
+import com.jogamp.opengl.GLCapabilitiesImmutable;
+import com.jogamp.opengl.GLProfile;
+
+import org.junit.FixMethodOrder;
+import org.junit.Test;
+import org.junit.runners.MethodSorters;
+
+/**
+ * Simply re-test w/o any properties after TestGLProfile*NoARBCtx
+ * to be sure follow-up unit tests are tested under default conditions.
+ */
+@FixMethodOrder(MethodSorters.NAME_ASCENDING)
+public class TestGLProfileXXNEWTPost extends GLProfile0XBase {
+
+    @Test
+    public void test01GLProfileDefault() throws InterruptedException {
+        System.out.println("GLProfile "+GLProfile.glAvailabilityToString());
+        System.out.println("GLProfile.getDefaultDevice(): "+GLProfile.getDefaultDevice());
+        final GLProfile glp = GLProfile.getDefault();
+        System.out.println("GLProfile.getDefault(): "+glp);
+        final GLCapabilitiesImmutable caps = new GLCapabilities(glp);
+        validateOnlineOffscreen("default", caps);
+    }
+
+    public static void main(final String args[]) throws IOException {
+        final String tstname = TestGLProfileXXNEWTPost.class.getName();
+        org.junit.runner.JUnitCore.main(tstname);
+    }
+
+}