From fc5b20cb62db5b7675071dee57b3679ce8f7102b Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Mon, 27 Feb 2012 09:55:47 +0100
Subject: Fix minor test issues

---
 .../test/junit/graph/TestRegionRendererNEWT01.java |  4 +--
 .../test/junit/graph/TestTextRendererNEWT01.java   |  4 +--
 .../jogl/offscreen/TestOffscreen02BitmapNEWT.java  | 36 +++++-----------------
 3 files changed, 11 insertions(+), 33 deletions(-)

(limited to 'src/test/com')

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 a723e120a..a69f995d7 100644
--- a/src/test/com/jogamp/opengl/test/junit/graph/TestRegionRendererNEWT01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/TestRegionRendererNEWT01.java
@@ -54,7 +54,7 @@ public class TestRegionRendererNEWT01 extends UITestCase {
     public void testRegionRendererR2T01() throws InterruptedException {
         if(Platform.CPUFamily.X86 != Platform.CPU_ARCH.family) { // FIXME
             // FIXME: Disabled for now - since it doesn't seem fit for mobile (performance wise). 
-            setTestSupported(false);
+            System.err.println("disabled on non desktop (x86) arch for now ..");
             return;
         }
         GLProfile glp = GLProfile.getGL2ES2();
@@ -120,7 +120,7 @@ public class TestRegionRendererNEWT01 extends UITestCase {
         if(Platform.CPUFamily.X86 != Platform.CPU_ARCH.family) { // FIXME
             // FIXME: Disabled for now - since it doesn't seem fit for mobile (performance wise).
             // FIXME: Also the GLSL code for VARIABLE_CURVE is not fit for mobile yet!
-            setTestSupported(false);
+            System.err.println("disabled on non desktop (x86) arch for now ..");
             return;
         }
         GLProfile glp = GLProfile.get(GLProfile.GL2ES2);
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 f9c88dc30..3830b0cf0 100755
--- a/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT01.java
+++ b/src/test/com/jogamp/opengl/test/junit/graph/TestTextRendererNEWT01.java
@@ -76,8 +76,8 @@ public class TestTextRendererNEWT01 extends UITestCase {
     @Test
     public void testTextRendererR2T01() throws InterruptedException {
         if(Platform.CPUFamily.X86 != Platform.CPU_ARCH.family) { // FIXME
-            // FIXME: Disabled for now - since it doesn't seem fit for mobile (performance wise). 
-            setTestSupported(false);
+            // FIXME: Disabled for now - since it doesn't seem fit for mobile (performance wise).
+            System.err.println("disabled on non desktop (x86) arch for now ..");
             return;
         }
         GLProfile glp = GLProfile.getGL2ES2();
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 46e79588b..7898ddad9 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,10 +36,7 @@ import com.jogamp.newt.Window;
 import com.jogamp.newt.event.MouseListener;
 import com.jogamp.newt.event.WindowListener;
 import com.jogamp.newt.opengl.GLWindow;
-import org.junit.AfterClass;
 import org.junit.Assert;
-import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 
 import javax.media.opengl.*;
@@ -54,34 +51,13 @@ import java.io.IOException;
  * hence it is possible to not have GLSL. 
  */
 public class TestOffscreen02BitmapNEWT extends UITestCase {
-    static GLProfile glpDefault;
-    static GLDrawableFactory glDrawableFactory;
-    static int width, height;
-    GLCapabilities capsDefault;
-
-    @BeforeClass
-    public static void initClass() {
-        glpDefault = GLProfile.getDefault();
-        Assert.assertNotNull(glpDefault);
-        glDrawableFactory = GLDrawableFactory.getFactory(glpDefault);
-        System.out.println("INFO: PBuffer supported: "+ glDrawableFactory.canCreateGLPbuffer(null));
-        width  = 640;
-        height = 480;
-    }
-
-    @AfterClass
-    public static void releaseClass() {
-    }
-
-    @Before
-    public void init() {
-        capsDefault = new GLCapabilities(glpDefault);
-        Assert.assertNotNull(capsDefault);
-    }
+    static final int width = 640, height = 480;
 
     @Test
     public void test11OffscreenWindowPixmap() {
-        GLProfile glp = GLProfile.getGL2ES1();
+        // we need to stay w/ generic profile GL2ES1 
+        // since software rasterizer might be required (pixmap/bitmap) 
+        GLProfile glp = GLProfile.get(GLProfile.GL2ES1);
         Assert.assertNotNull(glp);
         GLCapabilities caps = new GLCapabilities(glp);
         Assert.assertNotNull(caps);
@@ -123,7 +99,9 @@ public class TestOffscreen02BitmapNEWT extends UITestCase {
 
     @Test
     public void test14OffscreenSnapshotWithDemoPixmap() {
-        GLProfile glp = GLProfile.getGL2ES1();
+        // we need to stay w/ generic profile GL2ES1 
+        // since software rasterizer might be required (pixmap/bitmap) 
+        GLProfile glp = GLProfile.get(GLProfile.GL2ES1);
         Assert.assertNotNull(glp);
         GLCapabilities caps = new GLCapabilities(glp);
         Assert.assertNotNull(caps);
-- 
cgit v1.2.3