test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java

*** 30,51 ****
   * @library ../../../../testlibrary
   * @build Echo
   * @build EchoImpl
   * @build EchoImpl_Stub
   * @build UseCustomSocketFactory
   * @run main/othervm/policy=security.policy/timeout=360 UseCustomSocketFactory
   */
  
  import java.io.*;
  import java.rmi.*;
  import java.rmi.activation.*;
  import java.rmi.server.*;
  import java.rmi.registry.*;
  
  public class UseCustomSocketFactory {
  
-     final static int REGISTRY_PORT = 2006;
      static String[] protocol = new String[] { "", "compress", "xor" };
  
      public static void main(String[] args) {
  
          System.out.println("\nRegression test for bug 4115696\n");
--- 30,52 ----
   * @library ../../../../testlibrary
   * @build Echo
   * @build EchoImpl
   * @build EchoImpl_Stub
   * @build UseCustomSocketFactory
+  * @build TestLibrary
   * @run main/othervm/policy=security.policy/timeout=360 UseCustomSocketFactory
   */
  
  import java.io.*;
  import java.rmi.*;
  import java.rmi.activation.*;
  import java.rmi.server.*;
  import java.rmi.registry.*;
  
  public class UseCustomSocketFactory {
+     static final int REGISTRY_PORT = TestLibrary.getUnusedRandomPort();
  
      static String[] protocol = new String[] { "", "compress", "xor" };
  
      public static void main(String[] args) {
  
          System.out.println("\nRegression test for bug 4115696\n");
*** 66,96 ****
                  "-C-Djava.security.policy=" +
                      TestParams.defaultGroupPolicy +
                      " -C-Djava.security.manager=java.rmi.RMISecurityManager "});
              rmid.start();
  
!             Echo[] echo = spawnAndTest();
              reactivateAndTest(echo);
          } catch (IOException e) {
              TestLibrary.bomb("creating rmid", e);
          } finally {
              if (rmid != null)
                  rmid.destroy();
          }
      }
  
!     private static Echo[] spawnAndTest() {
  
          System.err.println("\nCreate Test-->");
  
          Echo[] echo = new Echo[protocol.length];
  
          for (int i = 0; i < protocol.length; i++) {
- 
              JavaVM serverVM = new JavaVM("EchoImpl",
                                           "-Djava.security.policy=" +
!                                          TestParams.defaultPolicy,
                                           protocol[i]);
  
              System.err.println("\nusing protocol: " +
                                 (protocol[i] == "" ? "none" : protocol[i]));
  
--- 67,100 ----
                  "-C-Djava.security.policy=" +
                      TestParams.defaultGroupPolicy +
                      " -C-Djava.security.manager=java.rmi.RMISecurityManager "});
              rmid.start();
  
!             Echo[] echo = spawnAndTest(rmid.getPort());
              reactivateAndTest(echo);
          } catch (IOException e) {
              TestLibrary.bomb("creating rmid", e);
          } finally {
              if (rmid != null)
                  rmid.destroy();
          }
      }
  
!     private static Echo[] spawnAndTest(int rmidPort) {
  
          System.err.println("\nCreate Test-->");
  
          Echo[] echo = new Echo[protocol.length];
  
          for (int i = 0; i < protocol.length; i++) {
              JavaVM serverVM = new JavaVM("EchoImpl",
                                           "-Djava.security.policy=" +
!                                          TestParams.defaultPolicy +
!                                          " -Drmi.registry.port=" +
!                                          REGISTRY_PORT +
!                                          " -Djava.rmi.activation.port=" +
!                                          rmidPort,
                                           protocol[i]);
  
              System.err.println("\nusing protocol: " +
                                 (protocol[i] == "" ? "none" : protocol[i]));