You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by py...@apache.org on 2006/10/16 18:00:27 UTC
svn commit: r464530 - in /incubator/harmony/enhanced/classlib/trunk:
modules/luni/ modules/luni/src/test/java/tests/api/java/net/
modules/luni/src/test/resources/tests/api/java/net/
support/src/test/resources/net.resources/HTTP/html/testres231/JUC/
Author: pyang
Date: Mon Oct 16 09:00:24 2006
New Revision: 464530
URL: http://svn.apache.org/viewvc?view=rev&rev=464530
Log:
Enable JarURLConnectionTest
Added:
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/tests/api/java/net/
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/tests/api/java/net/lf.jar
- copied unchanged from r464419, incubator/harmony/enhanced/classlib/trunk/support/src/test/resources/net.resources/HTTP/html/testres231/JUC/lf.jar
Removed:
incubator/harmony/enhanced/classlib/trunk/support/src/test/resources/net.resources/HTTP/html/testres231/JUC/
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml?view=diff&rev=464530&r1=464529&r2=464530
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/build.xml Mon Oct 16 09:00:24 2006
@@ -317,7 +317,6 @@
<exclude name="tests/api/java/io/OutputStreamWriterTest.java" />
<exclude name="tests/api/java/lang/ProcessTest.java" />
<exclude name="tests/api/java/net/HttpURLConnectionTest.java" />
- <exclude name="tests/api/java/net/JarURLConnectionTest.java" />
<exclude name="tests/api/java/net/MulticastSocketTest.java" />
<exclude name="tests/api/java/net/SocketImplTest.java" />
<exclude name="tests/api/java/net/SocketTest.java" />
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java?view=diff&rev=464530&r1=464529&r2=464530
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/net/JarURLConnectionTest.java Mon Oct 16 09:00:24 2006
@@ -35,159 +35,138 @@
JarURLConnection juc;
URLConnection uc;
+
+ private static final URL BASE = JarURLConnectionTest.class.getClassLoader().getResource(JarURLConnectionTest.class.getPackage().getName().replace('.', File.separatorChar));
/**
* @tests java.net.JarURLConnection#getAttributes()
*/
- public void test_getAttributes() {
- try {
- URL u = new URL("jar:"
- + Support_Resources.getResourceURL("/JUC/lf.jar!/swt.dll"));
- juc = (JarURLConnection) u.openConnection();
- java.util.jar.Attributes a = juc.getJarEntry().getAttributes();
- assertEquals("Returned incorrect Attributes", "SHA MD5", a.get(
- new java.util.jar.Attributes.Name("Digest-Algorithms"))
- );
- } catch (java.io.IOException e) {
- fail("Exception during test : " + e.getMessage());
- }
+ public void test_getAttributes() throws Exception{
+ URL u = new URL("jar:"
+ + BASE.toString()+"/lf.jar!/swt.dll");
+ juc = (JarURLConnection) u.openConnection();
+ System.out.println(juc.getClass());
+ java.util.jar.Attributes a = juc.getJarEntry().getAttributes();
+ assertEquals("Returned incorrect Attributes", "SHA MD5", a
+ .get(new java.util.jar.Attributes.Name("Digest-Algorithms")));
}
/**
+ * @throws Exception
* @tests java.net.JarURLConnection#getEntryName()
*/
- public void test_getEntryName() {
- try {
- URL u = new URL("jar:"
- + Support_Resources.getResourceURL("/JUC/lf.jar!/plus.bmp"));
- juc = (JarURLConnection) u.openConnection();
- assertEquals("Returned incorrect entryName", "plus.bmp", juc.getEntryName()
- );
- u = new URL("jar:"
- + Support_Resources.getResourceURL("/JUC/lf.jar!/"));
- juc = (JarURLConnection) u.openConnection();
- assertNull("Returned incorrect entryName",
- juc.getEntryName());
- } catch (java.io.IOException e) {
- fail("IOException during test : " + e.getMessage());
- }
- }
+ public void test_getEntryName() throws Exception {
+ URL u = new URL("jar:"
+ + BASE.toString()+"/lf.jar!/plus.bmp");
+ juc = (JarURLConnection) u.openConnection();
+ assertEquals("Returned incorrect entryName", "plus.bmp", juc
+ .getEntryName());
+ u = new URL("jar:" + BASE.toString()+"/lf.jar!/");
+ juc = (JarURLConnection) u.openConnection();
+ assertNull("Returned incorrect entryName", juc.getEntryName());
+ }
/**
* @tests java.net.JarURLConnection#getJarEntry()
*/
- public void test_getJarEntry() {
- try {
- URL u = new URL("jar:"
- + Support_Resources.getResourceURL("/JUC/lf.jar!/plus.bmp"));
- juc = (JarURLConnection) u.openConnection();
- assertEquals("Returned incorrect JarEntry", "plus.bmp", juc.getJarEntry()
- .getName());
- u = new URL("jar:"
- + Support_Resources.getResourceURL("/JUC/lf.jar!/"));
- juc = (JarURLConnection) u.openConnection();
- assertNull("Returned incorrect JarEntry", juc.getJarEntry());
- } catch (java.io.IOException e) {
- fail("IOException during test : " + e.getMessage());
- }
+ public void test_getJarEntry() throws Exception {
+ URL u = new URL("jar:"
+ + BASE.toString()+"/lf.jar!/plus.bmp");
+ juc = (JarURLConnection) u.openConnection();
+ assertEquals("Returned incorrect JarEntry", "plus.bmp", juc
+ .getJarEntry().getName());
+ u = new URL("jar:" + BASE.toString()+"/lf.jar!/");
+ juc = (JarURLConnection) u.openConnection();
+ assertNull("Returned incorrect JarEntry", juc.getJarEntry());
}
/**
- * @tests java.net.JarURLConnection#getJarFile()
- */
- public void test_getJarFile()
- throws MalformedURLException,IOException {
- URL url = null;
- url = new URL("jar:"
- + Support_Resources.getResourceURL("/JUC/lf.jar!/missing"));
-
- JarURLConnection connection = null;
- connection = (JarURLConnection) url.openConnection();
- try {
- connection.connect();
- fail("Did not throw exception on connect");
- } catch (IOException e) {
- // expected
- }
-
- try {
- connection.getJarFile();
- fail("Did not throw exception after connect");
- } catch (IOException e) {
- // expected
- }
-
- File resources = Support_Resources.createTempFolder();
-
- Support_Resources.copyFile(resources, null, "hyts_att.jar");
- File file = new File(resources.toString() + "/hyts_att.jar");
- URL fUrl1 = new URL("jar:file:" + file.getPath() + "!/");
- JarURLConnection con1 = (JarURLConnection) fUrl1.openConnection();
- ZipFile jf1 = con1.getJarFile();
- JarURLConnection con2 = (JarURLConnection) fUrl1.openConnection();
- ZipFile jf2 = con2.getJarFile();
- assertTrue("file: JarFiles not the same", jf1 == jf2);
- jf1.close();
- assertTrue("File should exist", file.exists());
- new URL("jar:" + Support_Resources.getResourceURL("/JUC/lf.jar!/"));
- con1 = (JarURLConnection) fUrl1.openConnection();
- jf1 = con1.getJarFile();
- con2 = (JarURLConnection) fUrl1.openConnection();
- jf2 = con2.getJarFile();
- assertTrue("http: JarFiles not the same", jf1 == jf2);
- jf1.close();
- }
-
- /**
- * @tests java.net.JarURLConnection.getJarFile()
- *
- * Regression test for HARMONY-29
- */
- public void test_getJarFile29() throws Exception {
- File jarFile = File.createTempFile("1+2 3", "test.jar");
- jarFile.deleteOnExit();
- JarOutputStream out = new JarOutputStream(new FileOutputStream(jarFile));
- out.putNextEntry(new ZipEntry("test"));
- out.closeEntry();
- out.close();
+ * @tests java.net.JarURLConnection#getJarFile()
+ */
+ public void test_getJarFile() throws MalformedURLException, IOException {
+ URL url = null;
+ url = new URL("jar:"
+ + BASE.toString()+"/lf.jar!/missing");
+
+ JarURLConnection connection = null;
+ connection = (JarURLConnection) url.openConnection();
+ try {
+ connection.connect();
+ fail("Did not throw exception on connect");
+ } catch (IOException e) {
+ // expected
+ }
- JarURLConnection conn = (JarURLConnection) new URL("jar:file:/"+jarFile.getAbsolutePath().replaceAll(" ", "%20")+"!/").openConnection();
- conn.getJarFile().entries();
+ try {
+ connection.getJarFile();
+ fail("Did not throw exception after connect");
+ } catch (IOException e) {
+ // expected
}
- /**
- * @tests java.net.JarURLConnection#getJarFileURL()
- */
- public void test_getJarFileURL() {
- try {
- URL fileURL = new URL(Support_Resources
- .getResourceURL("/JUC/lf.jar"));
- URL u = new URL("jar:"
- + Support_Resources.getResourceURL("/JUC/lf.jar!/plus.bmp"));
- juc = (JarURLConnection) u.openConnection();
- assertTrue("Returned incorrect file URL", juc.getJarFileURL()
- .equals(fileURL));
- } catch (java.io.IOException e) {
- fail("IOException during test : " + e.getMessage());
- }
- }
+ File resources = Support_Resources.createTempFolder();
+
+ Support_Resources.copyFile(resources, null, "hyts_att.jar");
+ File file = new File(resources.toString() + "/hyts_att.jar");
+ URL fUrl1 = new URL("jar:file:" + file.getPath() + "!/");
+ JarURLConnection con1 = (JarURLConnection) fUrl1.openConnection();
+ ZipFile jf1 = con1.getJarFile();
+ JarURLConnection con2 = (JarURLConnection) fUrl1.openConnection();
+ ZipFile jf2 = con2.getJarFile();
+ assertTrue("file: JarFiles not the same", jf1 == jf2);
+ jf1.close();
+ assertTrue("File should exist", file.exists());
+ new URL("jar:" + BASE.toString()+"/lf.jar!/");
+ con1 = (JarURLConnection) fUrl1.openConnection();
+ jf1 = con1.getJarFile();
+ con2 = (JarURLConnection) fUrl1.openConnection();
+ jf2 = con2.getJarFile();
+ assertTrue("http: JarFiles not the same", jf1 == jf2);
+ jf1.close();
+ }
+
+ /**
+ * @tests java.net.JarURLConnection.getJarFile()
+ *
+ * Regression test for HARMONY-29
+ */
+ public void test_getJarFile29() throws Exception {
+ File jarFile = File.createTempFile("1+2 3", "test.jar");
+ jarFile.deleteOnExit();
+ JarOutputStream out = new JarOutputStream(new FileOutputStream(jarFile));
+ out.putNextEntry(new ZipEntry("test"));
+ out.closeEntry();
+ out.close();
+
+ JarURLConnection conn = (JarURLConnection) new URL("jar:file:/"
+ + jarFile.getAbsolutePath().replaceAll(" ", "%20") + "!/")
+ .openConnection();
+ conn.getJarFile().entries();
+ }
+
+ /**
+ * @tests java.net.JarURLConnection#getJarFileURL()
+ */
+ public void test_getJarFileURL() throws Exception {
+ URL fileURL = new URL(BASE.toString()+"/lf.jar");
+ URL u = new URL("jar:"
+ + BASE.toString()+"/lf.jar!/plus.bmp");
+ juc = (JarURLConnection) u.openConnection();
+ assertTrue("Returned incorrect file URL", juc.getJarFileURL().equals(
+ fileURL));
+ }
/**
* @tests java.net.JarURLConnection#getMainAttributes()
*/
- public void test_getMainAttributes() {
- try {
- URL u = new URL("jar:"
- + Support_Resources.getResourceURL("/JUC/lf.jar!/swt.dll"));
- juc = (JarURLConnection) u.openConnection();
- java.util.jar.Attributes a = juc.getMainAttributes();
- assertEquals("Returned incorrect Attributes",
- "1.0", a.get(
- java.util.jar.Attributes.Name.MANIFEST_VERSION));
- } catch (java.io.IOException e) {
- fail("IOException during test : " + e.getMessage());
- }
- }
+ public void test_getMainAttributes() throws Exception{
+ URL u = new URL("jar:"
+ + BASE.toString()+"/lf.jar!/swt.dll");
+ juc = (JarURLConnection) u.openConnection();
+ java.util.jar.Attributes a = juc.getMainAttributes();
+ assertEquals("Returned incorrect Attributes", "1.0", a
+ .get(java.util.jar.Attributes.Name.MANIFEST_VERSION));
+ }
protected void setUp() {
}