aboutsummaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-10-12 22:09:27 +0200
committerSven Gothel <[email protected]>2013-10-12 22:09:27 +0200
commitef02c4dc2aced367ad5de29171d138161e2b3514 (patch)
treed4c0e01d8fb989360bec67f5194c002ddc32e0e1 /test
parent722624dbbce37fa69c0cae0d832beb5a58d68739 (diff)
Refine 7b21b5abb6373637eeeb270de05bb7472f70b853: Add CLGL.CL_CONTEXT_PROPERTY_USE_CGL_SHAREGROUP_APPLE and comment it's usage; Remove 'import static'
Note: JOCL impl. shall remove all 'import static' to remove hardhsip on ClassLoader ..
Diffstat (limited to 'test')
-rw-r--r--test/com/jogamp/opencl/gl/CLGLTest.java12
1 files changed, 2 insertions, 10 deletions
diff --git a/test/com/jogamp/opencl/gl/CLGLTest.java b/test/com/jogamp/opencl/gl/CLGLTest.java
index 75cd35c..5ccebb1 100644
--- a/test/com/jogamp/opencl/gl/CLGLTest.java
+++ b/test/com/jogamp/opencl/gl/CLGLTest.java
@@ -37,9 +37,7 @@ import com.jogamp.opencl.CLCommandQueue;
import javax.media.opengl.GL2;
import javax.media.opengl.GLException;
import com.jogamp.opencl.CLDevice;
-import com.jogamp.newt.Display;
import com.jogamp.newt.NewtFactory;
-import com.jogamp.newt.Screen;
import com.jogamp.newt.Window;
import com.jogamp.newt.opengl.GLWindow;
import com.jogamp.opencl.CLContext;
@@ -51,10 +49,7 @@ import java.nio.IntBuffer;
import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GLProfile;
import javax.media.opengl.GLContext;
-import org.junit.Rule;
import org.junit.Test;
-import org.junit.rules.MethodRule;
-import org.junit.rules.Timeout;
import static com.jogamp.opencl.util.CLPlatformFilters.*;
import static org.junit.Assert.*;
@@ -66,9 +61,6 @@ import static java.lang.System.*;
*/
public class CLGLTest {
- @Rule
- public MethodRule methodTimeout= new Timeout(15000);
-
private static GLContext glcontext;
private static GLWindow glWindow;
private static Window window;
@@ -101,7 +93,7 @@ public class CLGLTest {
window = null;
}
- @Test
+ @Test(timeout=15000)
public void createContextTest() {
initGL();
@@ -143,7 +135,7 @@ public class CLGLTest {
}
- @Test
+ @Test(timeout=15000)
public void vboSharing() {
out.println(" - - - glcl; vboSharing - - - ");