TestShutdownCompleteNEWT/AWT: Align both tests and account for GLInfo.

4 files changed, 83 insertions, 41 deletions

diff --git a/make/scripts/tests-win.bat b/make/scripts/tests-win.bat
index 6d79c596c..f5417bf7a 100755
--- a/make/scripts/tests-win.bat
+++ b/make/scripts/tests-win.bat
@@ -32,14 +32,14 @@ REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.tile.TestTiledRenderi
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.tile.TestRandomTiledRendering2GL2NEWT %*
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.tile.TestRandomTiledRendering3GL2AWT %*
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.tile.TestTiledPrintingGearsAWT %*
-scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.tile.TestTiledPrintingGearsSwingAWT %*
+REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.tile.TestTiledPrintingGearsSwingAWT %*
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.tile.TestTiledPrintingGearsSwingAWT2 %*
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.tile.TestTiledPrintingGearsNewtAWT %*
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.tile.TestTiledPrintingNIOImageSwingAWT %*
 
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestGLCapabilities01NEWT %*
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteNEWT %*
-REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteAWT %*
+scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteAWT %*
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.offscreen.TestOffscreen01GLPBufferNEWT -time 5000
 
 REM scripts\java-win.bat com.jogamp.opengl.test.junit.jogl.acore.TestSharedContextListNEWT %*
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index fe09a427b..6cf493de2 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -384,7 +384,7 @@ function testawtswt() {
 
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile00NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $*
-testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteNEWT $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteNEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestInitConcurrent01NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestInitConcurrent02NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLContextSurfaceLockNEWT $*
@@ -414,7 +414,7 @@ testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteNEWT $*
 
 #testawt com.jogamp.opengl.test.junit.jogl.acore.TestFBOAutoDrawableDeadlockAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.acore.TestPBufferDeadlockAWT $*
-#testawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteAWT $*
+testawt com.jogamp.opengl.test.junit.jogl.acore.TestShutdownCompleteAWT $*
 #testawt com.jogamp.opengl.test.junit.jogl.acore.x11.TestGLXCallsOnAWT $*
 
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestFBOOffThreadSharedContextMix2DemosES2NEWT $*
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteAWT.java
index 4e2e91320..9f367ef0b 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteAWT.java
@@ -3,14 +3,14 @@
  *
  * 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
@@ -20,12 +20,12 @@
  * 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.awt.Frame;
@@ -36,11 +36,14 @@ import javax.media.opengl.GLCapabilities;
 import javax.media.opengl.GLProfile;
 import javax.media.opengl.awt.GLCanvas;
 
+import org.junit.AfterClass;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.FixMethodOrder;
 import org.junit.runners.MethodSorters;
 
+import com.jogamp.common.os.Platform;
+import com.jogamp.opengl.JoglVersion;
 import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2;
 import com.jogamp.opengl.test.junit.util.UITestCase;
 import com.jogamp.opengl.util.Animator;
@@ -49,7 +52,7 @@ import com.jogamp.opengl.util.Animator;
 public class TestShutdownCompleteAWT extends UITestCase {
 
     static long duration = 300; // ms
-    
+
     protected void runTestGL() throws InterruptedException, InvocationTargetException {
         final Frame frame = new Frame("Gears AWT Test");
         Assert.assertNotNull(frame);
@@ -67,8 +70,8 @@ public class TestShutdownCompleteAWT extends UITestCase {
                 frame.setSize(256, 256);
                 frame.setVisible(true);
             }});
-        
-        animator.setUpdateFPSFrames(60, System.err);        
+
+        animator.setUpdateFPSFrames(60, System.err);
         animator.start();
         Assert.assertEquals(true, animator.isAnimating());
         Assert.assertEquals(true, glCanvas.isVisible());
@@ -93,37 +96,70 @@ public class TestShutdownCompleteAWT extends UITestCase {
             }});
     }
 
