jdk-sandbox: comparison jdk/test/java/rmi/activation/checkusage/CheckUsage.java

equal deleted inserted replaced

-:cf5d2d5094cc
+:796ffc400e9e
 /*
-* Copyright (c) 1999, 2012, Oracle and/or its affiliates. All rights reserved.
+* Copyright (c) 1999, 2013, Oracle and/or its affiliates. All rights reserved.
 * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
 *
 * This code is free software; you can redistribute it and/or modify it
 * under the terms of the GNU General Public License version 2 only, as
 * published by the Free Software Foundation.
 * questions.
 */
 /* @test
 * @bug 4259564
+* @summary RMID's usage message is incomplete and inconsistent with other tools
 *
 * @library ../../testlibrary
 * @build TestLibrary JavaVM
 * @run main/othervm CheckUsage
 */
 * Make sure that rmid prints out a correct usage statement when run with an
 * incorrect command line.
 */
 public class CheckUsage {
 public static void main(String[] args) {
-System.err.println("\nregression test for 4259564\n");
-JavaVM rmidVM = null;
 try {
-// make sure the registry exits with a proper usage statement
 ByteArrayOutputStream berr = new ByteArrayOutputStream();
-// run a VM to start the registry
+// create rmid with incorrect command line args
-rmidVM = new JavaVM("sun.rmi.server.Activation", "", "foo",
+JavaVM rmidVM = new JavaVM("sun.rmi.server.Activation", "", "foo",
 System.out, berr);
 System.err.println("starting rmid");
-rmidVM.start();
-// wait for registry exit
+// run the subprocess and wait for it to exit
-int rmidVMExitStatus = rmidVM.getVM().waitFor();
+int rmidVMExitStatus = rmidVM.execute();
 System.err.println("rmid exited with status: " +
 rmidVMExitStatus);
 String usage = new String(berr.toByteArray());
 if (usage.indexOf("-J<runtime flag>") < 0) {
 TestLibrary.bomb("rmid has incorrect usage message");
 } else {
 System.err.println("test passed");
 }
 } catch (Exception e) {
 TestLibrary.bomb(e);
-} finally {
-rmidVM.destroy();
-rmidVM = null;
 }
 }
 }

changeset 15005	796ffc400e9e
parent 14778	5947768d173d