Add JOGL SWT GLCanvas unit test

3 files changed, 189 insertions, 4 deletions

diff --git a/etc/profile.jogl b/etc/profile.jogl
index 86eeb60b8..1177aaa49 100755
--- a/etc/profile.jogl
+++ b/etc/profile.jogl
@@ -35,6 +35,7 @@ JOGL_TEST="jogl.test.jar"
 JOGL_JAR_ALL="jogl.all.jar"
 JOGL_JAR_ALL_NOAWT="jogl.all-noawt.jar"
 JOGL_JAR_ALL_MOBILE="jogl.all-mobile.jar"
+JOGL_JAR_SWT="atomic/jogl.swt.jar"
 
 JOGL_LIB_ALL="libnativewindow_x11.so libnativewindow_awt.so libjogl_desktop.so libjogl_mobile.so libjogl_cg.so libnewt.so"
 JOGL_LIB_ALL_NOAWT="libnativewindow_x11.so libjogl_desktop.so libjogl_mobile.so libjogl_cg.so libnewt.so"
@@ -76,7 +77,8 @@ export JOGL_LIB_DIR
 JOGL_ALL_AWT_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL $JOGL_TEST)
 JOGL_ALL_NOAWT_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL_NOAWT $JOGL_TEST)
 JOGL_MOBILE_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_ALL_MOBILE)
