stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

6937244: sqe ws7 tools javap/javap_t10a fail jdk7 b80 used output of javap is changed

Browse Source 
Reviewed-by: darcy
This commit is contained in:
Jonathan Gibbons 2010-03-23 18:05:54 -07:00
parent 9eec6f646a
commit 624b674ca3
3 changed files with 159 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
langtools/src/share/classes/com/sun/tools/javap/ClassWriter.java
View File

@ -225,15 +225,15 @@ public class ClassWriter extends BasicWriter {
writeModifiers(flags.getFieldModifiers());
Signature_attribute sigAttr = getSignature(f.attributes);
if (sigAttr == null)
print(getFieldType(f.descriptor));
print(getJavaFieldType(f.descriptor));
else {
try {
Type t = sigAttr.getParsedSignature().getType(constant_pool);
print(t);
print(getJavaName(t.toString()));
} catch (ConstantPoolException e) {
// report error?
// fall back on non-generic descriptor
print(getFieldType(f.descriptor));
print(getJavaFieldType(f.descriptor));
}
}
print(" ");
@ -314,14 +314,14 @@ public class ClassWriter extends BasicWriter {
}
if (getName(m).equals("<init>")) {
print(getJavaName(classFile));
print(getParameterTypes(d, flags));
print(getJavaParameterTypes(d, flags));
} else if (getName(m).equals("<clinit>")) {
print("{}");
} else {
print(getReturnType(d));
print(getJavaReturnType(d));
print(" ");
print(getName(m));
print(getParameterTypes(d, flags));
print(getJavaParameterTypes(d, flags));
}
Attribute e_attr = m.attributes.get(Attribute.Exceptions);
@ -460,9 +460,9 @@ public class ClassWriter extends BasicWriter {
}
}
String getFieldType(Descriptor d) {
String getJavaFieldType(Descriptor d) {
try {
return d.getFieldType(constant_pool);
return getJavaName(d.getFieldType(constant_pool));
} catch (ConstantPoolException e) {
return report(e);
} catch (DescriptorException e) {
@ -470,9 +470,9 @@ public class ClassWriter extends BasicWriter {
}
}
String getReturnType(Descriptor d) {
String getJavaReturnType(Descriptor d) {
try {
return d.getReturnType(constant_pool);
return getJavaName(d.getReturnType(constant_pool));
} catch (ConstantPoolException e) {
return report(e);
} catch (DescriptorException e) {
@ -480,9 +480,9 @@ public class ClassWriter extends BasicWriter {
}
}
String getParameterTypes(Descriptor d, AccessFlags flags) {
String getJavaParameterTypes(Descriptor d, AccessFlags flags) {
try {
return adjustVarargs(flags, d.getParameterTypes(constant_pool));
return getJavaName(adjustVarargs(flags, d.getParameterTypes(constant_pool)));
} catch (ConstantPoolException e) {
return report(e);
} catch (DescriptorException e) {

57
langtools/test/tools/javap/6937244/T6937244.java Normal file
View File

@ -0,0 +1,57 @@
/*
* Copyright 2010 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6937244
* @summary fields display with JVMS names, not Java names
*/
import java.io.*;
public class T6937244 {
public static void main(String[] args) throws Exception {
new T6937244().run();
}
void run() throws Exception {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
String[] args = { "java.lang.String" };
int rc = com.sun.tools.javap.Main.run(args, pw);
pw.close();
String out = sw.toString();
System.err.println(out);
if (rc != 0)
throw new Exception("unexpected exit from javap: " + rc);
for (String line: out.split("[\r\n]+")) {
if (line.contains("CASE_INSENSITIVE_ORDER")) {
if (line.matches("\\s*\\Qpublic static final java.util.Comparator<java.lang.String> CASE_INSENSITIVE_ORDER;\\E\\s*"))
return;
throw new Exception("declaration not shown as expected");
}
}
throw new Exception("declaration of CASE_INSENSITIVE_ORDER not found");
}
}

90
langtools/test/tools/javap/6937244/T6937244A.java Normal file
View File

@ -0,0 +1,90 @@
/*
* Copyright 2010 Sun Microsystems, Inc. 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 Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
* CA 95054 USA or visit www.sun.com if you need additional information or
* have any questions.
*/
/*
* @test
* @bug 6937244
* @summary fields display with JVMS names, not Java names
*/
import java.io.*;
import java.util.*;
public class T6937244A {
public static void main(String[] args) throws Exception {
new T6937244A().run();
}
void run() throws Exception {
StringWriter sw = new StringWriter();
PrintWriter pw = new PrintWriter(sw);
String[] args = { "Test" };
int rc = com.sun.tools.javap.Main.run(args, pw);
pw.close();
String out = sw.toString();
System.err.println(out);
if (rc != 0)
throw new Exception("unexpected exit from javap: " + rc);
int count = 0;
for (String line: out.split("[\r\n]+")) {
if (line.contains("extends")) {
verify(line, "extends java.lang.Object implements java.util.List<java.lang.String>");
count++;
}
if (line.contains("field")) {
verify(line, "java.util.List<java.lang.String> field");
count++;
}
if (line.contains("method")) {
verify(line, "java.util.List<java.lang.String> method(java.util.List<java.lang.String>) throws java.lang.Exception");
count++;
}
}
// final backstop check
if (out.contains("/"))
throw new Exception("unexpected \"/\" in output");
if (count != 3)
throw new Exception("wrong number of matches found: " + count);
}
void verify(String line, String expect) throws Exception {
if (!line.contains(expect)) {
System.err.println("line: " + line);
System.err.println("expect: " + expect);
throw new Exception("expected string not found in line");
}
}
}
abstract class Test implements List<String> {
public List<String> field;
public List<String> method(List<String> arg) throws Exception { return null; }
}