summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2014-07-10 14:03:34 +0200
committerSven Gothel <[email protected]>2014-07-10 14:03:34 +0200
commit9d7a7e55c95fcf29ce1ed0804fd7791c1c1147de (patch)
tree6176a6f2dec99950d6d43b1c86903cd7b4c2f228
parentec2d94ca26ddab8ec67135ebc5f2d0a43f6a4c25 (diff)
Bug 982: Adding test TGA file for confirmation - No bug
-rw-r--r--make/scripts/tests.sh3
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTGATextureFromFileNEWT.java13
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug982.rle32.256x256.tgabin0 -> 30510 bytes
3 files changed, 15 insertions, 1 deletions
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 629816e50..1fb4b8467 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -382,7 +382,7 @@ function testawtswt() {
#testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2GLJPanelAWT $*
#testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.glsl.TestRulerNEWT01 $*
-testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
+#testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
#testawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtCanvasAWTDemo $*
#testawt com.jogamp.opengl.test.junit.jogl.awt.ManualHiDPIBufferedImage01AWT $*
@@ -764,6 +764,7 @@ testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUUISceneNewtDemo $*
#testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPixelFormatUtil01NEWT $*
#testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPNGTextureFromFileAWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestPNGTextureFromFileNEWT $*
+testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestTGATextureFromFileNEWT $*
#testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite01AWT $*
#testnoawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite01NEWT $*
#testawt com.jogamp.opengl.test.junit.jogl.util.texture.TestGLReadBufferUtilTextureIOWrite02AWT $*
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTGATextureFromFileNEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTGATextureFromFileNEWT.java
index 4f6705330..ed8339b68 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTGATextureFromFileNEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/TestTGATextureFromFileNEWT.java
@@ -64,6 +64,7 @@ public class TestTGATextureFromFileNEWT extends UITestCase {
InputStream testTextureStream01U32;
InputStream testTextureStream02RLE32;
+ InputStream testTextureStream03RLE32;
@Before
public void initTest() throws IOException {
@@ -79,6 +80,12 @@ public class TestTGATextureFromFileNEWT extends UITestCase {
testTextureStream02RLE32 = testTextureUrlConn.getInputStream();
Assert.assertNotNull(testTextureStream02RLE32);
}
+ {
+ final URLConnection testTextureUrlConn = IOUtil.getResource(this.getClass(), "bug982.rle32.256x256.tga");
+ Assert.assertNotNull(testTextureUrlConn);
+ testTextureStream03RLE32 = testTextureUrlConn.getInputStream();
+ Assert.assertNotNull(testTextureStream03RLE32);
+ }
}
public void testImpl(final boolean useFFP, final InputStream istream) throws InterruptedException, IOException {
@@ -150,10 +157,16 @@ public class TestTGATextureFromFileNEWT extends UITestCase {
testImpl(true, testTextureStream02RLE32);
}
+ @Test
+ public void test03RLE32__GL2() throws InterruptedException, IOException {
+ testImpl(true, testTextureStream03RLE32);
+ }
+
@After
public void cleanupTest() {
testTextureStream01U32 = null;
testTextureStream02RLE32 = null;
+ testTextureStream03RLE32 = null;
}
public static void main(final String args[]) throws IOException {
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug982.rle32.256x256.tga b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug982.rle32.256x256.tga
new file mode 100644
index 000000000..d4affa19d
--- /dev/null
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/util/texture/bug982.rle32.256x256.tga
Binary files differ