Fri, 18 Sep 2015 08:11:44 -0700
Merge
vromero@1591 | 1 | /* |
vromero@1591 | 2 | * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. |
vromero@1591 | 3 | * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. |
vromero@1591 | 4 | * |
vromero@1591 | 5 | * This code is free software; you can redistribute it and/or modify it |
vromero@1591 | 6 | * under the terms of the GNU General Public License version 2 only, as |
vromero@1591 | 7 | * published by the Free Software Foundation. |
vromero@1591 | 8 | * |
vromero@1591 | 9 | * This code is distributed in the hope that it will be useful, but WITHOUT |
vromero@1591 | 10 | * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or |
vromero@1591 | 11 | * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License |
vromero@1591 | 12 | * version 2 for more details (a copy is included in the LICENSE file that |
vromero@1591 | 13 | * accompanied this code). |
vromero@1591 | 14 | * |
vromero@1591 | 15 | * You should have received a copy of the GNU General Public License version |
vromero@1591 | 16 | * 2 along with this work; if not, write to the Free Software Foundation, |
vromero@1591 | 17 | * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. |
vromero@1591 | 18 | * |
vromero@1591 | 19 | * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA |
vromero@1591 | 20 | * or visit www.oracle.com if you need additional information or have any |
vromero@1591 | 21 | * questions. |
vromero@1591 | 22 | */ |
vromero@1591 | 23 | |
vromero@1591 | 24 | /* |
vromero@1591 | 25 | * @test |
vromero@1591 | 26 | * @bug 4786406 4781221 4780341 6214324 |
vromero@1591 | 27 | * @summary Validates rewritten javah handling of class defined constants and |
vromero@1591 | 28 | * ensures that the appropriate macro definitions are placed in the generated |
vromero@1591 | 29 | * header file. |
vromero@1591 | 30 | * @library /tools/javac/lib |
vromero@1591 | 31 | * @build ToolBox |
vromero@1591 | 32 | * @run main ConstMacroTest |
vromero@1591 | 33 | */ |
vromero@1591 | 34 | |
vromero@1591 | 35 | import java.io.*; |
vromero@1591 | 36 | import java.nio.file.Paths; |
vromero@1591 | 37 | |
vromero@1591 | 38 | //original test: test/tools/javah/ConstMacroTest.sh |
vromero@1591 | 39 | public class ConstMacroTest { |
vromero@1591 | 40 | |
vromero@1637 | 41 | private static final String subClassConstsGoldenFileTemplate = |
vromero@1591 | 42 | "/* DO NOT EDIT THIS FILE - it is machine generated */\n" + |
vromero@1591 | 43 | "#include <jni.h>\n" + |
vromero@1591 | 44 | "/* Header for class SubClassConsts */\n" + |
vromero@1591 | 45 | "\n" + |
vromero@1591 | 46 | "#ifndef _Included_SubClassConsts\n" + |
vromero@1591 | 47 | "#define _Included_SubClassConsts\n" + |
vromero@1591 | 48 | "#ifdef __cplusplus\n" + |
vromero@1591 | 49 | "extern \"C\" {\n" + |
vromero@1591 | 50 | "#endif\n" + |
vromero@1591 | 51 | "#undef SubClassConsts_serialVersionUID\n" + |
vromero@1637 | 52 | "#define SubClassConsts_serialVersionUID 6733861379283244755%s\n" + |
vromero@1591 | 53 | "#undef SubClassConsts_SUPER_INT_CONSTANT\n" + |
vromero@1591 | 54 | "#define SubClassConsts_SUPER_INT_CONSTANT 3L\n" + |
vromero@1591 | 55 | "#undef SubClassConsts_SUPER_FLOAT_CONSTANT\n" + |
vromero@1591 | 56 | "#define SubClassConsts_SUPER_FLOAT_CONSTANT 99.3f\n" + |
vromero@1591 | 57 | "#undef SubClassConsts_SUPER_DOUBLE_CONSTANT\n" + |
vromero@1591 | 58 | "#define SubClassConsts_SUPER_DOUBLE_CONSTANT 33.2\n" + |
vromero@1591 | 59 | "#undef SubClassConsts_SUPER_BOOLEAN_CONSTANT\n" + |
vromero@1591 | 60 | "#define SubClassConsts_SUPER_BOOLEAN_CONSTANT 0L\n" + |
vromero@1591 | 61 | "#undef SubClassConsts_SUB_INT_CONSTANT\n" + |
vromero@1591 | 62 | "#define SubClassConsts_SUB_INT_CONSTANT 2L\n" + |
vromero@1591 | 63 | "#undef SubClassConsts_SUB_DOUBLE_CONSTANT\n" + |
vromero@1591 | 64 | "#define SubClassConsts_SUB_DOUBLE_CONSTANT 2.25\n" + |
vromero@1591 | 65 | "#undef SubClassConsts_SUB_FLOAT_CONSTANT\n" + |
vromero@1591 | 66 | "#define SubClassConsts_SUB_FLOAT_CONSTANT 7.9f\n" + |
vromero@1591 | 67 | "#undef SubClassConsts_SUB_BOOLEAN_CONSTANT\n" + |
vromero@1591 | 68 | "#define SubClassConsts_SUB_BOOLEAN_CONSTANT 1L\n" + |
vromero@1591 | 69 | "#ifdef __cplusplus\n" + |
vromero@1591 | 70 | "}\n" + |
vromero@1591 | 71 | "#endif\n" + |
vromero@1591 | 72 | "#endif"; |
vromero@1591 | 73 | |
vromero@1637 | 74 | private static final String serialVersionUIDSuffix = |
vromero@1637 | 75 | ToolBox.isWindows() ? "i64" : "LL"; ; |
vromero@1637 | 76 | |
vromero@1591 | 77 | public static void main(String[] args) throws Exception { |
vromero@1591 | 78 | //first steps are now done by jtreg |
vromero@1591 | 79 | // cp "${TESTSRC}${FS}SuperClassConsts.java" . |
vromero@1591 | 80 | // cp "${TESTSRC}${FS}SubClassConsts.java" . |
vromero@1591 | 81 | |
vromero@1591 | 82 | // "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}SubClassConsts.java" |
vromero@1591 | 83 | |
vromero@1591 | 84 | // "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} SubClassConsts |
vromero@1591 | 85 | ToolBox.JavaToolArgs successParams = |
vromero@1591 | 86 | new ToolBox.JavaToolArgs() |
vromero@1591 | 87 | .setAllArgs("-cp", System.getProperty("test.classes"), "SubClassConsts"); |
vromero@1591 | 88 | ToolBox.javah(successParams); |
vromero@1591 | 89 | |
vromero@1591 | 90 | // diff ${DIFFOPTS} "${TESTSRC}${FS}${EXPECTED_JAVAH_OUT_FILE}" "${GENERATED_HEADER_FILE}" |
vromero@1637 | 91 | String subClassConstGoldenFile = String.format(subClassConstsGoldenFileTemplate, |
vromero@1637 | 92 | serialVersionUIDSuffix); |
vromero@1591 | 93 | ToolBox.compareLines(Paths.get("SubClassConsts.h"), |
vromero@1637 | 94 | ToolBox.splitLines(subClassConstGoldenFile, "\n"), null, true); |
vromero@1591 | 95 | } |
vromero@1591 | 96 | |
vromero@1591 | 97 | } |
vromero@1591 | 98 | |
vromero@1591 | 99 | class SuperClassConsts implements Serializable { |
vromero@1591 | 100 | // Define class constant values, base class is serializable |
vromero@1591 | 101 | private static final long serialVersionUID = 6733861379283244755L; |
vromero@1591 | 102 | public static final int SUPER_INT_CONSTANT = 3; |
vromero@1591 | 103 | public final static float SUPER_FLOAT_CONSTANT = 99.3f; |
vromero@1591 | 104 | public final static double SUPER_DOUBLE_CONSTANT = 33.2; |
vromero@1591 | 105 | public final static boolean SUPER_BOOLEAN_CONSTANT = false; |
vromero@1591 | 106 | // A token instance field |
vromero@1591 | 107 | int instanceField; |
vromero@1591 | 108 | |
vromero@1591 | 109 | public native int numValues(); |
vromero@1591 | 110 | } |
vromero@1591 | 111 | |
vromero@1591 | 112 | class SubClassConsts extends SuperClassConsts { |
vromero@1591 | 113 | private final static int SUB_INT_CONSTANT = 2; |
vromero@1591 | 114 | private final static double SUB_DOUBLE_CONSTANT = 2.25; |
vromero@1591 | 115 | private final static float SUB_FLOAT_CONSTANT = 7.90f; |
vromero@1591 | 116 | private final static boolean SUB_BOOLEAN_CONSTANT = true; |
vromero@1591 | 117 | } |