harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r948628 - in /harmony/enhanced/java/branches/mrh/classlib/modules/archive: make/ src/test/java/org/apache/harmony/archive/tests/java/util/jar/ src/test/java/org/apache/harmony/archive/tests/java/util/zip/
Date Wed, 26 May 2010 22:44:25 GMT
Author: hindessm
Date: Wed May 26 22:44:24 2010
New Revision: 948628

URL: http://svn.apache.org/viewvc?rev=948628&view=rev
Log:
I can't get these to fail and the related jira HARMONY-2921 closed.

Modified:
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/exclude.linux.x86.drl.interm
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java
    harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/exclude.linux.x86.drl.interm
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/exclude.linux.x86.drl.interm?rev=948628&r1=948627&r2=948628&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/exclude.linux.x86.drl.interm
(original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/make/exclude.linux.x86.drl.interm
Wed May 26 22:44:24 2010
@@ -1,3 +0,0 @@
-#2921
-org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
-org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java?rev=948628&r1=948627&r2=948628&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java
(original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/jar/JarInputStreamTest.java
Wed May 26 22:44:24 2010
@@ -30,7 +30,6 @@ import java.util.zip.ZipEntry;
 import java.util.zip.ZipException;
 
 import tests.support.resource.Support_Resources;
-import tests.support.Support_Excludes;
 
 public class JarInputStreamTest extends junit.framework.TestCase {
 	// a 'normal' jar file
@@ -57,10 +56,6 @@ public class JarInputStreamTest extends 
 	 * @tests java.util.jar.JarInputStream#JarInputStream(java.io.InputStream)
 	 */
 	public void test_ConstructorLjava_io_InputStream() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method java.util.jar.JarInputStream(java.io.InputStream)
 		InputStream is = new URL(jarName).openConnection().getInputStream();
 		boolean hasCorrectEntry = false;
@@ -77,10 +72,6 @@ public class JarInputStreamTest extends 
 	}
 
     public void test_closeAfterException() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         File resources = Support_Resources.createTempFolder();
         Support_Resources.copyFile(resources, null, "Broken_entry.jar");
         InputStream is = Support_Resources.getStream("Broken_entry.jar");
@@ -102,10 +93,6 @@ public class JarInputStreamTest extends 
     }
 
     public void test_getNextJarEntry_Ex() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         final Set<String> desired = new HashSet<String>(Arrays
                 .asList("foo/", "foo/bar/", "foo/bar/A.class", "Blah.txt"));
         Set<String> actual = new HashSet<String>();
@@ -143,10 +130,6 @@ public class JarInputStreamTest extends 
 	 * @tests java.util.jar.JarInputStream#getManifest()
 	 */
 	public void test_getManifest() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// Test for method java.util.jar.Manifest
 		// java.util.jar.JarInputStream.getManifest()
 		Manifest m;
@@ -165,10 +148,6 @@ public class JarInputStreamTest extends 
 	 * @tests java.util.jar.JarInputStream#getNextJarEntry()
 	 */
 	public void test_getNextJarEntry() throws Exception {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
         final Set<String> desired = new HashSet<String>(Arrays.asList(new String[]
{ "foo/",
                 "foo/bar/", "foo/bar/A.class", "Blah.txt" }));
         Set<String> actual = new HashSet<String>();
@@ -184,10 +163,6 @@ public class JarInputStreamTest extends 
 
     public void test_JarInputStream_Integrate_Jar_getNextEntry()
             throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String intJarName = Support_Resources.getURL("Integrate.jar");
         InputStream is = new URL(intJarName).openConnection()
                 .getInputStream();
@@ -204,10 +179,6 @@ public class JarInputStreamTest extends 
 
     public void test_JarInputStream_Modified_Class_getNextEntry()
             throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String modJarName = Support_Resources.getURL("Modified_Class.jar");
         InputStream is = new URL(modJarName).openConnection()
                 .getInputStream();
@@ -235,10 +206,6 @@ public class JarInputStreamTest extends 
 
     public void test_JarInputStream_Modified_Manifest_MainAttributes_getNextEntry()
             throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String modJarName = Support_Resources.getURL("Modified_Manifest_MainAttributes.jar");
         InputStream is = new URL(modJarName).openConnection()
                 .getInputStream();
@@ -259,10 +226,6 @@ public class JarInputStreamTest extends 
 
     public void test_JarInputStream_Modified_Manifest_EntryAttributes_getNextEntry()
             throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String modJarName = Support_Resources
                 .getURL("Modified_Manifest_EntryAttributes.jar");
         InputStream is = new URL(modJarName).openConnection()
@@ -290,10 +253,6 @@ public class JarInputStreamTest extends 
 
     public void test_JarInputStream_Modified_SF_EntryAttributes_getNextEntry()
             throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String modJarName = Support_Resources
                 .getURL("Modified_SF_EntryAttributes.jar");
         InputStream is = new URL(modJarName).openConnection()
@@ -320,10 +279,6 @@ public class JarInputStreamTest extends 
     }
 
     public void test_JarInputStream_Modified_Class_read() throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String modJarName = Support_Resources.getURL("Modified_Class.jar");
         InputStream is = new URL(modJarName).openConnection()
                 .getInputStream();
@@ -353,10 +308,6 @@ public class JarInputStreamTest extends 
     }
 
     public void test_Integrate_Jar_read() throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String intJarName = Support_Resources.getURL("Integrate.jar");
         InputStream is = new URL(intJarName).openConnection()
                 .getInputStream();
