You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by hi...@apache.org on 2010/07/28 00:39:22 UTC
svn commit: r979897 - in /harmony/enhanced/java/trunk/classlib:
modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/
support/src/test/java/tests/resources/
Author: hindessm
Date: Tue Jul 27 22:39:21 2010
New Revision: 979897
URL: http://svn.apache.org/viewvc?rev=979897&view=rev
Log:
Fix for "[#HARMONY-6519] [classlib][archive] support .txt files are not
text/plain files".
Added:
harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_compDiction.bin
- copied unchanged from r979888, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_compDiction.txt
harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_compressD.bin
- copied unchanged from r979888, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_compressD.txt
harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(O).bin
- copied unchanged from r979887, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(O).txt
harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(OD).bin
- copied unchanged from r979887, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(OD).txt
harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(ODI).bin
- copied unchanged from r979887, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(ODI).txt
Removed:
harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_compDiction.txt
harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_compressD.txt
harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(O).txt
harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(OD).txt
harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(ODI).txt
Modified:
harmony/enhanced/java/trunk/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
harmony/enhanced/java/trunk/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java
Modified: harmony/enhanced/java/trunk/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java?rev=979897&r1=979896&r2=979897&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java (original)
+++ harmony/enhanced/java/trunk/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java Tue Jul 27 22:39:21 2010
@@ -63,7 +63,7 @@ public class InflaterInputStreamTest ext
int result = 0;
int buffer[] = new int[500];
InputStream infile = Support_Resources
- .getStream("hyts_constru(O).txt");
+ .getStream("hyts_constru(O).bin");
InflaterInputStream inflatIP = new InflaterInputStream(infile);
@@ -82,7 +82,7 @@ public class InflaterInputStreamTest ext
*/
public void test_ConstructorLjava_io_InputStreamLjava_util_zip_Inflater() throws IOException {
byte byteArray[] = new byte[100];
- InputStream infile = Support_Resources.getStream("hyts_constru(OD).txt");
+ InputStream infile = Support_Resources.getStream("hyts_constru(OD).bin");
Inflater inflate = new Inflater();
InflaterInputStream inflatIP = new InflaterInputStream(infile,
inflate);
@@ -98,7 +98,7 @@ public class InflaterInputStreamTest ext
public void test_ConstructorLjava_io_InputStreamLjava_util_zip_InflaterI() throws IOException {
int result = 0;
int buffer[] = new int[500];
- InputStream infile = Support_Resources.getStream("hyts_constru(ODI).txt");
+ InputStream infile = Support_Resources.getStream("hyts_constru(ODI).bin");
Inflater inflate = new Inflater();
InflaterInputStream inflatIP = new InflaterInputStream(infile,
inflate, 1);
@@ -141,7 +141,7 @@ public class InflaterInputStreamTest ext
int buffer[] = new int[500];
byte orgBuffer[] = { 1, 3, 4, 7, 8 };
InputStream infile = Support_Resources
- .getStream("hyts_constru(OD).txt");
+ .getStream("hyts_constru(OD).bin");
Inflater inflate = new Inflater();
InflaterInputStream inflatIP = new InflaterInputStream(infile,
inflate);
@@ -326,7 +326,7 @@ public class InflaterInputStreamTest ext
// testing for negative input to skip
InputStream infile = Support_Resources
- .getStream("hyts_constru(OD).txt");
+ .getStream("hyts_constru(OD).bin");
Inflater inflate = new Inflater();
InflaterInputStream inflatIP = new InflaterInputStream(infile,
inflate, 10);
@@ -341,7 +341,7 @@ public class InflaterInputStreamTest ext
// testing for number of bytes greater than input.
InputStream infile2 = Support_Resources
- .getStream("hyts_constru(OD).txt");
+ .getStream("hyts_constru(OD).bin");
InflaterInputStream inflatIP2 = new InflaterInputStream(infile2);
// looked at how many bytes the skip skipped. It is
@@ -354,7 +354,7 @@ public class InflaterInputStreamTest ext
// test for skipping of 2 bytes
InputStream infile3 = Support_Resources
- .getStream("hyts_constru(OD).txt");
+ .getStream("hyts_constru(OD).bin");
InflaterInputStream inflatIP3 = new InflaterInputStream(infile3);
skip = inflatIP3.skip(2);
assertEquals("the number of bytes returned by skip did not correspond with its input parameters",
Modified: harmony/enhanced/java/trunk/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/trunk/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java?rev=979897&r1=979896&r2=979897&view=diff
==============================================================================
--- harmony/enhanced/java/trunk/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java (original)
+++ harmony/enhanced/java/trunk/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java Tue Jul 27 22:39:21 2010
@@ -689,13 +689,13 @@ public class InflaterTest extends junit.
protected void setUp() {
try {
java.io.InputStream infile = Support_Resources
- .getStream("hyts_compressD.txt");
+ .getStream("hyts_compressD.bin");
BufferedInputStream inflatIP = new BufferedInputStream(infile);
inflatIP.read(outPutBuff1, 0, outPutBuff1.length);
inflatIP.close();
java.io.InputStream infile2 = Support_Resources
- .getStream("hyts_compDiction.txt");
+ .getStream("hyts_compDiction.bin");
BufferedInputStream inflatIP2 = new BufferedInputStream(infile2);
inflatIP2.read(outPutDiction, 0, outPutDiction.length);
inflatIP2.close();