Fix NEWT/AWT WindowClosing Unit Tests ; Review/Cleanup NEWT WindowClosing mechanism

Due to a NEWT WindowClosing event regression cause by NewtCanvasAWT changes
a review of our WindowClosing event mechanism was required.

Important cleanups are marked w/ '(*)' below.

I would have preferred to change the 'WindowListener.windowDestroyNotify(WindowEvent)'
method to pass a WindowCloseEvent object exposing more information like
toolkit or programmatic destruction and passing whether a 'closing' or 'nop' action
will be performed based on the WindowClosingMode.
For now I postponed this idea .. since it would change the API again,
but may reconsider it after merging the Android 'closing' patch.

- InputEvent.consumedTag -> NEWTEvent.consumedTag

- Window
  - (*) Promote setWindowDestroyNotifyAction(Runnable) to public,
        former WindowImpl.setHandleDestroyNotify(boolean).
    Using a Runnable action for WindowImpl.windowDestroyNotify(boolean)
    allows a setting defined alternative for destroy() and gets rid
    of [ab]using WindowListener.windowDestroyNotify(WindowEvent) for
    lifecycle actions. Used in:
      - GLWindow
      - GLAutoDrawableDelegate impl.

- WindowImpl
  - Respect NEWTEvent.consumedTag for WindowEvents as well

  - (*) Impl. setHandleDestroyNotify(boolean) (see above)

  - (*) destroy() simply sends out pre- and post- destruction Window events,
    where windowDestroyNotify(boolean) sends out the pre-destruction event if NOP.

  - (*) windowDestroyNotify(boolean) is public now, allowing other impl. details
    to follow proper destruction using handleDestroyNotify Runnable (-> NewtCanvasAWT).

- AWTWindowClosingProtocol:
  - addClosingListenerOneShot() -> addClosingListener()
    - calling addClosingListener() at addNotify()
    - calling removeClosingListener() at removeNotify()

  - AWTWindowClosingProtocol ctor taking NOP runnable,
    allowing to send WindowEvent.EVENT_WINDOW_DESTROY_NOTIFY at WindowClosingMode.DO_NOTHING_ON_CLOSE

  - add/remove listener on AWT-EDT

- AWTWindowAdapter
  - Add 'removeWindowClosingFrom(..)',
    allowing to remove window closing event fwd.

  - Also fwd windowClosed in window closing fwd'ing.

- NewtCanvasAWT
  - (*) Utilize AWTWindowClosingProtocol NOP runnable (see above)
    to fwd closing-NOP event to NEWT

  - (*) Unify remove/destroy code in destroyImpl(..)
    - !removeNotify -> destroy NEWT child programatic or as toolkit event
    - removeNotify || windowClosing -> destroy jawtWindow

  - (*) Remove AWTWindowAdapter/AWTParentWindowAdapter's windowClosingListener,
    since we utilize AWTWindowClosingProtocol

- DisplayImpl
  - Adding 'final void dispatchMessage(final NEWTEvent event)'
    allowing to remove the NEWTEventTask wrapping for no reason
    in enqueueEvent(..) if on EDT and waiting.

10 files changed, 291 insertions, 70 deletions

diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateNEWT.java
new file mode 100644
index 000000000..2729d6a5d
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateNEWT.java
@@ -0,0 +1,160 @@
+/**
+ * Copyright 2013 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+ 
+package com.jogamp.opengl.test.junit.jogl.acore;
+
+import java.io.IOException;
+
+import javax.media.opengl.GLCapabilities;
+import javax.media.opengl.GLCapabilitiesImmutable;
+import javax.media.opengl.GLContext;
+import javax.media.opengl.GLDrawable;
+import javax.media.opengl.GLDrawableFactory;
+import javax.media.opengl.GLEventListener;
+import javax.media.opengl.GLProfile;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.jogamp.newt.NewtFactory;
+import com.jogamp.newt.Window;
+import com.jogamp.newt.event.WindowAdapter;
+import com.jogamp.newt.event.WindowEvent;
+import com.jogamp.newt.event.WindowUpdateEvent;
+import com.jogamp.opengl.GLAutoDrawableDelegate;
+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.QuitAdapter;
+import com.jogamp.opengl.test.junit.util.UITestCase;
+import com.jogamp.opengl.util.Animator;
+
+/**
+ * Test using a NEWT {@link Window} for onscreen case.
+ * <p>
+ * Creates a {@link GLDrawable} using the 
+ * {@link GLDrawableFactory#createGLDrawable(javax.media.nativewindow.NativeSurface) factory model}.
+ * The {@link GLContext} is derived {@link GLDrawable#createContext(GLContext) from the drawable}.
+ * </p>
+ * <p>
+ * Finally a {@link GLAutoDrawableDelegate} is created with the just created {@link GLDrawable} and {@link GLContext}.
+ * It is being used to run the {@link GLEventListener}.  
+ * </p> 
+ */
+public class TestGLAutoDrawableDelegateNEWT extends UITestCase {
+    static long duration = 500; // ms
+    
+    void doTest(GLCapabilitiesImmutable reqGLCaps, GLEventListener demo) throws InterruptedException {
+        final GLDrawableFactory factory = GLDrawableFactory.getFactory(reqGLCaps.getGLProfile());
+        
+        //
+        // Create native windowing resources .. X11/Win/OSX
+        // 
+        final Window window = NewtFactory.createWindow(reqGLCaps);
+        Assert.assertNotNull(window);
+        window.setSize(640, 400);
+        window.setVisible(true);
+        Assert.assertTrue(AWTRobotUtil.waitForVisible(window, true));
+        Assert.assertTrue(AWTRobotUtil.waitForRealized(window, true));
+        System.out.println("Window: "+window.getClass().getName());
+        
+        final GLDrawable drawable = factory.createGLDrawable(window);
+        Assert.assertNotNull(drawable);
+        drawable.setRealized(true);
+        
+        final GLAutoDrawableDelegate glad = new GLAutoDrawableDelegate(drawable, drawable.createContext(null), window, false, null) {
+                @Override
+                protected void destroyImplInLock() {
+                    super.destroyImplInLock();  // destroys drawable/context
+                    window.destroy(); // destroys the actual window, incl. the device
+                }
+            };
+        
+        window.setWindowDestroyNotifyAction( new Runnable() {
+            public void run() {
+                glad.windowDestroyNotifyOp();
+            } } );
+                
+        window.addWindowListener(new WindowAdapter() {
+                @Override
+                public void windowRepaint(WindowUpdateEvent e) {
+                    glad.windowRepaintOp();
+                }
+
+                @Override
+                public void windowResized(WindowEvent e) {
+                    glad.windowResizedOp(window.getWidth(), window.getHeight());
+                }
+            });
+
+        glad.addGLEventListener(demo);
+                
+        QuitAdapter quitAdapter = new QuitAdapter();
+        //glWindow.addKeyListener(new TraceKeyAdapter(quitAdapter));
+        //glWindow.addWindowListener(new TraceWindowAdapter(quitAdapter));
+        window.addKeyListener(quitAdapter);
+        window.addWindowListener(quitAdapter);
+        
+        Animator animator = new Animator();
+        animator.setUpdateFPSFrames(60, System.err);
+        animator.setModeBits(false, Animator.MODE_EXPECT_AWT_RENDERING_THREAD);
+        animator.add(glad);
+        animator.start();
+        Assert.assertTrue(animator.isStarted());
+        Assert.assertTrue(animator.isAnimating());
+        
+        while(!quitAdapter.shouldQuit() && animator.isAnimating() && animator.getTotalFPSDuration()<duration) {
+            Thread.sleep(100);
+        }        
+        System.out.println("Fin start ...");
+        
+        animator.stop();
+        Assert.assertFalse(animator.isAnimating());
+        Assert.assertFalse(animator.isStarted());
+        glad.destroy();
+        System.out.println("Fin Drawable: "+drawable);        
+        System.out.println("Fin Window: "+window);
+    }
+
+    @Test
+    public void testOnScreenDblBuf() throws InterruptedException {
+        final GLCapabilities reqGLCaps = new GLCapabilities( GLProfile.getGL2ES2() );
+        doTest(reqGLCaps, new GearsES2(1));
+    }
+    
+    public static void main(String args[]) throws IOException {
+        for(int i=0; i<args.length; i++) {
+            if(args[i].equals("-time")) {
+                i++;
+                duration = MiscUtils.atol(args[i], duration);
+            }
+        }
+        org.junit.runner.JUnitCore.main(TestGLAutoDrawableDelegateNEWT.class.getName());
+    }
+
+}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateOnOffscrnCapsNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateOnOffscrnCapsNEWT.java
index c5b4227c2..050e596cf 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateOnOffscrnCapsNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateOnOffscrnCapsNEWT.java
@@ -55,6 +55,7 @@ import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
 import com.jogamp.opengl.test.junit.jogl.demos.gl2.Gears;
 import com.jogamp.opengl.test.junit.util.AWTRobotUtil;
 import com.jogamp.opengl.test.junit.util.UITestCase;
