aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/com/jogamp
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-12-08 07:39:24 +0100
committerSven Gothel <[email protected]>2019-12-08 07:39:24 +0100
commitdd8f6f0c884161eb1099ff1ab8af20383984771d (patch)
tree9b2e49937aa7f989e11d7abcc044aef82ac371ab /src/test/com/jogamp
parent136971bf41c9784bee187389f138daf77ba4392c (diff)
Bug 1415: ExclusiveContextBase00+10: Utilize one Animator per Window for clean ExclusiveContextThread
No, this does not resolve the issue - but is the proper test case. ExclusiveContextBase10 also gets the preVis test.
Diffstat (limited to 'src/test/com/jogamp')
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00.java295
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10.java138
2 files changed, 248 insertions, 185 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00.java
index fca967ea4..817f5988e 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00.java
@@ -36,7 +36,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.util.AnimatorBase;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
-
+import com.jogamp.common.os.Platform;
import com.jogamp.nativewindow.Capabilities;
import com.jogamp.nativewindow.util.InsetsImmutable;
@@ -114,90 +114,92 @@ public abstract class ExclusiveContextBase00 extends UITestCase {
return;
}
final Thread awtRenderThread = getAWTRenderThread();
- final AnimatorBase animator = createAnimator();
- if( !useAWTRenderThread ) {
- animator.setModeBits(false, AnimatorBase.MODE_EXPECT_AWT_RENDERING_THREAD);
- }
+ final AnimatorBase[] animators = new AnimatorBase[drawableCount];
final GLAutoDrawable[] drawables = new GLAutoDrawable[drawableCount];
for(int i=0; i<drawableCount; i++) {
+ animators[i] = createAnimator();
+ if( !useAWTRenderThread ) {
+ animators[i].setModeBits(false, AnimatorBase.MODE_EXPECT_AWT_RENDERING_THREAD);
+ }
+
final int x = ( i % num_x ) * ( demoWinSize + insets.getTotalHeight() ) + insets.getLeftWidth();
final int y = ( (i / num_x) % num_y ) * ( demoWinSize + insets.getTotalHeight() ) + insets.getTopHeight();
-
drawables[i] = createGLAutoDrawable("Win #"+i, x, y, demoWinSize, demoWinSize, caps);
Assert.assertNotNull(drawables[i]);
final GearsES2 demo = new GearsES2(swapInterval);
demo.setVerbose(false);
drawables[i].addGLEventListener(demo);
+
+ if( preAdd ) {
+ animators[i].add(drawables[i]);
+ if( exclusive ) {
+ if( useAWTRenderThread ) {
+ Assert.assertEquals(null, animators[i].setExclusiveContext(awtRenderThread));
+ } else {
+ Assert.assertEquals(false, animators[i].setExclusiveContext(true));
+ }
+ }
+ }
+ Assert.assertFalse(animators[i].isAnimating());
+ Assert.assertFalse(animators[i].isStarted());
}
+
if( preVisible ) {
setGLAutoDrawableVisible(drawables);
- }
- if( preAdd ) {
+ // Made visible, check if drawables are realized
for(int i=0; i<drawableCount; i++) {
- animator.add(drawables[i]);
- }
- if( exclusive ) {
- if( useAWTRenderThread ) {
- Assert.assertEquals(null, animator.setExclusiveContext(awtRenderThread));
- } else {
- Assert.assertEquals(false, animator.setExclusiveContext(true));
- }
+ Assert.assertEquals(true, drawables[i].isRealized());
+ animators[i].setUpdateFPSFrames(showFPSRate, showFPS ? System.err : null);
}
}
- Assert.assertFalse(animator.isAnimating());
- Assert.assertFalse(animator.isStarted());
// Animator Start
- Assert.assertTrue(animator.start());
-
- Assert.assertTrue(animator.isStarted());
- if( preAdd ) {
- Assert.assertTrue(animator.isAnimating());
- } else {
- Assert.assertFalse(animator.isAnimating());
- if( exclusive ) {
- if( useAWTRenderThread ) {
- Assert.assertEquals(null, animator.setExclusiveContext(awtRenderThread));
- } else {
- Assert.assertEquals(false, animator.setExclusiveContext(true));
+ for(int i=0; i<drawableCount; i++) {
+ Assert.assertTrue(animators[i].start());
+
+ Assert.assertTrue(animators[i].isStarted());
+ if( preAdd ) {
+ Assert.assertTrue(animators[i].isAnimating());
+ } else {
+ Assert.assertFalse(animators[i].isAnimating());
+ if( exclusive ) {
+ if( useAWTRenderThread ) {
+ Assert.assertEquals(null, animators[i].setExclusiveContext(awtRenderThread));
+ } else {
+ Assert.assertEquals(false, animators[i].setExclusiveContext(true));
+ }
}
+ animators[i].add(drawables[i]);
+ Assert.assertTrue(animators[i].isAnimating());
}
- for(int i=0; i<drawableCount; i++) {
- animator.add(drawables[i]);
- }
- Assert.assertTrue(animator.isAnimating());
- }
- // After start, ExclusiveContextThread is set
- Assert.assertEquals(exclusive, animator.isExclusiveContextEnabled());
- {
- final Thread ect = animator.getExclusiveContextThread();
- if(exclusive) {
- if( useAWTRenderThread ) {
- Assert.assertEquals(awtRenderThread, ect);
+ // After start, ExclusiveContextThread is set
+ Assert.assertEquals(exclusive, animators[i].isExclusiveContextEnabled());
+ {
+ final Thread ect = animators[i].getExclusiveContextThread();
+ if(exclusive) {
+ if( useAWTRenderThread ) {
+ Assert.assertEquals(awtRenderThread, ect);
+ } else {
+ Assert.assertEquals(animators[i].getThread(), ect);
+ }
} else {
- Assert.assertEquals(animator.getThread(), ect);
+ Assert.assertEquals(null, ect);
}
- } else {
- Assert.assertEquals(null, ect);
- }
- for(int i=0; i<drawableCount; i++) {
Assert.assertEquals(ect, drawables[i].getExclusiveContextThread());
}
}
+
if( !preVisible ) {
setGLAutoDrawableVisible(drawables);
- }
- // Made visible, check if drawables are realized
- {
+ // Made visible, check if drawables are realized
for(int i=0; i<drawableCount; i++) {
Assert.assertEquals(true, drawables[i].isRealized());
+ animators[i].setUpdateFPSFrames(showFPSRate, showFPS ? System.err : null);
}
-
}
- animator.setUpdateFPSFrames(showFPSRate, showFPS ? System.err : null);
// Normal run ..
Thread.sleep(duration/durationParts); // 1
@@ -205,15 +207,19 @@ public abstract class ExclusiveContextBase00 extends UITestCase {
if( !shortenTest ) {
// Disable/Enable exclusive mode manually for all GLAutoDrawable
if(exclusive) {
- final Thread ect = animator.getExclusiveContextThread();
- if( useAWTRenderThread ) {
- Assert.assertEquals(awtRenderThread, ect);
- } else {
- Assert.assertEquals(animator.getThread(), ect);
- }
+ final Thread ects[] = new Thread[drawableCount];
for(int i=0; i<drawableCount; i++) {
- final Thread t = drawables[i].setExclusiveContextThread(null);
- Assert.assertEquals(ect, t);
+ ects[i] = animators[i].getExclusiveContextThread();
+ if( useAWTRenderThread ) {
+ Assert.assertEquals(awtRenderThread, ects[i]);
+ } else {
+ Assert.assertEquals(animators[i].getThread(), ects[i]);
+ }
+ // Disable ECT now ..
+ {
+ final Thread t = drawables[i].setExclusiveContextThread(null);
+ Assert.assertEquals(ects[i], t); // old one should match
+ }
}
Thread.sleep(duration/durationParts); // 2
@@ -233,120 +239,117 @@ public abstract class ExclusiveContextBase00 extends UITestCase {
}
Assert.assertEquals(true, ok);
}
- final Thread t = drawables[i].setExclusiveContextThread(ect);
+ final Thread t = drawables[i].setExclusiveContextThread(ects[i]);
Assert.assertEquals(null, t);
}
Thread.sleep(duration/durationParts); // 3
- }
-
- // Disable/Enable exclusive mode via Animator for all GLAutoDrawable
- if(exclusive) {
- final Thread ect = animator.getExclusiveContextThread();
- if( useAWTRenderThread ) {
- Assert.assertEquals(awtRenderThread, ect);
- } else {
- Assert.assertEquals(animator.getThread(), ect);
- }
- Assert.assertEquals(true, animator.setExclusiveContext(false));
- Assert.assertFalse(animator.isExclusiveContextEnabled());
+ // Disable/Enable exclusive mode via Animator for all GLAutoDrawable
for(int i=0; i<drawableCount; i++) {
+ ects[i] = animators[i].getExclusiveContextThread();
+ if( useAWTRenderThread ) {
+ Assert.assertEquals(awtRenderThread, ects[i]);
+ } else {
+ Assert.assertEquals(animators[i].getThread(), ects[i]);
+ }
+
+ Assert.assertEquals(true, animators[i].setExclusiveContext(false));
+ Assert.assertFalse(animators[i].isExclusiveContextEnabled());
Assert.assertEquals(null, drawables[i].getExclusiveContextThread());
}
- Thread.sleep(duration/durationParts); // 4
+ Thread.sleep(duration/durationParts); // 4
- Assert.assertEquals(null, animator.setExclusiveContext(ect));
- Assert.assertTrue(animator.isExclusiveContextEnabled());
- Assert.assertEquals(ect, animator.getExclusiveContextThread());
for(int i=0; i<drawableCount; i++) {
- Assert.assertEquals(ect, drawables[i].getExclusiveContextThread());
+ Assert.assertEquals(null, animators[i].setExclusiveContext(ects[i]));
+ Assert.assertTrue(animators[i].isExclusiveContextEnabled());
+ Assert.assertEquals(ects[i], animators[i].getExclusiveContextThread());
+ Assert.assertEquals(ects[i], drawables[i].getExclusiveContextThread());
}
Thread.sleep(duration/durationParts); // 5
}
- Assert.assertEquals(exclusive, animator.isExclusiveContextEnabled());
- Assert.assertTrue(animator.isStarted());
- Assert.assertTrue(animator.isAnimating());
- Assert.assertFalse(animator.isPaused());
-
- // Animator Pause
- Assert.assertTrue(animator.pause());
- Assert.assertTrue(animator.isStarted());
- Assert.assertFalse(animator.isAnimating());
- Assert.assertTrue(animator.isPaused());
- Assert.assertEquals(exclusive, animator.isExclusiveContextEnabled());
- if(exclusive) {
- final Thread ect = animator.getExclusiveContextThread();
- if( useAWTRenderThread ) {
- Assert.assertEquals(awtRenderThread, ect);
+ for(int i=0; i<drawableCount; i++) {
+ Assert.assertEquals(exclusive, animators[i].isExclusiveContextEnabled());
+ Assert.assertTrue(animators[i].isStarted());
+ Assert.assertTrue(animators[i].isAnimating());
+ Assert.assertFalse(animators[i].isPaused());
+
+ // Animator Pause
+ Assert.assertTrue(animators[i].pause());
+ Assert.assertTrue(animators[i].isStarted());
+ Assert.assertFalse(animators[i].isAnimating());
+ Assert.assertTrue(animators[i].isPaused());
+ Assert.assertEquals(exclusive, animators[i].isExclusiveContextEnabled());
+ if(exclusive) {
+ final Thread ect = animators[i].getExclusiveContextThread();
+ if( useAWTRenderThread ) {
+ Assert.assertEquals(awtRenderThread, ect);
+ } else {
+ Assert.assertEquals(animators[i].getThread(), ect);
+ }
} else {
- Assert.assertEquals(animator.getThread(), ect);
+ Assert.assertEquals(null, animators[i].getExclusiveContextThread());
}
- } else {
- Assert.assertEquals(null, animator.getExclusiveContextThread());
- }
- for(int i=0; i<drawableCount; i++) {
+
Assert.assertEquals(null, drawables[i].getExclusiveContextThread());
}
Thread.sleep(duration/durationParts); // 6
// Animator Resume
- Assert.assertTrue(animator.resume());
- Assert.assertTrue(animator.isStarted());
- Assert.assertTrue(animator.isAnimating());
- Assert.assertFalse(animator.isPaused());
- Assert.assertEquals(exclusive, animator.isExclusiveContextEnabled());
- if(exclusive) {
- final Thread ect = animator.getExclusiveContextThread();
- if( useAWTRenderThread ) {
- Assert.assertEquals(awtRenderThread, ect);
- } else {
- Assert.assertEquals(animator.getThread(), ect);
- }
- for(int i=0; i<drawableCount; i++) {
+ for(int i=0; i<drawableCount; i++) {
+ Assert.assertTrue(animators[i].resume());
+ Assert.assertTrue(animators[i].isStarted());
+ Assert.assertTrue(animators[i].isAnimating());
+ Assert.assertFalse(animators[i].isPaused());
+ Assert.assertEquals(exclusive, animators[i].isExclusiveContextEnabled());
+ if(exclusive) {
+ final Thread ect = animators[i].getExclusiveContextThread();
+ if( useAWTRenderThread ) {
+ Assert.assertEquals(awtRenderThread, ect);
+ } else {
+ Assert.assertEquals(animators[i].getThread(), ect);
+ }
Assert.assertEquals(ect, drawables[i].getExclusiveContextThread());
- }
- } else {
- Assert.assertEquals(null, animator.getExclusiveContextThread());
- for(int i=0; i<drawableCount; i++) {
+ } else {
+ Assert.assertEquals(null, animators[i].getExclusiveContextThread());
Assert.assertEquals(null, drawables[i].getExclusiveContextThread());
}
}
Thread.sleep(duration/durationParts); // 7
// Animator Stop #1
- Assert.assertTrue(animator.stop());
- Assert.assertFalse(animator.isAnimating());
- Assert.assertFalse(animator.isStarted());
- Assert.assertFalse(animator.isPaused());
- Assert.assertEquals(exclusive, animator.isExclusiveContextEnabled());
- Assert.assertEquals(null, animator.getExclusiveContextThread());
for(int i=0; i<drawableCount; i++) {
+ Assert.assertTrue(animators[i].stop());
+ Assert.assertFalse(animators[i].isAnimating());
+ Assert.assertFalse(animators[i].isStarted());
+ Assert.assertFalse(animators[i].isPaused());
+ Assert.assertEquals(exclusive, animators[i].isExclusiveContextEnabled());
+ Assert.assertEquals(null, animators[i].getExclusiveContextThread());
Assert.assertEquals(null, drawables[i].getExclusiveContextThread());
}
Thread.sleep(duration/durationParts); // 8
// Animator Re-Start
- Assert.assertTrue(animator.start());
- Assert.assertTrue(animator.isStarted());
- Assert.assertTrue(animator.isAnimating());
- Assert.assertEquals(exclusive, animator.isExclusiveContextEnabled());
- // After start, ExclusiveContextThread is set
- {
- final Thread ect = animator.getExclusiveContextThread();
- if(exclusive) {
- if( useAWTRenderThread ) {
- Assert.assertEquals(awtRenderThread, ect);
+ for(int i=0; i<drawableCount; i++) {
+ Assert.assertTrue(animators[i].start());
+ Assert.assertTrue(animators[i].isStarted());
+ Assert.assertTrue(animators[i].isAnimating());
+ Assert.assertEquals(exclusive, animators[i].isExclusiveContextEnabled());
+ // After start, ExclusiveContextThread is set
+ {
+ final Thread ect = animators[i].getExclusiveContextThread();
+ if(exclusive) {
+ if( useAWTRenderThread ) {
+ Assert.assertEquals(awtRenderThread, ect);
+ } else {
+ Assert.assertEquals(animators[i].getThread(), ect);
+ }
} else {
- Assert.assertEquals(animator.getThread(), ect);
+ Assert.assertEquals(null, ect);
}
- } else {
- Assert.assertEquals(null, ect);
- }
- for(int i=0; i<drawableCount; i++) {
Assert.assertEquals(ect, drawables[i].getExclusiveContextThread());
}
}
@@ -355,20 +358,22 @@ public abstract class ExclusiveContextBase00 extends UITestCase {
// Remove all drawables .. while running!
for(int i=0; i<drawableCount; i++) {
final GLAutoDrawable drawable = drawables[i];
- animator.remove(drawable);
+ animators[i].remove(drawable);
Assert.assertEquals(null, drawable.getExclusiveContextThread());
+ Assert.assertTrue(animators[i].isStarted());
+ Assert.assertFalse(animators[i].isAnimating()); // no drawables in list!
}
- Assert.assertTrue(animator.isStarted());
- Assert.assertFalse(animator.isAnimating()); // no drawables in list!
} // !shortenTest
// Animator Stop #2
- Assert.assertTrue(animator.stop());
- Assert.assertFalse(animator.isAnimating());
- Assert.assertFalse(animator.isStarted());
- Assert.assertFalse(animator.isPaused());
- Assert.assertEquals(exclusive, animator.isExclusiveContextEnabled());
- Assert.assertEquals(null, animator.getExclusiveContextThread());
+ for(int i=0; i<drawableCount; i++) {
+ Assert.assertTrue(animators[i].stop());
+ Assert.assertFalse(animators[i].isAnimating());
+ Assert.assertFalse(animators[i].isStarted());
+ Assert.assertFalse(animators[i].isPaused());
+ Assert.assertEquals(exclusive, animators[i].isExclusiveContextEnabled());
+ Assert.assertEquals(null, animators[i].getExclusiveContextThread());
+ }
// Destroy GLWindows
for(int i=0; i<drawableCount; i++) {
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10.java
index 50f04ed17..e9932637d 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10.java
@@ -36,7 +36,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.util.AnimatorBase;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
-
+import com.jogamp.common.os.Platform;
import com.jogamp.nativewindow.Capabilities;
import com.jogamp.nativewindow.util.InsetsImmutable;
@@ -60,7 +60,7 @@ public abstract class ExclusiveContextBase10 extends UITestCase {
static boolean testExclusiveWithAWT = false;
static long duration = 1400;
- static boolean showFPS = true;
+ static boolean showFPS = false;
static int showFPSRate = 60;
static final int demoWinSize = 128;
@@ -98,7 +98,14 @@ public abstract class ExclusiveContextBase10 extends UITestCase {
protected abstract void setGLAutoDrawableVisible(GLAutoDrawable[] glads);
protected abstract void destroyGLAutoDrawableVisible(GLAutoDrawable glad);
+ /**
+ * @deprecated Use {@link #runTestGL(GLCapabilitiesImmutable,int,boolean,boolean)} instead
+ */
protected void runTestGL(final GLCapabilitiesImmutable caps, final int drawableCount, final boolean exclusive) throws InterruptedException {
+ runTestGL(caps, drawableCount, exclusive, false);
+ }
+
+ protected void runTestGL(final GLCapabilitiesImmutable caps, final int drawableCount, final boolean exclusive, final boolean preVisible) throws InterruptedException {
final boolean useAWTRenderThread = isAWTTestCase();
if( useAWTRenderThread && exclusive ) {
if( testExclusiveWithAWT ) {
@@ -113,15 +120,16 @@ public abstract class ExclusiveContextBase10 extends UITestCase {
return;
}
final Thread awtRenderThread = getAWTRenderThread();
- final AnimatorBase animator = createAnimator();
- if( !useAWTRenderThread ) {
- animator.setModeBits(false, AnimatorBase.MODE_EXPECT_AWT_RENDERING_THREAD);
- }
+ final AnimatorBase[] animators = new AnimatorBase[drawableCount];
final GLAutoDrawable[] drawables = new GLAutoDrawable[drawableCount];
for(int i=0; i<drawableCount; i++) {
+ animators[i] = createAnimator();
+ if( !useAWTRenderThread ) {
+ animators[i].setModeBits(false, AnimatorBase.MODE_EXPECT_AWT_RENDERING_THREAD);
+ }
+
final int x = ( i % num_x ) * ( demoWinSize + insets.getTotalHeight() ) + insets.getLeftWidth();
final int y = ( (i / num_x) % num_y ) * ( demoWinSize + insets.getTotalHeight() ) + insets.getTopHeight();
-
drawables[i] = createGLAutoDrawable("Win #"+i, x, y, demoWinSize, demoWinSize, caps);
Assert.assertNotNull(drawables[i]);
final GearsES2 demo = new GearsES2(swapInterval);
@@ -129,55 +137,76 @@ public abstract class ExclusiveContextBase10 extends UITestCase {
drawables[i].addGLEventListener(demo);
}
- for(int i=0; i<drawableCount; i++) {
- animator.add(drawables[i]);
+ if( preVisible ) {
+ setGLAutoDrawableVisible(drawables);
+
+ // Made visible, check if drawables are realized
+ for(int i=0; i<drawableCount; i++) {
+ Assert.assertEquals(true, drawables[i].isRealized());
+ animators[i].setUpdateFPSFrames(showFPSRate, showFPS ? System.err : null);
+ }
}
- if( exclusive ) {
- if( useAWTRenderThread ) {
- Assert.assertEquals(null, animator.setExclusiveContext(awtRenderThread));
- } else {
- Assert.assertEquals(false, animator.setExclusiveContext(true));
+
+ for(int i=0; i<drawableCount; i++) {
+ animators[i].add(drawables[i]);
+
+ if( exclusive ) {
+ if( useAWTRenderThread ) {
+ Assert.assertEquals(null, animators[i].setExclusiveContext(awtRenderThread));
+ } else {
+ Assert.assertEquals(false, animators[i].setExclusiveContext(true));
+ }
}
+ Assert.assertFalse(animators[i].isAnimating());
+ Assert.assertFalse(animators[i].isStarted());
}
- Assert.assertFalse(animator.isAnimating());
- Assert.assertFalse(animator.isStarted());
// Animator Start
- Assert.assertTrue(animator.start());
+ for(int i=0; i<drawableCount; i++) {
+ Assert.assertTrue(animators[i].start());
- Assert.assertTrue(animator.isStarted());
- Assert.assertTrue(animator.isAnimating());
- Assert.assertEquals(exclusive, animator.isExclusiveContextEnabled());
+ Assert.assertTrue(animators[i].isStarted());
+ Assert.assertTrue(animators[i].isAnimating());
+ Assert.assertEquals(exclusive, animators[i].isExclusiveContextEnabled());
+ }
// After start, ExclusiveContextThread is set
- {
- final Thread ect = animator.getExclusiveContextThread();
+ for(int i=0; i<drawableCount; i++) {
+ final Thread ect = animators[i].getExclusiveContextThread();
if(exclusive) {
if( useAWTRenderThread ) {
Assert.assertEquals(awtRenderThread, ect);
} else {
- Assert.assertEquals(animator.getThread(), ect);
+ Assert.assertEquals(animators[i].getThread(), ect);
}
} else {
Assert.assertEquals(null, ect);
}
+ Assert.assertEquals(ect, drawables[i].getExclusiveContextThread());
+ }
+
+ if( !preVisible ) {
+ setGLAutoDrawableVisible(drawables);
+
+ // Made visible, check if drawables are realized
for(int i=0; i<drawableCount; i++) {
- Assert.assertEquals(ect, drawables[i].getExclusiveContextThread());
+ Assert.assertEquals(true, drawables[i].isRealized());
+ animators[i].setUpdateFPSFrames(showFPSRate, showFPS ? System.err : null);
}
- setGLAutoDrawableVisible(drawables);
}
- animator.setUpdateFPSFrames(showFPSRate, showFPS ? System.err : null);
// Normal run ..
Thread.sleep(duration);
// Animator Stop #2
- Assert.assertTrue(animator.stop());
- Assert.assertFalse(animator.isAnimating());
- Assert.assertFalse(animator.isStarted());
- Assert.assertFalse(animator.isPaused());
- Assert.assertEquals(exclusive, animator.isExclusiveContextEnabled());
- Assert.assertEquals(null, animator.getExclusiveContextThread());
+ for(int i=0; i<drawableCount; i++) {
+ Assert.assertTrue(animators[i].stop());
+ Assert.assertFalse(animators[i].isAnimating());
+ Assert.assertFalse(animators[i].isStarted());
+ Assert.assertFalse(animators[i].isPaused());
+ Assert.assertEquals(exclusive, animators[i].isExclusiveContextEnabled());
+ Assert.assertEquals(null, animators[i].getExclusiveContextThread());
+ }
// Destroy GLWindows
for(int i=0; i<drawableCount; i++) {
@@ -187,30 +216,59 @@ public abstract class ExclusiveContextBase10 extends UITestCase {
}
@Test
- public void test01Normal_1Win() throws InterruptedException {
+ public void test01Normal_1WinPostVis() throws InterruptedException {
final GLProfile glp = GLProfile.getGL2ES2();
final GLCapabilities caps = new GLCapabilities( glp );
- runTestGL(caps, 1 /* numWin */, false /* exclusive */);
+ runTestGL(caps, 1 /* numWin */, false /* exclusive */, false /* preVisible */);
}
@Test
- public void test03Excl_1Win() throws InterruptedException {
+ public void test03Excl_1WinPostVis() throws InterruptedException {
final GLProfile glp = GLProfile.getGL2ES2();
final GLCapabilities caps = new GLCapabilities( glp );
- runTestGL(caps, 1 /* numWin */, true /* exclusive */);
+ runTestGL(caps, 1 /* numWin */, true /* exclusive */, false /* preVisible */);
}
@Test
- public void test05Normal_4Win() throws InterruptedException {
+ public void test05Normal_4WinPostVis() throws InterruptedException {
final GLProfile glp = GLProfile.getGL2ES2();
final GLCapabilities caps = new GLCapabilities( glp );
- runTestGL(caps, 4 /* numWin */, false /* exclusive */);
+ runTestGL(caps, 4 /* numWin */, false /* exclusive */, false /* preVisible */);
}
@Test
- public void test07Excl_4Win() throws InterruptedException {
+ public void test07Excl_4WinPostVis() throws InterruptedException {
final GLProfile glp = GLProfile.getGL2ES2();
final GLCapabilities caps = new GLCapabilities( glp );
- runTestGL(caps, 4 /* numWin */, true /* exclusive */);
+ runTestGL(caps, 4 /* numWin */, true /* exclusive */, false /* preVisible */);
}
+
+ @Test
+ public void test11Normal_1WinPreVis() throws InterruptedException {
+ final GLProfile glp = GLProfile.getGL2ES2();
+ final GLCapabilities caps = new GLCapabilities( glp );
+ runTestGL(caps, 1 /* numWin */, false /* exclusive */, true /* preVisible */);
+ }
+
+ @Test
+ public void test13Excl_1WinPreVis() throws InterruptedException {
+ final GLProfile glp = GLProfile.getGL2ES2();
+ final GLCapabilities caps = new GLCapabilities( glp );
+ runTestGL(caps, 1 /* numWin */, true /* exclusive */, true /* preVisible */);
+ }
+
+ @Test
+ public void test15Normal_4WinPreVis() throws InterruptedException {
+ final GLProfile glp = GLProfile.getGL2ES2();
+ final GLCapabilities caps = new GLCapabilities( glp );
+ runTestGL(caps, 4 /* numWin */, false /* exclusive */, true /* preVisible */);
+ }
+
+ @Test
+ public void test17Excl_4WinPreVis() throws InterruptedException {
+ final GLProfile glp = GLProfile.getGL2ES2();
+ final GLCapabilities caps = new GLCapabilities( glp );
+ runTestGL(caps, 4 /* numWin */, true /* exclusive */, true /* preVisible */);
+ }
+
}