From 42d3b31d1becd8eb8e2847c87e14e47e15e730cd Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 9 Jan 2014 22:08:10 +0100 Subject: Fix PNGTstFiles: Typo of new PNG icons .. used AE's 'gray' instead of BE's 'grey', which is used for the filename --- make/scripts/tests.sh | 4 ++-- .../jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java | 8 ++++---- .../test/junit/jogl/util/texture/TestPNGPixelRect00NEWT.java | 4 +++- .../test/junit/jogl/util/texture/TestPNGPixelRect01NEWT.java | 9 +++++++++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 10cd3f17c..bf9eba958 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -325,7 +325,7 @@ function testawtswt() { #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelsAWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestLandscapeES2NewtCanvasAWT $* -#testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* +testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestLandscapeES2NEWT $* #testawtswt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasSWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestElektronenMultipliziererNEWT $* @@ -479,7 +479,7 @@ function testawtswt() { #testnoawt com.jogamp.opengl.test.junit.newt.TestWindows01NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestWindowClosingProtocol02NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows01NEWT $* -testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated $* +#testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows02NEWTAnimated $* #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindows03NEWTAnimResize $* #testnoawt com.jogamp.opengl.test.junit.newt.TestGLWindowInvisiblePointer01NEWT $* #testnoawt com.jogamp.opengl.test.junit.newt.TestDisplayLifecycle01NEWT diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java index e3ad7fc03..0d5d74a97 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java @@ -41,14 +41,14 @@ public class PNGTstFiles { "grayscale_texture", "bug724-transparent-grey_orig", "bug724-transparent-grey_gimpexp", - "cross-gray-alpha-16x16", - "pointer-gray-alpha-16x24", + "cross-grey-alpha-16x16", + "pointer-grey-alpha-16x24", }; static public final String[] greyBasenames = { "grayscale_texture", "bug724-transparent-grey_orig", "bug724-transparent-grey_gimpexp", - "cross-gray-alpha-16x16", - "pointer-gray-alpha-16x24", + "cross-grey-alpha-16x16", + "pointer-grey-alpha-16x24", }; } diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGPixelRect00NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGPixelRect00NEWT.java index fc97c56fa..c2b39f0f3 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGPixelRect00NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGPixelRect00NEWT.java @@ -129,7 +129,9 @@ public class TestPNGPixelRect00NEWT extends UITestCase { final File out2R_f=new File(getSimpleTestName(".")+"-03-"+basename+"-reversed.png"); final File out2RF_f=new File(getSimpleTestName(".")+"-04-"+basename+"-reversed_flipped.png"); URLConnection urlConn = IOUtil.getResource(this.getClass(), pathname+basename+".png"); - + if( null == urlConn ) { + throw new IOException("Cannot find "+pathname+basename+".png"); + } final PNGPixelRect image1 = PNGPixelRect.read(urlConn.getInputStream(), destFmt, false /* directBuffer */, destMinStrideInBytes, destIsGLOriented); System.err.println("PNGPixelRect - Orig: "+image1); { diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGPixelRect01NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGPixelRect01NEWT.java index 0e92db48e..3b1d9fbb0 100644 --- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGPixelRect01NEWT.java +++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGPixelRect01NEWT.java @@ -156,6 +156,9 @@ public class TestPNGPixelRect01NEWT extends UITestCase { return; } final URLConnection urlConn = IOUtil.getResource(this.getClass(), _fname); + if( null == urlConn ) { + throw new IOException("Cannot find "+_fname+".png"); + } testImpl(0, _fname, urlConn.getInputStream(), null); } @@ -167,6 +170,9 @@ public class TestPNGPixelRect01NEWT extends UITestCase { for(int i=0; i