Changeset 406 for trunk/openjdk/jdk/test

Timestamp:

Dec 21, 2012, 10:37:13 AM (13 years ago)

Author:

dmik

Message:

trunk: Merged in openjdk6 b27 from branches/vendor/oracle.

Location:

trunk/openjdk

Files:

• . (modified) (1 prop)
• jdk/test/java/awt/Dialog/CrashXCheckJni (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/java/awt/Dialog/CrashXCheckJni )
• jdk/test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java )
• jdk/test/java/net/Socket/setReuseAddress/Basic.java (modified) (3 diffs)
• jdk/test/java/net/Socket/setReuseAddress/Restart.java (modified) (3 diffs)
• jdk/test/java/util/UUID/UUIDTest.java (modified) (3 diffs)
• jdk/test/javax/crypto/CipherSpi (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/javax/crypto/CipherSpi )
• jdk/test/javax/crypto/CipherSpi/DirectBBRemaining.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/javax/crypto/CipherSpi/DirectBBRemaining.java )
• jdk/test/javax/swing/plaf/synth/7143614 (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/javax/swing/plaf/synth/7143614 )
• jdk/test/javax/swing/plaf/synth/7143614/bug7143614.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/javax/swing/plaf/synth/7143614/bug7143614.java )
• jdk/test/sun/security/x509/X509CRLImpl/OrderAndDup.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/sun/security/x509/X509CRLImpl/OrderAndDup.java )
• jdk/test/sun/tools/native2ascii/Permission.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/sun/tools/native2ascii/Permission.java )
• jdk/test/tools/jar/UpdateJar.java (copied) (copied from branches/vendor/oracle/openjdk6/b27/jdk/test/tools/jar/UpdateJar.java )

trunk/openjdk/jdk/test/java/net/Socket/setReuseAddress/Basic.java

@@ -1 +1 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -24 +24 @@
 /*
  * @test
- * @bug 4476378
+ * @bug 4476378 7123896
  * @summary Check the specific behaviour of the setReuseAddress(boolean)
  * method.
+ * @run main Basic
+ * @run main/othervm -Dsun.net.useExclusiveBind Basic
  */
 import java.net.*;
@@ -171 +173 @@
             passed();
         } catch (BindException e) {
-            failed();
+            if (System.getProperty("sun.net.useExclusiveBind") != null) {
+                // exclusive bind enabled - expected result
+                passed();
+            } else {
+                failed();
+            }
         }
         s2.close();

trunk/openjdk/jdk/test/java/net/Socket/setReuseAddress/Restart.java

@@ -1 +1 @@
 /*
- * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -24 +24 @@
 /*
  * @test
- * @bug 4476378
- * @summary Check that SO_REUSEADDR allows a server to restart
+ * @bug 4476378 7123896
+ * @summary Check that SO_REUSEADDR allows a server to restart 
  *          after a crash.
+ * @run main Restart
+ * @run main/othervm -Dsun.net.useExclusiveBind Restart
  */
 import java.net.*;
@@ -40 +42 @@
 
     public static void main(String args[]) throws Exception {
+        ServerSocket ss = new ServerSocket(0);
+        Socket s1 = null, s2 = null;
+        try {
+            int port = ss.getLocalPort();
 
-        InetSocketAddress isa = new InetSocketAddress(0);
-        ServerSocket ss = new ServerSocket();
-        ss.bind(isa);
+            s1 = new Socket(InetAddress.getLocalHost(), port);
+            s2 = ss.accept();
 
-        int port = ss.getLocalPort();
+            // close server socket and the accepted connection
+            ss.close();
+            s2.close();
 
-        Socket s1 = new Socket(InetAddress.getLocalHost(), port);
-        Socket s2 = ss.accept();
+            ss = new ServerSocket();
+            ss.bind( new InetSocketAddress(port) );
+            ss.close();
 
-        // close server socket and the accepted connection
-        ss.close();
-        s2.close();
-
-        boolean failed = false;
-
-        ss = new ServerSocket();
-        ss.bind( new InetSocketAddress(port) );
-        ss.close();
-
-        // close the client socket
-        s1.close();
+            // close the client socket
+            s1.close();
+        } catch (BindException be) {
+            if (System.getProperty("sun.net.useExclusiveBind") != null) {
+                // exclusive bind, expected exception
+            } else {
+                throw be;
+            }
+        } finally {
+            if (ss != null) ss.close();
+            if (s1 != null) s1.close();
+            if (s2 != null) s2.close();
+        }
     }
 }

trunk/openjdk/jdk/test/java/util/UUID/UUIDTest.java

@@ -1 +1 @@
 /*
- * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2012, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
@@ -61 +61 @@
         for (int i=0; i<100; i++) {
             UUID u1 = UUID.randomUUID();
+            if(4 != u1.version())
+                throw new Exception("bad version");
+            if(2 != u1.variant())
+                throw new Exception("bad variant");
             if (list.contains(u1))
                 throw new Exception("random UUID collision very unlikely");
@@ -73 +77 @@
         for (int i=0; i<100; i++) {
             byteSource.nextBytes(someBytes);
-            UUID test = UUID.nameUUIDFromBytes(someBytes);
-            if (list.contains(test))
+            UUID u1 = UUID.nameUUIDFromBytes(someBytes);
+            if(3 != u1.version())
+                throw new Exception("bad version");
+            if(2 != u1.variant())
+                throw new Exception("bad variant");
+            if (list.contains(u1))
                 throw new Exception("byte UUID collision very unlikely");
-            list.add(test);
+            list.add(u1);
         }
     }