From f0f5b3aa50b43d2c3ba4b3dfcaeb7f8cb1e54c4f Mon Sep 17 00:00:00 2001 From: Stuart Marks Date: Thu, 20 Feb 2014 21:36:02 -0800 Subject: [PATCH] 8027810: RMI CheckUsage tests should be deleted Reviewed-by: mchung --- .../rmi/activation/checkusage/CheckUsage.java | 67 ------------------- .../rmi/registry/checkusage/CheckUsage.java | 67 ------------------- 2 files changed, 134 deletions(-) delete mode 100644 jdk/test/java/rmi/activation/checkusage/CheckUsage.java delete mode 100644 jdk/test/java/rmi/registry/checkusage/CheckUsage.java diff --git a/jdk/test/java/rmi/activation/checkusage/CheckUsage.java b/jdk/test/java/rmi/activation/checkusage/CheckUsage.java deleted file mode 100644 index c114928d201..00000000000 --- a/jdk/test/java/rmi/activation/checkusage/CheckUsage.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * 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 - */ - -import java.io.ByteArrayOutputStream; - -/** - * 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) { - try { - ByteArrayOutputStream berr = new ByteArrayOutputStream(); - - // create rmid with incorrect command line args - JavaVM rmidVM = new JavaVM("sun.rmi.server.Activation", "", "foo", - System.out, berr); - System.err.println("starting rmid"); - - // run the subprocess and wait for it to exit - int rmidVMExitStatus = rmidVM.execute(); - System.err.println("rmid exited with status: " + - rmidVMExitStatus); - - String usage = new String(berr.toByteArray()); - - System.err.println("rmid usage: " + usage); - - if (usage.indexOf("-J") < 0) { - TestLibrary.bomb("rmid has incorrect usage message"); - } else { - System.err.println("test passed"); - } - } catch (Exception e) { - TestLibrary.bomb(e); - } - } -} diff --git a/jdk/test/java/rmi/registry/checkusage/CheckUsage.java b/jdk/test/java/rmi/registry/checkusage/CheckUsage.java deleted file mode 100644 index 88d9a900cdd..00000000000 --- a/jdk/test/java/rmi/registry/checkusage/CheckUsage.java +++ /dev/null @@ -1,67 +0,0 @@ -/* - * 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. - * - * This code is distributed in the hope that it will be useful, but WITHOUT - * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or - * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License - * version 2 for more details (a copy is included in the LICENSE file that - * accompanied this code). - * - * You should have received a copy of the GNU General Public License version - * 2 along with this work; if not, write to the Free Software Foundation, - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. - * - * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA - * or visit www.oracle.com if you need additional information or have any - * questions. - */ - -/* @test - * @bug 4151966 - * @summary rmiregistry error message obsure; internationalize rmiregistry - * @author Laird Dornin - * - * @library ../../testlibrary - * @build TestLibrary JavaVM - * @run main/othervm CheckUsage - */ - -import java.io.ByteArrayOutputStream; - -/** - * Make sure that the rmiregistry prints out a correct usage statement - * when run with an incorrect command line. - */ -public class CheckUsage { - public static void main(String[] args) { - - try { - ByteArrayOutputStream berr = new ByteArrayOutputStream(); - - // run a VM to start the registry - JavaVM registryVM = new JavaVM("sun.rmi.registry.RegistryImpl", - "", "foo", - System.out, berr); - System.err.println("starting registry"); - System.err.println(" registry exited with status: " + - registryVM.execute()); - - String usage = new String(berr.toByteArray()); - - System.err.println("rmiregistry usage: " + usage); - - if (usage.indexOf("-J") < 0) { - TestLibrary.bomb("rmiregistry has incorrect usage statement"); - } else { - System.err.println("test passed"); - } - } catch (Exception e) { - TestLibrary.bomb(e); - } - } -}