@@ -379,10 +330,6 @@ public class JarInputStreamTest extends 
 
     public void test_JarInputStream_Modified_Manifest_MainAttributes_read()
             throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String modJarName = Support_Resources
                 .getURL("Modified_Manifest_MainAttributes.jar");
         InputStream is = new URL(modJarName).openConnection()
@@ -414,10 +361,6 @@ public class JarInputStreamTest extends 
 
     public void test_JarInputStream_Modified_SF_EntryAttributes_read()
             throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         String modJarName = Support_Resources
                 .getURL("Modified_SF_EntryAttributes.jar");
         InputStream is = new URL(modJarName).openConnection()
@@ -448,10 +391,6 @@ public class JarInputStreamTest extends 
     }    
 
     public void test_getNextEntry() throws Exception {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         File resources = Support_Resources.createTempFolder();
         Support_Resources.copyFile(resources, null, "Broken_entry.jar");
         InputStream is = Support_Resources.getStream("Broken_entry.jar");

Modified: harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java?rev=948628&r1=948627&r2=948628&view=diff
==============================================================================
--- harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
(original)
+++ harmony/enhanced/java/branches/mrh/classlib/modules/archive/src/test/java/org/apache/harmony/archive/tests/java/util/zip/GZIPInputStreamTest.java
Wed May 26 22:44:24 2010
@@ -29,7 +29,6 @@ import java.util.zip.GZIPInputStream;
 import java.util.zip.GZIPOutputStream;
 
 import tests.support.resource.Support_Resources;
-import tests.support.Support_Excludes;
 
 public class GZIPInputStreamTest extends junit.framework.TestCase {
 	File resources;
@@ -56,10 +55,6 @@ public class GZIPInputStreamTest extends
 	 * @tests java.util.zip.GZIPInputStream#GZIPInputStream(java.io.InputStream)
 	 */
 	public void test_ConstructorLjava_io_InputStream() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// test method java.util.zip.GZIPInputStream.constructor
 		try {
 			Support_Resources.copyFile(resources, "GZIPInputStream",
@@ -84,10 +79,6 @@ public class GZIPInputStreamTest extends
 	 *        int)
 	 */
 	public void test_ConstructorLjava_io_InputStreamI() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// test method java.util.zip.GZIPInputStream.constructorI
 		try {
 			Support_Resources.copyFile(resources, "GZIPInputStream",
@@ -111,10 +102,6 @@ public class GZIPInputStreamTest extends
 	 * @tests java.util.zip.GZIPInputStream#read(byte[], int, int)
 	 */
 	public void test_read$BII() throws IOException {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// test method java.util.zip.GZIPInputStream.readBII
         byte orgBuf[] = { '3', '5', '2', 'r', 'g', 'e', 'f', 'd', 'e', 'w' };
         byte outBuf[] = new byte[100];
@@ -234,10 +221,6 @@ public class GZIPInputStreamTest extends
 	 * @tests java.util.zip.GZIPInputStream#close()
 	 */
 	public void test_close() {
-	    if (Support_Excludes.isExcluded()) {
-	        return;
-	    }
-
 		// test method java.util.zip.GZIPInputStream.close
 		byte outBuf[] = new byte[100];
 		try {
@@ -277,10 +260,6 @@ public class GZIPInputStreamTest extends
      * @tests java.util.zip.GZIPInputStream#read()
      */
     public void test_read() throws IOException {
-        if (Support_Excludes.isExcluded()) {
-            return;
-        }
-
         GZIPInputStream gis = null;
         int result = 0;
         byte[] buffer = new byte[] {1,2,3,4,5,6,7,8,9,10};



Mime
View raw message