aboutsummaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/test')
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java43
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasAWT.java43
2 files changed, 58 insertions, 28 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java
index 14b1f04b0..5dee22e1d 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java
@@ -89,6 +89,7 @@ public class TestGearsES2NEWT extends UITestCase {
static boolean forceGL3 = false;
static boolean mainRun = false;
static boolean exclusiveContext = false;
+ static boolean useAnimator = true;
@BeforeClass
public static void initClass() {
@@ -138,9 +139,11 @@ public class TestGearsES2NEWT extends UITestCase {
});
}
- Animator animator = new Animator();
- animator.setModeBits(false, Animator.MODE_EXPECT_AWT_RENDERING_THREAD);
- animator.setExclusiveContext(exclusiveContext);
+ final Animator animator = useAnimator ? new Animator() : null;
+ if( useAnimator ) {
+ animator.setModeBits(false, Animator.MODE_EXPECT_AWT_RENDERING_THREAD);
+ animator.setExclusiveContext(exclusiveContext);
+ }
QuitAdapter quitAdapter = new QuitAdapter();
//glWindow.addKeyListener(new TraceKeyAdapter(quitAdapter));
@@ -246,14 +249,18 @@ public class TestGearsES2NEWT extends UITestCase {
}
});
- animator.add(glWindow);
- animator.start();
- Assert.assertTrue(animator.isStarted());
- Assert.assertTrue(animator.isAnimating());
- Assert.assertEquals(exclusiveContext ? animator.getThread() : null, glWindow.getExclusiveContextThread());
+ if( useAnimator ) {
+ animator.add(glWindow);
+ animator.start();
+ Assert.assertTrue(animator.isStarted());
+ Assert.assertTrue(animator.isAnimating());
+ Assert.assertEquals(exclusiveContext ? animator.getThread() : null, glWindow.getExclusiveContextThread());
+ }
glWindow.setVisible(true);
- animator.setUpdateFPSFrames(60, showFPS ? System.err : null);
+ if( useAnimator ) {
+ animator.setUpdateFPSFrames(60, showFPS ? System.err : null);
+ }
System.err.println("NW chosen: "+glWindow.getDelegatedWindow().getChosenCapabilities());
System.err.println("GL chosen: "+glWindow.getChosenCapabilities());
@@ -265,14 +272,19 @@ public class TestGearsES2NEWT extends UITestCase {
System.err.println("window resize pos/siz: "+glWindow.getX()+"/"+glWindow.getY()+" "+glWindow.getWidth()+"x"+glWindow.getHeight()+", "+glWindow.getInsets());
}
- while(!quitAdapter.shouldQuit() && animator.isAnimating() && animator.getTotalFPSDuration()<duration) {
+ final long t0 = System.currentTimeMillis();
+ long t1 = t0;
+ while(!quitAdapter.shouldQuit() && t1-t0<duration) {
Thread.sleep(100);
+ t1 = System.currentTimeMillis();
}
- Assert.assertEquals(exclusiveContext ? animator.getThread() : null, glWindow.getExclusiveContextThread());
- animator.stop();
- Assert.assertFalse(animator.isAnimating());
- Assert.assertFalse(animator.isStarted());
+ if( useAnimator ) {
+ Assert.assertEquals(exclusiveContext ? animator.getThread() : null, glWindow.getExclusiveContextThread());
+ animator.stop();
+ Assert.assertFalse(animator.isAnimating());
+ Assert.assertFalse(animator.isStarted());
+ }
Assert.assertEquals(null, glWindow.getExclusiveContextThread());
glWindow.destroy();
Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, false));
@@ -342,6 +354,8 @@ public class TestGearsES2NEWT extends UITestCase {
swapInterval = MiscUtils.atoi(args[i], swapInterval);
} else if(args[i].equals("-exclctx")) {
exclusiveContext = true;
+ } else if(args[i].equals("-noanim")) {
+ useAnimator = false;
} else if(args[i].equals("-es2")) {
forceES2 = true;
} else if(args[i].equals("-gl3")) {
@@ -410,6 +424,7 @@ public class TestGearsES2NEWT extends UITestCase {
System.err.println("forceGL3 "+forceGL3);
System.err.println("swapInterval "+swapInterval);
System.err.println("exclusiveContext "+exclusiveContext);
+ System.err.println("useAnimator "+useAnimator);
if(waitForKey) {
UITestCase.waitForKey("Start");
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasAWT.java
index fd99b4f61..38eb80be8 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasAWT.java
@@ -95,6 +95,7 @@ public class TestGearsES2NewtCanvasAWT extends UITestCase {
static boolean forceGL3 = false;
static boolean mainRun = false;
static boolean exclusiveContext = false;
+ static boolean useAnimator = true;
@BeforeClass
public static void initClass() {
@@ -244,9 +245,11 @@ public class TestGearsES2NewtCanvasAWT extends UITestCase {
demo.setPMVUseBackingArray(pmvUseBackingArray);
glWindow.addGLEventListener(demo);
- Animator animator = new Animator();
- animator.setModeBits(false, Animator.MODE_EXPECT_AWT_RENDERING_THREAD);
- animator.setExclusiveContext(exclusiveContext);
+ final Animator animator = useAnimator ? new Animator() : null;
+ if( useAnimator ) {
+ animator.setModeBits(false, Animator.MODE_EXPECT_AWT_RENDERING_THREAD);
+ animator.setExclusiveContext(exclusiveContext);
+ }
final QuitAdapter quitAdapter = new QuitAdapter();
//glWindow.addKeyListener(new TraceKeyAdapter(quitAdapter));
@@ -304,11 +307,13 @@ public class TestGearsES2NewtCanvasAWT extends UITestCase {
}
});
- animator.add(glWindow);
- animator.start();
- Assert.assertTrue(animator.isStarted());
- Assert.assertTrue(animator.isAnimating());
- Assert.assertEquals(exclusiveContext ? animator.getThread() : null, glWindow.getExclusiveContextThread());
+ if( useAnimator ) {
+ animator.add(glWindow);
+ animator.start();
+ Assert.assertTrue(animator.isStarted());
+ Assert.assertTrue(animator.isAnimating());
+ Assert.assertEquals(exclusiveContext ? animator.getThread() : null, glWindow.getExclusiveContextThread());
+ }
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
@@ -323,7 +328,9 @@ public class TestGearsES2NewtCanvasAWT extends UITestCase {
Assert.assertEquals(true, AWTRobotUtil.waitForVisible(frame, true));
Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, true));
- animator.setUpdateFPSFrames(60, showFPS ? System.err : null);
+ if( useAnimator ) {
+ animator.setUpdateFPSFrames(60, showFPS ? System.err : null);
+ }
System.err.println("NW chosen: "+glWindow.getDelegatedWindow().getChosenCapabilities());
System.err.println("GL chosen: "+glWindow.getChosenCapabilities());
@@ -335,14 +342,19 @@ public class TestGearsES2NewtCanvasAWT extends UITestCase {
System.err.println("window resize "+rwsize+" -> pos/siz: "+glWindow.getX()+"/"+glWindow.getY()+" "+glWindow.getWidth()+"x"+glWindow.getHeight()+", "+glWindow.getInsets());
}
- while(!quitAdapter.shouldQuit() && animator.getTotalFPSDuration()<duration) {
+ final long t0 = System.currentTimeMillis();
+ long t1 = t0;
+ while(!quitAdapter.shouldQuit() && t1-t0<duration) {
Thread.sleep(100);
+ t1 = System.currentTimeMillis();
}
- Assert.assertEquals(exclusiveContext ? animator.getThread() : null, glWindow.getExclusiveContextThread());
- animator.stop();
- Assert.assertFalse(animator.isAnimating());
- Assert.assertFalse(animator.isStarted());
+ if( useAnimator ) {
+ Assert.assertEquals(exclusiveContext ? animator.getThread() : null, glWindow.getExclusiveContextThread());
+ animator.stop();
+ Assert.assertFalse(animator.isAnimating());
+ Assert.assertFalse(animator.isStarted());
+ }
Assert.assertEquals(null, glWindow.getExclusiveContextThread());
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
@@ -431,6 +443,8 @@ public class TestGearsES2NewtCanvasAWT extends UITestCase {
shallUseOffscreenFBOLayer = true;
} else if(args[i].equals("-exclctx")) {
exclusiveContext = true;
+ } else if(args[i].equals("-noanim")) {
+ useAnimator = false;
} else if(args[i].equals("-es2")) {
forceES2 = true;
} else if(args[i].equals("-gl3")) {
@@ -487,6 +501,7 @@ public class TestGearsES2NewtCanvasAWT extends UITestCase {
System.err.println("forceGL3 "+forceGL3);
System.err.println("swapInterval "+swapInterval);
System.err.println("exclusiveContext "+exclusiveContext);
+ System.err.println("useAnimator "+useAnimator);
org.junit.runner.JUnitCore.main(TestGearsES2NewtCanvasAWT.class.getName());
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-05 01:38:40 +0000