Fri, 30 Oct 2009 10:55:00 -0700
Added tag jdk7-b75 for changeset 2485f5641ed0
jjg@46 | 1 | /* |
jjg@46 | 2 | * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved. |
jjg@46 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
jjg@46 | 4 | * |
jjg@46 | 5 | * This code is free software; you can redistribute it and/or modify it |
jjg@46 | 6 | * under the terms of the GNU General Public License version 2 only, as |
jjg@46 | 7 | * published by the Free Software Foundation. |
jjg@46 | 8 | * |
jjg@46 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
jjg@46 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
jjg@46 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
jjg@46 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
jjg@46 | 13 | * accompanied this code). |
jjg@46 | 14 | * |
jjg@46 | 15 | * You should have received a copy of the GNU General Public License version |
jjg@46 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
jjg@46 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
jjg@46 | 18 | * |
jjg@46 | 19 | * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara, |
jjg@46 | 20 | * CA 95054 USA or visit www.sun.com if you need additional information or |
jjg@46 | 21 | * have any questions. |
jjg@46 | 22 | */ |
jjg@46 | 23 | |
jjg@46 | 24 | /* |
jjg@46 | 25 | * @test |
jjg@46 | 26 | * @bug 4501660 |
jjg@46 | 27 | * @summary change diagnostic of -help as 'print this help message and exit' |
jjg@46 | 28 | * (actually, verify -help does not cause premature exit) |
jjg@46 | 29 | */ |
jjg@46 | 30 | |
jjg@46 | 31 | import java.io.*; |
jjg@46 | 32 | import java.util.zip.*; |
jjg@46 | 33 | |
jjg@46 | 34 | public class T4501660 { |
jjg@46 | 35 | public static void main(String[] args) throws Exception { |
jjg@46 | 36 | new T4501660().run(); |
jjg@46 | 37 | } |
jjg@46 | 38 | |
jjg@46 | 39 | public void run() throws IOException { |
jjg@46 | 40 | String testClasses = System.getProperty("test.classes", "."); |
jjg@46 | 41 | String output = javap("-classpath", testClasses, "-help", "T4501660"); |
jjg@46 | 42 | verify(output, |
jjg@46 | 43 | "-public", "-protected", "-private", // check -help output is present |
jjg@46 | 44 | "class T4501660" // check class output is present |
jjg@46 | 45 | ); |
jjg@46 | 46 | |
jjg@46 | 47 | if (errors > 0) |
jjg@46 | 48 | throw new Error(errors + " found."); |
jjg@46 | 49 | } |
jjg@46 | 50 | |
jjg@46 | 51 | String javap(String... args) { |
jjg@46 | 52 | StringWriter sw = new StringWriter(); |
jjg@46 | 53 | PrintWriter out = new PrintWriter(sw); |
jjg@46 | 54 | //sun.tools.javap.Main.entry(args); |
jjg@46 | 55 | int rc = com.sun.tools.javap.Main.run(args, out); |
jjg@46 | 56 | if (rc != 0) |
jjg@46 | 57 | throw new Error("javap failed. rc=" + rc); |
jjg@46 | 58 | out.close(); |
jjg@46 | 59 | System.out.println(sw); |
jjg@46 | 60 | return sw.toString(); |
jjg@46 | 61 | } |
jjg@46 | 62 | |
jjg@46 | 63 | void verify(String output, String... expects) { |
jjg@46 | 64 | for (String expect: expects) { |
jjg@46 | 65 | if (output.indexOf(expect)< 0) |
jjg@46 | 66 | error(expect + " not found"); |
jjg@46 | 67 | } |
jjg@46 | 68 | } |
jjg@46 | 69 | |
jjg@46 | 70 | void error(String msg) { |
jjg@46 | 71 | System.err.println(msg); |
jjg@46 | 72 | errors++; |
jjg@46 | 73 | } |
jjg@46 | 74 | |
jjg@46 | 75 | int errors; |
jjg@46 | 76 | } |