+import jogamp.newt.WindowImpl;
 
 /**
  * Tests using a NEWT {@link Window} for on- and offscreen cases.
@@ -169,6 +170,11 @@ public class TestGLAutoDrawableDelegateOnOffscrnCapsNEWT extends UITestCase {
                 }
             };
         
+        window.setWindowDestroyNotifyAction( new Runnable() {
+            public void run() {
+                glad.windowDestroyNotifyOp();
+            } } );
+                
         window.addWindowListener(new WindowAdapter() {
                 @Override
                 public void windowRepaint(WindowUpdateEvent e) {
@@ -179,11 +185,6 @@ public class TestGLAutoDrawableDelegateOnOffscrnCapsNEWT extends UITestCase {
                 public void windowResized(WindowEvent e) {
                     glad.windowResizedOp(window.getWidth(), window.getHeight());
                 }
-
-                @Override
-                public void windowDestroyNotify(WindowEvent e) {
-                    glad.windowDestroyNotifyOp();
-                }
             });
 
         glad.addGLEventListener(demo);
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitch01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitch01NEWT.java
index 8b1449493..cce4149ba 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitch01NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitch01NEWT.java
@@ -107,6 +107,11 @@ public class TestGLContextDrawableSwitch01NEWT extends UITestCase {
             }            
         };
         
+        window.setWindowDestroyNotifyAction( new Runnable() {
+            public void run() {
+                glad.windowDestroyNotifyOp();
+            } } );
+        
         // add basic window interaction
         window.addWindowListener(new WindowAdapter() {
             @Override
@@ -117,10 +122,6 @@ public class TestGLContextDrawableSwitch01NEWT extends UITestCase {
             public void windowResized(WindowEvent e) {
                 glad.windowResizedOp(window.getWidth(), window.getHeight());
             }
-            @Override
-            public void windowDestroyNotify(WindowEvent e) {
-                glad.windowDestroyNotifyOp();
-            }
         });
         window.addWindowListener(wl);
         
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitch11NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitch11NEWT.java
index 4af9a3932..2ef797fba 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitch11NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextDrawableSwitch11NEWT.java
@@ -109,6 +109,11 @@ public class TestGLContextDrawableSwitch11NEWT extends UITestCase {
             }            
         };
         
+        window.setWindowDestroyNotifyAction( new Runnable() {
+            public void run() {
+                glad.windowDestroyNotifyOp();
+            } } );
+        
         // add basic window interaction
         window.addWindowListener(new WindowAdapter() {
             @Override
@@ -119,10 +124,6 @@ public class TestGLContextDrawableSwitch11NEWT extends UITestCase {
             public void windowResized(WindowEvent e) {
                 glad.windowResizedOp(window.getWidth(), window.getHeight());
             }
-            @Override
-            public void windowDestroyNotify(WindowEvent e) {
-                glad.windowDestroyNotifyOp();
-            }
         });
         window.addWindowListener(wl);
         
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextNewtAWTBug523.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextNewtAWTBug523.java
index 7894f3e86..fbea81a54 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextNewtAWTBug523.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextNewtAWTBug523.java
@@ -68,6 +68,7 @@ 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.UITestCase;
+import com.jogamp.opengl.test.junit.util.AWTRobotUtil.WindowClosingListener;
 import com.jogamp.opengl.util.Animator;
 import com.jogamp.opengl.util.GLBuffers;
 
@@ -507,6 +508,8 @@ public class TestSharedContextNewtAWTBug523 extends UITestCase {
      */
     public void testContextSharingCreateVisibleDestroy(final boolean useNewt, final boolean shareContext) throws InterruptedException, InvocationTargetException {
         final JFrame frame = new JFrame("Simple JOGL App for testing context sharing");
+        final WindowClosingListener awtClosingListener = AWTRobotUtil.addClosingListener(frame);
+
         //
         // GLDrawableFactory factory = GLDrawableFactory.getFactory(GLProfile.get(GLProfile.GL2));
         // GLContext sharedContext = factory.getOrCreateSharedContext(factory.getDefaultDevice());
@@ -699,7 +702,7 @@ public class TestSharedContextNewtAWTBug523 extends UITestCase {
             while(animator.isAnimating() && animator.getTotalFPSDuration() < durationPerTest) {
                 Thread.sleep(100);
             }
-            AWTRobotUtil.closeWindow(frame, true);
+            AWTRobotUtil.closeWindow(frame, true, awtClosingListener);
             boolean windowClosed = closingSemaphore.tryAcquire(5000, TimeUnit.MILLISECONDS);
             Assert.assertEquals(true, windowClosed);
         } catch (InterruptedException e) {
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 4ebb7dddd..d63193445 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestCloseNewtAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestCloseNewtAWT.java
@@ -45,6 +45,7 @@ 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.UITestCase;
+import com.jogamp.opengl.test.junit.util.AWTRobotUtil.WindowClosingListener;
 
 public class TestCloseNewtAWT extends UITestCase {
 
@@ -107,9 +108,11 @@ public class TestCloseNewtAWT extends UITestCase {
                 frame.setVisible(true);
             }
         });
-        Thread.sleep(500);
+        Assert.assertEquals(true, AWTRobotUtil.waitForVisible(frame, true));
+        Assert.assertEquals(true,  AWTRobotUtil.waitForRealized(newtWindow, true));
+        final WindowClosingListener closingListener = AWTRobotUtil.addClosingListener(frame);
 
-        Assert.assertEquals(true,  AWTRobotUtil.closeWindow(frame, true));
+        Assert.assertEquals(true,  AWTRobotUtil.closeWindow(frame, true, closingListener));
     }
 
     public static void main(String[] args) {
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol01AWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol01AWT.java
index 6aedb8433..5b7986f4d 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol01AWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol01AWT.java
@@ -46,13 +46,14 @@ 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.UITestCase;
+import com.jogamp.opengl.test.junit.util.AWTRobotUtil.WindowClosingListener;
 
 public class TestWindowClosingProtocol01AWT extends UITestCase {
 
     @Test
     public void testCloseFrameGLCanvas() throws InterruptedException, InvocationTargetException {
         final Frame frame = new Frame("testCloseFrameGLCanvas AWT");
-
+        final WindowClosingListener closingListener = AWTRobotUtil.addClosingListener(frame);
         GLProfile glp = GLProfile.getGL2ES2();
         GLCapabilities caps = new GLCapabilities(glp);
         final GLCanvas glCanvas = new GLCanvas(caps);
@@ -74,12 +75,14 @@ public class TestWindowClosingProtocol01AWT extends UITestCase {
         WindowClosingMode op = glCanvas.getDefaultCloseOperation();
         Assert.assertEquals(WindowClosingMode.DO_NOTHING_ON_CLOSE, op);
 
-        Assert.assertEquals(true, AWTRobotUtil.closeWindow(frame, false)); // nop
+        Assert.assertEquals(true, AWTRobotUtil.closeWindow(frame, false, closingListener)); // nop
         Thread.sleep(100);
-        Assert.assertEquals(true, frame.isDisplayable());
+        Assert.assertEquals(true,  frame.isDisplayable());
         Assert.assertEquals(true,  frame.isVisible());
-        Assert.assertEquals(true, glCanvas.isValid());
-        Assert.assertEquals(true, glCanvas.isDisplayable());
+        Assert.assertEquals(true,  glCanvas.isValid());
+        Assert.assertEquals(true,  glCanvas.isDisplayable());
+        Assert.assertEquals(true,  closingListener.isWindowClosing());
+        Assert.assertEquals(false, closingListener.isWindowClosed());
 
         //
         // close with op (GLCanvas): DISPOSE_ON_CLOSE -> dispose
@@ -90,10 +93,12 @@ public class TestWindowClosingProtocol01AWT extends UITestCase {
         
         Thread.sleep(300);
 
-        Assert.assertEquals(true,  AWTRobotUtil.closeWindow(frame, false)); // no frame close, but GLCanvas's GL resources will be destroyed
+        Assert.assertEquals(true,  AWTRobotUtil.closeWindow(frame, false, closingListener)); // no frame close, but GLCanvas's GL resources will be destroyed
         Thread.sleep(100);
         Assert.assertEquals(true,  frame.isDisplayable());
         Assert.assertEquals(true,  frame.isVisible());
+        Assert.assertEquals(true,  closingListener.isWindowClosing());
+        Assert.assertEquals(false, closingListener.isWindowClosed());
         for (int wait=0; wait<AWTRobotUtil.POLL_DIVIDER && glCanvas.isRealized(); wait++) {
             Thread.sleep(AWTRobotUtil.TIME_SLICE);
         }
@@ -108,7 +113,8 @@ public class TestWindowClosingProtocol01AWT extends UITestCase {
     @Test
     public void testCloseJFrameGLCanvas() throws InterruptedException, InvocationTargetException {
         final JFrame frame = new JFrame("testCloseJFrameGLCanvas AWT");
-
+        final WindowClosingListener closingListener = AWTRobotUtil.addClosingListener(frame);
+        
         GLProfile glp = GLProfile.getGL2ES2();
         GLCapabilities caps = new GLCapabilities(glp);
         GLCanvas glCanvas = new GLCanvas(caps);
@@ -133,7 +139,7 @@ public class TestWindowClosingProtocol01AWT extends UITestCase {
 
         Thread.sleep(300);
         
-        Assert.assertEquals(true,  AWTRobotUtil.closeWindow(frame, false)); // nop
+        Assert.assertEquals(true,  AWTRobotUtil.closeWindow(frame, false, closingListener)); // nop
         Thread.sleep(100);
         Assert.assertEquals(true,  frame.isDisplayable());
         Assert.assertEquals(true,  glCanvas.isValid());
@@ -154,7 +160,7 @@ public class TestWindowClosingProtocol01AWT extends UITestCase {
         op = glCanvas.getDefaultCloseOperation();
         Assert.assertEquals(WindowClosingMode.DISPOSE_ON_CLOSE, op);
 
-        Assert.assertEquals(true,  AWTRobotUtil.closeWindow(frame, true));
+        Assert.assertEquals(true,  AWTRobotUtil.closeWindow(frame, true, closingListener));
         Assert.assertEquals(true,  AWTRobotUtil.waitForRealized(glCanvas, false));
         Assert.assertEquals(false, frame.isDisplayable());
         Assert.assertEquals(false, glCanvas.isValid());
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 8cd44b82c..8d32beea3 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol02NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol02NEWT.java
@@ -52,7 +52,7 @@ public class TestWindowClosingProtocol02NEWT extends UITestCase {
         GLProfile glp = GLProfile.getGL2ES2();
         GLCapabilities caps = new GLCapabilities(glp);
         final GLWindow glWindow = GLWindow.create(caps);
-        final AWTRobotUtil.WindowClosingListener windowClosingListener = AWTRobotUtil.addClosingListener(glWindow);
+        final AWTRobotUtil.WindowClosingListener closingListener = AWTRobotUtil.addClosingListener(glWindow);
 
         glWindow.addGLEventListener(new GearsES2());
         glWindow.setSize(512, 512);
@@ -72,10 +72,10 @@ public class TestWindowClosingProtocol02NEWT extends UITestCase {
         
         Thread.sleep(300);
 
-        Assert.assertEquals(true, AWTRobotUtil.closeWindow(glWindow, false)); // nop
+        Assert.assertEquals(true, AWTRobotUtil.closeWindow(glWindow, false, closingListener)); // nop
         Assert.assertEquals(true, glWindow.isNativeValid());
-        Assert.assertEquals(true, windowClosingListener.isWindowClosing());
-        windowClosingListener.reset();
+        Assert.assertEquals(true, closingListener.isWindowClosing());
+        closingListener.reset();
 
         //
         // close with op (GLCanvas): DISPOSE_ON_CLOSE -> dispose
@@ -84,9 +84,9 @@ public class TestWindowClosingProtocol02NEWT extends UITestCase {
         op = glWindow.getDefaultCloseOperation();
         Assert.assertEquals(WindowClosingMode.DISPOSE_ON_CLOSE, op);
 
-        Assert.assertEquals(true,  AWTRobotUtil.closeWindow(glWindow, true));
+        Assert.assertEquals(true,  AWTRobotUtil.closeWindow(glWindow, true, closingListener));
         Assert.assertEquals(false, glWindow.isNativeValid());
-        Assert.assertEquals(true,  windowClosingListener.isWindowClosing());
+        Assert.assertEquals(true,  closingListener.isWindowClosing());
     }
 
     public static void main(String[] args) {
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 be3c48fb6..b0a222a5a 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java
@@ -46,17 +46,19 @@ 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.UITestCase;
+import com.jogamp.opengl.test.junit.util.AWTRobotUtil.WindowClosingListener;
 
 public class TestWindowClosingProtocol03NewtAWT extends UITestCase {
 
     @Test
     public void testCloseJFrameNewtCanvasAWT() throws InterruptedException, InvocationTargetException {
         final JFrame frame = new JFrame("testCloseJFrameNewtCanvasAWT");
-
+        final WindowClosingListener awtClosingListener = AWTRobotUtil.addClosingListener(frame);
+        
         GLProfile glp = GLProfile.getGL2ES2();
         GLCapabilities caps = new GLCapabilities(glp);
         final GLWindow glWindow = GLWindow.create(caps);
-        final AWTRobotUtil.WindowClosingListener windowClosingListener = AWTRobotUtil.addClosingListener(glWindow);
+        final AWTRobotUtil.WindowClosingListener newtClosingListener = AWTRobotUtil.addClosingListener(glWindow);
 
         glWindow.addGLEventListener(new GearsES2());
 
@@ -81,20 +83,26 @@ public class TestWindowClosingProtocol03NewtAWT extends UITestCase {
         //
         // close with op: DO_NOTHING_ON_CLOSE -> NOP / HIDE (default)
         //
-        Assert.assertEquals(JFrame.HIDE_ON_CLOSE, frame.getDefaultCloseOperation());
-        WindowClosingMode op = newtCanvas.getDefaultCloseOperation();
-        Assert.assertEquals(WindowClosingMode.DO_NOTHING_ON_CLOSE, op);
+        {
+            Assert.assertEquals(JFrame.HIDE_ON_CLOSE, frame.getDefaultCloseOperation());
+            WindowClosingMode op = newtCanvas.getDefaultCloseOperation();
+            Assert.assertEquals(WindowClosingMode.DO_NOTHING_ON_CLOSE, op);
+        }
 
         Thread.sleep(300);
         
-        Assert.assertEquals(true,  AWTRobotUtil.closeWindow(frame, false));
+        Assert.assertEquals(true,  AWTRobotUtil.closeWindow(frame, false, awtClosingListener));
         Assert.assertEquals(true,  frame.isDisplayable());
         Assert.assertEquals(false, frame.isVisible());
         Assert.assertEquals(true,  newtCanvas.isValid());
         Assert.assertEquals(true,  newtCanvas.isDisplayable());
         Assert.assertEquals(true,  glWindow.isNativeValid());
-        Assert.assertEquals(true,  windowClosingListener.isWindowClosing());
-        windowClosingListener.reset();
+        Assert.assertEquals(true,  awtClosingListener.isWindowClosing());
+        Assert.assertEquals(false, awtClosingListener.isWindowClosed());
+        Assert.assertEquals(true,  newtClosingListener.isWindowClosing());
+        Assert.assertEquals(false, newtClosingListener.isWindowClosed());
+        awtClosingListener.reset();
+        newtClosingListener.reset();
 
         SwingUtilities.invokeAndWait(new Runnable() {
             public void run() {
@@ -107,20 +115,25 @@ public class TestWindowClosingProtocol03NewtAWT extends UITestCase {
         //
         // close with op (JFrame): DISPOSE_ON_CLOSE -- newtCanvas -- glWindow --> dispose
         //
-        frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
-        Assert.assertEquals(JFrame.DISPOSE_ON_CLOSE, frame.getDefaultCloseOperation());
-        op = newtCanvas.getDefaultCloseOperation();
-        Assert.assertEquals(WindowClosingMode.DISPOSE_ON_CLOSE, op);
+        {
+            frame.setDefaultCloseOperation(JFrame.DISPOSE_ON_CLOSE);
+            Assert.assertEquals(JFrame.DISPOSE_ON_CLOSE, frame.getDefaultCloseOperation());
+            WindowClosingMode op = newtCanvas.getDefaultCloseOperation();
+            Assert.assertEquals(WindowClosingMode.DISPOSE_ON_CLOSE, op);
+        }
         
         Thread.sleep(300);
 
-        Assert.assertEquals(true,  AWTRobotUtil.closeWindow(frame, true));
+        Assert.assertEquals(true,  AWTRobotUtil.closeWindow(frame, true, awtClosingListener));
         Assert.assertEquals(false, frame.isDisplayable());
         Assert.assertEquals(false, frame.isVisible());
         Assert.assertEquals(false, newtCanvas.isValid());
         Assert.assertEquals(false, newtCanvas.isDisplayable());
         Assert.assertEquals(false, glWindow.isNativeValid());
-        Assert.assertEquals(true,  windowClosingListener.isWindowClosing());
+        Assert.assertEquals(true,  awtClosingListener.isWindowClosing());
+        Assert.assertEquals(true,  awtClosingListener.isWindowClosed());
+        Assert.assertEquals(true,  newtClosingListener.isWindowClosing());
+        Assert.assertEquals(true,  newtClosingListener.isWindowClosed());
     }
 
     public static void main(String[] args) {
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 ffc42e318..8b46760e1 100644
--- a/src/test/com/jogamp/opengl/test/junit/util/AWTRobotUtil.java
+++ b/src/test/com/jogamp/opengl/test/junit/util/AWTRobotUtil.java
@@ -28,6 +28,7 @@
  
 package com.jogamp.opengl.test.junit.util;
 
+import jogamp.common.awt.AWTEDTExecutor;
 import jogamp.newt.WindowImplAccess;
 
 import java.lang.reflect.InvocationTargetException;
@@ -41,6 +42,8 @@ import javax.media.opengl.awt.GLCanvas;
 
 import org.junit.Assert;
 
+import com.jogamp.newt.event.WindowEvent;
+
 public class AWTRobotUtil {
 
     static final boolean DEBUG = false;
@@ -646,16 +649,19 @@ public class AWTRobotUtil {
      *
      * @param obj either an AWT Window (Frame, JFrame) or NEWT Window
      * @param willClose indicating that the window will close, hence this method waits for the window to be closed
+     * @param wcl the WindowClosingListener to determine whether the AWT or NEWT widget has been closed. It should be attached 
+     *            to the widget ASAP before any other listener, e.g. via {@link #addClosingListener(Object)}. 
+     *            The WindowClosingListener will be reset before attempting to close the widget.   
      * @return True if the Window is closing and closed (if willClose is true), each within TIME_OUT
      * @throws InterruptedException
      */
-    public static boolean closeWindow(Object obj, boolean willClose) throws InterruptedException, InvocationTargetException {
-        WindowClosingListener closingListener = addClosingListener(obj);
+    public static boolean closeWindow(Object obj, boolean willClose, WindowClosingListener closingListener) throws InterruptedException {
+        closingListener.reset();
         if(obj instanceof java.awt.Window) {
             final java.awt.Window win = (java.awt.Window) obj;
             java.awt.Toolkit tk = java.awt.Toolkit.getDefaultToolkit();
             final java.awt.EventQueue evtQ = tk.getSystemEventQueue();
-            java.awt.EventQueue.invokeAndWait(new Runnable() {
+            AWTEDTExecutor.singleton.invoke(true, new Runnable() {
                 public void run() {
                     evtQ.postEvent(new java.awt.event.WindowEvent(win, java.awt.event.WindowEvent.WINDOW_CLOSING));
                 } });
@@ -675,12 +681,15 @@ public class AWTRobotUtil {
         return wait<POLL_DIVIDER;
     }
 
-    public static WindowClosingListener addClosingListener(Object obj) throws InterruptedException {
+    public static WindowClosingListener addClosingListener(Object obj) {
         WindowClosingListener cl = null;
         if(obj instanceof java.awt.Window) {
-            java.awt.Window win = (java.awt.Window) obj;
-            AWTWindowClosingAdapter acl = new AWTWindowClosingAdapter();
-            win.addWindowListener(acl);
+            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);
+                } } );
             cl = acl;
         } else if(obj instanceof com.jogamp.newt.Window) {
             com.jogamp.newt.Window win = (com.jogamp.newt.Window) obj;
@@ -694,53 +703,77 @@ public class AWTRobotUtil {
     }
     public static interface WindowClosingListener {
         void reset();
+        public int getWindowClosingCount();
+        public int getWindowClosedCount();
         public boolean isWindowClosing();
         public boolean isWindowClosed();
     }
     static class AWTWindowClosingAdapter
             extends java.awt.event.WindowAdapter implements WindowClosingListener
     {
-        volatile boolean closing = false;
-        volatile boolean closed = false;
+        volatile int closing = 0;
+        volatile int closed = 0;
 
         public void reset() {
-            closing = false;
-            closed = false;
+            closing = 0;
+            closed = 0;
         }
-        public boolean isWindowClosing() {
+        public int getWindowClosingCount() {
             return closing;
         }
-        public boolean isWindowClosed() {
+        public int getWindowClosedCount() {
             return closed;
         }
+        public boolean isWindowClosing() {
+            return 0 < closing;
+        }
+        public boolean isWindowClosed() {
+            return 0 < closed;
+        }
         public void windowClosing(java.awt.event.WindowEvent e) {
-            closing = true;
+            closing++;
+            System.err.println("AWTWindowClosingAdapter.windowClosing: "+this);
         }
         public void windowClosed(java.awt.event.WindowEvent e) {
-            closed = true;
+            closed++;
+            System.err.println("AWTWindowClosingAdapter.windowClosed: "+this);
+        }
+        public String toString() {
+            return "AWTWindowClosingAdapter[closing "+closing+", closed "+closed+"]";
         }
     }
     static class NEWTWindowClosingAdapter
             extends com.jogamp.newt.event.WindowAdapter implements WindowClosingListener
     {
-        volatile boolean closing = false;
-        volatile boolean closed = false;
+        volatile int closing = 0;
+        volatile int closed = 0;
 
         public void reset() {
-            closing = false;
-            closed = false;
+            closing = 0;
+            closed = 0;
         }
-        public boolean isWindowClosing() {
+        public int getWindowClosingCount() {
             return closing;
         }
-        public boolean isWindowClosed() {
+        public int getWindowClosedCount() {
             return closed;
         }
-        public void windowDestroyNotify(com.jogamp.newt.event.WindowEvent e) {
-            closing = true;
+        public boolean isWindowClosing() {
+            return 0 < closing;
+        }
+        public boolean isWindowClosed() {
+            return 0 < closed;
+        }
+        public void windowDestroyNotify(WindowEvent e) {
+            closing++;
+            System.err.println("NEWTWindowClosingAdapter.windowDestroyNotify: "+this);
+        }
+        public void windowDestroyed(WindowEvent e) {
+            closed++;
+            System.err.println("NEWTWindowClosingAdapter.windowDestroyed: "+this);
         }
-        public void windowDestroyed(com.jogamp.newt.event.WindowEvent e) {
-            closed = true;
+        public String toString() {
+            return "NEWTWindowClosingAdapter[closing "+closing+", closed "+closed+"]";
         }
     }