aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/com/jogamp
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2019-04-10 04:04:20 +0200
committerSven Gothel <[email protected]>2019-04-10 04:04:20 +0200
commitfc2edeb79e42897b926081769ad3cb3e509aed71 (patch)
treefd4724ee500640640b6b006ed4c0927131e39a2e /src/test/com/jogamp
parent35e3789ba401e94cb4778971470eb90d5c383f79 (diff)
AWTRobotUtil Cleanup: Use specific argument types (AWT, NEWT, ..)
Most fixed, some marked as FIXME left still .. Also fixed AWTRoboUtil regression of last commit(s), where AWTRobotUtil.addClosingListener(..) called to itself causing a StackOverflowError.
Diffstat (limited to 'src/test/com/jogamp')
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMix2DemosES2NEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOffThreadSharedContextMix2DemosES2NEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOnThreadSharedContext1DemoES2NEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00.java5
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10.java5
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/GLContextDrawableSwitchBase1.java10
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java5
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasAWT.java2
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasSWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestRedSquareES2NEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/javafx/TestNewtCanvasJFXGLn.java3
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/newt/TestSwingAWTRobotUsageBeforeJOGLInitBug411.java10
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/swt/TestBug672NewtCanvasSWTSashFormComposite.java5
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTBug628ResizeDeadlockAWT.java3
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTGLn.java3
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTBug643AsyncExec.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/TestCloseNewtAWT.java6
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/TestDisplayLifecycle02NEWT.java16
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/TestWindowAndPointerIconNEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol02NEWT.java8
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java10
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNewtCanvasAWT.java7
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodeModifiersAWT.java2
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodesAWT.java2
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventAutoRepeatAWT.java2
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventOrderAWT.java2
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyPressReleaseUnmaskRepeatAWT.java2
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus01SwingAWTRobot.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus02SwingAWTRobot.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus03KeyTraversalAWT.java12
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00bNEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00cNEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01aNEWT.java6
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01bNEWT.java8
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01cNEWT.java12
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01dNEWT.java10
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02aNEWT.java6
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02bNEWT.java6
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01aAWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01cSwingAWT.java8
-rw-r--r--src/test/com/jogamp/opengl/test/junit/util/AWTRobotUtil.java181
41 files changed, 197 insertions, 208 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMix2DemosES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMix2DemosES2NEWT.java
index 4960196cb..3f5540501 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMix2DemosES2NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMix2DemosES2NEWT.java
@@ -38,8 +38,8 @@ import com.jogamp.newt.event.KeyEvent;
import com.jogamp.newt.event.WindowEvent;
import com.jogamp.newt.event.WindowAdapter;
import com.jogamp.newt.opengl.GLWindow;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.test.junit.util.QuitAdapter;
@@ -206,7 +206,7 @@ public class TestFBOMix2DemosES2NEWT extends UITestCase {
Assert.assertFalse(animator.isAnimating());
Assert.assertFalse(animator.isStarted());
glWindow.destroy();
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, false, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, false, null));
}
@Test
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOffThreadSharedContextMix2DemosES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOffThreadSharedContextMix2DemosES2NEWT.java
index 4de889940..b0b9b53e4 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOffThreadSharedContextMix2DemosES2NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOffThreadSharedContextMix2DemosES2NEWT.java
@@ -35,8 +35,8 @@ import java.io.InputStreamReader;
import com.jogamp.newt.event.WindowEvent;
import com.jogamp.newt.event.WindowAdapter;
import com.jogamp.newt.opengl.GLWindow;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.test.junit.util.QuitAdapter;
@@ -258,7 +258,7 @@ public class TestFBOOffThreadSharedContextMix2DemosES2NEWT extends UITestCase {
fbod2.destroy();
glWindow.destroy();
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, false, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, false, null));
}
@Test
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOnThreadSharedContext1DemoES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOnThreadSharedContext1DemoES2NEWT.java
index 1fe059a90..2bc512fa0 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOnThreadSharedContext1DemoES2NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOnThreadSharedContext1DemoES2NEWT.java
@@ -35,8 +35,8 @@ import java.io.InputStreamReader;
import com.jogamp.newt.event.WindowEvent;
import com.jogamp.newt.event.WindowAdapter;
import com.jogamp.newt.opengl.GLWindow;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.test.junit.util.QuitAdapter;
@@ -231,7 +231,7 @@ public class TestFBOOnThreadSharedContext1DemoES2NEWT extends UITestCase {
fbod1.destroy();
glWindow.destroy();
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, false, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, false, null));
}
@Test
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 117779b3a..1598a90fb 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
@@ -30,10 +30,9 @@ package com.jogamp.opengl.test.junit.jogl.acore.ect;
import com.jogamp.newt.NewtFactory;
import com.jogamp.newt.Window;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
+import com.jogamp.opengl.test.junit.util.GLTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
-import com.jogamp.opengl.util.Animator;
import com.jogamp.opengl.util.AnimatorBase;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
@@ -361,7 +360,7 @@ public abstract class ExclusiveContextBase00 extends UITestCase {
// Destroy GLWindows
for(int i=0; i<drawableCount; i++) {
destroyGLAutoDrawableVisible(drawables[i]);
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(drawables[i], false, null));
+ Assert.assertEquals(true, GLTestUtil.waitForRealized(drawables[i], false, null));
}
}
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 8f94cfa78..50f04ed17 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
@@ -30,10 +30,9 @@ package com.jogamp.opengl.test.junit.jogl.acore.ect;
import com.jogamp.newt.NewtFactory;
import com.jogamp.newt.Window;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
+import com.jogamp.opengl.test.junit.util.GLTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
-import com.jogamp.opengl.util.Animator;
import com.jogamp.opengl.util.AnimatorBase;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
@@ -183,7 +182,7 @@ public abstract class ExclusiveContextBase10 extends UITestCase {
// Destroy GLWindows
for(int i=0; i<drawableCount; i++) {
destroyGLAutoDrawableVisible(drawables[i]);
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(drawables[i], false, null));
+ Assert.assertEquals(true, GLTestUtil.waitForRealized(drawables[i], false, null));
}
}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/GLContextDrawableSwitchBase1.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/GLContextDrawableSwitchBase1.java
index 5cb802c35..632fd9e3d 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/GLContextDrawableSwitchBase1.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/GLContextDrawableSwitchBase1.java
@@ -49,6 +49,8 @@ import com.jogamp.opengl.GLEventListenerState;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.GLEventListenerCounter;
+import com.jogamp.opengl.test.junit.util.GLTestUtil;
+import com.jogamp.opengl.test.junit.util.TestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import org.junit.Assert;
@@ -212,7 +214,7 @@ public abstract class GLContextDrawableSwitchBase1 extends UITestCase {
} else if( GLADType.GLWindow == gladType ) {
((GLWindow)glad).setVisible(true);
}
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glad, true, null));
+ Assert.assertEquals(true, GLTestUtil.waitForRealized(glad, true, null));
Assert.assertNotNull(glad.getContext());
Assert.assertTrue(glad.isRealized());
@@ -235,10 +237,10 @@ public abstract class GLContextDrawableSwitchBase1 extends UITestCase {
Assert.assertEquals(false, glelsIn.isOwner());
}
- for (int wait=0; wait<AWTRobotUtil.POLL_DIVIDER &&
+ for (int wait=0; wait<TestUtil.POLL_DIVIDER &&
( 1 > glelTracker.initCount || 1 > glelTracker.reshapeCount || 1 > glelTracker.displayCount );
wait++) {
- Thread.sleep(AWTRobotUtil.TIME_SLICE);
+ Thread.sleep(TestUtil.TIME_SLICE);
}
final long t0 = System.currentTimeMillis();
@@ -276,7 +278,7 @@ public abstract class GLContextDrawableSwitchBase1 extends UITestCase {
} else if( GLADType.GLOffscreen == gladType ) {
glad.destroy();
}
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glad, false, null));
+ Assert.assertEquals(true, GLTestUtil.waitForRealized(glad, false, null));
Assert.assertEquals(1, glelTracker.initCount);
Assert.assertTrue(1 <= glelTracker.reshapeCount);
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 33a5d7134..6733d7e57 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
@@ -44,15 +44,14 @@ import com.jogamp.newt.event.WindowAdapter;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.newt.opengl.util.NEWTDemoListener;
import com.jogamp.newt.util.EDTUtil;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.util.Animator;
import com.jogamp.opengl.util.AnimatorBase;
import com.jogamp.opengl.test.junit.jogl.demos.GLClearOnInitReshape;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
import com.jogamp.opengl.test.junit.jogl.demos.es2.LineSquareXDemoES2;
-import com.jogamp.opengl.test.junit.newt.parenting.NewtReparentingKeyAdapter;
import com.jogamp.nativewindow.NativeWindowFactory;
import com.jogamp.nativewindow.ScalableSurface;
import com.jogamp.nativewindow.util.Dimension;
@@ -395,7 +394,7 @@ public class TestGearsES2NEWT extends UITestCase {
glWindow2[0] = null;
}
if( NativeWindowFactory.isAWTAvailable() ) {
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, false, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, false, null));
}
}
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 08f71a679..fb3d82f9a 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
@@ -356,7 +356,7 @@ public class TestGearsES2NewtCanvasAWT extends UITestCase {
}
});
glWindow.destroy();
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, false, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, false, null));
}
@Test
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasSWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasSWT.java
index 7eb57c436..00091e486 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasSWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasSWT.java
@@ -31,7 +31,6 @@ package com.jogamp.opengl.test.junit.jogl.demos.es2.newt;
import java.io.IOException;
import java.lang.reflect.InvocationTargetException;
-import com.jogamp.common.util.InterruptSource;
import com.jogamp.nativewindow.swt.SWTAccessor;
import com.jogamp.newt.NewtFactory;
import com.jogamp.newt.event.KeyAdapter;
@@ -40,7 +39,6 @@ import com.jogamp.newt.event.WindowEvent;
import com.jogamp.newt.event.WindowAdapter;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.newt.swt.NewtCanvasSWT;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.GLTestUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
import com.jogamp.opengl.test.junit.util.NewtTestUtil;
@@ -258,7 +256,7 @@ public class TestGearsES2NewtCanvasSWT extends UITestCase {
canvas1.dispose();
glWindow.destroy();
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, false, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, false, null));
}
@Test
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestRedSquareES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestRedSquareES2NEWT.java
index 0549d9c20..786549fdc 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestRedSquareES2NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestRedSquareES2NEWT.java
@@ -31,8 +31,8 @@ package com.jogamp.opengl.test.junit.jogl.demos.es2.newt;
import com.jogamp.newt.event.KeyAdapter;
import com.jogamp.newt.event.KeyEvent;
import com.jogamp.newt.opengl.GLWindow;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.test.junit.util.QuitAdapter;
import com.jogamp.opengl.util.Animator;
@@ -143,7 +143,7 @@ public class TestRedSquareES2NEWT extends UITestCase {
Assert.assertFalse(animator.isStarted());
glWindow.destroy();
if( NativeWindowFactory.isAWTAvailable() ) {
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, false, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, false, null));
}
}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/javafx/TestNewtCanvasJFXGLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/javafx/TestNewtCanvasJFXGLn.java
index ac5e75b0f..179cd49f0 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/javafx/TestNewtCanvasJFXGLn.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/javafx/TestNewtCanvasJFXGLn.java
@@ -59,6 +59,7 @@ import com.jogamp.opengl.test.junit.newt.parenting.NewtJFXReparentingKeyAdapter;
import com.jogamp.opengl.test.junit.newt.parenting.NewtReparentingKeyAdapter;
import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.util.Animator;
import com.jogamp.opengl.util.GLReadBufferUtil;
@@ -377,7 +378,7 @@ public class TestNewtCanvasJFXGLn extends UITestCase {
}
if( null != glWindow1 ) {
- Assert.assertTrue("GLWindow didn't become visible natively!", AWTRobotUtil.waitForRealized(glWindow1, true, awtRobotWaitAction));
+ Assert.assertTrue("GLWindow didn't become visible natively!", NewtTestUtil.waitForRealized(glWindow1, true, awtRobotWaitAction));
System.err.println("GLWindow LOS.0: "+glWindow1.getLocationOnScreen(null));
glWindow1.addWindowListener(new WindowAdapter() {
public void windowResized(final WindowEvent e) {
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/newt/TestSwingAWTRobotUsageBeforeJOGLInitBug411.java b/src/test/com/jogamp/opengl/test/junit/jogl/newt/TestSwingAWTRobotUsageBeforeJOGLInitBug411.java
index 1d0f00122..2840e4026 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/newt/TestSwingAWTRobotUsageBeforeJOGLInitBug411.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/newt/TestSwingAWTRobotUsageBeforeJOGLInitBug411.java
@@ -164,8 +164,8 @@ public class TestSwingAWTRobotUsageBeforeJOGLInitBug411 extends UITestCase {
robot.setAutoWaitForIdle(true);
// NativeWindow/JOGL is not initialized yet ..
- for (int wait=0; wait<AWTRobotUtil.POLL_DIVIDER && !frame.isVisible(); wait++) {
- Thread.sleep(AWTRobotUtil.TIME_SLICE);
+ for (int wait=0; wait<TestUtil.POLL_DIVIDER && !frame.isVisible(); wait++) {
+ Thread.sleep(TestUtil.TIME_SLICE);
}
Assert.assertEquals(true, frame.isVisible());
@@ -214,7 +214,7 @@ public class TestSwingAWTRobotUsageBeforeJOGLInitBug411 extends UITestCase {
AWTRobotUtil.toFrontAndRequestFocus(robot, frame);
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(drawable, true, null));
+ Assert.assertEquals(true, GLTestUtil.waitForRealized(drawable, true, null));
drawable.addGLEventListener(new GearsES2());
@@ -268,7 +268,7 @@ public class TestSwingAWTRobotUsageBeforeJOGLInitBug411 extends UITestCase {
final GLWindow win0 = GLWindow.create(caps);
win0.setSize(100,100);
win0.setVisible(true);
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(win0, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(win0, true, null));
final Screen screen = win0.getScreen();
final RectangleImmutable screenBoundsInWinU = screen.getViewportInWindowUnits();
@@ -283,7 +283,7 @@ public class TestSwingAWTRobotUsageBeforeJOGLInitBug411 extends UITestCase {
runTestGL(newtCanvasAWT, win1);
win0.destroy();
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(win0, false, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(win0, false, null));
Assert.assertEquals(false, win0.isNativeValid());
Assert.assertEquals(true, anim.isAnimating()); // due to newtCanvasAWT/win1
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestBug672NewtCanvasSWTSashFormComposite.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestBug672NewtCanvasSWTSashFormComposite.java
index e4f2912f9..fd6a3691c 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestBug672NewtCanvasSWTSashFormComposite.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestBug672NewtCanvasSWTSashFormComposite.java
@@ -41,6 +41,7 @@ import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.newt.swt.NewtCanvasSWT;
import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.test.junit.util.QuitAdapter;
import com.jogamp.opengl.util.Animator;
@@ -235,7 +236,7 @@ public class TestBug672NewtCanvasSWTSashFormComposite extends UITestCase {
shell.open();
}
});
- Assert.assertTrue("GLWindow didn't become visible natively!", AWTRobotUtil.waitForRealized(glWindow, true, awtRobotWaitAction));
+ Assert.assertTrue("GLWindow didn't become visible natively!", NewtTestUtil.waitForRealized(glWindow, true, awtRobotWaitAction));
Assert.assertNotNull( canvas1.getNativeWindow() );
System.err.println("NW chosen: "+glWindow.getDelegatedWindow().getChosenCapabilities());
@@ -279,7 +280,7 @@ public class TestBug672NewtCanvasSWTSashFormComposite extends UITestCase {
canvas1.dispose();
glWindow.destroy();
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, false, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, false, null));
}
@Test
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTBug628ResizeDeadlockAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTBug628ResizeDeadlockAWT.java
index 5bfaae3fa..329a08a48 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTBug628ResizeDeadlockAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTBug628ResizeDeadlockAWT.java
@@ -60,6 +60,7 @@ import com.jogamp.newt.opengl.GLWindow ;
import com.jogamp.newt.swt.NewtCanvasSWT ;
import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
////////////////////////////////////////////////////////////////////////////////
@@ -349,7 +350,7 @@ public class TestNewtCanvasSWTBug628ResizeDeadlockAWT extends UITestCase {
dsc.shell.setSize( 400, 450 ) ;
dsc.shell.open() ;
} } );
- Assert.assertTrue("GLWindow didn't become visible natively!", AWTRobotUtil.waitForRealized(glWindow, true, dsc.awtRobotWaitAction));
+ Assert.assertTrue("GLWindow didn't become visible natively!", NewtTestUtil.waitForRealized(glWindow, true, dsc.awtRobotWaitAction));
AWTRobotUtil.requestFocus(robot, glWindow, false);
AWTRobotUtil.setMouseToClientLocation(robot, glWindow, 50, 50);
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTGLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTGLn.java
index 30b34577b..93b1af15a 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTGLn.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTGLn.java
@@ -57,6 +57,7 @@ import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
import com.jogamp.opengl.test.junit.jogl.demos.es2.MultisampleDemoES2;
import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.util.Animator;
import com.jogamp.opengl.util.GLReadBufferUtil;
@@ -194,7 +195,7 @@ public class TestNewtCanvasSWTGLn extends UITestCase {
canvas1.setNEWTChild(glWindow1);
}
- Assert.assertTrue("GLWindow didn't become visible natively!", AWTRobotUtil.waitForRealized(glWindow1, true, awtRobotWaitAction));
+ Assert.assertTrue("GLWindow didn't become visible natively!", NewtTestUtil.waitForRealized(glWindow1, true, awtRobotWaitAction));
System.err.println("GLWindow LOS.0: "+glWindow1.getLocationOnScreen(null));
System.err.println("NewtCanvasSWT LOS.0: "+canvas1.getNativeWindow().getLocationOnScreen(null));
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTBug643AsyncExec.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTBug643AsyncExec.java
index 8a5df90c4..b8ba3b97e 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTBug643AsyncExec.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTBug643AsyncExec.java
@@ -58,8 +58,8 @@ import com.jogamp.newt.opengl.GLWindow ;
import com.jogamp.newt.swt.NewtCanvasSWT ;
import com.jogamp.opengl.swt.GLCanvas;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.util.Animator;
@@ -241,7 +241,7 @@ public class TestSWTBug643AsyncExec extends UITestCase {
if( glWindowPreVisible ) {
newtDisplay.setEDTUtil(new SWTEDTUtil(newtDisplay, dsc.display)); // Especially Windows requires creation access via same thread!
glWindow.setVisible(true);
- AWTRobotUtil.waitForRealized(glWindow, true, null);
+ NewtTestUtil.waitForRealized(glWindow, true, null);
Thread.sleep(120); // let it render a bit, before consumed by SWT
}
glad = glWindow;
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestCloseNewtAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestCloseNewtAWT.java
index 5efc54585..c6dc81342 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestCloseNewtAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestCloseNewtAWT.java
@@ -47,8 +47,8 @@ import com.jogamp.newt.Window;
import com.jogamp.newt.awt.NewtCanvasAWT;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.TestUtil;
-import com.jogamp.opengl.test.junit.util.TestUtil.WindowClosingListener;
import com.jogamp.opengl.test.junit.util.UITestCase;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -114,8 +114,8 @@ public class TestCloseNewtAWT extends UITestCase {
}
});
Assert.assertEquals(true, AWTRobotUtil.waitForVisible(frame, true, null));
- final Object obj = newtWindow;
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(obj, true, null));
+ final GLWindow obj = newtWindow;
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(obj, true, null));
final TestUtil.WindowClosingListener closingListener = AWTRobotUtil.addClosingListener(frame);
Assert.assertEquals(true, AWTRobotUtil.closeWindow(frame, true, closingListener, null));
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestDisplayLifecycle02NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestDisplayLifecycle02NEWT.java
index ef0cf9de7..62e3df992 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestDisplayLifecycle02NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestDisplayLifecycle02NEWT.java
@@ -43,9 +43,9 @@ import com.jogamp.newt.opengl.*;
import java.io.IOException;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -147,8 +147,8 @@ public class TestDisplayLifecycle02NEWT extends UITestCase {
// destruction.. ref count down, but keep all
window.destroy();
- Assert.assertTrue(AWTRobotUtil.waitForRealized(window, false, null));
- Assert.assertTrue(AWTRobotUtil.waitForRealized(screen, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(window, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(screen, false, null));
Assert.assertEquals(screen,window.getScreen());
Assert.assertEquals(0,Display.getActiveDisplayNumber());
@@ -195,8 +195,8 @@ public class TestDisplayLifecycle02NEWT extends UITestCase {
System.err.println("duration: "+window.getTotalFPSDuration());
window.destroy();
- Assert.assertTrue(AWTRobotUtil.waitForRealized(window, false, null));
- Assert.assertTrue(AWTRobotUtil.waitForRealized(screen, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(window, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(screen, false, null));
Assert.assertEquals(screen,window.getScreen());
Assert.assertEquals(false,window.isNativeValid());
@@ -300,7 +300,7 @@ public class TestDisplayLifecycle02NEWT extends UITestCase {
// destruction ...
window1.destroy();
- Assert.assertTrue(AWTRobotUtil.waitForRealized(window1, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(window1, false, null));
Assert.assertNotNull(window1.getScreen());
Assert.assertEquals(false,window1.isNativeValid());
@@ -317,8 +317,8 @@ public class TestDisplayLifecycle02NEWT extends UITestCase {
// destruction
window2.destroy();
- Assert.assertTrue(AWTRobotUtil.waitForRealized(window2, false, null));
- Assert.assertTrue(AWTRobotUtil.waitForRealized(screen, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(window2, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(screen, false, null));
Assert.assertNotNull(window2.getScreen());
Assert.assertEquals(false,window2.isNativeValid());
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowAndPointerIconNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowAndPointerIconNEWT.java
index 4dcc843f8..8e2d191b2 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowAndPointerIconNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowAndPointerIconNEWT.java
@@ -46,8 +46,8 @@ import com.jogamp.newt.Display;
import com.jogamp.newt.Display.PointerIcon;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.QuitAdapter;
import com.jogamp.opengl.util.Animator;
import com.jogamp.opengl.util.AnimatorBase;
@@ -126,7 +126,7 @@ public class TestWindowAndPointerIconNEWT extends SingletonJunitCase {
glWindow.destroy();
if( NativeWindowFactory.isAWTAvailable() ) {
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, false, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, false, null));
}
}
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol02NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol02NEWT.java
index b7a112c23..232d333c3 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol02NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol02NEWT.java
@@ -44,7 +44,7 @@ import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.TestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
@@ -56,7 +56,7 @@ public class TestWindowClosingProtocol02NEWT extends UITestCase {
final GLProfile glp = GLProfile.getGL2ES2();
final GLCapabilities caps = new GLCapabilities(glp);
final GLWindow glWindow = GLWindow.create(caps);
- final TestUtil.WindowClosingListener closingListener = AWTRobotUtil.addClosingListener(glWindow);
+ final TestUtil.WindowClosingListener closingListener = NewtTestUtil.addClosingListener(glWindow);
glWindow.addGLEventListener(new GearsES2());
glWindow.setSize(512, 512);
@@ -76,7 +76,7 @@ public class TestWindowClosingProtocol02NEWT extends UITestCase {
Thread.sleep(300);
- Assert.assertEquals(true, AWTRobotUtil.closeWindow(glWindow, false, closingListener, null)); // nop
+ Assert.assertEquals(true, NewtTestUtil.closeWindow(glWindow, false, closingListener, null)); // nop
Assert.assertEquals(true, glWindow.isNativeValid());
Assert.assertEquals(true, closingListener.isWindowClosing());
closingListener.reset();
@@ -88,7 +88,7 @@ public class TestWindowClosingProtocol02NEWT extends UITestCase {
op = glWindow.getDefaultCloseOperation();
Assert.assertEquals(WindowClosingMode.DISPOSE_ON_CLOSE, op);
- Assert.assertEquals(true, AWTRobotUtil.closeWindow(glWindow, true, closingListener, null));
+ Assert.assertEquals(true, NewtTestUtil.closeWindow(glWindow, true, closingListener, null));
Assert.assertEquals(false, glWindow.isNativeValid());
Assert.assertEquals(true, closingListener.isWindowClosing());
}
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java
index 7a41f09b7..24a6c58bf 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java
@@ -47,8 +47,8 @@ import com.jogamp.opengl.GLProfile;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.TestUtil;
-import com.jogamp.opengl.test.junit.util.TestUtil.WindowClosingListener;
import com.jogamp.opengl.test.junit.util.UITestCase;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
@@ -62,7 +62,7 @@ public class TestWindowClosingProtocol03NewtAWT extends UITestCase {
final GLProfile glp = GLProfile.getGL2ES2();
final GLCapabilities caps = new GLCapabilities(glp);
final GLWindow glWindow = GLWindow.create(caps);
- final TestUtil.WindowClosingListener newtClosingListener = AWTRobotUtil.addClosingListener(glWindow);
+ final TestUtil.WindowClosingListener newtClosingListener = NewtTestUtil.addClosingListener(glWindow);
glWindow.addGLEventListener(new GearsES2());
@@ -77,7 +77,7 @@ public class TestWindowClosingProtocol03NewtAWT extends UITestCase {
frame.setVisible(true);
} });
Assert.assertEquals(true, AWTRobotUtil.waitForVisible(frame, true, null));
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, true, null));
Assert.assertEquals(true, frame.isDisplayable());
Assert.assertEquals(true, frame.isVisible());
Assert.assertEquals(true, newtCanvas.isValid());
@@ -114,7 +114,7 @@ public class TestWindowClosingProtocol03NewtAWT extends UITestCase {
frame.setVisible(true);
} });
Assert.assertEquals(true, AWTRobotUtil.waitForVisible(frame, true, null));
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, true, null));
Assert.assertEquals(true, frame.isDisplayable());
Assert.assertEquals(true, frame.isVisible());
@@ -131,7 +131,7 @@ public class TestWindowClosingProtocol03NewtAWT extends UITestCase {
Thread.sleep(300);
Assert.assertEquals(true, AWTRobotUtil.closeWindow(frame, true, awtClosingListener, null));
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, false, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, false, null));
Assert.assertEquals(false, frame.isDisplayable());
Assert.assertEquals(false, frame.isVisible());
Assert.assertEquals(false, newtCanvas.isValid());
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNewtCanvasAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNewtCanvasAWT.java
index 373cfcf33..0fb34a062 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNewtCanvasAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNewtCanvasAWT.java
@@ -47,6 +47,7 @@ import com.jogamp.newt.awt.NewtCanvasAWT ;
import com.jogamp.newt.opengl.GLWindow ;
import com.jogamp.opengl.test.junit.jogl.demos.es2.RedSquareES2;
import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
/**
* Test whether or not event modifiers are preserved by NEWT when
@@ -84,9 +85,9 @@ public class TestNewtEventModifiersNewtCanvasAWT extends BaseNewtEventModifiers
}
} ) ;
Assert.assertEquals(true, AWTRobotUtil.waitForVisible(_testFrame, true, null));
- Assert.assertTrue(AWTRobotUtil.waitForVisible(_glWindow, true, null));
- final Object obj = _glWindow;
- Assert.assertTrue(AWTRobotUtil.waitForRealized(obj, true, null));
+ Assert.assertTrue(NewtTestUtil.waitForVisible(_glWindow, true, null));
+ final GLWindow obj = _glWindow;
+ Assert.assertTrue(NewtTestUtil.waitForRealized(obj, true, null));
AWTRobotUtil.assertRequestFocusAndWait(null, _glWindow, _glWindow, null, null); // programmatic
Assert.assertNotNull(_robot);
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodeModifiersAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodeModifiersAWT.java
index 3f693f12b..40ae3d29d 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodeModifiersAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodeModifiersAWT.java
@@ -253,7 +253,7 @@ public class TestNewtKeyCodeModifiersAWT extends UITestCase {
glWindow1KA.setVerbose(false);
glWindow.addKeyListener(glWindow1KA);
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, true, null));
// Continuous animation ..
final Animator animator = new Animator(glWindow);
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodesAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodesAWT.java
index b450311ce..821063ee5 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodesAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodesAWT.java
@@ -243,7 +243,7 @@ public class TestNewtKeyCodesAWT extends UITestCase {
glWindow1KA.setVerbose(false);
glWindow.addKeyListener(glWindow1KA);
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, true, null));
// Continuous animation ..
final Animator animator = new Animator(glWindow);
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventAutoRepeatAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventAutoRepeatAWT.java
index b2db2f95d..e48193ed0 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventAutoRepeatAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventAutoRepeatAWT.java
@@ -261,7 +261,7 @@ public class TestNewtKeyEventAutoRepeatAWT extends UITestCase {
glWindow1KA.setVerbose(false);
glWindow.addKeyListener(glWindow1KA);
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, true, null));
// Continuous animation ..
final Animator animator = new Animator(glWindow);
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventOrderAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventOrderAWT.java
index d169c0d2e..c4fee01f0 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventOrderAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventOrderAWT.java
@@ -210,7 +210,7 @@ public class TestNewtKeyEventOrderAWT extends UITestCase {
glWindow1KA.setVerbose(false);
glWindow.addKeyListener(glWindow1KA);
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, true, null));
// Continuous animation ..
final Animator animator = new Animator(glWindow);
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyPressReleaseUnmaskRepeatAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyPressReleaseUnmaskRepeatAWT.java
index 1083fe93c..87dc1576d 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyPressReleaseUnmaskRepeatAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyPressReleaseUnmaskRepeatAWT.java
@@ -166,7 +166,7 @@ public class TestNewtKeyPressReleaseUnmaskRepeatAWT extends UITestCase {
final SimpleKeyPressRelease simpleKeyPressRelease = new SimpleKeyPressRelease();
glWindow.addKeyListener(simpleKeyPressRelease);
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow, true, null));
// Continuous animation ..
final Animator animator = new Animator(glWindow);
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus01SwingAWTRobot.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus01SwingAWTRobot.java
index 27f6a7239..d3728e2be 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus01SwingAWTRobot.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus01SwingAWTRobot.java
@@ -148,7 +148,7 @@ public class TestParentingFocus01SwingAWTRobot extends UITestCase {
frame1.setVisible(true);
} } );
Assert.assertEquals(true, AWTRobotUtil.waitForVisible(frame1, true, null));
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow1, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow1, true, null));
AWTRobotUtil.clearAWTFocus(robot);
Assert.assertTrue(AWTRobotUtil.toFrontAndRequestFocus(robot, frame1));
@@ -217,7 +217,7 @@ public class TestParentingFocus01SwingAWTRobot extends UITestCase {
Assume.assumeNoException( throwable );
}
glWindow1.destroy();
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow1, false, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow1, false, null));
}
static int atoi(final String a) {
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus02SwingAWTRobot.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus02SwingAWTRobot.java
index 3e1a78c05..b6a95caff 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus02SwingAWTRobot.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus02SwingAWTRobot.java
@@ -172,7 +172,7 @@ public class TestParentingFocus02SwingAWTRobot extends UITestCase {
jFrame1.setVisible(true);
} } );
Assert.assertEquals(true, AWTRobotUtil.waitForVisible(jFrame1, true, null));
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow1, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow1, true, null));
AWTRobotUtil.clearAWTFocus(robot);
Assert.assertTrue(AWTRobotUtil.toFrontAndRequestFocus(robot, jFrame1));
@@ -280,7 +280,7 @@ public class TestParentingFocus02SwingAWTRobot extends UITestCase {
} });
glWindow1.destroy();
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow1, false, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow1, false, null));
}
@Test
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus03KeyTraversalAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus03KeyTraversalAWT.java
index d35ef1797..14cb9065e 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus03KeyTraversalAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestParentingFocus03KeyTraversalAWT.java
@@ -211,8 +211,8 @@ public class TestParentingFocus03KeyTraversalAWT extends UITestCase {
frame1.validate();
frame1.setVisible(true);
}});
- Assert.assertEquals(true, AWTRobotUtil.waitForVisible(glWindow1, true, null));
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow1, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForVisible(glWindow1, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow1, true, null));
Assert.assertEquals(newtCanvasAWT1.getNativeWindow(),glWindow1.getParent());
AWTRobotUtil.clearAWTFocus(robot);
Assert.assertTrue(AWTRobotUtil.toFrontAndRequestFocus(robot, frame1));
@@ -236,7 +236,7 @@ public class TestParentingFocus03KeyTraversalAWT extends UITestCase {
// bWest -> glWin
AWTRobotUtil.keyType(0, robot, java.awt.event.KeyEvent.VK_TAB, cWest, null);
- Assert.assertTrue("Did not gain focus", AWTRobotUtil.waitForFocus(glWindow1, glWindow1FA, bWestFA, null));
+ Assert.assertTrue("Did not gain focus", NewtTestUtil.waitForFocus(glWindow1, glWindow1FA, bWestFA, null));
Assert.assertEquals(true, glWindow1FA.focusGained());
Assert.assertEquals(true, bWestFA.focusLost());
Thread.sleep(durationPerTest/numFocus);
@@ -253,7 +253,7 @@ public class TestParentingFocus03KeyTraversalAWT extends UITestCase {
//
// bEast -> glWin
AWTRobotUtil.keyType(0, robot, java.awt.event.KeyEvent.VK_BACK_SPACE, cEast, null);
- Assert.assertTrue("Did not gain focus", AWTRobotUtil.waitForFocus(glWindow1, glWindow1FA, bEastFA, null));
+ Assert.assertTrue("Did not gain focus", NewtTestUtil.waitForFocus(glWindow1, glWindow1FA, bEastFA, null));
Assert.assertEquals(true, glWindow1FA.focusGained());
Assert.assertEquals(true, bEastFA.focusLost());
Thread.sleep(durationPerTest/numFocus);
@@ -272,7 +272,7 @@ public class TestParentingFocus03KeyTraversalAWT extends UITestCase {
}
});
} catch (final Exception ex) { ex.printStackTrace(); }
- Assert.assertTrue("Did not gain focus", AWTRobotUtil.waitForFocus(glWindow1, glWindow1FA, bWestFA, null));
+ Assert.assertTrue("Did not gain focus", NewtTestUtil.waitForFocus(glWindow1, glWindow1FA, bWestFA, null));
Assert.assertEquals(true, glWindow1FA.focusGained());
Assert.assertEquals(true, bWestFA.focusLost());
Thread.sleep(durationPerTest/numFocus);
@@ -295,7 +295,7 @@ public class TestParentingFocus03KeyTraversalAWT extends UITestCase {
{
// Short: Assert.assertTrue("Did not gain focus", AWTRobotUtil.waitForFocus(glWindow1, glWindow1FA, bWestFA));
// More verbose:
- final boolean ok = AWTRobotUtil.waitForFocus(glWindow1, glWindow1FA, bWestFA, null);
+ final boolean ok = NewtTestUtil.waitForFocus(glWindow1, glWindow1FA, bWestFA, null);
System.err.println("glWindow hasFocus "+glWindow1.hasFocus());
System.err.println("glWindow1FA "+glWindow1FA);
System.err.println("bWestFA "+bWestFA);
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00bNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00bNEWT.java
index 7d213d2b7..b4b640280 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00bNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00bNEWT.java
@@ -44,7 +44,7 @@ import com.jogamp.newt.Screen;
import com.jogamp.newt.MonitorMode;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.util.Animator;
@@ -119,7 +119,7 @@ public class TestScreenMode00bNEWT extends UITestCase {
Assert.assertEquals(false,window.isVisible());
Assert.assertEquals(false,window.isNativeValid());
- Assert.assertTrue(AWTRobotUtil.waitForRealized(screen, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(screen, false, null));
Assert.assertEquals(false,screen.isNativeValid());
Assert.assertEquals(false,display.isNativeValid());
}
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00cNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00cNEWT.java
index 6d48bbf51..31a16b8c6 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00cNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00cNEWT.java
@@ -49,8 +49,8 @@ import com.jogamp.newt.MonitorMode;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.newt.util.MonitorModeUtil;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import java.util.List;
@@ -110,7 +110,7 @@ public class TestScreenMode00cNEWT extends UITestCase {
static void destroyWindow(final Window window) throws InterruptedException {
if(null!=window) {
window.destroy();
- Assert.assertTrue(AWTRobotUtil.waitForRealized(window, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(window, false, null));
}
}
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01aNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01aNEWT.java
index 2dd5439c4..ab8ad8661 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01aNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01aNEWT.java
@@ -49,8 +49,8 @@ import com.jogamp.newt.MonitorMode;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.newt.util.MonitorModeUtil;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import java.util.List;
@@ -111,7 +111,7 @@ public class TestScreenMode01aNEWT extends UITestCase {
static void destroyWindow(final Window window) throws InterruptedException {
if(null!=window) {
window.destroy();
- Assert.assertTrue(AWTRobotUtil.waitForRealized(window, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(window, false, null));
}
}
@@ -219,7 +219,7 @@ public class TestScreenMode01aNEWT extends UITestCase {
Assert.assertEquals(false,window0.isVisible());
Assert.assertEquals(false,window0.isNativeValid());
- Assert.assertTrue(AWTRobotUtil.waitForRealized(screen, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(screen, false, null));
Assert.assertEquals(false,screen.isNativeValid());
Assert.assertEquals(false,display.isNativeValid());
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01bNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01bNEWT.java
index c83ea1df0..60d61f905 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01bNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01bNEWT.java
@@ -49,8 +49,8 @@ import com.jogamp.newt.MonitorMode;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.newt.util.MonitorModeUtil;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.util.Animator;
@@ -105,7 +105,7 @@ public class TestScreenMode01bNEWT extends UITestCase {
static void destroyWindow(final Window window) throws InterruptedException {
if(null!=window) {
window.destroy();
- Assert.assertTrue(AWTRobotUtil.waitForRealized(window, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(window, false, null));
}
}
@@ -121,7 +121,7 @@ public class TestScreenMode01bNEWT extends UITestCase {
testScreenModeChangeImpl(screen, monitorVp.getX(), monitorVp.getY());
} finally {
screen.removeReference();
- Assert.assertTrue(AWTRobotUtil.waitForRealized(screen, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(screen, false, null));
}
}
@@ -141,7 +141,7 @@ public class TestScreenMode01bNEWT extends UITestCase {
testScreenModeChangeImpl(screen, monitorVp.getX(), monitorVp.getY());
} finally {
screen.removeReference();
- Assert.assertTrue(AWTRobotUtil.waitForRealized(screen, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(screen, false, null));
}
}
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01cNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01cNEWT.java
index 3ca24009d..61a8527a7 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01cNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01cNEWT.java
@@ -48,8 +48,8 @@ import com.jogamp.newt.Window;
import com.jogamp.newt.MonitorMode;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
import com.jogamp.opengl.test.junit.util.MiscUtils;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.util.Animator;
@@ -105,7 +105,7 @@ public class TestScreenMode01cNEWT extends UITestCase {
static void destroyWindow(final Window window) throws InterruptedException {
if(null!=window) {
window.destroy();
- AWTRobotUtil.waitForRealized(window, false, null); // don't override a previous assertion failure
+ NewtTestUtil.waitForRealized(window, false, null); // don't override a previous assertion failure
}
}
@@ -121,7 +121,7 @@ public class TestScreenMode01cNEWT extends UITestCase {
testScreenFullscreenImpl(screen, monitorVp.getX(), monitorVp.getY(), false, null);
} finally {
screen.removeReference();
- AWTRobotUtil.waitForRealized(screen, false, null); // don't override a previous assertion failure
+ NewtTestUtil.waitForRealized(screen, false, null); // don't override a previous assertion failure
}
}
@@ -141,7 +141,7 @@ public class TestScreenMode01cNEWT extends UITestCase {
testScreenFullscreenImpl(screen, monitorVp.getX(), monitorVp.getY(), false, null);
} finally {
screen.removeReference();
- AWTRobotUtil.waitForRealized(screen, false, null); // don't override a previous assertion failure
+ NewtTestUtil.waitForRealized(screen, false, null); // don't override a previous assertion failure
}
}
@@ -164,7 +164,7 @@ public class TestScreenMode01cNEWT extends UITestCase {
testScreenFullscreenImpl(screen, monitorVp.getX()+50, monitorVp.getY()+50, true, monitors);
} finally {
screen.removeReference();
- AWTRobotUtil.waitForRealized(screen, false, null); // don't override a previous assertion failure
+ NewtTestUtil.waitForRealized(screen, false, null); // don't override a previous assertion failure
}
}
@@ -184,7 +184,7 @@ public class TestScreenMode01cNEWT extends UITestCase {
testScreenFullscreenImpl(screen, monitorVp.getX()-50, monitorVp.getY()+50, true, null);
} finally {
screen.removeReference();
- AWTRobotUtil.waitForRealized(screen, false, null); // don't override a previous assertion failure
+ NewtTestUtil.waitForRealized(screen, false, null); // don't override a previous assertion failure
}
}
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01dNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01dNEWT.java
index ae52c98d5..7b22dea65 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01dNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01dNEWT.java
@@ -50,7 +50,7 @@ import com.jogamp.newt.MonitorMode;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.newt.util.MonitorModeUtil;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import java.util.List;
@@ -142,7 +142,7 @@ public class TestScreenMode01dNEWT extends UITestCase {
static void destroyWindow(final Window window) throws InterruptedException {
if(null!=window) {
window.destroy();
- Assert.assertTrue(AWTRobotUtil.waitForRealized(window, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(window, false, null));
}
}
@@ -189,7 +189,7 @@ public class TestScreenMode01dNEWT extends UITestCase {
Assert.assertEquals(false,window.isVisible());
Assert.assertEquals(false,window.isRealized());
Assert.assertEquals(false,window.isNativeValid());
- Assert.assertTrue(AWTRobotUtil.waitForRealized(screen, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(screen, false, null));
Assert.assertEquals(false,screen.isNativeValid());
Assert.assertEquals(false,display.isNativeValid());
@@ -279,7 +279,7 @@ public class TestScreenMode01dNEWT extends UITestCase {
Assert.assertEquals(false,window.isVisible());
Assert.assertEquals(false,window.isRealized());
Assert.assertEquals(false,window.isNativeValid());
- Assert.assertTrue(AWTRobotUtil.waitForRealized(screen, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(screen, false, null));
Assert.assertEquals(false,screen.isNativeValid());
Assert.assertEquals(false,display.isNativeValid());
@@ -386,7 +386,7 @@ public class TestScreenMode01dNEWT extends UITestCase {
Assert.assertEquals(false,window.isVisible());
Assert.assertEquals(false,window.isRealized());
Assert.assertEquals(false,window.isNativeValid());
- Assert.assertTrue(AWTRobotUtil.waitForRealized(screen, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(screen, false, null));
Assert.assertEquals(false,screen.isNativeValid());
Assert.assertEquals(false,display.isNativeValid());
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02aNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02aNEWT.java
index 04f89aa22..d512df3d7 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02aNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02aNEWT.java
@@ -50,7 +50,7 @@ import com.jogamp.newt.MonitorMode;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.newt.util.MonitorModeUtil;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import java.util.List;
import com.jogamp.nativewindow.util.Dimension;
@@ -92,7 +92,7 @@ public class TestScreenMode02aNEWT extends UITestCase {
static void destroyWindow(final Window window) throws InterruptedException {
if(null!=window) {
window.destroy();
- Assert.assertTrue(AWTRobotUtil.waitForRealized(window, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(window, false, null));
}
}
@@ -240,7 +240,7 @@ public class TestScreenMode02aNEWT extends UITestCase {
Assert.assertEquals(false,window.isVisible());
Assert.assertEquals(false,window.isNativeValid());
- Assert.assertTrue(AWTRobotUtil.waitForRealized(screen, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(screen, false, null));
Assert.assertEquals(false,screen.isNativeValid());
Assert.assertEquals(false,display.isNativeValid());
}
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02bNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02bNEWT.java
index 619116c1e..8388a9ad0 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02bNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02bNEWT.java
@@ -49,7 +49,7 @@ import com.jogamp.newt.MonitorMode;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.newt.util.MonitorModeUtil;
import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
-import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
+import com.jogamp.opengl.test.junit.util.NewtTestUtil;
import com.jogamp.opengl.test.junit.util.UITestCase;
import com.jogamp.opengl.util.Animator;
@@ -106,7 +106,7 @@ public class TestScreenMode02bNEWT extends UITestCase {
static void destroyWindow(final Window window) throws InterruptedException {
if(null!=window) {
window.destroy();
- Assert.assertTrue(AWTRobotUtil.waitForRealized(window, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(window, false, null));
}
}
@@ -249,7 +249,7 @@ public class TestScreenMode02bNEWT extends UITestCase {
Assert.assertEquals(false,window.isVisible());
Assert.assertEquals(false,window.isNativeValid());
- Assert.assertTrue(AWTRobotUtil.waitForRealized(screen, false, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(screen, false, null));
Assert.assertEquals(false,screen.isNativeValid());
Assert.assertEquals(false,display.isNativeValid());
}
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01aAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01aAWT.java
index bf2cc5289..b030bc5e4 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01aAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01aAWT.java
@@ -114,8 +114,8 @@ public class TestParenting01aAWT extends UITestCase {
final Animator animator1 = new Animator(glWindow1);
animator1.setUpdateFPSFrames(1, null);
animator1.start();
- Assert.assertTrue(AWTRobotUtil.waitForRealized(glWindow1, true, null));
- Assert.assertTrue(AWTRobotUtil.waitForVisible(glWindow1, true, null));
+ Assert.assertTrue(NewtTestUtil.waitForRealized(glWindow1, true, null));
+ Assert.assertTrue(NewtTestUtil.waitForVisible(glWindow1, true, null));
while(animator1.isAnimating() && animator1.getTotalFPSDuration()<durationPerTest) {
Thread.sleep(100);
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01cSwingAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01cSwingAWT.java
index 1144ffbe6..175b3c675 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01cSwingAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01cSwingAWT.java
@@ -178,8 +178,8 @@ public class TestParenting01cSwingAWT extends UITestCase {
jFrame1.setVisible(true);
}
});
- Assert.assertEquals(true, AWTRobotUtil.waitForRealized(glWindow1, true, null));
- Assert.assertEquals(true, AWTRobotUtil.waitForVisible(glWindow1, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForRealized(glWindow1, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForVisible(glWindow1, true, null));
// visible test
Assert.assertEquals(newtCanvasAWT.getNativeWindow(),glWindow1.getParent());
@@ -196,14 +196,14 @@ public class TestParenting01cSwingAWT extends UITestCase {
System.err.println("Demos: 3 - !Visible");
jFrame1.setVisible(false);
} });
- Assert.assertEquals(true, AWTRobotUtil.waitForVisible(glWindow1, false, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForVisible(glWindow1, false, null));
SwingUtilities.invokeAndWait(new Runnable() {
public void run() {
System.err.println("Demos: 4 - Visible");
jFrame1.setVisible(true);
} });
- Assert.assertEquals(true, AWTRobotUtil.waitForVisible(glWindow1, true, null));
+ Assert.assertEquals(true, NewtTestUtil.waitForVisible(glWindow1, true, null));
final boolean wasOnscreen = glWindow1.getChosenCapabilities().isOnscreen();
diff --git a/src/test/com/jogamp/opengl/test/junit/util/AWTRobotUtil.java b/src/test/com/jogamp/opengl/test/junit/util/AWTRobotUtil.java
index bb35bd81b..cbc969589 100644
--- a/src/test/com/jogamp/opengl/test/junit/util/AWTRobotUtil.java
+++ b/src/test/com/jogamp/opengl/test/junit/util/AWTRobotUtil.java
@@ -117,6 +117,7 @@ public class AWTRobotUtil extends TestUtil {
System.err.println("******** clearAWTFocus.X");
}
+ // FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
public static int[] getCenterLocation(final Object obj, final boolean onTitleBarIfWindow)
throws InterruptedException, InvocationTargetException {
if(obj instanceof com.jogamp.newt.Window) {
@@ -155,6 +156,7 @@ public class AWTRobotUtil extends TestUtil {
return new int[] { x0, y0 };
}
+ // FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
public static int[] getClientLocation(final Object obj, final int x, final int y)
throws InterruptedException, InvocationTargetException {
if(obj instanceof com.jogamp.newt.Window) {
@@ -231,6 +233,7 @@ public class AWTRobotUtil extends TestUtil {
/**
* centerMouse
+ * FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
* @param onTitleBarIfWindow TODO
*/
public static void centerMouse(Robot robot, final Object obj, final boolean onTitleBarIfWindow)
@@ -246,6 +249,7 @@ public class AWTRobotUtil extends TestUtil {
awtRobotMouseMove(robot, p0[0], p0[1] );
}
+ // FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
public static void setMouseToClientLocation(Robot robot, final Object obj, final int x, final int y)
throws AWTException, InterruptedException, InvocationTargetException {
@@ -258,6 +262,7 @@ public class AWTRobotUtil extends TestUtil {
awtRobotMouseMove(robot, p0[0], p0[1] );
}
+ // FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
public static int getClickTimeout(final Object obj) {
if(obj instanceof com.jogamp.newt.Window) {
return com.jogamp.newt.event.MouseEvent.getClickTimeout();
@@ -276,6 +281,8 @@ public class AWTRobotUtil extends TestUtil {
}
/**
+ * FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
+ *
* requestFocus, if robot is valid, use mouse operation,
* otherwise programmatic, ie call requestFocus
*/
@@ -285,6 +292,8 @@ public class AWTRobotUtil extends TestUtil {
}
/**
+ * FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
+ *
* requestFocus, if robot is valid, use mouse operation,
* otherwise programmatic, ie call requestFocus
*/
@@ -324,6 +333,7 @@ public class AWTRobotUtil extends TestUtil {
}});
}
+ // FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
public static void requestFocus(final Robot robot, final Object obj, final int x, final int y)
throws AWTException, InterruptedException, InvocationTargetException {
validateAWTEDTIsAlive();
@@ -342,6 +352,7 @@ public class AWTRobotUtil extends TestUtil {
robot.delay( d );
}
+ // FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
public static boolean hasFocus(final Object obj) {
if(obj instanceof com.jogamp.newt.Window) {
return ((com.jogamp.newt.Window) obj).hasFocus();
@@ -359,24 +370,17 @@ public class AWTRobotUtil extends TestUtil {
* @param waitAction if not null, Runnable shall wait {@link #TIME_SLICE} ms, if appropriate
* @return True if the Window became the global focused Window within TIME_OUT
*/
- public static boolean waitForFocus(final Object obj, final Runnable waitAction) throws InterruptedException {
- if(obj instanceof com.jogamp.newt.Window) {
- return NewtTestUtil.waitForFocus((com.jogamp.newt.Window) obj, waitAction);
- } else if(NativeWindowFactory.isAWTAvailable() && obj instanceof java.awt.Component) {
- int wait;
- final java.awt.Component comp = (java.awt.Component) obj;
- final java.awt.KeyboardFocusManager kfm = java.awt.KeyboardFocusManager.getCurrentKeyboardFocusManager();
- for (wait=0; wait<POLL_DIVIDER && comp != kfm.getPermanentFocusOwner(); wait++) {
- if( null != waitAction ) {
- waitAction.run();
- } else {
- Thread.sleep(TIME_SLICE);
- }
+ public static boolean waitForFocus(final java.awt.Component comp, final Runnable waitAction) throws InterruptedException {
+ int wait;
+ final java.awt.KeyboardFocusManager kfm = java.awt.KeyboardFocusManager.getCurrentKeyboardFocusManager();
+ for (wait=0; wait<POLL_DIVIDER && comp != kfm.getPermanentFocusOwner(); wait++) {
+ if( null != waitAction ) {
+ waitAction.run();
+ } else {
+ Thread.sleep(TIME_SLICE);
}
- return wait<POLL_DIVIDER;
- } else {
- throw new RuntimeException("Neither AWT nor NEWT: "+obj);
}
+ return wait<POLL_DIVIDER;
}
/**
@@ -384,14 +388,15 @@ public class AWTRobotUtil extends TestUtil {
* @param waitAction if not null, Runnable shall wait {@link #TIME_SLICE} ms, if appropriate
* @return True if the Window became the global focused Window within TIME_OUT
*/
- public static boolean waitForFocus(final Object obj, final FocusEventCountAdapter gain,
+ public static boolean waitForFocus(final java.awt.Component comp, final FocusEventCountAdapter gain,
final FocusEventCountAdapter lost, final Runnable waitAction) throws InterruptedException {
- if(!waitForFocus(obj, waitAction)) {
+ if(!waitForFocus(comp, waitAction)) {
return false;
}
return TestUtil.waitForFocus(gain, lost, waitAction);
}
+ // FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
public static void assertRequestFocusAndWait(final Robot robot, final Object requestFocus, final Object waitForFocus,
final FocusEventCountAdapter gain, final FocusEventCountAdapter lost)
throws AWTException, InterruptedException, InvocationTargetException {
@@ -401,7 +406,13 @@ public class AWTRobotUtil extends TestUtil {
for(i=0; i < RETRY_NUMBER && !hasFocus; i++) {
requestFocus(robot, requestFocus);
- hasFocus = waitForFocus(waitForFocus, gain, lost, null);
+ if(waitForFocus instanceof com.jogamp.newt.Window) {
+ hasFocus = NewtTestUtil.waitForFocus((com.jogamp.newt.Window)waitForFocus, gain, lost, null);
+ } else if(NativeWindowFactory.isAWTAvailable() && waitForFocus instanceof java.awt.Component) {
+ hasFocus = waitForFocus((java.awt.Component)waitForFocus, gain, lost, null);
+ } else {
+ throw new RuntimeException("Neither AWT nor NEWT: "+waitForFocus);
+ }
}
if(!hasFocus) {
System.err.print("*** AWTRobotUtil.assertRequestFocusAndWait() ");
@@ -438,6 +449,7 @@ public class AWTRobotUtil extends TestUtil {
robot.delay(msDelay);
}
+ // FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
public static int keyType(final int i, final Robot robot, final int keyCode,
final Object obj, final KeyEventCountAdapter counter) throws InterruptedException, AWTException, InvocationTargetException
{
@@ -497,6 +509,8 @@ public class AWTRobotUtil extends TestUtil {
}
/**
+ * FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
+ *
* @param keyCode TODO
* @param counter shall return the number of keys typed (press + release)
*/
@@ -529,6 +543,8 @@ public class AWTRobotUtil extends TestUtil {
}
/**
+ * FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
+ *
* @param keyCode TODO
* @param counter shall return the number of keys typed (press + release)
*/
@@ -579,6 +595,7 @@ public class AWTRobotUtil extends TestUtil {
robot.delay(actionDelay);
}
+ // FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
static int mouseClick(final int i, final Robot robot, final int mouseButton,
final Object obj, final InputEventCountAdapter counter) throws InterruptedException, AWTException, InvocationTargetException
{
@@ -610,6 +627,8 @@ public class AWTRobotUtil extends TestUtil {
}
/**
+ * FIXME: AWTRobotUtil Cleanup: Use specific type for argument object
+ *
* @param mouseButton ie InputEvent.BUTTON1_MASK
* @param clickCount ie 1, or 2
*/
@@ -650,23 +669,16 @@ public class AWTRobotUtil extends TestUtil {
* @param waitAction if not null, Runnable shall wait {@link #TIME_SLICE} ms, if appropriate
* @return True if the Component becomes <code>visible</code> within TIME_OUT
*/
- public static boolean waitForVisible(final Object obj, final boolean visible, final Runnable waitAction) throws InterruptedException {
- if(obj instanceof com.jogamp.newt.Window) {
- return NewtTestUtil.waitForVisible((com.jogamp.newt.Window) obj, visible, waitAction);
- } else if(NativeWindowFactory.isAWTAvailable() && obj instanceof java.awt.Component) {
- int wait;
- final java.awt.Component comp = (java.awt.Component) obj;
- for (wait=0; wait<POLL_DIVIDER && visible != comp.isShowing(); wait++) {
- if( null != waitAction ) {
- waitAction.run();
- } else {
- Thread.sleep(TIME_SLICE);
- }
+ public static boolean waitForVisible(final java.awt.Component comp, final boolean visible, final Runnable waitAction) throws InterruptedException {
+ int wait;
+ for (wait=0; wait<POLL_DIVIDER && visible != comp.isShowing(); wait++) {
+ if( null != waitAction ) {
+ waitAction.run();
+ } else {
+ Thread.sleep(TIME_SLICE);
}
- return wait<POLL_DIVIDER;
- } else {
- throw new RuntimeException("Neither AWT nor NEWT: "+obj);
}
+ return wait<POLL_DIVIDER;
}
/**
@@ -676,18 +688,22 @@ public class AWTRobotUtil extends TestUtil {
* @return True if the Component becomes realized (not displayable, native invalid) within TIME_OUT
* @throws InterruptedException
*/
- public static boolean waitForRealized(final Object obj, final boolean realized, final Runnable waitAction) throws InterruptedException {
- if(obj instanceof com.jogamp.newt.Screen) {
- return NewtTestUtil.waitForRealized((com.jogamp.newt.Screen) obj, realized, waitAction);
- } else if(obj instanceof com.jogamp.newt.Window) {
- return NewtTestUtil.waitForRealized((com.jogamp.newt.Window) obj, realized, waitAction);
- } else if(obj instanceof GLAutoDrawable) {
- return GLTestUtil.waitForRealized((GLAutoDrawable) obj, realized, waitAction);
- } else if (NativeWindowFactory.isAWTAvailable() && obj instanceof java.awt.Component) {
- long t0 = System.currentTimeMillis();
- long t1 = t0;
- final java.awt.Component comp = (java.awt.Component) obj;
- while( (t1-t0) < TIME_OUT && realized != comp.isShowing() ) {
+ public static boolean waitForRealized(final java.awt.Component comp, final boolean realized, final Runnable waitAction) throws InterruptedException {
+ long t0 = System.currentTimeMillis();
+ long t1 = t0;
+ while( (t1-t0) < TIME_OUT && realized != comp.isShowing() ) {
+ if( null != waitAction ) {
+ waitAction.run();
+ } else {
+ Thread.sleep(TIME_SLICE);
+ }
+ t1 = System.currentTimeMillis();
+ }
+ // if GLCanvas, ensure it got also painted -> drawable.setRealized(true);
+ if( (t1-t0) < TIME_OUT && comp instanceof GLAutoDrawable) {
+ final GLAutoDrawable glad = (GLAutoDrawable) comp;
+ t0 = System.currentTimeMillis();
+ while( (t1-t0) < TIME_OUT && realized != glad.isRealized() ) {
if( null != waitAction ) {
waitAction.run();
} else {
@@ -695,9 +711,10 @@ public class AWTRobotUtil extends TestUtil {
}
t1 = System.currentTimeMillis();
}
- // if GLCanvas, ensure it got also painted -> drawable.setRealized(true);
- if( (t1-t0) < TIME_OUT && comp instanceof GLAutoDrawable) {
- final GLAutoDrawable glad = (GLAutoDrawable) comp;
+ if( (t1-t0) >= TIME_OUT ) {
+ // for some reason GLCanvas hasn't been painted yet, force it!
+ System.err.println("XXX: FORCE REPAINT PRE - glad: "+glad);
+ comp.repaint();
t0 = System.currentTimeMillis();
while( (t1-t0) < TIME_OUT && realized != glad.isRealized() ) {
if( null != waitAction ) {
@@ -707,26 +724,10 @@ public class AWTRobotUtil extends TestUtil {
}
t1 = System.currentTimeMillis();
}
- if( (t1-t0) >= TIME_OUT ) {
- // for some reason GLCanvas hasn't been painted yet, force it!
- System.err.println("XXX: FORCE REPAINT PRE - glad: "+glad);
- comp.repaint();
- t0 = System.currentTimeMillis();
- while( (t1-t0) < TIME_OUT && realized != glad.isRealized() ) {
- if( null != waitAction ) {
- waitAction.run();
- } else {
- Thread.sleep(TIME_SLICE);
- }
- t1 = System.currentTimeMillis();
- }
- System.err.println("XXX: FORCE REPAINT POST - glad: "+glad);
- }
+ System.err.println("XXX: FORCE REPAINT POST - glad: "+glad);
}
- return (t1-t0) < TIME_OUT;
- } else {
- throw new RuntimeException("Neither AWT nor NEWT nor GLAutoDrawable: "+obj);
}
+ return (t1-t0) < TIME_OUT;
}
/**
@@ -742,38 +743,24 @@ public class AWTRobotUtil extends TestUtil {
* @return True if the Window is closing and closed (if willClose is true), each within TIME_OUT
* @throws InterruptedException
*/
- public static boolean closeWindow(final Object obj, final boolean willClose, final TestUtil.WindowClosingListener closingListener, final Runnable waitAction) throws InterruptedException {
- if(obj instanceof java.awt.Window) {
- closingListener.reset();
- final java.awt.Window win = (java.awt.Window) obj;
- final java.awt.Toolkit tk = java.awt.Toolkit.getDefaultToolkit();
- final java.awt.EventQueue evtQ = tk.getSystemEventQueue();
- AWTEDTExecutor.singleton.invoke(true, new Runnable() {
- public void run() {
- evtQ.postEvent(new java.awt.event.WindowEvent(win, java.awt.event.WindowEvent.WINDOW_CLOSING));
- } });
- return waitUntilClosed(willClose, closingListener, waitAction);
- } else if(obj instanceof com.jogamp.newt.Window) {
- return NewtTestUtil.closeWindow((com.jogamp.newt.Window) obj, willClose, closingListener, waitAction);
- } else {
- throw new RuntimeException("Neither AWT nor NEWT: "+obj);
- }
+ public static boolean closeWindow(final java.awt.Window win, final boolean willClose, final TestUtil.WindowClosingListener closingListener, final Runnable waitAction) throws InterruptedException {
+ closingListener.reset();
+ final java.awt.Toolkit tk = java.awt.Toolkit.getDefaultToolkit();
+ final java.awt.EventQueue evtQ = tk.getSystemEventQueue();
+ AWTEDTExecutor.singleton.invoke(true, new Runnable() {
+ public void run() {
+ evtQ.postEvent(new java.awt.event.WindowEvent(win, java.awt.event.WindowEvent.WINDOW_CLOSING));
+ } });
+ return waitUntilClosed(willClose, closingListener, waitAction);
}
- public static TestUtil.WindowClosingListener addClosingListener(final Object obj) {
- if(obj instanceof java.awt.Window) {
- final java.awt.Window win = (java.awt.Window) obj;
- final AWTWindowClosingAdapter acl = new AWTWindowClosingAdapter();
- AWTEDTExecutor.singleton.invoke(true, new Runnable() {
- public void run() {
- win.addWindowListener(acl);
- } } );
- return acl;
- } else if(obj instanceof com.jogamp.newt.Window) {
- return addClosingListener(obj);
- } else {
- throw new RuntimeException("Neither AWT nor NEWT: "+obj);
- }
+ public static TestUtil.WindowClosingListener addClosingListener(final java.awt.Window win) {
+ final AWTWindowClosingAdapter acl = new AWTWindowClosingAdapter();
+ AWTEDTExecutor.singleton.invoke(true, new Runnable() {
+ public void run() {
+ win.addWindowListener(acl);
+ } } );
+ return acl;
}
static class AWTWindowClosingAdapter
extends java.awt.event.WindowAdapter implements TestUtil.WindowClosingListener