Skip to content

Commit

Permalink
Test NEWT Key Events, TestInitConcurrent0*NEWT: TO 5 -> 3 minutes
Browse files Browse the repository at this point in the history
  • Loading branch information
@sgothel
sgothel committed Jun 25, 2013
1 parent 0bb1796 commit 7cac2c2
Show file tree
Hide file tree
Showing 9 changed files with 28 additions and 28 deletions.
4 changes: 2 additions & 2 deletions src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent01NEWT.java
View file
Expand Up @@ -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);
}
Expand Down
6 changes: 3 additions & 3 deletions src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent02NEWT.java
View file
Expand Up @@ -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");
Expand All @@ -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");
Expand All @@ -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");
Expand Down
2 changes: 1 addition & 1 deletion .../jogamp/opengl/test/junit/jogl/acore/glels/TestBug722GLContextDrawableSwitchNewt2AWT.java
View file
Expand Up @@ -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;
Expand Down
16 changes: 8 additions & 8 deletions src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java
View file
Expand Up @@ -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() {
Expand All @@ -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() {
Expand All @@ -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() {
Expand All @@ -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() {
Expand All @@ -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() {
Expand Down Expand Up @@ -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() {
Expand All @@ -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() {
Expand All @@ -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() {
Expand Down
6 changes: 3 additions & 3 deletions src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodeModifiersAWT.java
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -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.");
Expand All @@ -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.");
Expand Down
6 changes: 3 additions & 3 deletions src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodesAWT.java
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -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.");
Expand All @@ -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.");
Expand Down
4 changes: 2 additions & 2 deletions src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventAutoRepeatAWT.java
View file
Expand Up @@ -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);
Expand All @@ -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);

Expand Down
6 changes: 3 additions & 3 deletions src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventOrderAWT.java
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -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.");
Expand All @@ -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.");
Expand Down
6 changes: 3 additions & 3 deletions src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyPressReleaseUnmaskRepeatAWT.java
View file
Expand Up @@ -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);
Expand Down Expand Up @@ -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.");
Expand All @@ -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.");
Expand Down

0 comments on commit 7cac2c2

Please sign in to comment.