From 7cac2c276675e059137aa16b7d856c59f0943dac Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Tue, 25 Jun 2013 16:19:26 +0200 Subject: [PATCH] Test NEWT Key Events, TestInitConcurrent0*NEWT: TO 5 -> 3 minutes --- .../jogl/acore/TestInitConcurrent01NEWT.java | 4 ++-- .../jogl/acore/TestInitConcurrent02NEWT.java | 6 +++--- ...estBug722GLContextDrawableSwitchNewt2AWT.java | 2 +- .../junit/newt/event/BaseNewtEventModifiers.java | 16 ++++++++-------- .../newt/event/TestNewtKeyCodeModifiersAWT.java | 6 +++--- .../junit/newt/event/TestNewtKeyCodesAWT.java | 6 +++--- .../event/TestNewtKeyEventAutoRepeatAWT.java | 4 ++-- .../newt/event/TestNewtKeyEventOrderAWT.java | 6 +++--- .../TestNewtKeyPressReleaseUnmaskRepeatAWT.java | 6 +++--- 9 files changed, 28 insertions(+), 28 deletions(-) diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent01NEWT.java index 6116fdf4a5..20c098f2ed 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent01NEWT.java @@ -44,12 +44,12 @@ public class TestInitConcurrent01NEWT extends InitConcurrentBaseNEWT { static boolean mainRun = false; - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test02TwoThreads() throws InterruptedException { runJOGLTasks(2, true); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test02FourThreads() throws InterruptedException { runJOGLTasks(4, true); } diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent02NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent02NEWT.java index 950bc1fc1a..5b754ef7dd 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent02NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent02NEWT.java @@ -44,7 +44,7 @@ public class TestInitConcurrent02NEWT extends InitConcurrentBaseNEWT { static boolean mainRun = false; - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test02TwoThreads() throws InterruptedException { if(!mainRun) { System.err.println("Disabled for auto unit test until further analysis - Windows/ATI driver crash"); @@ -53,7 +53,7 @@ public void test02TwoThreads() throws InterruptedException { runJOGLTasks(2, false); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test02FourThreads() throws InterruptedException { if(!mainRun) { System.err.println("Disabled for auto unit test until further analysis - Windows/ATI driver crash"); @@ -62,7 +62,7 @@ public void test02FourThreads() throws InterruptedException { runJOGLTasks(4, false); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test16SixteenThreads() throws InterruptedException { if(!mainRun) { System.err.println("Disabled for auto unit test until further analysis - Windows/ATI driver crash"); diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestBug722GLContextDrawableSwitchNewt2AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestBug722GLContextDrawableSwitchNewt2AWT.java index a119787848..c670f4c4ca 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestBug722GLContextDrawableSwitchNewt2AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestBug722GLContextDrawableSwitchNewt2AWT.java @@ -65,7 +65,7 @@ public class TestBug722GLContextDrawableSwitchNewt2AWT extends GLContextDrawable */ public static boolean fixedNewtDisplay = true; - @Test(timeout=3000000) + @Test(timeout=180000) // TO 3 min public void test11GLWindow2GLCanvasOnScrnGL2ES2() throws InterruptedException { final GLCapabilities caps = getCaps(GLProfile.GL2ES2); if(null == caps) return; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java b/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java index 2221523568..a959a56bea 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java @@ -386,7 +386,7 @@ private void execOffThreadWithOnThreadEventDispatch(Runnable testAction) throws // run the tests for NewtCanvasAWT and NewtCanvasSWT until we can // pay more attention to the NEWT event modifier stuff. - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void testSingleButtonPressAndRelease() throws Exception { execOffThreadWithOnThreadEventDispatch(new Runnable() { public void run() { @@ -396,7 +396,7 @@ public void run() { } } ); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void testSingleButtonPressAndReleaseWithShift() throws Exception { execOffThreadWithOnThreadEventDispatch(new Runnable() { public void run() { @@ -406,7 +406,7 @@ public void run() { } } ); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void testSingleButtonPressAndReleaseWithCtrl() throws Exception { execOffThreadWithOnThreadEventDispatch(new Runnable() { public void run() { @@ -419,7 +419,7 @@ public void run() { /** * The META and ALT tests get too tied up with functions of the window system on X11, * so it's probably best to leave them commented out. - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void testSingleButtonPressAndReleaseWithMeta() throws Exception { execOffThreadWithOnThreadEventDispatch(new Runnable() { public void run() { @@ -429,7 +429,7 @@ public void run() { } } ); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void testSingleButtonPressAndReleaseWithAlt() throws Exception { execOffThreadWithOnThreadEventDispatch(new Runnable() { public void run() { @@ -459,7 +459,7 @@ public void run() { //////////////////////////////////////////////////////////////////////////// - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void testHoldOneButtonAndPressAnother() throws Exception { execOffThreadWithOnThreadEventDispatch(new Runnable() { public void run() { @@ -469,7 +469,7 @@ public void run() { } } ); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void testPressAllButtonsInSequence() throws Exception { execOffThreadWithOnThreadEventDispatch(new Runnable() { public void run() { @@ -479,7 +479,7 @@ public void run() { } } ); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void testSingleButtonClickAndDrag() throws Exception { execOffThreadWithOnThreadEventDispatch(new Runnable() { public void run() { 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 d31b18ee8f..0f79d9b9c0 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 @@ -95,7 +95,7 @@ public void initTest() { public void releaseTest() { } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test01NEWT() throws AWTException, InterruptedException, InvocationTargetException { GLWindow glWindow = GLWindow.create(glCaps); glWindow.setSize(width, height); @@ -141,7 +141,7 @@ public void run() { glWindow.destroy(); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test02NewtCanvasAWT_Onscreen() throws AWTException, InterruptedException, InvocationTargetException { if( JAWTUtil.isOffscreenLayerRequired() ) { System.err.println("Platform doesn't support onscreen rendering."); @@ -150,7 +150,7 @@ public void test02NewtCanvasAWT_Onscreen() throws AWTException, InterruptedExcep testNewtCanvasAWT_Impl(true); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test03NewtCanvasAWT_Offsccreen() throws AWTException, InterruptedException, InvocationTargetException { if( !JAWTUtil.isOffscreenLayerSupported() ) { System.err.println("Platform doesn't support offscreen rendering."); 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 56debef878..333a21b89f 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 @@ -91,7 +91,7 @@ public void initTest() { public void releaseTest() { } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test01NEWT() throws AWTException, InterruptedException, InvocationTargetException { GLWindow glWindow = GLWindow.create(glCaps); glWindow.setSize(width, height); @@ -137,7 +137,7 @@ public void run() { glWindow.destroy(); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test02NewtCanvasAWT_Onscreen() throws AWTException, InterruptedException, InvocationTargetException { if( JAWTUtil.isOffscreenLayerRequired() ) { System.err.println("Platform doesn't support onscreen rendering."); @@ -146,7 +146,7 @@ public void test02NewtCanvasAWT_Onscreen() throws AWTException, InterruptedExcep testNewtCanvasAWT_Impl(true); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test03NewtCanvasAWT_Offsccreen() throws AWTException, InterruptedException, InvocationTargetException { if( !JAWTUtil.isOffscreenLayerSupported() ) { System.err.println("Platform doesn't support offscreen rendering."); 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 6675d89e94..8b8a5ac792 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 @@ -108,7 +108,7 @@ public void initTest() { public void releaseTest() { } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test01NEWT() throws AWTException, InterruptedException, InvocationTargetException { GLWindow glWindow = GLWindow.create(glCaps); glWindow.setSize(width, height); @@ -119,7 +119,7 @@ public void test01NEWT() throws AWTException, InterruptedException, InvocationTa glWindow.destroy(); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test02NewtCanvasAWT() throws AWTException, InterruptedException, InvocationTargetException { GLWindow glWindow = GLWindow.create(glCaps); 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 6fbc3a330c..d0c3813d5f 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 @@ -94,7 +94,7 @@ public void initTest() { public void releaseTest() { } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test01NEWT() throws AWTException, InterruptedException, InvocationTargetException { GLWindow glWindow = GLWindow.create(glCaps); glWindow.setSize(width, height); @@ -140,7 +140,7 @@ public void run() { glWindow.destroy(); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test02NewtCanvasAWT_Onscreen() throws AWTException, InterruptedException, InvocationTargetException { if( JAWTUtil.isOffscreenLayerRequired() ) { System.err.println("Platform doesn't support onscreen rendering."); @@ -149,7 +149,7 @@ public void test02NewtCanvasAWT_Onscreen() throws AWTException, InterruptedExcep testNewtCanvasAWT_Impl(true); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test03NewtCanvasAWT_Offsccreen() throws AWTException, InterruptedException, InvocationTargetException { if( !JAWTUtil.isOffscreenLayerSupported() ) { System.err.println("Platform doesn't support offscreen rendering."); 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 33ae4d2da3..e0d2ae2ee4 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 @@ -89,7 +89,7 @@ public void initTest() { public void releaseTest() { } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test01NEWT() throws AWTException, InterruptedException, InvocationTargetException { GLWindow glWindow = GLWindow.create(glCaps); glWindow.setSize(width, height); @@ -135,7 +135,7 @@ public void run() { glWindow.destroy(); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test02NewtCanvasAWT_Onscreen() throws AWTException, InterruptedException, InvocationTargetException { if( JAWTUtil.isOffscreenLayerRequired() ) { System.err.println("Platform doesn't support onscreen rendering."); @@ -144,7 +144,7 @@ public void test02NewtCanvasAWT_Onscreen() throws AWTException, InterruptedExcep testNewtCanvasAWT_Impl(true); } - @Test(timeout=300000) // TO 5 min + @Test(timeout=180000) // TO 3 min public void test03NewtCanvasAWT_Offsccreen() throws AWTException, InterruptedException, InvocationTargetException { if( !JAWTUtil.isOffscreenLayerSupported() ) { System.err.println("Platform doesn't support offscreen rendering.");