diff options
| -rw-r--r-- | make/build-test.xml | 2 | ||||
| -rw-r--r-- | src/jogl/classes/com/jogamp/opengl/swt/GLCanvas.java | 4 | ||||
| -rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLnAWT.java (renamed from src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java) | 8 |
3 files changed, 11 insertions, 3 deletions
diff --git a/make/build-test.xml b/make/build-test.xml index 533ca301c..0f176de92 100644 --- a/make/build-test.xml +++ b/make/build-test.xml @@ -398,7 +398,7 @@ </for> </target> - <target name="junit.run.swt.awt" depends="test.compile" description="Runs all SWT_AWT tests." if="isSWTRuntimeAvailable"> + <target name="junit.run.swt.awt" depends="test.compile" description="Runs all SWT AWT tests." if="isSWTRuntimeAvailable"> <!-- Test*SWT*AWT* --> <junit forkmode="perTest" showoutput="true" fork="true" haltonerror="off" timeout="${batchtest.timeout}"> <env key="${system.env.library.path}" path="${obj.all.paths}"/> diff --git a/src/jogl/classes/com/jogamp/opengl/swt/GLCanvas.java b/src/jogl/classes/com/jogamp/opengl/swt/GLCanvas.java index c3936c615..ef1c3fbeb 100644 --- a/src/jogl/classes/com/jogamp/opengl/swt/GLCanvas.java +++ b/src/jogl/classes/com/jogamp/opengl/swt/GLCanvas.java @@ -71,6 +71,10 @@ import com.jogamp.opengl.JoglVersion; /** * Native SWT Canvas implementing GLAutoDrawable + * <p> + * FIXME: Still needs AWT for threading impl., + * ie. will issue a 'wrong thread' error if runs in headless mode! + * </p> */ public class GLCanvas extends Canvas implements GLAutoDrawable { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLnAWT.java index d8bf3e79f..6e5e7d802 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLnAWT.java @@ -56,9 +56,13 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * <p>
* Uses JOGL's new SWT GLCanvas.
* </p>
+ * <p>
+ * Holds AWT in it's test name, since our impl. still needs the AWT threading,
+ * see {@link GLCanvas}.
+ * </p>
* @author Wade Walker, et.al.
*/
-public class TestSWTJOGLGLCanvas01GLn extends UITestCase {
+public class TestSWTJOGLGLCanvas01GLnAWT extends UITestCase {
static int duration = 250;
@@ -173,6 +177,6 @@ public class TestSWTJOGLGLCanvas01GLn extends UITestCase { }
}
System.out.println("durationPerTest: "+duration);
- org.junit.runner.JUnitCore.main(TestSWTJOGLGLCanvas01GLn.class.getName());
+ org.junit.runner.JUnitCore.main(TestSWTJOGLGLCanvas01GLnAWT.class.getName());
}
}
|