1.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
1.2 +++ b/test/tools/javap/T6868539.java Sat Aug 08 17:56:37 2009 -0700
1.3 @@ -0,0 +1,96 @@
1.4 +/*
1.5 + * Copyright 2009 Sun Microsystems, Inc. All Rights Reserved.
1.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
1.7 + *
1.8 + * This code is free software; you can redistribute it and/or modify it
1.9 + * under the terms of the GNU General Public License version 2 only, as
1.10 + * published by the Free Software Foundation.
1.11 + *
1.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
1.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
1.14 + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
1.15 + * version 2 for more details (a copy is included in the LICENSE file that
1.16 + * accompanied this code).
1.17 + *
1.18 + * You should have received a copy of the GNU General Public License version
1.19 + * 2 along with this work; if not, write to the Free Software Foundation,
1.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
1.21 + *
1.22 + * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
1.23 + * CA 95054 USA or visit www.sun.com if you need additional information or
1.24 + * have any questions.
1.25 + */
1.26 +
1.27 +/*
1.28 + * @test
1.29 + * @bug 6868539 6868548
1.30 + * @summary javap should use current names for constant pool entries,
1.31 + * remove spurious ';' from constant pool entries
1.32 + */
1.33 +
1.34 +import java.io.*;
1.35 +import java.util.*;
1.36 +
1.37 +public class T6868539
1.38 +
1.39 +{
1.40 + public static void main(String... args) {
1.41 + new T6868539().run();
1.42 + }
1.43 +
1.44 + void run() {
1.45 + verify("T6868539", "Utf8 +java/lang/String"); // 1: Utf8
1.46 + // 2: currently unused
1.47 + verify("T6868539", "Integer +123456"); // 3: Integer
1.48 + verify("T6868539", "Float +123456.0f"); // 4: Float
1.49 + verify("T6868539", "Long +123456l"); // 5: Long
1.50 + verify("T6868539", "Double +123456.0d"); // 6: Double
1.51 + verify("T6868539", "Class +#[0-9]+ +// + T6868539"); // 7: Class
1.52 + verify("T6868539", "String +#[0-9]+ +// + not found"); // 8: String
1.53 + verify("T6868539", "Fieldref +#[0-9]+\\.#[0-9]+ +// +T6868539.errors:I"); // 9: Fieldref
1.54 + verify("T6868539", "Methodref +#[0-9]+\\.#[0-9]+ +// +T6868539.run:\\(\\)V"); // 10: Methodref
1.55 + verify("T6868539", "InterfaceMethodref +#[0-9]+\\.#[0-9]+ +// +java/lang/Runnable\\.run:\\(\\)V");
1.56 + // 11: InterfaceMethodref
1.57 + verify("T6868539", "NameAndType +#[0-9]+:#[0-9]+ +// +run:\\(\\)V"); // 12: NameAndType
1.58 + if (errors > 0)
1.59 + throw new Error(errors + " found.");
1.60 + }
1.61 +
1.62 + void verify(String className, String... expects) {
1.63 + String output = javap(className);
1.64 + for (String expect: expects) {
1.65 + if (!output.matches("(?s).*" + expect + ".*"))
1.66 + error(expect + " not found");
1.67 + }
1.68 + }
1.69 +
1.70 + void error(String msg) {
1.71 + System.err.println(msg);
1.72 + errors++;
1.73 + }
1.74 +
1.75 + int errors;
1.76 +
1.77 + String javap(String className) {
1.78 + String testClasses = System.getProperty("test.classes", ".");
1.79 + StringWriter sw = new StringWriter();
1.80 + PrintWriter out = new PrintWriter(sw);
1.81 + String[] args = { "-v", "-classpath", testClasses, className };
1.82 + int rc = com.sun.tools.javap.Main.run(args, out);
1.83 + if (rc != 0)
1.84 + throw new Error("javap failed. rc=" + rc);
1.85 + out.close();
1.86 + String output = sw.toString();
1.87 + System.out.println("class " + className);
1.88 + System.out.println(output);
1.89 + return output;
1.90 + }
1.91 +
1.92 + int i = 123456;
1.93 + float f = 123456.f;
1.94 + double d = 123456.;
1.95 + long l = 123456L;
1.96 +
1.97 + void m(Runnable r) { r.run(); }
1.98 +}
1.99 +