-    protected void oneLife() throws InterruptedException, InvocationTargetException {
-        long t0 = System.nanoTime();
+    @AfterClass
+    public static void afterAll() {
+        if(waitForKey) {
+            UITestCase.waitForKey("Exit");
+        }
+    }
+
+    protected void oneLife(boolean glInfo) throws InterruptedException, InvocationTargetException {
+        final long t0 = Platform.currentTimeMicros();
         GLProfile.initSingleton();
-        long t1 = System.nanoTime();
-        runTestGL();        
-        long t2 = System.nanoTime();
-        GLProfile.shutdown();        
-        long t3 = System.nanoTime();
-        System.err.println("Total:                          "+ (t3-t0)/1e6 +"ms"); 
-        System.err.println("  GLProfile.initSingleton():    "+ (t1-t0)/1e6 +"ms"); 
-        System.err.println("  Demo Code:                    "+ (t2-t1)/1e6 +"ms"); 
-        System.err.println("  GLProfile.shutdown():         "+ (t3-t2)/1e6 +"ms"); 
+        final long t1 = Platform.currentTimeMicros();
+        if(!initOnly) {
+            runTestGL();
+        }
+        final long t2 = Platform.currentTimeMicros();
+        if(glInfo) {
+            System.err.println(JoglVersion.getDefaultOpenGLInfo(null, null, false).toString());
+        }
+        final long t3 = Platform.currentTimeMicros();
+        GLProfile.shutdown();
+        final long t4 = Platform.currentTimeMicros();
+        System.err.println("Total:                          "+ (t4-t0)/1e3 +"ms");
+        System.err.println("  GLProfile.initSingleton():    "+ (t1-t0)/1e3 +"ms");
+        System.err.println("  Demo Code:                    "+ (t2-t1)/1e3 +"ms");
+        System.err.println("  GLInfo:                       "+ (t3-t2)/1e3 +"ms");
+        System.err.println("  GLProfile.shutdown():         "+ (t4-t3)/1e3 +"ms");
     }
-    
+
     @Test
     public void test01OneLife() throws InterruptedException, InvocationTargetException {
-        oneLife();
+        oneLife(false);
+    }
+
+    @Test
+    public void test02AnotherLifeWithGLInfo() throws InterruptedException, InvocationTargetException {
+        oneLife(true);
     }
 
     @Test
-    public void test01AnotherLife() throws InterruptedException, InvocationTargetException {
-        oneLife();
+    public void test03AnotherLife() throws InterruptedException, InvocationTargetException {
+        oneLife(true);
     }
-    
+
     @Test
-    public void test01TwoLifes() throws InterruptedException, InvocationTargetException {
-        oneLife();
-        oneLife();
+    public void test03TwoLifes() throws InterruptedException, InvocationTargetException {
+        oneLife(false);
+        oneLife(false);
     }
-    
+
+    static boolean initOnly = false;
+    static boolean waitForKey = false;
+
     public static void main(String args[]) throws IOException {
+        for(int i=0; i<args.length; i++) {
+            if(args[i].equals("-wait")) {
+                waitForKey = true;
+            } else if(args[i].equals("-initOnly")) {
+                initOnly = true;
+            }
+        }
+
+        if(waitForKey) {
+            UITestCase.waitForKey("Start");
+        }
         String tstname = TestShutdownCompleteAWT.class.getName();
         org.junit.runner.JUnitCore.main(tstname);
     }
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteNEWT.java
index a0e7f515c..e7d1cb8e9 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteNEWT.java
@@ -92,37 +92,43 @@ public class TestShutdownCompleteNEWT extends UITestCase {
         if(waitForEach) {
             UITestCase.waitForKey("Start One Life");
         }
-        long t0 = Platform.currentTimeMicros();
+        final long t0 = Platform.currentTimeMicros();
         GLProfile.initSingleton();
-        long t1 = Platform.currentTimeMicros();
+        final long t1 = Platform.currentTimeMicros();
         if(!initOnly) {
             runTestGL(true);
         }
-        long t2 = Platform.currentTimeMicros();
+        final long t2 = Platform.currentTimeMicros();
         if(glInfo) {
             System.err.println(JoglVersion.getDefaultOpenGLInfo(null, null, false).toString());
         }
-        long t3 = Platform.currentTimeMicros();
+        final long t3 = Platform.currentTimeMicros();
         GLProfile.shutdown();
-        long t4 = Platform.currentTimeMicros();
-        System.err.println("Total:                          "+ (t3-t0)/1e3 +"ms");
+        final long t4 = Platform.currentTimeMicros();
+        System.err.println("Total:                          "+ (t4-t0)/1e3 +"ms");
         System.err.println("  GLProfile.initSingleton():    "+ (t1-t0)/1e3 +"ms");
         System.err.println("  Demo Code:                    "+ (t2-t1)/1e3 +"ms");
+        System.err.println("  GLInfo:                       "+ (t3-t2)/1e3 +"ms");
         System.err.println("  GLProfile.shutdown():         "+ (t4-t3)/1e3 +"ms");
     }
 
     @Test
     public void test01OneLife() throws InterruptedException {
+        oneLife(false);
+    }
+
+    @Test
+    public void test02AnotherLifeWithGLInfo() throws InterruptedException {
         oneLife(true);
     }
 
     @Test
-    public void test01AnotherLife() throws InterruptedException {
-        oneLife(false);
+    public void test03AnotherLife() throws InterruptedException {
+        oneLife(true);
     }
 
     @Test
-    public void test01TwoLifes() throws InterruptedException {
+    public void test03TwoLifes() throws InterruptedException {
         oneLife(false);
         oneLife(false);
     }