diff options
Diffstat (limited to 'src/test/com')
3 files changed, 18 insertions, 43 deletions
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 13af808c0..d4f24bb19 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 @@ -66,14 +66,7 @@ public class TestGLProfile01NEWT extends UITestCase { public void test01GLProfileDefault() throws InterruptedException { System.out.println("GLProfile "+GLProfile.glAvailabilityToString()); GLProfile glp = GLProfile.getDefault(); - dumpVersion(glp); - } - - @Test - public void test02GLProfileMaxFixedFunc() throws InterruptedException { - // Assuming at least one fixed profile is available - GLProfile glp = GLProfile.getMaxFixedFunc(); - System.out.println("GLProfile getMaxFixedFunc(): "+glp); + System.out.println("GLProfile.getDefault(): "+glp); if(glp.getName().equals(GLProfile.GL4bc)) { Assert.assertTrue(GLProfile.isGL4bcAvailable()); Assert.assertTrue(GLProfile.isGL3bcAvailable()); @@ -96,10 +89,16 @@ public class TestGLProfile01NEWT extends UITestCase { } @Test + public void test02GL2() throws InterruptedException { + GLProfile glp = GLProfile.get(GLProfile.GL2); + dumpVersion(glp); + } + + @Test public void test03GLProfileMaxProgrammable() throws InterruptedException { // Assuming at least one programmable profile is available GLProfile glp = GLProfile.getMaxProgrammable(); - System.out.println("GLProfile getMaxProgrammable(): "+glp); + System.out.println("GLProfile.getMaxProgrammable(): "+glp); if(glp.getName().equals(GLProfile.GL4)) { Assert.assertTrue(GLProfile.isGL4Available()); Assert.assertTrue(GLProfile.isGL3Available()); 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 83561eb97..21e1a4aca 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 @@ -122,23 +122,11 @@ public class TestAWT01GLn extends UITestCase { } @Test - public void test03GLMaxFixed() throws InterruptedException { - GLProfile maxFixed = GLProfile.getMaxFixedFunc(); - System.out.println("GLProfile MaxFixed: "+maxFixed); - GLCapabilities caps = new GLCapabilities(maxFixed); - try { - runTestGL(caps); - } catch (Throwable t) { - // FIXME: - // Stop test and ignore if GL3bc and GL4bc - // currently this won't work on ATI! - if(maxFixed.equals(GLProfile.GL3bc) || - maxFixed.equals(GLProfile.GL4bc)) { - t.printStackTrace(); - Assume.assumeNoException(t); - } - // else .. serious unexpected exception - } + public void test02GL2() throws InterruptedException { + GLProfile glprofile = GLProfile.get(GLProfile.GL2); + System.out.println( "GLProfile GL2: " + glprofile ); + GLCapabilities caps = new GLCapabilities(glprofile); + runTestGL(caps); } public static void main(String args[]) { 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 8f642dfc9..779ad7666 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 @@ -134,23 +134,11 @@ public class TestSwingAWT01GLn extends UITestCase { } @Test - public void test03GLMaxFixed() throws InterruptedException, InvocationTargetException { - GLProfile maxFixed = GLProfile.getMaxFixedFunc(); - System.out.println("GLProfile MaxFixed: "+maxFixed); - GLCapabilities caps = new GLCapabilities(maxFixed); - try { - runTestGL(caps); - } catch (Throwable t) { - // FIXME: - // Stop test and ignore if GL3bc and GL4bc - // currently this won't work on ATI! - if(maxFixed.getName().equals(GLProfile.GL3bc) || - maxFixed.getName().equals(GLProfile.GL4bc)) { - t.printStackTrace(); - assumeNoException(t); - } - // else .. serious unexpected exception - } + public void test02GL2() throws InterruptedException, InvocationTargetException { + GLProfile glprofile = GLProfile.get(GLProfile.GL2); + System.out.println( "GLProfile GL2: " + glprofile ); + GLCapabilities caps = new GLCapabilities(glprofile); + runTestGL(caps); } public static void main(String args[]) { |