vromero@1591: /* vromero@1591: * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. vromero@1591: * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. vromero@1591: * vromero@1591: * This code is free software; you can redistribute it and/or modify it vromero@1591: * under the terms of the GNU General Public License version 2 only, as vromero@1591: * published by the Free Software Foundation. vromero@1591: * vromero@1591: * This code is distributed in the hope that it will be useful, but WITHOUT vromero@1591: * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or vromero@1591: * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License vromero@1591: * version 2 for more details (a copy is included in the LICENSE file that vromero@1591: * accompanied this code). vromero@1591: * vromero@1591: * You should have received a copy of the GNU General Public License version vromero@1591: * 2 along with this work; if not, write to the Free Software Foundation, vromero@1591: * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. vromero@1591: * vromero@1591: * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA vromero@1591: * or visit www.oracle.com if you need additional information or have any vromero@1591: * questions. vromero@1591: */ vromero@1591: vromero@1591: /* vromero@1591: * @test vromero@1591: * @bug 4786406 4781221 4780341 6214324 vromero@1591: * @summary Validates rewritten javah handling of class defined constants and vromero@1591: * ensures that the appropriate macro definitions are placed in the generated vromero@1591: * header file. vromero@1591: * @library /tools/javac/lib vromero@1591: * @build ToolBox vromero@1591: * @run main ConstMacroTest vromero@1591: */ vromero@1591: vromero@1591: import java.io.*; vromero@1591: import java.nio.file.Paths; vromero@1591: vromero@1591: //original test: test/tools/javah/ConstMacroTest.sh vromero@1591: public class ConstMacroTest { vromero@1591: vromero@1591: private static final String SubClassConstsGoldenFile = vromero@1591: "/* DO NOT EDIT THIS FILE - it is machine generated */\n" + vromero@1591: "#include \n" + vromero@1591: "/* Header for class SubClassConsts */\n" + vromero@1591: "\n" + vromero@1591: "#ifndef _Included_SubClassConsts\n" + vromero@1591: "#define _Included_SubClassConsts\n" + vromero@1591: "#ifdef __cplusplus\n" + vromero@1591: "extern \"C\" {\n" + vromero@1591: "#endif\n" + vromero@1591: "#undef SubClassConsts_serialVersionUID\n" + vromero@1591: "#define SubClassConsts_serialVersionUID 6733861379283244755LL\n" + vromero@1591: "#undef SubClassConsts_SUPER_INT_CONSTANT\n" + vromero@1591: "#define SubClassConsts_SUPER_INT_CONSTANT 3L\n" + vromero@1591: "#undef SubClassConsts_SUPER_FLOAT_CONSTANT\n" + vromero@1591: "#define SubClassConsts_SUPER_FLOAT_CONSTANT 99.3f\n" + vromero@1591: "#undef SubClassConsts_SUPER_DOUBLE_CONSTANT\n" + vromero@1591: "#define SubClassConsts_SUPER_DOUBLE_CONSTANT 33.2\n" + vromero@1591: "#undef SubClassConsts_SUPER_BOOLEAN_CONSTANT\n" + vromero@1591: "#define SubClassConsts_SUPER_BOOLEAN_CONSTANT 0L\n" + vromero@1591: "#undef SubClassConsts_SUB_INT_CONSTANT\n" + vromero@1591: "#define SubClassConsts_SUB_INT_CONSTANT 2L\n" + vromero@1591: "#undef SubClassConsts_SUB_DOUBLE_CONSTANT\n" + vromero@1591: "#define SubClassConsts_SUB_DOUBLE_CONSTANT 2.25\n" + vromero@1591: "#undef SubClassConsts_SUB_FLOAT_CONSTANT\n" + vromero@1591: "#define SubClassConsts_SUB_FLOAT_CONSTANT 7.9f\n" + vromero@1591: "#undef SubClassConsts_SUB_BOOLEAN_CONSTANT\n" + vromero@1591: "#define SubClassConsts_SUB_BOOLEAN_CONSTANT 1L\n" + vromero@1591: "#ifdef __cplusplus\n" + vromero@1591: "}\n" + vromero@1591: "#endif\n" + vromero@1591: "#endif"; vromero@1591: vromero@1591: public static void main(String[] args) throws Exception { vromero@1591: //first steps are now done by jtreg vromero@1591: // cp "${TESTSRC}${FS}SuperClassConsts.java" . vromero@1591: // cp "${TESTSRC}${FS}SubClassConsts.java" . vromero@1591: vromero@1591: // "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}SubClassConsts.java" vromero@1591: vromero@1591: // "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} SubClassConsts vromero@1591: ToolBox.JavaToolArgs successParams = vromero@1591: new ToolBox.JavaToolArgs() vromero@1591: .setAllArgs("-cp", System.getProperty("test.classes"), "SubClassConsts"); vromero@1591: ToolBox.javah(successParams); vromero@1591: vromero@1591: // diff ${DIFFOPTS} "${TESTSRC}${FS}${EXPECTED_JAVAH_OUT_FILE}" "${GENERATED_HEADER_FILE}" vromero@1591: ToolBox.compareLines(Paths.get("SubClassConsts.h"), vromero@1591: ToolBox.splitLines(SubClassConstsGoldenFile), null); vromero@1591: } vromero@1591: vromero@1591: } vromero@1591: vromero@1591: class SuperClassConsts implements Serializable { vromero@1591: // Define class constant values, base class is serializable vromero@1591: private static final long serialVersionUID = 6733861379283244755L; vromero@1591: public static final int SUPER_INT_CONSTANT = 3; vromero@1591: public final static float SUPER_FLOAT_CONSTANT = 99.3f; vromero@1591: public final static double SUPER_DOUBLE_CONSTANT = 33.2; vromero@1591: public final static boolean SUPER_BOOLEAN_CONSTANT = false; vromero@1591: // A token instance field vromero@1591: int instanceField; vromero@1591: vromero@1591: public native int numValues(); vromero@1591: } vromero@1591: vromero@1591: class SubClassConsts extends SuperClassConsts { vromero@1591: private final static int SUB_INT_CONSTANT = 2; vromero@1591: private final static double SUB_DOUBLE_CONSTANT = 2.25; vromero@1591: private final static float SUB_FLOAT_CONSTANT = 7.90f; vromero@1591: private final static boolean SUB_BOOLEAN_CONSTANT = true; vromero@1591: }