diff options
219 files changed, 659 insertions, 7 deletions
diff --git a/.classpath b/.classpath index 41f50c091..817f2b8ec 100644 --- a/.classpath +++ b/.classpath @@ -27,11 +27,11 @@ </attributes> </classpathentry> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/> - <classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/> <classpathentry combineaccessrules="false" kind="src" path="/gluegen"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/Ant"/> <classpathentry kind="con" path="org.eclipse.jdt.USER_LIBRARY/SWT"/> <classpathentry kind="lib" path="/gluegen/make/lib/android-sdk/15/android.jar" sourcepath="/gluegen/make/lib/android-sdk/15/android-java-src.zip"/> <classpathentry combineaccessrules="false" kind="src" path="/joal"/> + <classpathentry kind="lib" path="/gluegen/make/lib/junit.jar" sourcepath="/gluegen/make/lib/junit-sources.jar"/> <classpathentry kind="output" path="build/eclipse-classes"/> </classpath> diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestRegionRendererNEWT01.java b/src/test/com/jogamp/opengl/test/junit/graph/TestRegionRendererNEWT01.java index a6616945d..e9609ca9c 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/TestRegionRendererNEWT01.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/TestRegionRendererNEWT01.java @@ -38,6 +38,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.os.Platform; import com.jogamp.graph.curve.Region; @@ -51,6 +53,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.glsl.ShaderState; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestRegionRendererNEWT01 extends UITestCase { public static void main(String args[]) throws IOException { diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT00.java b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT00.java index b594fab48..f675e42cd 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT00.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT00.java @@ -45,6 +45,8 @@ import javax.media.opengl.GLRunnable; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.graph.curve.opengl.RenderState; import com.jogamp.graph.curve.opengl.TextRenderer; @@ -58,6 +60,7 @@ import com.jogamp.opengl.util.GLReadBufferUtil; import com.jogamp.opengl.util.glsl.ShaderState; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestTextRendererNEWT00 extends UITestCase { static final boolean DEBUG = false; static final boolean TRACE = false; diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT01.java b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT01.java index ea02e930c..75a672a5b 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT01.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT01.java @@ -39,6 +39,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.os.Platform; import com.jogamp.graph.curve.Region; @@ -52,6 +54,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.glsl.ShaderState; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestTextRendererNEWT01 extends UITestCase { static final boolean DEBUG = false; static final boolean TRACE = false; diff --git a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT10.java b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT10.java index eb2c7bf82..bfa942cc1 100644 --- a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT10.java +++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT10.java @@ -38,6 +38,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.graph.curve.opengl.RenderState; import com.jogamp.graph.curve.opengl.TextRenderer; @@ -50,6 +52,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.glsl.ShaderState; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestTextRendererNEWT10 extends UITestCase { static final boolean DEBUG = false; static final boolean TRACE = false; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAWTCloseX11DisplayBug565.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAWTCloseX11DisplayBug565.java index 89de086bb..d8506a0d6 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAWTCloseX11DisplayBug565.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAWTCloseX11DisplayBug565.java @@ -3,6 +3,8 @@ package com.jogamp.opengl.test.junit.jogl.acore; import jogamp.nativewindow.x11.X11Util; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.nativewindow.NativeWindowFactory; import javax.media.opengl.GLCapabilities; @@ -14,6 +16,7 @@ import java.awt.Frame; /** * Tests the closing the device of GLCanvas in JOGL */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestAWTCloseX11DisplayBug565 { @Test diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAddRemove01GLCanvasSwingAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAddRemove01GLCanvasSwingAWT.java index d96a49bb8..3e54bcd60 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAddRemove01GLCanvasSwingAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAddRemove01GLCanvasSwingAWT.java @@ -49,11 +49,14 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestAddRemove01GLCanvasSwingAWT extends UITestCase { static long durationPerTest = 100; static int addRemoveCount = 15; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAddRemove02GLWindowNewtCanvasAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAddRemove02GLWindowNewtCanvasAWT.java index 8b447485c..be8dd3d46 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAddRemove02GLWindowNewtCanvasAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAddRemove02GLWindowNewtCanvasAWT.java @@ -49,6 +49,8 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.awt.NewtCanvasAWT; import com.jogamp.newt.opengl.GLWindow; @@ -56,6 +58,7 @@ import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestAddRemove02GLWindowNewtCanvasAWT extends UITestCase { static long durationPerTest = 50; static int addRemoveCount = 15; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAddRemove03GLWindowNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAddRemove03GLWindowNEWT.java index 981b14af3..d99475442 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAddRemove03GLWindowNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestAddRemove03GLWindowNEWT.java @@ -38,12 +38,15 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestAddRemove03GLWindowNEWT extends UITestCase { static long durationPerTest = 50; static int addRemoveCount = 15; 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 7b8529191..d61ac9ab3 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 @@ -37,6 +37,8 @@ import jogamp.opengl.GLContextImpl; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; @@ -53,6 +55,7 @@ import com.jogamp.opengl.util.Animator; * * <https://jogamp.org/bugzilla/show_bug.cgi?id=669> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug669RecursiveGLContext01NEWT extends UITestCase { @Test(timeout=5000) 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 104355a18..d83101659 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 @@ -34,6 +34,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; @@ -51,6 +53,7 @@ import com.jogamp.opengl.util.Animator; * * <https://jogamp.org/bugzilla/show_bug.cgi?id=669> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug669RecursiveGLContext02NEWT extends UITestCase { @Test(timeout=5000) diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug692GL3VAO.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug692GL3VAO.java index de5db0ae2..55328f1e6 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug692GL3VAO.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestBug692GL3VAO.java @@ -43,7 +43,9 @@ import javax.media.opengl.GLProfile; import junit.framework.Assert;
-import org.junit.Test;
+import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters;
import com.jogamp.common.nio.Buffers;
import com.jogamp.newt.opengl.GLWindow;
@@ -62,6 +64,7 @@ import com.jogamp.opengl.util.GLBuffers; * testGL3bc() tests VAO and VBO while alternating between both methods.
* </p>
*/
+@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug692GL3VAO extends UITestCase {
static long duration = 500; // ms
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 43415136d..2df14d151 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 @@ -41,10 +41,13 @@ import jogamp.nativewindow.jawt.JAWTUtil; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.util.RunnableTask; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestFBOAutoDrawableDeadlockAWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableFactoryNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableFactoryNEWT.java index 2dc547f39..9151a88a5 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableFactoryNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOAutoDrawableFactoryNEWT.java @@ -41,6 +41,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.FBObject; import com.jogamp.opengl.test.junit.jogl.demos.es2.FBOMix2DemosES2; @@ -59,6 +61,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * Extensive FBO reconfiguration (size and sample buffer count) and validation are performed. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestFBOAutoDrawableFactoryNEWT extends UITestCase { static final int widthStep = 800/4; 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 387e152ce..7ec8715a4 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 @@ -55,7 +55,10 @@ import javax.media.opengl.GLUniformData; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestFBOMRTNEWT01 extends UITestCase { static long durationPerTest = 10*40*2; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMix2DemosES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMix2DemosES2NEWT.java index 87d4df342..42f7ba652 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMix2DemosES2NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOMix2DemosES2NEWT.java @@ -57,7 +57,10 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestFBOMix2DemosES2NEWT extends UITestCase { static long duration = 500; // ms static int swapInterval = 1; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOffThreadSharedContextMix2DemosES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOffThreadSharedContextMix2DemosES2NEWT.java index 19e57c9bc..b3e5e95b0 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOffThreadSharedContextMix2DemosES2NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOffThreadSharedContextMix2DemosES2NEWT.java @@ -64,6 +64,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Toolkit agnostic {@link GLOffscreenAutoDrawable.FBO} tests using the @@ -93,6 +95,7 @@ import org.junit.Test; * </ul> * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestFBOOffThreadSharedContextMix2DemosES2NEWT extends UITestCase { static long duration = 500; // ms static int swapInterval = 1; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOnThreadSharedContext1DemoES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOnThreadSharedContext1DemoES2NEWT.java index acd46f57f..0f8ee56aa 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOnThreadSharedContext1DemoES2NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestFBOOnThreadSharedContext1DemoES2NEWT.java @@ -62,6 +62,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Toolkit agnostic {@link GLOffscreenAutoDrawable.FBO} tests using the @@ -91,6 +93,7 @@ import org.junit.Test; * </ul> * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestFBOOnThreadSharedContext1DemoES2NEWT extends UITestCase { static long duration = 500; // ms static int swapInterval = 1; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateNEWT.java index 2729d6a5d..0585bfaf8 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateNEWT.java @@ -40,6 +40,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.NewtFactory; import com.jogamp.newt.Window; @@ -66,6 +68,7 @@ import com.jogamp.opengl.util.Animator; * It is being used to run the {@link GLEventListener}. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLAutoDrawableDelegateNEWT extends UITestCase { static long duration = 500; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateOnOffscrnCapsNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateOnOffscrnCapsNEWT.java index 6fc4902ba..3d49a0dce 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateOnOffscrnCapsNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableDelegateOnOffscrnCapsNEWT.java @@ -43,6 +43,8 @@ import jogamp.opengl.GLGraphicsConfigurationUtil; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.NewtFactory; import com.jogamp.newt.Window; @@ -68,6 +70,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * It is being used to run the {@link GLEventListener}. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLAutoDrawableDelegateOnOffscrnCapsNEWT extends UITestCase { static final int widthStep = 800/4; static final int heightStep = 600/4; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableFactoryES2OffscrnCapsNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableFactoryES2OffscrnCapsNEWT.java index adef9ed15..7bcb5b56d 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableFactoryES2OffscrnCapsNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableFactoryES2OffscrnCapsNEWT.java @@ -43,6 +43,8 @@ import jogamp.opengl.GLGraphicsConfigurationUtil; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.JoglVersion; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; @@ -56,6 +58,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * The created {@link GLOffscreenAutoDrawable} is being used to run the {@link GLEventListener}. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLAutoDrawableFactoryES2OffscrnCapsNEWT extends UITestCase { static final int widthStep = 800/4; static final int heightStep = 600/4; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableFactoryGL2OffscrnCapsNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableFactoryGL2OffscrnCapsNEWT.java index 80e56f862..06dc7c83e 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableFactoryGL2OffscrnCapsNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableFactoryGL2OffscrnCapsNEWT.java @@ -43,6 +43,8 @@ import jogamp.opengl.GLGraphicsConfigurationUtil; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.JoglVersion; import com.jogamp.opengl.test.junit.jogl.demos.gl2.Gears; @@ -56,6 +58,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * The created {@link GLOffscreenAutoDrawable} is being used to run the {@link GLEventListener}. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLAutoDrawableFactoryGL2OffscrnCapsNEWT extends UITestCase { static final int widthStep = 800/4; static final int heightStep = 600/4; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableFactoryGLnBitmapCapsNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableFactoryGLnBitmapCapsNEWT.java index 746b8e15a..75609224e 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableFactoryGLnBitmapCapsNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableFactoryGLnBitmapCapsNEWT.java @@ -43,6 +43,8 @@ import jogamp.opengl.GLGraphicsConfigurationUtil; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.JoglVersion; import com.jogamp.opengl.test.junit.jogl.demos.gl2.Gears; @@ -56,6 +58,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * The created {@link GLOffscreenAutoDrawable} is being used to run the {@link GLEventListener}. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLAutoDrawableFactoryGLnBitmapCapsNEWT extends UITestCase { static final int widthStep = 800/4; static final int heightStep = 600/4; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableGLCanvasOnOffscrnCapsAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableGLCanvasOnOffscrnCapsAWT.java index 2df1d3cb6..ab64b5def 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableGLCanvasOnOffscrnCapsAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableGLCanvasOnOffscrnCapsAWT.java @@ -49,6 +49,8 @@ import jogamp.opengl.GLGraphicsConfigurationUtil; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.JoglVersion; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; @@ -58,6 +60,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; /** * Tests using an AWT {@link GLCanvas} {@link GLAutoDrawable auto drawable} for on- and offscreen cases. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLAutoDrawableGLCanvasOnOffscrnCapsAWT extends UITestCase { static final int widthStep = 800/4; static final int heightStep = 600/4; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableGLWindowOnOffscrnCapsNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableGLWindowOnOffscrnCapsNEWT.java index 0a6056606..9332b0f2e 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableGLWindowOnOffscrnCapsNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableGLWindowOnOffscrnCapsNEWT.java @@ -44,6 +44,8 @@ import jogamp.opengl.GLGraphicsConfigurationUtil; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.JoglVersion; @@ -58,6 +60,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * The NEWT {@link GLAutoDrawable} is being used to run the {@link GLEventListener}. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLAutoDrawableGLWindowOnOffscrnCapsNEWT extends UITestCase { static final int widthStep = 800/4; static final int heightStep = 600/4; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableNewtCanvasAWTOnOffscrnCapsAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableNewtCanvasAWTOnOffscrnCapsAWT.java index f4999c0fa..ae5dc614b 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableNewtCanvasAWTOnOffscrnCapsAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLAutoDrawableNewtCanvasAWTOnOffscrnCapsAWT.java @@ -50,6 +50,8 @@ import jogamp.opengl.GLGraphicsConfigurationUtil; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.awt.NewtCanvasAWT; import com.jogamp.newt.opengl.GLWindow; @@ -64,6 +66,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * The NEWT {@link GLAutoDrawable} is being used to run the {@link GLEventListener}. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLAutoDrawableNewtCanvasAWTOnOffscrnCapsAWT extends UITestCase { static final int widthStep = 800/4; static final int heightStep = 600/4; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextSurfaceLockNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextSurfaceLockNEWT.java index b3516d6b4..c64bb3854 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextSurfaceLockNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLContextSurfaceLockNEWT.java @@ -37,11 +37,14 @@ import javax.media.opengl.GLEventListener; import javax.media.opengl.GLProfile; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLContextSurfaceLockNEWT extends UITestCase { static final int demoSize = 64; 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 629a613e9..f0950fba8 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 @@ -42,6 +42,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.Display; import com.jogamp.newt.NewtFactory; @@ -49,6 +51,7 @@ import com.jogamp.newt.Screen; import com.jogamp.newt.Window; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLDebug00NEWT extends UITestCase { static String dbgTstMsg0 = "Hello World"; 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 5cace1eb9..76bf33044 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 @@ -41,10 +41,13 @@ import javax.media.opengl.GLRunnable; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLDebug01NEWT extends UITestCase { static String dbgTstMsg0 = "Hello World"; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLExtensionQueryOffscreen.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLExtensionQueryOffscreen.java index d4f3fece5..f9ab6c4b3 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLExtensionQueryOffscreen.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLExtensionQueryOffscreen.java @@ -42,7 +42,10 @@ import javax.media.opengl.GLProfile; import jogamp.opengl.GLDrawableFactoryImpl; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLExtensionQueryOffscreen { public static void main(String[] args) { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLMesaBug651NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLMesaBug651NEWT.java index 9251120c0..5efe21e16 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLMesaBug651NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLMesaBug651NEWT.java @@ -44,6 +44,8 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Some GL state values are broken w/ Mesa 9.0 w/ multiple different context. @@ -57,6 +59,7 @@ import org.junit.Test; * </p> * <https://jogamp.org/bugzilla/show_bug.cgi?id=651> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLMesaBug651NEWT extends UITestCase { static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLMesaBug658NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLMesaBug658NEWT.java index 25b0b930c..b11a6f931 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLMesaBug658NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLMesaBug658NEWT.java @@ -10,6 +10,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.JoglVersion; @@ -27,6 +29,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * </p> * <https://jogamp.org/bugzilla/show_bug.cgi?id=658> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLMesaBug658NEWT extends UITestCase { @Test diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLPointsNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLPointsNEWT.java index 692a3181b..7d3a7b896 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLPointsNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLPointsNEWT.java @@ -42,7 +42,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLPointsNEWT extends UITestCase { static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfile00NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfile00NEWT.java index 19402c9cf..7a48fbb2a 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfile00NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfile00NEWT.java @@ -31,11 +31,14 @@ package com.jogamp.opengl.test.junit.jogl.acore; import java.io.IOException; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.opengl.*; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLProfile00NEWT extends UITestCase { @Test diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfile01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfile01NEWT.java index 47edf53bb..462934c92 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfile01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLProfile01NEWT.java @@ -32,6 +32,8 @@ import java.io.IOException; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.opengl.*; @@ -44,6 +46,7 @@ import com.jogamp.opengl.JoglVersion; import com.jogamp.newt.opengl.*; import com.jogamp.newt.*; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLProfile01NEWT extends UITestCase { @Test diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLVersionParsing00NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLVersionParsing00NEWT.java index a39e68abf..7ae49fe54 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLVersionParsing00NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLVersionParsing00NEWT.java @@ -32,12 +32,15 @@ import java.io.IOException; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import jogamp.opengl.GLVersionNumber; import com.jogamp.common.util.VersionNumberString; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLVersionParsing00NEWT extends UITestCase { public static final String[] glVersionStrings00 = new String[] { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGPUMemSec01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGPUMemSec01NEWT.java index 60803433d..004201905 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGPUMemSec01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGPUMemSec01NEWT.java @@ -44,7 +44,10 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGPUMemSec01NEWT extends UITestCase { static String hexString(int i) { return "0x"+Integer.toHexString(i); diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent01NEWT.java index f8e0affa3..3933000ec 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent01NEWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.jogl.acore; import java.io.IOException; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.os.Platform; @@ -41,6 +43,7 @@ import com.jogamp.common.os.Platform; * perform lifecycle actions (window creation etc) with locking. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestInitConcurrent01NEWT extends InitConcurrentBaseNEWT { @Test(timeout=180000) // TO 3 min diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent02NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent02NEWT.java index dfb7326df..67b3cef38 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent02NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestInitConcurrent02NEWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.jogl.acore; import java.io.IOException; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.os.Platform; @@ -41,6 +43,7 @@ import com.jogamp.common.os.Platform; * perform lifecycle actions (window creation etc) w/o locking. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestInitConcurrent02NEWT extends InitConcurrentBaseNEWT { static boolean mainRun = false; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMainVersionGLCanvasAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMainVersionGLCanvasAWT.java index 5523ce5ce..5c60d094f 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMainVersionGLCanvasAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMainVersionGLCanvasAWT.java @@ -33,9 +33,12 @@ import java.io.IOException; import javax.media.opengl.awt.GLCanvas; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestMainVersionGLCanvasAWT extends UITestCase { @Test diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMainVersionGLWindowNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMainVersionGLWindowNEWT.java index 24ba59b57..85de65e2a 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMainVersionGLWindowNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMainVersionGLWindowNEWT.java @@ -30,11 +30,14 @@ package com.jogamp.opengl.test.junit.jogl.acore; import java.io.IOException; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.JoglVersion; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestMainVersionGLWindowNEWT extends UITestCase { private static String[] args = null; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMapBufferRead01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMapBufferRead01NEWT.java index 158c2aa90..8fee7907a 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMapBufferRead01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestMapBufferRead01NEWT.java @@ -42,11 +42,14 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * * @author Luz, et.al. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestMapBufferRead01NEWT extends UITestCase { static final boolean DEBUG = false; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestNEWTCloseX11DisplayBug565.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestNEWTCloseX11DisplayBug565.java index c1b7464e7..c8cc294a2 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestNEWTCloseX11DisplayBug565.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestNEWTCloseX11DisplayBug565.java @@ -3,6 +3,8 @@ package com.jogamp.opengl.test.junit.jogl.acore; import jogamp.nativewindow.x11.X11Util; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; @@ -19,6 +21,7 @@ import javax.media.opengl.GLProfile; * Tests the closing the device of GLWindow and GLPBuffer in JOGL */ @SuppressWarnings("deprecation") +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNEWTCloseX11DisplayBug565 { @Test diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestNVSwapGroupNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestNVSwapGroupNEWT.java index 54f99433c..e41f22ab0 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestNVSwapGroupNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestNVSwapGroupNEWT.java @@ -44,7 +44,10 @@ import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNVSwapGroupNEWT extends UITestCase { static GLProfile glp; static GLCapabilities caps; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestOffscreenLayer01GLCanvasAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestOffscreenLayer01GLCanvasAWT.java index 8cc094276..c93e54eb9 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestOffscreenLayer01GLCanvasAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestOffscreenLayer01GLCanvasAWT.java @@ -47,6 +47,8 @@ import jogamp.nativewindow.jawt.JAWTUtil; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.os.Platform; import com.jogamp.newt.Window; @@ -57,6 +59,7 @@ import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.Animator; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestOffscreenLayer01GLCanvasAWT extends UITestCase { static boolean singleBuffer = false; static boolean useMSAA = false; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestOffscreenLayer02NewtCanvasAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestOffscreenLayer02NewtCanvasAWT.java index 2236f4b05..cea104e2f 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestOffscreenLayer02NewtCanvasAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestOffscreenLayer02NewtCanvasAWT.java @@ -46,6 +46,8 @@ import jogamp.nativewindow.jawt.JAWTUtil; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.Window; import com.jogamp.newt.awt.NewtCanvasAWT; @@ -57,6 +59,7 @@ import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.Animator; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestOffscreenLayer02NewtCanvasAWT extends UITestCase { static boolean singleBuffer = false; static boolean useMSAA = false; 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 8684ab15e..a1f0d3330 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 @@ -41,11 +41,14 @@ import jogamp.nativewindow.jawt.JAWTUtil; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.util.RunnableTask; import com.jogamp.opengl.test.junit.util.UITestCase; @SuppressWarnings("deprecation") +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestPBufferDeadlockAWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListAWT.java index 67b70e117..a3eb6db84 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListAWT.java @@ -47,7 +47,10 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestSharedContextListAWT extends UITestCase { static GLProfile glp; static GLCapabilities caps; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListNEWT.java index 78c8fd0ae..1e34b83cc 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListNEWT.java @@ -46,7 +46,10 @@ import com.jogamp.opengl.test.junit.jogl.demos.gl2.Gears; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestSharedContextListNEWT extends UITestCase { static GLProfile glp; static GLCapabilities caps; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListNEWT2.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListNEWT2.java index 7893c51f1..6b1da870a 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListNEWT2.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextListNEWT2.java @@ -44,7 +44,10 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestSharedContextListNEWT2 extends UITestCase { static GLProfile glp; static GLCapabilities caps; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextNewtAWTBug523.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextNewtAWTBug523.java index fbea81a54..434a64fad 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextNewtAWTBug523.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextNewtAWTBug523.java @@ -62,6 +62,8 @@ import javax.swing.event.ChangeListener; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.nio.Buffers; import com.jogamp.newt.awt.NewtCanvasAWT; @@ -96,6 +98,7 @@ import com.jogamp.opengl.util.GLBuffers; * {@link TestSharedContextVBOES2NEWT} and {@link TestSharedContextVBOES1NEWT}. * */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestSharedContextNewtAWTBug523 extends UITestCase { static long durationPerTest = 1000; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES1NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES1NEWT.java index 6f108d862..19089e165 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES1NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES1NEWT.java @@ -44,7 +44,10 @@ import com.jogamp.opengl.test.junit.jogl.demos.es1.GearsES1; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestSharedContextVBOES1NEWT extends UITestCase { static GLProfile glp; static GLCapabilities caps; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES2NEWT.java index 4aa977ae8..361ae597c 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES2NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestSharedContextVBOES2NEWT.java @@ -46,7 +46,10 @@ import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestSharedContextVBOES2NEWT extends UITestCase { static GLProfile glp; static GLCapabilities caps; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteAWT.java index afcf51e08..4e2e91320 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteAWT.java @@ -38,11 +38,14 @@ import javax.media.opengl.awt.GLCanvas; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.Animator; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestShutdownCompleteAWT extends UITestCase { static long duration = 300; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteNEWT.java index f376cd6d4..881d6c8de 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestShutdownCompleteNEWT.java @@ -37,6 +37,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.JoglVersion; @@ -44,6 +46,7 @@ import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.Animator; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestShutdownCompleteNEWT extends UITestCase { static long duration = 300; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestX11DefaultDisplay.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestX11DefaultDisplay.java index a2c620492..fca2beb73 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestX11DefaultDisplay.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestX11DefaultDisplay.java @@ -36,6 +36,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.jogl.demos.es1.RedSquareES1; @@ -51,6 +53,7 @@ import com.jogamp.opengl.util.Animator; * DISPLAY environment variable. * */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestX11DefaultDisplay extends UITestCase { static long duration = 500; // ms static int width = 512, height = 512; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00.java index 3a03b052a..4980e8562 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00.java @@ -50,10 +50,13 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * ExclusiveContextThread base implementation to test correctness of the ExclusiveContext feature _and_ AnimatorBase. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public abstract class ExclusiveContextBase00 extends UITestCase { static boolean testExclusiveWithAWT = false; static final int durationParts = 9; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00AWT.java index 387f6b794..5608fe282 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00AWT.java @@ -42,6 +42,8 @@ import javax.media.opengl.awt.GLCanvas; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.os.Platform; import com.jogamp.common.util.VersionNumber; @@ -49,6 +51,7 @@ import com.jogamp.common.util.VersionNumber; /** * ExclusiveContextThread base implementation to test correctness of the ExclusiveContext feature _and_ AnimatorBase with AWT. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public abstract class ExclusiveContextBase00AWT extends ExclusiveContextBase00 { static Thread awtEDT; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00NEWT.java index 43b1e1475..3f2de0156 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase00NEWT.java @@ -39,10 +39,13 @@ import javax.media.opengl.GLCapabilitiesImmutable; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * ExclusiveContextThread base implementation to test correctness of the ExclusiveContext feature _and_ AnimatorBase with NEWT. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public abstract class ExclusiveContextBase00NEWT extends ExclusiveContextBase00 { static Display dpy; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10.java index dc99e490f..516622796 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10.java @@ -49,11 +49,14 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; +import org.junit.FixMethodOrder; import org.junit.Test; +import org.junit.runners.MethodSorters; /** * ExclusiveContextThread base implementation to test performance impact of the ExclusiveContext feature with AnimatorBase. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public abstract class ExclusiveContextBase10 extends UITestCase { static boolean testExclusiveWithAWT = false; static long duration = 1400; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10AWT.java index fcccafadf..237479e5a 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10AWT.java @@ -42,6 +42,8 @@ import javax.media.opengl.awt.GLCanvas; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.os.Platform; import com.jogamp.common.util.VersionNumber; @@ -49,6 +51,7 @@ import com.jogamp.common.util.VersionNumber; /** * ExclusiveContextThread base implementation to test performance impact of the ExclusiveContext feature with AnimatorBase and AWT. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public abstract class ExclusiveContextBase10AWT extends ExclusiveContextBase10 { static Thread awtEDT; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10NEWT.java index 94a32e2f5..fc8cad04c 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/ExclusiveContextBase10NEWT.java @@ -39,10 +39,13 @@ import javax.media.opengl.GLCapabilitiesImmutable; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * ExclusiveContextThread base implementation to test performance impact of the ExclusiveContext feature with AnimatorBase and NEWT. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public abstract class ExclusiveContextBase10NEWT extends ExclusiveContextBase10 { static Display dpy; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext01VSyncAnimAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext01VSyncAnimAWT.java index 25554a845..038e0781f 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext01VSyncAnimAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext01VSyncAnimAWT.java @@ -35,9 +35,13 @@ import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.util.AnimatorBase; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; + /** * ExclusiveContextThread VSync Animator to test correctness of the ExclusiveContext feature _and_ Animator with AWT. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestExclusiveContext01VSyncAnimAWT extends ExclusiveContextBase00AWT { @Override diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext01VSyncAnimNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext01VSyncAnimNEWT.java index 3ea2704ff..d52347920 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext01VSyncAnimNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext01VSyncAnimNEWT.java @@ -34,10 +34,13 @@ import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.util.AnimatorBase; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * ExclusiveContextThread VSync Animator to test correctness of the ExclusiveContext feature _and_ Animator with NEWT. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestExclusiveContext01VSyncAnimNEWT extends ExclusiveContextBase00NEWT { @Override diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext02FPSAnimAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext02FPSAnimAWT.java index a91f7e159..f6697c608 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext02FPSAnimAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext02FPSAnimAWT.java @@ -34,10 +34,13 @@ import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.util.AnimatorBase; import com.jogamp.opengl.util.FPSAnimator; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * ExclusiveContextThread FPS Animator to test correctness of the ExclusiveContext feature _and_ FPSAnimator with AWT. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestExclusiveContext02FPSAnimAWT extends ExclusiveContextBase00AWT { @Override diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext02FPSAnimNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext02FPSAnimNEWT.java index c83bfd2b0..33819c845 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext02FPSAnimNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext02FPSAnimNEWT.java @@ -34,10 +34,13 @@ import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.util.AnimatorBase; import com.jogamp.opengl.util.FPSAnimator; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * ExclusiveContextThread FPS Animator to test correctness of the ExclusiveContext feature _and_ FPSAnimator with NEWT. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestExclusiveContext02FPSAnimNEWT extends ExclusiveContextBase00NEWT { @Override diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext11VSyncAnimNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext11VSyncAnimNEWT.java index 7caab623b..5067d6c57 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext11VSyncAnimNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext11VSyncAnimNEWT.java @@ -34,9 +34,13 @@ import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.util.AnimatorBase; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; + /** * ExclusiveContextThread base implementation to test performance impact of the ExclusiveContext feature with Animator and NEWT. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestExclusiveContext11VSyncAnimNEWT extends ExclusiveContextBase10NEWT { @Override diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext12FPSAnimNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext12FPSAnimNEWT.java index 798d09b15..993b67e80 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext12FPSAnimNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/ect/TestExclusiveContext12FPSAnimNEWT.java @@ -34,10 +34,13 @@ import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.util.AnimatorBase; import com.jogamp.opengl.util.FPSAnimator; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * ExclusiveContextThread base implementation to test performance impact of the ExclusiveContext feature with FPSAnimator and NEWT. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestExclusiveContext12FPSAnimNEWT extends ExclusiveContextBase10NEWT { @Override diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestBug722GLContextDrawableSwitchNewt2AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestBug722GLContextDrawableSwitchNewt2AWT.java index 3599258e6..24eefe73c 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestBug722GLContextDrawableSwitchNewt2AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestBug722GLContextDrawableSwitchNewt2AWT.java @@ -44,6 +44,8 @@ import com.jogamp.opengl.test.junit.util.GLEventListenerCounter; import com.jogamp.opengl.test.junit.util.MiscUtils; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Tests Bug 722 @@ -51,6 +53,7 @@ import org.junit.Test; * See Bug 722 - https://jogamp.org/bugzilla/show_bug.cgi?id=722. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug722GLContextDrawableSwitchNewt2AWT extends GLContextDrawableSwitchBase { static int loops = 10; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch01NEWT.java index 5f2b9fb53..633d9de3b 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch01NEWT.java @@ -58,11 +58,14 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Test re-association (switching) of GLContext/GLDrawables, * i.e. ctx1/draw1, ctx2/draw2 -> ctx1/draw2, ctx2/draw1. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLContextDrawableSwitch01NEWT extends UITestCase { static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch10NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch10NEWT.java index 2bba76ee7..4225cd988 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch10NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch10NEWT.java @@ -58,6 +58,8 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Test re-association of GLContext/GLDrawables, @@ -75,6 +77,7 @@ import org.junit.Test; * See Bug 665 - https://jogamp.org/bugzilla/show_bug.cgi?id=665. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLContextDrawableSwitch10NEWT extends UITestCase { // default period for 1 GLAD cycle static long duration = 1000; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch11NewtAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch11NewtAWT.java index a3f3ffbee..e5f61a4be 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch11NewtAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch11NewtAWT.java @@ -40,6 +40,8 @@ import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.test.junit.util.GLEventListenerCounter; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Test re-association of GLContext/GLDrawables, @@ -57,6 +59,7 @@ import org.junit.Test; * See Bug 665 - https://jogamp.org/bugzilla/show_bug.cgi?id=665. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLContextDrawableSwitch11NewtAWT extends GLContextDrawableSwitchBase { @Test(timeout=30000) diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch12AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch12AWT.java index 95e895d44..d17d899b8 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch12AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch12AWT.java @@ -41,6 +41,8 @@ import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.test.junit.util.GLEventListenerCounter; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Test re-association of GLContext/GLDrawables, @@ -58,6 +60,7 @@ import org.junit.Test; * See Bug 665 - https://jogamp.org/bugzilla/show_bug.cgi?id=665. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLContextDrawableSwitch12AWT extends GLContextDrawableSwitchBase { @Test(timeout=30000) diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch21Newt2AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch21Newt2AWT.java index d337570ec..2b0f43d68 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch21Newt2AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/glels/TestGLContextDrawableSwitch21Newt2AWT.java @@ -44,6 +44,8 @@ import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.test.junit.util.GLEventListenerCounter; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Test re-association of GLContext/GLDrawables, @@ -70,6 +72,7 @@ import org.junit.Test; * to avoid such re-usage worksaround this problem. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLContextDrawableSwitch21Newt2AWT extends GLContextDrawableSwitchBase { @Test(timeout=30000) diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWT01GLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWT01GLn.java index d444f02f7..6152fb144 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWT01GLn.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWT01GLn.java @@ -42,8 +42,11 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestAWT01GLn extends UITestCase { @BeforeClass public static void startup() { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWT02WindowClosing.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWT02WindowClosing.java index 6c0bc7701..349674eef 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWT02WindowClosing.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWT02WindowClosing.java @@ -36,7 +36,10 @@ import java.awt.event.*; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestAWT02WindowClosing extends UITestCase { static long durationPerTest = 200; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWT03GLCanvasRecreate01.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWT03GLCanvasRecreate01.java index 49ad1c9ba..7282687e5 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWT03GLCanvasRecreate01.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWT03GLCanvasRecreate01.java @@ -46,8 +46,11 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.After; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestAWT03GLCanvasRecreate01 extends UITestCase { static long durationPerTest = 1000; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWTCardLayoutAnimatorStartStopBug532.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWTCardLayoutAnimatorStartStopBug532.java index 1237fc9d4..d757d9522 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWTCardLayoutAnimatorStartStopBug532.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestAWTCardLayoutAnimatorStartStopBug532.java @@ -19,6 +19,8 @@ import javax.swing.JLabel; import javax.swing.JPanel; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import com.jogamp.opengl.test.junit.util.MiscUtils; @@ -26,6 +28,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.Animator; import com.jogamp.opengl.util.FPSAnimator; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestAWTCardLayoutAnimatorStartStopBug532 extends UITestCase { static final String LABEL = "Label"; static final String CANVAS = "GLCanvas"; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug460GLCanvasNPEAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug460GLCanvasNPEAWT.java index c89ce43f7..00e14b094 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug460GLCanvasNPEAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug460GLCanvasNPEAWT.java @@ -34,7 +34,10 @@ import javax.media.opengl.GLProfile; import javax.media.opengl.awt.GLCanvas; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug460GLCanvasNPEAWT { public static void main(String[] args) { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug461FBOSupersamplingSwingAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug461FBOSupersamplingSwingAWT.java index 56e308427..033e55da3 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug461FBOSupersamplingSwingAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug461FBOSupersamplingSwingAWT.java @@ -49,6 +49,8 @@ import javax.swing.JLabel; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.util.UITestCase; @@ -60,6 +62,7 @@ import com.jogamp.opengl.util.awt.AWTGLReadBufferUtil; * * @author Wade Walker (from code sample provided by Owen Dimond) */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug461FBOSupersamplingSwingAWT extends UITestCase implements GLEventListener { static long durationPerTest = 500; JFrame jframe; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug461PBufferSupersamplingSwingAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug461PBufferSupersamplingSwingAWT.java index bda1a29fd..a1abbe2aa 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug461PBufferSupersamplingSwingAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug461PBufferSupersamplingSwingAWT.java @@ -48,6 +48,8 @@ import javax.swing.JLabel; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.test.junit.util.UITestCase; @@ -58,6 +60,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * @author Wade Walker (from code sample provided by Owen Dimond) */ @SuppressWarnings("deprecation") +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug461PBufferSupersamplingSwingAWT extends UITestCase implements GLEventListener { JFrame jframe; GLPbuffer offScreenBuffer; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug551AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug551AWT.java index e68ddb4c1..51eb22210 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug551AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug551AWT.java @@ -46,6 +46,8 @@ import java.awt.Window; import javax.swing.JFrame; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import static org.junit.Assume.*; import static javax.swing.SwingUtilities.*; @@ -54,6 +56,7 @@ import static javax.swing.SwingUtilities.*; * Tests context creation + display on various kinds of Window implementations. * @author Michael Bien, et. al. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug551AWT extends UITestCase { static void checkGraphicsEnvironment() { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug572AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug572AWT.java index ea8fe070d..763c0c8ff 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug572AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug572AWT.java @@ -42,6 +42,8 @@ import junit.framework.Assert; import org.junit.Assume; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import com.jogamp.opengl.test.junit.util.AWTRobotUtil; @@ -50,6 +52,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; /** * Test realize GLCanvas and setVisible(true) AWT-Frames on AWT-EDT and on current thread (non AWT-EDT) */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug572AWT extends UITestCase { static long durationPerTest = 150; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug611AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug611AWT.java index b6a7639bd..d8e781d92 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug611AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug611AWT.java @@ -7,6 +7,8 @@ import java.io.File; import javax.media.opengl.GLProfile; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.os.Platform; import com.jogamp.opengl.test.junit.util.UITestCase; @@ -24,6 +26,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * Since Windows XP is out of life .. we may not care .. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug611AWT extends UITestCase { @Test diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug642JSplitPaneMixHwLw01AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug642JSplitPaneMixHwLw01AWT.java index 8b88a8615..57210a946 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug642JSplitPaneMixHwLw01AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug642JSplitPaneMixHwLw01AWT.java @@ -25,6 +25,8 @@ import javax.swing.WindowConstants; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.util.ReflectionUtil; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; @@ -42,6 +44,7 @@ import com.jogamp.opengl.util.FPSAnimator; * See Bug 586 * See git commit '8df12ca151dfc577c90b485d4ebfe491b88e55aa'. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug642JSplitPaneMixHwLw01AWT extends UITestCase { static long durationPerTest = 500; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug664GLCanvasSetVisibleSwingAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug664GLCanvasSetVisibleSwingAWT.java index d59bc2230..91da73e67 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug664GLCanvasSetVisibleSwingAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug664GLCanvasSetVisibleSwingAWT.java @@ -51,12 +51,15 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import com.jogamp.opengl.test.junit.util.AWTRobotUtil; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.Animator; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug664GLCanvasSetVisibleSwingAWT extends UITestCase { static long durationPerTest = 500; static boolean shallUseOffscreenFBOLayer = false; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug675BeansInDesignTimeAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug675BeansInDesignTimeAWT.java index 0c0975308..05f0c1ce3 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug675BeansInDesignTimeAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestBug675BeansInDesignTimeAWT.java @@ -43,11 +43,14 @@ import javax.swing.SwingUtilities; import junit.framework.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug675BeansInDesignTimeAWT extends UITestCase { static boolean waitForKey = false; static long durationPerTest = 200; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock00AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock00AWT.java index f026fa2c0..46230465f 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock00AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock00AWT.java @@ -47,8 +47,11 @@ import java.awt.Insets; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLCanvasAWTActionDeadlock00AWT extends UITestCase { static long durationPerTest = 1000; // ms static final int width = 512; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock01AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock01AWT.java index 0bcde2b35..ba06f91a3 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock01AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock01AWT.java @@ -57,6 +57,8 @@ import java.lang.reflect.InvocationTargetException; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * BUG on OSX/CALayer w/ Java6: @@ -76,6 +78,7 @@ import org.junit.Test; * Users shall make sure all mutable AWT calls are performed on the EDT, even before 1st setVisible(true) ! * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLCanvasAWTActionDeadlock01AWT extends UITestCase { static long durationPerTest = 1000; // ms static final int width = 512; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock02AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock02AWT.java index 289c62423..2587f8d50 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock02AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestGLCanvasAWTActionDeadlock02AWT.java @@ -52,6 +52,8 @@ import javax.media.opengl.awt.GLCanvas; import org.junit.Assume; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.os.Platform; import com.jogamp.common.util.VersionNumber; @@ -82,6 +84,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * Users shall make sure all mutable AWT calls are performed on the EDT, even before 1st setVisible(true) ! * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLCanvasAWTActionDeadlock02AWT extends UITestCase { static int framesPerTest = 240; // frames diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestIsRealizedConcurrency01AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestIsRealizedConcurrency01AWT.java index 74e5d6cb7..3f8b76a17 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestIsRealizedConcurrency01AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestIsRealizedConcurrency01AWT.java @@ -42,8 +42,11 @@ import java.lang.reflect.InvocationTargetException; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestIsRealizedConcurrency01AWT extends UITestCase { static long durationPerTest = 500; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestJScrollPaneMixHwLw01AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestJScrollPaneMixHwLw01AWT.java index 991f4acf8..28fb79cea 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestJScrollPaneMixHwLw01AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestJScrollPaneMixHwLw01AWT.java @@ -21,6 +21,8 @@ import javax.swing.WindowConstants; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.util.ReflectionUtil; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; @@ -40,6 +42,7 @@ import com.jogamp.opengl.util.Animator; * </p> * See git commit '8df12ca151dfc577c90b485d4ebfe491b88e55aa'. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestJScrollPaneMixHwLw01AWT extends UITestCase { static long durationPerTest = 500; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestSwingAWT01GLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestSwingAWT01GLn.java index 007df9f49..ccdaf6edc 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestSwingAWT01GLn.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/TestSwingAWT01GLn.java @@ -45,6 +45,8 @@ import javax.swing.JFrame; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import static org.junit.Assume.*; import static javax.swing.SwingUtilities.*; @@ -53,6 +55,7 @@ import static javax.swing.SwingUtilities.*; * Tests context creation + display on various kinds of Window implementations. * @author Michael Bien, et. al. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestSwingAWT01GLn extends UITestCase { private Window[] windows; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/awt/text/TestAWTTextRendererUseVertexArrayBug464.java b/src/test/com/jogamp/opengl/test/junit/jogl/awt/text/TestAWTTextRendererUseVertexArrayBug464.java index ffe3bb3a6..066e5fe0d 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/awt/text/TestAWTTextRendererUseVertexArrayBug464.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/awt/text/TestAWTTextRendererUseVertexArrayBug464.java @@ -44,6 +44,8 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.After; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /* * Unit tests for Bug464 @@ -61,6 +63,7 @@ import org.junit.Test; * TestTextRendererTraceGL2Mock01 */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestAWTTextRendererUseVertexArrayBug464 extends UITestCase { static GLProfile glp; static GLCapabilities caps; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestBug605FlippedImageAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestBug605FlippedImageAWT.java index b949bc34d..0b317eb84 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestBug605FlippedImageAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestBug605FlippedImageAWT.java @@ -48,9 +48,12 @@ import java.awt.image.BufferedImage; import junit.framework.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug605FlippedImageAWT extends UITestCase { class FlippedImageTest implements GLEventListener { public void display(GLAutoDrawable drawable) { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestBug605FlippedImageNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestBug605FlippedImageNEWT.java index dc1d528f8..4fc681a74 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestBug605FlippedImageNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestBug605FlippedImageNEWT.java @@ -41,10 +41,13 @@ import javax.media.opengl.GLProfile; import junit.framework.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.GLReadBufferUtil; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug605FlippedImageNEWT extends UITestCase { static class FlippedImageTest implements GLEventListener { public void display(GLAutoDrawable drawable) { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1AWT.java index 208367102..521224c01 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1AWT.java @@ -58,8 +58,11 @@ import com.jogamp.opengl.util.GLReadBufferUtil; import com.jogamp.opengl.util.texture.TextureIO; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestMultisampleES1AWT extends UITestCase { static long durationPerTest = 60; // ms private GLCanvas canvas; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1NEWT.java index bc4ee5502..cf30c50bd 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestMultisampleES1NEWT.java @@ -47,6 +47,8 @@ import javax.media.opengl.GLEventListener; import javax.media.opengl.GLProfile; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.jogl.demos.es1.MultisampleDemoES1; @@ -55,6 +57,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.GLReadBufferUtil; import com.jogamp.opengl.util.texture.TextureIO; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestMultisampleES1NEWT extends UITestCase { static long durationPerTest = 60; // ms private GLWindow window; 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 f3d320dff..008568f68 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 @@ -47,6 +47,8 @@ import javax.media.opengl.GLEventListener; import javax.media.opengl.GLProfile; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.jogl.demos.es2.MultisampleDemoES2; @@ -55,6 +57,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.GLReadBufferUtil; import com.jogamp.opengl.util.texture.TextureIO; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestMultisampleES2NEWT extends UITestCase { static long durationPerTest = 60; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestTranslucencyAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestTranslucencyAWT.java index 6d8270aaf..7ba6b0947 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestTranslucencyAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestTranslucencyAWT.java @@ -50,12 +50,15 @@ import javax.media.opengl.awt.GLCanvas; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.util.ReflectionUtil; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.Animator; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestTranslucencyAWT extends UITestCase { static Dimension size; static long durationPerTest = 400; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestTranslucencyNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestTranslucencyNEWT.java index f184873be..8d65fdef3 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestTranslucencyNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/caps/TestTranslucencyNEWT.java @@ -45,7 +45,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestTranslucencyNEWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/TestGearsES1NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/TestGearsES1NEWT.java index 34fa79b5a..8abb0cc0e 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/TestGearsES1NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/TestGearsES1NEWT.java @@ -46,7 +46,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGearsES1NEWT extends UITestCase { static int width, height; static boolean forceES2 = false; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/TestOlympicES1NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/TestOlympicES1NEWT.java index 84be7c6e6..c12ef9525 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/TestOlympicES1NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/TestOlympicES1NEWT.java @@ -43,7 +43,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestOlympicES1NEWT extends UITestCase { static int width, height; static boolean forceES2 = false; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/TestRedSquareES1NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/TestRedSquareES1NEWT.java index 478195c99..200936f34 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/TestRedSquareES1NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es1/newt/TestRedSquareES1NEWT.java @@ -45,7 +45,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestRedSquareES1NEWT extends UITestCase { static int width, height; static boolean forceES2 = false; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2AWT.java index d47017f0f..58600dacd 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2AWT.java @@ -63,7 +63,10 @@ import org.junit.Assume; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGearsES2AWT extends UITestCase { public enum FrameLayout { None, TextOnBottom, BorderCenterSurrounded, DoubleBorderCenterSurrounded }; public enum ResizeBy { Component, Frame }; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelAWT.java index e3be7b8b7..3a9cf8f98 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelAWT.java @@ -44,6 +44,8 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.event.TraceKeyAdapter; import com.jogamp.newt.event.TraceWindowAdapter; @@ -56,6 +58,7 @@ import com.jogamp.opengl.test.junit.util.QuitAdapter; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.FPSAnimator; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGearsES2GLJPanelAWT extends UITestCase { static Dimension wsize, rwsize=null; static boolean forceES2 = false; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelsAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelsAWT.java index 4668603d8..d9e0496b3 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelsAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/awt/TestGearsES2GLJPanelsAWT.java @@ -53,6 +53,8 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.nio.Buffers; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; @@ -63,6 +65,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.FPSAnimator; import com.jogamp.opengl.util.awt.AWTGLPixelBuffer.SingleAWTGLPixelBufferProvider; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGearsES2GLJPanelsAWT extends UITestCase { static int demoCount = 4; static boolean jOpaque = false; // flicker-less w/o opaque, opaque leads to overdraw w/ mixed clipRects -> flicker - due to JComponent _paintImmediately(..) (?) diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestElektronenMultipliziererNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestElektronenMultipliziererNEWT.java index 25e6f5ce6..69252915c 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestElektronenMultipliziererNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestElektronenMultipliziererNEWT.java @@ -45,11 +45,14 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * @see com.jogamp.opengl.test.junit.jogl.demos.es2.ElektronenMultiplizierer * @author Dominik Ströhlein (DemoscenePassivist), et.al. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestElektronenMultipliziererNEWT extends UITestCase { static final int width = 640, height = 480; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java index 7a536e450..fe2c0f31a 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NEWT.java @@ -66,7 +66,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGearsES2NEWT extends UITestCase { static int screenIdx = 0; static PointImmutable wpos; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasAWT.java index f12f02c5e..3fc1eb61d 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasAWT.java @@ -72,7 +72,10 @@ import org.junit.Assume; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGearsES2NewtCanvasAWT extends UITestCase { public enum FrameLayout { None, TextOnBottom, BorderBottom, BorderBottom2, BorderCenter, BorderCenterSurrounded, DoubleBorderCenterSurrounded }; public enum ResizeBy { GLWindow, Component, Frame }; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasSWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasSWT.java index 7a93faa1f..9b2db6bcc 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasSWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestGearsES2NewtCanvasSWT.java @@ -69,7 +69,10 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGearsES2NewtCanvasSWT extends UITestCase { static int screenIdx = 0; static PointImmutable wpos; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestLandscapeES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestLandscapeES2NEWT.java index 281ee54f9..50a5de1f9 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestLandscapeES2NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestLandscapeES2NEWT.java @@ -43,7 +43,10 @@ import javax.media.opengl.GLCapabilities; import javax.media.opengl.GLProfile; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLandscapeES2NEWT extends UITestCase { static int width = 500, height = 290; static int swapInterval = 1; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestLandscapeES2NewtCanvasAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestLandscapeES2NewtCanvasAWT.java index 72357dc29..37172822b 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestLandscapeES2NewtCanvasAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestLandscapeES2NewtCanvasAWT.java @@ -59,7 +59,10 @@ import javax.media.opengl.GLProfile; import javax.swing.SwingUtilities; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestLandscapeES2NewtCanvasAWT extends UITestCase { static DimensionImmutable wsize = new Dimension(500, 290); diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestRedSquareES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestRedSquareES2NEWT.java index 4f8cc0a35..b2f72b7c3 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestRedSquareES2NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/newt/TestRedSquareES2NEWT.java @@ -49,7 +49,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestRedSquareES2NEWT extends UITestCase { static int width, height; static int loops = 1; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/swt/TestGearsES2SWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/swt/TestGearsES2SWT.java index 008349d0a..df7a25448 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/swt/TestGearsES2SWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/es2/swt/TestGearsES2SWT.java @@ -61,7 +61,10 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGearsES2SWT extends UITestCase { static int screenIdx = 0; static PointImmutable wpos; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGLJPanelAWTBug450.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGLJPanelAWTBug450.java index aaf995e6c..0a8c406fb 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGLJPanelAWTBug450.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGLJPanelAWTBug450.java @@ -50,6 +50,8 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Test for bug 450, which causes the right part of the frame to be black @@ -61,6 +63,7 @@ import org.junit.Test; * * @author Wade Walker (adapted from TestGearsGLJPanelAWT) */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLJPanelAWTBug450 extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGearsAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGearsAWT.java index 528762a9c..d23130d36 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGearsAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGearsAWT.java @@ -52,7 +52,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGearsAWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGearsAWTAnalyzeBug455.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGearsAWTAnalyzeBug455.java index 22df3313b..66b9e4a78 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGearsAWTAnalyzeBug455.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGearsAWTAnalyzeBug455.java @@ -50,7 +50,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGearsAWTAnalyzeBug455 extends UITestCase { static long duration = 500; // ms static boolean waitForKey = false; // for manual profiling diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGearsGLJPanelAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGearsGLJPanelAWT.java index 02e44e747..5de08c738 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGearsGLJPanelAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/awt/TestGearsGLJPanelAWT.java @@ -53,7 +53,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGearsGLJPanelAWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/newt/TestGearsNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/newt/TestGearsNEWT.java index 3c33a4899..a5134254b 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/newt/TestGearsNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/newt/TestGearsNEWT.java @@ -45,7 +45,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGearsNEWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/newt/TestGearsNewtAWTWrapper.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/newt/TestGearsNewtAWTWrapper.java index 0b907d5ee..84e6670c3 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/newt/TestGearsNewtAWTWrapper.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/newt/TestGearsNewtAWTWrapper.java @@ -46,7 +46,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGearsNewtAWTWrapper extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/newt/TestTeapotNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/newt/TestTeapotNEWT.java index ddde837ab..5a22fc7b1 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/newt/TestTeapotNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl2/newt/TestTeapotNEWT.java @@ -43,7 +43,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestTeapotNEWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl3/newt/TestGeomShader01TextureGL3NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl3/newt/TestGeomShader01TextureGL3NEWT.java index 71c0ae7ac..8e582bd3b 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl3/newt/TestGeomShader01TextureGL3NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/demos/gl3/newt/TestGeomShader01TextureGL3NEWT.java @@ -34,6 +34,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.jogl.demos.gl3.GeomShader01TextureGL3; @@ -45,6 +47,7 @@ import com.jogamp.opengl.util.Animator; /** * Test Geometry shader demo GeomShader01TextureGL3 */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGeomShader01TextureGL3NEWT extends UITestCase { static long duration = 500; // ms 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 98acea6ac..c240731a1 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 @@ -47,11 +47,14 @@ import javax.media.opengl.GLUniformData; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Testing different vertex attribute (VA) data sets on one shader * and shader state in general. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLSLShaderState01NEWT extends UITestCase { static long durationPerTest = 10; // ms static boolean firstUIActionOnProcess = false; 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 bd0e77e9b..eb5a3fcf5 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 @@ -47,11 +47,14 @@ import javax.media.opengl.GLUniformData; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Testing different vertex attribute (VA) data sets on one shader * and shader state in general. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLSLShaderState02NEWT extends UITestCase { static long durationPerTest = 10; // ms 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 dde7252e8..9a70a0859 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 @@ -39,6 +39,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.util.Animator; @@ -48,6 +50,7 @@ import com.jogamp.opengl.test.junit.util.MiscUtils; import java.io.IOException; import javax.media.opengl.GL2ES2; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLSLSimple01NEWT extends UITestCase { static long durationPerTest = 100; // ms 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 658e3e7f3..360f4e8d7 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,7 +53,10 @@ import javax.media.opengl.GLUniformData; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestRulerNEWT01 extends UITestCase { static long durationPerTest = 10; // ms 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 4d878432f..f26927a5c 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 @@ -44,11 +44,14 @@ import org.junit.Assume; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Duplicates bug 459, where a vertex shader won't compile when 8 bits of stencil are requested. * This bug is Windows-only; it works on Mac OS X and CentOS. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestShaderCompilationBug459AWT extends UITestCase { static int width, height; static long duration = 500; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestTransformFeedbackVaryingsBug407NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestTransformFeedbackVaryingsBug407NEWT.java index 3be08971b..bbfe1dd1a 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestTransformFeedbackVaryingsBug407NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/glsl/TestTransformFeedbackVaryingsBug407NEWT.java @@ -15,6 +15,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.util.glsl.ShaderUtil; @@ -24,6 +26,7 @@ import java.io.IOException; * Bug 'Function glTransformFeedbackVaryings incorrectly passes argument' * http://jogamp.org/bugzilla/show_bug.cgi?id=407 */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestTransformFeedbackVaryingsBug407NEWT extends UITestCase { private static final boolean debugGL = true; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug463ScaleImageMemoryAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug463ScaleImageMemoryAWT.java index 3f122accb..e5690a0b0 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug463ScaleImageMemoryAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug463ScaleImageMemoryAWT.java @@ -41,6 +41,8 @@ import javax.media.opengl.glu.gl2es1.GLUgl2es1; import org.junit.Assume; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.test.junit.util.UITestCase; @@ -52,6 +54,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * was in JOGL 1) solves the problem. * @author Wade Walker */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug463ScaleImageMemoryAWT extends UITestCase implements GLEventListener { /* @Override */ diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug694ScaleImageUnpackBufferSizeAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug694ScaleImageUnpackBufferSizeAWT.java index d3bcce116..ca5b089e1 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug694ScaleImageUnpackBufferSizeAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/glu/TestBug694ScaleImageUnpackBufferSizeAWT.java @@ -41,6 +41,8 @@ import javax.media.opengl.glu.GLU; import org.junit.Assume; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.nio.Buffers; import com.jogamp.opengl.test.junit.util.UITestCase; @@ -51,6 +53,7 @@ import com.jogamp.opengl.util.GLPixelStorageModes; * Demonstrates how to use {@link GLBuffers#sizeof(GL, int[], int, int, int, int, int, boolean)} * to determine the unpack buffer size for {@link GLU#gluScaleImage(int, int, int, int, java.nio.Buffer, int, int, int, java.nio.Buffer)}. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug694ScaleImageUnpackBufferSizeAWT extends UITestCase implements GLEventListener { /* @Override */ diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/math/TestFloatUtil01MatrixMatrixMultNOUI.java b/src/test/com/jogamp/opengl/test/junit/jogl/math/TestFloatUtil01MatrixMatrixMultNOUI.java index 83a1be456..3f22fec2b 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/math/TestFloatUtil01MatrixMatrixMultNOUI.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/math/TestFloatUtil01MatrixMatrixMultNOUI.java @@ -30,9 +30,12 @@ package com.jogamp.opengl.test.junit.jogl.math; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.math.FloatUtil; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestFloatUtil01MatrixMatrixMultNOUI { final float[] m1 = new float[]{ 1, 3, 4, 0, diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/math/TestGluUnprojectDoubleNOUI.java b/src/test/com/jogamp/opengl/test/junit/jogl/math/TestGluUnprojectDoubleNOUI.java index 32861f764..db40dad15 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/math/TestGluUnprojectDoubleNOUI.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/math/TestGluUnprojectDoubleNOUI.java @@ -32,10 +32,13 @@ import javax.media.opengl.glu.GLU; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * @author Julien Gouesse */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGluUnprojectDoubleNOUI { @Test diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/math/TestGluUnprojectFloatNOUI.java b/src/test/com/jogamp/opengl/test/junit/jogl/math/TestGluUnprojectFloatNOUI.java index 9951500fc..0f9a45fd7 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/math/TestGluUnprojectFloatNOUI.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/math/TestGluUnprojectFloatNOUI.java @@ -32,7 +32,10 @@ import javax.media.opengl.glu.GLU; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGluUnprojectFloatNOUI { @Test diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/math/TestPMVMatrix01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/math/TestPMVMatrix01NEWT.java index 3d9bfed7e..fa18abd6e 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/math/TestPMVMatrix01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/math/TestPMVMatrix01NEWT.java @@ -42,6 +42,8 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.os.Platform; import com.jogamp.opengl.math.FloatUtil; @@ -50,6 +52,7 @@ import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.PMVMatrix; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestPMVMatrix01NEWT extends UITestCase { static final float epsilon = 0.00001f; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/math/TestPMVMatrix02NOUI.java b/src/test/com/jogamp/opengl/test/junit/jogl/math/TestPMVMatrix02NOUI.java index 0c66ad237..2c3a6f36a 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/math/TestPMVMatrix02NOUI.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/math/TestPMVMatrix02NOUI.java @@ -29,7 +29,9 @@ package com.jogamp.opengl.test.junit.jogl.math;
import org.junit.Before;
-import org.junit.Test;
+import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters;
import com.jogamp.opengl.util.PMVMatrix;
@@ -41,6 +43,7 @@ import static org.junit.Assert.assertArrayEquals; /**
* @author Thomas De Bodt
*/
+@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestPMVMatrix02NOUI {
private PMVMatrix fMat;
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/math/TestPMVMatrix03NOUI.java b/src/test/com/jogamp/opengl/test/junit/jogl/math/TestPMVMatrix03NOUI.java index 81242ce6e..df149169a 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/math/TestPMVMatrix03NOUI.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/math/TestPMVMatrix03NOUI.java @@ -9,7 +9,10 @@ import com.jogamp.opengl.util.PMVMatrix; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestPMVMatrix03NOUI { static final float epsilon = 0.00001f; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/newt/TestSwingAWTRobotUsageBeforeJOGLInitBug411.java b/src/test/com/jogamp/opengl/test/junit/jogl/newt/TestSwingAWTRobotUsageBeforeJOGLInitBug411.java index d8a2e7810..2f5fb2606 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/newt/TestSwingAWTRobotUsageBeforeJOGLInitBug411.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/newt/TestSwingAWTRobotUsageBeforeJOGLInitBug411.java @@ -68,7 +68,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestSwingAWTRobotUsageBeforeJOGLInitBug411 extends UITestCase { static long durationPerTest = 150; // ms static Robot robot; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/TestOffscreen01GLPBufferNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/TestOffscreen01GLPBufferNEWT.java index f1408d38f..3f0dae6b0 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/TestOffscreen01GLPBufferNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/TestOffscreen01GLPBufferNEWT.java @@ -38,6 +38,8 @@ import org.junit.Assert; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.opengl.*; @@ -45,6 +47,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.test.junit.jogl.demos.es2.RedSquareES2; import java.io.IOException; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestOffscreen01GLPBufferNEWT extends UITestCase { static GLProfile glpDefault; static GLDrawableFactory glDrawableFactory; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/TestOffscreen02BitmapNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/TestOffscreen02BitmapNEWT.java index 0701d883c..72cb7a512 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/TestOffscreen02BitmapNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/TestOffscreen02BitmapNEWT.java @@ -36,6 +36,8 @@ import com.jogamp.newt.Window; import com.jogamp.newt.opengl.GLWindow; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.opengl.*; @@ -47,6 +49,7 @@ import java.io.IOException; * Using ES1 GL demo, since pixmap might not be hw accelerated, * hence it is possible to not have GLSL. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestOffscreen02BitmapNEWT extends UITestCase { static final int width = 640, height = 480; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTBug628ResizeDeadlockAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTBug628ResizeDeadlockAWT.java index f8fbe7276..dcb041147 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTBug628ResizeDeadlockAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTBug628ResizeDeadlockAWT.java @@ -41,6 +41,8 @@ import org.eclipse.swt.widgets.Display ; import org.eclipse.swt.widgets.Shell ; import org.junit.Assume; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.opengl.GL ; import javax.media.opengl.GL2 ; @@ -64,6 +66,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; //////////////////////////////////////////////////////////////////////////////// +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNewtCanvasSWTBug628ResizeDeadlockAWT extends UITestCase { static int duration = 500; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTGLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTGLn.java index 7acc6452e..bcb462953 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTGLn.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestNewtCanvasSWTGLn.java @@ -46,6 +46,8 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.After; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.nativewindow.swt.SWTAccessor; import com.jogamp.newt.NewtFactory; @@ -73,6 +75,7 @@ import com.jogamp.opengl.util.texture.TextureIO; * SWT running on Mac OSX, i.e. to enforce UI action on the main thread. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNewtCanvasSWTGLn extends UITestCase { static int duration = 250; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor03AWTGLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor03AWTGLn.java index ee5dc7fea..7cc19a72f 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor03AWTGLn.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTAccessor03AWTGLn.java @@ -51,6 +51,8 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.os.Platform; import com.jogamp.nativewindow.swt.SWTAccessor; @@ -63,6 +65,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * the SWT_AWT bridge. * @author Wade Walker, et.al. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestSWTAccessor03AWTGLn extends UITestCase { static int duration = 250; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTBug643AsyncExec.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTBug643AsyncExec.java index 4d279b349..c9b832b8a 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTBug643AsyncExec.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTBug643AsyncExec.java @@ -39,6 +39,8 @@ import org.eclipse.swt.widgets.Display ; import org.eclipse.swt.widgets.Shell ; import org.junit.Assume; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.opengl.GLAutoDrawable; import javax.media.opengl.GLCapabilities ; @@ -62,6 +64,7 @@ import com.jogamp.opengl.util.Animator; //////////////////////////////////////////////////////////////////////////////// +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestSWTBug643AsyncExec extends UITestCase { static int duration = 500; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTEclipseGLCanvas01GLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTEclipseGLCanvas01GLn.java index 0bd47c980..b0acbedc2 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTEclipseGLCanvas01GLn.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTEclipseGLCanvas01GLn.java @@ -52,6 +52,8 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.After; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.nativewindow.swt.SWTAccessor; import com.jogamp.opengl.test.junit.jogl.demos.es1.OneTriangle; @@ -64,6 +66,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; * </p> * @author Wade Walker, et.al. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestSWTEclipseGLCanvas01GLn extends UITestCase { static int duration = 250; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java index 1822d2eaf..a1d8d40c2 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/swt/TestSWTJOGLGLCanvas01GLn.java @@ -46,6 +46,8 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.After; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.nativewindow.swt.SWTAccessor; import com.jogamp.opengl.swt.GLCanvas; @@ -69,6 +71,7 @@ import com.jogamp.opengl.util.texture.TextureIO; * </p> * @author Wade Walker, et al. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestSWTJOGLGLCanvas01GLn extends UITestCase { static int duration = 250; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/TestES1FixedFunctionPipelineNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/TestES1FixedFunctionPipelineNEWT.java index 9d84bc58c..c35a60af7 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/TestES1FixedFunctionPipelineNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/TestES1FixedFunctionPipelineNEWT.java @@ -45,7 +45,10 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestES1FixedFunctionPipelineNEWT extends UITestCase { static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/TestImmModeSinkES1NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/TestImmModeSinkES1NEWT.java index d8bdf8ab2..0ac01bc31 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/TestImmModeSinkES1NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/TestImmModeSinkES1NEWT.java @@ -36,6 +36,8 @@ import javax.media.opengl.GLEventListener; import javax.media.opengl.GLProfile; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.util.MiscUtils; @@ -44,6 +46,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; /** * Testing the ImmModeSink w/ GL2ES1 context */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestImmModeSinkES1NEWT extends UITestCase { static int duration = 100; static final int iWidth = 400; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/TestImmModeSinkES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/TestImmModeSinkES2NEWT.java index 165a3b8cf..de6aef55e 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/TestImmModeSinkES2NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/TestImmModeSinkES2NEWT.java @@ -36,6 +36,8 @@ import javax.media.opengl.GLEventListener; import javax.media.opengl.GLProfile; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.util.MiscUtils; @@ -44,6 +46,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; /** * Testing the ImmModeSink w/ GL2ES1 context */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestImmModeSinkES2NEWT extends UITestCase { static int duration = 100; static final int iWidth = 400; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestBug817GLReadBufferUtilGLCTXDefFormatTypeES2NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestBug817GLReadBufferUtilGLCTXDefFormatTypeES2NEWT.java index 6f0524621..679f0692b 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestBug817GLReadBufferUtilGLCTXDefFormatTypeES2NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestBug817GLReadBufferUtilGLCTXDefFormatTypeES2NEWT.java @@ -34,6 +34,8 @@ import javax.media.opengl.GLEventListener; import javax.media.opengl.GLProfile; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; @@ -44,6 +46,7 @@ import com.jogamp.opengl.util.GLPixelBuffer.GLPixelBufferProvider; import com.jogamp.opengl.util.GLReadBufferUtil; import com.jogamp.opengl.util.texture.TextureIO; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestBug817GLReadBufferUtilGLCTXDefFormatTypeES2NEWT extends UITestCase { static long durationPerTest = 60; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01AWT.java index e2252d635..21987c504 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01AWT.java @@ -51,7 +51,10 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLReadBufferUtilTextureIOWrite01AWT extends UITestCase { static GLProfile glp; static GLCapabilities caps; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01NEWT.java index 16bd94cfe..521e89a8b 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite01NEWT.java @@ -44,7 +44,10 @@ import com.jogamp.opengl.test.junit.jogl.offscreen.WindowUtilNEWT; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLReadBufferUtilTextureIOWrite01NEWT extends UITestCase { static GLProfile glp; static GLCapabilities caps; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02AWT.java index bec55d868..3822bff09 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02AWT.java @@ -52,7 +52,10 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLReadBufferUtilTextureIOWrite02AWT extends UITestCase { static GLProfile glp; static GLCapabilities caps; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02NEWT.java index 36d905a2c..9615297e3 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestGLReadBufferUtilTextureIOWrite02NEWT.java @@ -46,7 +46,10 @@ import com.jogamp.opengl.test.junit.jogl.offscreen.WindowUtilNEWT; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLReadBufferUtilTextureIOWrite02NEWT extends UITestCase { static GLProfile glp; static GLCapabilities caps; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java index 5181dc2d3..483ae6d9b 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGImage01NEWT.java @@ -39,6 +39,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.util.IOUtil; import com.jogamp.newt.opengl.GLWindow; @@ -61,6 +63,7 @@ import javax.media.opengl.GL; * Main function accepts arbitrary JPG file name for manual tests. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestJPEGImage01NEWT extends UITestCase { static boolean showFPS = false; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTBenchmarkNewtAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTBenchmarkNewtAWT.java index 1e27f5dae..bd2488e26 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTBenchmarkNewtAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTBenchmarkNewtAWT.java @@ -48,7 +48,10 @@ import java.net.URLConnection; import java.nio.Buffer; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestJPEGJoglAWTBenchmarkNewtAWT extends UITestCase { static boolean showFPS = false; static String fname = "j1-baseline.jpg"; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTCompareNewtAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTCompareNewtAWT.java index 0df275652..653923bc4 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTCompareNewtAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGJoglAWTCompareNewtAWT.java @@ -59,7 +59,10 @@ import java.net.URLConnection; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestJPEGJoglAWTCompareNewtAWT extends UITestCase { static boolean showFPS = false; static long duration = 100; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGTextureFromFileNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGTextureFromFileNEWT.java index adce6245e..13686cc22 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGTextureFromFileNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestJPEGTextureFromFileNEWT.java @@ -56,7 +56,10 @@ import org.junit.Assert; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestJPEGTextureFromFileNEWT extends UITestCase { static boolean showFPS = false; static long duration = 100; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage00NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage00NEWT.java index aedb6a573..f4b3cab80 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage00NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage00NEWT.java @@ -34,11 +34,14 @@ import java.net.URLConnection; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.util.IOUtil; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.texture.spi.PNGImage; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestPNGImage00NEWT extends UITestCase { @Test public void testPNGReadWriteAndCompare() throws InterruptedException, IOException, MalformedURLException { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage01NEWT.java index 839a198b9..f8808559f 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGImage01NEWT.java @@ -40,6 +40,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.util.IOUtil; import com.jogamp.newt.opengl.GLWindow; @@ -61,6 +63,7 @@ import com.jogamp.opengl.util.texture.spi.PNGImage; * Main function accepts arbitrary PNG file name for manual tests. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestPNGImage01NEWT extends UITestCase { static boolean showFPS = false; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileAWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileAWT.java index 756a8d8e4..6a15300a7 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileAWT.java @@ -62,6 +62,8 @@ import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Unit test for bug 417, which shows a GLException when reading a grayscale texture. @@ -69,6 +71,7 @@ import org.junit.Test; * after the bug was submitted. * @author Wade Walker, et.al. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestPNGTextureFromFileAWT extends UITestCase { static boolean showFPS = false; static long duration = 100; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileNEWT.java index 42e5230da..1bc526429 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGTextureFromFileNEWT.java @@ -56,7 +56,10 @@ import org.junit.Assert; import org.junit.After; import org.junit.Before; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestPNGTextureFromFileNEWT extends UITestCase { static boolean showFPS = false; static long duration = 100; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTGATextureFromFileNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTGATextureFromFileNEWT.java index 17c3d3efd..3e1acdb39 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTGATextureFromFileNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTGATextureFromFileNEWT.java @@ -41,6 +41,8 @@ import org.junit.After; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.util.IOUtil; import com.jogamp.newt.opengl.GLWindow; @@ -55,6 +57,7 @@ import com.jogamp.opengl.util.GLReadBufferUtil; import com.jogamp.opengl.util.texture.TextureData; import com.jogamp.opengl.util.texture.TextureIO; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestTGATextureFromFileNEWT extends UITestCase { static boolean showFPS = false; static long duration = 100; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTexture01AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTexture01AWT.java index 6913cf30e..855529f9c 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTexture01AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTexture01AWT.java @@ -61,6 +61,8 @@ import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Demonstrates TextureData w/ AWT usage in both directions, @@ -68,6 +70,7 @@ import org.junit.Test; * as well as reading out GL framebuffer and displaying it * as an BufferedImage. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestTexture01AWT extends UITestCase { static long durationPerTest = 500; static GLProfile glp; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTexture02AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTexture02AWT.java index 5948f5971..566ce0f18 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTexture02AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTexture02AWT.java @@ -52,12 +52,15 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; /** * Demonstrates TextureData w/ AWT usage, * i.e. reading out an animated GL framebuffer and displaying it * as an BufferedImage. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestTexture02AWT extends UITestCase { static long durationPerTest = 500; static GLProfile glp; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureSequence01AWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureSequence01AWT.java index 7bad83781..2b3ead5b9 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureSequence01AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureSequence01AWT.java @@ -12,6 +12,8 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.opengl.test.junit.jogl.demos.TextureSequenceDemo01; import com.jogamp.opengl.test.junit.jogl.demos.es2.TextureSequenceCubeES2; @@ -20,6 +22,7 @@ import com.jogamp.opengl.test.junit.util.QuitAdapter; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.Animator; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestTextureSequence01AWT extends UITestCase { static boolean showFPS = false; static int width = 510; diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureSequence01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureSequence01NEWT.java index ae4d2c377..5145e104f 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureSequence01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTextureSequence01NEWT.java @@ -8,6 +8,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.jogl.demos.TextureSequenceDemo01; @@ -17,6 +19,7 @@ import com.jogamp.opengl.test.junit.util.QuitAdapter; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.Animator; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestTextureSequence01NEWT extends UITestCase { static boolean showFPS = false; static int width = 510; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestCloseNewtAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestCloseNewtAWT.java index d63193445..817f4140e 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestCloseNewtAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestCloseNewtAWT.java @@ -29,6 +29,8 @@ package com.jogamp.opengl.test.junit.newt; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import org.junit.Assert; import java.lang.reflect.InvocationTargetException; @@ -47,6 +49,7 @@ import com.jogamp.opengl.test.junit.util.AWTRobotUtil; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.test.junit.util.AWTRobotUtil.WindowClosingListener; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestCloseNewtAWT extends UITestCase { GLWindow newtWindow = null; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestDisplayLifecycle01NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestDisplayLifecycle01NEWT.java index 6a248bcf6..a3ea9ad3e 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestDisplayLifecycle01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestDisplayLifecycle01NEWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.newt; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.opengl.*; @@ -45,6 +47,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestDisplayLifecycle01NEWT extends UITestCase { static GLProfile glp; static GLCapabilities caps; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestDisplayLifecycle02NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestDisplayLifecycle02NEWT.java index 3ab81bd2f..87cb6f05b 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestDisplayLifecycle02NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestDisplayLifecycle02NEWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.newt; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.opengl.*; @@ -44,6 +46,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestDisplayLifecycle02NEWT extends UITestCase { static GLProfile glp; static GLCapabilities caps; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestEventSourceNotAWTBug.java b/src/test/com/jogamp/opengl/test/junit/newt/TestEventSourceNotAWTBug.java index ecf0ada8a..a2100cfc5 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestEventSourceNotAWTBug.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestEventSourceNotAWTBug.java @@ -30,6 +30,8 @@ package com.jogamp.opengl.test.junit.newt; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import java.io.IOException; import java.lang.reflect.InvocationTargetException; @@ -48,6 +50,7 @@ import com.jogamp.opengl.test.junit.util.*; /** * This simple program will throw a {@link RuntimeException} when the application is closed. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestEventSourceNotAWTBug extends UITestCase { @BeforeClass diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestFocus01SwingAWTRobot.java b/src/test/com/jogamp/opengl/test/junit/newt/TestFocus01SwingAWTRobot.java index 78be14dc6..5f3702340 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestFocus01SwingAWTRobot.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestFocus01SwingAWTRobot.java @@ -48,6 +48,8 @@ import java.io.IOException; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.awt.NewtCanvasAWT; import com.jogamp.newt.opengl.GLWindow; @@ -65,6 +67,7 @@ import com.jogamp.opengl.test.junit.util.*; * <i>+ Container is the JFrame's implicit root content pane</i><br/> * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestFocus01SwingAWTRobot extends UITestCase { static int width, height; static long durationPerTest = 10; 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 5b07c73bd..1c1ba9080 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestFocus02SwingAWTRobot.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestFocus02SwingAWTRobot.java @@ -34,6 +34,8 @@ import org.junit.Assert; import org.junit.BeforeClass; import org.junit.AfterClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import java.awt.AWTException; import java.awt.Button; @@ -65,6 +67,7 @@ import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; * <i>+ JPanel is set as JFrame's root content pane</i><br/> * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestFocus02SwingAWTRobot extends UITestCase { static int width, height; static long durationPerTest = 10; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindowInvisiblePointer01NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindowInvisiblePointer01NEWT.java index ba69481a3..75a9e87af 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindowInvisiblePointer01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindowInvisiblePointer01NEWT.java @@ -11,6 +11,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.Screen; import com.jogamp.newt.opengl.GLWindow; @@ -18,6 +20,7 @@ import com.jogamp.opengl.test.junit.jogl.demos.es1.GearsES1; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.Animator; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLWindowInvisiblePointer01NEWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindowWarpPointer01NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindowWarpPointer01NEWT.java index ffbd9d1fa..d6b550c80 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindowWarpPointer01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindowWarpPointer01NEWT.java @@ -13,6 +13,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.Screen; import com.jogamp.newt.event.MouseAdapter; @@ -22,6 +24,7 @@ import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.Animator; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLWindowWarpPointer01NEWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows00NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows00NEWT.java index 309d7c7cb..384b6806a 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows00NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows00NEWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.newt; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.opengl.*; @@ -43,6 +45,7 @@ import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import javax.media.nativewindow.AbstractGraphicsDevice; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLWindows00NEWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows01NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows01NEWT.java index 0c6f60b5f..2b3e448db 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows01NEWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.newt; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.opengl.*; @@ -43,6 +45,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLWindows01NEWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows02NEWTAnimated.java b/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows02NEWTAnimated.java index e1c6c75c9..86cb53319 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows02NEWTAnimated.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestGLWindows02NEWTAnimated.java @@ -32,6 +32,8 @@ package com.jogamp.opengl.test.junit.newt; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.opengl.*; @@ -45,6 +47,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestGLWindows02NEWTAnimated extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestListenerCom01AWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestListenerCom01AWT.java index fa7f0f915..91937c8c8 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestListenerCom01AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestListenerCom01AWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.newt; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import java.awt.Frame; @@ -47,6 +49,7 @@ import java.lang.reflect.InvocationTargetException; import com.jogamp.opengl.test.junit.util.*; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestListenerCom01AWT extends UITestCase { static int width, height; static long durationPerTest = 500; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestRemoteGLWindows01NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestRemoteGLWindows01NEWT.java index ef830b660..d4e8e7eac 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestRemoteGLWindows01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestRemoteGLWindows01NEWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.newt; import org.junit.Assert; import org.junit.Assume; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.opengl.*; @@ -46,6 +48,7 @@ import com.jogamp.opengl.test.junit.jogl.demos.es1.GearsES1; import javax.media.nativewindow.AbstractGraphicsDevice; import javax.media.nativewindow.NativeWindowException; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestRemoteGLWindows01NEWT extends UITestCase { static int width = 640, height = 480; static long durationPerTest = 100; // ms diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestRemoteWindow01NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestRemoteWindow01NEWT.java index 53995e8f7..a26b96e38 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestRemoteWindow01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestRemoteWindow01NEWT.java @@ -33,6 +33,8 @@ import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.nativewindow.*; @@ -41,6 +43,7 @@ import java.io.IOException; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestRemoteWindow01NEWT extends UITestCase { static int width, height; static String remoteDisplay = "localhost:0.0"; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol01AWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol01AWT.java index acaa279fe..a88b20714 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol01AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol01AWT.java @@ -29,6 +29,8 @@ package com.jogamp.opengl.test.junit.newt; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import org.junit.Assert; import java.lang.reflect.InvocationTargetException; @@ -48,6 +50,7 @@ import com.jogamp.opengl.test.junit.util.AWTRobotUtil; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.test.junit.util.AWTRobotUtil.WindowClosingListener; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestWindowClosingProtocol01AWT extends UITestCase { @Test diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol02NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol02NEWT.java index 8d32beea3..020581cb0 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol02NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol02NEWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.newt; import java.lang.reflect.InvocationTargetException; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import org.junit.Assert; import javax.media.nativewindow.WindowClosingProtocol.WindowClosingMode; @@ -45,6 +47,7 @@ import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; import com.jogamp.opengl.test.junit.util.AWTRobotUtil; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestWindowClosingProtocol02NEWT extends UITestCase { @Test diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java index 45b41219a..efc833d88 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestWindowClosingProtocol03NewtAWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.newt; import com.jogamp.newt.awt.NewtCanvasAWT; import com.jogamp.newt.opengl.GLWindow; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import org.junit.Assert; import java.lang.reflect.InvocationTargetException; @@ -48,6 +50,7 @@ import com.jogamp.opengl.test.junit.util.AWTRobotUtil; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.test.junit.util.AWTRobotUtil.WindowClosingListener; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestWindowClosingProtocol03NewtAWT extends UITestCase { @Test diff --git a/src/test/com/jogamp/opengl/test/junit/newt/TestWindows01NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/TestWindows01NEWT.java index e03b5e7d6..6b44a4b2c 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/TestWindows01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/TestWindows01NEWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.newt; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.nativewindow.*; @@ -39,6 +41,7 @@ import java.io.IOException; import com.jogamp.opengl.test.junit.util.UITestCase; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestWindows01NEWT extends UITestCase { static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java b/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java index a959a56be..da09757c5 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/event/BaseNewtEventModifiers.java @@ -35,7 +35,9 @@ import javax.media.opengl.GLProfile ; import org.junit.Assert ; import org.junit.BeforeClass ; +import org.junit.FixMethodOrder; import org.junit.Test ; +import org.junit.runners.MethodSorters; import com.jogamp.common.util.RunnableTask; import com.jogamp.newt.event.MouseEvent; @@ -47,7 +49,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase ; * class defines most of the tests, but leaves the type of window * and canvas up to subclasses. */ - +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public abstract class BaseNewtEventModifiers extends UITestCase { //////////////////////////////////////////////////////////////////////////// diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersAWTCanvas.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersAWTCanvas.java index 1504c948e..f1906f560 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersAWTCanvas.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersAWTCanvas.java @@ -37,6 +37,8 @@ import javax.swing.WindowConstants ; import org.junit.AfterClass ; import org.junit.Assert; import org.junit.BeforeClass ; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.event.awt.AWTMouseAdapter ; import com.jogamp.opengl.test.junit.jogl.demos.es2.RedSquareES2; @@ -47,6 +49,7 @@ import com.jogamp.opengl.test.junit.util.AWTRobotUtil; * the source is an AWT canvas. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNewtEventModifiersAWTCanvas extends BaseNewtEventModifiers { private static JFrame _testFrame ; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNEWTWindowAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNEWTWindowAWT.java index 71191c863..c4bd3eb71 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNEWTWindowAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNEWTWindowAWT.java @@ -34,6 +34,8 @@ import javax.media.opengl.GLProfile; import org.junit.AfterClass ; import org.junit.Assert; import org.junit.BeforeClass ; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.jogl.demos.es2.RedSquareES2; @@ -42,6 +44,7 @@ import com.jogamp.opengl.test.junit.util.AWTRobotUtil; /** * Test whether or not event modifiers are properly delivered by NEWT. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNewtEventModifiersNEWTWindowAWT extends BaseNewtEventModifiers { private static GLWindow _glWindow; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNewtCanvasAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNewtCanvasAWT.java index e0bc847a7..0abadb0d4 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNewtCanvasAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNewtCanvasAWT.java @@ -40,6 +40,8 @@ import javax.swing.WindowConstants ; import org.junit.AfterClass ; import org.junit.Assert; import org.junit.BeforeClass ; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.awt.NewtCanvasAWT ; import com.jogamp.newt.opengl.GLWindow ; @@ -50,7 +52,7 @@ import com.jogamp.opengl.test.junit.util.AWTRobotUtil; * Test whether or not event modifiers are preserved by NEWT when * the canvas is a NewtCanvasAWT. */ - +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNewtEventModifiersNewtCanvasAWT extends BaseNewtEventModifiers { private static JFrame _testFrame ; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNewtCanvasSWTAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNewtCanvasSWTAWT.java index 349d200d7..2a6b8ba19 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNewtCanvasSWTAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtEventModifiersNewtCanvasSWTAWT.java @@ -41,6 +41,8 @@ import org.junit.AfterClass ; import org.junit.Assert; import org.junit.Assume; import org.junit.BeforeClass ; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.nativewindow.swt.SWTAccessor; import com.jogamp.newt.opengl.GLWindow ; @@ -52,7 +54,7 @@ import com.jogamp.opengl.test.junit.util.AWTRobotUtil; * Test whether or not event modifiers preserved by NEWT when * the canvas is a NewtCanvasSWT. */ - +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNewtEventModifiersNewtCanvasSWTAWT extends BaseNewtEventModifiers { private static Display _display = null; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodeModifiersAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodeModifiersAWT.java index 0f79d9b9c..4be819261 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodeModifiersAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodeModifiersAWT.java @@ -51,6 +51,8 @@ import jogamp.nativewindow.jawt.JAWTUtil; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.awt.NewtCanvasAWT; import com.jogamp.newt.event.InputEvent; @@ -69,6 +71,7 @@ import com.jogamp.opengl.test.junit.util.*; * even though we do unify VK codes to US keyboard across all layouts. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNewtKeyCodeModifiersAWT extends UITestCase { static int width, height; static long durationPerTest = 100; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodesAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodesAWT.java index 333a21b89..4778b4feb 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodesAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyCodesAWT.java @@ -52,6 +52,8 @@ import jogamp.nativewindow.jawt.JAWTUtil; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.awt.NewtCanvasAWT; import com.jogamp.newt.event.KeyEvent; @@ -65,6 +67,7 @@ import com.jogamp.opengl.test.junit.util.NEWTKeyUtil.CodeSeg; /** * Testing key code of key events. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNewtKeyCodesAWT extends UITestCase { static int width, height; static long durationPerTest = 100; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventAutoRepeatAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventAutoRepeatAWT.java index 8b8a5ac79..34e81c033 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventAutoRepeatAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventAutoRepeatAWT.java @@ -50,6 +50,8 @@ import java.io.IOException; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.awt.NewtCanvasAWT; import com.jogamp.newt.event.InputEvent; @@ -82,6 +84,7 @@ import com.jogamp.opengl.test.junit.util.*; * The idea is if you mask out auto-repeat in your event listener * you just get one long pressed key D/U tuple. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNewtKeyEventAutoRepeatAWT extends UITestCase { static int width, height; static long durationPerTest = 100; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventOrderAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventOrderAWT.java index d0c3813d5..23de0e91d 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventOrderAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyEventOrderAWT.java @@ -49,6 +49,8 @@ import jogamp.nativewindow.jawt.JAWTUtil; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.awt.NewtCanvasAWT; import com.jogamp.newt.opengl.GLWindow; @@ -68,6 +70,7 @@ import com.jogamp.opengl.test.junit.util.*; * </ol> * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNewtKeyEventOrderAWT extends UITestCase { static int width, height; static long durationPerTest = 100; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyPressReleaseUnmaskRepeatAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyPressReleaseUnmaskRepeatAWT.java index e0d2ae2ee..f48a07a8c 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyPressReleaseUnmaskRepeatAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/event/TestNewtKeyPressReleaseUnmaskRepeatAWT.java @@ -49,6 +49,8 @@ import jogamp.nativewindow.jawt.JAWTUtil; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.awt.NewtCanvasAWT; import com.jogamp.newt.event.InputEvent; @@ -63,6 +65,7 @@ import com.jogamp.opengl.test.junit.util.*; /** * Testing key press and release events w/o AUTO-REPEAT */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestNewtKeyPressReleaseUnmaskRepeatAWT extends UITestCase { static int width, height; static long durationPerTest = 100; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00aNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00aNEWT.java index 151cc0a56..93e005b53 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00aNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00aNEWT.java @@ -34,6 +34,8 @@ import javax.media.nativewindow.NativeWindowFactory; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.util.ArrayHashSet; import com.jogamp.newt.Display; @@ -62,6 +64,7 @@ import jogamp.newt.MonitorModeProps; * Also validates the descending order of the given MonitorMode lists. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestScreenMode00aNEWT extends UITestCase { static int screenIdx = 0; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00bNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00bNEWT.java index d5323e1d2..69f19c258 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00bNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00bNEWT.java @@ -34,6 +34,8 @@ import javax.media.nativewindow.NativeWindowFactory; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.Display; import com.jogamp.newt.MonitorDevice; @@ -55,6 +57,7 @@ import javax.media.opengl.GLCapabilitiesImmutable; * Queries the current MonitorMode 50 times, * stressing a possible race condition. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestScreenMode00bNEWT extends UITestCase { static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00cNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00cNEWT.java index bc1dcf792..de856e569 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00cNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode00cNEWT.java @@ -36,6 +36,8 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.Display; import com.jogamp.newt.MonitorDevice; @@ -58,6 +60,7 @@ import javax.media.nativewindow.util.Dimension; /** * Tests X11 XRandR MonitorMode reset via {@link UITestCase#resetXRandRIfX11()}. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestScreenMode00cNEWT extends UITestCase { static boolean manualTest = false; static GLProfile glp; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01aNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01aNEWT.java index bff220648..0f3dbeefc 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01aNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01aNEWT.java @@ -36,6 +36,8 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.Display; import com.jogamp.newt.MonitorDevice; @@ -63,6 +65,7 @@ import javax.media.nativewindow.util.Dimension; * * @see TestScreenMode01dNEWT#cleanupGL() */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestScreenMode01aNEWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01bNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01bNEWT.java index 3c363b3f5..4804a753c 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01bNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01bNEWT.java @@ -36,6 +36,8 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.Display; import com.jogamp.newt.MonitorDevice; @@ -58,6 +60,7 @@ import javax.media.nativewindow.util.RectangleImmutable; /** * Mode change on separate monitors .. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestScreenMode01bNEWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01cNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01cNEWT.java index 6a7a399ee..db6360a19 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01cNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01cNEWT.java @@ -36,6 +36,8 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.Display; import com.jogamp.newt.MonitorDevice; @@ -58,6 +60,7 @@ import javax.media.nativewindow.util.RectangleImmutable; /** * Fullscreen on separate monitors, incl. spanning across multiple monitors. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestScreenMode01cNEWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01dNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01dNEWT.java index b4fd132a7..6158e6244 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01dNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode01dNEWT.java @@ -38,6 +38,8 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.Display; import com.jogamp.newt.MonitorDevice; @@ -66,6 +68,7 @@ import javax.media.nativewindow.util.RectangleImmutable; * <p> * Also documents NV RANDR/GL bug, see {@link TestScreenMode01dNEWT#cleanupGL()}.</p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestScreenMode01dNEWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02aNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02aNEWT.java index 25751662d..e87194bc6 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02aNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02aNEWT.java @@ -37,6 +37,8 @@ import com.jogamp.opengl.util.Animator; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.os.Platform; import com.jogamp.newt.Display; @@ -60,6 +62,7 @@ import javax.media.nativewindow.util.Dimension; * MonitorMode change does not use highest resolution. * </p> */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestScreenMode02aNEWT extends UITestCase { static GLProfile glp; static int width, height; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02bNEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02bNEWT.java index aa1bbad3f..2da2abd32 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02bNEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/mm/TestScreenMode02bNEWT.java @@ -36,6 +36,8 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.os.Platform; import com.jogamp.newt.Display; @@ -70,6 +72,7 @@ import javax.media.nativewindow.util.Dimension; * * @see TestScreenMode01NEWT#cleanupGL() */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestScreenMode02bNEWT extends UITestCase { static GLProfile glp; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01NEWT.java index d618d3b3c..41a6b77fa 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01NEWT.java @@ -32,6 +32,8 @@ package com.jogamp.opengl.test.junit.newt.parenting; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.opengl.*; @@ -45,6 +47,7 @@ import com.jogamp.opengl.test.junit.util.*; import com.jogamp.opengl.test.junit.jogl.demos.es2.RedSquareES2; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestParenting01NEWT extends UITestCase { static int width, height; static long durationPerTest = 600; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01aAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01aAWT.java index f8f97518e..6de24d1ea 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01aAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01aAWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.newt.parenting; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import java.awt.Button; import java.awt.BorderLayout; @@ -50,6 +52,7 @@ import java.lang.reflect.InvocationTargetException; import com.jogamp.opengl.test.junit.util.*; import com.jogamp.opengl.test.junit.jogl.demos.es2.RedSquareES2; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestParenting01aAWT extends UITestCase { static int width, height; static long durationPerTest = 800; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01aSWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01aSWT.java index c95ac1985..4bb64c766 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01aSWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01aSWT.java @@ -45,6 +45,8 @@ import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.nativewindow.swt.SWTAccessor; import com.jogamp.newt.NewtFactory; @@ -58,6 +60,7 @@ import com.jogamp.opengl.test.junit.util.UITestCase; /** * Simple visibility test .. */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestParenting01aSWT extends UITestCase { static int width, height; static long durationPerTest = 800; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01bAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01bAWT.java index 906aeee45..45612eb1a 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01bAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01bAWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.newt.parenting; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import java.awt.Button; import java.awt.BorderLayout; @@ -51,6 +53,7 @@ import java.lang.reflect.InvocationTargetException; import com.jogamp.opengl.test.junit.util.*; import com.jogamp.opengl.test.junit.jogl.demos.es2.RedSquareES2; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestParenting01bAWT extends UITestCase { static int width, height; static long durationPerTest = 800; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01cAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01cAWT.java index baa4c4676..dd5d6eb13 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01cAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01cAWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.newt.parenting; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import java.awt.Button; import java.awt.BorderLayout; @@ -50,6 +52,7 @@ import java.lang.reflect.InvocationTargetException; import com.jogamp.opengl.test.junit.util.*; import com.jogamp.opengl.test.junit.jogl.demos.es2.RedSquareES2; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestParenting01cAWT extends UITestCase { static int width, height; static long durationPerTest = 800; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01cSwingAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01cSwingAWT.java index 1dd80e313..375f676f4 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01cSwingAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting01cSwingAWT.java @@ -33,6 +33,8 @@ import java.lang.reflect.*; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import java.awt.Button; import java.awt.BorderLayout; @@ -53,6 +55,7 @@ import java.io.IOException; import com.jogamp.opengl.test.junit.util.*; import com.jogamp.opengl.test.junit.jogl.demos.es2.RedSquareES2; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestParenting01cSwingAWT extends UITestCase { static int width, height; static long durationPerTest = 800; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting02AWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting02AWT.java index 204d98d5c..d79bdcaf6 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting02AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting02AWT.java @@ -31,6 +31,8 @@ package com.jogamp.opengl.test.junit.newt.parenting; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import java.awt.Button; import java.awt.BorderLayout; @@ -49,6 +51,7 @@ import java.lang.reflect.InvocationTargetException; import com.jogamp.opengl.test.junit.util.*; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestParenting02AWT extends UITestCase { static int width, height; static long durationPerTest = 500; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting02NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting02NEWT.java index 8e2c73e9d..6294483f0 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting02NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting02NEWT.java @@ -32,6 +32,8 @@ package com.jogamp.opengl.test.junit.newt.parenting; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import javax.media.opengl.*; import javax.media.nativewindow.*; @@ -48,6 +50,7 @@ import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; // import com.jogamp.opengl.test.junit.jogl.demos.es1.RedSquareES1; // import com.jogamp.opengl.test.junit.jogl.demos.es1.GearsES1; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestParenting02NEWT extends UITestCase { static int width, height; static long durationPerTest = 500; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting03AWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting03AWT.java index 4f880347a..60c2b702c 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting03AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting03AWT.java @@ -33,6 +33,8 @@ import java.lang.reflect.*; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import java.awt.BorderLayout; import java.awt.Button; @@ -52,6 +54,7 @@ import java.io.IOException; import com.jogamp.opengl.test.junit.util.*; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestParenting03AWT extends UITestCase { static Dimension glSize, fSize; static long durationPerTest = 1100; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting04AWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting04AWT.java index 0af42ec03..827ac525a 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting04AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting04AWT.java @@ -41,6 +41,8 @@ import javax.swing.SwingUtilities; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.Window; import com.jogamp.newt.awt.NewtCanvasAWT; @@ -54,6 +56,7 @@ import com.jogamp.opengl.util.Animator; /** * Using {@link NewtCanvasAWT#setNEWTChild(Window)} for reparenting, i.e. NEWT/AWT hopping */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestParenting04AWT extends UITestCase { static int width, height; static long durationPerTest = 800; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting04SWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting04SWT.java index a4e4ace43..78b3bc464 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting04SWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParenting04SWT.java @@ -45,6 +45,8 @@ import org.junit.Assume; import org.junit.Before; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.nativewindow.swt.SWTAccessor; import com.jogamp.newt.NewtFactory; @@ -60,6 +62,7 @@ import com.jogamp.opengl.util.Animator; /** * Using {@link NewtCanvasSWT#setNEWTChild(Window)} for reparenting, i.e. NEWT/AWT hopping */ +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestParenting04SWT extends UITestCase { static int width, height; static long durationPerTest = 800; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParentingFocusTraversal01AWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParentingFocusTraversal01AWT.java index d340fc280..58dafba15 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParentingFocusTraversal01AWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestParentingFocusTraversal01AWT.java @@ -36,6 +36,8 @@ import java.util.Set; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import java.awt.AWTException; import java.awt.AWTKeyStroke; @@ -62,6 +64,7 @@ import jogamp.newt.driver.DriverClearFocus; import com.jogamp.opengl.test.junit.util.*; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestParentingFocusTraversal01AWT extends UITestCase { static Dimension glSize, fSize; static int numFocus = 8; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestTranslucentChildWindowBug632NEWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestTranslucentChildWindowBug632NEWT.java index 1d186a490..b2286a8b7 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestTranslucentChildWindowBug632NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestTranslucentChildWindowBug632NEWT.java @@ -11,6 +11,8 @@ import javax.media.opengl.GLProfile; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.newt.opengl.GLWindow; import com.jogamp.opengl.test.junit.jogl.demos.es2.GearsES2; @@ -18,6 +20,7 @@ import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.Animator; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestTranslucentChildWindowBug632NEWT extends UITestCase { static long durationPerTest = 2*300; static GLProfile glp; diff --git a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestTranslucentParentingAWT.java b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestTranslucentParentingAWT.java index 2d668c224..f273f7672 100644 --- a/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestTranslucentParentingAWT.java +++ b/src/test/com/jogamp/opengl/test/junit/newt/parenting/TestTranslucentParentingAWT.java @@ -49,6 +49,8 @@ import javax.media.opengl.GLEventListener; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Test; +import org.junit.FixMethodOrder; +import org.junit.runners.MethodSorters; import com.jogamp.common.util.ReflectionUtil; import com.jogamp.newt.Window; @@ -59,6 +61,7 @@ import com.jogamp.opengl.test.junit.util.MiscUtils; import com.jogamp.opengl.test.junit.util.UITestCase; import com.jogamp.opengl.util.Animator; +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public class TestTranslucentParentingAWT extends UITestCase { static Dimension size; static long durationPerTest = 400; diff --git a/src/test/com/jogamp/opengl/test/junit/util/UITestCase.java b/src/test/com/jogamp/opengl/test/junit/util/UITestCase.java index 839a0c7b8..82247a59b 100644 --- a/src/test/com/jogamp/opengl/test/junit/util/UITestCase.java +++ b/src/test/com/jogamp/opengl/test/junit/util/UITestCase.java @@ -56,12 +56,14 @@ import org.junit.Before; import org.junit.BeforeClass; import org.junit.After; import org.junit.AfterClass; +import org.junit.FixMethodOrder; import org.junit.Rule; import org.junit.rules.TestName; +import org.junit.runners.MethodSorters; import org.junit.runners.model.FrameworkMethod; import org.junit.runners.model.TestClass; - +@FixMethodOrder(MethodSorters.NAME_ASCENDING) public abstract class UITestCase { @Rule public TestName _unitTestName = new TestName(); |