diff options
Diffstat (limited to 'src/test/com/jogamp/opengl')
4 files changed, 16 insertions, 15 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMRTNEWT01.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMRTNEWT01.java index 8e2468536..e5075bbea 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMRTNEWT01.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMRTNEWT01.java @@ -87,8 +87,8 @@ public class TestFBOMRTNEWT01 extends UITestCase { "shader/bin", "fbo-mrt-1", false); final ShaderProgram sp0 = new ShaderProgram(); sp0.add(gl, vp0, System.err); - sp0.add(gl, fp0, System.err); - Assert.assertTrue(0<=sp0.program()); + sp0.add(gl, fp0, System.err); + Assert.assertTrue(0 != sp0.program()); Assert.assertTrue(!sp0.inUse()); Assert.assertTrue(!sp0.linked()); Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError()); @@ -101,7 +101,7 @@ public class TestFBOMRTNEWT01 extends UITestCase { final ShaderProgram sp1 = new ShaderProgram(); sp1.add(gl, vp1, System.err); sp1.add(gl, fp1, System.err); - Assert.assertTrue(0<=sp1.program()); + Assert.assertTrue(0 != sp1.program()); Assert.assertTrue(!sp1.inUse()); Assert.assertTrue(!sp1.linked()); Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError()); 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 e64c3de19..ab4b2d8b6 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 @@ -81,12 +81,12 @@ public class TestGLSLShaderState01NEWT extends UITestCase { rsFp.defaultShaderCustomization(gl, true, ShaderCode.es2_default_precision_fp); final ShaderProgram sp = new ShaderProgram(); - Assert.assertTrue(0>sp.program()); + Assert.assertTrue(0 == sp.program()); sp.add(gl, rsVp, System.err); sp.add(gl, rsFp, System.err); - Assert.assertTrue(0<=sp.program()); + Assert.assertTrue(0 != sp.program()); Assert.assertTrue(!sp.inUse()); Assert.assertTrue(!sp.linked()); Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError()); 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 69736f33b..7022b7400 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 @@ -94,9 +94,9 @@ public class TestGLSLShaderState02NEWT extends UITestCase { sp1.add(rsVp0); sp1.add(rsFp1); Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError()); - Assert.assertTrue(0>sp1.program()); - sp1.init(gl); - Assert.assertTrue(0<=sp1.program()); + Assert.assertTrue(0 == sp1.program()); + Assert.assertTrue(sp1.init(gl)); + Assert.assertTrue(0 != sp1.program()); Assert.assertTrue(!sp1.inUse()); Assert.assertTrue(!sp1.linked()); Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError()); @@ -111,9 +111,9 @@ public class TestGLSLShaderState02NEWT extends UITestCase { sp0.add(rsFp0); Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError()); - Assert.assertTrue(0>sp0.program()); - sp0.init(gl); - Assert.assertTrue(0<=sp0.program()); + Assert.assertTrue(0 == sp0.program()); + Assert.assertTrue(sp0.init(gl)); + Assert.assertTrue(0 != sp0.program()); Assert.assertTrue(!sp0.inUse()); Assert.assertTrue(!sp0.linked()); Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError()); @@ -265,15 +265,16 @@ public class TestGLSLShaderState02NEWT extends UITestCase { sp1.add(rsVp0); sp1.add(rsFp1); Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError()); - Assert.assertTrue(0>sp1.program()); - sp1.init(gl); + Assert.assertTrue(0 == sp1.program()); + Assert.assertTrue(sp1.init(gl)); + Assert.assertTrue(0 != sp1.program()); Assert.assertTrue(sp1.link(gl, System.err)); final ShaderProgram sp0 = new ShaderProgram(); sp0.add(rsVp0); sp0.add(rsFp0); - sp0.init(gl); + Assert.assertTrue(sp0.init(gl)); Assert.assertTrue(sp0.link(gl, System.err)); st.attachShaderProgram(gl, sp0, true); 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 a7fe9a064..98620e0c1 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 @@ -83,7 +83,7 @@ public class TestRulerNEWT01 extends UITestCase { final ShaderProgram sp0 = new ShaderProgram(); sp0.add(gl, vp0, System.err); sp0.add(gl, fp0, System.err); - Assert.assertTrue(0<=sp0.program()); + Assert.assertTrue(0 != sp0.program()); Assert.assertTrue(!sp0.inUse()); Assert.assertTrue(!sp0.linked()); Assert.assertEquals(GL.GL_NO_ERROR, gl.glGetError()); |