diff options
| -rw-r--r-- | make/scripts/tests.bat | 4 | ||||
| -rw-r--r-- | make/scripts/tests2.sh | 7 | ||||
| -rw-r--r-- | src/junit/com/jogamp/test/junit/newt/TestFocus01SwingAWTRobot.java | 12 | ||||
| -rw-r--r-- | src/junit/com/jogamp/test/junit/newt/TestFocus02SwingAWTRobot.java | 12 | ||||
| -rw-r--r-- | src/junit/com/jogamp/test/junit/util/AWTRobotUtil.java | 2 |
5 files changed, 9 insertions, 28 deletions
diff --git a/make/scripts/tests.bat b/make/scripts/tests.bat index 925ad8fc0..873f039a8 100644 --- a/make/scripts/tests.bat +++ b/make/scripts/tests.bat @@ -9,13 +9,13 @@ REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParentin REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestGLWindows01NEWT REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestGLWindows02NEWTAnimated REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting01NEWT -REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot +scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot REM scripts\java-win64-dbg.bat com.jogamp.test.junit.nativewindow.TestRecursiveToolkitLockCORE REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.parenting.TestParenting03AWT -time 100000 REM scripts\java-win64.bat com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot -scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestScreenMode00NEWT +REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestScreenMode00NEWT REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestScreenMode01NEWT REM scripts\java-win64-dbg.bat com.jogamp.test.junit.newt.TestScreenMode02NEWT diff --git a/make/scripts/tests2.sh b/make/scripts/tests2.sh index cf0b38705..cce1c3e19 100644 --- a/make/scripts/tests2.sh +++ b/make/scripts/tests2.sh @@ -25,7 +25,8 @@ function jrun() { #D_ARGS="-Dnewt.debug.EDT -Djogamp.common.utils.locks.Lock.timeout=600000 -Djogl.debug.Animator -Dnewt.debug.Display -Dnewt.debug.Screen" #D_ARGS="-Dnewt.debug.EDT -Dnewt.debug.Display -Dnativewindow.debug.X11Util -Djogl.debug.GLDrawable -Djogl.debug.GLCanvas" #D_ARGS="-Dnewt.debug.EDT -Djogl.debug.GLContext" - D_ARGS="-Dnewt.debug.Screen -Dnewt.debug.EDT" + #D_ARGS="-Dnewt.debug.Screen -Dnewt.debug.EDT" + D_ARGS="-Dnewt.debug.EDT" # D_ARGS="-Djogl.debug=all" java $X_ARGS $D_ARGS $* 2>&1 | tee -a java-run.log } @@ -45,7 +46,7 @@ function testawt() { #testawt com.jogamp.test.junit.jogl.texture.TestTexture01AWT #testawt com.jogamp.test.junit.newt.TestEventSourceNotAWTBug #testawt com.jogamp.test.junit.newt.TestFocus01SwingAWTRobot -#testawt com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot +testawt com.jogamp.test.junit.newt.TestFocus02SwingAWTRobot #testawt com.jogamp.test.junit.newt.TestListenerCom01AWT #testawt com.jogamp.test.junit.newt.parenting.TestParenting01aAWT #testawt com.jogamp.test.junit.newt.parenting.TestParenting01bAWT @@ -61,7 +62,7 @@ function testawt() { #testawt com.jogamp.test.junit.newt.parenting.TestParenting01NEWT #testawt com.jogamp.test.junit.newt.parenting.TestParenting02NEWT -testawt com.jogamp.test.junit.newt.TestScreenMode00NEWT +#testawt com.jogamp.test.junit.newt.TestScreenMode00NEWT #testawt com.jogamp.test.junit.newt.TestScreenMode01NEWT #testawt com.jogamp.test.junit.newt.TestScreenMode02NEWT diff --git a/src/junit/com/jogamp/test/junit/newt/TestFocus01SwingAWTRobot.java b/src/junit/com/jogamp/test/junit/newt/TestFocus01SwingAWTRobot.java index 656783740..1002fc9f8 100644 --- a/src/junit/com/jogamp/test/junit/newt/TestFocus01SwingAWTRobot.java +++ b/src/junit/com/jogamp/test/junit/newt/TestFocus01SwingAWTRobot.java @@ -205,17 +205,7 @@ public class TestFocus01SwingAWTRobot extends UITestCase { } System.out.println("durationPerTest: "+durationPerTest); String tstname = TestFocus01SwingAWTRobot.class.getName(); - org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(new String[] { - tstname, - "filtertrace=true", - "haltOnError=false", - "haltOnFailure=false", - "showoutput=true", - "outputtoformatters=true", - "logfailedtests=true", - "logtestlistenerevents=true", - "formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter", - "formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,TEST-"+tstname+".xml" } ); + org.junit.runner.JUnitCore.main(tstname); } diff --git a/src/junit/com/jogamp/test/junit/newt/TestFocus02SwingAWTRobot.java b/src/junit/com/jogamp/test/junit/newt/TestFocus02SwingAWTRobot.java index 8d262fc3f..3891f1565 100644 --- a/src/junit/com/jogamp/test/junit/newt/TestFocus02SwingAWTRobot.java +++ b/src/junit/com/jogamp/test/junit/newt/TestFocus02SwingAWTRobot.java @@ -295,17 +295,7 @@ public class TestFocus02SwingAWTRobot extends UITestCase { System.err.println("durationPerTest "+durationPerTest); System.err.println("waitReparent "+waitReparent); String tstname = TestFocus02SwingAWTRobot.class.getName(); - org.apache.tools.ant.taskdefs.optional.junit.JUnitTestRunner.main(new String[] { - tstname, - "filtertrace=true", - "haltOnError=false", - "haltOnFailure=false", - "showoutput=true", - "outputtoformatters=true", - "logfailedtests=true", - "logtestlistenerevents=true", - "formatter=org.apache.tools.ant.taskdefs.optional.junit.PlainJUnitResultFormatter", - "formatter=org.apache.tools.ant.taskdefs.optional.junit.XMLJUnitResultFormatter,TEST-"+tstname+".xml" } ); + org.junit.runner.JUnitCore.main(tstname); } } diff --git a/src/junit/com/jogamp/test/junit/util/AWTRobotUtil.java b/src/junit/com/jogamp/test/junit/util/AWTRobotUtil.java index 4e0d4a883..c49de3e1f 100644 --- a/src/junit/com/jogamp/test/junit/util/AWTRobotUtil.java +++ b/src/junit/com/jogamp/test/junit/util/AWTRobotUtil.java @@ -301,7 +301,7 @@ public class AWTRobotUtil { centerMouse(robot, obj); - robot.delay(clickTO); + robot.delay(2*clickTO); int c0 = mouseClickCounter.getCount(); |