summaryrefslogtreecommitdiffstats
path: root/src/test/com
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-10-08 20:05:34 +0200
committerSven Gothel <[email protected]>2014-10-08 20:05:34 +0200
commitac585daa624ec7e8bc747e6e4ef4e1c330f447b5 (patch)
tree6c8dc9147e2b761b6d800aacb2059a027e70f480 /src/test/com
parent94596376a190e88b40f517185da54cc37f03a285 (diff)
Unit Tests: Increase minimum manual set timeout to 10s
Diffstat (limited to 'src/test/com')
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext01NEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext02NEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableDeadlockAWT.java2
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java2
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES2NEWT.java6
5 files changed, 9 insertions, 9 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext01NEWT.java
index c17f669ee..05f70689c 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext01NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext01NEWT.java
@@ -58,12 +58,12 @@ import com.jogamp.opengl.util.Animator;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestBug669RecursiveGLContext01NEWT extends UITestCase {
- @Test(timeout=5000)
+ @Test(timeout=10000)
public void test01_Plain() {
test01Impl(false);
}
- @Test(timeout=5000)
+ @Test(timeout=10000)
public void test01_Anim() {
test01Impl(true);
}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext02NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext02NEWT.java
index 54afe9143..4a8499be2 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext02NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug669RecursiveGLContext02NEWT.java
@@ -56,12 +56,12 @@ import com.jogamp.opengl.util.Animator;
@FixMethodOrder(MethodSorters.NAME_ASCENDING)
public class TestBug669RecursiveGLContext02NEWT extends UITestCase {
- @Test(timeout=5000)
+ @Test(timeout=10000)
public void test01_Plain() {
test01Impl(false);
}
- @Test(timeout=5000)
+ @Test(timeout=10000)
public void test01_Anim() {
test01Impl(true);
}
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableDeadlockAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableDeadlockAWT.java
index 2559fe363..929799ecd 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableDeadlockAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableDeadlockAWT.java
@@ -102,7 +102,7 @@ public class TestFBOAutoDrawableDeadlockAWT extends UITestCase {
fbod.destroy();
}
- @Test(timeout = 2000) // 2s timeout
+ @Test(timeout = 10000)
public void testDeadlock() throws InterruptedException, InvocationTargetException {
final GLCapabilities caps = new GLCapabilities( glp );
runTestGL( caps );
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java
index ec377662f..e8b21e935 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestPBufferDeadlockAWT.java
@@ -101,7 +101,7 @@ public class TestPBufferDeadlockAWT extends UITestCase {
pbuffer.destroy();
}
- @Test(timeout = 2000) // 2s timeout
+ @Test(timeout = 10000)
public void testDeadlock() throws InterruptedException, InvocationTargetException {
final GLCapabilities caps = new GLCapabilities( glp );
runTestGL( caps );
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES2NEWT.java
index daac8ad5a..148e107e3 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES2NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES2NEWT.java
@@ -87,17 +87,17 @@ public class TestMultisampleES2NEWT extends UITestCase {
testMultiSampleAAImpl(false, true, 0);
}
- @Test(timeout = 3000) // 3s timeout
+ @Test(timeout = 10000)
public void testOffsreenPBufferMultiSampleAA8() throws InterruptedException {
testMultiSampleAAImpl(false, true, 8);
}
- @Test(timeout = 3000) // 3s timeout
+ @Test(timeout = 10000)
public void testOffscreenFBOMultiSampleAA0() throws InterruptedException {
testMultiSampleAAImpl(true, false, 0);
}
- @Test(timeout = 3000) // 3s timeout
+ @Test(timeout = 10000)
public void testOffsreenFBOMultiSampleAA8() throws InterruptedException {
testMultiSampleAAImpl(true, false, 8);
}