aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/com/jogamp/opengl
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-01-09 22:08:10 +0100
committerSven Gothel <[email protected]>2014-01-09 22:08:10 +0100
commit42d3b31d1becd8eb8e2847c87e14e47e15e730cd (patch)
tree82bdf44d4ba1c32e0af39f68a70904a4a0fb48dc /src/test/com/jogamp/opengl
parent299d5c395aa77b5a79ef04302777efb81ca1f087 (diff)
Fix PNGTstFiles: Typo of new PNG icons .. used AE's 'gray' instead of BE's 'grey', which is used for the filename
Diffstat (limited to 'src/test/com/jogamp/opengl')
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/util/texture/PNGTstFiles.java8
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGPixelRect00NEWT.java4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestPNGPixelRect01NEWT.java9
3 files changed, 16 insertions, 5 deletions
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<PNGTstFiles.allBasenames.length; i++) {
final String basename = PNGTstFiles.allBasenames[i];
final URLConnection urlConn = IOUtil.getResource(this.getClass(), basename+".png");
+ if( null == urlConn ) {
+ throw new IOException("Cannot find "+basename+".png");
+ }
testImpl(i, basename, urlConn.getInputStream(), null);
}
}
@@ -178,6 +184,9 @@ public class TestPNGPixelRect01NEWT extends UITestCase {
for(int i=0; i<PNGTstFiles.greyBasenames.length; i++) {
final String basename = PNGTstFiles.greyBasenames[i];
final URLConnection urlConn = IOUtil.getResource(this.getClass(), basename+".png");
+ if( null == urlConn ) {
+ throw new IOException("Cannot find "+basename+".png");
+ }
testImpl(i, basename, urlConn.getInputStream(), PixelFormat.RGBA8888);
}
}