From f171a694436b7ef15802f7c3bf805bcdd76d2cf1 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 19 Dec 2011 01:48:44 +0100
Subject: Fix SWT test on OSX 32/64 bit ; Fix TestSWTAWT01GL for OSX

Fix SWT test on OSX 32/64 bit:
  - Pick 32bit SWT for 32bit tests

Fix TestSWTAWT01GL for OSX:
  - Using proper thread for AWT and SWT actions, platform agnostic
    but required for OSX.

  - Enable SWT*AWT* tests on OSX
---
 .../opengl/test/junit/jogl/swt/TestSWT02GLn.java   |  1 -
 .../test/junit/jogl/swt/TestSWTAWT01GLn.java       | 92 ++++++++++++----------
 2 files changed, 52 insertions(+), 41 deletions(-)

(limited to 'src/test')

diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWT02GLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWT02GLn.java
index 84d5f09ef..b8e45dfe1 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWT02GLn.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWT02GLn.java
@@ -38,7 +38,6 @@ import org.eclipse.swt.events.PaintEvent;
 import org.eclipse.swt.events.PaintListener;
 import org.eclipse.swt.graphics.Rectangle;
 import org.eclipse.swt.layout.FillLayout;
-import org.eclipse.swt.opengl.GLCanvas;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Display;
 import org.eclipse.swt.widgets.Event;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAWT01GLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAWT01GLn.java
index 595e6fb31..6139d816a 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAWT01GLn.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAWT01GLn.java
@@ -29,6 +29,7 @@
 package com.jogamp.opengl.test.junit.jogl.swt;
 
 import java.awt.Frame;
+import java.lang.reflect.InvocationTargetException;
 
 import javax.media.opengl.GL2;
 import javax.media.opengl.GLAutoDrawable;
@@ -37,6 +38,8 @@ import javax.media.opengl.GLEventListener;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLCanvas;
 
+import jogamp.nativewindow.swt.SWTAccessor;
+
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.awt.SWT_AWT;
 import org.eclipse.swt.graphics.Rectangle;
@@ -76,46 +79,47 @@ public class TestSWTAWT01GLn extends UITestCase {
     }
 
     @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.EMBEDDED | SWT.NO_BACKGROUND );
-        composite.setLayout( new FillLayout() );
-        Assert.assertNotNull( composite );
-        frame = SWT_AWT.new_Frame( composite );
-        Assert.assertNotNull( frame );
+    public void init() throws InterruptedException, InvocationTargetException {
+        SWTAccessor.invoke(true, new Runnable() {
+            public void run() {        
+                display = new Display();
+                Assert.assertNotNull( display );
+                shell = new Shell( display );
+                Assert.assertNotNull( shell );
+                shell.setLayout( new FillLayout() );
+                composite = new Composite( shell, SWT.EMBEDDED | SWT.NO_BACKGROUND );
+                composite.setLayout( new FillLayout() );
+                Assert.assertNotNull( composite );
+                frame = SWT_AWT.new_Frame( composite );
+                Assert.assertNotNull( frame );
+            }});
     }
 
     @After
-    public void release() {
+    public void release() throws InterruptedException, InvocationTargetException {
         Assert.assertNotNull( display );
         Assert.assertNotNull( shell );
         Assert.assertNotNull( composite );
         Assert.assertNotNull( glcanvas );
-        try {
-            javax.swing.SwingUtilities.invokeAndWait(new Runnable() {
-                public void run() {
-                    frame.setVisible(false);
-                    frame.remove(glcanvas);
-                    frame.dispose();
-                }});
-            composite.dispose();
-            shell.close();
-            shell.dispose();
-            display.dispose();
-        }
-        catch( Throwable throwable ) {
-            throwable.printStackTrace();
-            Assume.assumeNoException( throwable );
-        }
-        display = null;
-        shell = null;
-        composite = null;
-        frame = null;
-        glcanvas = null;
+        javax.swing.SwingUtilities.invokeAndWait(new Runnable() {
+            public void run() {
+                frame.setVisible(false);
+                frame.remove(glcanvas);
+                frame.dispose();
+                frame = null;
+                glcanvas = null;
+            }});
+        
+        SWTAccessor.invoke(true, new Runnable() {
+            public void run() {
+                composite.dispose();
+                shell.close();
+                shell.dispose();
+                display.dispose();
+                display = null;
+                shell = null;
+                composite = null;
+            }});
     }
 
     protected void runTestGL( GLProfile glprofile ) throws InterruptedException {
@@ -148,18 +152,26 @@ public class TestSWTAWT01GLn extends UITestCase {
             }
         });
 
-        shell.setText( getClass().getName() );
-        shell.setSize( 640, 480 );
-        shell.open();
+        SWTAccessor.invoke(true, new Runnable() {
+            public void run() {
+                shell.setText( getClass().getName() );
+                shell.setSize( 640, 480 );
+                shell.open();
+            }});
 
         long lStartTime = System.currentTimeMillis();
         long lEndTime = lStartTime + duration;
         try {
             while( (System.currentTimeMillis() < lEndTime) && !composite.isDisposed() ) {
-                if( !display.readAndDispatch() ) {
-                    // blocks on linux .. display.sleep();
-                    Thread.sleep(10);
-                }
+                SWTAccessor.invoke(true, new Runnable() {
+                    public void run() {
+                        if( !display.readAndDispatch() ) {
+                            // blocks on linux .. display.sleep();
+                            try {
+                                Thread.sleep(10);
+                            } catch (InterruptedException e) { }
+                        }
+                    }});
             }
         }
         catch( Throwable throwable ) {
-- 
cgit v1.2.3