diff options
author | Sven Gothel <[email protected]> | 2011-05-17 13:58:40 +0200 |
---|---|---|
committer | Sven Gothel <[email protected]> | 2011-05-17 13:58:40 +0200 |
commit | 61a9cd15e166cbb544d0fa59af7b6c13f0456659 (patch) | |
tree | 259efa11a46971f34d39bf6d3b02b4981711e67f | |
parent | f08f31480433674db753f226f15609f9eab5b6fc (diff) |
NEWT/GLContext (unit test): Wait for visibility/realized ; Add clean scripts
-rwxr-xr-x | make/scripts/clean-graph.sh | 3 | ||||
-rwxr-xr-x | make/scripts/clean-tests.sh | 6 | ||||
-rwxr-xr-x | make/scripts/tests.sh | 4 | ||||
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java | 6 |
4 files changed, 15 insertions, 4 deletions
diff --git a/make/scripts/clean-graph.sh b/make/scripts/clean-graph.sh new file mode 100755 index 000000000..23e0d457e --- /dev/null +++ b/make/scripts/clean-graph.sh @@ -0,0 +1,3 @@ +#! /bin/bash + +rm -rf ../build/jogl/classes/jogamp/graph ../build/jogl/classes/com/jogamp/graph ../build/test/build/classes/com/jogamp/opengl/test/junit/graph diff --git a/make/scripts/clean-tests.sh b/make/scripts/clean-tests.sh new file mode 100755 index 000000000..cc2fdd922 --- /dev/null +++ b/make/scripts/clean-tests.sh @@ -0,0 +1,6 @@ +#! /bin/bash + +rm -rf ../build/test/* \ + ../build/jogl/jogl.test.jar \ + ../build/jar/jogl.test.jar + diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index aef612303..c8cf79e9f 100755 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -209,8 +209,8 @@ function testawtmt() { #testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLSimple01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState01NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestGLSLShaderState02NEWT $* -#testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 $* -testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestFBOMRTNEWT01 $* +testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 $* +#testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestFBOMRTNEWT01 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestRegionRendererNEWT01 $* #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 $* diff --git a/src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java b/src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java index ac91b642d..b8df88901 100644 --- a/src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java +++ b/src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java @@ -56,7 +56,7 @@ public class NEWTGLContext { } } - public static WindowContext createWindow(GLProfile glp, int width, int height, boolean debugGL) { + public static WindowContext createWindow(GLProfile glp, int width, int height, boolean debugGL) throws InterruptedException { GLCapabilities caps = new GLCapabilities(glp); // // Create native windowing resources .. X11/Win/OSX @@ -71,7 +71,9 @@ public class NEWTGLContext { Assert.assertNotNull(window); window.setSize(width, height); window.setVisible(true); - + AWTRobotUtil.waitForVisible(window, true); + AWTRobotUtil.waitForRealized(window, true); + GLDrawableFactory factory = GLDrawableFactory.getFactory(glp); GLDrawable drawable = factory.createGLDrawable(window); Assert.assertNotNull(drawable); |