You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by te...@apache.org on 2006/05/05 21:20:58 UTC
svn commit: r400148 -
/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
Author: tellison
Date: Fri May 5 12:20:56 2006
New Revision: 400148
URL: http://svn.apache.org/viewcvs?rev=400148&view=rev
Log:
Tidy-up test to use JUnit exception handling
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
URL: http://svn.apache.org/viewcvs/incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java?rev=400148&r1=400147&r2=400148&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java Fri May 5 12:20:56 2006
@@ -15,22 +15,21 @@
package org.apache.harmony.archive.tests.java.util.zip;
import java.io.ByteArrayInputStream;
-import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.util.zip.Inflater;
import java.util.zip.InflaterInputStream;
-import java.util.zip.ZipException;
+import junit.framework.TestCase;
import tests.support.resource.Support_Resources;
-public class InflaterInputStreamTest extends junit.framework.TestCase {
+public class InflaterInputStreamTest extends TestCase {
// files hyts_constru(O),hyts_constru(OD),hyts_constru(ODI) needs to be
// included as resources
byte outPutBuf[] = new byte[500];
- class MyInflaterInputStream extends java.util.zip.InflaterInputStream {
+ class MyInflaterInputStream extends InflaterInputStream {
MyInflaterInputStream(InputStream in) {
super(in);
}
@@ -51,131 +50,81 @@
/**
* @tests java.util.zip.InflaterInputStream#InflaterInputStream(java.io.InputStream)
*/
- public void test_ConstructorLjava_io_InputStream() {
- // test method
- // java.util.zip.inflaterInputStream.InflaterInputStream(InputStream)
+ public void test_ConstructorLjava_io_InputStream() throws IOException {
int result = 0;
int buffer[] = new int[500];
- try {
- InputStream infile = Support_Resources
- .getStream("hyts_constru(O).txt");
+ InputStream infile = Support_Resources
+ .getStream("hyts_constru(O).txt");
- InflaterInputStream inflatIP = new InflaterInputStream(infile);
+ InflaterInputStream inflatIP = new InflaterInputStream(infile);
- int i = 0;
- while ((result = inflatIP.read()) != -1) {
- buffer[i] = result;
- i++;
- }
- inflatIP.close();
- } catch (FileNotFoundException e) {
- fail(
- "input file to test InflaterInputStream constructor is not found");
- } catch (ZipException e) {
- fail(
- "read() threw an zip exception while testing constructor");
- } catch (IOException e) {
- fail("read() threw an exception while testing constructor");
+ int i = 0;
+ while ((result = inflatIP.read()) != -1) {
+ buffer[i] = result;
+ i++;
}
+ inflatIP.close();
}
/**
* @tests java.util.zip.InflaterInputStream#InflaterInputStream(java.io.InputStream,
* java.util.zip.Inflater)
*/
- public void test_ConstructorLjava_io_InputStreamLjava_util_zip_Inflater() {
- // test method
- // java.util.zip.inflaterInputStream.InflaterInputStream(InputStream,Inflater)
-
+ public void test_ConstructorLjava_io_InputStreamLjava_util_zip_Inflater() throws IOException {
byte byteArray[] = new byte[100];
- try {
- InputStream infile = Support_Resources
- .getStream("hyts_constru(OD).txt");
- Inflater inflate = new Inflater();
- InflaterInputStream inflatIP = new InflaterInputStream(infile,
- inflate);
-
- inflatIP.read(byteArray, 0, 5);// ony suppose to read in 5 bytes
- inflatIP.close();
- } catch (FileNotFoundException e) {
- fail(
- "input file to test InflaterInputStream constructor is not found");
- } catch (ZipException e) {
- fail(
- "read() threw an zip exception while testing constructor");
- } catch (IOException e) {
- fail("read() threw an exception while testing constructor");
- }
+ InputStream infile = Support_Resources.getStream("hyts_constru(OD).txt");
+ Inflater inflate = new Inflater();
+ InflaterInputStream inflatIP = new InflaterInputStream(infile,
+ inflate);
+
+ inflatIP.read(byteArray, 0, 5);// ony suppose to read in 5 bytes
+ inflatIP.close();
}
/**
* @tests java.util.zip.InflaterInputStream#InflaterInputStream(java.io.InputStream,
* java.util.zip.Inflater, int)
*/
- public void test_ConstructorLjava_io_InputStreamLjava_util_zip_InflaterI() {
- // test method
- // java.util.zip.inflaterInputStream.InflaterInputStream(InputStream,Inflater,int)
+ public void test_ConstructorLjava_io_InputStreamLjava_util_zip_InflaterI() throws IOException {
int result = 0;
int buffer[] = new int[500];
- try {
- InputStream infile = Support_Resources
- .getStream("hyts_constru(ODI).txt");
- Inflater inflate = new Inflater();
- InflaterInputStream inflatIP = new InflaterInputStream(infile,
- inflate, 1);
-
- int i = 0;
- while ((result = inflatIP.read()) != -1) {
- buffer[i] = result;
- i++;
- }
- inflatIP.close();
- } catch (FileNotFoundException e) {
- fail(
- "input file to test InflaterInputStream constructor is not found");
- } catch (ZipException e) {
- fail(
- "read() threw an zip exception while testing constructor");
- } catch (IOException e) {
- fail("read() threw an exception while testing constructor");
+ InputStream infile = Support_Resources.getStream("hyts_constru(ODI).txt");
+ Inflater inflate = new Inflater();
+ InflaterInputStream inflatIP = new InflaterInputStream(infile,
+ inflate, 1);
+
+ int i = 0;
+ while ((result = inflatIP.read()) != -1) {
+ buffer[i] = result;
+ i++;
}
+ inflatIP.close();
}
/**
* @tests java.util.zip.InflaterInputStream#read()
*/
- public void test_read() {
- // test method java.util.zip.inflaterInputStream.Read()
+ public void test_read() throws IOException {
int result = 0;
int buffer[] = new int[500];
byte orgBuffer[] = { 1, 3, 4, 7, 8 };
- try {
- InputStream infile = Support_Resources
- .getStream("hyts_constru(OD).txt");
- Inflater inflate = new Inflater();
- InflaterInputStream inflatIP = new InflaterInputStream(infile,
- inflate);
-
- int i = 0;
- while ((result = inflatIP.read()) != -1) {
- buffer[i] = result;
- i++;
- }
- inflatIP.close();
- } catch (FileNotFoundException e) {
- fail(
- "input file to test InflaterInputStream constructor is not found");
- } catch (ZipException e) {
- fail(
- "read() threw an zip exception while testing constructor");
- } catch (IOException e) {
- fail("read() threw an exception while testing constructor");
+ InputStream infile = Support_Resources
+ .getStream("hyts_constru(OD).txt");
+ Inflater inflate = new Inflater();
+ InflaterInputStream inflatIP = new InflaterInputStream(infile,
+ inflate);
+
+ int i = 0;
+ while ((result = inflatIP.read()) != -1) {
+ buffer[i] = result;
+ i++;
}
+ inflatIP.close();
for (int j = 0; j < orgBuffer.length; j++) {
assertTrue(
- "orginal compressed data did not equal decompressed data",
- buffer[j] == orgBuffer[j]);
+ "orginal compressed data did not equal decompressed data",
+ buffer[j] == orgBuffer[j]);
}
}
@@ -183,226 +132,144 @@
* @tests java.util.zip.InflaterInputStream#read(byte[], int, int)
*/
public void test_read$BII() {
- /*
- * // test method java.util.zip.inflaterInputStream.read(byte,int,int)
- * byte byteArray[] = new byte[100]; byte orgBuffer[] = { 1, 3, 4, 7, 8 };
- * try { InputStream infile = Support_Resources
- * .getStream("hyts_constru(OD).txt"); Inflater inflate = new
- * Inflater(); InflaterInputStream inflatIP = new
- * InflaterInputStream(infile, inflate);
- *
- * inflatIP.read(byteArray, 0, 4);// ony suppose to read in 4 bytes
- * inflatIP.close(); assertEquals("the fifth element of byteArray
- * contained a non zero value", 0, byteArray[4]); } catch
- * (FileNotFoundException e) { fail( "input file to test
- * InflaterInputStream constructor is not found"); } catch
- * (ZipException e) { fail( "read() threw an zip exception while
- * testing constructor"); } catch (IOException e) {
- * assertTrue("read() threw an exception while testing constructor",
- * false); }
- *
- * for (int j = 0; j < 4; j++) { assertTrue( "orginal compressed data
- * did not equal decompressed data", byteArray[j] == orgBuffer[j]); }
- *
- * InflaterInputStream iis = setupIISForReadTest(); try { int n =
- * iis.read(); n = iis.read(new byte[1], -1, 0); fail("FAILED: expected
- * IOOBE, but the method returns: " //$NON-NLS-1$ + n); } catch
- * (IOException e) { fail("FAILED: unexpected " + e); //$NON-NLS-1$ }
- * catch (IndexOutOfBoundsException e2) { // NO OP }
- *
- * iis = setupIISForReadTest(); try { int n = iis.read(); n =
- * iis.read(null, 0, 1); fail("FAILED: expected NPE, but the method
- * returns: " //$NON-NLS-1$ + n); } catch (IOException e) {
- * fail("FAILED: unexpected " + e); //$NON-NLS-1$ } catch
- * (NullPointerException e2) { // NO OP }
- *
- * iis = setupIISForReadTest(); try { int n = iis.read(); n =
- * iis.read(new byte[1], 0, 0); assertEquals(0, n); } catch (Exception
- * e) { fail("FAILED: unexpected " + e); //$NON-NLS-1$ }
- */
- }
-
- /**
- * @return
- */
- private InflaterInputStream setupIISForReadTest() {
- /*
- * ByteArrayOutputStream baos; DeflaterOutputStream dos;
- * ByteArrayInputStream bais; InflaterInputStream iis;
- *
- * baos = new ByteArrayOutputStream(); dos = new
- * DeflaterOutputStream(baos); try { dos.write(2); dos.close(); } catch
- * (IOException e3) { fail(); e3.printStackTrace(); } bais = new
- * ByteArrayInputStream(baos.toByteArray()); iis = new
- * InflaterInputStream(bais); return iis;
- */
- return null;
+ // TODO
}
/**
* @tests java.util.zip.InflaterInputStream#skip(long)
*/
- public void test_skipJ() {
- // Test for method java.util.zip.Inflater.InputStream.skip(long)
+ public void test_skipJ() throws IOException {
+ InputStream is = Support_Resources.getStream("hyts_available.tst");
+ InflaterInputStream iis = new InflaterInputStream(is);
+ // Tests for skipping a negative number of bytes.
try {
- InputStream is = Support_Resources.getStream("hyts_available.tst");
- InflaterInputStream iis = new InflaterInputStream(is);
-
- // Tests for skipping a negative number of bytes.
- try {
- iis.skip(-3);
- fail("IllegalArgumentException not thrown");
- } catch (IllegalArgumentException e) {
- }
- assertEquals("Incorrect Byte Returned.", 5, iis.read());
-
- try {
- iis.skip(Integer.MIN_VALUE);
- fail("IllegalArgumentException not thrown");
- } catch (IllegalArgumentException e) {
- }
- assertEquals("Incorrect Byte Returned.", 4, iis.read());
-
- // Test to make sure the correct number of bytes were skipped
- assertEquals("Incorrect Number Of Bytes Skipped.", 3, iis.skip(3));
-
- // Test to see if the number of bytes skipped returned is true.
- assertEquals("Incorrect Byte Returned.", 7, iis.read());
-
- assertEquals("Incorrect Number Of Bytes Skipped.", 0, iis.skip(0));
- assertEquals("Incorrect Byte Returned.", 0, iis.read());
-
- // Test for skipping more bytes than available in the stream
- assertEquals("Incorrect Number Of Bytes Skipped.", 2, iis.skip(4));
- assertEquals("Incorrect Byte Returned.", -1, iis.read());
- iis.close();
- } catch (IOException e) {
- fail("Unexpected IOException during test");
+ iis.skip(-3);
+ fail("IllegalArgumentException not thrown");
+ } catch (IllegalArgumentException e) {
+ // Expected
}
+ assertEquals("Incorrect Byte Returned.", 5, iis.read());
+
+ try {
+ iis.skip(Integer.MIN_VALUE);
+ fail("IllegalArgumentException not thrown");
+ } catch (IllegalArgumentException e) {
+ // Expected
+ }
+ assertEquals("Incorrect Byte Returned.", 4, iis.read());
+
+ // Test to make sure the correct number of bytes were skipped
+ assertEquals("Incorrect Number Of Bytes Skipped.", 3, iis.skip(3));
+
+ // Test to see if the number of bytes skipped returned is true.
+ assertEquals("Incorrect Byte Returned.", 7, iis.read());
+
+ assertEquals("Incorrect Number Of Bytes Skipped.", 0, iis.skip(0));
+ assertEquals("Incorrect Byte Returned.", 0, iis.read());
+
+ // Test for skipping more bytes than available in the stream
+ assertEquals("Incorrect Number Of Bytes Skipped.", 2, iis.skip(4));
+ assertEquals("Incorrect Byte Returned.", -1, iis.read());
+ iis.close();
}
/**
* @tests java.util.zip.InflaterInputStream#skip(long)
*/
- public void test_skipJ2() {
- // test method java.util.zip.inflaterInputStream.skip(long)
+ public void test_skipJ2() throws IOException {
int result = 0;
int buffer[] = new int[100];
byte orgBuffer[] = { 1, 3, 4, 7, 8 };
+
+ // testing for negative input to skip
+ InputStream infile = Support_Resources
+ .getStream("hyts_constru(OD).txt");
+ Inflater inflate = new Inflater();
+ InflaterInputStream inflatIP = new InflaterInputStream(infile,
+ inflate, 10);
+ long skip;
try {
- // testing for negative input to skip
- InputStream infile = Support_Resources
- .getStream("hyts_constru(OD).txt");
- Inflater inflate = new Inflater();
- InflaterInputStream inflatIP = new InflaterInputStream(infile,
- inflate, 10);
- long skip;
- try {
- skip = inflatIP.skip(Integer.MIN_VALUE);
- fail("Expected IllegalArgumentException when skip() is called with negative parameter");
- } catch (IllegalArgumentException e) {
- }
- inflatIP.close();
-
- // testing for number of bytes greater than input.
- InputStream infile2 = Support_Resources
- .getStream("hyts_constru(OD).txt");
- InflaterInputStream inflatIP2 = new InflaterInputStream(infile2);
-
- // looked at how many bytes the skip skipped. It is
- // 5 and its supposed to be the entire input stream.
-
- skip = inflatIP2.skip(Integer.MAX_VALUE);
- // System.out.println(skip);
- assertEquals("method skip() returned wrong number of bytes skiped",
- 5, skip);
-
- // test for skiping of 2 bytes
- InputStream infile3 = Support_Resources
- .getStream("hyts_constru(OD).txt");
- InflaterInputStream inflatIP3 = new InflaterInputStream(infile3);
- skip = inflatIP3.skip(2);
- assertEquals("the number of bytes returned by skip did not correspond with its input parameters",
- 2, skip);
- int i = 0;
- result = 0;
- while ((result = inflatIP3.read()) != -1) {
- buffer[i] = result;
- i++;
- }
- inflatIP2.close();
-
- for (int j = 2; j < orgBuffer.length; j++) {
- assertTrue(
- "orginal compressed data did not equal decompressed data",
- buffer[j - 2] == orgBuffer[j]);
- }
- } catch (FileNotFoundException e) {
- fail(
- "input file to test InflaterInputStream constructor is not found");
- } catch (ZipException e) {
- fail(
- "read() threw an zip exception while testing constructor");
- } catch (IOException e) {
- fail("read() threw an exception while testing constructor");
+ skip = inflatIP.skip(Integer.MIN_VALUE);
+ fail("Expected IllegalArgumentException when skip() is called with negative parameter");
+ } catch (IllegalArgumentException e) {
+ // Expected
+ }
+ inflatIP.close();
+
+ // testing for number of bytes greater than input.
+ InputStream infile2 = Support_Resources
+ .getStream("hyts_constru(OD).txt");
+ InflaterInputStream inflatIP2 = new InflaterInputStream(infile2);
+
+ // looked at how many bytes the skip skipped. It is
+ // 5 and its supposed to be the entire input stream.
+
+ skip = inflatIP2.skip(Integer.MAX_VALUE);
+ // System.out.println(skip);
+ assertEquals("method skip() returned wrong number of bytes skiped",
+ 5, skip);
+
+ // test for skiping of 2 bytes
+ InputStream infile3 = Support_Resources
+ .getStream("hyts_constru(OD).txt");
+ InflaterInputStream inflatIP3 = new InflaterInputStream(infile3);
+ skip = inflatIP3.skip(2);
+ assertEquals("the number of bytes returned by skip did not correspond with its input parameters",
+ 2, skip);
+ int i = 0;
+ result = 0;
+ while ((result = inflatIP3.read()) != -1) {
+ buffer[i] = result;
+ i++;
+ }
+ inflatIP2.close();
+
+ for (int j = 2; j < orgBuffer.length; j++) {
+ assertTrue(
+ "orginal compressed data did not equal decompressed data",
+ buffer[j - 2] == orgBuffer[j]);
}
}
/**
* @tests java.util.zip.InflaterInputStream#available()
*/
- public void test_available() {
- // Test for method java.util.zip.Inflater.InputStream.available()
+ public void test_available() throws IOException {
+ InputStream is = Support_Resources.getStream("hyts_available.tst");
+ InflaterInputStream iis = new InflaterInputStream(is);
+
+ int available;
+ int read;
+ for (int i = 0; i < 11; i++) {
+ read = iis.read();
+ available = iis.available();
+ if (read == -1)
+ assertEquals("Bytes Available Should Return 0 ",
+ 0, available);
+ else
+ assertEquals("Bytes Available Should Return 1.",
+ 1, available);
+ }
+ iis.close();
try {
-
- InputStream is = Support_Resources.getStream("hyts_available.tst");
- InflaterInputStream iis = new InflaterInputStream(is);
-
- int available;
- int read;
- for (int i = 0; i < 11; i++) {
- read = iis.read();
- available = iis.available();
- if (read == -1)
- assertEquals("Bytes Available Should Return 0 ",
- 0, available);
- else
- assertEquals("Bytes Available Should Return 1.",
- 1, available);
- }
-
- iis.close();
- try {
- iis.available();
- fail("available after close should throw IOException.");
- } catch (IOException e) {
- }
+ iis.available();
+ fail("available after close should throw IOException.");
} catch (IOException e) {
- fail("Unexpected IOException during test");
+ // Expected
}
}
/**
* @tests java.util.zip.InflaterInputStream#close()
*/
- public void test_close() {
+ public void test_close() throws IOException {
InflaterInputStream iin = new InflaterInputStream(
new ByteArrayInputStream(new byte[0]));
- try {
- iin.close();
- // test for exception
- iin.close();
- } catch (IOException e) {
- fail("Threw exception");
- }
- }
-
- protected void setUp() {
- }
+ iin.close();
- protected void tearDown() {
+ // test for exception
+ iin.close();
}
-
}