aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/com/jogamp/opengl
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2011-08-30 22:49:25 +0200
committerSven Gothel <[email protected]>2011-08-30 22:49:25 +0200
commit072dc4b6e9bdc501873633fff824802d3948a636 (patch)
tree1ef923a2e3340f2cd3c0909d8be0ab5f62c63e0c /src/test/com/jogamp/opengl
parentf3c58e61ad9b1ad1d1c193d6f538776fb4de1dac (diff)
Test: Cleanup warnings; Add GLProfile.initSingleton(true) call for fluctuating NEWT tests
Add GLProfile.initSingleton(true) call for fluctuating NEWT tests - Some of these tests even fail in the <init> state, i.e. cause a JVM stack dump around an early GLX createContext method only when issued via Jenkins. The Ubuntu 11.04/64bit Jenkins node runs 2 nodes (32 and 64 bit). TODO: Find cause.
Diffstat (limited to 'src/test/com/jogamp/opengl')
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug00NEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug01NEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestFBOMRTNEWT01.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState01NEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState02NEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLSimple01NEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestRulerNEWT01.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestShaderCompilationBug459AWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/newt/TestFocus02SwingAWTRobot.java5
-rw-r--r--src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java2
10 files changed, 33 insertions, 6 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug00NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug00NEWT.java
index 4e489dbb0..f305b3a4c 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug00NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug00NEWT.java
@@ -51,6 +51,10 @@ import com.jogamp.opengl.test.junit.util.UITestCase;
public class TestGLDebug00NEWT extends UITestCase {
+ static {
+ GLProfile.initSingleton(true);
+ }
+
static String dbgTstMsg0 = "Hello World";
static int dbgTstId0 = 42;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug01NEWT.java
index fcda5e84b..95dc5fe81 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug01NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLDebug01NEWT.java
@@ -47,6 +47,10 @@ import com.jogamp.opengl.test.junit.util.UITestCase;
public class TestGLDebug01NEWT extends UITestCase {
+ static {
+ GLProfile.initSingleton(true);
+ }
+
static String dbgTstMsg0 = "Hello World";
static int dbgTstId0 = 42;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestFBOMRTNEWT01.java b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestFBOMRTNEWT01.java
index 05d9e0908..dd933ad3b 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestFBOMRTNEWT01.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestFBOMRTNEWT01.java
@@ -51,6 +51,10 @@ import org.junit.Assert;
import org.junit.Test;
public class TestFBOMRTNEWT01 extends UITestCase {
+ static {
+ GLProfile.initSingleton(true);
+ }
+
static long durationPerTest = 10; // ms
@Test
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState01NEWT.java
index 4b7617d63..838110b56 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState01NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState01NEWT.java
@@ -52,6 +52,10 @@ import org.junit.Test;
* and shader state in general.
*/
public class TestGLSLShaderState01NEWT extends UITestCase {
+ static {
+ GLProfile.initSingleton(true);
+ }
+
static long durationPerTest = 10; // ms
static final int vertices0_loc = 0; // FIXME: AMD needs this to be location 0 ? hu ?
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState02NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState02NEWT.java
index 854bc2aa6..fb53794d2 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState02NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLShaderState02NEWT.java
@@ -52,6 +52,10 @@ import org.junit.Test;
* and shader state in general.
*/
public class TestGLSLShaderState02NEWT extends UITestCase {
+ static {
+ GLProfile.initSingleton(true);
+ }
+
static long durationPerTest = 10; // ms
static final int vertices0_loc = 0; // FIXME: AMD needs this to be location 0 ? hu ?
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLSimple01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLSimple01NEWT.java
index b683cb2e7..55cc1fb76 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLSimple01NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestGLSLSimple01NEWT.java
@@ -52,6 +52,10 @@ import javax.media.opengl.GL2ES2;
import org.junit.AfterClass;
public class TestGLSLSimple01NEWT extends UITestCase {
+ static {
+ GLProfile.initSingleton(true);
+ }
+
static long durationPerTest = 100; // ms
@BeforeClass
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestRulerNEWT01.java b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestRulerNEWT01.java
index 465f55c42..5019dcaa7 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestRulerNEWT01.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestRulerNEWT01.java
@@ -53,6 +53,10 @@ import org.junit.Assert;
import org.junit.Test;
public class TestRulerNEWT01 extends UITestCase {
+ static {
+ GLProfile.initSingleton(true);
+ }
+
static long durationPerTest = 10; // ms
@Test
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestShaderCompilationBug459AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestShaderCompilationBug459AWT.java
index e3d275845..44ad797c1 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestShaderCompilationBug459AWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestShaderCompilationBug459AWT.java
@@ -50,6 +50,9 @@ import org.junit.Test;
* This bug is Windows-only; it works on Mac OS X and CentOS.
*/
public class TestShaderCompilationBug459AWT extends UITestCase {
+ static {
+ GLProfile.initSingleton(true);
+ }
static GLProfile glp;
static int width, height;
static long duration = 500; // ms
@@ -58,7 +61,6 @@ public class TestShaderCompilationBug459AWT extends UITestCase {
@BeforeClass
public static void initClass() {
- GLProfile.initSingleton(true);
glp = GLProfile.getDefault();
Assert.assertNotNull(glp);
width = 512;
diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestFocus02SwingAWTRobot.java b/src/test/com/jogamp/opengl/test/junit/newt/TestFocus02SwingAWTRobot.java
index 01b1e32b8..bea9a1f2f 100644
--- a/src/test/com/jogamp/opengl/test/junit/newt/TestFocus02SwingAWTRobot.java
+++ b/src/test/com/jogamp/opengl/test/junit/newt/TestFocus02SwingAWTRobot.java
@@ -84,10 +84,8 @@ public class TestFocus02SwingAWTRobot extends UITestCase {
private void testFocus01ProgrFocusImpl(Robot robot)
throws AWTException, InterruptedException, InvocationTargetException {
- int x = 0;
- int y = 0;
- ArrayList eventCountAdapters = new ArrayList();
+ ArrayList<EventCountAdapter> eventCountAdapters = new ArrayList<EventCountAdapter>();
/**
* JFrame . JPanel . Container . NewtCanvasAWT . GLWindow
@@ -284,6 +282,7 @@ public class TestFocus02SwingAWTRobot extends UITestCase {
return i;
}
+ @SuppressWarnings("unused")
public static void main(String args[])
throws IOException, AWTException, InterruptedException, InvocationTargetException
{
diff --git a/src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java b/src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java
index a4449e6d6..814a9fcfb 100644
--- a/src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java
+++ b/src/test/com/jogamp/opengl/test/junit/util/NEWTGLContext.java
@@ -32,8 +32,6 @@ import com.jogamp.newt.NewtFactory;
import com.jogamp.newt.Screen;
import com.jogamp.newt.Window;
-import javax.media.opengl.GL;
-import javax.media.opengl.GL2ES2;
import javax.media.opengl.GLCapabilities;
import javax.media.opengl.GLContext;
import javax.media.opengl.GLDrawable;