diff options
Diffstat (limited to 'src/test/com/jogamp/opengl')
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsES1.java | 9 | ||||
-rw-r--r-- | src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java | 7 |
2 files changed, 1 insertions, 15 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsES1.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsES1.java index 4bb584865..8d579ce5d 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsES1.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/GearsES1.java @@ -27,8 +27,6 @@ import javax.media.opengl.GLAutoDrawable; import javax.media.opengl.GLEventListener; import javax.media.opengl.GLProfile; -import org.junit.Assert; - import com.jogamp.newt.Window; import com.jogamp.newt.event.KeyAdapter; import com.jogamp.newt.event.KeyEvent; @@ -84,7 +82,6 @@ public class GearsES1 implements GLEventListener { public void init(GLAutoDrawable drawable) { System.err.println(Thread.currentThread()+" GearsES1.init ..."); - Assert.assertEquals("already init", false, initialized); initialized = true; // Use debug pipeline @@ -148,7 +145,6 @@ public class GearsES1 implements GLEventListener { public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { System.err.println(Thread.currentThread()+" GearsES1.reshape "+x+"/"+y+" "+width+"x"+height+", swapInterval "+swapInterval); - Assert.assertEquals("not init or already disposed", true, initialized); GL2ES1 gl = drawable.getGL().getGL2ES1(); gl.setSwapInterval(swapInterval); @@ -167,7 +163,6 @@ public class GearsES1 implements GLEventListener { public void dispose(GLAutoDrawable drawable) { System.err.println(Thread.currentThread()+" GearsES1.dispose ... "); - Assert.assertEquals("not init or already disposed", true, initialized); initialized = false; GL gl = drawable.getGL(); gear1.destroy(gl); @@ -179,9 +174,7 @@ public class GearsES1 implements GLEventListener { System.err.println(Thread.currentThread()+" GearsES1.dispose FIN"); } - public void display(GLAutoDrawable drawable) { - Assert.assertEquals("not init or already disposed", true, initialized); - + public void display(GLAutoDrawable drawable) { // Turn the gears' teeth angle += 2.0f; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java index d92d98894..d0eb3b183 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/GearsES2.java @@ -37,13 +37,10 @@ import java.nio.FloatBuffer; import javax.media.opengl.GL; import javax.media.opengl.GL2ES2; import javax.media.opengl.GLAutoDrawable; -import javax.media.opengl.GLContext; import javax.media.opengl.GLEventListener; import javax.media.opengl.GLProfile; import javax.media.opengl.GLUniformData; -import junit.framework.Assert; - /** * GearsES2.java <BR> * @author Brian Paul (converted to Java by Ron Cemer and Sven Gothel) <P> @@ -95,7 +92,6 @@ public class GearsES2 implements GLEventListener { public void init(GLAutoDrawable drawable) { System.err.println(Thread.currentThread()+" GearsES2.init ..."); - Assert.assertEquals("already init", false, initialized); initialized = true; GL2ES2 gl = drawable.getGL().getGL2ES2(); @@ -182,7 +178,6 @@ public class GearsES2 implements GLEventListener { public void reshape(GLAutoDrawable drawable, int x, int y, int width, int height) { System.err.println(Thread.currentThread()+" GearsES2.reshape "+x+"/"+y+" "+width+"x"+height+", swapInterval "+swapInterval); - Assert.assertEquals("not init or already disposed", true, initialized); GL2ES2 gl = drawable.getGL().getGL2ES2(); float h = (float)height / (float)width; @@ -202,7 +197,6 @@ public class GearsES2 implements GLEventListener { public void dispose(GLAutoDrawable drawable) { System.err.println(Thread.currentThread()+" GearsES2.dispose ... "); - Assert.assertEquals("not init or already disposed", true, initialized); initialized = false; GL2ES2 gl = drawable.getGL().getGL2ES2(); st.useProgram(gl, false); @@ -220,7 +214,6 @@ public class GearsES2 implements GLEventListener { } public void display(GLAutoDrawable drawable) { - Assert.assertEquals("not init or already disposed", true, initialized); // Turn the gears' teeth angle += 2.0f; |