-export JOGL_ALL_AWT_CLASSPATH JOGL_ALL_NOAWT_CLASSPATH JOGL_MOBILE_CLASSPATH
+JOGL_SWT_CLASSPATH=$(concat_jogl_list $JOGL_BUILD_DIR $JOGL_JAR_SWT)
+export JOGL_ALL_AWT_CLASSPATH JOGL_ALL_NOAWT_CLASSPATH JOGL_MOBILE_CLASSPATH JOGL_SWT_CLASSPATH
 
 if [ ! -z "$JOGL_PROFILE" ] ; then
     case "$JOGL_PROFILE" in
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 9667fdcd2..fb9c4c410 100755
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -56,7 +56,7 @@ function jrun() {
     #D_ARGS="-Dnewt.debug.MainThread"
     #D_ARGS="-Djogl.debug=all -Dnativewindow.debug=all"
     #D_ARGS="-Djogl.debug=all"
-    D_ARGS="-Djogl.debug.GLCanvas -Djogl.debug.Animator -Djogl.debug.GLDrawable -Djogl.debug.GLContext -Djogl.debug.GLContext.TraceSwitch"
+    #D_ARGS="-Djogl.debug.GLCanvas -Djogl.debug.Animator -Djogl.debug.GLDrawable -Djogl.debug.GLContext -Djogl.debug.GLContext.TraceSwitch"
     #D_ARGS="-Djogl.debug.GLContext -Djogl.debug.ExtensionAvailabilityCache"
     #D_ARGS="-Djogl.debug.GLContext -Djogl.debug.GLProfile -Djogl.debug.GLDrawable"
     #D_ARGS="-Djogl.debug.GLProfile"
@@ -125,9 +125,12 @@ function jrun() {
         X_ARGS="-Djava.awt.headless=false"
     else
         export CLASSPATH=$JOGAMP_ALL_NOAWT_CLASSPATH
-        echo CLASSPATH $CLASSPATH
         X_ARGS="-Djava.awt.headless=true"
     fi
+    if [ $swton -eq 1 ] ; then
+        export CLASSPATH=$CLASSPATH:$JOGL_SWT_CLASSPATH
+    fi
+    echo CLASSPATH $CLASSPATH
     if [ $MOSX_MT -eq 1 ] ; then
         X_ARGS="-XstartOnFirstThread $X_ARGS"
         if [ $swton -eq 0 ] ; then
@@ -241,11 +244,13 @@ function testswt() {
 #
 #testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWT01GLn $*
 #testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWT02GLn $*
+#testswt com.jogamp.opengl.test.junit.jogl.swt.TestSWTGLCanvas01GLn $*
+testawt com.jogamp.opengl.test.junit.jogl.swt.TestSWTGLCanvas01GLn $*
 
 #
 # newt.awt (testawt)
 #
-testawt com.jogamp.opengl.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411
+#testawt com.jogamp.opengl.test.junit.jogl.newt.TestSwingAWTRobotUsageBeforeJOGLInitBug411
 #testawt com.jogamp.opengl.test.junit.jogl.demos.gl2.newt.TestGearsNewtAWTWrapper
 #testawt com.jogamp.opengl.test.junit.newt.TestEventSourceNotAWTBug
 #testawt com.jogamp.opengl.test.junit.newt.TestFocus01SwingAWTRobot $*
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTGLCanvas01GLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTGLCanvas01GLn.java
new file mode 100644
index 000000000..0956788a6
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTGLCanvas01GLn.java
@@ -0,0 +1,178 @@
+/**

+ * 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.swt;

+

+import javax.media.opengl.GLAutoDrawable;

+import javax.media.opengl.GLCapabilities;

+import javax.media.opengl.GLCapabilitiesImmutable;

+import javax.media.opengl.GLEventListener;

+import javax.media.opengl.GLProfile;

+

+import org.eclipse.swt.SWT;

+import org.eclipse.swt.layout.FillLayout;

+import org.eclipse.swt.widgets.Composite;

+import org.eclipse.swt.widgets.Display;

+import org.eclipse.swt.widgets.Shell;

+

+import org.junit.Assert;

+import org.junit.Assume;

+import org.junit.Before;

+import org.junit.BeforeClass;

+import org.junit.After;

+import org.junit.Test;

+

+import com.jogamp.opengl.swt.GLCanvas;

+import com.jogamp.opengl.test.junit.jogl.demos.gl2.OneTriangle;

+import com.jogamp.opengl.test.junit.util.UITestCase;

+

+/**

+ * Tests that a basic SWT app can open without crashing under different GL profiles.

+ * <p> 

+ * Uses JOGL's new SWT GLCanvas.

+ * </p>

+ * @author Wade Walker, et.al.

+ */

+public class TestSWTGLCanvas01GLn extends UITestCase {

+

+    static int duration = 250;

+

+    static final int iwidth = 640;

+    static final int iheight = 480;

+

+    Display display = null;

+    Shell shell = null;

+    Composite composite = null;

+

+    @BeforeClass

+    public static void startup() {

+        System.out.println( "GLProfile " + GLProfile.glAvailabilityToString() );

+    }

+

+    @Before

+    public void init() {

+        display = new Display();

+        Assert.assertNotNull( display );

+        shell = new Shell( display );

+        Assert.assertNotNull( shell );

+        shell.setLayout( new FillLayout() );

+        composite = new Composite( shell, SWT.NONE );

+        composite.setLayout( new FillLayout() );

+        Assert.assertNotNull( composite );

+    }

+

+    @After

+    public void release() {

+        Assert.assertNotNull( display );

+        Assert.assertNotNull( shell );

+        Assert.assertNotNull( composite );

+        try {

+            composite.dispose();

+            shell.dispose();

+            display.dispose();

+        }

+        catch( Throwable throwable ) {

+            throwable.printStackTrace();

+            Assume.assumeNoException( throwable );

+        }

+        display = null;

+        shell = null;

+        composite = null;

+    }

+

+    protected void runTestAGL( GLProfile glprofile ) throws InterruptedException {

+        // need SWT.NO_BACKGROUND to prevent SWT from clearing the window

+        // at the wrong times (we use glClear for this instead)

+        final GLCapabilitiesImmutable caps = new GLCapabilities( glprofile );

+        

+        final GLCanvas canvas = new GLCanvas( composite, SWT.NO_BACKGROUND, caps, null, null);

+        Assert.assertNotNull( canvas );

+

+        canvas.addGLEventListener(new GLEventListener() {

+           public void init(final GLAutoDrawable drawable) { }

+           public void reshape(final GLAutoDrawable drawable, final int x, final int y, final int width, final int height) {

+                OneTriangle.setup( drawable.getGL().getGL2(), width, height );

+           }                 

+           public void display(final GLAutoDrawable drawable) {

+                OneTriangle.render( drawable.getGL().getGL2(), drawable.getWidth(), drawable.getHeight());

+           }

+           public void dispose(final GLAutoDrawable drawable) {}         

+        });

+       

+        shell.setText( getClass().getName() );

+        shell.setSize( 640, 480 );

+        shell.open();

+

+        long lStartTime = System.currentTimeMillis();

+        long lEndTime = lStartTime + duration;

+        try {

+            while( (System.currentTimeMillis() < lEndTime) && !canvas.isDisposed() ) {

+                if( !display.readAndDispatch() ) {

+                    // blocks on linux .. display.sleep();

+                    Thread.sleep(10);

+                }

+            }

+        } catch( Throwable throwable ) {

+            throwable.printStackTrace();

+            Assume.assumeNoException( throwable );

+        }

+        canvas.dispose();

+    }

+

+    @Test

+    public void testA01GLDefault() throws InterruptedException {

+        GLProfile glprofile = GLProfile.getDefault();

+        System.out.println( "GLProfile Default: " + glprofile );

+        runTestAGL( glprofile );

+    }

+

+    @Test

+    public void test02GL2() throws InterruptedException {

+        GLProfile glprofile = GLProfile.get(GLProfile.GL2);

+        System.out.println( "GLProfile GL2: " + glprofile );

+        runTestAGL( glprofile );

+    }

+

+    static int atoi(String a) {

+        int i=0;

+        try {

+            i = Integer.parseInt(a);

+        } catch (Exception ex) { ex.printStackTrace(); }

+        return i;

+    }

+

+    public static void main(String args[]) {

+        for(int i=0; i<args.length; i++) {

+            if(args[i].equals("-time")) {

+                duration = atoi(args[++i]);

+            }

+        }

+        System.out.println("durationPerTest: "+duration);

+        org.junit.runner.JUnitCore.main(TestSWTGLCanvas01GLn.class.getName());

+    }

+}