Test: UITestCase.get*Name() takes 'String separator' as argument.

4 files changed, 15 insertions, 15 deletions

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 5415ad159..8384e5b61 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
@@ -113,7 +113,7 @@ public class TestAWTCardLayoutAnimatorStartStopBug532 extends UITestCase {
       } */
 
       final JFrame frame = new JFrame();
-      frame.setTitle(getSimpleTestName());
+      frame.setTitle(getSimpleTestName(" - "));
       frame.addWindowListener(new WindowAdapter() { 
          public void windowClosing(WindowEvent e) {
             animatorCtrl.stop();
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 365265334..4f9fa2529 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
@@ -83,7 +83,7 @@ public class TestBug551AWT extends UITestCase {
     }
     
     protected void runTestGL() throws InterruptedException, InvocationTargetException {
-        final Window window = new JFrame(this.getSimpleTestName());
+        final Window window = new JFrame(this.getSimpleTestName(" - "));
         final GLCapabilities caps = new GLCapabilities(GLProfile.getDefault());
         
         // final array as mutable container hack
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/Surface2File.java b/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/Surface2File.java
index 8ca1f3ef8..79cc836f6 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/Surface2File.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/offscreen/Surface2File.java
@@ -31,7 +31,6 @@ package com.jogamp.opengl.test.junit.jogl.offscreen;
 import javax.media.opengl.*;
 
 import com.jogamp.opengl.util.GLReadBufferUtil;
-import com.jogamp.opengl.util.texture.TextureIO;
 
 import java.io.File;
 import java.io.IOException;
@@ -55,12 +54,13 @@ public class Surface2File implements SurfaceUpdatedListener {
                 GL gl = ctx.getGL();
                 // FIXME glFinish() is an expensive paranoia sync, should not be necessary due to spec
                 gl.glFinish();
-                readBufferUtil.readPixels(gl, drawable, false);
-                gl.glFinish();
-                try {
-                    surface2File("shot");
-                } catch (IOException ex) {
-                    throw new RuntimeException("can not write survace to file", ex);
+                if(readBufferUtil.readPixels(gl, drawable, false)) {
+                    gl.glFinish();
+                    try {
+                        surface2File("shot");
+                    } catch (IOException ex) {
+                        throw new RuntimeException("can not write survace to file", ex);
+                    }
                 }
             }
         }
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 1ff1428fc..1ef778090 100644
--- a/src/test/com/jogamp/opengl/test/junit/util/UITestCase.java
+++ b/src/test/com/jogamp/opengl/test/junit/util/UITestCase.java
@@ -63,12 +63,12 @@ public abstract class UITestCase {
         return _unitTestName.getMethodName();
     }
     
-    public final String getSimpleTestName() {
-        return getClass().getSimpleName()+" - "+getTestMethodName();
+    public final String getSimpleTestName(String separator) {
+        return getClass().getSimpleName()+separator+getTestMethodName();
     }
 
-    public final String getFullTestName() {
-        return getClass().getName()+" - "+getTestMethodName();
+    public final String getFullTestName(String separator) {
+        return getClass().getName()+separator+getTestMethodName();
     }
     
     @BeforeClass
@@ -86,12 +86,12 @@ public abstract class UITestCase {
 
     @Before
     public void setUp() {
-        System.err.println("++++ UITestCase.setUp: "+getFullTestName());
+        System.err.println("++++ UITestCase.setUp: "+getFullTestName(" - "));
     }
 
     @After
     public void tearDown() {
-        System.err.println("++++ UITestCase.tearDown: "+getFullTestName());
+        System.err.println("++++ UITestCase.tearDown: "+getFullTestName(" - "));
     }
 
 }