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 2008/01/15 13:43:46 UTC
svn commit: r612106 - in /harmony/enhanced/classlib/trunk/modules/luni:
make/ src/test/api/common/org/apache/harmony/luni/tests/java/net/
src/test/api/common/tests/
src/test/resources/org/apache/harmony/luni/tests/java/net/
src/test/resources/tests/
Author: tellison
Date: Tue Jan 15 04:43:34 2008
New Revision: 612106
URL: http://svn.apache.org/viewvc?rev=612106&view=rev
Log:
Rename packages for java.net tests, and update exclusion list to reflect new package names.
Added:
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/AuthenticatorTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/AuthenticatorTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/BindExceptionTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/BindExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ConnectExceptionTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ConnectExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/CookieHandlerTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/CookieHandlerTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramPacketTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/DatagramPacketTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketImplTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/DatagramSocketImplTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/DatagramSocketTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ExcludedProxyTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ExcludedProxyTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/HttpURLConnectionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/JarURLConnectionTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/JarURLConnectionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MalformedURLExceptionTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/MalformedURLExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/MulticastSocketTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NetPermissionTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/NetPermissionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NetworkInterfaceTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/NetworkInterfaceTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NoRouteToHostExceptionTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/NoRouteToHostExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/PasswordAuthenticationTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/PasswordAuthenticationTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProtocolExceptionTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ProtocolExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ProxySelectorTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxyTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ProxyTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ResponseCacheTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ResponseCacheTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SecureCacheResponseTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SecureCacheResponseTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ServerSocketTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketExceptionTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketImplTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketImplTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketPermissionTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketPermissionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTestCase.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketTestCase.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/TestServerSocketInit.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/TestServerSocketInit.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URISyntaxExceptionTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URISyntaxExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URITest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URITest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLClassLoaderTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLClassLoaderTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLConnectionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLDecoderTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLDecoderTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLEncoderTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLEncoderTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/UnknownHostExceptionTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/UnknownHostExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/UnknownServiceExceptionTest.java
- copied, changed from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/UnknownServiceExceptionTest.java
harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/org/apache/harmony/luni/tests/java/net/
- copied from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/tests/api/java/net/
Removed:
harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/
harmony/enhanced/classlib/trunk/modules/luni/src/test/resources/tests/
Modified:
harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common
harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl
harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl
harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl
Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common?rev=612106&r1=612105&r2=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common Tue Jan 15 04:43:34 2008
@@ -1,2 +1,2 @@
-tests/api/java/net/URLClassLoaderTest.java
-tests/api/java/net/ExcludedProxyTest.java
+org/apache/harmony/luni/tests/java/net/URLClassLoaderTest.java
+org/apache/harmony/luni/tests/java/net/ExcludedProxyTest.java
Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl?rev=612106&r1=612105&r2=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86.drl Tue Jan 15 04:43:34 2008
@@ -1,5 +1,5 @@
org/apache/harmony/luni/tests/java/lang/ThreadTest.java
-tests/api/java/net/SocketTest.java
+org/apache/harmony/luni/tests/java/net/SocketTest.java
# HARMONY-4043 (was duplicate HARMONY-4753)
org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java
Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl?rev=612106&r1=612105&r2=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.linux.x86_64.drl Tue Jan 15 04:43:34 2008
@@ -1,7 +1,7 @@
org/apache/harmony/luni/tests/java/net/InetAddressTest.java
org/apache/harmony/luni/tests/java/lang/ThreadTest.java
-tests/api/java/net/SocketTest.java
-tests/api/java/net/MulticastSocketTest.java
+org/apache/harmony/luni/tests/java/net/SocketTest.java
+org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java
# HARMONY-4043 (was duplicate HARMONY-4753)
org/apache/harmony/luni/tests/java/lang/SecurityManager2Test.java
Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl?rev=612106&r1=612105&r2=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.windows.x86_64.drl Tue Jan 15 04:43:34 2008
@@ -1,4 +1,4 @@
-tests/api/java/net/MulticastSocketTest.java
+org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java
org/apache/harmony/luni/tests/java/util/ArrayListTest.java
# HARMONY-4043 (was duplicate HARMONY-4753)
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/AuthenticatorTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/AuthenticatorTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/AuthenticatorTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/AuthenticatorTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/AuthenticatorTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/AuthenticatorTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/AuthenticatorTest.java Tue Jan 15 04:43:34 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.Authenticator;
import java.net.InetAddress;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/BindExceptionTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/BindExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/BindExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/BindExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/BindExceptionTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/BindExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/BindExceptionTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.BindException;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ConnectExceptionTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ConnectExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ConnectExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ConnectExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ConnectExceptionTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ConnectExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ConnectExceptionTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.ConnectException;
import java.net.InetAddress;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/CookieHandlerTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/CookieHandlerTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/CookieHandlerTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/CookieHandlerTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/CookieHandlerTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/CookieHandlerTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/CookieHandlerTest.java Tue Jan 15 04:43:34 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.IOException;
import java.net.CookieHandler;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramPacketTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/DatagramPacketTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramPacketTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramPacketTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/DatagramPacketTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/DatagramPacketTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramPacketTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.IOException;
import java.net.DatagramPacket;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketImplTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/DatagramSocketImplTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketImplTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketImplTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/DatagramSocketImplTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/DatagramSocketImplTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketImplTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.FileDescriptor;
import java.io.IOException;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/DatagramSocketTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/DatagramSocketTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/DatagramSocketTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/DatagramSocketTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.IOException;
import java.io.InterruptedIOException;
@@ -761,64 +761,64 @@
*
* @throws IOException if some I/O error occured
*/
- public void test2276() throws IOException {
- final String ADDRESS = "239.255.2.3";
- final int PORT = Support_PortManager.getNextPortForUDP();
- InetAddress group = InetAddress.getByName(ADDRESS);
- MulticastSocket socket = new MulticastSocket(PORT);
- byte[] recvData = new byte[100];
- DatagramPacket recvDatagram = new DatagramPacket(recvData, recvData.length);
-
- String message = "Hello, world!";
- String longerMessage = message + " again.";
- String veryLongMessage = longerMessage + " Forever!";
-
- socket.joinGroup(group);
- socket.setSoTimeout(5000); // prevent eternal block in
- // socket.receive()
- // send & recieve packet
- byte[] sendData = message.getBytes();
- DatagramPacket sendDatagram = new DatagramPacket(sendData, 0,
- sendData.length, group, PORT);
- socket.send(sendDatagram);
- socket.receive(recvDatagram);
- String recvMessage = new String(recvData, 0, recvDatagram.getLength());
- assertEquals(message, recvMessage);
-
- // send & receive longer packet
- sendData = longerMessage.getBytes();
- sendDatagram = new DatagramPacket(sendData, 0, sendData.length,
- group, PORT);
- socket.send(sendDatagram);
- socket.receive(recvDatagram);
- recvMessage = new String(recvData, 0, recvDatagram.getLength());
- assertEquals(longerMessage, recvMessage);
-
- // tricky case, added to test compatibility with RI;
- // depends on the previous test case
- sendData = veryLongMessage.getBytes();
- sendDatagram = new DatagramPacket(sendData, 0, sendData.length, group,
- PORT);
- socket.send(sendDatagram);
- recvDatagram.setLength(recvDatagram.getLength()); // !!!
- socket.receive(recvDatagram);
- recvMessage = new String(recvData, 0, recvDatagram.getLength());
- assertEquals(longerMessage, recvMessage);
-
- // tests if received packet is truncated after length was set to 1
- sendData = message.getBytes();
- sendDatagram = new DatagramPacket(sendData, 0, sendData.length,
- group, PORT);
- socket.send(sendDatagram);
- recvDatagram.setLength(1);
- socket.receive(recvDatagram);
- assertEquals("Received message was not truncated", 1,
- recvDatagram.getLength());
- assertSame("Received message is invalid", sendData[0], recvData[0]);
-
- socket.leaveGroup(group);
- socket.close();
- }
+// public void test2276() throws IOException {
+// final String ADDRESS = "239.255.2.3";
+// final int PORT = Support_PortManager.getNextPortForUDP();
+// InetAddress group = InetAddress.getByName(ADDRESS);
+// MulticastSocket socket = new MulticastSocket(PORT);
+// byte[] recvData = new byte[100];
+// DatagramPacket recvDatagram = new DatagramPacket(recvData, recvData.length);
+//
+// String message = "Hello, world!";
+// String longerMessage = message + " again.";
+// String veryLongMessage = longerMessage + " Forever!";
+//
+// socket.joinGroup(group);
+// socket.setSoTimeout(5000); // prevent eternal block in
+// // socket.receive()
+// // send & recieve packet
+// byte[] sendData = message.getBytes();
+// DatagramPacket sendDatagram = new DatagramPacket(sendData, 0,
+// sendData.length, group, PORT);
+// socket.send(sendDatagram);
+// socket.receive(recvDatagram);
+// String recvMessage = new String(recvData, 0, recvDatagram.getLength());
+// assertEquals(message, recvMessage);
+//
+// // send & receive longer packet
+// sendData = longerMessage.getBytes();
+// sendDatagram = new DatagramPacket(sendData, 0, sendData.length,
+// group, PORT);
+// socket.send(sendDatagram);
+// socket.receive(recvDatagram);
+// recvMessage = new String(recvData, 0, recvDatagram.getLength());
+// assertEquals(longerMessage, recvMessage);
+//
+// // tricky case, added to test compatibility with RI;
+// // depends on the previous test case
+// sendData = veryLongMessage.getBytes();
+// sendDatagram = new DatagramPacket(sendData, 0, sendData.length, group,
+// PORT);
+// socket.send(sendDatagram);
+// recvDatagram.setLength(recvDatagram.getLength()); // !!!
+// socket.receive(recvDatagram);
+// recvMessage = new String(recvData, 0, recvDatagram.getLength());
+// assertEquals(longerMessage, recvMessage);
+//
+// // tests if received packet is truncated after length was set to 1
+// sendData = message.getBytes();
+// sendDatagram = new DatagramPacket(sendData, 0, sendData.length,
+// group, PORT);
+// socket.send(sendDatagram);
+// recvDatagram.setLength(1);
+// socket.receive(recvDatagram);
+// assertEquals("Received message was not truncated", 1,
+// recvDatagram.getLength());
+// assertSame("Received message is invalid", sendData[0], recvData[0]);
+//
+// socket.leaveGroup(group);
+// socket.close();
+// }
/**
* @tests java.net.DatagramSocket#send(java.net.DatagramPacket)
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ExcludedProxyTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ExcludedProxyTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ExcludedProxyTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ExcludedProxyTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ExcludedProxyTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ExcludedProxyTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ExcludedProxyTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.IOException;
import java.io.InputStream;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/HttpURLConnectionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/HttpURLConnectionTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/HttpURLConnectionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/HttpURLConnectionTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.IOException;
import java.io.InputStream;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/JarURLConnectionTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/JarURLConnectionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/JarURLConnectionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/JarURLConnectionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/JarURLConnectionTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/JarURLConnectionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/JarURLConnectionTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.BufferedOutputStream;
import java.io.File;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MalformedURLExceptionTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/MalformedURLExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MalformedURLExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MalformedURLExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/MalformedURLExceptionTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/MalformedURLExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MalformedURLExceptionTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.MalformedURLException;
import java.net.URL;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/MulticastSocketTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/MulticastSocketTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/MulticastSocketTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/MulticastSocketTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.IOException;
import java.net.BindException;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NetPermissionTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/NetPermissionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NetPermissionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NetPermissionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/NetPermissionTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/NetPermissionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NetPermissionTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.NetPermission;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NetworkInterfaceTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/NetworkInterfaceTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NetworkInterfaceTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NetworkInterfaceTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/NetworkInterfaceTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/NetworkInterfaceTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NetworkInterfaceTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.InetAddress;
import java.net.NetworkInterface;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NoRouteToHostExceptionTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/NoRouteToHostExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NoRouteToHostExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NoRouteToHostExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/NoRouteToHostExceptionTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/NoRouteToHostExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/NoRouteToHostExceptionTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.NoRouteToHostException;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/PasswordAuthenticationTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/PasswordAuthenticationTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/PasswordAuthenticationTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/PasswordAuthenticationTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/PasswordAuthenticationTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/PasswordAuthenticationTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/PasswordAuthenticationTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.PasswordAuthentication;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProtocolExceptionTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ProtocolExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProtocolExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProtocolExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ProtocolExceptionTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ProtocolExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProtocolExceptionTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.ProtocolException;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ProxySelectorTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ProxySelectorTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ProxySelectorTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxySelectorTest.java Tue Jan 15 04:43:34 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.IOException;
import java.net.InetSocketAddress;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxyTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ProxyTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxyTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxyTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ProxyTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ProxyTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ProxyTest.java Tue Jan 15 04:43:34 2008
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.InetSocketAddress;
import java.net.Proxy;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ResponseCacheTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ResponseCacheTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ResponseCacheTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ResponseCacheTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ResponseCacheTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ResponseCacheTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ResponseCacheTest.java Tue Jan 15 04:43:34 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.IOException;
import java.net.CacheRequest;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SecureCacheResponseTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SecureCacheResponseTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SecureCacheResponseTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SecureCacheResponseTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SecureCacheResponseTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SecureCacheResponseTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SecureCacheResponseTest.java Tue Jan 15 04:43:34 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.IOException;
import java.io.InputStream;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ServerSocketTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ServerSocketTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/ServerSocketTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/ServerSocketTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.IOException;
import java.io.InputStream;
@@ -889,7 +889,7 @@
* @throws Exception
*/
public void test_ServerSocket_init() throws Exception {
- String[] args = new String[]{"tests.api.java.net.TestServerSocketInit"};
+ String[] args = new String[]{"org.apache.harmony.luni.tests.java.net.TestServerSocketInit"};
Support_Exec.execJava(args, null, true);
}
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketExceptionTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketExceptionTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketExceptionTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.SocketException;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketImplTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketImplTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketImplTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketImplTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketImplTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketImplTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketImplTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.FileDescriptor;
import java.io.IOException;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketPermissionTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketPermissionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketPermissionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketPermissionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketPermissionTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketPermissionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketPermissionTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.InetAddress;
import java.net.SocketPermission;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.IOException;
import java.io.InputStream;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTestCase.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketTestCase.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTestCase.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTestCase.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketTestCase.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/SocketTestCase.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/SocketTestCase.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
public abstract class SocketTestCase extends junit.framework.TestCase {
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/TestServerSocketInit.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/TestServerSocketInit.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/TestServerSocketInit.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/TestServerSocketInit.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/TestServerSocketInit.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/TestServerSocketInit.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/TestServerSocketInit.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.IOException;
import java.net.ServerSocket;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URISyntaxExceptionTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URISyntaxExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URISyntaxExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URISyntaxExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URISyntaxExceptionTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URISyntaxExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URISyntaxExceptionTest.java Tue Jan 15 04:43:34 2008
@@ -14,7 +14,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.URISyntaxException;
import java.util.Locale;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URITest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URITest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URITest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URITest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URITest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URITest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URITest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.MalformedURLException;
import java.net.URI;
@@ -84,7 +84,7 @@
/**
* @tests java.net.URI#URI(java.lang.String)
*/
- public void test_ConstructorLjava_lang_String() {
+ public void test_ConstructorLjava_lang_String() throws URISyntaxException {
// tests for public URI(String uri) throws URISyntaxException
String[] constructorTests = new String[] {
@@ -214,6 +214,37 @@
} catch (URISyntaxException e) {
}
}
+
+ // Regression test for HARMONY-23
+ try {
+ new URI("%3");
+ fail("Assert 0: URI constructor failed to throw exception on invalid input.");
+ } catch (URISyntaxException e) {
+ // Expected
+ assertEquals("Assert 1: Wrong index in URISyntaxException.", 0, e.getIndex());
+ }
+
+ // Regression test for HARMONY-25
+ // if port value is negative, the authority should be considered registry-based.
+ URI uri = new URI("http://host:-8096/path/index.html");
+ assertEquals("Assert 2: returned wrong port value,", -1, uri.getPort());
+ assertNull("Assert 3: returned wrong host value,", uri.getHost());
+ try {
+ uri.parseServerAuthority();
+ fail("Assert 4: Expected URISyntaxException");
+ } catch (URISyntaxException e){
+ // Expected
+ }
+
+ uri = new URI("http","//myhost:-8096", null);
+ assertEquals("Assert 5: returned wrong port value,", -1, uri.getPort());
+ assertNull("Assert 6: returned wrong host value,", uri.getHost());
+ try {
+ uri.parseServerAuthority();
+ fail("Assert 7: Expected URISyntaxException");
+ } catch (URISyntaxException e){
+ // Expected
+ }
}
/**
@@ -249,31 +280,24 @@
* @tests java.net.URI#URI(java.lang.String, java.lang.String,
* java.lang.String)
*/
- public void test_ConstructorLjava_lang_StringLjava_lang_StringLjava_lang_String() {
- // tests for public URI(String scheme, String ssp, String frag) throws
- // URISyntaxException
-
- URI uri;
- try {
- uri = new URI("mailto", "mduerst@ifi.unizh.ch", null);
- assertNull("wrong userinfo", uri.getUserInfo());
- assertNull("wrong hostname", uri.getHost());
- assertNull("wrong authority", uri.getAuthority());
- assertEquals("wrong port number", -1, uri.getPort());
- assertNull("wrong path", uri.getPath());
- assertNull("wrong query", uri.getQuery());
- assertNull("wrong fragment", uri.getFragment());
- assertEquals("wrong SchemeSpecificPart", "mduerst@ifi.unizh.ch",
- uri.getSchemeSpecificPart());
- } catch (URISyntaxException e) {
- fail("Unexpected Exception: " + e);
- }
+ public void test_ConstructorLjava_lang_StringLjava_lang_StringLjava_lang_String() throws URISyntaxException {
+ URI uri = new URI("mailto", "mduerst@ifi.unizh.ch", null);
+ assertNull("wrong userinfo", uri.getUserInfo());
+ assertNull("wrong hostname", uri.getHost());
+ assertNull("wrong authority", uri.getAuthority());
+ assertEquals("wrong port number", -1, uri.getPort());
+ assertNull("wrong path", uri.getPath());
+ assertNull("wrong query", uri.getQuery());
+ assertNull("wrong fragment", uri.getFragment());
+ assertEquals("wrong SchemeSpecificPart", "mduerst@ifi.unizh.ch", uri
+ .getSchemeSpecificPart());
// scheme specific part can not be null
try {
uri = new URI("mailto", null, null);
fail("Expected URISyntaxException");
} catch (URISyntaxException e) {
+ // Expected
}
// scheme needs to start with an alpha char
@@ -281,6 +305,7 @@
uri = new URI("3scheme", "//authority/path", "fragment");
fail("Expected URISyntaxException");
} catch (URISyntaxException e) {
+ // Expected
}
// scheme can not be empty string
@@ -288,6 +313,7 @@
uri = new URI("", "//authority/path", "fragment");
fail("Expected URISyntaxException");
} catch (URISyntaxException e) {
+ // Expected
}
}
@@ -1515,7 +1541,7 @@
/**
* @tests java.net.URI#relativize(java.net.URI)
*/
- public void test_relativizeLjava_net_URI() {
+ public void test_relativizeLjava_net_URI() throws URISyntaxException {
// relativization tests
String[][] relativizeData = new String[][] {
// first is base, second is the one to relativize
@@ -1564,13 +1590,33 @@
+ relativizeData[i][0] + ", " + relativizeData[i][1]
+ ": " + e);
}
- }
+ }
+
+ URI a = new URI("http://host/dir");
+ URI b = new URI("http://host/dir/file?query");
+ assertEquals("Assert 0: URI relativized incorrectly,",
+ new URI("file?query"), a.relativize(b));
+
+ // One URI with empty host
+ a = new URI("file:///~/first");
+ b = new URI("file://tools/~/first");
+ assertEquals("Assert 1: URI relativized incorrectly,",
+ new URI("file://tools/~/first"), a.relativize(b));
+ assertEquals("Assert 2: URI relativized incorrectly,",
+ new URI("file:///~/first"), b.relativize(a));
+
+ // Both URIs with empty hosts
+ b = new URI("file:///~/second");
+ assertEquals("Assert 3: URI relativized incorrectly,",
+ new URI("file:///~/second"), a.relativize(b));
+ assertEquals("Assert 4: URI relativized incorrectly,",
+ new URI("file:///~/first"), b.relativize(a));
}
/**
* @tests java.net.URI#relativize(java.net.URI)
*/
- public void test_relativize2() throws Exception {
+ public void test_relativize2() throws URISyntaxException {
URI a = new URI("http://host/dir");
URI b = new URI("http://host/dir/file?query");
assertEquals("relativized incorrectly,", new URI("file?query"), a
@@ -1590,6 +1636,20 @@
a.relativize(b));
assertEquals("relativized incorrectly,",
new URI("file:///~/dictionary"), b.relativize(a));
+
+ URI one = new URI("file:/C:/test/ws");
+ URI two = new URI("file:/C:/test/ws");
+
+ URI empty = new URI("");
+ assertEquals(empty, one.relativize(two));
+
+ one = new URI("file:/C:/test/ws");
+ two = new URI("file:/C:/test/ws/p1");
+ URI result = new URI("p1");
+ assertEquals(result, one.relativize(two));
+
+ one = new URI("file:/C:/test/ws/");
+ assertEquals(result, one.relativize(two));
}
/**
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLClassLoaderTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLClassLoaderTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLClassLoaderTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLClassLoaderTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLClassLoaderTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLClassLoaderTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLClassLoaderTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.File;
import java.io.IOException;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLConnectionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLConnectionTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLConnectionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLConnectionTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
@@ -39,8 +39,6 @@
import java.security.Permission;
import java.util.Calendar;
import java.util.GregorianCalendar;
-import java.util.HashMap;
-import java.util.Hashtable;
import java.util.List;
import java.util.Map;
import java.util.TimeZone;
@@ -70,7 +68,72 @@
fail("Exception during setup jetty : " + e.getMessage());
}
}
-
+
+ /**
+ * @tests java.net.URLConnection#addRequestProperty(String, String)
+ */
+ public void test_addRequestProperty() throws MalformedURLException,
+ IOException {
+
+ MockURLConnection u = new MockURLConnection(new URL(
+ "http://www.apache.org"));
+ try {
+ // Regression for HARMONY-604
+ u.addRequestProperty(null, "someValue");
+ fail("Expected NullPointerException");
+ } catch (NullPointerException e) {
+ // expected
+ }
+
+ u.connect();
+ try {
+ // state of connection is checked first
+ // so no NPE in case of null 'field' param
+ u.addRequestProperty(null, "someValue");
+ fail("Expected IllegalStateException");
+ } catch (IllegalStateException e) {
+ // expected
+ }
+ }
+
+ /**
+ * @tests java.net.URLConnection#setRequestProperty(String, String)
+ */
+ public void test_setRequestProperty() throws MalformedURLException,
+ IOException {
+
+ MockURLConnection u = new MockURLConnection(new URL(
+ "http://www.apache.org"));
+ try {
+ u.setRequestProperty(null, "someValue");
+ fail("Expected NullPointerException");
+ } catch (NullPointerException e) {
+ // expected
+ }
+
+ u.connect();
+ try {
+ // state of connection is checked first
+ // so no NPE in case of null 'field' param
+ u.setRequestProperty(null, "someValue");
+ fail("Expected IllegalStateException");
+ } catch (IllegalStateException e) {
+ // expected
+ }
+ }
+
+ static class MockURLConnection extends URLConnection {
+
+ public MockURLConnection(URL url) {
+ super(url);
+ }
+
+ @Override
+ public void connect() {
+ connected = true;
+ }
+ }
+
/**
* @tests java.net.URLConnection#getAllowUserInteraction()
*/
@@ -963,9 +1026,19 @@
/**
* @tests java.net.URLConnection#setAllowUserInteraction(boolean)
*/
- public void test_setAllowUserInteractionZ() {
- assertTrue("Used to test", true);
- }
+ public void test_setAllowUserInteractionZ() throws MalformedURLException {
+ // Regression for HARMONY-72
+ MockURLConnection u = new MockURLConnection(new URL(
+ "http://www.apache.org"));
+ u.connect();
+ try {
+ u.setAllowUserInteraction(false);
+ fail("Assert 0: expected an IllegalStateException");
+ } catch (IllegalStateException e) {
+ // expected
+ }
+
+ }
/**
* @tests java.net.URLConnection#setDefaultAllowUserInteraction(boolean)
@@ -1064,8 +1137,17 @@
/**
* @tests java.net.URLConnection#setUseCaches(boolean)
*/
- public void test_setUseCachesZ() {
- assertTrue("Used to test", true);
+ public void test_setUseCachesZ() throws MalformedURLException {
+ // Regression for HARMONY-71
+ MockURLConnection u = new MockURLConnection(new URL(
+ "http://www.apache.org"));
+ u.connect();
+ try {
+ u.setUseCaches(true);
+ fail("Assert 0: expected an IllegalStateException");
+ } catch (IllegalStateException e) {
+ // expected
+ }
}
/**
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLDecoderTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLDecoderTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLDecoderTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLDecoderTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLDecoderTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLDecoderTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLDecoderTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLEncoderTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLEncoderTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLEncoderTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLEncoderTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLEncoderTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLEncoderTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLEncoderTest.java Tue Jan 15 04:43:34 2008
@@ -15,44 +15,54 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
+import java.io.UnsupportedEncodingException;
import java.net.URLDecoder;
import java.net.URLEncoder;
+import junit.framework.TestCase;
import tests.support.Support_Configuration;
-public class URLEncoderTest extends junit.framework.TestCase {
+public class URLEncoderTest extends TestCase {
- /**
- * @tests java.net.URLEncoder#encode(java.lang.String)
- */
- public void test_encodeLjava_lang_String() {
- // Test for method java.lang.String
- // java.net.URLEncoder.encode(java.lang.String)
- final String URL = "http://" + Support_Configuration.HomeAddress;
- final String URL2 = "telnet://justWantToHaveFun.com:400";
- final String URL3 = "file://myServer.org/a file with spaces.jpg";
-
- assertTrue("1. Incorrect encoding/decoding", URLDecoder.decode(
- URLEncoder.encode(URL)).equals(URL));
- assertTrue("2. Incorrect encoding/decoding", URLDecoder.decode(
- URLEncoder.encode(URL2)).equals(URL2));
- assertTrue("3. Incorrect encoding/decoding", URLDecoder.decode(
- URLEncoder.encode(URL3)).equals(URL3));
- }
-
- /**
- * Sets up the fixture, for example, open a network connection. This method
- * is called before a test is executed.
- */
- protected void setUp() {
- }
-
- /**
- * Tears down the fixture, for example, close a network connection. This
- * method is called after a test is executed.
- */
- protected void tearDown() {
- }
+ /**
+ * @tests java.net.URLEncoder#encode(java.lang.String)
+ */
+ @SuppressWarnings("deprecation")
+ public void test_encodeLjava_lang_String() {
+ // Test for method java.lang.String
+ // java.net.URLEncoder.encode(java.lang.String)
+ final String URL = "http://" + Support_Configuration.HomeAddress;
+ final String URL2 = "telnet://justWantToHaveFun.com:400";
+ final String URL3 = "file://myServer.org/a file with spaces.jpg";
+
+ assertTrue("1. Incorrect encoding/decoding", URLDecoder.decode(
+ URLEncoder.encode(URL)).equals(URL));
+ assertTrue("2. Incorrect encoding/decoding", URLDecoder.decode(
+ URLEncoder.encode(URL2)).equals(URL2));
+ assertTrue("3. Incorrect encoding/decoding", URLDecoder.decode(
+ URLEncoder.encode(URL3)).equals(URL3));
+ }
+
+ /**
+ * @tests URLEncoder#encode(String, String)
+ */
+ public void test_encodeLjava_lang_StringLjava_lang_String()
+ throws Exception {
+ // Regression for HARMONY-24
+ try {
+ URLEncoder.encode("str", "unknown_enc");
+ fail("Assert 0: Should throw UEE for invalid encoding");
+ } catch (UnsupportedEncodingException e) {
+ // expected
+ }
+ // Regression for HARMONY-1233
+ try {
+ URLEncoder.encode(null, "harmony");
+ fail("NullPointerException expected");
+ } catch (NullPointerException e) {
+ // expected
+ }
+ }
}
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/URLTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/URLTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.io.File;
import java.io.FileOutputStream;
@@ -663,9 +663,8 @@
* java.lang.String)
*/
public void test_ConstructorLjava_lang_StringLjava_lang_StringLjava_lang_String()
- throws Exception {
- // Test for method java.net.URL(java.lang.String, java.lang.String,
- // java.lang.String)
+ throws MalformedURLException {
+
u = new URL("http", "www.yahoo.com", "test.html#foo");
assertEquals("http", u.getProtocol());
assertEquals("www.yahoo.com", u.getHost());
@@ -673,37 +672,45 @@
assertEquals("test.html", u.getFile());
assertEquals("foo", u.getRef());
- URL testURL = new URL("http", "www.yahoo.com:8080", "test.html#foo");
- assertEquals("http", testURL.getProtocol());
- assertEquals("[www.yahoo.com:8080]", testURL.getHost());
- assertEquals(-1, testURL.getPort());
- assertEquals("test.html", testURL.getFile());
- assertEquals("foo", testURL.getRef());
+ // Strange behavior in reference, the hostname contains a ':' so it gets
+ // wrapped in '[', ']'
+ URL testURL = new URL("http", "www.apache.org:8080", "test.html#anch");
+ assertEquals("wrong protocol", "http", testURL.getProtocol());
+ assertEquals("wrong host", "[www.apache.org:8080]", testURL.getHost());
+ assertEquals("wrong port", -1, testURL.getPort());
+ assertEquals("wrong file", "test.html", testURL.getFile());
+ assertEquals("wrong anchor", "anch", testURL.getRef());
}
/**
- * @tests java.net.URL#URL(java.lang.String, java.lang.String, int,
- * java.lang.String)
- */
- public void test_ConstructorLjava_lang_StringLjava_lang_StringILjava_lang_String() throws Exception {
- // Test for method java.net.URL(java.lang.String, java.lang.String, int,
- // java.lang.String)
- u = new URL("http", "www.yahoo.com", 8080, "test.html#foo");
- assertEquals("SSIS returns a wrong protocol",
- "http", u.getProtocol());
- assertEquals("SSIS returns a wrong host",
- "www.yahoo.com", u.getHost());
- assertEquals("SSIS returns a wrong port", 8080, u.getPort());
- assertEquals("SSIS returns a wrong file",
- "test.html", u.getFile());
- assertTrue("SSIS returns a wrong anchor: " + u.getRef(), u.getRef()
- .equals("foo"));
- }
+ * @tests java.net.URL#URL(java.lang.String, java.lang.String, int,
+ * java.lang.String)
+ */
+ public void test_ConstructorLjava_lang_StringLjava_lang_StringILjava_lang_String()
+ throws MalformedURLException {
+ u = new URL("http", "www.yahoo.com", 8080, "test.html#foo");
+ assertEquals("SSIS returns a wrong protocol", "http", u.getProtocol());
+ assertEquals("SSIS returns a wrong host", "www.yahoo.com", u.getHost());
+ assertEquals("SSIS returns a wrong port", 8080, u.getPort());
+ assertEquals("SSIS returns a wrong file", "test.html", u.getFile());
+ assertTrue("SSIS returns a wrong anchor: " + u.getRef(), u.getRef()
+ .equals("foo"));
+
+ // Regression for HARMONY-83
+ new URL("http", "apache.org", 123456789, "file");
+ try {
+ new URL("http", "apache.org", -123, "file");
+ fail("Assert 0: Negative port should throw exception");
+ } catch (MalformedURLException e) {
+ // expected
+ }
+
+ }
/**
- * @tests java.net.URL#URL(java.lang.String, java.lang.String, int,
- * java.lang.String, java.net.URLStreamHandler)
- */
+ * @tests java.net.URL#URL(java.lang.String, java.lang.String, int,
+ * java.lang.String, java.net.URLStreamHandler)
+ */
public void test_ConstructorLjava_lang_StringLjava_lang_StringILjava_lang_StringLjava_net_URLStreamHandler() throws Exception {
// Test for method java.net.URL(java.lang.String, java.lang.String, int,
// java.lang.String, java.net.URLStreamHandler)
@@ -896,7 +903,7 @@
assertTrue("openStream succeeded for non existent resource",
exception);
- int port = Support_Jetty.startHttpServerWithDocRoot("./src/test/resources/tests/api/java/net/");
+ int port = Support_Jetty.startHttpServerWithDocRoot("./src/test/resources/org/apache/harmony/luni/tests/java/net/");
URL u = new URL("jar:" + "http://localhost:" + port
+ "/lf.jar!/plus.bmp");
InputStream in = u.openStream();
@@ -1013,9 +1020,11 @@
/**
* @tests java.net.URL#getHost()
*/
- public void test_getHost() {
- // Test for method java.lang.String java.net.URL.getHost()
- assertTrue("Used to test", true);
+ public void test_getHost() throws MalformedURLException {
+ // Regression for HARMONY-60
+ String ipv6Host = "FEDC:BA98:7654:3210:FEDC:BA98:7654:3210";
+ URL url = new URL("http", ipv6Host, -1, "myfile");
+ assertEquals(("[" + ipv6Host + "]"), url.getHost());
}
/**
@@ -1394,6 +1403,26 @@
fail("Should throw SecurityException.");
} catch (SecurityException e) {
// expected;
+ }
+ }
+
+ /**
+ * @tests java.net.URL#URL(String, String, String)
+ */
+ public void test_java_protocol_handler_pkgs_prop() throws MalformedURLException {
+ // Regression test for Harmony-3094
+ final String HANDLER_PKGS = "java.protocol.handler.pkgs";
+ String pkgs = System.getProperty(HANDLER_PKGS);
+ System.setProperty(HANDLER_PKGS, "fake|org.apache.harmony.luni.tests.java.net");
+
+ try {
+ new URL("test_protocol", "", "fake.jar");
+ } finally {
+ if (pkgs == null) {
+ System.clearProperty(HANDLER_PKGS);
+ } else {
+ System.setProperty(HANDLER_PKGS, pkgs);
+ }
}
}
}
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/UnknownHostExceptionTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/UnknownHostExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/UnknownHostExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/UnknownHostExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/UnknownHostExceptionTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/UnknownHostExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/UnknownHostExceptionTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
public class UnknownHostExceptionTest extends junit.framework.TestCase {
Copied: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/UnknownServiceExceptionTest.java (from r611789, harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/UnknownServiceExceptionTest.java)
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/UnknownServiceExceptionTest.java?p2=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/UnknownServiceExceptionTest.java&p1=harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/UnknownServiceExceptionTest.java&r1=611789&r2=612106&rev=612106&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/tests/api/java/net/UnknownServiceExceptionTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/net/UnknownServiceExceptionTest.java Tue Jan 15 04:43:34 2008
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package tests.api.java.net;
+package org.apache.harmony.luni.tests.java.net;
import java.net.URL;
import java.net.UnknownServiceException;