diff options
5 files changed, 35 insertions, 6 deletions
diff --git a/make/scripts/tests-win.bat b/make/scripts/tests-win.bat index 4716d98f6..06e0c512d 100755 --- a/make/scripts/tests-win.bat +++ b/make/scripts/tests-win.bat @@ -22,6 +22,26 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestEl REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.gl3.newt.TestGeomShader01TextureGL3NEWT %* REM +REM HiDPI +REM +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2SimpleNEWT %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelAWT %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.anim.TestAnimatorGLWindow01NEWT %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.anim.TestAnimatorGLJPanel01AWT %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.awt.TestGLJPanelResize01AWT %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.swt.TestGLCanvasSWTNewtCanvasSWTPosInTabs %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.demos.gl2.awt.TestGearsAWT %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 %* +REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo20 %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.awt.ManualHiDPIBufferedImage01AWT %* +REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextNewtAWTBug523 %* +scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestSingleGLInJSliderNewtAWT %* + + +REM REM av demos REM REM scripts\java-win.bat jogamp.opengl.openal.av.ALDummyUsage %* @@ -248,7 +268,7 @@ REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo10 %* REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo11 %* REM scripts\java-win.bat com.jogamp.opengl.demos.graph.ui.UISceneDemo20 %* -scripts\java-win.bat com.jogamp.opengl.demos.av.MovieCube %* +REM scripts\java-win.bat com.jogamp.opengl.demos.av.MovieCube %* REM scripts\java-win.bat com.jogamp.opengl.demos.av.MovieSimple %* REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.awt.TestBug461FBOSupersamplingSwingAWT diff --git a/make/scripts/tests-x64-dbg.bat b/make/scripts/tests-x64-dbg.bat index 4c7f44236..2fcf199ae 100755 --- a/make/scripts/tests-x64-dbg.bat +++ b/make/scripts/tests-x64-dbg.bat @@ -45,7 +45,7 @@ REM set D_ARGS="-Djogamp.debug.IOUtil" REM set D_ARGS="-Djogl.debug.GLSLCode"
REM set D_ARGS="-Djogl.debug.GLSLCode" "-Djogl.debug.GLMediaPlayer"
REM set D_ARGS="-Djogl.debug.GLMediaPlayer"
-set D_ARGS="-Djogl.debug.GLMediaPlayer" "-Djogl.debug.AudioSink"
+REM set D_ARGS="-Djogl.debug.GLMediaPlayer" "-Djogl.debug.AudioSink"
REM set D_ARGS="-Djogl.debug.GLMediaPlayer" "-Djogl.debug.GLMediaPlayer.Native"
REM set D_ARGS="-Djogl.debug.GLMediaPlayer" "-Djogl.debug.GLMediaPlayer.Native" "-Djogamp.debug.NativeLibrary=true"
REM set D_ARGS="-Djogl.debug.GLMediaPlayer.StreamWorker.delay=25" "-Djogl.debug.GLMediaPlayer"
@@ -71,6 +71,7 @@ REM set D_ARGS="-Djogl.debug.GLContext" "-Djogl.debug.GLJPanel" REM set D_ARGS="-Djogl.gljpanel.noverticalflip"
REM set D_ARGS="-Dnewt.debug=all"
REM set D_ARGS="-Dnewt.debug.Window"
+set D_ARGS="-Dnewt.debug.Window" "-Dnativewindow.debug.JAWT"
REM set D_ARGS="-Dnativewindow.debug.SWT" "-Dnewt.debug.Window" "-Djogl.debug.GLCanvas"
REM set D_ARGS="-Dnativewindow.debug.JFX" "-Dnewt.debug.Window"
REM set D_ARGS="-Dnewt.debug.Window.KeyEvent"
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 9c0c05b55..8f1d2a656 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -503,6 +503,8 @@ function testawtswt() { # #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2SimpleNEWT $* +#testnoawt com.jogamp.opengl.test.junit.jogl.acore.anim.TestAnimatorGLWindow01NEWT $* +#testawt com.jogamp.opengl.test.junit.jogl.acore.anim.TestAnimatorGLJPanel01AWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelAWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $* diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/anim/TestAnimatorGLJPanel01AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/anim/TestAnimatorGLJPanel01AWT.java index bec3fe2ef..8825b94c7 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/anim/TestAnimatorGLJPanel01AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/anim/TestAnimatorGLJPanel01AWT.java @@ -47,8 +47,8 @@ import org.junit.runners.MethodSorters; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestAnimatorGLJPanel01AWT extends UITestCase { - static final int width = 640; - static final int height = 480; + static final int width = 400; + static final int height = 400; protected GLJPanel createGLJPanel(final GLCapabilities caps, final Frame frame, final int x, final int y, final GearsES2 gears) throws InterruptedException { final GLJPanel glCanvas = new GLJPanel(caps); @@ -111,6 +111,7 @@ public class TestAnimatorGLJPanel01AWT extends UITestCase { animator.add(c3); javax.swing.SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { f1.setVisible(true); f2.setVisible(true); @@ -159,6 +160,7 @@ public class TestAnimatorGLJPanel01AWT extends UITestCase { stopAnimator(animator); javax.swing.SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { try { f1.dispose(); @@ -187,6 +189,7 @@ public class TestAnimatorGLJPanel01AWT extends UITestCase { Assert.assertEquals(false, a1.isPaused()); Assert.assertEquals(true, a1.isAnimating()); javax.swing.SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { f1.setVisible(true); } } ); @@ -201,6 +204,7 @@ public class TestAnimatorGLJPanel01AWT extends UITestCase { Assert.assertEquals(false, a2.isPaused()); Assert.assertEquals(true, a2.isAnimating()); javax.swing.SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { f2.setVisible(true); } } ); @@ -215,6 +219,7 @@ public class TestAnimatorGLJPanel01AWT extends UITestCase { Assert.assertEquals(false, a3.isPaused()); Assert.assertEquals(true, a3.isAnimating()); javax.swing.SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { f3.setVisible(true); } } ); @@ -267,6 +272,7 @@ public class TestAnimatorGLJPanel01AWT extends UITestCase { stopAnimator(a3); javax.swing.SwingUtilities.invokeAndWait(new Runnable() { + @Override public void run() { try { f1.dispose(); diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/anim/TestAnimatorGLWindow01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/anim/TestAnimatorGLWindow01NEWT.java index 3eeea1690..4ee80946e 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/anim/TestAnimatorGLWindow01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/anim/TestAnimatorGLWindow01NEWT.java @@ -46,8 +46,8 @@ import org.junit.runners.MethodSorters; @FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestAnimatorGLWindow01NEWT extends UITestCase { - static final int width = 640; - static final int height = 480; + static final int width = 400; + static final int height = 400; protected GLWindow createGLWindow(final GLCapabilities caps, final int x, final int y, final GearsES2 gears) throws InterruptedException { final GLWindow glWindow = GLWindow.create(caps); |