3789983e89
Reviewed-by: darcy, ihse
100 lines
3.8 KiB
Java
100 lines
3.8 KiB
Java
/*
|
|
* Copyright (c) 2009, 2016, 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 6868539 6868548 8035364
|
|
* @summary javap should use current names for constant pool entries,
|
|
* remove spurious ';' from constant pool entries
|
|
* @modules jdk.jdeps/com.sun.tools.javap
|
|
*/
|
|
|
|
import java.io.*;
|
|
import java.util.*;
|
|
|
|
public class T6868539
|
|
|
|
{
|
|
public static void main(String... args) {
|
|
new T6868539().run();
|
|
}
|
|
|
|
void run() {
|
|
String output = javap("T6868539");
|
|
verify(output, "Utf8 +java/lang/String"); // 1: Utf8
|
|
// 2: currently unused
|
|
verify(output, "Integer +123456"); // 3: Integer
|
|
verify(output, "Float +123456.0f"); // 4: Float
|
|
verify(output, "Long +123456l"); // 5: Long
|
|
verify(output, "Double +123456.0d"); // 6: Double
|
|
verify(output, "Class +#[0-9]+ +// +T6868539"); // 7: Class
|
|
verify(output, "String +#[0-9]+ +// +not found"); // 8: String
|
|
verify(output, "Fieldref +#[0-9]+\\.#[0-9]+ +// +T6868539.errors:I"); // 9: Fieldref
|
|
verify(output, "Methodref +#[0-9]+\\.#[0-9]+ +// +T6868539.run:\\(\\)V"); // 10: Methodref
|
|
verify(output, "InterfaceMethodref +#[0-9]+\\.#[0-9]+ +// +java/lang/Runnable\\.run:\\(\\)V");
|
|
// 11: InterfaceMethodref
|
|
verify(output, "NameAndType +#[0-9]+:#[0-9]+ +// +run:\\(\\)V"); // 12: NameAndType
|
|
if (errors > 0)
|
|
throw new Error(errors + " found.");
|
|
}
|
|
|
|
String notFound = " not found";
|
|
|
|
void verify(String output, String... expects) {
|
|
for (String expect: expects) {
|
|
if (!output.matches("(?s).*" + expect + ".*"))
|
|
error(expect + notFound);
|
|
}
|
|
}
|
|
|
|
void error(String msg) {
|
|
System.err.println(msg);
|
|
errors++;
|
|
}
|
|
|
|
int errors;
|
|
|
|
String javap(String className) {
|
|
String testClasses = System.getProperty("test.classes", ".");
|
|
StringWriter sw = new StringWriter();
|
|
PrintWriter out = new PrintWriter(sw);
|
|
String[] args = { "-v", "-classpath", testClasses, className };
|
|
int rc = com.sun.tools.javap.Main.run(args, out);
|
|
if (rc != 0)
|
|
throw new Error("javap failed. rc=" + rc);
|
|
out.close();
|
|
String output = sw.toString();
|
|
System.out.println("class " + className);
|
|
System.out.println(output);
|
|
return output;
|
|
}
|
|
|
|
int i = 123456;
|
|
float f = 123456.f;
|
|
double d = 123456.;
|
|
long l = 123456L;
|
|
|
|
void m(Runnable r) { r.run(); }
|
|
}
|
|
|