Mercurial > hg > openjdk > jigsaw > jdk
changeset 7041:0e93015e77f6
7140852: Add test for 7022100
Reviewed-by: sspitsyn, coleenp
author | stefank |
---|---|
date | Tue, 22 Jan 2013 15:25:37 +0100 |
parents | c6d77b2b4478 |
children | 63fe6a9820b6 9f9dac5a9e74 |
files | test/java/lang/instrument/RedefineMethodWithAnnotations.sh test/java/lang/instrument/RedefineMethodWithAnnotationsAgent.java test/java/lang/instrument/RedefineMethodWithAnnotationsAnnotations.java test/java/lang/instrument/RedefineMethodWithAnnotationsApp.java test/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java test/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java |
diffstat | 6 files changed, 341 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/lang/instrument/RedefineMethodWithAnnotations.sh Tue Jan 22 15:25:37 2013 +0100 @@ -0,0 +1,85 @@ +# +# Copyright (c) 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 7022100 +# @summary Method annotations are incorrectly set when redefining classes. +# @author Stefan Karlsson +# +# @run shell MakeJAR3.sh RedefineMethodWithAnnotationsAgent 'Can-Redefine-Classes: true' +# @run build RedefineMethodWithAnnotationsTarget RedefineMethodWithAnnotationsApp RedefineMethodWithAnnotationsAnnotations +# @run shell RedefineMethodWithAnnotations.sh +# + +if [ "${TESTJAVA}" = "" ] +then + echo "TESTJAVA not set. Test cannot execute. Failed." + exit 1 +fi + +if [ "${COMPILEJAVA}" = "" ] +then + COMPILEJAVA="${TESTJAVA}" +fi +echo "COMPILEJAVA=${COMPILEJAVA}" + +if [ "${TESTSRC}" = "" ] +then + echo "TESTSRC not set. Test cannot execute. Failed." + exit 1 +fi + +if [ "${TESTCLASSES}" = "" ] +then + echo "TESTCLASSES not set. Test cannot execute. Failed." + exit 1 +fi + +JAVAC="${COMPILEJAVA}"/bin/javac +JAVA="${TESTJAVA}"/bin/java + +cp "${TESTSRC}"/RedefineMethodWithAnnotationsTarget_2.java \ + RedefineMethodWithAnnotationsTarget.java +cp "${TESTSRC}"/RedefineMethodWithAnnotationsAnnotations.java \ + RedefineMethodWithAnnotationsAnnotations.java + +"${JAVAC}" ${TESTJAVACOPTS} ${TESTTOOLVMOPTS} -d . \ + RedefineMethodWithAnnotationsTarget.java \ + RedefineMethodWithAnnotationsAnnotations.java + +"${JAVA}" ${TESTVMOPTS} -javaagent:RedefineMethodWithAnnotationsAgent.jar \ + -cp "${TESTCLASSES}" RedefineMethodWithAnnotationsApp > output.log 2>&1 +cat output.log + +MESG="Exception" +grep "$MESG" output.log +result=$? +if [ "$result" = 0 ]; then + echo "FAIL: found '$MESG' in the test output" + result=1 +else + echo "PASS: did NOT find '$MESG' in the test output" + result=0 +fi + +exit $result
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/lang/instrument/RedefineMethodWithAnnotationsAgent.java Tue Jan 22 15:25:37 2013 +0100 @@ -0,0 +1,42 @@ +/* + * Copyright (c) 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. + */ + +import java.lang.instrument.Instrumentation; + +public class RedefineMethodWithAnnotationsAgent { + private static Instrumentation instrumentation; + + private RedefineMethodWithAnnotationsAgent() {} + + public static void premain(String agentArgs, Instrumentation inst) { + System.out.println("Hello from RedefineMethodWithAnnotationsAgent!"); + System.out.println("isRedefineClassesSupported()=" + + inst.isRedefineClassesSupported()); + + instrumentation = inst; + } + + public static Instrumentation getInstrumentation() { + return instrumentation; + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/lang/instrument/RedefineMethodWithAnnotationsAnnotations.java Tue Jan 22 15:25:37 2013 +0100 @@ -0,0 +1,38 @@ +/* + * Copyright (c) 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. + */ + +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; + +@Retention(RetentionPolicy.RUNTIME) +@interface ParameterAnnotation { + // Values used for the annotations in the first version of the target class. + static final String STRING_VALUE_1 = "String1"; + static final String INT_VALUE_1 = "Int1"; + + // Values used for the annotations in the second version of the target class. + static final String STRING_VALUE_2 = "String2"; + static final String INT_VALUE_2 = "Int2"; + + String value(); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/lang/instrument/RedefineMethodWithAnnotationsApp.java Tue Jan 22 15:25:37 2013 +0100 @@ -0,0 +1,108 @@ +/* + * Copyright (c) 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. + */ + +import java.io.File; +import java.io.FileInputStream; +import java.io.InputStream; +import java.lang.annotation.Annotation; +import java.lang.instrument.ClassDefinition; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.reflect.Method; + +public class RedefineMethodWithAnnotationsApp { + public static void main(String args[]) throws Exception { + System.out.println("Hello from RedefineMethodWithAnnotationsApp!"); + + new RedefineMethodWithAnnotationsApp().doTest(); + + System.exit(0); + } + + private void doTest() throws Exception { + doMethodParameterAnnotationsTest(); + } + + private void doMethodParameterAnnotationsTest() throws Exception { + verifyMethodParameterAnnotationsValue( + ParameterAnnotation.STRING_VALUE_1); + + doRedefine(RedefineMethodWithAnnotationsTarget.class); + + verifyMethodParameterAnnotationsValue( + ParameterAnnotation.STRING_VALUE_2); + } + + private static void verifyMethodParameterAnnotationsValue( + String expectedValue) throws Exception { + Class<RedefineMethodWithAnnotationsTarget> c = + RedefineMethodWithAnnotationsTarget.class; + Method method = c.getMethod("annotatedMethod", String.class); + + Annotation [][] parametersAnnotations = + method.getParameterAnnotations(); + if (parametersAnnotations.length != 1) { + throw new Exception("Incorrect number of parameters to method: " + + method.getName() + "." + + " Expected: 1," + + " got: " + parametersAnnotations.length); + } + + Annotation[] parameterAnnotations = parametersAnnotations[0]; + if (parameterAnnotations.length != 1) { + throw new Exception("Incorrect number of annotations." + + " Expected: 1" + + ", got " + parameterAnnotations.length); + } + + Annotation parameterAnnotation = parameterAnnotations[0]; + if (!(parameterAnnotation instanceof ParameterAnnotation)) { + throw new Exception("Incorrect Annotation class." + + " Expected: " + ParameterAnnotation.class.getName() + + ", got: " + parameterAnnotation.getClass().getName()); + } + + ParameterAnnotation pa = (ParameterAnnotation)parameterAnnotation; + String annotationValue = pa.value(); + if (!expectedValue.equals(annotationValue)) { + throw new Exception("Incorrect parameter annotation value." + + " Expected: " + expectedValue + + ", got: " + annotationValue); + } + } + + private static void doRedefine(Class<?> clazz) throws Exception { + // Load the second version of this class. + File f = new File(clazz.getName() + ".class"); + System.out.println("Reading test class from " + f); + InputStream redefineStream = new FileInputStream(f); + + byte[] redefineBuffer = NamedBuffer.loadBufferFromStream(redefineStream); + + ClassDefinition redefineParamBlock = new ClassDefinition( + clazz, redefineBuffer); + + RedefineMethodWithAnnotationsAgent.getInstrumentation().redefineClasses( + new ClassDefinition[] {redefineParamBlock}); + } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget.java Tue Jan 22 15:25:37 2013 +0100 @@ -0,0 +1,33 @@ +/* + * Copyright (c) 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. + */ + +/** + * The first version of this class. The second version is in + * RedefineMethodWithAnnotationsTarget_2.java. + */ +public class RedefineMethodWithAnnotationsTarget { + public void annotatedMethod(@ParameterAnnotation( + value = ParameterAnnotation.STRING_VALUE_1) String parameter) { } + public void annotatedMethod(@ParameterAnnotation( + value = ParameterAnnotation.INT_VALUE_1) int parameter) { } +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/java/lang/instrument/RedefineMethodWithAnnotationsTarget_2.java Tue Jan 22 15:25:37 2013 +0100 @@ -0,0 +1,35 @@ +/* + * Copyright (c) 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. + */ + +/** + * This is the second version of this class. The first version is in + * RedefineMethodWithAnnotationsTarget.java. + * <p> + * It has the same methods but with different annotations and order. + */ +public class RedefineMethodWithAnnotationsTarget { + public void annotatedMethod(@ParameterAnnotation( + value = ParameterAnnotation.INT_VALUE_2) int parameter) { } + public void annotatedMethod(@ParameterAnnotation( + value = ParameterAnnotation.STRING_VALUE_2) String parameter) { } +}