NEWT: Changed Lifecycle of Display/Screen (part 4) - Reparenting - Tests

- Adapted tests to API changes

- Notably new Display lifecycle / Reparenting tests:
    - TestDisplayLifecycle01NEWT - Tests display lifecycle
    - TestParenting01NEWT - Tests various reparenting cases (native/recreate)
    - TestParenting01bAWT - Tests Animator/FPSAnimator with reparenting (AWT/Newt)

- Other changes:
    - TestGearsNEWT: Added 'on-the-fly' KeyAdapter
      inducing a GLRunnable into the GLWindow for fullscreen toggle.

    -

5 files changed, 63 insertions, 4 deletions

diff --git a/make/scripts/count-edt-start.sh b/make/scripts/count-edt-start.sh
new file mode 100755
index 000000000..06af8c396
--- /dev/null
+++ b/make/scripts/count-edt-start.sh
@@ -0,0 +1,11 @@
+#! /bin/sh
+
+echo EDT START
+grep "EDT run() START" $1 | wc
+
+echo EDT END
+grep "EDT run() END" $1 | wc
+
+echo EDT EXIT
+grep "EDT run() EXIT" $1 | wc
+
diff --git a/make/scripts/java-run-all.sh b/make/scripts/java-run-all.sh
index 3728ee2e4..c7eb15ed6 100755
--- a/make/scripts/java-run-all.sh
+++ b/make/scripts/java-run-all.sh
@@ -44,9 +44,12 @@ uname -a | grep -i Darwin && MOSX=1
 # D_ARGS="-Dnewt.debug=all -Dnativewindow.debug=all"
 # D_ARGS="-Djogl.debug=all -Dnewt.debug=all -Dnativewindow.debug=all"
 # D_ARGS="-Dnewt.debug=all"
-# D_ARGS="-Dnewt.debug.Window"
+# D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.debug.EDT"
+# D_ARGS="-Dnewt.debug.EDT -Dnewt.debug.Window"
+D_ARGS="-Dnewt.debug.EDT"
 # D_ARGS="-Dnewt.debug.Display"
-D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display"
+# D_ARGS="-Djogl.debug.Animator -Dnewt.debug.Window -Dnewt.debug.Display"
+# D_ARGS="-Dnewt.debug.Window -Dnewt.debug.Display -Dnewt.test.Window.reparent.incompatible=true"
 # D_ARGS="-Dnewt.debug.Window -Dnewt.debug.TestEDTMainThread"
 # D_ARGS="-Dnewt.debug.TestEDTMainThread"
 # D_ARGS="-Djogl.debug=all -Djogl.debug.DynamicLookup=true -Djogamp.debug.NativeLibrary=true"
diff --git a/make/scripts/java-win64-dbg.bat b/make/scripts/java-win64-dbg.bat
index 0b34ee348..edd729c14 100755
--- a/make/scripts/java-win64-dbg.bat
+++ b/make/scripts/java-win64-dbg.bat
@@ -14,8 +14,11 @@ set CP_ALL=.;%BLD_DIR%\jogl\jogl.all.jar;%BLD_DIR%\nativewindow\nativewindow.all
 echo CP_ALL %CP_ALL%

 

 REM set D_ARGS="-Djogamp.debug.JNILibLoader=true" "-Djogamp.debug.NativeLibrary=true" "-Djogamp.debug.NativeLibrary.Lookup=true" "-Djogl.debug.GLProfile=true"

-REM set D_ARGS="-Djogl.debug=all -Dnewt.debug=all -Dnativewindow.debug=all"

-set D_ARGS="-Dnewt.debug.Window"

+REM set D_ARGS="-Djogl.debug=all" "-Dnewt.debug=all" "-Dnativewindow.debug=all"

+REM set D_ARGS="-Dnewt.debug.Window" "-Dnativewindow.debug.TraceLock"

+REM set D_ARGS="-Dnativewindow.debug.TraceLock"

+set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display"

+REM set D_ARGS="-Dnewt.debug.Window" "-Dnewt.debug.Display" "-Dnewt.test.Window.reparent.incompatible=true"

 

 set X_ARGS="-Dsun.java2d.noddraw=true" "-Dsun.awt.noerasebackground=true"

 

diff --git a/make/scripts/tests.bat b/make/scripts/tests.bat
new file mode 100644
index 000000000..7be498837
--- /dev/null
+++ b/make/scripts/tests.bat
@@ -0,0 +1,14 @@
+REM #com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsNEWT -time 30000
+REM #com.jogamp.test.junit.jogl.acore.TestGLProfile01CORE
+REM #com.jogamp.test.junit.newt.TestParenting01AWT
+
+REM # ./scripts/java-run-all.sh ../build-x86_64 
+
+REM # ./scripts/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01cAWT -time 50000
+REM # ./scripts/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT
+REM # ./scripts/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestListenerCom01AWT
+REM # ./scripts/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01NEWT
+
+REM # ./scripts/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestGLWindows01NEWT
+REM # ./scripts/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated
+scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
new file mode 100755
index 000000000..7a8f514d1
--- /dev/null
+++ b/make/scripts/tests.sh
@@ -0,0 +1,28 @@
+#! /bin/bash
+
+spath=`dirname $0`
+
+#com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsNEWT -time 30000
+#com.jogamp.test.junit.jogl.acore.TestGLProfile01CORE
+#com.jogamp.test.junit.newt.TestParenting01AWT
+
+# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsAWT $*
+# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.jogl.demos.gl2.gears.TestGearsNEWT $*
+
+# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestDisplayLifecycle01NEWT $*
+
+# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestListenerCom01AWT $*
+
+# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestGLWindows01NEWT $*
+# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated $*
+
+# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01NEWT $*
+# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting02NEWT $*
+
+$spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01aAWT $*
+# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01cAWT $*
+# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01bAWT $*
+# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting01cSwingAWT $*
+# $spath/java-run-all.sh ../build-x86_64 com.jogamp.test.junit.newt.parenting.TestParenting02AWT $*
+
+$spath/count-edt-start.sh java-run.log