harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r979973 - in /harmony/enhanced/java/branches/java6: ./ classlib/ classlib/depends/libs/ classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/ classlib/support/src/test/java/tests/resources/ drlvm/ jdktools/
Date Wed, 28 Jul 2010 07:30:55 GMT
Author: hindessm
Date: Wed Jul 28 07:30:54 2010
New Revision: 979973

URL: http://svn.apache.org/viewvc?rev=979973&view=rev
Log:
Merge change from /harmony/enhanced/java/trunk@979897:

  r979897 | hindessm | 2010-07-27 23:39:21 +0100 (Tue, 27 Jul 2010) | 3 lines
  
  Fix for "[#HARMONY-6519] [classlib][archive] support .txt files are not
  text/plain files".
  


Added:
    harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/hyts_compDiction.bin
      - copied unchanged from r979897, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_compDiction.bin
    harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/hyts_compressD.bin
      - copied unchanged from r979897, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_compressD.bin
    harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/hyts_constru(O).bin
      - copied unchanged from r979897, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(O).bin
    harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/hyts_constru(OD).bin
      - copied unchanged from r979897, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(OD).bin
    harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/hyts_constru(ODI).bin
      - copied unchanged from r979897, harmony/enhanced/java/trunk/classlib/support/src/test/java/tests/resources/hyts_constru(ODI).bin
Removed:
    harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/hyts_compDiction.txt
    harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/hyts_compressD.txt
    harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/hyts_constru(O).txt
    harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/hyts_constru(OD).txt
    harmony/enhanced/java/branches/java6/classlib/support/src/test/java/tests/resources/hyts_constru(ODI).txt
Modified:
    harmony/enhanced/java/branches/java6/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/depends/libs/   (props changed)
    harmony/enhanced/java/branches/java6/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
    harmony/enhanced/java/branches/java6/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java
    harmony/enhanced/java/branches/java6/drlvm/   (props changed)
    harmony/enhanced/java/branches/java6/jdktools/   (props changed)

Propchange: harmony/enhanced/java/branches/java6/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 28 07:30:54 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/java/branches/mrh:935751-941490
-/harmony/enhanced/java/trunk:929253-979569,979593,979613,979615,979647,979659,979682
+/harmony/enhanced/java/trunk:929253-979569,979593,979613,979615,979647,979659,979682,979897
 /harmony/enhanced/trunk:476395-929252
 /incubator/harmony/enhanced/trunk:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 28 07:30:54 2010
@@ -1,7 +1,7 @@
 /harmony/enhanced/classlib/trunk:713674-735919,765923-926091,926318-926838
 /harmony/enhanced/classlib/trunk/working_classlib:884014-884286
 /harmony/enhanced/java/branches/mrh/classlib:935751-941490
-/harmony/enhanced/java/trunk/classlib:929253-979569,979593,979613,979615,979647,979659,979682
+/harmony/enhanced/java/trunk/classlib:929253-979569,979593,979613,979615,979647,979659,979682,979897
 /harmony/enhanced/trunk/classlib:476395-929252
 /harmony/enhanced/trunk/working_classlib:476396-920147
 /incubator/harmony/enhanced/trunk/classlib:292550-476394

Propchange: harmony/enhanced/java/branches/java6/classlib/depends/libs/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 28 07:30:54 2010
@@ -1,4 +1,4 @@
 /harmony/enhanced/classlib/trunk/depends/libs:544451-926091
-/harmony/enhanced/java/trunk/classlib/depends/libs:929253-979569,979593,979613,979615,979647,979659,979682
+/harmony/enhanced/java/trunk/classlib/depends/libs:929253-979569,979593,979613,979615,979647,979659,979682,979897
 /harmony/enhanced/trunk/classlib/depends/libs:476395-929252
 /incubator/harmony/enhanced/trunk/classlib/depends/libs:292550-476394

Modified: harmony/enhanced/java/branches/java6/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/branches/java6/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java?rev=979973&r1=979972&r2=979973&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterInputStreamTest.java
Wed Jul 28 07:30:54 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/branches/java6/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/branches/java6/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java?rev=979973&r1=979972&r2=979973&view=diff
==============================================================================
--- harmony/enhanced/java/branches/java6/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java
(original)
+++ harmony/enhanced/java/branches/java6/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/InflaterTest.java
Wed Jul 28 07:30:54 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();

Propchange: harmony/enhanced/java/branches/java6/drlvm/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 28 07:30:54 2010
@@ -1,5 +1,5 @@
 /harmony/enhanced/java/branches/mrh/drlvm:935751-941490
-/harmony/enhanced/java/trunk/drlvm:929253-979569,979593,979613,979615,979647,979659,979682
+/harmony/enhanced/java/trunk/drlvm:929253-979569,979593,979613,979615,979647,979659,979682,979897
 /harmony/enhanced/trunk/drlvm:476395-929252
 /harmony/enhanced/trunk/working_vm:476396-920147
 /incubator/harmony/enhanced/trunk/drlvm:292550-476394

Propchange: harmony/enhanced/java/branches/java6/jdktools/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jul 28 07:30:54 2010
@@ -1,4 +1,4 @@
-/harmony/enhanced/java/trunk/jdktools:929253-979569,979593,979613,979615,979647,979659,979682
+/harmony/enhanced/java/trunk/jdktools:929253-979569,979593,979613,979615,979647,979659,979682,979897
 /harmony/enhanced/jdktools/trunk:630107-925933
 /harmony/enhanced/trunk/jdktools:476395-929252
 /harmony/enhanced/trunk/working_jdktools:476396-920147



Mime
View raw message