archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-21 03:24:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8006212: javac, convert jtreg tests from shell script to java

Browse source 
Reviewed-by: jjg
This commit is contained in:
Vicente Romero 2013-02-19 17:53:16 +00:00
parent 6e097b8776
commit 68a3295c8b
88 changed files with 2675 additions and 3237 deletions
Download patch file Download diff file Expand all files Collapse all files

112
langtools/test/tools/javah/constMacroTest/ConstMacroTest.java Normal file
View file

@ -0,0 +1,112 @@
/*
* 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 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.
* @library /tools/javac/lib
* @build ToolBox
* @run main ConstMacroTest
*/
import java.io.*;
import java.nio.file.Paths;
//original test: test/tools/javah/ConstMacroTest.sh
public class ConstMacroTest {
private static final String SubClassConstsGoldenFile =
"/* 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" +
"#define SubClassConsts_serialVersionUID 6733861379283244755LL\n" +
"#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 {
//first steps are now done by jtreg
// cp "${TESTSRC}${FS}SuperClassConsts.java" .
// cp "${TESTSRC}${FS}SubClassConsts.java" .
// "${TESTJAVA}${FS}bin${FS}javac" ${TESTTOOLVMOPTS} -d . "${TESTSRC}${FS}SubClassConsts.java"
// "${TESTJAVA}${FS}bin${FS}javah" ${TESTTOOLVMOPTS} SubClassConsts
ToolBox.JavaToolArgs successParams =
new ToolBox.JavaToolArgs()
.setAllArgs("-cp", System.getProperty("test.classes"), "SubClassConsts");
ToolBox.javah(successParams);
// diff ${DIFFOPTS} "${TESTSRC}${FS}${EXPECTED_JAVAH_OUT_FILE}" "${GENERATED_HEADER_FILE}"
ToolBox.compareLines(Paths.get("SubClassConsts.h"),
ToolBox.splitLines(SubClassConstsGoldenFile), null);
}
}
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;
}