2013-02-19 17:53:16 +00:00
|
|
|
/*
|
8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: Vicente Romero <vicente.romero@oracle.com>
Co-authored-by: Andreas Lundblad <andreas.lundblad@oracle.com>
Co-authored-by: Andrey Nazarov <andrey.x.nazarov@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Kumar Srinivasan <kumar.x.srinivasan@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: jjg, jlahoda, vromero, mcimadamore, bpatel, ksrini, darcy, anazarov, dfuchs
2016-03-17 19:04:28 +00:00
|
|
|
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
|
2013-02-19 17:53:16 +00:00
|
|
|
* 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 4786406 4781221 4780341 6214324
|
|
|
|
* @summary Validates rewritten javah handling of class defined constants and
|
|
|
|
* ensures that the appropriate macro definitions are placed in the generated
|
|
|
|
* header file.
|
2014-08-13 13:20:31 -07:00
|
|
|
* @library /tools/lib
|
2015-05-21 11:41:04 -07:00
|
|
|
* @modules jdk.compiler/com.sun.tools.javac.api
|
|
|
|
* jdk.compiler/com.sun.tools.javac.main
|
8142968: Module System implementation
Initial integration of JEP 200, JEP 260, JEP 261, and JEP 282
Co-authored-by: Alex Buckley <alex.buckley@oracle.com>
Co-authored-by: Jonathan Gibbons <jonathan.gibbons@oracle.com>
Co-authored-by: Karen Kinnear <karen.kinnear@oracle.com>
Co-authored-by: Mandy Chung <mandy.chung@oracle.com>
Co-authored-by: Mark Reinhold <mark.reinhold@oracle.com>
Co-authored-by: Jan Lahoda <jan.lahoda@oracle.com>
Co-authored-by: Vicente Romero <vicente.romero@oracle.com>
Co-authored-by: Andreas Lundblad <andreas.lundblad@oracle.com>
Co-authored-by: Andrey Nazarov <andrey.x.nazarov@oracle.com>
Co-authored-by: Chris Hegarty <chris.hegarty@oracle.com>
Co-authored-by: Erik Joelsson <erik.joelsson@oracle.com>
Co-authored-by: Kumar Srinivasan <kumar.x.srinivasan@oracle.com>
Co-authored-by: Sundararajan Athijegannathan <sundararajan.athijegannathan@oracle.com>
Reviewed-by: jjg, jlahoda, vromero, mcimadamore, bpatel, ksrini, darcy, anazarov, dfuchs
2016-03-17 19:04:28 +00:00
|
|
|
* jdk.jdeps/com.sun.tools.javap
|
2016-03-31 15:20:50 -07:00
|
|
|
* @build toolbox.ToolBox toolbox.JavahTask
|
2013-02-19 17:53:16 +00:00
|
|
|
* @run main ConstMacroTest
|
|
|
|
*/
|
|
|
|
|
|
|
|
import java.io.*;
|
2014-08-13 13:20:31 -07:00
|
|
|
import java.util.List;
|
2013-02-19 17:53:16 +00:00
|
|
|
|
2016-03-31 15:20:50 -07:00
|
|
|
import toolbox.JavahTask;
|
|
|
|
import toolbox.ToolBox;
|
|
|
|
|
2014-08-13 13:20:31 -07:00
|
|
|
// Original test: test/tools/javah/ConstMacroTest.sh
|
2013-02-19 17:53:16 +00:00
|
|
|
public class ConstMacroTest {
|
|
|
|
|
2013-03-14 08:30:16 +00:00
|
|
|
private static final String subClassConstsGoldenFileTemplate =
|
2013-02-19 17:53:16 +00:00
|
|
|
"/* DO NOT EDIT THIS FILE - it is machine generated */\n" +
|
|
|
|
"#include <jni.h>\n" +
|
|
|
|
"/* Header for class SubClassConsts */\n" +
|
|
|
|
"\n" +
|
|
|
|
"#ifndef _Included_SubClassConsts\n" +
|
|
|
|
"#define _Included_SubClassConsts\n" +
|
|
|
|
"#ifdef __cplusplus\n" +
|
|
|
|
"extern \"C\" {\n" +
|
|
|
|
"#endif\n" +
|
|
|
|
"#undef SubClassConsts_serialVersionUID\n" +
|
2013-03-14 08:30:16 +00:00
|
|
|
"#define SubClassConsts_serialVersionUID 6733861379283244755%s\n" +
|
2013-02-19 17:53:16 +00:00
|
|
|
"#undef SubClassConsts_SUPER_INT_CONSTANT\n" +
|
|
|
|
"#define SubClassConsts_SUPER_INT_CONSTANT 3L\n" +
|
|
|
|
"#undef SubClassConsts_SUPER_FLOAT_CONSTANT\n" +
|
|
|
|
"#define SubClassConsts_SUPER_FLOAT_CONSTANT 99.3f\n" +
|
|
|
|
"#undef SubClassConsts_SUPER_DOUBLE_CONSTANT\n" +
|
|
|
|
"#define SubClassConsts_SUPER_DOUBLE_CONSTANT 33.2\n" +
|
|
|
|
"#undef SubClassConsts_SUPER_BOOLEAN_CONSTANT\n" +
|
|
|
|
"#define SubClassConsts_SUPER_BOOLEAN_CONSTANT 0L\n" +
|
|
|
|
"#undef SubClassConsts_SUB_INT_CONSTANT\n" +
|
|
|
|
"#define SubClassConsts_SUB_INT_CONSTANT 2L\n" +
|
|
|
|
"#undef SubClassConsts_SUB_DOUBLE_CONSTANT\n" +
|
|
|
|
"#define SubClassConsts_SUB_DOUBLE_CONSTANT 2.25\n" +
|
|
|
|
"#undef SubClassConsts_SUB_FLOAT_CONSTANT\n" +
|
|
|
|
"#define SubClassConsts_SUB_FLOAT_CONSTANT 7.9f\n" +
|
|
|
|
"#undef SubClassConsts_SUB_BOOLEAN_CONSTANT\n" +
|
|
|
|
"#define SubClassConsts_SUB_BOOLEAN_CONSTANT 1L\n" +
|
|
|
|
"#ifdef __cplusplus\n" +
|
|
|
|
"}\n" +
|
|
|
|
"#endif\n" +
|
|
|
|
"#endif";
|
|
|
|
|
|
|
|
public static void main(String[] args) throws Exception {
|
2014-08-13 13:20:31 -07:00
|
|
|
ToolBox tb = new ToolBox();
|
|
|
|
|
2016-03-31 15:20:50 -07:00
|
|
|
new JavahTask(tb)
|
2014-08-13 13:20:31 -07:00
|
|
|
.classpath(ToolBox.testClasses)
|
|
|
|
.classes("SubClassConsts")
|
|
|
|
.run();
|
2013-02-19 17:53:16 +00:00
|
|
|
|
2014-08-13 13:20:31 -07:00
|
|
|
String longSuffix = tb.isWindows() ? "i64" : "LL";
|
|
|
|
List<String> subClassConstsGoldenFile = tb.split(
|
|
|
|
String.format(subClassConstsGoldenFileTemplate, longSuffix), "\n");
|
2013-02-19 17:53:16 +00:00
|
|
|
|
2014-08-13 13:20:31 -07:00
|
|
|
List<String> subClassConstsFile = tb.readAllLines("SubClassConsts.h");
|
2013-02-19 17:53:16 +00:00
|
|
|
|
2014-08-13 13:20:31 -07:00
|
|
|
tb.checkEqual(subClassConstsFile, subClassConstsGoldenFile);
|
2013-02-19 17:53:16 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
class SuperClassConsts implements Serializable {
|
|
|
|
// Define class constant values, base class is serializable
|
|
|
|
private static final long serialVersionUID = 6733861379283244755L;
|
|
|
|
public static final int SUPER_INT_CONSTANT = 3;
|
|
|
|
public final static float SUPER_FLOAT_CONSTANT = 99.3f;
|
|
|
|
public final static double SUPER_DOUBLE_CONSTANT = 33.2;
|
|
|
|
public final static boolean SUPER_BOOLEAN_CONSTANT = false;
|
|
|
|
// A token instance field
|
|
|
|
int instanceField;
|
|
|
|
|
|
|
|
public native int numValues();
|
|
|
|
}
|
|
|
|
|
|
|
|
class SubClassConsts extends SuperClassConsts {
|
|
|
|
private final static int SUB_INT_CONSTANT = 2;
|
|
|
|
private final static double SUB_DOUBLE_CONSTANT = 2.25;
|
|
|
|
private final static float SUB_FLOAT_CONSTANT = 7.90f;
|
|
|
|
private final static boolean SUB_BOOLEAN_CONSTANT = true;
|
|
|
|
}
|