diff --git a/.hgtags b/.hgtags index 38eb404cddb..da69c7e51c4 100644 --- a/.hgtags +++ b/.hgtags @@ -372,3 +372,4 @@ d53037a90c441cb528dc41c30827985de0e67c62 jdk-9+123 8e45018bde9de4ad15b972ae62874bba52dba2d5 jdk-9+127 5bf88dce615f6804f9e101a96ffa7c9dfb4fbbbe jdk-9+128 e8373543a3f0f60589b7d72b1f9b172721124caf jdk-9+129 +e613affb88d178dc7c589f1679db113d589bddb4 jdk-9+130 diff --git a/.hgtags-top-repo b/.hgtags-top-repo index 918c4e57478..b44b5caeac9 100644 --- a/.hgtags-top-repo +++ b/.hgtags-top-repo @@ -372,3 +372,4 @@ f80c841ae2545eaf9acd2724bccc305d98cefbe2 jdk-9+124 8fa686245bd2a072ece3392743460030f0854520 jdk-9+127 b30ae794d974d7dd3eb4e84203f70021823fa6c6 jdk-9+128 f5902d3841b82cac6e7716a20c24e8e916fb14a8 jdk-9+129 +d94d54a3192fea79234c3ac55cd0b4052d45e954 jdk-9+130 diff --git a/common/autoconf/flags.m4 b/common/autoconf/flags.m4 index e4cd491b0ce..cc32499be7b 100644 --- a/common/autoconf/flags.m4 +++ b/common/autoconf/flags.m4 @@ -684,7 +684,7 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK], AC_SUBST(CXXFLAGS_TESTEXE) LDFLAGS_TESTLIB="$LDFLAGS_JDKLIB" - LDFLAGS_TESTEXE="$LDFLAGS_JDKEXE" + LDFLAGS_TESTEXE="$LDFLAGS_JDKEXE $JAVA_BASE_LDFLAGS" AC_SUBST(LDFLAGS_TESTLIB) AC_SUBST(LDFLAGS_TESTEXE) @@ -713,20 +713,17 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER], FLAGS_CXX_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [[$]$2CXXSTD_CXXFLAG -Werror], IF_FALSE: [$2CXXSTD_CXXFLAG=""]) $2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} ${$2CXXSTD_CXXFLAG}" + $2JVM_CFLAGS="${$2JVM_CFLAGS} ${$2CXXSTD_CXXFLAG}" AC_SUBST([$2CXXSTD_CXXFLAG]) fi if test "x$OPENJDK_TARGET_OS" = xsolaris; then $2CFLAGS_JDK="${$2CFLAGS_JDK} -D__solaris__" $2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} -D__solaris__" - $2CFLAGS_JDKLIB_EXTRA='-xstrconst' - CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -qfullpath -qsaveopt" - CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -qfullpath -qsaveopt" fi if test "x$OPENJDK_TARGET_OS" = xsolaris; then $2CFLAGS_JDK="${$2CFLAGS_JDK} -D__solaris__" $2CXXFLAGS_JDK="${$2CXXFLAGS_JDK} -D__solaris__" - $2CFLAGS_JDKLIB_EXTRA='-xstrconst' fi $2CFLAGS_JDK="${$2CFLAGS_JDK} ${$2EXTRA_CFLAGS}" @@ -768,7 +765,7 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER], $2CFLAGS_JDK="${$2CFLAGS_JDK} -fno-strict-aliasing" ;; esac - TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: 6, PREFIX: $2, IF_AT_LEAST: FLAGS_SETUP_GCC6_COMPILER_FLAGS) + TOOLCHAIN_CHECK_COMPILER_VERSION(VERSION: 6, PREFIX: $2, IF_AT_LEAST: FLAGS_SETUP_GCC6_COMPILER_FLAGS($2)) elif test "x$TOOLCHAIN_TYPE" = xclang; then $2JVM_CFLAGS="[$]$2JVM_CFLAGS -D_GNU_SOURCE" @@ -1112,7 +1109,7 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER], fi elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then LDFLAGS_SOLSTUDIO="-Wl,-z,defs" - $2LDFLAGS_JDK="[$]$2LDFLAGS_JDK $LDFLAGS_SOLSTUDIO -xildoff -ztext" + $2LDFLAGS_JDK="[$]$2LDFLAGS_JDK $LDFLAGS_SOLSTUDIO -ztext" LDFLAGS_CXX_SOLSTUDIO="-norunpath" $2LDFLAGS_CXX_JDK="[$]$2LDFLAGS_CXX_JDK $LDFLAGS_CXX_SOLSTUDIO -xnolib" $2JVM_LDFLAGS="[$]$2JVM_LDFLAGS $LDFLAGS_SOLSTUDIO -library=%none -mt $LDFLAGS_CXX_SOLSTUDIO -z noversion" @@ -1147,11 +1144,11 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER], $2LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB} ${SHARED_LIBRARY_FLAGS}" if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then - $2LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB} \ + $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \ -libpath:${OUTPUT_ROOT}/support/modules_libs/java.base" $2JDKLIB_LIBS="" else - $2LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB} \ + $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)" if test "x$1" = "xTARGET"; then @@ -1160,17 +1157,17 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER], # Only add client/minimal dir if client/minimal is being built. # Default to server for other variants. if HOTSPOT_CHECK_JVM_VARIANT(server); then - $2LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server" + $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server" elif HOTSPOT_CHECK_JVM_VARIANT(client); then - $2LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/client" + $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/client" elif HOTSPOT_CHECK_JVM_VARIANT(minimal); then - $2LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/minimal" + $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/minimal" else - $2LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server" + $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server" fi elif test "x$1" = "xBUILD"; then # When building a buildjdk, it's always only the server variant - $2LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB} \ + $2JAVA_BASE_LDFLAGS="${$2JAVA_BASE_LDFLAGS} \ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_$1_CPU_LIBDIR)/server" fi @@ -1181,6 +1178,8 @@ AC_DEFUN([FLAGS_SETUP_COMPILER_FLAGS_FOR_JDK_HELPER], fi +$2LDFLAGS_JDKLIB="${$2LDFLAGS_JDKLIB} ${$2JAVA_BASE_LDFLAGS}" + # Set $2JVM_LIBS (per os) if test "x$OPENJDK_$1_OS" = xlinux; then $2JVM_LIBS="[$]$2JVM_LIBS -lm -ldl -lpthread" @@ -1447,19 +1446,24 @@ AC_DEFUN_ONCE([FLAGS_SETUP_COMPILER_FLAGS_MISC], AC_SUBST(CFLAGS_WARNINGS_ARE_ERRORS) ]) -AC_DEFUN_ONCE([FLAGS_SETUP_GCC6_COMPILER_FLAGS], +# FLAGS_SETUP_GCC6_COMPILER_FLAGS([PREFIX]) +# Arguments: +# $1 - Optional prefix for each variable defined. +AC_DEFUN([FLAGS_SETUP_GCC6_COMPILER_FLAGS], [ # These flags are required for GCC 6 builds as undefined behaviour in OpenJDK code # runs afoul of the more aggressive versions of these optimisations. # Notably, value range propagation now assumes that the this pointer of C++ # member functions is non-null. - NO_NULL_POINTER_CHECK_CFLAG="-fno-delete-null-pointer-checks" - FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_NULL_POINTER_CHECK_CFLAG -Werror], - IF_FALSE: [NO_NULL_POINTER_CHECK_CFLAG=""]) - AC_SUBST([NO_NULL_POINTER_CHECK_CFLAG]) + NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" + dnl Argument check is disabled until FLAGS_COMPILER_CHECK_ARGUMENTS handles cross-compilation + dnl FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_DELETE_NULL_POINTER_CHECKS_CFLAG -Werror], + dnl IF_FALSE: [NO_DELETE_NULL_POINTER_CHECKS_CFLAG=""]) NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" - FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_LIFETIME_DSE_CFLAG -Werror], - IF_FALSE: [NO_LIFETIME_DSE_CFLAG=""]) - CFLAGS_JDK="${CFLAGS_JDK} ${NO_NULL_POINTER_CHECK_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" - AC_SUBST([NO_LIFETIME_DSE_CFLAG]) + dnl Argument check is disabled until FLAGS_COMPILER_CHECK_ARGUMENTS handles cross-compilation + dnl FLAGS_COMPILER_CHECK_ARGUMENTS(ARGUMENT: [$NO_LIFETIME_DSE_CFLAG -Werror], + dnl IF_FALSE: [NO_LIFETIME_DSE_CFLAG=""]) + AC_MSG_NOTICE([GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} and ${NO_LIFETIME_DSE_CFLAG}]) + $1CFLAGS_JDK="[$]$1CFLAGS_JDK ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" + $1JVM_CFLAGS="[$]$1JVM_CFLAGS ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" ]) diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 961e90e1142..02375c62e7f 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -749,8 +749,6 @@ CXXFLAGS_JDKLIB CFLAGS_JDKEXE CFLAGS_JDKLIB MACOSX_VERSION_MIN -NO_LIFETIME_DSE_CFLAG -NO_NULL_POINTER_CHECK_CFLAG CXXSTD_CXXFLAG CXX_O_FLAG_SIZE CXX_O_FLAG_NONE @@ -4092,6 +4090,9 @@ ac_configure="$SHELL $ac_aux_dir/configure" # Please don't use this var. +# FLAGS_SETUP_GCC6_COMPILER_FLAGS([PREFIX]) +# Arguments: +# $1 - Optional prefix for each variable defined. # @@ -4913,7 +4914,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++" TOOLCHAIN_MINIMUM_VERSION_clang="3.2" TOOLCHAIN_MINIMUM_VERSION_gcc="4.3" TOOLCHAIN_MINIMUM_VERSION_microsoft="" -TOOLCHAIN_MINIMUM_VERSION_solstudio="5.12" +TOOLCHAIN_MINIMUM_VERSION_solstudio="5.13" TOOLCHAIN_MINIMUM_VERSION_xlc="" # Prepare the system so that TOOLCHAIN_CHECK_COMPILER_VERSION can be called. @@ -5094,7 +5095,7 @@ VS_SDK_PLATFORM_NAME_2013= #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1469202305 +DATE_WHEN_GENERATED=1470415803 ############################################################################### # @@ -43767,8 +43768,12 @@ $as_echo "$as_me: Rewriting OBJDUMP to \"$new_complete\"" >&6;} fi - # Restore old path. - PATH="$OLD_PATH" + # Restore old path, except for the microsoft toolchain, which requires VS_PATH + # to remain in place. Otherwise the compiler will not work in some siutations + # in later configure checks. + if test "x$TOOLCHAIN_TYPE" != "xmicrosoft"; then + PATH="$OLD_PATH" + fi # Restore the flags to the user specified values. # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2" @@ -47232,6 +47237,28 @@ $as_echo "$as_me: WARNING: C compiler version number has a part larger than 9999 BUILD_SYSROOT_CFLAGS="$SYSROOT_CFLAGS" BUILD_SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS" BUILD_AR="$AR" + + + if test "x$CC_VERSION_NUMBER" != "x$CXX_VERSION_NUMBER"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C and C++ compiler have different version numbers, $CC_VERSION_NUMBER vs $CXX_VERSION_NUMBER." >&5 +$as_echo "$as_me: WARNING: C and C++ compiler have different version numbers, $CC_VERSION_NUMBER vs $CXX_VERSION_NUMBER." >&2;} + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This typically indicates a broken setup, and is not supported" >&5 +$as_echo "$as_me: WARNING: This typically indicates a broken setup, and is not supported" >&2;} + fi + + # We only check CC_VERSION_NUMBER since we assume CXX_VERSION_NUMBER is equal. + if [[ "[$]CC_VERSION_NUMBER" =~ (.*\.){3} ]] ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C compiler version number has more than three parts (X.Y.Z): $CC_VERSION_NUMBER. Comparisons might be wrong." >&5 +$as_echo "$as_me: WARNING: C compiler version number has more than three parts (X.Y.Z): $CC_VERSION_NUMBER. Comparisons might be wrong." >&2;} + fi + + if [[ "[$]CC_VERSION_NUMBER" =~ [0-9]{6} ]] ; then + { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: C compiler version number has a part larger than 99999: $CC_VERSION_NUMBER. Comparisons might be wrong." >&5 +$as_echo "$as_me: WARNING: C compiler version number has a part larger than 99999: $CC_VERSION_NUMBER. Comparisons might be wrong." >&2;} + fi + + OPENJDK_BUILD_COMPARABLE_ACTUAL_VERSION=`$AWK -F. '{ printf("%05d%05d%05d\n", $1, $2, $3) }' <<< "$CC_VERSION_NUMBER"` + fi @@ -49781,20 +49808,17 @@ $as_echo "$supports" >&6; } CXXFLAGS_JDK="${CXXFLAGS_JDK} ${CXXSTD_CXXFLAG}" + JVM_CFLAGS="${JVM_CFLAGS} ${CXXSTD_CXXFLAG}" fi if test "x$OPENJDK_TARGET_OS" = xsolaris; then CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__" CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__" - CFLAGS_JDKLIB_EXTRA='-xstrconst' - CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -qfullpath -qsaveopt" - CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -qfullpath -qsaveopt" fi if test "x$OPENJDK_TARGET_OS" = xsolaris; then CFLAGS_JDK="${CFLAGS_JDK} -D__solaris__" CXXFLAGS_JDK="${CXXFLAGS_JDK} -D__solaris__" - CFLAGS_JDKLIB_EXTRA='-xstrconst' fi CFLAGS_JDK="${CFLAGS_JDK} ${EXTRA_CFLAGS}" @@ -49913,542 +49937,12 @@ $as_echo "$supports" >&6; } # runs afoul of the more aggressive versions of these optimisations. # Notably, value range propagation now assumes that the this pointer of C++ # member functions is non-null. - NO_NULL_POINTER_CHECK_CFLAG="-fno-delete-null-pointer-checks" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Execute function body - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Execute function body - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler supports \"$NO_NULL_POINTER_CHECK_CFLAG -Werror\"" >&5 -$as_echo_n "checking if the C compiler supports \"$NO_NULL_POINTER_CHECK_CFLAG -Werror\"... " >&6; } - supports=yes - - saved_cflags="$CFLAGS" - CFLAGS="$CFLAGS $NO_NULL_POINTER_CHECK_CFLAG -Werror" - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int i; -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - supports=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - CFLAGS="$saved_cflags" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5 -$as_echo "$supports" >&6; } - if test "x$supports" = "xyes" ; then - : - C_COMP_SUPPORTS="yes" - else - : - C_COMP_SUPPORTS="no" - fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Execute function body - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$NO_NULL_POINTER_CHECK_CFLAG -Werror\"" >&5 -$as_echo_n "checking if the C++ compiler supports \"$NO_NULL_POINTER_CHECK_CFLAG -Werror\"... " >&6; } - supports=yes - - saved_cxxflags="$CXXFLAGS" - CXXFLAGS="$CXXFLAG $NO_NULL_POINTER_CHECK_CFLAG -Werror" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int i; -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -else - supports=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - CXXFLAGS="$saved_cxxflags" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5 -$as_echo "$supports" >&6; } - if test "x$supports" = "xyes" ; then - : - CXX_COMP_SUPPORTS="yes" - else - : - CXX_COMP_SUPPORTS="no" - fi - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if both compilers support \"$NO_NULL_POINTER_CHECK_CFLAG -Werror\"" >&5 -$as_echo_n "checking if both compilers support \"$NO_NULL_POINTER_CHECK_CFLAG -Werror\"... " >&6; } - supports=no - if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5 -$as_echo "$supports" >&6; } - if test "x$supports" = "xyes" ; then - : - - else - : - NO_NULL_POINTER_CHECK_CFLAG="" - fi - - - - - - - - NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Execute function body - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Execute function body - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C compiler supports \"$NO_LIFETIME_DSE_CFLAG -Werror\"" >&5 -$as_echo_n "checking if the C compiler supports \"$NO_LIFETIME_DSE_CFLAG -Werror\"... " >&6; } - supports=yes - - saved_cflags="$CFLAGS" - CFLAGS="$CFLAGS $NO_LIFETIME_DSE_CFLAG -Werror" - ac_ext=c -ac_cpp='$CPP $CPPFLAGS' -ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_c_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int i; -_ACEOF -if ac_fn_c_try_compile "$LINENO"; then : - -else - supports=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - CFLAGS="$saved_cflags" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5 -$as_echo "$supports" >&6; } - if test "x$supports" = "xyes" ; then - : - C_COMP_SUPPORTS="yes" - else - : - C_COMP_SUPPORTS="no" - fi - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Execute function body - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the C++ compiler supports \"$NO_LIFETIME_DSE_CFLAG -Werror\"" >&5 -$as_echo_n "checking if the C++ compiler supports \"$NO_LIFETIME_DSE_CFLAG -Werror\"... " >&6; } - supports=yes - - saved_cxxflags="$CXXFLAGS" - CXXFLAGS="$CXXFLAG $NO_LIFETIME_DSE_CFLAG -Werror" - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - cat confdefs.h - <<_ACEOF >conftest.$ac_ext -/* end confdefs.h. */ -int i; -_ACEOF -if ac_fn_cxx_try_compile "$LINENO"; then : - -else - supports=no -fi -rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext - ac_ext=cpp -ac_cpp='$CXXCPP $CPPFLAGS' -ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' -ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' -ac_compiler_gnu=$ac_cv_cxx_compiler_gnu - - CXXFLAGS="$saved_cxxflags" - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5 -$as_echo "$supports" >&6; } - if test "x$supports" = "xyes" ; then - : - CXX_COMP_SUPPORTS="yes" - else - : - CXX_COMP_SUPPORTS="no" - fi - - - - - - - - - - - - - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if both compilers support \"$NO_LIFETIME_DSE_CFLAG -Werror\"" >&5 -$as_echo_n "checking if both compilers support \"$NO_LIFETIME_DSE_CFLAG -Werror\"... " >&6; } - supports=no - if test "x$C_COMP_SUPPORTS" = "xyes" -a "x$CXX_COMP_SUPPORTS" = "xyes"; then supports=yes; fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $supports" >&5 -$as_echo "$supports" >&6; } - if test "x$supports" = "xyes" ; then - : - - else - : - NO_LIFETIME_DSE_CFLAG="" - fi - - - - - - - CFLAGS_JDK="${CFLAGS_JDK} ${NO_NULL_POINTER_CHECK_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" - - + NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" + NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" + { $as_echo "$as_me:${as_lineno-$LINENO}: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} and ${NO_LIFETIME_DSE_CFLAG}" >&5 +$as_echo "$as_me: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} and ${NO_LIFETIME_DSE_CFLAG}" >&6;} + CFLAGS_JDK="$CFLAGS_JDK ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" + JVM_CFLAGS="$JVM_CFLAGS ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" else : @@ -50900,7 +50394,7 @@ $as_echo "$supports" >&6; } fi elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then LDFLAGS_SOLSTUDIO="-Wl,-z,defs" - LDFLAGS_JDK="$LDFLAGS_JDK $LDFLAGS_SOLSTUDIO -xildoff -ztext" + LDFLAGS_JDK="$LDFLAGS_JDK $LDFLAGS_SOLSTUDIO -ztext" LDFLAGS_CXX_SOLSTUDIO="-norunpath" LDFLAGS_CXX_JDK="$LDFLAGS_CXX_JDK $LDFLAGS_CXX_SOLSTUDIO -xnolib" JVM_LDFLAGS="$JVM_LDFLAGS $LDFLAGS_SOLSTUDIO -library=%none -mt $LDFLAGS_CXX_SOLSTUDIO -z noversion" @@ -50935,11 +50429,11 @@ $as_echo "$supports" >&6; } LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} ${SHARED_LIBRARY_FLAGS}" if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} \ + JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \ -libpath:${OUTPUT_ROOT}/support/modules_libs/java.base" JDKLIB_LIBS="" else - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} \ + JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)" if test "xTARGET" = "xTARGET"; then @@ -50948,17 +50442,17 @@ $as_echo "$supports" >&6; } # Only add client/minimal dir if client/minimal is being built. # Default to server for other variants. if [[ " $JVM_VARIANTS " =~ " server " ]] ; then - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server" + JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server" elif [[ " $JVM_VARIANTS " =~ " client " ]] ; then - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/client" + JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/client" elif [[ " $JVM_VARIANTS " =~ " minimal " ]] ; then - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/minimal" + JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/minimal" else - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server" + JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server" fi elif test "xTARGET" = "xBUILD"; then # When building a buildjdk, it's always only the server variant - LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} \ + JAVA_BASE_LDFLAGS="${JAVA_BASE_LDFLAGS} \ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_TARGET_CPU_LIBDIR)/server" fi @@ -50969,6 +50463,8 @@ $as_echo "$supports" >&6; } fi +LDFLAGS_JDKLIB="${LDFLAGS_JDKLIB} ${JAVA_BASE_LDFLAGS}" + # Set JVM_LIBS (per os) if test "x$OPENJDK_TARGET_OS" = xlinux; then JVM_LIBS="$JVM_LIBS -lm -ldl -lpthread" @@ -51127,20 +50623,17 @@ $as_echo "$supports" >&6; } OPENJDK_BUILD_CXXFLAGS_JDK="${OPENJDK_BUILD_CXXFLAGS_JDK} ${OPENJDK_BUILD_CXXSTD_CXXFLAG}" + OPENJDK_BUILD_JVM_CFLAGS="${OPENJDK_BUILD_JVM_CFLAGS} ${OPENJDK_BUILD_CXXSTD_CXXFLAG}" fi if test "x$OPENJDK_TARGET_OS" = xsolaris; then OPENJDK_BUILD_CFLAGS_JDK="${OPENJDK_BUILD_CFLAGS_JDK} -D__solaris__" OPENJDK_BUILD_CXXFLAGS_JDK="${OPENJDK_BUILD_CXXFLAGS_JDK} -D__solaris__" - OPENJDK_BUILD_CFLAGS_JDKLIB_EXTRA='-xstrconst' - CFLAGS_JDK="${CFLAGS_JDK} -qchars=signed -qfullpath -qsaveopt" - CXXFLAGS_JDK="${CXXFLAGS_JDK} -qchars=signed -qfullpath -qsaveopt" fi if test "x$OPENJDK_TARGET_OS" = xsolaris; then OPENJDK_BUILD_CFLAGS_JDK="${OPENJDK_BUILD_CFLAGS_JDK} -D__solaris__" OPENJDK_BUILD_CXXFLAGS_JDK="${OPENJDK_BUILD_CXXFLAGS_JDK} -D__solaris__" - OPENJDK_BUILD_CFLAGS_JDKLIB_EXTRA='-xstrconst' fi OPENJDK_BUILD_CFLAGS_JDK="${OPENJDK_BUILD_CFLAGS_JDK} ${OPENJDK_BUILD_EXTRA_CFLAGS}" @@ -51255,6 +50748,17 @@ $as_echo "$supports" >&6; } if test $OPENJDK_BUILD_COMPARABLE_ACTUAL_VERSION -ge $COMPARABLE_REFERENCE_VERSION ; then : + # These flags are required for GCC 6 builds as undefined behaviour in OpenJDK code + # runs afoul of the more aggressive versions of these optimisations. + # Notably, value range propagation now assumes that the this pointer of C++ + # member functions is non-null. + NO_DELETE_NULL_POINTER_CHECKS_CFLAG="-fno-delete-null-pointer-checks" + NO_LIFETIME_DSE_CFLAG="-fno-lifetime-dse" + { $as_echo "$as_me:${as_lineno-$LINENO}: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} and ${NO_LIFETIME_DSE_CFLAG}" >&5 +$as_echo "$as_me: GCC >= 6 detected; adding ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} and ${NO_LIFETIME_DSE_CFLAG}" >&6;} + OPENJDK_BUILD_CFLAGS_JDK="$OPENJDK_BUILD_CFLAGS_JDK ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" + OPENJDK_BUILD_JVM_CFLAGS="$OPENJDK_BUILD_JVM_CFLAGS ${NO_DELETE_NULL_POINTER_CHECKS_CFLAG} ${NO_LIFETIME_DSE_CFLAG}" + else : @@ -51705,7 +51209,7 @@ $as_echo "$supports" >&6; } fi elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then LDFLAGS_SOLSTUDIO="-Wl,-z,defs" - OPENJDK_BUILD_LDFLAGS_JDK="$OPENJDK_BUILD_LDFLAGS_JDK $LDFLAGS_SOLSTUDIO -xildoff -ztext" + OPENJDK_BUILD_LDFLAGS_JDK="$OPENJDK_BUILD_LDFLAGS_JDK $LDFLAGS_SOLSTUDIO -ztext" LDFLAGS_CXX_SOLSTUDIO="-norunpath" OPENJDK_BUILD_LDFLAGS_CXX_JDK="$OPENJDK_BUILD_LDFLAGS_CXX_JDK $LDFLAGS_CXX_SOLSTUDIO -xnolib" OPENJDK_BUILD_JVM_LDFLAGS="$OPENJDK_BUILD_JVM_LDFLAGS $LDFLAGS_SOLSTUDIO -library=%none -mt $LDFLAGS_CXX_SOLSTUDIO -z noversion" @@ -51740,11 +51244,11 @@ $as_echo "$supports" >&6; } OPENJDK_BUILD_LDFLAGS_JDKLIB="${OPENJDK_BUILD_LDFLAGS_JDKLIB} ${SHARED_LIBRARY_FLAGS}" if test "x$TOOLCHAIN_TYPE" = xmicrosoft; then - OPENJDK_BUILD_LDFLAGS_JDKLIB="${OPENJDK_BUILD_LDFLAGS_JDKLIB} \ + OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \ -libpath:${OUTPUT_ROOT}/support/modules_libs/java.base" OPENJDK_BUILD_JDKLIB_LIBS="" else - OPENJDK_BUILD_LDFLAGS_JDKLIB="${OPENJDK_BUILD_LDFLAGS_JDKLIB} \ + OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)" if test "xBUILD" = "xTARGET"; then @@ -51753,17 +51257,17 @@ $as_echo "$supports" >&6; } # Only add client/minimal dir if client/minimal is being built. # Default to server for other variants. if [[ " $JVM_VARIANTS " =~ " server " ]] ; then - OPENJDK_BUILD_LDFLAGS_JDKLIB="${OPENJDK_BUILD_LDFLAGS_JDKLIB} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server" + OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server" elif [[ " $JVM_VARIANTS " =~ " client " ]] ; then - OPENJDK_BUILD_LDFLAGS_JDKLIB="${OPENJDK_BUILD_LDFLAGS_JDKLIB} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/client" + OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/client" elif [[ " $JVM_VARIANTS " =~ " minimal " ]] ; then - OPENJDK_BUILD_LDFLAGS_JDKLIB="${OPENJDK_BUILD_LDFLAGS_JDKLIB} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/minimal" + OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/minimal" else - OPENJDK_BUILD_LDFLAGS_JDKLIB="${OPENJDK_BUILD_LDFLAGS_JDKLIB} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server" + OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server" fi elif test "xBUILD" = "xBUILD"; then # When building a buildjdk, it's always only the server variant - OPENJDK_BUILD_LDFLAGS_JDKLIB="${OPENJDK_BUILD_LDFLAGS_JDKLIB} \ + OPENJDK_BUILD_JAVA_BASE_LDFLAGS="${OPENJDK_BUILD_JAVA_BASE_LDFLAGS} \ -L\$(SUPPORT_OUTPUTDIR)/modules_libs/java.base\$(OPENJDK_BUILD_CPU_LIBDIR)/server" fi @@ -51774,6 +51278,8 @@ $as_echo "$supports" >&6; } fi +OPENJDK_BUILD_LDFLAGS_JDKLIB="${OPENJDK_BUILD_LDFLAGS_JDKLIB} ${OPENJDK_BUILD_JAVA_BASE_LDFLAGS}" + # Set OPENJDK_BUILD_JVM_LIBS (per os) if test "x$OPENJDK_BUILD_OS" = xlinux; then OPENJDK_BUILD_JVM_LIBS="$OPENJDK_BUILD_JVM_LIBS -lm -ldl -lpthread" @@ -51838,7 +51344,7 @@ $as_echo "$supports" >&6; } LDFLAGS_TESTLIB="$LDFLAGS_JDKLIB" - LDFLAGS_TESTEXE="$LDFLAGS_JDKEXE" + LDFLAGS_TESTEXE="$LDFLAGS_JDKEXE $JAVA_BASE_LDFLAGS" @@ -53328,8 +52834,8 @@ $as_echo "$JVM_FEATURES" >&6; } as_fn_error $? "Specified JVM feature 'management' requires feature 'nmt'" "$LINENO" 5 fi - if [[ " $JVM_FEATURES " =~ " jvmci " ]] && ! [[ " $JVM_FEATURES " =~ " compiler2 " ]] ; then - as_fn_error $? "Specified JVM feature 'jvmci' requires feature 'compiler2'" "$LINENO" 5 + if [[ " $JVM_FEATURES " =~ " jvmci " ]] && ! ( [[ " $JVM_FEATURES " =~ " compiler1 " ]] || [[ " $JVM_FEATURES " =~ " compiler2 " ]] ); then + as_fn_error $? "Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1'" "$LINENO" 5 fi if [[ " $JVM_FEATURES " =~ " compiler2 " ]] && ! [[ " $JVM_FEATURES " =~ " all-gcs " ]] ; then @@ -53369,7 +52875,7 @@ $as_echo "$JVM_FEATURES" >&6; } fi fi - # Only enable jvmci on x86_64, sparcv9 and aarch64, and only on server. + # Only enable jvmci on x86_64, sparcv9 and aarch64. if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \ test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \ test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then @@ -53383,7 +52889,7 @@ $as_echo "$JVM_FEATURES" >&6; } # Enable features depending on variant. JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" - JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES" + JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES" JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES" JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES" diff --git a/common/autoconf/hotspot.m4 b/common/autoconf/hotspot.m4 index 306e2db5502..cda292e3f87 100644 --- a/common/autoconf/hotspot.m4 +++ b/common/autoconf/hotspot.m4 @@ -198,8 +198,8 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES], AC_MSG_ERROR([Specified JVM feature 'management' requires feature 'nmt']) fi - if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && ! HOTSPOT_CHECK_JVM_FEATURE(compiler2); then - AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2']) + if HOTSPOT_CHECK_JVM_FEATURE(jvmci) && ! (HOTSPOT_CHECK_JVM_FEATURE(compiler1) || HOTSPOT_CHECK_JVM_FEATURE(compiler2)); then + AC_MSG_ERROR([Specified JVM feature 'jvmci' requires feature 'compiler2' or 'compiler1']) fi if HOTSPOT_CHECK_JVM_FEATURE(compiler2) && ! HOTSPOT_CHECK_JVM_FEATURE(all-gcs); then @@ -239,7 +239,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES], fi fi - # Only enable jvmci on x86_64, sparcv9 and aarch64, and only on server. + # Only enable jvmci on x86_64, sparcv9 and aarch64. if test "x$OPENJDK_TARGET_CPU" = "xx86_64" || \ test "x$OPENJDK_TARGET_CPU" = "xsparcv9" || \ test "x$OPENJDK_TARGET_CPU" = "xaarch64" ; then @@ -253,7 +253,7 @@ AC_DEFUN_ONCE([HOTSPOT_SETUP_JVM_FEATURES], # Enable features depending on variant. JVM_FEATURES_server="compiler1 compiler2 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" - JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES" + JVM_FEATURES_client="compiler1 $NON_MINIMAL_FEATURES $JVM_FEATURES $JVM_FEATURES_jvmci" JVM_FEATURES_core="$NON_MINIMAL_FEATURES $JVM_FEATURES" JVM_FEATURES_minimal="compiler1 minimal $JVM_FEATURES" JVM_FEATURES_zero="zero $NON_MINIMAL_FEATURES $JVM_FEATURES" diff --git a/common/autoconf/spec.gmk.in b/common/autoconf/spec.gmk.in index 0efabd42a15..510764002a2 100644 --- a/common/autoconf/spec.gmk.in +++ b/common/autoconf/spec.gmk.in @@ -391,8 +391,6 @@ CFLAGS_WARNINGS_ARE_ERRORS:=@CFLAGS_WARNINGS_ARE_ERRORS@ WARNINGS_AS_ERRORS := @WARNINGS_AS_ERRORS@ CFLAGS_CCACHE:=@CFLAGS_CCACHE@ -NO_NULL_POINTER_CHECK_FLAG=@NO_NULL_POINTER_CHECK_CFLAG@ -NO_LIFETIME_DSE_CFLAG=@NO_LIFETIME_DSE_CFLAG@ CXXSTD_CXXFLAG=@CXXSTD_CXXFLAG@ # Tools that potentially need to be cross compilation aware. diff --git a/common/autoconf/toolchain.m4 b/common/autoconf/toolchain.m4 index e87cb24e7f2..6a563f01942 100644 --- a/common/autoconf/toolchain.m4 +++ b/common/autoconf/toolchain.m4 @@ -54,7 +54,7 @@ TOOLCHAIN_DESCRIPTION_xlc="IBM XL C/C++" TOOLCHAIN_MINIMUM_VERSION_clang="3.2" TOOLCHAIN_MINIMUM_VERSION_gcc="4.3" TOOLCHAIN_MINIMUM_VERSION_microsoft="" -TOOLCHAIN_MINIMUM_VERSION_solstudio="5.12" +TOOLCHAIN_MINIMUM_VERSION_solstudio="5.13" TOOLCHAIN_MINIMUM_VERSION_xlc="" # Prepare the system so that TOOLCHAIN_CHECK_COMPILER_VERSION can be called. @@ -312,8 +312,12 @@ AC_DEFUN_ONCE([TOOLCHAIN_PRE_DETECTION], # Restore path, etc AC_DEFUN_ONCE([TOOLCHAIN_POST_DETECTION], [ - # Restore old path. - PATH="$OLD_PATH" + # Restore old path, except for the microsoft toolchain, which requires VS_PATH + # to remain in place. Otherwise the compiler will not work in some siutations + # in later configure checks. + if test "x$TOOLCHAIN_TYPE" != "xmicrosoft"; then + PATH="$OLD_PATH" + fi # Restore the flags to the user specified values. # This is necessary since AC_PROG_CC defaults CFLAGS to "-g -O2" @@ -831,6 +835,8 @@ AC_DEFUN_ONCE([TOOLCHAIN_SETUP_BUILD_COMPILERS], BUILD_SYSROOT_CFLAGS="$SYSROOT_CFLAGS" BUILD_SYSROOT_LDFLAGS="$SYSROOT_LDFLAGS" BUILD_AR="$AR" + + TOOLCHAIN_PREPARE_FOR_VERSION_COMPARISONS([], [OPENJDK_BUILD_]) fi AC_SUBST(BUILD_CC) diff --git a/common/bin/hgforest.sh b/common/bin/hgforest.sh index ff0bcdfb0f0..7320aa09a11 100644 --- a/common/bin/hgforest.sh +++ b/common/bin/hgforest.sh @@ -335,7 +335,10 @@ else for j in ${repos_extra} ; do if [ "${i}" = "${j}" ] ; then # it's an "extra" - pull_base="${pull_extra}" + if [ -n "${pull_extra}" ]; then + # if no pull_extra is defined, assume that pull_default is valid + pull_base="${pull_extra}" + fi fi done diff --git a/common/conf/jib-profiles.js b/common/conf/jib-profiles.js index cefedb00dca..2fa29a7c634 100644 --- a/common/conf/jib-profiles.js +++ b/common/conf/jib-profiles.js @@ -357,6 +357,18 @@ var getJibProfilesDependencies = function (input, common) { var boot_jdk_platform = input.build_os + "-" + (input.build_cpu == "x86" ? "i586" : input.build_cpu); + var boot_jdk_revision = "8"; + var boot_jdk_subdirpart = "1.8.0"; + // JDK 8 does not work on sparc M7 cpus, need a newer update when building + // on such hardware. + if (input.build_cpu == "sparcv9") { + var cpu_brand = $EXEC("bash -c \"kstat -m cpu_info | grep brand | head -n1 | awk '{ print \$2 }'\""); + if (cpu_brand.trim() == 'SPARC-M7') { + boot_jdk_revision = "8u20"; + boot_jdk_subdirpart = "1.8.0_20"; + } + } + var devkit_platform_revisions = { linux_x64: "gcc4.9.2-OEL6.4+1.0", macosx_x64: "Xcode6.3-MacOSX10.9+1.0", @@ -374,12 +386,12 @@ var getJibProfilesDependencies = function (input, common) { boot_jdk: { server: "javare", module: "jdk", - revision: "8", + revision: boot_jdk_revision, checksum_file: boot_jdk_platform + "/MD5_VALUES", - file: boot_jdk_platform + "/jdk-8-" + boot_jdk_platform + ".tar.gz", + file: boot_jdk_platform + "/jdk-" + boot_jdk_revision + "-" + boot_jdk_platform + ".tar.gz", configure_args: (input.build_os == "macosx" - ? "--with-boot-jdk=" + input.get("boot_jdk", "install_path") + "/jdk1.8.0.jdk/Contents/Home" - : "--with-boot-jdk=" + input.get("boot_jdk", "install_path") + "/jdk1.8.0") + ? "--with-boot-jdk=" + input.get("boot_jdk", "install_path") + "/jdk" + boot_jdk_subdirpart + ".jdk/Contents/Home" + : "--with-boot-jdk=" + input.get("boot_jdk", "install_path") + "/jdk" + boot_jdk_subdirpart) }, devkit: { diff --git a/corba/.hgtags b/corba/.hgtags index 8cb5ff14b22..c046996c773 100644 --- a/corba/.hgtags +++ b/corba/.hgtags @@ -372,3 +372,4 @@ c7f5ba08fcd4b8416e62c21229f9a07c95498919 jdk-9+126 8fab452b6f4710762ba1d8e55fd62db00b1355fe jdk-9+127 1f093d3f8cd99cd37c3b0af4cf5c3bffaa9c8b98 jdk-9+128 c3e83ccab3bb1733ae903d681879a33f85ed465c jdk-9+129 +77f9692d5976ae155773dd3e07533616bb95bae1 jdk-9+130 diff --git a/hotspot/.hgtags b/hotspot/.hgtags index 16c8be595e2..dcd6fc2574e 100644 --- a/hotspot/.hgtags +++ b/hotspot/.hgtags @@ -532,3 +532,4 @@ adc8c84b7cf8c540d920182f78a2bc982366432a jdk-9+126 352357128f602dcf0426b1cbe011a4685a4d9f97 jdk-9+127 22bf6db9767b1b3a1994cbf32eb3331f31ae2093 jdk-9+128 e96b34b76d863ed1fa04e0eeb3f297ac17b490fd jdk-9+129 +7d54c7056328b6a2bf4877458b8f4d8cd870f93b jdk-9+130 diff --git a/hotspot/test/runtime/8007320/ConstMethodTest.java b/hotspot/test/runtime/8007320/ConstMethodTest.java index d24ff6df979..734baaa6aad 100644 --- a/hotspot/test/runtime/8007320/ConstMethodTest.java +++ b/hotspot/test/runtime/8007320/ConstMethodTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8007320 8014709 + * @bug 8007320 8014709 8163231 * @summary Test all optional fields in ConstMethod * @compile -g -parameters ConstMethodTest.java * @run main ConstMethodTest @@ -122,8 +122,8 @@ public class ConstMethodTest { equal(ann.length, 3); Annotation foo = ann[0][0]; Annotation bar = ann[1][0]; - equal(foo.toString(), "@Named(value=aName)"); - equal(bar.toString(), "@Named(value=bName)"); + equal(foo.toString(), "@Named(value=\"aName\")"); + equal(bar.toString(), "@Named(value=\"bName\")"); check(foo.equals(foo)); check(bar.equals(bar)); check(! foo.equals(bar)); @@ -131,7 +131,7 @@ public class ConstMethodTest { Annotation[] ann2 = m.getAnnotations(); equal(ann2.length, 1); Annotation mann = ann2[0]; - equal(mann.toString(), "@MyAnnotation(date=today, name=someName, value=Hello World)"); + equal(mann.toString(), "@MyAnnotation(date=\"today\", name=\"someName\", value=\"Hello World\")"); // Test Method parameter names Parameter[] parameters = m.getParameters(); if(parameters == null) diff --git a/hotspot/test/runtime/RedefineTests/RedefineAnnotations.java b/hotspot/test/runtime/RedefineTests/RedefineAnnotations.java index a759574aada..cfe4c97fae8 100644 --- a/hotspot/test/runtime/RedefineTests/RedefineAnnotations.java +++ b/hotspot/test/runtime/RedefineTests/RedefineAnnotations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -370,7 +370,7 @@ public class RedefineAnnotations { } private static void verifyTestAnnSite(Annotation testAnn, String expectedSite) { - String expectedAnn = "@TestAnn(site=" + expectedSite + ")"; + String expectedAnn = "@TestAnn(site=\"" + expectedSite + "\")"; assertTrue(testAnn.toString().equals(expectedAnn), "Expected \"" + expectedAnn + "\", got \"" + testAnn + "\""); } diff --git a/jaxp/.hgtags b/jaxp/.hgtags index d974c630cc3..ac9804aad0a 100644 --- a/jaxp/.hgtags +++ b/jaxp/.hgtags @@ -372,3 +372,4 @@ e04a15153cc293f05fcd60bc98236f50e16af46a jdk-9+124 bdc3c0b737efbf899709eb3121ce760dcfb51151 jdk-9+127 8a7681a9d70640ac7fbf05c28f53c1d51d8d00a1 jdk-9+128 74241304e87b0d463391a8ecab40979b5af86dc2 jdk-9+129 +e66cdc2de6b02443911d386fc9217b0d824d0686 jdk-9+130 diff --git a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java index 05f7a4e52c0..220e6eaba0f 100644 --- a/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java +++ b/jaxp/src/java.xml/share/classes/javax/xml/xpath/XPathFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -93,14 +93,14 @@ public abstract class XPathFactory { public static XPathFactory newInstance() { try { - return newInstance(DEFAULT_OBJECT_MODEL_URI); - } catch (XPathFactoryConfigurationException xpathFactoryConfigurationException) { - throw new RuntimeException( - "XPathFactory#newInstance() failed to create an XPathFactory for the default object model: " - + DEFAULT_OBJECT_MODEL_URI - + " with the XPathFactoryConfigurationException: " - + xpathFactoryConfigurationException.toString() - ); + return newInstance(DEFAULT_OBJECT_MODEL_URI); + } catch (XPathFactoryConfigurationException e) { + throw new RuntimeException( + "XPathFactory#newInstance() failed to create an XPathFactory for the default object model: " + + DEFAULT_OBJECT_MODEL_URI + + " with the XPathFactoryConfigurationException: " + + e.getMessage(), e + ); } } diff --git a/jaxp/test/ProblemList.txt b/jaxp/test/ProblemList.txt index 84897030275..27337ae935c 100644 --- a/jaxp/test/ProblemList.txt +++ b/jaxp/test/ProblemList.txt @@ -27,4 +27,4 @@ javax/xml/jaxp/isolatedjdk/catalog/PropertiesTest.sh 8147431 generic- javax/xml/jaxp/unittest/common/TransformationWarningsTest.java 8150145 generic-all -javax/xml/jaxp/unittest/stream/FactoryFindTest.java 8156508 generic-all +javax/xml/jaxp/unittest/common/ValidationWarningsTest.java 8150145 generic-all diff --git a/jaxp/test/TEST.ROOT b/jaxp/test/TEST.ROOT index a90dc70cd58..190bdf5ccae 100644 --- a/jaxp/test/TEST.ROOT +++ b/jaxp/test/TEST.ROOT @@ -14,6 +14,11 @@ keys=intermittent randomness # Tests that must run in othervm mode othervm.dirs=javax/xml/jaxp +lib.dirs = /javax/xml/jaxp/libs + +# Declare module dependency +modules=java.xml + # Group definitions groups=TEST.groups diff --git a/jaxp/test/javax/xml/jaxp/functional/TEST.properties b/jaxp/test/javax/xml/jaxp/functional/TEST.properties deleted file mode 100644 index f94f3b92152..00000000000 --- a/jaxp/test/javax/xml/jaxp/functional/TEST.properties +++ /dev/null @@ -1,12 +0,0 @@ -# This file identifies root(s) of the test-ng hierarchy. - -TestNG.dirs = . - -lib.dirs = /javax/xml/jaxp/libs - -# Tests that must run in othervm mode -othervm.dirs= /javax/xml/jaxp/functional - -# Declare module dependency -modules=java.xml - diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/CatalogReferCircularityTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/CatalogReferCircularityTest.java index 300b386943b..41eda62e4ab 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/CatalogReferCircularityTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/CatalogReferCircularityTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -28,17 +28,21 @@ import static catalog.CatalogTestUtils.catalogResolver; import javax.xml.catalog.CatalogException; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.CatalogReferCircularityTest + * @run testng/othervm catalog.CatalogReferCircularityTest * @summary Via nextCatalog entry, the catalog reference chain may be * a (partial) closed circuit. For instance, a catalog may use itself * as an additional catalog specified in its own nextCatalog entry. * This case tests if the implementation handles this issue. - * @compile ../../libs/catalog/CatalogTestUtils.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class CatalogReferCircularityTest { @Test(dataProvider = "catalogName", @@ -49,7 +53,7 @@ public class CatalogReferCircularityTest { } @DataProvider(name = "catalogName") - private Object[][] catalogName() { + public Object[][] catalogName() { return new Object[][] { // This catalog defines itself as next catalog. { "catalogReferCircle-itself.xml" }, @@ -60,3 +64,4 @@ public class CatalogReferCircularityTest { { "catalogReferCircle-left.xml" } }; } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/DefaultFeaturesTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/DefaultFeaturesTest.java index 4aaf3e5793c..9a05145738f 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/DefaultFeaturesTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/DefaultFeaturesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -29,13 +29,18 @@ import javax.xml.catalog.CatalogFeatures.Feature; import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.DefaultFeaturesTest + * @run testng/othervm catalog.DefaultFeaturesTest * @summary This case tests if the default feature values are expected. */ +@Listeners({jaxp.library.FilePolicy.class}) public class DefaultFeaturesTest { private CatalogFeatures defaultFeature; @@ -56,7 +61,7 @@ public class DefaultFeaturesTest { } @DataProvider(name = "feature-value") - private Object[][] data() { + public Object[][] data() { return new Object[][] { { Feature.FILES, null }, { Feature.PREFER, CatalogTestUtils.PREFER_PUBLIC }, @@ -64,3 +69,4 @@ public class DefaultFeaturesTest { { Feature.RESOLVE, CatalogTestUtils.RESOLVE_STRICT } }; } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java index a0066a9a0e5..1f046f3bed5 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/DeferFeatureTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -28,6 +28,8 @@ import static catalog.CatalogTestUtils.DEFER_TRUE; import static catalog.CatalogTestUtils.getCatalogPath; import static javax.xml.catalog.CatalogFeatures.Feature.DEFER; import static javax.xml.catalog.CatalogManager.catalog; +import static jaxp.library.JAXPTestUtilities.runWithAllPerm; +import static jaxp.library.JAXPTestUtilities.tryRunWithAllPerm; import java.lang.reflect.Method; @@ -36,16 +38,20 @@ import javax.xml.catalog.CatalogFeatures; import org.testng.Assert; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.DeferFeatureTest + * @run testng/othervm catalog.DeferFeatureTest * @summary This case tests whether the catalogs specified in delegateSystem, * delegatePublic, delegateURI and nextCatalog entries are used lazily * in resolution via defer feature. - * @compile ../../libs/catalog/CatalogTestUtils.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class DeferFeatureTest { @Test(dataProvider = "catalog-countOfLoadedCatalogFile") @@ -55,7 +61,7 @@ public class DeferFeatureTest { } @DataProvider(name = "catalog-countOfLoadedCatalogFile") - private Object[][] data() { + public Object[][] data() { return new Object[][]{ // By default, alternative catalogs are not loaded. {createCatalog(CatalogFeatures.defaults()), 0}, @@ -75,9 +81,9 @@ public class DeferFeatureTest { } private int loadedCatalogCount(Catalog catalog) throws Exception { - Method method = catalog.getClass().getDeclaredMethod( - "loadedCatalogCount"); - method.setAccessible(true); + Method method = tryRunWithAllPerm(() -> catalog.getClass().getDeclaredMethod("loadedCatalogCount")); + runWithAllPerm(() -> method.setAccessible(true)); return (int) method.invoke(catalog); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/DelegatePublicTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/DelegatePublicTest.java index 931c66cbe9f..e89c82051b0 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/DelegatePublicTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/DelegatePublicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -31,15 +31,18 @@ import javax.xml.catalog.CatalogException; import javax.xml.catalog.CatalogResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.DelegatePublicTest + * @run testng/othervm catalog.DelegatePublicTest * @summary Get matched URIs from DelegatePublic entries. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class DelegatePublicTest { @Test(dataProvider = "publicId-matchedUri") @@ -48,7 +51,7 @@ public class DelegatePublicTest { } @DataProvider(name = "publicId-matchedUri") - private Object[][] dataOnMatch() { + public Object[][] dataOnMatch() { return new Object[][] { // The matched URI of the specified public id is defined in // a delegate catalog file of the current catalog file. @@ -79,7 +82,7 @@ public class DelegatePublicTest { } @DataProvider(name = "publicId-expectedExceptionClass") - private Object[][] dataOnException() { + public Object[][] dataOnException() { return new Object[][] { // The matched delegatePublic entry of the specified public id // defines a non-existing delegate catalog file. That should @@ -97,3 +100,4 @@ public class DelegatePublicTest { return catalogResolver("delegatePublic.xml"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/DelegateSystemTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/DelegateSystemTest.java index c4191f4f7de..f18b6c2eba2 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/DelegateSystemTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/DelegateSystemTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -31,15 +31,18 @@ import javax.xml.catalog.CatalogException; import javax.xml.catalog.CatalogResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.DelegateSystemTest + * @run testng/othervm catalog.DelegateSystemTest * @summary Get matched URIs from delegateSystem entries. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class DelegateSystemTest { @Test(dataProvider = "systemId-matchedUri") @@ -48,7 +51,7 @@ public class DelegateSystemTest { } @DataProvider(name = "systemId-matchedUri") - private Object[][] dataOnMatch() { + public Object[][] dataOnMatch() { return new Object[][] { // The matched URI of the specified system id is defined in // a delegate catalog file of the current catalog file. @@ -79,7 +82,7 @@ public class DelegateSystemTest { } @DataProvider(name = "systemId-expectedExceptionClass") - private Object[][] dataOnException() { + public Object[][] dataOnException() { return new Object[][] { // The matched delegateSystem entry of the specified system id // defines a non-existing delegate catalog file. That should @@ -97,3 +100,4 @@ public class DelegateSystemTest { return catalogResolver("delegateSystem.xml"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/DelegateUriTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/DelegateUriTest.java index 956df3adda4..44addf59575 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/DelegateUriTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/DelegateUriTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -31,15 +31,18 @@ import javax.xml.catalog.CatalogException; import javax.xml.catalog.CatalogUriResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.DelegateUriTest + * @run testng/othervm catalog.DelegateUriTest * @summary Get matched URIs from delegateURI entries. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class DelegateUriTest { @Test(dataProvider = "uri-matchedUri") @@ -48,7 +51,7 @@ public class DelegateUriTest { } @DataProvider(name = "uri-matchedUri") - private Object[][] data() { + public Object[][] data() { return new Object[][] { // The matched URI of the specified URI reference is defined in // a delegate catalog file of the current catalog file. @@ -78,7 +81,7 @@ public class DelegateUriTest { } @DataProvider(name = "uri-expectedExceptionClass") - private Object[][] dataOnException() { + public Object[][] dataOnException() { return new Object[][] { // The matched delegateURI entry of the specified URI reference // defines a non-existing delegate catalog file. That should @@ -96,3 +99,4 @@ public class DelegateUriTest { return catalogUriResolver("delegateUri.xml"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/GroupTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/GroupTest.java index f73af2306e2..fd2766896cd 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/GroupTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/GroupTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -32,16 +32,19 @@ import static catalog.ResolutionChecker.checkUriResolution; import javax.xml.catalog.CatalogResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.GroupTest + * @run testng/othervm catalog.GroupTest * @summary Get matched URIs from system, public and uri entries respectively, * and some of the entries are enclosed by group entries. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class GroupTest { private static final String CATALOG_GROUP = "group.xml"; @@ -52,7 +55,7 @@ public class GroupTest { } @DataProvider(name = "systemId-matchedUri") - private Object[][] dataOnSysId() { + public Object[][] dataOnSysId() { return new Object[][] { // The matched URI of the specified system id is enclosed by a // group entry. @@ -78,7 +81,7 @@ public class GroupTest { } @DataProvider(name = "publicId-matchedUri") - private Object[][] dataOnPubId() { + public Object[][] dataOnPubId() { return new Object[][] { // The matched URI of the specified public id is enclosed by a // group entry. @@ -104,7 +107,7 @@ public class GroupTest { } @DataProvider(name = "uri-matchedUri") - private Object[][] dataOnUri() { + public Object[][] dataOnUri() { return new Object[][] { // The matched URI of the specified URI reference is enclosed by // a group entry. @@ -128,3 +131,4 @@ public class GroupTest { return catalogResolver(CATALOG_GROUP); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/LoadCatalogTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/LoadCatalogTest.java index d5a3734a640..b985876bb07 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/LoadCatalogTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/LoadCatalogTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -36,17 +36,20 @@ import javax.xml.catalog.CatalogResolver; import javax.xml.catalog.CatalogUriResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.LoadCatalogTest + * @run testng/othervm catalog.LoadCatalogTest * @summary When catalog resolver loads catalog files, the current catalog file * and the catalog files specified by the nextCatalog entries may not * accessible. This case tests how does the resolver handle this issue. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class LoadCatalogTest { private static final String CATALOG_LOADCATALOGFILES = "loadCatalogFiles.xml"; @@ -62,7 +65,7 @@ public class LoadCatalogTest { } @DataProvider(name = "entityResolver") - private Object[][] entityResolver() { + public Object[][] entityResolver() { return new Object[][] { // This EntityResolver loads multiple catalog files one by one. // All of the files are available. @@ -82,7 +85,7 @@ public class LoadCatalogTest { } @DataProvider(name = "uriResolver") - private Object[][] uriResolver() { + public Object[][] uriResolver() { return new Object[][] { // This URIResolver loads multiple catalog files one by one. // All of the files are available. @@ -108,7 +111,7 @@ public class LoadCatalogTest { } @DataProvider(name = "catalogName") - private Object[][] catalogName() { + public Object[][] catalogName() { return new Object[][] { // This catalog file set includes null catalog files. { (String[]) null }, @@ -118,3 +121,4 @@ public class LoadCatalogTest { { new String[] { CATALOG_LOADCATALOGFILES } } }; } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/NextCatalogTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/NextCatalogTest.java index 688a669e96c..3f14dcda3e0 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/NextCatalogTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/NextCatalogTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -33,16 +33,19 @@ import javax.xml.catalog.CatalogResolver; import javax.xml.catalog.CatalogUriResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.NextCatalogTest + * @run testng/othervm catalog.NextCatalogTest * @summary Get matched URIs from system, public and uri entries respectively, * but some of the entries are defined in none-current catalog files. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class NextCatalogTest { private static final String CATALOG_NEXTCATALOGLEFT @@ -56,7 +59,7 @@ public class NextCatalogTest { } @DataProvider(name = "systemId-matchedUri") - private Object[][] dataOnSysId() { + public Object[][] dataOnSysId() { return new Object[][] { // This matched URI of the specified system id is defined in a // next catalog file. @@ -88,7 +91,7 @@ public class NextCatalogTest { } @DataProvider(name = "publicId-matchedUri") - private Object[][] dataOnPubId() { + public Object[][] dataOnPubId() { return new Object[][] { // This matched URI of the specified public id is defined in a // next catalog file. @@ -120,7 +123,7 @@ public class NextCatalogTest { } @DataProvider(name = "uri-matchedUri") - private Object[][] dataOnUri() { + public Object[][] dataOnUri() { return new Object[][] { // This matched URI of the specified URI reference is defined in // a next catalog file. @@ -156,3 +159,4 @@ public class NextCatalogTest { CATALOG_NEXTCATALOGRIGHT); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/NormalizationTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/NormalizationTest.java index 882e17e3c6c..b7715c0f69b 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/NormalizationTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/NormalizationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -33,18 +33,21 @@ import javax.xml.catalog.CatalogResolver; import javax.xml.catalog.CatalogUriResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.NormalizationTest + * @run testng/othervm catalog.NormalizationTest * @summary Before matching identifiers and URI references, it has to normalize * the passed identifiers and URI references. And then the catalog * resolver uses the normalized stuff to search the counterparts in * catalog files. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class NormalizationTest { private static final String CATALOG_NORMALIZATION = "normalization.xml"; @@ -65,7 +68,7 @@ public class NormalizationTest { } @DataProvider(name = "systemId_uri-matchedUri") - private Object[][] dataOnSysIdAndUri() { + public Object[][] dataOnSysIdAndUri() { return new Object[][] { // The specified system id/URI reference contains spaces. And // the counterparts in system/uri entries also contain spaces. @@ -87,7 +90,7 @@ public class NormalizationTest { } @DataProvider(name = "publicId-matchedUri") - private Object[][] dataOnPubId() { + public Object[][] dataOnPubId() { return new Object[][] { // The specified public id contains spaces. And the counterparts // in public entry also contains spaces. @@ -112,3 +115,4 @@ public class NormalizationTest { return catalogUriResolver(CATALOG_NORMALIZATION); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/PreferFeatureTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/PreferFeatureTest.java index 61d7c146d54..c449771b135 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/PreferFeatureTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/PreferFeatureTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -33,16 +33,20 @@ import javax.xml.catalog.CatalogFeatures; import javax.xml.catalog.CatalogResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.PreferFeatureTest + * @run testng/othervm catalog.PreferFeatureTest * @summary This case tests how does the feature affect the catalog resolution, * and tests the priority between this feature and attribute prefer * in catalog file. - * @compile ../../libs/catalog/CatalogTestUtils.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class PreferFeatureTest { @Test(dataProvider = "prefer-publicId-systemId", @@ -53,7 +57,7 @@ public class PreferFeatureTest { } @DataProvider(name = "prefer-publicId-systemId") - private Object[][] data() { + public Object[][] data() { return new Object[][] { // The feature prefer is system. There's a match for the // specified public id, and no match for the specified system id. @@ -77,3 +81,4 @@ public class PreferFeatureTest { "preferFeature.xml"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/PreferTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/PreferTest.java index ef03ff80856..2f73bb7cb4a 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/PreferTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/PreferTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -29,18 +29,21 @@ import static catalog.ResolutionChecker.checkExtIdResolution; import javax.xml.catalog.CatalogResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.PreferTest + * @run testng/othervm catalog.PreferTest * @summary Get matched URIs from system and public family entries, which * specify the prefer attribute. It tests how does the prefer attribute * affect the resolution procedure. The test rule is based on OASIS * Standard V1.1 section 4.1.1. "The prefer attribute". - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class PreferTest { @Test(dataProvider = "publicId-systemId-matchedUri") @@ -50,7 +53,7 @@ public class PreferTest { } @DataProvider(name = "publicId-systemId-matchedUri") - private Object[][] data() { + public Object[][] data() { return new Object[][] { // The prefer attribute is public. Both of the specified public // id and system id have matches in the catalog file. But @@ -89,3 +92,4 @@ public class PreferTest { return catalogResolver("prefer.xml"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/PublicFamilyTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/PublicFamilyTest.java index c0e76434e80..e149949f98a 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/PublicFamilyTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/PublicFamilyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -30,18 +30,21 @@ import static catalog.ResolutionChecker.checkPubIdResolution; import javax.xml.catalog.CatalogException; import javax.xml.catalog.CatalogResolver; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.PublicFamilyTest + * @run testng/othervm catalog.PublicFamilyTest * @summary Get matched URIs from public and delegatePublic entries. * It tests the resolution priorities among the public family entries. * The test rule is based on OASIS Standard V1.1 section 7.1.2. * "Resolution of External Identifiers". - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class PublicFamilyTest { /* @@ -67,3 +70,4 @@ public class PublicFamilyTest { return catalogResolver("publicFamily.xml"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/PublicTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/PublicTest.java index d63df96abff..48c103e4203 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/PublicTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/PublicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -32,15 +32,18 @@ import javax.xml.catalog.CatalogException; import javax.xml.catalog.CatalogResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.PublicTest + * @run testng/othervm catalog.PublicTest * @summary Get matched URIs from public entries. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class PublicTest { @Test(dataProvider = "publicId-matchedUri") @@ -89,3 +92,4 @@ public class PublicTest { return catalogResolver(CATALOG_PUBLIC); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/ResolveFeatureTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/ResolveFeatureTest.java index 4aa74650049..9cb29bd3694 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/ResolveFeatureTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/ResolveFeatureTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -40,16 +40,19 @@ import javax.xml.catalog.CatalogFeatures.Feature; import javax.xml.catalog.CatalogResolver; import javax.xml.catalog.CatalogUriResolver; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.ResolveFeatureTest + * @run testng/othervm catalog.ResolveFeatureTest * @summary This case tests how does resolve feature affect the catalog * resolution. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class ResolveFeatureTest { /* @@ -128,3 +131,4 @@ public class ResolveFeatureTest { return builder().with(Feature.RESOLVE, resolve).build(); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/RewriteSystemTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/RewriteSystemTest.java index c00f6b52d8d..fb45816981c 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/RewriteSystemTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/RewriteSystemTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -31,15 +31,18 @@ import javax.xml.catalog.CatalogException; import javax.xml.catalog.CatalogResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.RewriteSystemTest + * @run testng/othervm catalog.RewriteSystemTest * @summary Get matched URIs from rewriteSystem entries. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class RewriteSystemTest { @Test(dataProvider = "systemId-matchedUri") @@ -92,3 +95,4 @@ public class RewriteSystemTest { return catalogResolver("rewriteSystem.xml"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/RewriteUriTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/RewriteUriTest.java index 5032a898f78..0a449420bd1 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/RewriteUriTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/RewriteUriTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -31,15 +31,18 @@ import javax.xml.catalog.CatalogException; import javax.xml.catalog.CatalogUriResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.RewriteUriTest + * @run testng/othervm catalog.RewriteUriTest * @summary Get matched URIs from rewriteURI entries. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class RewriteUriTest { @Test(dataProvider = "uri-matchedUri") @@ -92,3 +95,4 @@ public class RewriteUriTest { return catalogUriResolver("rewriteUri.xml"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/SpecifyCatalogTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/SpecifyCatalogTest.java index a1be6d229b4..6085e6e60a2 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/SpecifyCatalogTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/SpecifyCatalogTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -23,6 +23,8 @@ package catalog; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + import static catalog.CatalogTestUtils.FEATURE_FILES; import static catalog.CatalogTestUtils.catalogResolver; import static catalog.CatalogTestUtils.catalogUriResolver; @@ -36,15 +38,18 @@ import javax.xml.catalog.CatalogFeatures; import javax.xml.catalog.CatalogResolver; import javax.xml.catalog.CatalogUriResolver; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.SpecifyCatalogTest + * @run testng/othervm catalog.SpecifyCatalogTest * @summary This case tests how to specify the catalog files. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class SpecifyCatalogTest { private static final String ID_URI = "http://remote/dtd/uri/doc.dtd"; @@ -76,7 +81,7 @@ public class SpecifyCatalogTest { */ @Test public void specifyCatalogViaSysProps() { - System.setProperty(FEATURE_FILES, + setSystemProperty(FEATURE_FILES, getCatalogPath("specifyCatalog-sysProps.xml")); checkResolutionOnEntityResolver(catalogResolver((String[]) null), @@ -106,3 +111,4 @@ public class SpecifyCatalogTest { return builder().with(FILES, getCatalogPath(catalogName)).build(); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/SystemFamilyTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/SystemFamilyTest.java index 9bd3c799813..aa921b5ef50 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/SystemFamilyTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/SystemFamilyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -31,18 +31,21 @@ import javax.xml.catalog.CatalogException; import javax.xml.catalog.CatalogResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.SystemFamilyTest + * @run testng/othervm catalog.SystemFamilyTest * @summary Get matched URIs from system, rewriteSystem, systemSuffix and * delegateSystem entries. It tests the resolution priorities among * the system family entries. The test rule is based on OASIS * Standard V1.1 section 7.1.2. "Resolution of External Identifiers". - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class SystemFamilyTest { @Test(dataProvider = "systemId-matchedUri") @@ -81,3 +84,4 @@ public class SystemFamilyTest { return catalogResolver("systemFamily.xml"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/SystemSuffixTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/SystemSuffixTest.java index 9ebd18a19f6..97622704682 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/SystemSuffixTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/SystemSuffixTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -31,15 +31,18 @@ import javax.xml.catalog.CatalogException; import javax.xml.catalog.CatalogResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.SystemSuffixTest + * @run testng/othervm catalog.SystemSuffixTest * @summary Get matched URIs from systemSuffix entries. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class SystemSuffixTest { @Test(dataProvider = "systemId-matchedUri") @@ -92,3 +95,4 @@ public class SystemSuffixTest { return catalogResolver("systemSuffix.xml"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/SystemTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/SystemTest.java index 74dab681b83..d78029319bd 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/SystemTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/SystemTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -32,15 +32,18 @@ import javax.xml.catalog.CatalogException; import javax.xml.catalog.CatalogResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.SystemTest + * @run testng/othervm catalog.SystemTest * @summary Get matched URIs from system entries. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class SystemTest { @Test(dataProvider = "systemId-matchedUri") @@ -89,3 +92,4 @@ public class SystemTest { return catalogResolver(CATALOG_SYSTEM); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/UriFamilyTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/UriFamilyTest.java index f2e19c6c7a1..f6104e8d15d 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/UriFamilyTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/UriFamilyTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -31,18 +31,21 @@ import javax.xml.catalog.CatalogException; import javax.xml.catalog.CatalogUriResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.UriFamilyTest + * @run testng/othervm catalog.UriFamilyTest * @summary Get matched URIs from uri, rewriteURI, uriSuffix and delegateURI * entries. It tests the resolution priorities among the uri family * entries. The test rule is based on OASIS Standard V1.1 section * 7.2.2. "Resolution of External Identifiers". - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class UriFamilyTest { @Test(dataProvider = "uri-matchedUri") @@ -81,3 +84,4 @@ public class UriFamilyTest { return catalogUriResolver("uriFamily.xml"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/UriSuffixTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/UriSuffixTest.java index e79cdf82441..9cc4a2736e2 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/UriSuffixTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/UriSuffixTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -31,15 +31,18 @@ import javax.xml.catalog.CatalogException; import javax.xml.catalog.CatalogUriResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.UriSuffixTest + * @run testng/othervm catalog.UriSuffixTest * @summary Get matched URIs from rewriteURI entries. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class UriSuffixTest { @Test(dataProvider = "uri-matchedUri") @@ -92,3 +95,4 @@ public class UriSuffixTest { return catalogUriResolver("uriSuffix.xml"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/UriTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/UriTest.java index 88a166635a0..ae17e34c6a1 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/UriTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/UriTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -34,15 +34,18 @@ import javax.xml.catalog.CatalogFeatures; import javax.xml.catalog.CatalogUriResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.UriTest + * @run testng/othervm catalog.UriTest * @summary Get matched URIs from uri entries. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class UriTest { @Test(dataProvider = "uri-matchedUri") @@ -101,3 +104,4 @@ public class UriTest { return catalogUriResolver(CATALOG_URI); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/UrnUnwrappingTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/UrnUnwrappingTest.java index e2281ea221f..468de7ef528 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/UrnUnwrappingTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/UrnUnwrappingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -29,17 +29,20 @@ import static catalog.ResolutionChecker.checkPubIdResolution; import javax.xml.catalog.CatalogResolver; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.UrnUnwrappingTest + * @run testng/othervm catalog.UrnUnwrappingTest * @summary If the passed public identifier is started with "urn:publicid:", * it has to be regarded as URN and normalized. And then the catalog * resolver uses the normalized stuff to do matching. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class UrnUnwrappingTest { @Test(dataProvider = "urn-matchedUri") @@ -48,7 +51,7 @@ public class UrnUnwrappingTest { } @DataProvider(name = "urn-matchedUri") - private Object[][] data() { + public Object[][] data() { return new Object[][] { // The specified public id is URN format. { "urn:publicid:-:REMOTE:DTD+ALICE+DOCALICE+XML:EN", @@ -64,3 +67,4 @@ public class UrnUnwrappingTest { return catalogResolver("urnUnwrapping.xml"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/catalog/ValidateCatalogTest.java b/jaxp/test/javax/xml/jaxp/functional/catalog/ValidateCatalogTest.java index 2b4170c3cbb..d0194ca4009 100644 --- a/jaxp/test/javax/xml/jaxp/functional/catalog/ValidateCatalogTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/catalog/ValidateCatalogTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -32,17 +32,20 @@ import static catalog.ResolutionChecker.checkUriResolution; import javax.xml.catalog.CatalogException; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* * @test * @bug 8077931 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true catalog.ValidateCatalogTest + * @run testng/othervm catalog.ValidateCatalogTest * @summary A legal catalog file must be well-formed XML, the root element * must be catalog, and the naming space of the root element must be * urn:oasis:names:tc:entity:xmlns:xml:catalog. - * @compile ../../libs/catalog/CatalogTestUtils.java - * @compile ../../libs/catalog/ResolutionChecker.java */ +@Listeners({jaxp.library.FilePolicy.class}) public class ValidateCatalogTest { private static final String CATALOG_WRONGROOT = "validateCatalog-wrongRoot.xml"; @@ -99,3 +102,4 @@ public class ValidateCatalogTest { "http://local/dtd/docAliceURI.dtd"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java index f18cf9c6c29..2a27b942859 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/DurationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -44,17 +44,21 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.Duration; import javax.xml.namespace.QName; -import jaxp.library.JAXPBaseTest; - import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.datatype.ptests.DurationTest + * @run testng/othervm javax.xml.datatype.ptests.DurationTest * @summary Class containing the test cases for Duration. */ -public class DurationTest extends JAXPBaseTest { +@Listeners({jaxp.library.BasePolicy.class}) +public class DurationTest { private DatatypeFactory datatypeFactory; @@ -583,3 +587,4 @@ public class DurationTest extends JAXPBaseTest { private final BigInteger one = BigInteger.ONE; } + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java index 48f4a19c8d5..8f21a2b23a1 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/FactoryNewInstanceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -30,15 +30,20 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.Duration; import jaxp.library.JAXPDataProvider; -import jaxp.library.JAXPBaseTest; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.datatype.ptests.FactoryNewInstanceTest + * @run testng/othervm javax.xml.datatype.ptests.FactoryNewInstanceTest * @summary Tests for DatatypeFactory.newInstance(factoryClassName , classLoader) */ -public class FactoryNewInstanceTest extends JAXPBaseTest { +@Listeners({jaxp.library.BasePolicy.class}) +public class FactoryNewInstanceTest { private static final String DATATYPE_FACTORY_CLASSNAME = "com.sun.org.apache.xerces.internal.jaxp.datatype.DatatypeFactoryImpl"; @@ -72,3 +77,4 @@ public class FactoryNewInstanceTest extends JAXPBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java index 3b47d519368..bd98ec9690d 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/datatype/ptests/XMLGregorianCalendarTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -39,18 +39,22 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.Duration; import javax.xml.datatype.XMLGregorianCalendar; -import jaxp.library.JAXPBaseTest; - import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 5049592 5041845 5048932 5064587 5040542 5049531 5049528 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.datatype.ptests.XMLGregorianCalendarTest + * @run testng/othervm javax.xml.datatype.ptests.XMLGregorianCalendarTest * @summary Class containing the test cases for XMLGregorianCalendar */ -public class XMLGregorianCalendarTest extends JAXPBaseTest { +@Listeners({jaxp.library.BasePolicy.class}) +public class XMLGregorianCalendarTest { private DatatypeFactory datatypeFactory; @@ -354,3 +358,4 @@ public class XMLGregorianCalendarTest extends JAXPBaseTest { private final int undef = DatatypeConstants.FIELD_UNDEFINED; } + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java index 6c2f073342b..9eec7901ffd 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DBFNamespaceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -23,18 +23,21 @@ package javax.xml.parsers.ptests; +import static javax.xml.parsers.ptests.ParserTestConst.GOLDEN_DIR; +import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR; import static jaxp.library.JAXPTestUtilities.USER_DIR; import static jaxp.library.JAXPTestUtilities.compareWithGold; import static org.testng.Assert.assertTrue; + import java.io.File; + import javax.xml.parsers.DocumentBuilderFactory; -import static javax.xml.parsers.ptests.ParserTestConst.GOLDEN_DIR; -import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXResult; -import jaxp.library.JAXPFileBaseTest; + import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; @@ -42,7 +45,14 @@ import org.w3c.dom.Document; * This tests DocumentBuilderFactory for namespace processing and no-namespace * processing. */ -public class DBFNamespaceTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.parsers.ptests.DBFNamespaceTest + * @run testng/othervm javax.xml.parsers.ptests.DBFNamespaceTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class DBFNamespaceTest { /** * Provide input for the cases that supporting namespace or not. @@ -95,3 +105,5 @@ public class DBFNamespaceTest extends JAXPFileBaseTest { } } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java index 77196ee720d..2419a23241e 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -40,7 +40,6 @@ import java.io.Closeable; import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.FilePermission; import java.io.FileReader; import javax.xml.parsers.DocumentBuilder; @@ -55,9 +54,9 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXResult; import jaxp.library.JAXPDataProvider; -import jaxp.library.JAXPFileBaseTest; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -70,7 +69,14 @@ import org.xml.sax.helpers.DefaultHandler; * @bug 8080907 * This checks the methods of DocumentBuilderFactoryImpl. */ -public class DocumentBuilderFactoryTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.parsers.ptests.DocumentBuilderFactoryTest + * @run testng/othervm javax.xml.parsers.ptests.DocumentBuilderFactoryTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class DocumentBuilderFactoryTest { /** * DocumentBuilderFactory implementation class name. */ @@ -419,8 +425,6 @@ public class DocumentBuilderFactoryTest extends JAXPFileBaseTest { @Test public void testCheckDocumentBuilderFactory13() throws Exception { // Accesing default working directory. - String workingDir = getSystemProperty("user.dir"); - setPermissions(new FilePermission(workingDir + "/*", "read")); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); DocumentBuilder docBuilder = dbf.newDocumentBuilder(); Document doc = docBuilder.parse(new File(XML_DIR + "dbf10import.xsl") @@ -436,8 +440,6 @@ public class DocumentBuilderFactoryTest extends JAXPFileBaseTest { @Test(expectedExceptions = SAXException.class) public void testCheckDocumentBuilderFactory14() throws Exception { // Accesing default working directory. - String workingDir = getSystemProperty("user.dir"); - setPermissions(new FilePermission(workingDir, "read")); DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); DocumentBuilder docBuilder = dbf.newDocumentBuilder(); docBuilder.parse(""); @@ -529,3 +531,5 @@ public class DocumentBuilderFactoryTest extends JAXPFileBaseTest { assertTrue(compareWithGold(goldFile, outputFile)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java index 144df205131..e805094f887 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/DocumentBuilderImpl01.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -23,18 +23,21 @@ package javax.xml.parsers.ptests; +import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR; import static jaxp.library.JAXPTestUtilities.FILE_SEP; import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; + import java.io.File; import java.io.FileInputStream; import java.io.FilePermission; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR; -import jaxp.library.JAXPFileReadOnlyBaseTest; -import static org.testng.Assert.assertNotNull; + import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.EntityResolver; import org.xml.sax.InputSource; @@ -42,8 +45,14 @@ import org.xml.sax.InputSource; /** * This checks for the methods of DocumentBuilder */ -public class DocumentBuilderImpl01 extends JAXPFileReadOnlyBaseTest - implements EntityResolver { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.parsers.ptests.DocumentBuilderImpl01 + * @run testng/othervm javax.xml.parsers.ptests.DocumentBuilderImpl01 + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class DocumentBuilderImpl01 implements EntityResolver { /** * Provide DocumentBuilder. * @@ -82,7 +91,7 @@ public class DocumentBuilderImpl01 extends JAXPFileReadOnlyBaseTest * @param docBuilder document builder instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "builder-provider") + @Test(dataProvider = "builder-provider") public void testCheckDocumentBuilderImpl04(DocumentBuilder docBuilder) throws Exception { try (FileInputStream fis = new FileInputStream(new File(XML_DIR, @@ -97,7 +106,7 @@ public class DocumentBuilderImpl01 extends JAXPFileReadOnlyBaseTest * @param docBuilder document builder instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "builder-provider") + @Test(dataProvider = "builder-provider") public void testCheckDocumentBuilderImpl05(DocumentBuilder docBuilder) throws Exception { assertNotNull(docBuilder.parse(new File(XML_DIR, @@ -109,11 +118,9 @@ public class DocumentBuilderImpl01 extends JAXPFileReadOnlyBaseTest * @param docBuilder document builder instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "builder-provider") + @Test(dataProvider = "builder-provider") public void testCheckDocumentBuilderImpl06(DocumentBuilder docBuilder) throws Exception { - setPermissions(new FilePermission(XML_DIR + "../-", - "read")); try (FileInputStream fis = new FileInputStream(new File(XML_DIR, "DocumentBuilderImpl02.xml"))) { assertNotNull(docBuilder.parse(fis, new File(XML_DIR).toURI() @@ -150,3 +157,5 @@ public class DocumentBuilderImpl01 extends JAXPFileReadOnlyBaseTest return null; } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java index 88a66dd5506..32c25b30c0b 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/FactoryConfErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -23,20 +23,30 @@ package javax.xml.parsers.ptests; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; +import static jaxp.library.JAXPTestUtilities.clearSystemProperty; + import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPBaseTest; import org.testng.annotations.AfterTest; import org.testng.annotations.BeforeTest; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /** * Class containing the test cases for SAXParserFactory/DocumentBuilderFactory * newInstance methods. */ -public class FactoryConfErrorTest extends JAXPBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.parsers.ptests.FactoryConfErrorTest + * @run testng/othervm javax.xml.parsers.ptests.FactoryConfErrorTest + */ +@Listeners({jaxp.library.BasePolicy.class}) +public class FactoryConfErrorTest { /** * Set properties DocumentBuilderFactory and SAXParserFactory to invalid @@ -54,8 +64,8 @@ public class FactoryConfErrorTest extends JAXPBaseTest { */ @AfterTest public void cleanup() { - setSystemProperty("javax.xml.parsers.DocumentBuilderFactory", null); - setSystemProperty("javax.xml.parsers.SAXParserFactory", null); + clearSystemProperty("javax.xml.parsers.DocumentBuilderFactory"); + clearSystemProperty("javax.xml.parsers.SAXParserFactory"); } /** @@ -76,3 +86,5 @@ public class FactoryConfErrorTest extends JAXPBaseTest { DocumentBuilderFactory.newInstance(); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java index d2f3561af9c..e4db5b4e3a2 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXFactoryNewInstanceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -31,16 +31,21 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import jaxp.library.JAXPDataProvider; -import jaxp.library.JAXPBaseTest; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.parsers.ptests.SAXFactoryNewInstanceTest + * @run testng/othervm javax.xml.parsers.ptests.SAXFactoryNewInstanceTest * @summary Tests for SAXParserFactory.newInstance(factoryClassName , classLoader) */ -public class SAXFactoryNewInstanceTest extends JAXPBaseTest { +@Listeners({jaxp.library.BasePolicy.class}) +public class SAXFactoryNewInstanceTest { private static final String SAXPARSER_FACTORY_CLASSNAME = "com.sun.org.apache.xerces.internal.jaxp.SAXParserFactoryImpl"; @@ -73,3 +78,5 @@ public class SAXFactoryNewInstanceTest extends JAXPBaseTest { } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java index 8c84ed85cc0..6b8245a43cc 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserFactTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -24,14 +24,23 @@ package javax.xml.parsers.ptests; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; + import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPBaseTest; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /** * Class containing the test cases for SAXParserFactory API. */ -public class SAXParserFactTest extends JAXPBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.parsers.ptests.SAXParserFactTest + * @run testng/othervm javax.xml.parsers.ptests.SAXParserFactTest + */ +@Listeners({jaxp.library.BasePolicy.class}) +public class SAXParserFactTest { private static final String NAMESPACES = "http://xml.org/sax/features/namespaces"; private static final String NAMESPACE_PREFIXES = "http://xml.org/sax/features/namespace-prefixes"; @@ -220,3 +229,5 @@ public class SAXParserFactTest extends JAXPBaseTest { assertFalse(spf.getFeature(EXTERNAL_P_ENTITIES)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java index 920f0917ff7..adc1b657c23 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -23,15 +23,23 @@ package javax.xml.parsers.ptests; +import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR; +import static jaxp.library.JAXPTestUtilities.USER_DIR; +import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission; + import java.io.File; import java.io.FileInputStream; import java.io.FilePermission; import java.io.IOException; +import java.util.PropertyPermission; + import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR; -import jaxp.library.JAXPFileReadOnlyBaseTest; + +import jaxp.library.JAXPTestUtilities; + import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.HandlerBase; import org.xml.sax.InputSource; @@ -41,7 +49,14 @@ import org.xml.sax.helpers.DefaultHandler; /** * Class contains the test cases for SAXParser API */ -public class SAXParserTest extends JAXPFileReadOnlyBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.parsers.ptests.SAXParserTest + * @run testng/othervm javax.xml.parsers.ptests.SAXParserTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class SAXParserTest { /** * Provide SAXParser. * @@ -92,13 +107,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { @Test(expectedExceptions = { SAXException.class }, dataProvider = "parser-provider") public void testParse03(SAXParser saxparser) throws Exception { - String workingDir = getSystemProperty("user.dir"); - setPermissions(new FilePermission(workingDir, "read")); - try { - saxparser.parse("", new HandlerBase()); - } finally { - setPermissions(); - } + saxparser.parse("", new HandlerBase()); } /** @@ -124,13 +133,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { */ @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider") public void testParse05(SAXParser saxparser) throws Exception { - String workingDir = getSystemProperty("user.dir"); - setPermissions(new FilePermission(workingDir, "read")); - try { - saxparser.parse(new File(""), new HandlerBase()); - } finally { - setPermissions(); - } + tryRunWithTmpPermission(() -> saxparser.parse(new File(""), new HandlerBase()), new PropertyPermission("user.dir", "read")); } /** @@ -176,23 +179,18 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { } /** - * Test with non-existence URI, parsing should fail and throw - * SAXException or IOException. + * Test with non-existence URI, parsing should fail and throw SAXException + * or IOException. * - * @param saxparser a SAXParser instance. - * @throws Exception If any errors occur. + * @param saxparser + * a SAXParser instance. + * @throws Exception + * If any errors occur. */ - @Test(expectedExceptions = { SAXException.class, IOException.class }, - dataProvider = "parser-provider") + @Test(expectedExceptions = { SAXException.class, IOException.class }, dataProvider = "parser-provider") public void testParse09(SAXParser saxparser) throws Exception { - String workingDir = getSystemProperty("user.dir"); - setPermissions(new FilePermission(workingDir + "/../-", "read")); - String uri = " "; - try { - saxparser.parse(uri, new DefaultHandler()); - } finally { - setPermissions(); - } + JAXPTestUtilities.tryRunWithTmpPermission(() -> saxparser.parse(" ", new DefaultHandler()), + new FilePermission(USER_DIR + " ", "read")); } /** @@ -204,14 +202,8 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { */ @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider") public void testParse10(SAXParser saxparser) throws Exception { - String workingDir = getSystemProperty("user.dir"); - setPermissions(new FilePermission(workingDir, "read")); File file = new File(""); - try { - saxparser.parse(file, new DefaultHandler()); - } finally { - setPermissions(); - } + tryRunWithTmpPermission(() -> saxparser.parse(file, new DefaultHandler()), new PropertyPermission("user.dir", "read")); } /** @@ -248,7 +240,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class, + @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider") public void testParse13(SAXParser saxparser) throws Exception { try (FileInputStream instream = new FileInputStream(new File( @@ -263,7 +255,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider") + @Test(dataProvider = "parser-provider") public void testParse14(SAXParser saxparser) throws Exception { saxparser.parse(new File(XML_DIR, "parsertest.xml"), new HandlerBase()); @@ -276,7 +268,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider") + @Test(dataProvider = "parser-provider") public void testParse15(SAXParser saxparser) throws Exception { try (FileInputStream instream = new FileInputStream(new File(XML_DIR, "correct.xml"))) { @@ -291,7 +283,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider") + @Test(dataProvider = "parser-provider") public void testParse16(SAXParser saxparser) throws Exception { try (FileInputStream instream = new FileInputStream( new File(XML_DIR, "parsertest.xml"))) { @@ -306,7 +298,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider") + @Test(dataProvider = "parser-provider") public void testParse17(SAXParser saxparser) throws Exception { File file = new File(XML_DIR, "correct.xml"); saxparser.parse(file.toURI().toASCIIString(), new HandlerBase()); @@ -319,7 +311,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class, + @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider") public void testParse18(SAXParser saxparser) throws Exception { saxparser.parse(new File(XML_DIR, "valid.xml"), new HandlerBase()); @@ -332,7 +324,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider") + @Test(dataProvider = "parser-provider") public void testParse19(SAXParser saxparser) throws Exception { saxparser.parse(new File(XML_DIR, "correct.xml"), new HandlerBase()); } @@ -344,7 +336,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class, + @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider") public void testParse20(SAXParser saxparser) throws Exception { try(FileInputStream instream = new FileInputStream(new File(XML_DIR, @@ -360,7 +352,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider") + @Test(dataProvider = "parser-provider") public void testParse21(SAXParser saxparser) throws Exception { try (FileInputStream instream = new FileInputStream(new File(XML_DIR, "correct.xml"))) { @@ -375,7 +367,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class, + @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider") public void testParse22(SAXParser saxparser) throws Exception { try (FileInputStream instream = new FileInputStream( @@ -391,7 +383,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider") + @Test(dataProvider = "parser-provider") public void testParse23(SAXParser saxparser) throws Exception { DefaultHandler handler = new DefaultHandler(); saxparser.parse(new File(XML_DIR, "parsertest.xml"), handler); @@ -404,7 +396,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider") + @Test(dataProvider = "parser-provider") public void testParse24(SAXParser saxparser) throws Exception { try (FileInputStream instream = new FileInputStream(new File(XML_DIR, "correct.xml"))) { @@ -420,7 +412,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider") + @Test(dataProvider = "parser-provider") public void testParse25(SAXParser saxparser) throws Exception { try (FileInputStream instream = new FileInputStream( new File(XML_DIR, "parsertest.xml"))) { @@ -435,7 +427,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider") + @Test(dataProvider = "parser-provider") public void testParse26(SAXParser saxparser) throws Exception { File file = new File(XML_DIR, "correct.xml"); saxparser.parse(file.toURI().toASCIIString(), new DefaultHandler()); @@ -448,7 +440,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class, + @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider") public void testParse27(SAXParser saxparser) throws Exception { saxparser.parse(new File(XML_DIR, "valid.xml"), new DefaultHandler()); @@ -461,7 +453,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider") + @Test(dataProvider = "parser-provider") public void testParse28(SAXParser saxparser) throws Exception { saxparser.parse(new File(XML_DIR, "correct.xml"), new DefaultHandler()); } @@ -472,7 +464,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class, + @Test(expectedExceptions = SAXException.class, dataProvider = "parser-provider") public void testParse29(SAXParser saxparser) throws Exception { try (FileInputStream instream = new FileInputStream( @@ -487,7 +479,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * @param saxparser a SAXParser instance. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "parser-provider") + @Test(dataProvider = "parser-provider") public void testParse30(SAXParser saxparser) throws Exception { try (FileInputStream instream = new FileInputStream( new File(XML_DIR, "correct.xml"))) { @@ -500,7 +492,7 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testParse31() throws Exception { try (FileInputStream instream = new FileInputStream( new File(XML_DIR, "ns4.xml"))) { @@ -510,3 +502,5 @@ public class SAXParserTest extends JAXPFileReadOnlyBaseTest { } } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java index c396d73259b..d7efae1b51a 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest02.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -24,13 +24,15 @@ package javax.xml.parsers.ptests; import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; + import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPBaseTest; -import static org.testng.Assert.assertNotNull; + import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; import org.xml.sax.SAXNotSupportedException; @@ -40,7 +42,14 @@ import org.xml.sax.ext.LexicalHandler; /** * Class contains the test cases for SAXParser API */ -public class SAXParserTest02 extends JAXPBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.parsers.ptests.SAXParserTest02 + * @run testng/othervm javax.xml.parsers.ptests.SAXParserTest02 + */ +@Listeners({jaxp.library.BasePolicy.class}) +public class SAXParserTest02 { private static final String DOM_NODE = "http://xml.org/sax/properties/dom-node"; private static final String XML_STRING = "http://xml.org/sax/properties/xml-string"; private static final String DECL_HANDLER = "http://xml.org/sax/properties/declaration-handler"; @@ -260,3 +269,5 @@ public class SAXParserTest02 extends JAXPBaseTest { } } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java index 636b1e29a90..e16a070bc2a 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/parsers/ptests/SAXParserTest03.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -23,25 +23,32 @@ package javax.xml.parsers.ptests; +import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + import java.io.File; -import java.io.FilePermission; + import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import static javax.xml.parsers.ptests.ParserTestConst.XML_DIR; -import jaxp.library.JAXPFileReadOnlyBaseTest; -import static org.testng.Assert.fail; -import org.testng.annotations.AfterGroups; -import org.testng.annotations.BeforeGroups; + import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /** * Class contains the test cases for SAXParser API */ -public class SAXParserTest03 extends JAXPFileReadOnlyBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.parsers.ptests.SAXParserTest03 + * @run testng/othervm javax.xml.parsers.ptests.SAXParserTest03 + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class SAXParserTest03 { /** * Provide SAXParserFactory. @@ -63,7 +70,7 @@ public class SAXParserTest03 extends JAXPFileReadOnlyBaseTest { * @param handler an error handler for capturing events. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "input-provider") + @Test(dataProvider = "input-provider") public void testParseValidate01(SAXParserFactory spf, MyErrorHandler handler) throws Exception { spf.newSAXParser().parse(new File(XML_DIR, "parsertest.xml"), handler); @@ -78,7 +85,7 @@ public class SAXParserTest03 extends JAXPFileReadOnlyBaseTest { * @param handler an error handler for capturing events. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "input-provider") + @Test(dataProvider = "input-provider") public void testParseValidate02(SAXParserFactory spf, MyErrorHandler handler) throws Exception { spf.setNamespaceAware(true); @@ -95,7 +102,7 @@ public class SAXParserTest03 extends JAXPFileReadOnlyBaseTest { * @param handler an error handler for capturing events. * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, dataProvider = "input-provider") + @Test(dataProvider = "input-provider") public void testParseValidate03(SAXParserFactory spf, MyErrorHandler handler) throws Exception { try { @@ -109,3 +116,5 @@ public class SAXParserTest03 extends JAXPFileReadOnlyBaseTest { } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java index eb991f071b2..9d588c3dea0 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLEventFactoryNewInstanceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -23,20 +23,28 @@ package javax.xml.stream.ptests; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; +import static jaxp.library.JAXPTestUtilities.clearSystemProperty; + import static org.testng.Assert.assertNotNull; import javax.xml.stream.XMLEventFactory; import jaxp.library.JAXPDataProvider; -import jaxp.library.JAXPBaseTest; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.stream.ptests.XMLEventFactoryNewInstanceTest + * @run testng/othervm javax.xml.stream.ptests.XMLEventFactoryNewInstanceTest * @summary Tests for XMLEventFactory.newFactory(factoryId , classLoader) */ -public class XMLEventFactoryNewInstanceTest extends JAXPBaseTest { +@Listeners({jaxp.library.BasePolicy.class}) +public class XMLEventFactoryNewInstanceTest { private static final String XMLEVENT_FACTORY_CLASSNAME = "com.sun.xml.internal.stream.events.XMLEventFactoryImpl"; private static final String XMLEVENT_FACRORY_ID = "javax.xml.stream.XMLEventFactory"; @@ -59,7 +67,7 @@ public class XMLEventFactoryNewInstanceTest extends JAXPBaseTest { XMLEventFactory xef = XMLEventFactory.newFactory(factoryId, classLoader); assertNotNull(xef); } finally { - setSystemProperty(XMLEVENT_FACRORY_ID, null); + clearSystemProperty(XMLEVENT_FACRORY_ID); } } @@ -74,3 +82,4 @@ public class XMLEventFactoryNewInstanceTest extends JAXPBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java index 0d5afe322e5..b983d76a7d8 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/stream/ptests/XMLInputFactoryNewInstanceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -23,20 +23,28 @@ package javax.xml.stream.ptests; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; +import static jaxp.library.JAXPTestUtilities.clearSystemProperty; + import static org.testng.Assert.assertNotNull; import javax.xml.stream.XMLInputFactory; import jaxp.library.JAXPDataProvider; -import jaxp.library.JAXPBaseTest; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.stream.ptests.XMLInputFactoryNewInstanceTest + * @run testng/othervm javax.xml.stream.ptests.XMLInputFactoryNewInstanceTest * @summary Tests for XMLInputFactory.newFactory(factoryId , classLoader) */ -public class XMLInputFactoryNewInstanceTest extends JAXPBaseTest { +@Listeners({jaxp.library.BasePolicy.class}) +public class XMLInputFactoryNewInstanceTest { private static final String XMLINPUT_FACTORY_CLASSNAME = "com.sun.xml.internal.stream.XMLInputFactoryImpl"; private static final String XMLINPUT_FACRORY_ID = "javax.xml.stream.XMLInputFactory"; @@ -59,7 +67,7 @@ public class XMLInputFactoryNewInstanceTest extends JAXPBaseTest { XMLInputFactory xif = XMLInputFactory.newFactory(factoryId, classLoader); assertNotNull(xif); } finally { - setSystemProperty(XMLINPUT_FACRORY_ID, null); + clearSystemProperty(XMLINPUT_FACRORY_ID); } } @@ -74,3 +82,4 @@ public class XMLInputFactoryNewInstanceTest extends JAXPBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java index bb227d3574c..8fce6a80440 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/Bug6384418Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -23,6 +23,8 @@ package javax.xml.transform.ptests; +import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; + import java.io.ByteArrayOutputStream; import java.io.File; @@ -34,17 +36,20 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPFileBaseTest; -import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; /* + * @test * @bug 6384418 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.Bug6384418Test + * @run testng/othervm javax.xml.transform.ptests.Bug6384418Test * @summary verify the transforming won't throw any exception */ -public class Bug6384418Test extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class Bug6384418Test { @Test public void test() throws Exception { @@ -62,3 +67,5 @@ public class Bug6384418Test extends JAXPFileBaseTest { } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java index 42069ea2785..b1a86f73e64 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/DOMResultTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -23,20 +23,23 @@ package javax.xml.transform.ptests; -import java.io.BufferedWriter; -import java.io.FileWriter; -import java.io.IOException; -import javax.xml.transform.TransformerFactory; -import javax.xml.transform.dom.DOMResult; import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR; import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.sax.SAXTransformerFactory; -import javax.xml.transform.sax.TransformerHandler; -import jaxp.library.JAXPFileBaseTest; import static jaxp.library.JAXPTestUtilities.USER_DIR; import static jaxp.library.JAXPTestUtilities.compareWithGold; import static org.testng.Assert.assertTrue; + +import java.io.BufferedWriter; +import java.io.FileWriter; +import java.io.IOException; + +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.dom.DOMResult; +import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.sax.SAXTransformerFactory; +import javax.xml.transform.sax.TransformerHandler; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Attr; import org.w3c.dom.NamedNodeMap; @@ -50,7 +53,14 @@ import org.xml.sax.helpers.XMLReaderFactory; * DOM parse on test file to be compared with golden output file. No Exception * is expected. */ -public class DOMResultTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.DOMResultTest + * @run testng/othervm javax.xml.transform.ptests.DOMResultTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class DOMResultTest { /** * Unit test for simple DOM parsing. * @throws Exception If any errors occur. @@ -108,3 +118,5 @@ public class DOMResultTest extends JAXPFileBaseTest { writeNodes(kids.item(i), bWriter); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java index 19417830ac6..7d01e52de9a 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/ErrorListenerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -23,23 +23,32 @@ package javax.xml.transform.ptests; +import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.fail; + import java.io.File; -import java.io.FilePermission; + import javax.xml.transform.ErrorListener; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; -import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPBaseTest; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.fail; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /** * Class containing the test cases for ErrorListener interface */ -public class ErrorListenerTest extends JAXPBaseTest implements ErrorListener { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.ErrorListenerTest + * @run testng/othervm javax.xml.transform.ptests.ErrorListenerTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class ErrorListenerTest implements ErrorListener { /** * Define ErrorListener's status. */ @@ -60,7 +69,6 @@ public class ErrorListenerTest extends JAXPBaseTest implements ErrorListener { try { TransformerFactory tfactory = TransformerFactory.newInstance(); tfactory.setErrorListener (listener); - setPermissions(new FilePermission(XML_DIR + "invalid.xsl", "read")); tfactory.newTransformer(new StreamSource( new File(XML_DIR + "invalid.xsl"))); fail("Expect TransformerConfigurationException here"); @@ -96,3 +104,5 @@ public class ErrorListenerTest extends JAXPBaseTest implements ErrorListener { this.status = ListenerStatus.FATAL; } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java index ca4c67ed21b..81f97cd909e 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXSourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -23,18 +23,21 @@ package javax.xml.transform.ptests; -import java.io.File; -import java.io.FileInputStream; -import java.io.IOException; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.transform.dom.DOMSource; import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; -import javax.xml.transform.sax.SAXSource; -import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPFileReadOnlyBaseTest; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; + +import java.io.File; +import java.io.FileInputStream; +import java.io.IOException; + +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.sax.SAXSource; +import javax.xml.transform.stream.StreamSource; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; @@ -42,7 +45,14 @@ import org.xml.sax.InputSource; /** * Unit test for SAXSource sourceToInputSource API. */ -public class SAXSourceTest extends JAXPFileReadOnlyBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.SAXSourceTest + * @run testng/othervm javax.xml.transform.ptests.SAXSourceTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class SAXSourceTest { /** * Test style-sheet file name */ @@ -53,7 +63,7 @@ public class SAXSourceTest extends JAXPFileReadOnlyBaseTest { * * @throws IOException reading file error. */ - @Test(groups = {"readLocalFiles"}) + @Test public void source2inputsource01() throws IOException { try (FileInputStream fis = new FileInputStream(TEST_FILE)) { StreamSource streamSource = new StreamSource(fis); @@ -68,7 +78,7 @@ public class SAXSourceTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void source2inputsource02() throws Exception { DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); dbf.setNamespaceAware(true); @@ -83,7 +93,7 @@ public class SAXSourceTest extends JAXPFileReadOnlyBaseTest { * * @throws IOException reading file error. */ - @Test(groups = {"readLocalFiles"}) + @Test public void source2inputsource03() throws IOException { String SYSTEM_ID = "file:///" + XML_DIR; try (FileInputStream fis = new FileInputStream(TEST_FILE)) { @@ -95,3 +105,5 @@ public class SAXSourceTest extends JAXPFileReadOnlyBaseTest { } } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java index 60da93acc73..4721e7c9a61 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/SAXTFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -23,27 +23,30 @@ package javax.xml.transform.ptests; +import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR; +import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; +import static jaxp.library.JAXPTestUtilities.USER_DIR; +import static jaxp.library.JAXPTestUtilities.compareWithGold; +import static org.testng.Assert.assertTrue; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.Result; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; -import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR; -import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.sax.TemplatesHandler; import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPFileBaseTest; -import static jaxp.library.JAXPTestUtilities.USER_DIR; -import static jaxp.library.JAXPTestUtilities.compareWithGold; -import static org.testng.Assert.assertTrue; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -56,7 +59,14 @@ import org.xml.sax.helpers.XMLReaderFactory; * Test newTransformerhandler() method which takes StreamSource as argument can * be set to XMLReader. */ -public class SAXTFactoryTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.SAXTFactoryTest + * @run testng/othervm javax.xml.transform.ptests.SAXTFactoryTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class SAXTFactoryTest { /** * Test style-sheet file. */ @@ -421,3 +431,5 @@ public class SAXTFactoryTest extends JAXPFileBaseTest { assertTrue(compareWithGold(goldFile, outputFile)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java index 9ff71b900ae..832c5383e29 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/StreamResultTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,11 +22,16 @@ */ package javax.xml.transform.ptests; +import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; +import static jaxp.library.JAXPTestUtilities.USER_DIR; +import static jaxp.library.JAXPTestUtilities.failUnexpected; + import java.io.File; import java.io.FileInputStream; import java.io.IOException; import java.util.Arrays; import java.util.Properties; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -34,12 +39,10 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; -import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPFileBaseTest; -import static jaxp.library.JAXPTestUtilities.USER_DIR; -import static jaxp.library.JAXPTestUtilities.failUnexpected; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.SAXException; @@ -48,7 +51,14 @@ import org.xml.sax.SAXException; * Test a StreamResult using a file name that contains URL characters that need * to be encoded. */ -public class StreamResultTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.StreamResultTest + * @run testng/othervm javax.xml.transform.ptests.StreamResultTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class StreamResultTest { /** * Unit test for StreamResult. */ @@ -96,3 +106,5 @@ public class StreamResultTest extends JAXPFileBaseTest { }); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java index 02384973de7..b30cd90e4fc 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TfClearParamTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,20 +22,23 @@ */ package javax.xml.transform.ptests; +import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNull; + import java.io.File; import java.io.FileInputStream; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; -import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPFileReadOnlyBaseTest; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNull; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -44,7 +47,14 @@ import org.xml.sax.InputSource; /** * Class containing the test cases for SAXParserFactory API */ -public class TfClearParamTest extends JAXPFileReadOnlyBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.TfClearParamTest + * @run testng/othervm javax.xml.transform.ptests.TfClearParamTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class TfClearParamTest { /** * Test style-sheet file name. */ @@ -128,7 +138,7 @@ public class TfClearParamTest extends JAXPFileReadOnlyBaseTest { * @throws TransformerConfigurationException If for some reason the * TransformerHandler can not be created. */ - @Test (groups = {"readLocalFiles"}) + @Test public void clear05() throws TransformerConfigurationException { Transformer transformer = TransformerFactory.newInstance(). newTransformer(new StreamSource(new File(XSL_FILE))); @@ -143,7 +153,7 @@ public class TfClearParamTest extends JAXPFileReadOnlyBaseTest { * @throws TransformerConfigurationException If for some reason the * TransformerHandler can not be created. */ - @Test (groups = {"readLocalFiles"}) + @Test public void clear06() throws TransformerConfigurationException { Transformer transformer = TransformerFactory.newInstance(). newTransformer(new StreamSource(new File(XSL_FILE))); @@ -157,7 +167,7 @@ public class TfClearParamTest extends JAXPFileReadOnlyBaseTest { * the a name that set before. Value should be same as set one. * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public void clear07() throws Exception { try (FileInputStream fis = new FileInputStream(XSL_FILE)) { SAXSource saxSource = new SAXSource(); @@ -174,7 +184,7 @@ public class TfClearParamTest extends JAXPFileReadOnlyBaseTest { * the a name that wasn't set before. Null is expected. * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public void clear08() throws Exception { try (FileInputStream fis = new FileInputStream(XSL_FILE)) { SAXSource saxSource = new SAXSource(); @@ -192,7 +202,7 @@ public class TfClearParamTest extends JAXPFileReadOnlyBaseTest { * the a name that set before. Value should be same as set one. * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public void clear09() throws Exception { TransformerFactory tfactory = TransformerFactory.newInstance(); @@ -213,7 +223,7 @@ public class TfClearParamTest extends JAXPFileReadOnlyBaseTest { * the a name that wasn't set before. Null is expected. * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public void clear10() throws Exception { TransformerFactory tfactory = TransformerFactory.newInstance(); @@ -229,3 +239,5 @@ public class TfClearParamTest extends JAXPFileReadOnlyBaseTest { assertNull(transformer.getParameter(LONG_PARAM_NAME)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java index 417f6411b11..038bb168407 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -38,7 +38,6 @@ import java.util.function.Supplier; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; import javax.xml.stream.XMLEventWriter; import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; @@ -58,10 +57,9 @@ import javax.xml.transform.stax.StAXSource; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPFileBaseTest; - import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.Attributes; @@ -71,10 +69,15 @@ import org.xml.sax.Locator; import org.xml.sax.SAXException; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.TransformTest + * @run testng/othervm javax.xml.transform.ptests.TransformTest * @summary Tests for variable combination of Transformer.transform(Source, Result) */ @Test(singleThreaded = true) -public class TransformTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class TransformTest { /* * Initialize the share objects. @@ -381,3 +384,5 @@ public class TransformTest extends JAXPFileBaseTest { private Document xmlDoc; } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java index 1a936cbaa4b..58d60763db5 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerExcpTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,32 +22,40 @@ */ package javax.xml.transform.ptests; -import java.io.File; -import java.io.FilePermission; -import javax.xml.transform.Transformer; -import javax.xml.transform.TransformerException; -import javax.xml.transform.TransformerFactory; import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; -import javax.xml.transform.sax.SAXResult; -import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPBaseTest; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.fail; + +import java.io.File; + +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.sax.SAXResult; +import javax.xml.transform.stream.StreamSource; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /** * Basic test for TransformerException specification. */ -public class TransformerExcpTest extends JAXPBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.TransformerExcpTest + * @run testng/othervm javax.xml.transform.ptests.TransformerExcpTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class TransformerExcpTest { /** * Transform an unformatted style-sheet file. TransformerException is thrown. */ @Test public void tfexception() { try { - setPermissions(new FilePermission(XML_DIR + "-", "read")); // invalid.xsl has well-formedness error. Therefore transform throws // TransformerException StreamSource streamSource @@ -63,8 +71,6 @@ public class TransformerExcpTest extends JAXPBaseTest { assertNotNull(e.getException()); assertNull(e.getLocationAsString()); assertEquals(e.getMessageAndLocation(),e.getMessage()); - } finally { - setPermissions(); } } @@ -99,3 +105,5 @@ public class TransformerExcpTest extends JAXPBaseTest { assertNotNull(te.initCause(null)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java index 7324b1c144e..ae8a2bc6b8f 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,33 +22,45 @@ */ package javax.xml.transform.ptests; -import java.io.*; - -import javax.xml.parsers.*; -import javax.xml.transform.*; -import javax.xml.transform.dom.*; - import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR; import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; - -import javax.xml.transform.stream.*; - -import jaxp.library.JAXPDataProvider; -import jaxp.library.JAXPFileBaseTest; import static jaxp.library.JAXPTestUtilities.USER_DIR; import static jaxp.library.JAXPTestUtilities.compareWithGold; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import java.io.FileInputStream; +import java.io.FileOutputStream; + +import javax.xml.parsers.DocumentBuilder; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.transform.Source; +import javax.xml.transform.Transformer; +import javax.xml.transform.TransformerConfigurationException; +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.TransformerFactoryConfigurationError; +import javax.xml.transform.dom.DOMSource; +import javax.xml.transform.stream.StreamResult; + +import jaxp.library.JAXPDataProvider; + import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; -import org.w3c.dom.*; +import org.w3c.dom.Document; /** * Class containing the test cases for TransformerFactory API's * getAssociatedStyleSheet method and TransformerFactory.newInstance(factoryClassName , classLoader). */ -public class TransformerFactoryTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.TransformerFactoryTest + * @run testng/othervm javax.xml.transform.ptests.TransformerFactoryTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class TransformerFactoryTest { /** * TransformerFactory implementation class name. */ @@ -129,3 +141,5 @@ public class TransformerFactoryTest extends JAXPFileBaseTest { assertTrue(compareWithGold(goldFile, outputFile)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java index 8e718b082d3..a8d7e4705a7 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,9 +22,15 @@ */ package javax.xml.transform.ptests; +import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + import java.io.File; import java.io.FileInputStream; import java.util.Properties; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.ErrorListener; @@ -33,13 +39,10 @@ import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; -import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPFileReadOnlyBaseTest; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; -import static org.testng.Assert.assertTrue; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.InputSource; @@ -47,7 +50,14 @@ import org.xml.sax.InputSource; /** * Basic test cases for Transformer API */ -public class TransformerTest extends JAXPFileReadOnlyBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.TransformerTest + * @run testng/othervm javax.xml.transform.ptests.TransformerTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class TransformerTest { /** * XSLT file serves every test method. */ @@ -58,7 +68,7 @@ public class TransformerTest extends JAXPFileReadOnlyBaseTest { * @throws TransformerConfigurationException If for some reason the * TransformerHandler can not be created. */ - @Test (groups = {"readLocalFiles"}) + @Test public void transformer01() throws TransformerConfigurationException { TransformerFactory tfactory = TransformerFactory.newInstance(); StreamSource streamSource = new StreamSource( @@ -71,7 +81,7 @@ public class TransformerTest extends JAXPFileReadOnlyBaseTest { * This tests if newTransformer(SAXSource) method returns Transformer. * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public void transformer02() throws Exception { try (FileInputStream fis = new FileInputStream(TEST_XSL)) { TransformerFactory tfactory = TransformerFactory.newInstance(); @@ -86,7 +96,7 @@ public class TransformerTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public void transformer03() throws Exception { TransformerFactory tfactory = TransformerFactory.newInstance(); @@ -105,7 +115,7 @@ public class TransformerTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public void transformer04() throws Exception { DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); dbf.setNamespaceAware(true); @@ -125,7 +135,7 @@ public class TransformerTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public void transformer05() throws Exception { DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); dbf.setNamespaceAware(true); @@ -150,7 +160,7 @@ public class TransformerTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public void transformer06() throws Exception { TransformerFactory tfactory = TransformerFactory.newInstance(); @@ -197,3 +207,5 @@ class MyErrorListener implements ErrorListener { System.out.println(" In fatal"); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java index 0f50b349eec..3a9a058abcb 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest02.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,21 +22,24 @@ */ package javax.xml.transform.ptests; +import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR; +import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; +import static jaxp.library.JAXPTestUtilities.USER_DIR; +import static jaxp.library.JAXPTestUtilities.compareWithGold; +import static org.testng.Assert.assertTrue; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; + import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; -import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR; -import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPFileBaseTest; -import static jaxp.library.JAXPTestUtilities.USER_DIR; -import static jaxp.library.JAXPTestUtilities.compareWithGold; -import static org.testng.Assert.assertTrue; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; @@ -44,7 +47,14 @@ import org.testng.annotations.Test; * Here a transformer is created using DOMSource. Some specific output property * is set on transformer. Then transform(StreamSource, StreamResult) is tested. */ -public class TransformerTest02 extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.TransformerTest02 + * @run testng/othervm javax.xml.transform.ptests.TransformerTest02 + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class TransformerTest02 { /** * Unit test for transform(StreamSource, StreamResult). * @@ -75,3 +85,5 @@ public class TransformerTest02 extends JAXPFileBaseTest { assertTrue(compareWithGold(goldFile, outputFile)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java index 23855e52cb2..d0330a783ec 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/TransformerTest03.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,22 +22,25 @@ */ package javax.xml.transform.ptests; +import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR; +import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; +import static jaxp.library.JAXPTestUtilities.USER_DIR; +import static jaxp.library.JAXPTestUtilities.compareWithGold; +import static org.testng.Assert.assertTrue; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.util.Properties; + import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; -import static javax.xml.transform.ptests.TransformerTestConst.GOLDEN_DIR; -import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPFileBaseTest; -import static jaxp.library.JAXPTestUtilities.USER_DIR; -import static jaxp.library.JAXPTestUtilities.compareWithGold; -import static org.testng.Assert.assertTrue; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /** @@ -46,7 +49,14 @@ import org.testng.annotations.Test; * for transformer. Then transform(StreamSource, StreamResult) is used for * transformation. This tests the setOutputProperties() method. */ -public class TransformerTest03 extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.TransformerTest03 + * @run testng/othervm javax.xml.transform.ptests.TransformerTest03 + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class TransformerTest03 { /** * Test for Transformer.setOutputProperties method. * @@ -84,3 +94,5 @@ public class TransformerTest03 extends JAXPFileBaseTest { assertTrue(compareWithGold(goldFile, outputFile)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java index 05889f6715c..d595b485115 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/URIResolverTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,8 +22,13 @@ */ package javax.xml.transform.ptests; +import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; + import java.io.File; import java.io.FileInputStream; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.Source; @@ -31,13 +36,11 @@ import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.URIResolver; import javax.xml.transform.dom.DOMSource; -import static javax.xml.transform.ptests.TransformerTestConst.XML_DIR; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPFileBaseTest; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertNotNull; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.InputSource; @@ -45,7 +48,14 @@ import org.xml.sax.InputSource; /** * URIResolver should be invoked when transform happens. */ -public class URIResolverTest extends JAXPFileBaseTest implements URIResolver { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.URIResolverTest + * @run testng/othervm javax.xml.transform.ptests.URIResolverTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class URIResolverTest implements URIResolver { /** * System ID constant. */ @@ -115,7 +125,7 @@ public class URIResolverTest extends JAXPFileBaseTest implements URIResolver { * * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public static void resolver01() throws Exception { try (FileInputStream fis = new FileInputStream(XSL_INCLUDE_FILE)) { TransformerFactory tfactory = TransformerFactory.newInstance(); @@ -134,7 +144,7 @@ public class URIResolverTest extends JAXPFileBaseTest implements URIResolver { * * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public static void resolver02() throws Exception { TransformerFactory tfactory = TransformerFactory.newInstance(); URIResolverTest resolver = new URIResolverTest(XSL_TEMP_FILE, SYSTEM_ID); @@ -155,7 +165,7 @@ public class URIResolverTest extends JAXPFileBaseTest implements URIResolver { * * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public static void resolver03() throws Exception { try (FileInputStream fis = new FileInputStream(XSL_INCLUDE_FILE)){ URIResolverTest resolver = new URIResolverTest(XSL_TEMP_FILE, SYSTEM_ID); @@ -174,7 +184,7 @@ public class URIResolverTest extends JAXPFileBaseTest implements URIResolver { * * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public static void resolver04() throws Exception { try (FileInputStream fis = new FileInputStream(XSL_IMPORT_FILE)) { URIResolverTest resolver = new URIResolverTest(XSL_TEMP_FILE, SYSTEM_ID); @@ -192,7 +202,7 @@ public class URIResolverTest extends JAXPFileBaseTest implements URIResolver { * * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public static void resolver05() throws Exception { URIResolverTest resolver = new URIResolverTest(XSL_TEMP_FILE, SYSTEM_ID); TransformerFactory tfactory = TransformerFactory.newInstance(); @@ -211,7 +221,7 @@ public class URIResolverTest extends JAXPFileBaseTest implements URIResolver { * * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public static void resolver06() throws Exception { try (FileInputStream fis = new FileInputStream(XSL_IMPORT_FILE)){ URIResolverTest resolver = new URIResolverTest(XSL_TEMP_FILE, SYSTEM_ID); @@ -230,7 +240,7 @@ public class URIResolverTest extends JAXPFileBaseTest implements URIResolver { * * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public static void docResolver01() throws Exception { try (FileInputStream fis = new FileInputStream(XML_DIR + "doctest.xsl")) { URIResolverTest resolver = new URIResolverTest("temp/colors.xml", SYSTEM_ID); @@ -252,3 +262,5 @@ public class URIResolverTest extends JAXPFileBaseTest implements URIResolver { } } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java index 489fe838d32..f86d4b90fdc 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/transform/ptests/othervm/TFCErrorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -22,15 +22,27 @@ */ package javax.xml.transform.ptests.othervm; -import javax.xml.transform.*; -import jaxp.library.JAXPBaseTest; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + import static org.testng.Assert.fail; + +import javax.xml.transform.TransformerFactory; +import javax.xml.transform.TransformerFactoryConfigurationError; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /** * Negative test for set invalid TransformerFactory property. */ -public class TFCErrorTest extends JAXPBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.transform.ptests.othervm.TFCErrorTest + * @run testng/othervm javax.xml.transform.ptests.othervm.TFCErrorTest + */ +@Listeners({jaxp.library.BasePolicy.class}) +public class TFCErrorTest { @Test(expectedExceptions = ClassNotFoundException.class) public void tfce01() throws Exception { try{ @@ -42,3 +54,5 @@ public class TFCErrorTest extends JAXPBaseTest { } } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java index 1cdcbf7e073..f18588acbaa 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/SchemaFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -54,6 +54,7 @@ import jaxp.library.JAXPDataProvider; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.ErrorHandler; @@ -64,10 +65,15 @@ import org.xml.sax.SAXNotSupportedException; import org.xml.sax.SAXParseException; /* + * @test * @bug 8080907 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.validation.ptests.SchemaFactoryTest + * @run testng/othervm javax.xml.validation.ptests.SchemaFactoryTest * @summary Class containing the test cases for SchemaFactory */ @Test(singleThreaded = true) +@Listeners({jaxp.library.FilePolicy.class}) public class SchemaFactoryTest { @BeforeClass @@ -398,3 +404,4 @@ public class SchemaFactoryTest { private Document xsdDoc2; private byte[] xml; } + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java index d34c708bc90..782981a49be 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/TypeInfoProviderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -39,8 +39,7 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.TypeInfoProvider; import javax.xml.validation.ValidatorHandler; -import jaxp.library.JAXPFileBaseTest; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.Attributes; import org.xml.sax.InputSource; @@ -49,9 +48,14 @@ import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.validation.ptests.TypeInfoProviderTest + * @run testng/othervm javax.xml.validation.ptests.TypeInfoProviderTest * @summary test ValidatorHandler.getTypeInfoProvider() */ -public class TypeInfoProviderTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class TypeInfoProviderTest { private ValidatorHandler validatorHandler; @@ -91,3 +95,4 @@ public class TypeInfoProviderTest extends JAXPFileBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java index 3b48a21203f..b80a9f5047e 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -37,6 +37,7 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.ValidatorHandler; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ContentHandler; import org.xml.sax.ErrorHandler; @@ -46,8 +47,13 @@ import org.xml.sax.SAXNotSupportedException; import org.xml.sax.helpers.DefaultHandler; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.validation.ptests.ValidatorHandlerTest + * @run testng/othervm javax.xml.validation.ptests.ValidatorHandlerTest * @summary Class containing the test cases for ValidatorHandler API */ +@Listeners({jaxp.library.FilePolicy.class}) public class ValidatorHandlerTest { @BeforeClass public void setup() throws SAXException { @@ -142,3 +148,4 @@ public class ValidatorHandlerTest { private Schema schema; } + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java index c455f070694..17015bf9cc7 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/validation/ptests/ValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -45,10 +45,9 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; -import jaxp.library.JAXPFileBaseTest; - import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.ErrorHandler; @@ -59,9 +58,14 @@ import org.xml.sax.SAXNotSupportedException; import org.xml.sax.helpers.DefaultHandler; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.validation.ptests.ValidatorTest + * @run testng/othervm javax.xml.validation.ptests.ValidatorTest * @summary Class containing the test cases for Validator API */ -public class ValidatorTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class ValidatorTest { @BeforeClass public void setup() throws SAXException, IOException, ParserConfigurationException { @@ -205,3 +209,4 @@ public class ValidatorTest extends JAXPFileBaseTest { private Document xmlDoc; } + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java index bf9c2502ee9..585804cf995 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathExpressionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -23,26 +23,28 @@ package javax.xml.xpath.ptests; -import java.io.FilePermission; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import javax.xml.XMLConstants; -import javax.xml.namespace.QName; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.xpath.XPath; import static javax.xml.xpath.XPathConstants.BOOLEAN; import static javax.xml.xpath.XPathConstants.NODE; import static javax.xml.xpath.XPathConstants.NODESET; import static javax.xml.xpath.XPathConstants.NUMBER; import static javax.xml.xpath.XPathConstants.STRING; +import static javax.xml.xpath.ptests.XPathTestConst.XML_DIR; +import static org.testng.Assert.assertEquals; + +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; + +import javax.xml.XMLConstants; +import javax.xml.namespace.QName; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.xpath.XPath; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import static javax.xml.xpath.ptests.XPathTestConst.XML_DIR; -import jaxp.library.JAXPFileReadOnlyBaseTest; -import static org.testng.Assert.assertEquals; + import org.testng.annotations.BeforeTest; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -52,7 +54,14 @@ import org.xml.sax.InputSource; /** * Class containing the test cases for XPathExpression API. */ -public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.xpath.ptests.XPathExpressionTest + * @run testng/othervm javax.xml.xpath.ptests.XPathExpressionTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class XPathExpressionTest { /** * Document object for testing XML file. */ @@ -89,7 +98,6 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { */ @BeforeTest public void setup() throws Exception { - setPermissions(new FilePermission(XML_PATH.toFile().toString(), "read")); document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(XML_PATH.toFile()); xpath = XPathFactory.newInstance().newXPath(); } @@ -264,7 +272,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public void testCheckXPathExpression15() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { assertEquals(xpath.compile(EXPRESSION_NAME_A). @@ -287,7 +295,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class) + @Test(expectedExceptions = NullPointerException.class) public void testCheckXPathExpression17() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.compile(null).evaluate(new InputSource(is)); @@ -300,7 +308,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class) + @Test(expectedExceptions = XPathExpressionException.class) public void testCheckXPathExpression18() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.compile("-*&").evaluate(new InputSource(is)); @@ -313,7 +321,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class) + @Test(expectedExceptions = XPathExpressionException.class) public void testCheckXPathExpression19() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.compile(" ").evaluate(new InputSource(is)); @@ -326,7 +334,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPathExpression20() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { assertEquals(xpath.compile(EXPRESSION_NAME_A). @@ -351,7 +359,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class) + @Test(expectedExceptions = NullPointerException.class) public void testCheckXPathExpression22() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.compile(null).evaluate(new InputSource(is), STRING); @@ -364,7 +372,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class) + @Test(expectedExceptions = NullPointerException.class) public void testCheckXPathExpression23() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.compile(EXPRESSION_NAME_A).evaluate(new InputSource(is), null); @@ -377,7 +385,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class) + @Test(expectedExceptions = XPathExpressionException.class) public void testCheckXPathExpression24() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.compile("-*&").evaluate(new InputSource(is), STRING); @@ -390,7 +398,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class) + @Test(expectedExceptions = XPathExpressionException.class) public void testCheckXPathExpression25() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.compile(" ").evaluate(new InputSource(is), STRING); @@ -404,7 +412,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = IllegalArgumentException.class) + @Test(expectedExceptions = IllegalArgumentException.class) public void testCheckXPathExpression26() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.compile(EXPRESSION_NAME_A).evaluate(new InputSource(is), TEST_QNAME); @@ -417,7 +425,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPathExpression27() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { assertEquals(xpath.compile(EXPRESSION_NAME_A). @@ -431,7 +439,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPathExpression28() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { assertEquals(xpath.compile(EXPRESSION_NAME_B). @@ -445,7 +453,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPathExpression29() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { assertEquals(xpath.compile(EXPRESSION_NAME_A). @@ -459,7 +467,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPathExpression30() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { Attr attr = (Attr) xpath.compile(EXPRESSION_NAME_A). @@ -474,7 +482,7 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPathExpression31() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { NodeList nodeList = (NodeList) xpath.compile(EXPRESSION_NAME_A). @@ -483,3 +491,5 @@ public class XPathExpressionTest extends JAXPFileReadOnlyBaseTest { } } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java index a55e1b46554..517fecc020c 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -24,22 +24,29 @@ package javax.xml.xpath.ptests; import static javax.xml.xpath.XPathConstants.DOM_OBJECT_MODEL; +import static org.testng.Assert.assertNotNull; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactoryConfigurationException; import jaxp.library.JAXPDataProvider; -import jaxp.library.JAXPBaseTest; -import static org.testng.Assert.assertNotNull; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /** * Class containing the test cases for XPathFactory API. */ -public class XPathFactoryTest extends JAXPBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.xpath.ptests.XPathFactoryTest + * @run testng/othervm javax.xml.xpath.ptests.XPathFactoryTest + */ +@Listeners({jaxp.library.BasePolicy.class}) +public class XPathFactoryTest { /** * Valid URL for creating a XPath factory. */ @@ -211,3 +218,5 @@ public class XPathFactoryTest extends JAXPBaseTest { assertNotNull(XPathFactory.newInstance(DOM_OBJECT_MODEL)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java index cf1046508b5..8f19976cdb9 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathFunctionResolverTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -23,18 +23,27 @@ package javax.xml.xpath.ptests; +import static org.testng.Assert.assertEquals; + import javax.xml.xpath.XPath; import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; -import jaxp.library.JAXPBaseTest; -import static org.testng.Assert.assertEquals; + import org.testng.annotations.BeforeTest; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /** * Class containing the test cases for XPathFunctionResolver. */ -public class XPathFunctionResolverTest extends JAXPBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.xpath.ptests.XPathFunctionResolverTest + * @run testng/othervm javax.xml.xpath.ptests.XPathFunctionResolverTest + */ +@Listeners({jaxp.library.BasePolicy.class}) +public class XPathFunctionResolverTest { /** * A XPath for evaluation environment and expressions. */ @@ -73,3 +82,5 @@ public class XPathFunctionResolverTest extends JAXPBaseTest { assertEquals(xpath.evaluate(null, "5"), "2"); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java index 765cf18bae1..f3f4a0d0563 100644 --- a/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/javax/xml/xpath/ptests/XPathTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -23,30 +23,32 @@ package javax.xml.xpath.ptests; -import java.io.FilePermission; -import java.io.InputStream; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; -import java.util.Iterator; -import javax.xml.XMLConstants; -import javax.xml.namespace.NamespaceContext; -import javax.xml.namespace.QName; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.xpath.XPath; import static javax.xml.xpath.XPathConstants.BOOLEAN; import static javax.xml.xpath.XPathConstants.NODE; import static javax.xml.xpath.XPathConstants.NODESET; import static javax.xml.xpath.XPathConstants.NUMBER; import static javax.xml.xpath.XPathConstants.STRING; -import javax.xml.xpath.XPathExpressionException; -import javax.xml.xpath.XPathFactory; import static javax.xml.xpath.ptests.XPathTestConst.XML_DIR; -import jaxp.library.JAXPFileReadOnlyBaseTest; import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNotNull; import static org.testng.AssertJUnit.assertNull; + +import java.io.InputStream; +import java.nio.file.Files; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.Iterator; + +import javax.xml.XMLConstants; +import javax.xml.namespace.NamespaceContext; +import javax.xml.namespace.QName; +import javax.xml.parsers.DocumentBuilderFactory; +import javax.xml.xpath.XPath; +import javax.xml.xpath.XPathExpressionException; +import javax.xml.xpath.XPathFactory; + import org.testng.annotations.BeforeTest; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -56,7 +58,14 @@ import org.xml.sax.InputSource; /** * Class containing the test cases for XPath API. */ -public class XPathTest extends JAXPFileReadOnlyBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true javax.xml.xpath.ptests.XPathTest + * @run testng/othervm javax.xml.xpath.ptests.XPathTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class XPathTest { /** * Document object for testing XML file. */ @@ -93,7 +102,6 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { */ @BeforeTest public void setup() throws Exception { - setPermissions(new FilePermission(XML_DIR + "-", "read")); document = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(XML_PATH.toFile()); xpath = XPathFactory.newInstance().newXPath(); } @@ -347,7 +355,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test (groups = {"readLocalFiles"}) + @Test public void testCheckXPath22() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { assertEquals(xpath.evaluate(EXPRESSION_NAME_A, new InputSource(is)), "6"); @@ -371,7 +379,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class) + @Test(expectedExceptions = NullPointerException.class) public void testCheckXPath24() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.evaluate(null, new InputSource(is)); @@ -385,7 +393,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class) + @Test(expectedExceptions = XPathExpressionException.class) public void testCheckXPath25() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.evaluate("-*&", new InputSource(is)); @@ -398,7 +406,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class) + @Test(expectedExceptions = XPathExpressionException.class) public void testCheckXPath26() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.evaluate(" ", new InputSource(is)); @@ -411,7 +419,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPath27() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { assertEquals(xpath.evaluate(EXPRESSION_NAME_A, new InputSource(is), STRING), "6"); @@ -435,7 +443,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class) + @Test(expectedExceptions = NullPointerException.class) public void testCheckXPath29() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.evaluate(null, new InputSource(is), STRING); @@ -448,7 +456,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class) + @Test(expectedExceptions = NullPointerException.class) public void testCheckXPath30() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.evaluate(EXPRESSION_NAME_A, new InputSource(is), null); @@ -461,7 +469,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class) + @Test(expectedExceptions = XPathExpressionException.class) public void testCheckXPath31() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.evaluate("-*&", new InputSource(is), STRING); @@ -474,7 +482,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = XPathExpressionException.class) + @Test(expectedExceptions = XPathExpressionException.class) public void testCheckXPath32() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.evaluate(" ", new InputSource(is), STRING); @@ -488,7 +496,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = IllegalArgumentException.class) + @Test(expectedExceptions = IllegalArgumentException.class) public void testCheckXPath33() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { xpath.evaluate(EXPRESSION_NAME_A, new InputSource(is), TEST_QNAME); @@ -501,7 +509,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPath34() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { assertEquals(xpath.evaluate(EXPRESSION_NAME_A, new InputSource(is), @@ -515,7 +523,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPath35() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { assertEquals(xpath.evaluate(EXPRESSION_NAME_B, new InputSource(is), @@ -529,7 +537,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPath36() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { assertEquals(xpath.evaluate(EXPRESSION_NAME_A, new InputSource(is), @@ -543,7 +551,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPath37() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { assertEquals(((Attr)xpath.evaluate(EXPRESSION_NAME_A, @@ -557,7 +565,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPath38() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { NodeList nodeList = (NodeList)xpath.evaluate(EXPRESSION_NAME_A, @@ -573,7 +581,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPath52() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { assertEquals(xpath.evaluate(EXPRESSION_NAME_B, new InputSource(is), @@ -587,7 +595,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPath53() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { assertEquals(xpath.evaluate(EXPRESSION_NAME_A, new InputSource(is), @@ -601,7 +609,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPath54() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { assertEquals(((Attr)xpath.evaluate(EXPRESSION_NAME_A, @@ -615,7 +623,7 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckXPath55() throws Exception { try (InputStream is = Files.newInputStream(XML_PATH)) { NodeList nodeList = (NodeList)xpath.evaluate(EXPRESSION_NAME_A, @@ -749,3 +757,5 @@ public class XPathTest extends JAXPFileReadOnlyBaseTest { } } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AbstractCharacterDataTest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AbstractCharacterDataTest.java index c1ef1140136..c1b3381cb98 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AbstractCharacterDataTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AbstractCharacterDataTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -31,8 +31,6 @@ import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; -import jaxp.library.JAXPFileBaseTest; - import org.testng.annotations.DataProvider; import org.testng.annotations.Test; import org.w3c.dom.CharacterData; @@ -42,7 +40,7 @@ import org.xml.sax.SAXException; /* * @summary common test for the CharacterData Interface */ -public abstract class AbstractCharacterDataTest extends JAXPFileBaseTest { +public abstract class AbstractCharacterDataTest { @DataProvider(name = "data-for-length") public Object[][] getDataForTestLength() { return new Object[][] { diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java index b166c307a81..e17afe6b80a 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/AttrTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -28,8 +28,8 @@ import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; import static org.w3c.dom.ptests.DOMTestUtil.createDOM; -import jaxp.library.JAXPFileBaseTest; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -38,9 +38,14 @@ import org.w3c.dom.NamedNodeMap; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.w3c.dom.ptests.AttrTest + * @run testng/othervm org.w3c.dom.ptests.AttrTest * @summary Test for the Attr Interface */ -public class AttrTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class AttrTest { /* * Verify getName method against both existing Attr and new Attr. */ @@ -146,3 +151,4 @@ public class AttrTest extends JAXPFileBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java index daf585bf09b..eda658bb960 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/CommentTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -28,13 +28,19 @@ import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; +import org.testng.annotations.Listeners; import org.w3c.dom.CharacterData; import org.w3c.dom.Document; import org.xml.sax.SAXException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/functional + * @run testng/othervm -DrunSecMngr=true org.w3c.dom.ptests.CommentTest + * @run testng/othervm org.w3c.dom.ptests.CommentTest * @summary Test for Comment implementation returned by Document.createComment(String) */ +@Listeners({jaxp.library.FilePolicy.class}) public class CommentTest extends AbstractCharacterDataTest { @Override protected CharacterData createCharacterData(String text) throws IOException, SAXException, ParserConfigurationException { @@ -42,3 +48,4 @@ public class CommentTest extends AbstractCharacterDataTest { return document.createComment(text); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java index 90dd8cc64a8..fe309a81aaa 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -31,9 +31,9 @@ import static org.w3c.dom.DOMException.NAMESPACE_ERR; import static org.w3c.dom.ptests.DOMTestUtil.DOMEXCEPTION_EXPECTED; import static org.w3c.dom.ptests.DOMTestUtil.createDOMWithNS; import static org.w3c.dom.ptests.DOMTestUtil.createNewDocument; -import jaxp.library.JAXPFileBaseTest; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; @@ -42,9 +42,14 @@ import org.w3c.dom.Element; import org.w3c.dom.NodeList; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.w3c.dom.ptests.DocumentTest + * @run testng/othervm org.w3c.dom.ptests.DocumentTest * @summary Test createAttributeNS, getElementsByTagNameNS and createElementNS method of Document */ -public class DocumentTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class DocumentTest { @DataProvider(name = "invalid-nsuri") public Object[][] getInvalidNamespaceURI() { @@ -170,3 +175,4 @@ public class DocumentTest extends JAXPFileBaseTest { doc.createElement("!nc$%^*(!"); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java index d260d1f7c8e..63d23966131 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DocumentTypeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -25,17 +25,22 @@ package org.w3c.dom.ptests; import static org.testng.Assert.assertEquals; import static org.w3c.dom.ptests.DOMTestUtil.createDOM; -import jaxp.library.JAXPFileBaseTest; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DocumentType; import org.w3c.dom.NamedNodeMap; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.w3c.dom.ptests.DocumentTypeTest + * @run testng/othervm org.w3c.dom.ptests.DocumentTypeTest * @summary Test DocumentType */ -public class DocumentTypeTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class DocumentTypeTest { /* * Test testGetEntities method, and verify the entity items. @@ -87,3 +92,4 @@ public class DocumentTypeTest extends JAXPFileBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java index fb6ec4b5ea4..9e8c0247144 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/DomImplementationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -27,18 +27,22 @@ import static org.w3c.dom.ptests.DOMTestUtil.createNewDocument; import javax.xml.parsers.ParserConfigurationException; -import jaxp.library.JAXPBaseTest; - import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; import org.w3c.dom.DocumentType; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.w3c.dom.ptests.DomImplementationTest + * @run testng/othervm org.w3c.dom.ptests.DomImplementationTest * @summary Test DomImplementation API */ -public class DomImplementationTest extends JAXPBaseTest { +@Listeners({jaxp.library.BasePolicy.class}) +public class DomImplementationTest { /* * Test createDocument method with a namespace uri, qualified name and null * for the doctype @@ -125,3 +129,4 @@ public class DomImplementationTest extends JAXPBaseTest { assertEquals(documentType.getName(), name); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java index 2e4841f438a..6726eb0ab8b 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/ElementTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -37,9 +37,8 @@ import java.io.StringReader; import javax.xml.parsers.DocumentBuilderFactory; -import jaxp.library.JAXPFileBaseTest; - import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Attr; import org.w3c.dom.DOMException; @@ -50,9 +49,14 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.w3c.dom.ptests.ElementTest + * @run testng/othervm org.w3c.dom.ptests.ElementTest * @summary Test for the methods of Element Interface */ -public class ElementTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class ElementTest { @Test public void testGetAttributeNS() throws Exception { Document document = createDOMWithNS("ElementSample01.xml"); @@ -251,3 +255,4 @@ public class ElementTest extends JAXPFileBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java index 099b7c1fc83..ffac684287d 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/EntityChildTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -30,17 +30,21 @@ import java.io.File; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import jaxp.library.JAXPFileBaseTest; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.w3c.dom.ptests.EntityChildTest + * @run testng/othervm org.w3c.dom.ptests.EntityChildTest * @summary Test DOM Parser: parsing an xml file that contains external entities. */ -public class EntityChildTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class EntityChildTest { @Test public void test() throws Exception { @@ -57,3 +61,4 @@ public class EntityChildTest extends JAXPFileBaseTest { assertEquals(nl.getLength(), 3); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java index 49037f80c88..405934b3c3d 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NamedNodeMapTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -25,8 +25,8 @@ package org.w3c.dom.ptests; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; import static org.w3c.dom.ptests.DOMTestUtil.createDOMWithNS; -import jaxp.library.JAXPFileBaseTest; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -35,9 +35,14 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.w3c.dom.ptests.NamedNodeMapTest + * @run testng/othervm org.w3c.dom.ptests.NamedNodeMapTest * @summary Test for the methods of NamedNodeMap Interface */ -public class NamedNodeMapTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class NamedNodeMapTest { /* * Test setNamedItemNS method with a node having the same namespaceURI and * qualified name as an existing one, and then test with a non-existing node. @@ -116,3 +121,4 @@ public class NamedNodeMapTest extends JAXPFileBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java index 4aa51f76665..8d2d1556616 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeListTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -24,20 +24,25 @@ package org.w3c.dom.ptests; import static org.testng.Assert.assertEquals; import static org.w3c.dom.ptests.DOMTestUtil.createDOM; -import jaxp.library.JAXPFileBaseTest; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.w3c.dom.ptests.NodeListTest + * @run testng/othervm org.w3c.dom.ptests.NodeListTest * @summary Verifies a bug found in jaxp1.0.1 and 1.1FCS. After going out of * bound, the last element of a NodeList returns null. The bug has been fixed * in jaxp 1.1.1 build. */ -public class NodeListTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class NodeListTest { @DataProvider(name = "xml") public Object[][] getTestData() { @@ -59,3 +64,4 @@ public class NodeListTest extends JAXPFileBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java index dddc2ce24b0..25c047bdfd5 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NodeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -23,6 +23,7 @@ package org.w3c.dom.ptests; import static jaxp.library.JAXPTestUtilities.compareWithGold; +import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotEquals; @@ -33,6 +34,7 @@ import static org.w3c.dom.ptests.DOMTestUtil.createDOMWithNS; import static org.w3c.dom.ptests.DOMTestUtil.createNewDocument; import java.io.File; +import java.util.PropertyPermission; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerException; @@ -41,9 +43,8 @@ import javax.xml.transform.TransformerFactoryConfigurationError; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import jaxp.library.JAXPFileBaseTest; - import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; @@ -53,9 +54,14 @@ import org.w3c.dom.Node; import org.w3c.dom.NodeList; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.w3c.dom.ptests.NodeTest + * @run testng/othervm org.w3c.dom.ptests.NodeTest * @summary Test Node interface */ -public class NodeTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class NodeTest { @DataProvider(name = "feature-supported") public Object[][] getFeatureSupportedList() throws Exception { Document document = createDOMWithNS("Node01.xml"); @@ -153,7 +159,7 @@ public class NodeTest extends JAXPFileBaseTest { String outputfile = "InsertBefore.out"; String goldfile = GOLDEN_DIR + "InsertBeforeGF.out"; - outputXml(document, outputfile); + tryRunWithTmpPermission(() -> outputXml(document, outputfile), new PropertyPermission("user.dir", "read")); assertTrue(compareWithGold(goldfile, outputfile)); } @@ -171,7 +177,7 @@ public class NodeTest extends JAXPFileBaseTest { String outputfile = "ReplaceChild3.out"; String goldfile = GOLDEN_DIR + "ReplaceChild3GF.out"; - outputXml(document, outputfile); + tryRunWithTmpPermission(() -> outputXml(document, outputfile), new PropertyPermission("user.dir", "read")); assertTrue(compareWithGold(goldfile, outputfile)); } @@ -205,3 +211,4 @@ public class NodeTest extends JAXPFileBaseTest { transformer.transform(domSource, streamResult); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java index eea6ab41b47..0b698f37bc5 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/NotationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -29,8 +29,7 @@ import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; -import jaxp.library.JAXPFileBaseTest; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -38,9 +37,14 @@ import org.w3c.dom.Notation; import org.xml.sax.SAXException; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.w3c.dom.ptests.NotationTest + * @run testng/othervm org.w3c.dom.ptests.NotationTest * @summary Test for Notation interface */ -public class NotationTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class NotationTest { /* * Test getSystemId method. */ @@ -70,3 +74,4 @@ public class NotationTest extends JAXPFileBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java index 15bd6876c36..3ddf96e86a0 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/PITest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -24,16 +24,21 @@ package org.w3c.dom.ptests; import static org.testng.Assert.assertEquals; import static org.w3c.dom.ptests.DOMTestUtil.createDOMWithNS; -import jaxp.library.JAXPFileBaseTest; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.ProcessingInstruction; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.w3c.dom.ptests.PITest + * @run testng/othervm org.w3c.dom.ptests.PITest * @summary Test for the methods of Processing Instruction */ -public class PITest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class PITest { /* * Test getData, setData and getTarget methods */ @@ -49,3 +54,4 @@ public class PITest extends JAXPFileBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java index 7932114b519..223853ebd05 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TextTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -30,6 +30,7 @@ import java.io.IOException; import javax.xml.parsers.ParserConfigurationException; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.CharacterData; import org.w3c.dom.Document; @@ -39,8 +40,13 @@ import org.w3c.dom.Text; import org.xml.sax.SAXException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/functional + * @run testng/othervm -DrunSecMngr=true org.w3c.dom.ptests.TextTest + * @run testng/othervm org.w3c.dom.ptests.TextTest * @summary Test for Text implementation returned by Document.createTextNode(String) */ +@Listeners({jaxp.library.FilePolicy.class}) public class TextTest extends AbstractCharacterDataTest { /* * Verify splitText method works as the spec. @@ -68,3 +74,4 @@ public class TextTest extends AbstractCharacterDataTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java index f68dd919e0d..c407ff58a64 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/w3c/dom/ptests/TypeInfoTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, 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 @@ -30,8 +30,7 @@ import java.io.StringReader; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import jaxp.library.JAXPBaseTest; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -39,9 +38,14 @@ import org.w3c.dom.TypeInfo; import org.xml.sax.InputSource; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.w3c.dom.ptests.TypeInfoTest + * @run testng/othervm org.w3c.dom.ptests.TypeInfoTest * @summary Test getTypeName and getTypeNamespace methods of TypeInfo interface */ -public class TypeInfoTest extends JAXPBaseTest { +@Listeners({jaxp.library.BasePolicy.class}) +public class TypeInfoTest { /* * Get the TypeInfo of the root element, and verify it. */ @@ -136,3 +140,4 @@ public class TypeInfoTest extends JAXPBaseTest { } + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java index 708b53376df..2337dcec586 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttrImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,16 +22,24 @@ */ package org.xml.sax.ptests; -import jaxp.library.JAXPBaseTest; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.helpers.AttributesImpl; /** * Class containing the test cases for AttributesImpl API. */ -public class AttrImplTest extends JAXPBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.AttrImplTest + * @run testng/othervm org.xml.sax.ptests.AttrImplTest + */ +@Listeners({jaxp.library.BasePolicy.class}) +public class AttrImplTest { private static final String CAR_URI = "http://www.cars.com/xml"; private static final String CAR_LOCALNAME = "part"; @@ -194,3 +202,5 @@ public class AttrImplTest extends JAXPBaseTest { attr.removeAttribute(1); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java index 8309fc1b569..f42dc9c50e2 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesNSTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,17 +22,20 @@ */ package org.xml.sax.ptests; -import java.io.File; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPFileBaseTest; import static jaxp.library.JAXPTestUtilities.USER_DIR; import static jaxp.library.JAXPTestUtilities.compareWithGold; import static org.testng.Assert.assertTrue; -import org.testng.annotations.Test; import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR; import static org.xml.sax.ptests.SAXTestConst.XML_DIR; +import java.io.File; + +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; + /** * This tests the Attributes interface. Here the startElement() callback of * ContentHandler has Attributes as one of its arguments. Attributes @@ -40,7 +43,14 @@ import static org.xml.sax.ptests.SAXTestConst.XML_DIR; * of Attributes interfaces are tested. This program uses Namespace processing * with namespaces in XML file. This program does not use Validation */ -public class AttributesNSTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.AttributesNSTest + * @run testng/othervm org.xml.sax.ptests.AttributesNSTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class AttributesNSTest { /** * Test for Attribute Interface's setter/getter. * @@ -64,3 +74,5 @@ public class AttributesNSTest extends JAXPFileBaseTest { assertTrue(compareWithGold(goldFile, outputFile)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java index 351ceee914f..e56e9458532 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/AttributesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,17 +22,20 @@ */ package org.xml.sax.ptests; -import java.io.File; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPFileBaseTest; import static jaxp.library.JAXPTestUtilities.USER_DIR; import static jaxp.library.JAXPTestUtilities.compareWithGold; import static org.testng.Assert.assertTrue; -import org.testng.annotations.Test; import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR; import static org.xml.sax.ptests.SAXTestConst.XML_DIR; +import java.io.File; + +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; + /** * This tests the Attributes interface. Here the startElement() callback of * ContentHandler has Attributes as one of its arguments. Attributes @@ -41,7 +44,14 @@ import static org.xml.sax.ptests.SAXTestConst.XML_DIR; * This program uses Namespace processing without any namepsaces in xml file. * This program uses Validation */ -public class AttributesTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.AttributesTest + * @run testng/othervm org.xml.sax.ptests.AttributesTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class AttributesTest { /** * Unit test for Attributes interface. Prints all attributes into output * file. Check it with golden file. @@ -66,3 +76,5 @@ public class AttributesTest extends JAXPFileBaseTest { assertTrue(compareWithGold(goldFile, outputFile)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java index 7ab081ee2b7..bbcb4b40a4c 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ContentHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,15 +22,20 @@ */ package org.xml.sax.ptests; +import static jaxp.library.JAXPTestUtilities.USER_DIR; +import static jaxp.library.JAXPTestUtilities.compareWithGold; +import static org.testng.Assert.assertTrue; +import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR; +import static org.xml.sax.ptests.SAXTestConst.XML_DIR; + import java.io.BufferedWriter; import java.io.FileInputStream; import java.io.FileWriter; import java.io.IOException; + import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPFileBaseTest; -import static jaxp.library.JAXPTestUtilities.USER_DIR; -import static jaxp.library.JAXPTestUtilities.compareWithGold; -import static org.testng.Assert.assertTrue; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.Attributes; import org.xml.sax.InputSource; @@ -38,15 +43,20 @@ import org.xml.sax.Locator; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLFilterImpl; -import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR; -import static org.xml.sax.ptests.SAXTestConst.XML_DIR; /** * Class registers a content event handler to XMLReader. Content event handler * transverses XML and print all visited node when XMLreader parses XML. Test * verifies output is same as the golden file. */ -public class ContentHandlerTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.ContentHandlerTest + * @run testng/othervm org.xml.sax.ptests.ContentHandlerTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class ContentHandlerTest { /** * Content event handler visit all nodes to print to output file. * @@ -254,3 +264,5 @@ class MyContentHandler extends XMLFilterImpl implements AutoCloseable { bWriter.close(); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java index 309c95d27e3..f8cce65cd30 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/DefaultHandlerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,30 +22,40 @@ */ package org.xml.sax.ptests; +import static jaxp.library.JAXPTestUtilities.USER_DIR; +import static jaxp.library.JAXPTestUtilities.compareWithGold; +import static org.testng.Assert.assertTrue; +import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR; +import static org.xml.sax.ptests.SAXTestConst.XML_DIR; + import java.io.BufferedWriter; import java.io.File; import java.io.FileWriter; import java.io.IOException; + import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPFileBaseTest; -import static jaxp.library.JAXPTestUtilities.USER_DIR; -import static jaxp.library.JAXPTestUtilities.compareWithGold; -import static org.testng.Assert.assertTrue; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.Attributes; import org.xml.sax.Locator; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.helpers.DefaultHandler; -import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR; -import static org.xml.sax.ptests.SAXTestConst.XML_DIR; /** * XMLReader parse XML with default handler that transverses XML and * print all visited node. Test verifies output is same as the golden file. */ -public class DefaultHandlerTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.DefaultHandlerTest + * @run testng/othervm org.xml.sax.ptests.DefaultHandlerTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class DefaultHandlerTest { /** * Test default handler that transverses XML and print all visited node. * @@ -262,3 +272,5 @@ class MyDefaultHandler extends DefaultHandler { } } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java index d8ad68cd5e8..9d4621a4dbf 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/EHFatalTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,31 +22,41 @@ */ package org.xml.sax.ptests; -import java.io.BufferedWriter; -import java.io.FileInputStream; -import java.io.FileWriter; -import java.io.IOException; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPFileBaseTest; import static jaxp.library.JAXPTestUtilities.USER_DIR; import static jaxp.library.JAXPTestUtilities.compareWithGold; import static org.testng.Assert.assertTrue; import static org.testng.Assert.fail; +import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR; +import static org.xml.sax.ptests.SAXTestConst.XML_DIR; + +import java.io.BufferedWriter; +import java.io.FileInputStream; +import java.io.FileWriter; +import java.io.IOException; + +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLFilterImpl; -import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR; -import static org.xml.sax.ptests.SAXTestConst.XML_DIR; /** * ErrorHandler unit test. Set a ErrorHandle to XMLReader. Capture fatal error * events in ErrorHandler. */ -public class EHFatalTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.EHFatalTest + * @run testng/othervm org.xml.sax.ptests.EHFatalTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class EHFatalTest { /** * Error Handler to capture all error events to output file. Verifies the * output file is same as golden file. @@ -125,3 +135,5 @@ class MyErrorHandler extends XMLFilterImpl implements AutoCloseable { bWriter.close(); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java index a8731a484da..148f46a3950 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSSupportTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,17 +22,26 @@ */ package org.xml.sax.ptests; -import java.util.Enumeration; -import jaxp.library.JAXPBaseTest; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertNull; + +import java.util.Enumeration; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.helpers.NamespaceSupport; /** * Unit test cases for NamespaceSupport API */ -public class NSSupportTest extends JAXPBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.NSSupportTest + * @run testng/othervm org.xml.sax.ptests.NSSupportTest + */ +@Listeners({jaxp.library.BasePolicy.class}) +public class NSSupportTest { /** * Empty prefix name. */ @@ -122,3 +131,5 @@ public class NSSupportTest extends JAXPBaseTest { assertNull(support.getURI(DC_PREFIX)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java index 72a8cf37c59..615554f1d4e 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/NSTableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,11 +22,13 @@ */ package org.xml.sax.ptests; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPBaseTest; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; + +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.XMLReader; @@ -34,7 +36,14 @@ import org.xml.sax.XMLReader; * Class containing the test cases for Namespace Table defined at * http://www.megginson.com/SAX/Java/namespaces.html */ -public class NSTableTest extends JAXPBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.NSTableTest + * @run testng/othervm org.xml.sax.ptests.NSTableTest + */ +@Listeners({jaxp.library.BasePolicy.class}) +public class NSTableTest { private static final String NAMESPACES = "http://xml.org/sax/features/namespaces"; private static final String NAMESPACE_PREFIXES = @@ -159,3 +168,5 @@ public class NSTableTest extends JAXPBaseTest { assertFalse(spf.getFeature(NAMESPACE_PREFIXES)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java index f7ee1e92192..4fb4de21bba 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ParserAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,12 +22,16 @@ */ package org.xml.sax.ptests; -import java.io.FileInputStream; -import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPFileReadOnlyBaseTest; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import static org.xml.sax.ptests.SAXTestConst.XML_DIR; + +import java.io.FileInputStream; + +import javax.xml.parsers.SAXParserFactory; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; @@ -37,14 +41,20 @@ import org.xml.sax.XMLReader; import org.xml.sax.helpers.ParserAdapter; import org.xml.sax.helpers.XMLFilterImpl; import org.xml.sax.helpers.XMLReaderAdapter; -import static org.xml.sax.ptests.SAXTestConst.XML_DIR; /** * Unit test cases for ParserAdapter API. By default the only features recognized * are namespaces and namespace-prefixes. */ -public class ParserAdapterTest extends JAXPFileReadOnlyBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.ParserAdapterTest + * @run testng/othervm org.xml.sax.ptests.ParserAdapterTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class ParserAdapterTest { /** * namespaces feature name. */ @@ -234,7 +244,7 @@ public class ParserAdapterTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class) + @Test(expectedExceptions = SAXException.class) public void parse02() throws Exception { try(FileInputStream fis = new FileInputStream(XML_DIR + "invalid.xml")) { InputSource is = new InputSource(fis); @@ -247,7 +257,7 @@ public class ParserAdapterTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void parse03() throws Exception { try(FileInputStream fis = new FileInputStream(XML_DIR + "correct.xml")) { InputSource is = new InputSource(fis); @@ -255,3 +265,5 @@ public class ParserAdapterTest extends JAXPFileReadOnlyBaseTest { } } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java index 38cece57424..49796f21845 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/ResolverTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,28 +22,45 @@ */ package org.xml.sax.ptests; +import static java.nio.file.StandardCopyOption.REPLACE_EXISTING; +import static jaxp.library.JAXPTestUtilities.USER_DIR; +import static jaxp.library.JAXPTestUtilities.compareWithGold; +import static org.testng.Assert.assertTrue; +import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR; +import static org.xml.sax.ptests.SAXTestConst.XML_DIR; + import java.io.BufferedWriter; import java.io.FileInputStream; import java.io.FileWriter; import java.io.IOException; +import java.net.URI; +import java.net.URISyntaxException; +import java.nio.file.Files; +import java.nio.file.Paths; + import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPFileBaseTest; -import static jaxp.library.JAXPTestUtilities.USER_DIR; -import static jaxp.library.JAXPTestUtilities.compareWithGold; -import static org.testng.Assert.assertTrue; + +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLFilterImpl; -import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR; -import static org.xml.sax.ptests.SAXTestConst.XML_DIR; /** * Entity resolver should be invoked in XML parse. This test verifies parsing * process by checking the output with golden file. */ -public class ResolverTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.ResolverTest + * @run testng/othervm org.xml.sax.ptests.ResolverTest + */ +@Test +@Listeners({jaxp.library.FilePolicy.class}) +public class ResolverTest { /** * Unit test for entityResolver setter. * @@ -54,6 +71,11 @@ public class ResolverTest extends JAXPFileBaseTest { String goldFile = GOLDEN_DIR + "EntityResolverGF.out"; String xmlFile = XML_DIR + "publish.xml"; + Files.copy(Paths.get(XML_DIR + "publishers.dtd"), + Paths.get(USER_DIR + "publishers.dtd"), REPLACE_EXISTING); + Files.copy(Paths.get(XML_DIR + "familytree.dtd"), + Paths.get(USER_DIR + "familytree.dtd"), REPLACE_EXISTING); + try(FileInputStream instream = new FileInputStream(xmlFile); MyEntityResolver eResolver = new MyEntityResolver(outputFile)) { SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser(); @@ -97,7 +119,7 @@ class MyEntityResolver extends XMLFilterImpl implements AutoCloseable { @Override public InputSource resolveEntity(String publicid, String systemid) throws SAXException, IOException { - String str = "In resolveEntity.." + " " + publicid + " " + systemid; + String str = "In resolveEntity.." + " " + publicid + " " + getFileName(systemid); bWriter.write( str, 0,str.length()); bWriter.newLine(); return super.resolveEntity(publicid, systemid); @@ -112,4 +134,14 @@ class MyEntityResolver extends XMLFilterImpl implements AutoCloseable { bWriter.flush(); bWriter.close(); } + + private String getFileName(String systemid) { + try { + return Paths.get(new URI(systemid)).getFileName().toString(); + } catch (URISyntaxException e) { + throw new RuntimeException(e); + } + } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java index cb748b65fc6..84d534ba4d4 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/SAXParserNSTableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,21 +22,31 @@ */ package org.xml.sax.ptests; -import java.io.File; -import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPFileBaseTest; import static jaxp.library.JAXPTestUtilities.USER_DIR; import static jaxp.library.JAXPTestUtilities.compareWithGold; import static org.testng.Assert.assertTrue; -import org.testng.annotations.Test; import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR; import static org.xml.sax.ptests.SAXTestConst.XML_DIR; +import java.io.File; + +import javax.xml.parsers.SAXParserFactory; + +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; + /** * This class contains the testcases to test SAXParser with regard to * Namespace Table defined at http://www.megginson.com/SAX/Java/namespaces.html */ -public class SAXParserNSTableTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.SAXParserNSTableTest + * @run testng/othervm org.xml.sax.ptests.SAXParserNSTableTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class SAXParserNSTableTest { /** * namespace processing is enabled. namespace-prefix is also is enabled. * So it is a True-True combination. @@ -97,3 +107,5 @@ public class SAXParserNSTableTest extends JAXPFileBaseTest { assertTrue(compareWithGold(goldFile, outputFile)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java index 0d8fba825fd..9abea366b01 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterCBTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,15 +22,21 @@ */ package org.xml.sax.ptests; +import static jaxp.library.JAXPTestUtilities.USER_DIR; +import static jaxp.library.JAXPTestUtilities.compareWithGold; +import static org.testng.Assert.assertTrue; +import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR; +import static org.xml.sax.ptests.SAXTestConst.XML_DIR; + import java.io.BufferedWriter; import java.io.FileInputStream; import java.io.FileWriter; import java.io.IOException; + import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPFileBaseTest; -import static jaxp.library.JAXPTestUtilities.USER_DIR; -import static jaxp.library.JAXPTestUtilities.compareWithGold; -import static org.testng.Assert.assertTrue; + +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.Locator; @@ -38,14 +44,20 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLFilterImpl; -import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR; -import static org.xml.sax.ptests.SAXTestConst.XML_DIR; /** * Set parent of XMLFilter to XMLReader. Parsing on XML file will invoke XMLFilter * to write to output file. Test verifies output is same as the golden file. */ -public class XMLFilterCBTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.XMLFilterCBTest + * @run testng/othervm org.xml.sax.ptests.XMLFilterCBTest + */ +@Test +@Listeners({jaxp.library.FilePolicy.class}) +public class XMLFilterCBTest { /** * Test XMLFilter working with XML reader. * @@ -273,3 +285,5 @@ class MyXMLFilter extends XMLFilterImpl implements AutoCloseable { bWriter.close(); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java index 52a91ce4f3e..df6bce21461 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLFilterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,23 +22,33 @@ */ package org.xml.sax.ptests; -import java.io.FileInputStream; -import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPFileReadOnlyBaseTest; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import static org.xml.sax.ptests.SAXTestConst.XML_DIR; + +import java.io.FileInputStream; + +import javax.xml.parsers.SAXParserFactory; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.SAXNotRecognizedException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLFilterImpl; -import static org.xml.sax.ptests.SAXTestConst.XML_DIR; /** * Unit test for XMLFilter. */ -public class XMLFilterTest extends JAXPFileReadOnlyBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.XMLFilterTest + * @run testng/othervm org.xml.sax.ptests.XMLFilterTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class XMLFilterTest { /** * name spaces constant. */ @@ -217,7 +227,7 @@ public class XMLFilterTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class) + @Test(expectedExceptions = NullPointerException.class) public void parse02() throws Exception { try(FileInputStream fis = new FileInputStream(XML_DIR + "invalid.xml")) { new XMLFilterImpl().parse(new InputSource(fis)); @@ -229,10 +239,12 @@ public class XMLFilterTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = NullPointerException.class) + @Test(expectedExceptions = NullPointerException.class) public void parse03() throws Exception { try(FileInputStream fis = new FileInputStream(XML_DIR + "correct2.xml")) { new XMLFilterImpl().parse(new InputSource(fis)); } } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java index fff624d1f34..9ea1a1a39bb 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderAdapterTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,24 +22,33 @@ */ package org.xml.sax.ptests; -import java.io.FileInputStream; -import java.io.FilePermission; -import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPBaseTest; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertTrue; +import static org.xml.sax.ptests.SAXTestConst.XML_DIR; + +import java.io.FileInputStream; + +import javax.xml.parsers.SAXParserFactory; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.HandlerBase; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.XMLReaderAdapter; -import static org.xml.sax.ptests.SAXTestConst.XML_DIR; /** * Class containing the test cases for XMLReaderAdapter API */ -public class XMLReaderAdapterTest extends JAXPBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.XMLReaderAdapterTest + * @run testng/othervm org.xml.sax.ptests.XMLReaderAdapterTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class XMLReaderAdapterTest { /** * http://xml.org/sax/features/namespace-prefixes property name. */ @@ -92,7 +101,6 @@ public class XMLReaderAdapterTest extends JAXPBaseTest { */ @Test public void parse01() throws Exception { - setPermissions(new FilePermission(XML_DIR + "/-", "read")); try (FileInputStream fis = new FileInputStream(XML_DIR + "namespace1.xml")) { XMLReader xmlReader = SAXParserFactory.newInstance().newSAXParser().getXMLReader(); if (!xmlReader.getFeature(NM_PREFIXES_PROPERTY)) { @@ -102,6 +110,7 @@ public class XMLReaderAdapterTest extends JAXPBaseTest { xmlRA.setDocumentHandler(new HandlerBase()); xmlRA.parse(new InputSource(fis)); } - setPermissions(); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java index ae5e9215625..221244b96de 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,8 +22,11 @@ */ package org.xml.sax.ptests; -import jaxp.library.JAXPBaseTest; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + import static org.testng.Assert.assertNotNull; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; import org.xml.sax.helpers.XMLReaderFactory; @@ -31,7 +34,14 @@ import org.xml.sax.helpers.XMLReaderFactory; /** * Unit test for XMLReaderFactory.createXMLReader API. */ -public class XMLReaderFactoryTest extends JAXPBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.XMLReaderFactoryTest + * @run testng/othervm org.xml.sax.ptests.XMLReaderFactoryTest + */ +@Listeners({jaxp.library.BasePolicy.class}) +public class XMLReaderFactoryTest { /** * No exception expected when create XMLReader by default. * @throws org.xml.sax.SAXException when xml reader creation failed. @@ -66,3 +76,5 @@ public class XMLReaderFactoryTest extends JAXPBaseTest { XMLReaderFactory.createXMLReader("org.apache.crimson.parser.ABCD"); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java index f9a2be0b069..9f91ddee5f2 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderNSTableTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,23 +22,35 @@ */ package org.xml.sax.ptests; -import java.io.FileInputStream; -import javax.xml.parsers.SAXParser; -import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPFileBaseTest; import static jaxp.library.JAXPTestUtilities.USER_DIR; import static jaxp.library.JAXPTestUtilities.compareWithGold; import static org.testng.Assert.assertTrue; -import org.xml.sax.InputSource; -import org.xml.sax.XMLReader; import static org.xml.sax.ptests.SAXTestConst.GOLDEN_DIR; import static org.xml.sax.ptests.SAXTestConst.XML_DIR; +import java.io.FileInputStream; + +import javax.xml.parsers.SAXParser; +import javax.xml.parsers.SAXParserFactory; + +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; +import org.xml.sax.InputSource; +import org.xml.sax.XMLReader; + /** This class contains the testcases to test XMLReader with regard to * Namespace Table defined at * http://www.megginson.com/SAX/Java/namespaces.html */ -public class XMLReaderNSTableTest extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.XMLReaderNSTableTest + * @run testng/othervm org.xml.sax.ptests.XMLReaderNSTableTest + */ +@Test +@Listeners({jaxp.library.FilePolicy.class}) +public class XMLReaderNSTableTest { /** * XML file that used to be parsed. */ @@ -109,7 +121,7 @@ public class XMLReaderNSTableTest extends JAXPFileBaseTest { String goldFile = GOLDEN_DIR + "NSTableFTGF.out"; SAXParserFactory spf = SAXParserFactory.newInstance(); - spf.setNamespaceAware(true); + //NamespaceAware is false by default, so don't need to set here XMLReader xmlReader = spf.newSAXParser().getXMLReader(); try (FileInputStream fis = new FileInputStream(xmlFile); MyNSContentHandler handler = new MyNSContentHandler(outputFile)) { @@ -119,3 +131,5 @@ public class XMLReaderNSTableTest extends JAXPFileBaseTest { assertTrue(compareWithGold(goldFile, outputFile)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java index c01986f4299..0ba1ae55e76 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/ptests/XMLReaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,14 +22,18 @@ */ package org.xml.sax.ptests; -import java.io.FileInputStream; -import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPFileReadOnlyBaseTest; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertNotNull; import static org.testng.Assert.assertNull; import static org.testng.Assert.assertTrue; +import static org.xml.sax.ptests.SAXTestConst.XML_DIR; + +import java.io.FileInputStream; + +import javax.xml.parsers.SAXParserFactory; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -39,12 +43,18 @@ import org.xml.sax.XMLReader; import org.xml.sax.ext.DeclHandler; import org.xml.sax.ext.LexicalHandler; import org.xml.sax.helpers.XMLFilterImpl; -import static org.xml.sax.ptests.SAXTestConst.XML_DIR; /** * Class containing the test cases for SAXParser API */ -public class XMLReaderTest extends JAXPFileReadOnlyBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true org.xml.sax.ptests.XMLReaderTest + * @run testng/othervm org.xml.sax.ptests.XMLReaderTest + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class XMLReaderTest { /** * XML namespaces. @@ -434,7 +444,7 @@ public class XMLReaderTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}, expectedExceptions = SAXException.class) + @Test(expectedExceptions = SAXException.class) public void parse02() throws Exception { try (FileInputStream fis = new FileInputStream(XML_DIR + "invalid.xml")) { SAXParserFactory spf = SAXParserFactory.newInstance(); @@ -448,7 +458,7 @@ public class XMLReaderTest extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void parse03() throws Exception { try (FileInputStream fis = new FileInputStream(XML_DIR + "correct2.xml")) { SAXParserFactory spf = SAXParserFactory.newInstance(); @@ -661,3 +671,5 @@ class MyDeclHandler implements DeclHandler { public void internalEntityDecl(String name, String value) { } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/familytree.dtd b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/familytree.dtd new file mode 100644 index 00000000000..b913715c58a --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/familytree.dtd @@ -0,0 +1 @@ +purplelustrous diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/EntityResolverGF.out b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/EntityResolverGF.out index a44ae1b1999..6bf34028ec4 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/EntityResolverGF.out +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/EntityResolverGF.out @@ -1,2 +1,2 @@ -In resolveEntity.. -//mkrishna mohan//DTD//music pub//EN/ http://sc11152338.us.oracle.com:8080/xmlsqe/jaxp/web/testfiles/JAXPREP/publishers.dtd -In resolveEntity.. null http://sc11152338.us.oracle.com:8080/xmlsqe/jaxp/web/testfiles/JAXPREP/familytree.dtd +In resolveEntity.. -//mkrishna mohan//DTD//music pub//EN/ publishers.dtd +In resolveEntity.. null familytree.dtd diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableFTGF.out b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableFTGF.out index 491e0f50bd1..6634b532106 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableFTGF.out +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/out/NSTableFTGF.out @@ -1,109 +1,59 @@ setDocumentLocator... startDocument... -startPrefixMapping... -prefix: uri: -startPrefixMapping... -prefix: uri: startElement... namespaceURI: <> localName: <> qName: Number of Attributes: <2> Line# <3> characters...length is:3 < > -startPrefixMapping... -prefix: uri: -startPrefixMapping... -prefix: uri: startElement... namespaceURI: <> localName: <> qName: Number of Attributes: <0> Line# <4> characters...length is:5 < > -startPrefixMapping... -prefix: uri: -startPrefixMapping... -prefix: uri: startElement... namespaceURI: <> localName: <> qName: Number of Attributes: <0> Line# <5> characters...length is:10 <Typography> endElement... namespaceURI: <> localName: <> qName: <title> -endPrefixMapping... -prefix: <xml> -endPrefixMapping... -prefix: <xmlns> characters...length is:3 < > endElement... namespaceURI: <> localName: <> qName: <head> -endPrefixMapping... -prefix: <xml> -endPrefixMapping... -prefix: <xmlns> characters...length is:4 < > -startPrefixMapping... -prefix: <xml> uri: <http://www.w3.org/XML/1998/namespace> -startPrefixMapping... -prefix: <xmlns> uri: <http://www.w3.org/2000/xmlns/> startElement... namespaceURI: <> localName: <> qName: <body> Number of Attributes: <0> Line# <8> characters...length is:5 < > -startPrefixMapping... -prefix: <xml> uri: <http://www.w3.org/XML/1998/namespace> -startPrefixMapping... -prefix: <xmlns> uri: <http://www.w3.org/2000/xmlns/> startElement... namespaceURI: <> localName: <> qName: <p> Number of Attributes: <0> Line# <9> characters...length is:77 < Welcome to the world of typography! Here is a book that you may find useful.> endElement... namespaceURI: <> localName: <> qName: <p> -endPrefixMapping... -prefix: <xml> -endPrefixMapping... -prefix: <xmlns> characters...length is:5 < > -startPrefixMapping... -prefix: <xml> uri: <http://www.w3.org/XML/1998/namespace> -startPrefixMapping... -prefix: <xmlns> uri: <http://www.w3.org/2000/xmlns/> startElement... namespaceURI: <> localName: <> qName: <b:title> Number of Attributes: <1> Line# <10> characters...length is:18 <Digital Typography> endElement... namespaceURI: <> localName: <> qName: <b:title> -endPrefixMapping... -prefix: <xml> -endPrefixMapping... -prefix: <xmlns> -characters...length is:1 -< > characters...length is:5 < > -startPrefixMapping... -prefix: <xml> uri: <http://www.w3.org/XML/1998/namespace> -startPrefixMapping... -prefix: <xmlns> uri: <http://www.w3.org/2000/xmlns/> startElement... namespaceURI: <> localName: <> qName: <b:author> Number of Attributes: <0> Line# <11> characters...length is:12 <Donald Knuth> endElement... namespaceURI: <> localName: <> qName: <b:author> -endPrefixMapping... -prefix: <xml> -endPrefixMapping... -prefix: <xmlns> characters...length is:5 < > @@ -113,18 +63,10 @@ characters...length is:3 > endElement... namespaceURI: <> localName: <> qName: <body> -endPrefixMapping... -prefix: <xml> -endPrefixMapping... -prefix: <xmlns> characters...length is:2 < > endElement... namespaceURI: <> localName: <> qName: <html> -endPrefixMapping... -prefix: <xml> -endPrefixMapping... -prefix: <xmlns> endDocument... diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publish.xml b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publish.xml index 4c46f7b7175..e15cf988d30 100644 --- a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publish.xml +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publish.xml @@ -1,6 +1,5 @@ <?xml version="1.0" standalone="no"?> -<!DOCTYPE document PUBLIC "-//mkrishna mohan//DTD//music pub//EN/" - "http://sc11152338.us.oracle.com:8080/xmlsqe/jaxp/web/testfiles/JAXPREP/publishers.dtd"> +<!DOCTYPE document PUBLIC "-//mkrishna mohan//DTD//music pub//EN/" "publishers.dtd"> <document> Publishers of the Music of New York Women Composers <title>The Publishers diff --git a/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publishers.dtd b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publishers.dtd new file mode 100644 index 00000000000..afbc4a9b7c5 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/functional/org/xml/sax/xmlfiles/publishers.dtd @@ -0,0 +1,16 @@ + + + + + + + + + + + + + + + + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java b/jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java index d31fd23f605..8671a12242e 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/AstroTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, 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 @@ -24,6 +24,7 @@ package test.astro; import static java.lang.String.valueOf; +import static jaxp.library.JAXPTestUtilities.USER_DIR; import static org.testng.Assert.assertEquals; import static test.astro.AstroConstants.ASTROCAT; import static test.astro.AstroConstants.GOLDEN_DIR; @@ -35,13 +36,16 @@ import java.util.List; import javax.xml.transform.sax.TransformerHandler; -import jaxp.library.JAXPFileBaseTest; - import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.astro.AstroTest + * @run testng/othervm test.astro.AstroTest * @summary run astro application, test xslt * * There are vast amounts of textual astronomical data, typically user is @@ -66,7 +70,8 @@ import org.testng.annotations.Test; * AstroProcessor to test different JAXP classes and features. * */ -public class AstroTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class AstroTest { private FiltersAndGolden[] data; @BeforeClass @@ -107,7 +112,7 @@ public class AstroTest extends JAXPFileBaseTest { for (int i = 0; i < filterCreators.length; i++) filters[i] = filterCreators[i].createFilter(astro); - String outputfile = Files.createTempFile(Paths.get("").toAbsolutePath(), "query" + processNum + ".out.", null).toString(); + String outputfile = Files.createTempFile(Paths.get(USER_DIR), "query" + processNum + ".out.", null).toString(); System.out.println("output file: " + outputfile); astro.process(outputfile, filters); assertEquals(Files.readAllLines(Paths.get(outputfile)), goldenfileContent); @@ -140,3 +145,4 @@ public class AstroTest extends JAXPFileBaseTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java b/jaxp/test/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java index b0a76282f7d..20179d5f46b 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/DocumentLSTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, 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 @@ -40,8 +40,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; -import jaxp.library.JAXPFileBaseTest; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -52,9 +51,14 @@ import org.w3c.dom.ls.LSParser; import org.w3c.dom.ls.LSSerializer; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.astro.DocumentLSTest + * @run testng/othervm test.astro.DocumentLSTest * @summary org.w3c.dom.ls tests */ -public class DocumentLSTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class DocumentLSTest { /* * Test creating an empty Document */ @@ -178,3 +182,4 @@ public class DocumentLSTest extends JAXPFileBaseTest { return dbf.newDocumentBuilder(); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java b/jaxp/test/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java index 6a1d0dd3d66..e9584a99579 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/NamespaceContextTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, 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 @@ -28,14 +28,18 @@ import static org.testng.Assert.assertEquals; import javax.xml.namespace.QName; -import jaxp.library.JAXPBaseTest; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.astro.NamespaceContextTest + * @run testng/othervm test.astro.NamespaceContextTest * @summary javax.xml.namespace.QName tests */ -public class NamespaceContextTest extends JAXPBaseTest { +@Listeners({jaxp.library.BasePolicy.class}) +public class NamespaceContextTest { private static final String PREFIX = "astro"; private static final String LOCAL_PART = "stardb"; private static final String NS_URI = "http://www.astro.com"; @@ -85,3 +89,4 @@ public class NamespaceContextTest extends JAXPBaseTest { assertEquals(QName.valueOf(qname.toString()), qname); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/SAX201Test.java b/jaxp/test/javax/xml/jaxp/functional/test/astro/SAX201Test.java index bcba454c126..d1bb70a3b8f 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/astro/SAX201Test.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/SAX201Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, 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 @@ -24,15 +24,19 @@ package test.astro; import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPBaseTest; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.XMLReader; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.astro.SAX201Test + * @run testng/othervm test.astro.SAX201Test * @summary verify SAX 2.0.1 allows to use null in setters */ -public class SAX201Test extends JAXPBaseTest { +@Listeners({jaxp.library.BasePolicy.class}) +public class SAX201Test { @Test public void test() throws Exception { SAXParserFactory spf = SAXParserFactory.newInstance(); @@ -44,3 +48,4 @@ public class SAX201Test extends JAXPBaseTest { reader.setDTDHandler(null); // SAX 2.0.1 allows } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java b/jaxp/test/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java index c84fddb6882..6c557fb032b 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/SchemaValidationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, 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 @@ -33,16 +33,20 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPFileBaseTest; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.astro.SchemaValidationTest + * @run testng/othervm test.astro.SchemaValidationTest * @summary test parser sets schema related properties to do validation */ -public class SchemaValidationTest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class SchemaValidationTest { /* * Only set the schemaLanguage, without setting schemaSource. It should * work. @@ -72,3 +76,4 @@ public class SchemaValidationTest extends JAXPFileBaseTest { return spf.newSAXParser(); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/astro/XPathAPITest.java b/jaxp/test/javax/xml/jaxp/functional/test/astro/XPathAPITest.java index a97590fef38..ba3aae0fa2b 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/astro/XPathAPITest.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/astro/XPathAPITest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, 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 @@ -45,20 +45,24 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathVariableResolver; -import jaxp.library.JAXPFileBaseTest; - import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; import org.xml.sax.InputSource; /* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.astro.XPathAPITest + * @run testng/othervm test.astro.XPathAPITest * @summary test XPath API */ @Test(singleThreaded = true) -public class XPathAPITest extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class XPathAPITest { private static final String STARDB_STAR_3_CONSTELLATION = "//astro:stardb/astro:star[3]/astro:constellation"; private static final String STARDB_STAR = "//astro:stardb/astro:star"; private Document doc; @@ -167,3 +171,4 @@ public class XPathAPITest extends JAXPFileBaseTest { return new InputSource(filenameToURL(ASTROCAT)); } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java b/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java index 576f44a154f..1238fb88967 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionController.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,18 +22,23 @@ */ package test.auctionportal; -import static test.auctionportal.HiBidConstants.JAXP_SCHEMA_LANGUAGE; -import static test.auctionportal.HiBidConstants.JAXP_SCHEMA_SOURCE; +import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI; +import static jaxp.library.JAXPTestUtilities.bomStream; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; import static org.testng.Assert.assertTrue; +import static test.auctionportal.HiBidConstants.JAXP_SCHEMA_LANGUAGE; +import static test.auctionportal.HiBidConstants.JAXP_SCHEMA_SOURCE; +import static test.auctionportal.HiBidConstants.PORTAL_ACCOUNT_NS; +import static test.auctionportal.HiBidConstants.XML_DIR; + import java.io.File; import java.io.FileInputStream; import java.io.InputStream; import java.math.BigInteger; import java.nio.file.Paths; import java.util.GregorianCalendar; -import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI; + import javax.xml.datatype.DatatypeConstants; import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.Duration; @@ -46,8 +51,8 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; -import jaxp.library.JAXPFileReadOnlyBaseTest; -import static jaxp.library.JAXPTestUtilities.bomStream; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Attr; import org.w3c.dom.DOMConfiguration; @@ -58,20 +63,25 @@ import org.w3c.dom.TypeInfo; import org.w3c.dom.bootstrap.DOMImplementationRegistry; import org.w3c.dom.ls.DOMImplementationLS; import org.w3c.dom.ls.LSSerializer; -import static test.auctionportal.HiBidConstants.PORTAL_ACCOUNT_NS; -import static test.auctionportal.HiBidConstants.XML_DIR; /** * This is the user controller class for the Auction portal HiBid.com. */ -public class AuctionController extends JAXPFileReadOnlyBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.auctionportal.AuctionController + * @run testng/othervm test.auctionportal.AuctionController + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class AuctionController { /** * Check for DOMErrorHandler handling DOMError. Before fix of bug 4890927 * DOMConfiguration.setParameter("well-formed",true) throws an exception. * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCreateNewItem2Sell() throws Exception { String xmlFile = XML_DIR + "novelsInvalid.xml"; @@ -94,7 +104,7 @@ public class AuctionController extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCreateNewItem2SellRetry() throws Exception { String xmlFile = XML_DIR + "accountInfo.xml"; @@ -126,7 +136,7 @@ public class AuctionController extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCreateID() throws Exception { String xmlFile = XML_DIR + "accountInfo.xml"; @@ -147,7 +157,7 @@ public class AuctionController extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckingUserData() throws Exception { String xmlFile = XML_DIR + "accountInfo.xml"; @@ -184,7 +194,7 @@ public class AuctionController extends JAXPFileReadOnlyBaseTest { * @throws Exception If any errors occur. * @see movies.xml */ - @Test(groups = {"readLocalFiles"}) + @Test public void testCheckingEncoding() throws Exception { // Note since movies.xml is UTF-16 encoding. We're not using stanard XML // file suffix. @@ -206,7 +216,7 @@ public class AuctionController extends JAXPFileReadOnlyBaseTest { * @throws Exception If any errors occur. * @see userDetails.xsd */ - @Test(groups = {"readLocalFiles"}) + @Test public void testGetOwnerInfo() throws Exception { String schemaFile = XML_DIR + "userDetails.xsd"; String xmlFile = XML_DIR + "userDetails.xml"; @@ -241,7 +251,7 @@ public class AuctionController extends JAXPFileReadOnlyBaseTest { * @see coins.xsd * @see coinsImportMe.xsd */ - @Test(groups = {"readLocalFiles"}) + @Test public void testGetOwnerItemList() throws Exception { String xsdFile = XML_DIR + "coins.xsd"; String xmlFile = XML_DIR + "coins.xml"; @@ -277,7 +287,7 @@ public class AuctionController extends JAXPFileReadOnlyBaseTest { * @see coinsImportMe.xsd */ - @Test(groups = {"readLocalFiles"}) + @Test public void testGetOwnerItemList1() throws Exception { String xsdFile = XML_DIR + "coins.xsd"; String xmlFile = XML_DIR + "coins.xml"; @@ -299,7 +309,7 @@ public class AuctionController extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testGetItemDuration() throws Exception { String xmlFile = XML_DIR + "itemsDuration.xml"; @@ -332,7 +342,7 @@ public class AuctionController extends JAXPFileReadOnlyBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testGetTypeInfo() throws Exception { String xmlFile = XML_DIR + "accountInfo.xml"; @@ -356,3 +366,5 @@ public class AuctionController extends JAXPFileReadOnlyBaseTest { assertTrue(roletypeInfo.getTypeNamespace().equals(PORTAL_ACCOUNT_NS)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java b/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java index 25e78643cb4..4ab09cf71c7 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/AuctionItemRepository.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,18 +22,26 @@ */ package test.auctionportal; -import static test.auctionportal.HiBidConstants.SP_ENTITY_EXPANSION_LIMIT; -import static test.auctionportal.HiBidConstants.SP_MAX_OCCUR_LIMIT; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + +import static javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING; +import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI; +import static jaxp.library.JAXPTestUtilities.USER_DIR; +import static jaxp.library.JAXPTestUtilities.compareDocumentWithGold; +import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import static test.auctionportal.HiBidConstants.GOLDEN_DIR; import static test.auctionportal.HiBidConstants.JAXP_SCHEMA_LANGUAGE; import static test.auctionportal.HiBidConstants.JAXP_SCHEMA_SOURCE; -import static org.testng.Assert.assertTrue; +import static test.auctionportal.HiBidConstants.SP_ENTITY_EXPANSION_LIMIT; +import static test.auctionportal.HiBidConstants.SP_MAX_OCCUR_LIMIT; +import static test.auctionportal.HiBidConstants.XML_DIR; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.FilePermission; import java.io.InputStream; -import static javax.xml.XMLConstants.FEATURE_SECURE_PROCESSING; -import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.SAXParser; @@ -41,20 +49,23 @@ import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import jaxp.library.JAXPFileBaseTest; -import static jaxp.library.JAXPTestUtilities.USER_DIR; -import static jaxp.library.JAXPTestUtilities.compareDocumentWithGold; -import static org.testng.Assert.assertFalse; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.SAXParseException; -import static test.auctionportal.HiBidConstants.GOLDEN_DIR; -import static test.auctionportal.HiBidConstants.XML_DIR; /** * This is a test class for the Auction portal HiBid.com. */ -public class AuctionItemRepository extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.auctionportal.AuctionItemRepository + * @run testng/othervm test.auctionportal.AuctionItemRepository + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class AuctionItemRepository { /** * XML file for parsing. */ @@ -84,7 +95,6 @@ public class AuctionItemRepository extends JAXPFileBaseTest { SAXParser parser = factory.newSAXParser(); MyErrorHandler fatalHandler = new MyErrorHandler(); - setPermissions(new FilePermission(ENTITY_XML, "read")); parser.parse(new File(ENTITY_XML), fatalHandler); assertFalse(fatalHandler.isAnyError()); } @@ -107,7 +117,6 @@ public class AuctionItemRepository extends JAXPFileBaseTest { SAXParser parser = factory.newSAXParser(); MyErrorHandler fatalHandler = new MyErrorHandler(); - setPermissions(new FilePermission(ENTITY_XML, "read")); parser.parse(new File(ENTITY_XML), fatalHandler); } @@ -127,7 +136,6 @@ public class AuctionItemRepository extends JAXPFileBaseTest { setSystemProperty(SP_MAX_OCCUR_LIMIT, String.valueOf(10000)); SAXParser parser = factory.newSAXParser(); parser.setProperty(JAXP_SCHEMA_LANGUAGE, W3C_XML_SCHEMA_NS_URI); - setPermissions(new FilePermission(XML_DIR + "-", "read")); parser.setProperty(JAXP_SCHEMA_SOURCE, new File(schema_file)); try (InputStream is = new FileInputStream(xml_file)) { MyErrorHandler eh = new MyErrorHandler(); @@ -150,13 +158,8 @@ public class AuctionItemRepository extends JAXPFileBaseTest { DocumentBuilder dBuilder = dfactory.newDocumentBuilder(); MyErrorHandler eh = new MyErrorHandler(); dBuilder.setErrorHandler(eh); - try { - setPermissions(new FilePermission(ENTITY_XML, "read")); - dBuilder.parse(ENTITY_XML); - assertFalse(eh.isAnyError()); - } finally { - setPermissions(); - } + dBuilder.parse(ENTITY_XML); + assertFalse(eh.isAnyError()); } /** @@ -174,7 +177,6 @@ public class AuctionItemRepository extends JAXPFileBaseTest { DocumentBuilder dBuilder = dfactory.newDocumentBuilder(); MyErrorHandler eh = new MyErrorHandler(); dBuilder.setErrorHandler(eh); - setPermissions(new FilePermission(ENTITY_XML, "read")); dBuilder.parse(ENTITY_XML); } @@ -369,3 +371,5 @@ public class AuctionItemRepository extends JAXPFileBaseTest { assertTrue(compareDocumentWithGold(goldFile, resultFile)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/UserController.java b/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/UserController.java index b32cb3d0d51..4ee18c423c4 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/UserController.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/auctionportal/UserController.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -22,20 +22,26 @@ */ package test.auctionportal; -import static test.auctionportal.HiBidConstants.JAXP_SCHEMA_LANGUAGE; +import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI; +import static jaxp.library.JAXPTestUtilities.USER_DIR; +import static jaxp.library.JAXPTestUtilities.compareDocumentWithGold; +import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; +import static org.testng.Assert.assertTrue; +import static test.auctionportal.HiBidConstants.GOLDEN_DIR; +import static test.auctionportal.HiBidConstants.JAXP_SCHEMA_LANGUAGE; +import static test.auctionportal.HiBidConstants.PORTAL_ACCOUNT_NS; +import static test.auctionportal.HiBidConstants.XML_DIR; + import java.io.FileOutputStream; import java.nio.file.Files; import java.nio.file.Paths; import java.nio.file.StandardCopyOption; -import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; -import jaxp.library.JAXPFileBaseTest; -import static jaxp.library.JAXPTestUtilities.USER_DIR; -import static jaxp.library.JAXPTestUtilities.compareDocumentWithGold; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Attr; import org.w3c.dom.Document; @@ -46,14 +52,18 @@ import org.w3c.dom.bootstrap.DOMImplementationRegistry; import org.w3c.dom.ls.DOMImplementationLS; import org.w3c.dom.ls.LSParser; import org.w3c.dom.ls.LSSerializer; -import static test.auctionportal.HiBidConstants.GOLDEN_DIR; -import static test.auctionportal.HiBidConstants.PORTAL_ACCOUNT_NS; -import static test.auctionportal.HiBidConstants.XML_DIR; /** * This is the user controller class for the Auction portal HiBid.com. */ -public class UserController extends JAXPFileBaseTest { +/* + * @test + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.auctionportal.UserController + * @run testng/othervm test.auctionportal.UserController + */ +@Listeners({jaxp.library.FilePolicy.class}) +public class UserController { /** * Checking when creating an XML document using DOM Level 2 validating * it without having a schema source or a schema location It must throw a @@ -150,7 +160,7 @@ public class UserController extends JAXPFileBaseTest { * * @throws Exception If any errors occur. */ - @Test(groups = {"readLocalFiles"}) + @Test public void testMoreUserInfo() throws Exception { String xmlFile = XML_DIR + "accountInfo.xml"; DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); @@ -294,3 +304,5 @@ public class UserController extends JAXPFileBaseTest { assertTrue(compareDocumentWithGold(goldFile, resultFile)); } } + + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java index fec94a13174..65e38a75e25 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4511326.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -29,16 +29,19 @@ import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPBaseTest; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 4511326 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.gaptest.Bug4511326 + * @run testng/othervm test.gaptest.Bug4511326 * @summary In forwards-compatible mode the attribute isn't ignored */ - -public class Bug4511326 extends JAXPBaseTest { +@Listeners({jaxp.library.BasePolicy.class}) +public class Bug4511326 { private static final String XSL = "" @@ -61,3 +64,4 @@ public class Bug4511326 extends JAXPBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java index 631b0919ec7..cfc74fd26f2 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4512806.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -34,15 +34,19 @@ import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPBaseTest; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 4512806 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.gaptest.Bug4512806 + * @run testng/othervm test.gaptest.Bug4512806 * @summary test transformer.setOutputProperties(null) */ -public class Bug4512806 extends JAXPBaseTest { +@Listeners({jaxp.library.BasePolicy.class}) +public class Bug4512806 { @Test public void testProperty() throws TransformerConfigurationException { @@ -86,3 +90,4 @@ public class Bug4512806 extends JAXPBaseTest { } + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java index 0b822c810ef..a833c117a8f 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515047.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -31,16 +31,19 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import jaxp.library.JAXPBaseTest; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 4515047 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.gaptest.Bug4515047 + * @run testng/othervm test.gaptest.Bug4515047 * @summary test transform an empty dom source */ - -public class Bug4515047 extends JAXPBaseTest { +@Listeners({jaxp.library.BasePolicy.class}) +public class Bug4515047 { @Test public void testCreateTxDoc() throws TransformerException, ParserConfigurationException { @@ -59,3 +62,4 @@ public class Bug4515047 extends JAXPBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java index 6f2c3140555..bff0d401d25 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4515660.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -23,6 +23,9 @@ package test.gaptest; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; +import static jaxp.library.JAXPTestUtilities.clearSystemProperty; + import static org.testng.Assert.assertTrue; import java.io.IOException; @@ -39,21 +42,25 @@ import javax.xml.transform.sax.SAXSource; import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.stream.StreamResult; -import jaxp.library.JAXPBaseTest; - import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.helpers.XMLFilterImpl; /* + * @test * @bug 4515660 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.gaptest.Bug4515660 + * @run testng/othervm test.gaptest.Bug4515660 * @summary verify property org.xml.sax.driver is used by SAXTransformerFactory */ @Test(singleThreaded = true) -public class Bug4515660 extends JAXPBaseTest { +@Listeners({jaxp.library.BasePolicy.class}) +public class Bug4515660 { @BeforeClass public void setSaxDrier() { @@ -62,7 +69,7 @@ public class Bug4515660 extends JAXPBaseTest { @AfterClass public void clearSaxDrier() { - setSystemProperty("org.xml.sax.driver", null); + clearSystemProperty("org.xml.sax.driver"); } @Test @@ -121,3 +128,4 @@ public class Bug4515660 extends JAXPBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java index d7d586b584c..8db96ac91a6 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4693341.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -42,24 +42,28 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPFileBaseTest; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /* + * @test * @bug 4693341 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.gaptest.Bug4693341 + * @run testng/othervm test.gaptest.Bug4693341 * @summary test transforming to stream with external dtd */ -public class Bug4693341 extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class Bug4693341 { @Test public void test() throws TransformerException, ParserConfigurationException, SAXException, IOException { Transformer transformer = TransformerFactory.newInstance().newTransformer(); - String out = USER_DIR + File.separator + "Bug4693341.out"; + String out = USER_DIR + "Bug4693341.out"; StreamResult result = new StreamResult(new File(out)); String in = XML_DIR + "Bug4693341.xml"; @@ -69,7 +73,7 @@ public class Bug4693341 extends JAXPFileBaseTest { System.out.println(source.getSystemId()); Files.copy(Paths.get(XML_DIR + "Bug4693341.dtd"), - Paths.get(USER_DIR + File.separator + "Bug4693341.dtd"), REPLACE_EXISTING); + Paths.get(USER_DIR + "Bug4693341.dtd"), REPLACE_EXISTING); transformer.transform(source, result); @@ -77,3 +81,4 @@ public class Bug4693341 extends JAXPFileBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java index f4de7753162..4fa09ccc2dc 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4848653.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -32,8 +32,7 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import jaxp.library.JAXPFileBaseTest; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; import org.xml.sax.InputSource; @@ -42,11 +41,15 @@ import org.xml.sax.SAXParseException; import org.xml.sax.XMLReader; /* + * @test * @bug 4848653 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.gaptest.Bug4848653 + * @run testng/othervm test.gaptest.Bug4848653 * @summary Verify JAXP schemaLanguage property is ignored if setValidating(false) */ - -public class Bug4848653 extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class Bug4848653 { @Test public void test() throws IOException, SAXException, ParserConfigurationException { @@ -78,3 +81,4 @@ public class Bug4848653 extends JAXPFileBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java index 5dd54017c62..7bb8ea574ad 100644 --- a/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java +++ b/jaxp/test/javax/xml/jaxp/functional/test/gaptest/Bug4858685.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -37,19 +37,22 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMResult; import javax.xml.transform.stream.StreamSource; -import jaxp.library.JAXPFileBaseTest; - +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.NamedNodeMap; import org.w3c.dom.Node; import org.w3c.dom.NodeList; /* + * @test * @bug 4858685 4894410 + * @library /javax/xml/jaxp/libs + * @run testng/othervm -DrunSecMngr=true test.gaptest.Bug4858685 + * @run testng/othervm test.gaptest.Bug4858685 * @summary test transforming text node */ - -public class Bug4858685 extends JAXPFileBaseTest { +@Listeners({jaxp.library.FilePolicy.class}) +public class Bug4858685 { @Test public void test() throws TransformerException, IOException { String uri = XML_DIR + "certificate.xml"; @@ -244,3 +247,4 @@ public class Bug4858685 extends JAXPFileBaseTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/internaltest/TEST.properties b/jaxp/test/javax/xml/jaxp/internaltest/TEST.properties deleted file mode 100644 index 9c5515637e5..00000000000 --- a/jaxp/test/javax/xml/jaxp/internaltest/TEST.properties +++ /dev/null @@ -1,3 +0,0 @@ -# jaxp test uses TestNG -TestNG.dirs = javax/xml/common/bug6979306 javax/xml/parsers/bug8003147 javax/xml/transform/bug6551616 javax/xml/transform/cli - diff --git a/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/parsers/bug8003147/Bug8003147Test.java b/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/parsers/bug8003147/Bug8003147Test.java deleted file mode 100644 index 2781c97f853..00000000000 --- a/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/parsers/bug8003147/Bug8003147Test.java +++ /dev/null @@ -1,81 +0,0 @@ -/* - * Copyright (c) 2014, 2015, 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 - * @modules java.xml/com.sun.org.apache.bcel.internal.classfile - * java.xml/com.sun.org.apache.bcel.internal.generic - * @bug 8003147 - * @summary Test port fix for BCEL bug 39695. - */ - -import java.io.FileOutputStream; -import java.util.ArrayList; - -import org.testng.Assert; -import org.testng.annotations.Test; - -import com.sun.org.apache.bcel.internal.classfile.ClassParser; -import com.sun.org.apache.bcel.internal.classfile.ConstantClass; -import com.sun.org.apache.bcel.internal.classfile.ConstantPool; -import com.sun.org.apache.bcel.internal.classfile.ConstantUtf8; -import com.sun.org.apache.bcel.internal.classfile.JavaClass; -import com.sun.org.apache.bcel.internal.classfile.Method; -import com.sun.org.apache.bcel.internal.generic.ClassGen; -import com.sun.org.apache.bcel.internal.generic.MethodGen; - -public class Bug8003147Test { - - @Test - public void test() throws Exception { - String classfile = getClass().getResource("Bug8003147Test.class").getPath(); - JavaClass jc = new ClassParser(classfile).parse(); - // rename class - ConstantPool cp = jc.getConstantPool(); - int cpIndex = ((ConstantClass) cp.getConstant(jc.getClassNameIndex())).getNameIndex(); - cp.setConstant(cpIndex, new ConstantUtf8("Bug8003147TestPrime")); - ClassGen gen = new ClassGen(jc); - Method[] methods = jc.getMethods(); - int index; - for (index = 0; index < methods.length; index++) { - if (methods[index].getName().equals("doSomething")) { - break; - } - } - Method m = methods[index]; - MethodGen mg = new MethodGen(m, gen.getClassName(), gen.getConstantPool()); - gen.replaceMethod(m, mg.getMethod()); - String path = classfile.replace("Bug8003147Test", "Bug8003147TestPrime"); - gen.getJavaClass().dump(new FileOutputStream(path)); - - try { - Class.forName("Bug8003147TestPrime"); - } catch (ClassFormatError cfe) { - cfe.printStackTrace(); - Assert.fail("modified version of class does not pass verification"); - } - } - - public void doSomething(double d, ArrayList list) { - } -} diff --git a/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/cli/tigertest-in.xml b/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/cli/tigertest-in.xml deleted file mode 100644 index eeb3723c2bc..00000000000 --- a/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/cli/tigertest-in.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/cli/tigertest.xsl b/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/cli/tigertest.xsl deleted file mode 100644 index 5b10fc88769..00000000000 --- a/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/cli/tigertest.xsl +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/jaxp/test/javax/xml/jaxp/isolatedjdk/TEST.properties b/jaxp/test/javax/xml/jaxp/isolatedjdk/TEST.properties deleted file mode 100644 index 95fac7b2aac..00000000000 --- a/jaxp/test/javax/xml/jaxp/isolatedjdk/TEST.properties +++ /dev/null @@ -1,4 +0,0 @@ -lib.dirs=/javax/xml/jaxp/libs - -# Declare module dependency -modules=java.xml \ No newline at end of file diff --git a/jaxp/test/javax/xml/jaxp/libs/catalog/CatalogTestUtils.java b/jaxp/test/javax/xml/jaxp/libs/catalog/CatalogTestUtils.java index 0e0ff9f194c..a0e83d5b810 100644 --- a/jaxp/test/javax/xml/jaxp/libs/catalog/CatalogTestUtils.java +++ b/jaxp/test/javax/xml/jaxp/libs/catalog/CatalogTestUtils.java @@ -37,6 +37,8 @@ import javax.xml.catalog.CatalogManager; import javax.xml.catalog.CatalogResolver; import javax.xml.catalog.CatalogUriResolver; +import jaxp.library.JAXPTestUtilities; + /* * Utilities for testing XML Catalog API. */ @@ -126,24 +128,10 @@ final class CatalogTestUtils { static String getCatalogPath(String catalogName) { return catalogName == null ? null - : getPathByClassName(CatalogTestUtils.class, "catalogFiles") + : JAXPTestUtilities.getPathByClassName(CatalogTestUtils.class, "catalogFiles") + catalogName; } - /* - * Acquire a full path string by given class name and relative path string. - */ - private static String getPathByClassName(Class clazz, - String relativeDir) { - String packageName = FILE_SEP - + clazz.getPackage().getName().replaceAll("[.]", FILE_SEP); - String javaSourcePath = System.getProperty("test.src").replaceAll( - "\\" + File.separator, FILE_SEP) + packageName + FILE_SEP; - String normalizedPath = Paths.get(javaSourcePath, - relativeDir).normalize().toAbsolutePath().toString(); - return normalizedPath.replace("\\", FILE_SEP) + FILE_SEP; - } - /* ********** jaxp.properties ********** */ /* diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java new file mode 100644 index 00000000000..5289148ad74 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/BasePolicy.java @@ -0,0 +1,75 @@ +/* + * Copyright (c) 2016, 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. + */ +package jaxp.library; + +import org.testng.ITestContext; +import org.testng.ITestListener; +import org.testng.ITestResult; + +/** + * This policy includes default permissions. + * It should be used as one listener: either TestListener or MethodListener. + */ +public class BasePolicy implements ITestListener { + + @Override + public void onFinish(ITestContext arg0) { + try { + JAXPPolicyManager.teardownPolicyManager(); + } catch (Exception e) { + throw new RuntimeException("Failed to teardonw the policy manager", e); + } + } + + @Override + public void onStart(ITestContext arg0) { + // suppose to only run othervm mode + if (isRunWithSecurityManager()) + JAXPPolicyManager.getJAXPPolicyManager(true); + } + + @Override + public void onTestFailedButWithinSuccessPercentage(ITestResult arg0) { + } + + @Override + public void onTestFailure(ITestResult arg0) { + } + + @Override + public void onTestSkipped(ITestResult arg0) { + } + + @Override + public void onTestStart(ITestResult arg0) { + } + + @Override + public void onTestSuccess(ITestResult arg0) { + } + + protected boolean isRunWithSecurityManager() { + final String runSecMngr = JAXPTestUtilities.getSystemProperty("runSecMngr"); + return runSecMngr != null && runSecMngr.equals("true"); + } +} diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/FilePolicy.java b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/FilePolicy.java new file mode 100644 index 00000000000..d40c0c58b2e --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/FilePolicy.java @@ -0,0 +1,51 @@ +/* + * Copyright (c) 2016, 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. + */ +package jaxp.library; + +import static jaxp.library.JAXPTestUtilities.getSystemProperty; + +import java.io.FilePermission; + +import org.testng.ITestContext; + +/** + * This policy can access local XML files. + */ +public class FilePolicy extends BasePolicy { + + @Override + public void onStart(ITestContext arg0) { + // suppose to only run othervm mode + if (isRunWithSecurityManager()) { + JAXPPolicyManager policyManager = JAXPPolicyManager.getJAXPPolicyManager(true); + String userdir = getSystemProperty("user.dir"); + policyManager.addPermission(new FilePermission(userdir + "/-", "read,write,delete")); + String testSrc = System.getProperty("test.src"); + // to handle the directory structure of some functional test suite + if (testSrc.endsWith("ptests")) + testSrc = testSrc.substring(0, testSrc.length() - 7); + policyManager.addPermission(new FilePermission(testSrc + "/-", "read")); + policyManager.addPermission(new FilePermission(userdir, "read")); + } + } +} diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/InternalAPIPolicy.java b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/InternalAPIPolicy.java new file mode 100644 index 00000000000..b9431443b88 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/InternalAPIPolicy.java @@ -0,0 +1,43 @@ +/* + * Copyright (c) 2016, 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. + */ +package jaxp.library; + +import org.testng.ITestContext; + +/** + * This policy can access internal jaxp packages. + */ +public class InternalAPIPolicy extends BasePolicy { + + @Override + public void onStart(ITestContext arg0) { + // suppose to only run othervm mode + if (isRunWithSecurityManager()) { + JAXPPolicyManager policyManager = JAXPPolicyManager.getJAXPPolicyManager(true); + policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xerces.internal.jaxp")); + policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.org.apache.bcel.internal.classfile")); + policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.org.apache.bcel.internal.generic")); + policyManager.addPermission(new RuntimePermission("accessClassInPackage.com.sun.org.apache.xalan.internal.xsltc.trax")); + } + } +} diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPBaseTest.java b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPBaseTest.java deleted file mode 100644 index 687ff7009d5..00000000000 --- a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPBaseTest.java +++ /dev/null @@ -1,138 +0,0 @@ -/* - * Copyright (c) 2015, 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. - */ -package jaxp.library; - -import java.security.Permission; -import java.security.Permissions; -import java.security.Policy; -import java.util.PropertyPermission; -import org.testng.annotations.AfterClass; -import org.testng.annotations.BeforeClass; - -/** - * This is a base class that every test class must extend if it needs to be run - * with security mode. - */ -public class JAXPBaseTest { - /** - * Backing up policy. - */ - protected static Policy policy; - - /** - * Backing up security manager. - */ - private static SecurityManager sm; - - /* - * Install a SecurityManager along with a base Policy to allow testNG to - * run when there is a security manager. - */ - @BeforeClass - public void setUpClass() throws Exception { - setPolicy(new TestPolicy()); - System.setSecurityManager(new SecurityManager()); - } - - /* - * Install the original Policy and SecurityManager when there is a security - * manager. - */ - @AfterClass - public void tearDownClass() throws Exception { - System.setSecurityManager(sm); - setPolicy(policy); - } - - /* - * Utility Method used to set the current Policy. - */ - protected static void setPolicy(Policy p) { - Policy.setPolicy(p); - } - - /* - * Add the specified permission(s) to the test policy. - * Note there is no way to add permissions to current permissions. Reset - * test policy by setting minimal permmisons in addition to specified - * permissions when calling this method. - */ - protected static void setPermissions(Permission... ps) { - Policy.setPolicy(new TestPolicy(ps)); - } - - /* - * Add the specified permission(s) to the test policy. - * Note there is no way to add permissions to current permissions. Reset - * test policy by setting minimal permmisons in addition to specified - * permissions when calling this method. - */ - protected static void setPermissions(Permissions ps) { - Policy.setPolicy(new TestPolicy(ps)); - } - - /** - * Backing up policy and security manager for restore when there is a - * security manager. - */ - public JAXPBaseTest() { - policy = Policy.getPolicy(); - sm = System.getSecurityManager(); - } - - /** - * Safety acquire a system property. - * Note invocation of this method will restore permission to limited - * minimal permission of tests. If there is additional permission set - * already, you need restore permission by yourself. - * @param propName System property name to be acquired. - * @return property value - */ - protected String getSystemProperty(final String propName) { - setPermissions(new PropertyPermission(propName, "read")); - try { - return System.getProperty(propName); - } finally { - setPermissions(); - } - } - - /** - * Safety set a system property by given system value. - * - * @param propName System property name to be set. - * @param propValue System property value to be set. - */ - protected void setSystemProperty(final String propName, final String propValue) { - setPermissions(new PropertyPermission(propName, "write")); - try { - if (propValue == null) { - System.clearProperty(propName); - } else { - System.setProperty(propName, propValue); - } - } finally { - setPermissions(); - } - } -} diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPFileBaseTest.java b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPFileBaseTest.java deleted file mode 100644 index c45c6d3a270..00000000000 --- a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPFileBaseTest.java +++ /dev/null @@ -1,105 +0,0 @@ -/* - * Copyright (c) 2015, 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. - */ -package jaxp.library; - -import java.io.FilePermission; -import java.security.Permission; -import java.security.Permissions; -import java.security.Policy; -import static jaxp.library.JAXPBaseTest.setPolicy; -import org.testng.annotations.BeforeClass; - -/** - * This is a base class that every test class that need to access local XML - * files must extend if it needs to be run with security mode. - */ -public class JAXPFileBaseTest extends JAXPBaseTest { - /* - * Install a SecurityManager along with a base Policy to allow testNG to - * run when there is a security manager. - */ - @BeforeClass - @Override - public void setUpClass() throws Exception { - setPolicy(new FileTestPolicy()); - System.setSecurityManager(new SecurityManager()); - } - - /* - * Add the specified permission(s) to the test policy. - * Note there is no way to add permissions to current permissions. Reset - * test policy by setting minimal permmisons in addition to specified - * permissions when calling this method. - */ - protected static void setPermissions(Permission... ps) { - Policy.setPolicy(new FileTestPolicy(ps)); - } - - /* - * Add the specified permission(s) to the test policy. - * Note there is no way to add permissions to current permissions. Reset - * test policy by setting minimal permmisons in addition to specified - * permissions when calling this method. - */ - protected static void setPermissions(Permissions ps) { - Policy.setPolicy(new FileTestPolicy(ps)); - } -} - -/** - * This policy is only given to tests that need access local files. Additional - * permissions for accessing local files have been granted by default. - * @author HaiboYan - */ -class FileTestPolicy extends TestPolicy { - /** - * Constructor which sets the minimum permissions by default allowing testNG - * to work with a SecurityManager. - * @param ps permissions to be added. - */ - public FileTestPolicy(Permissions ps) { - super(ps); - } - - /** - * Constructor which sets the minimum permissions by default allowing testNG - * to work with a SecurityManager. - * @param ps permission array to be added. - */ - public FileTestPolicy(Permission... ps) { - super(ps); - } - - /** - * Defines the minimal permissions required by testNG when running these - * tests - */ - @Override - protected void setMinimalPermissions() { - super.setMinimalPermissions(); - permissions.add(new FilePermission(System.getProperty("user.dir") + "/-", - "read, write")); - permissions.add(new FilePermission(System.getProperty("test.src") + "/-", - "read")); - } -} diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPPolicyManager.java b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPPolicyManager.java new file mode 100644 index 00000000000..a52c854a707 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPPolicyManager.java @@ -0,0 +1,300 @@ +/* + * Copyright (c) 2015, 2016, 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. + */ +package jaxp.library; + + +import java.security.CodeSource; +import java.security.Permission; +import java.security.PermissionCollection; +import java.security.Permissions; +import java.security.Policy; +import java.security.ProtectionDomain; +import java.security.SecurityPermission; +import java.util.Enumeration; +import java.util.HashMap; +import java.util.Map; +import java.util.PropertyPermission; +import java.util.StringJoiner; + + +/* + * This is a base class that every test class must extend if it needs to be run + * with security mode. + */ +public class JAXPPolicyManager { + /* + * Backing up policy. + */ + private Policy policyBackup; + + /* + * Backing up security manager. + */ + private SecurityManager smBackup; + + /* + * Current policy. + */ + private TestPolicy policy = new TestPolicy(); + + /* + * JAXPPolicyManager singleton. + */ + private static JAXPPolicyManager policyManager = null; + + /* + * Install a SecurityManager along with a default Policy to allow testNG to + * run when there is a security manager. + */ + private JAXPPolicyManager() { + // Backing up policy and security manager for restore + policyBackup = Policy.getPolicy(); + smBackup = System.getSecurityManager(); + + // Set customized policy + setDefaultPermissions(); + Policy.setPolicy(policy); + System.setSecurityManager(new SecurityManager()); + } + + static synchronized JAXPPolicyManager getJAXPPolicyManager(boolean createIfNone) { + if (policyManager == null & createIfNone) + policyManager = new JAXPPolicyManager(); + return policyManager; + } + + private void teardown() throws Exception { + System.setSecurityManager(smBackup); + Policy.setPolicy(policyBackup); + } + + /* + * Restore the original Policy and SecurityManager. + */ + static synchronized void teardownPolicyManager() throws Exception { + if (policyManager != null) { + policyManager.teardown(); + policyManager = null; + } + } + + /* + * Set default permissions, sub-class of JAXPBaseTest should override this + * method. + */ + private void setDefaultPermissions() { + //Permissions to set security manager and policy + addPermission(new SecurityPermission("getPolicy")); + addPermission(new SecurityPermission("setPolicy")); + addPermission(new RuntimePermission("setSecurityManager")); + //Properties that jtreg and TestNG require + addPermission(new PropertyPermission("testng.show.stack.frames", "read")); + addPermission(new PropertyPermission("test.src", "read")); + addPermission(new PropertyPermission("test.classes", "read")); + addPermission(new PropertyPermission("dataproviderthreadcount", "read")); + addPermission(new PropertyPermission("experimental", "read")); + } + + /* + * Add permission to the TestPolicy. + * + * @param permission to be added. + */ + void addPermission(Permission p) { + policy.addPermission(p); + } + + /* + * Add a temporary permission in current thread context. This won't impact + * global policy and doesn't support permission combination. + * + * @param permission + * to add. + * @return index of the added permission. + */ + int addTmpPermission(Permission p) { + return policy.addTmpPermission(p); + } + + /* + * set allowAll in current thread context. + */ + void setAllowAll(boolean allow) { + policy.setAllowAll(allow); + } + + /* + * Remove a temporary permission from current thread context. + * + * @param index to remove. + * + * @throws RuntimeException if no temporary permission list in current + * thread context or no permission correlated to the index. + */ + void removeTmpPermission(int index) { + policy.removeTmpPermission(index); + } + + +} + +/* + * Simple Policy class that supports the required Permissions to validate the + * JAXP concrete classes. + */ +class TestPolicy extends Policy { + private final PermissionCollection permissions = new Permissions(); + + private ThreadLocal> transientPermissions = new ThreadLocal<>(); + private ThreadLocal allowAll = new ThreadLocal<>(); + + private static Policy defaultPolicy = Policy.getPolicy(); + + /* + * Add permission to this policy. + * + * @param permission to be added. + */ + void addPermission(Permission p) { + permissions.add(p); + } + + /* + * Set all permissions. Caution: this should not called carefully unless + * it's really needed. + * + * private void setAllPermissions() { permissions.add(new AllPermission()); + * } + */ + + /* + * Overloaded methods from the Policy class. + */ + @Override + public String toString() { + StringJoiner sj = new StringJoiner("\n", "policy: ", ""); + Enumeration perms = permissions.elements(); + while (perms.hasMoreElements()) { + sj.add(perms.nextElement().toString()); + } + return sj.toString(); + + } + + @Override + public PermissionCollection getPermissions(ProtectionDomain domain) { + return permissions; + } + + @Override + public PermissionCollection getPermissions(CodeSource codesource) { + return permissions; + } + + @Override + public boolean implies(ProtectionDomain domain, Permission perm) { + if (allowAll()) + return true; + + if (defaultPolicy.implies(domain, perm)) + return true; + + if (permissions.implies(perm)) + return true; + else + return tmpImplies(perm); + } + + /* + * Add a temporary permission in current thread context. This won't impact + * global policy and doesn't support permission combination. + * + * @param permission to add. + * @return index of the added permission. + */ + int addTmpPermission(Permission p) { + Map tmpPermissions = transientPermissions.get(); + if (tmpPermissions == null) + tmpPermissions = new HashMap<>(); + + int id = tmpPermissions.size(); + tmpPermissions.put(id, p); + transientPermissions.set(tmpPermissions); + return id; + } + + /* + * Remove a temporary permission from current thread context. + * + * @param index to remove. + * + * @throws RuntimeException if no temporary permission list in current + * thread context or no permission correlated to the index. + */ + void removeTmpPermission(int index) { + try { + Map tmpPermissions = transientPermissions.get(); + tmpPermissions.remove(index); + } catch (NullPointerException | IndexOutOfBoundsException e) { + throw new RuntimeException("Tried to delete a non-existent temporary permission", e); + } + } + + /* + * Checks to see if the specified permission is implied by temporary + * permission list in current thread context. + * + * @param permission the Permission object to compare. + * + * @return true if "permission" is implied by any permission in the + * temporary permission list, false if not. + */ + private boolean tmpImplies(Permission perm) { + Map tmpPermissions = transientPermissions.get(); + if (tmpPermissions != null) { + for (Permission p : tmpPermissions.values()) { + if (p.implies(perm)) + return true; + } + } + return false; + } + + /* + * Checks to see if allow all permission requests in current thread context. + */ + private boolean allowAll() { + Boolean allow = allowAll.get(); + if (allow != null) { + return allow; + } + return false; + } + + /* + * set allowAll in current thread context. + */ + void setAllowAll(boolean allow) { + allowAll.set(allow); + } +} diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java index 8269f05eee1..d89e740c118 100644 --- a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java +++ b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPTestUtilities.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -22,6 +22,8 @@ */ package jaxp.library; +import static org.testng.Assert.fail; + import java.io.ByteArrayInputStream; import java.io.File; import java.io.IOException; @@ -34,12 +36,18 @@ import java.nio.charset.StandardCharsets; import java.nio.charset.UnsupportedCharsetException; import java.nio.file.Files; import java.nio.file.Paths; +import java.security.Permission; +import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.Optional; +import java.util.concurrent.Callable; import java.util.concurrent.ConcurrentHashMap; +import java.util.function.Supplier; import java.util.regex.Pattern; import java.util.stream.Collectors; + import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; @@ -48,7 +56,7 @@ import javax.xml.transform.TransformerException; import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; -import static org.testng.Assert.fail; + import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.SAXException; @@ -73,12 +81,6 @@ public class JAXPTestUtilities { */ public static final String FILE_SEP = "/"; - /** - * Current test directory. - */ - public static final String USER_DIR = - System.getProperty("user.dir", ".") + FILE_SEP;; - /** * A map storing every test's current test file pointer. File number should * be incremental and it's a thread-safe reading on this file number. @@ -89,7 +91,7 @@ public class JAXPTestUtilities { /** * BOM table for storing BOM header. */ - private final static Map bom = new HashMap<>(); + private final static Map bom = new HashMap(); /** * Initialize all BOM headers. @@ -130,8 +132,15 @@ public class JAXPTestUtilities { */ public static boolean compareWithGold(String goldfile, String outputfile, Charset cs) throws IOException { - return Files.readAllLines(Paths.get(goldfile)). + boolean isSame = Files.readAllLines(Paths.get(goldfile)). equals(Files.readAllLines(Paths.get(outputfile), cs)); + if (!isSame) { + System.err.println("Golden file " + goldfile + " :"); + Files.readAllLines(Paths.get(goldfile)).forEach(System.err::println); + System.err.println("Output file " + outputfile + " :"); + Files.readAllLines(Paths.get(outputfile), cs).forEach(System.err::println); + } + return isSame; } /** @@ -308,10 +317,10 @@ public class JAXPTestUtilities { int nextNumber = currentFileNumber.contains(clazz) ? currentFileNumber.get(clazz) + 1 : 1; Integer i = currentFileNumber.putIfAbsent(clazz, nextNumber); - if (i != null && i != nextNumber) { + if (i != null) { do { nextNumber = currentFileNumber.get(clazz) + 1; - } while (currentFileNumber.replace(clazz, nextNumber -1, nextNumber)); + } while (!currentFileNumber.replace(clazz, nextNumber - 1, nextNumber)); } return USER_DIR + clazz.getName() + nextNumber + ".out"; } @@ -324,12 +333,177 @@ public class JAXPTestUtilities { * @return a string represents the full path of accessing path. */ public static String getPathByClassName(Class clazz, String relativeDir) { - String packageName = FILE_SEP + - clazz.getPackage().getName().replaceAll("[.]", FILE_SEP); - String javaSourcePath = System.getProperty("test.src").replaceAll("\\" + File.separator, FILE_SEP) - + packageName + FILE_SEP; + String javaSourcePath = System.getProperty("test.src").replaceAll("\\" + File.separator, FILE_SEP); String normalizedPath = Paths.get(javaSourcePath, relativeDir).normalize(). toAbsolutePath().toString(); return normalizedPath.replace("\\", FILE_SEP) + FILE_SEP; } + + + /** + * Run the supplier with all permissions. This won't impact global policy. + * + * @param s + * Supplier to run + */ + public static T runWithAllPerm(Supplier s) { + Optional policyManager = Optional.ofNullable(JAXPPolicyManager + .getJAXPPolicyManager(false)); + policyManager.ifPresent(manager -> manager.setAllowAll(true)); + try { + return s.get(); + } finally { + policyManager.ifPresent(manager -> manager.setAllowAll(false)); + } + } + + /** + * Run the supplier with all permissions. This won't impact global policy. + * + * @param s + * Supplier to run + */ + public static T tryRunWithAllPerm(Callable c) throws Exception { + Optional policyManager = Optional.ofNullable(JAXPPolicyManager + .getJAXPPolicyManager(false)); + policyManager.ifPresent(manager -> manager.setAllowAll(true)); + try { + return c.call(); + } finally { + policyManager.ifPresent(manager -> manager.setAllowAll(false)); + } + } + + /** + * Run the Runnable with all permissions. This won't impact global policy. + * + * @param s + * Supplier to run + */ + public static void runWithAllPerm(Runnable r) { + Optional policyManager = Optional.ofNullable(JAXPPolicyManager + .getJAXPPolicyManager(false)); + policyManager.ifPresent(manager -> manager.setAllowAll(true)); + try { + r.run(); + } finally { + policyManager.ifPresent(manager -> manager.setAllowAll(false)); + } + } + + /** + * Acquire a system property. + * + * @param name + * System property name to be acquired. + * @return property value + */ + public static String getSystemProperty(String name) { + return runWithAllPerm(() -> System.getProperty(name)); + } + + /** + * Set a system property by given system value. + * + * @param name + * System property name to be set. + * @param value + * System property value to be set. + */ + public static void setSystemProperty(String name, String value) { + runWithAllPerm(() -> System.setProperty(name, value)); + } + + /** + * Clear a system property. + * + * @param name + * System property name to be cleared. + */ + public static void clearSystemProperty(String name) { + runWithAllPerm(() -> System.clearProperty(name)); + } + + /** + * Run the runnable with assigning temporary permissions. This won't impact + * global policy. + * + * @param r + * Runnable to run + * @param ps + * assigning permissions to add. + */ + public static void runWithTmpPermission(Runnable r, Permission... ps) { + JAXPPolicyManager policyManager = JAXPPolicyManager.getJAXPPolicyManager(false); + List tmpPermissionIndexes = new ArrayList(); + if (policyManager != null) { + for (Permission p : ps) + tmpPermissionIndexes.add(policyManager.addTmpPermission(p)); + } + try { + r.run(); + } finally { + for (int index: tmpPermissionIndexes) + policyManager.removeTmpPermission(index); + } + } + + /** + * Run the supplier with assigning temporary permissions. This won't impact + * global policy. + * + * @param s + * Supplier to run + * @param ps + * assigning permissions to add. + */ + public static T runWithTmpPermission(Supplier s, Permission... ps) { + JAXPPolicyManager policyManager = JAXPPolicyManager.getJAXPPolicyManager(false); + List tmpPermissionIndexes = new ArrayList(); + if (policyManager != null) { + for (Permission p : ps) + tmpPermissionIndexes.add(policyManager.addTmpPermission(p)); + } + try { + return s.get(); + } finally { + for (int index: tmpPermissionIndexes) + policyManager.removeTmpPermission(index); + } + } + + /** + * Run the RunnableWithException with assigning temporary permissions. This + * won't impact global policy. + * + * @param r + * RunnableWithException to execute + * @param ps + * assigning permissions to add. + */ + public static void tryRunWithTmpPermission(RunnableWithException r, Permission... ps) throws Exception { + JAXPPolicyManager policyManager = JAXPPolicyManager.getJAXPPolicyManager(false); + List tmpPermissionIndexes = new ArrayList(); + if (policyManager != null) { + for (Permission p : ps) + tmpPermissionIndexes.add(policyManager.addTmpPermission(p)); + } + try { + r.run(); + } finally { + for (int index: tmpPermissionIndexes) + policyManager.removeTmpPermission(index); + } + } + + @FunctionalInterface + public interface RunnableWithException { + void run() throws Exception; + } + + /** + * Current test directory. + */ + public static final String USER_DIR = getSystemProperty("user.dir") + FILE_SEP;; + } diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPFileReadOnlyBaseTest.java b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/NetAccessPolicy.java similarity index 51% rename from jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPFileReadOnlyBaseTest.java rename to jaxp/test/javax/xml/jaxp/libs/jaxp/library/NetAccessPolicy.java index eed9a05b784..f7037cffe99 100644 --- a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/JAXPFileReadOnlyBaseTest.java +++ b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/NetAccessPolicy.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 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 @@ -22,34 +22,22 @@ */ package jaxp.library; -import java.io.FilePermission; -import static jaxp.library.JAXPBaseTest.setPermissions; -import org.testng.annotations.AfterGroups; -import org.testng.annotations.BeforeGroups; +import java.net.SocketPermission; + +import org.testng.ITestContext; /** - * This is a base class that every test class that need to reading local XML - * files must extend if it needs to be run with security mode. + * This policy can access network. */ -public class JAXPFileReadOnlyBaseTest extends JAXPBaseTest { - /** - * Source files/XML files directory. - */ - private final String SRC_DIR = getSystemProperty("test.src"); +public class NetAccessPolicy extends BasePolicy { - /** - * Allowing access local file system for this group. - */ - @BeforeGroups (groups = {"readLocalFiles"}) - public void setFilePermissions() { - setPermissions(new FilePermission(SRC_DIR + "/-", "read")); - } - - /** - * Restore the system property. - */ - @AfterGroups (groups = {"readLocalFiles"}) - public void restoreFilePermissions() { - setPermissions(); + @Override + public void onStart(ITestContext arg0) { + // suppose to only run othervm mode + if (isRunWithSecurityManager()) { + JAXPPolicyManager policyManager = JAXPPolicyManager.getJAXPPolicyManager(true); + policyManager.addPermission(new SocketPermission("openjdk.java.net:80", "connect,resolve")); + policyManager.addPermission(new SocketPermission("www.w3.org:80", "connect,resolve")); + } } } diff --git a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/TestPolicy.java b/jaxp/test/javax/xml/jaxp/libs/jaxp/library/TestPolicy.java deleted file mode 100644 index 1aaebc36c58..00000000000 --- a/jaxp/test/javax/xml/jaxp/libs/jaxp/library/TestPolicy.java +++ /dev/null @@ -1,153 +0,0 @@ -/* - * Copyright (c) 2015, 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. - */ -package jaxp.library; - -import java.security.AllPermission; -import java.security.CodeSource; -import java.security.Permission; -import java.security.PermissionCollection; -import java.security.Permissions; -import java.security.Policy; -import java.security.ProtectionDomain; -import java.security.SecurityPermission; -import java.util.Arrays; -import java.util.Collections; -import java.util.Enumeration; -import java.util.PropertyPermission; -import java.util.StringJoiner; - - -/* - * Simple Policy class that supports the required Permissions to validate the - * JAXP concrete classes. - * Note: permission can only be added. You may want to create a new TestPolicy - * instance if you need remove permissions. - */ -public class TestPolicy extends Policy { - protected final PermissionCollection permissions = new Permissions(); - - private static Policy defaultPolicy = Policy.getPolicy(); - - /** - * Constructor which sets the minimum permissions by default allowing testNG - * to work with a SecurityManager. - */ - public TestPolicy() { - setMinimalPermissions(); - } - - /** - * Construct an instance with the minimal permissions required by the test - * environment and additional permission(s) as specified. - * @param ps permissions to be added. - */ - public TestPolicy(Permissions ps) { - setMinimalPermissions(); - TestPolicy.this.addPermissions(ps); - } - - /** - * Construct an instance with the minimal permissions required by the test - * environment and additional permission(s) as specified. - * @param ps permission array to be added. - */ - public TestPolicy(Permission... ps) { - setMinimalPermissions(); - addPermissions(ps); - } - - /** - * Defines the minimal permissions required by testNG when running these - * tests - */ - protected void setMinimalPermissions() { - permissions.add(new SecurityPermission("getPolicy")); - permissions.add(new SecurityPermission("setPolicy")); - permissions.add(new RuntimePermission("getClassLoader")); - permissions.add(new RuntimePermission("setSecurityManager")); - permissions.add(new RuntimePermission("createSecurityManager")); - permissions.add(new PropertyPermission("testng.show.stack.frames", - "read")); - permissions.add(new PropertyPermission("user.dir", "read")); - permissions.add(new PropertyPermission("test.src", "read")); - permissions.add(new PropertyPermission("fileStringBuffer", "read")); - permissions.add(new PropertyPermission("dataproviderthreadcount", "read")); - } - - /* - * Add permissions for your tests. - * @param permissions to be added. - */ - private void addPermissions(Permissions ps) { - Collections.list(ps.elements()).forEach(p -> permissions.add(p)); - } - - - /* - * Add permissions for your tests. - * @param permissions to be added. - */ - private void addPermissions(Permission[] ps) { - Arrays.stream(ps).forEach(p -> permissions.add(p)); - } - - /** - * Set all permissions. Caution: this should not called carefully unless - * it's really needed. - */ - private void setAllPermissions() { - permissions.add(new AllPermission()); - } - - /* - * Overloaded methods from the Policy class. - */ - @Override - public String toString() { - StringJoiner sj = new StringJoiner("\n", "policy: ", ""); - Enumeration perms = permissions.elements(); - while (perms.hasMoreElements()) { - sj.add(perms.nextElement().toString()); - } - return sj.toString(); - - } - - @Override - public PermissionCollection getPermissions(ProtectionDomain domain) { - return permissions; - } - - @Override - public PermissionCollection getPermissions(CodeSource codesource) { - return permissions; - } - - @Override - public boolean implies(ProtectionDomain domain, Permission perm) { - if (defaultPolicy.implies(domain, perm)) - return true; - - return permissions.implies(perm); - } -} diff --git a/jaxp/test/javax/xml/jaxp/libs/test/astro/DOML3InputSourceFactoryImpl.java b/jaxp/test/javax/xml/jaxp/libs/test/astro/DOML3InputSourceFactoryImpl.java index 6978900344e..2f4170b21ce 100644 --- a/jaxp/test/javax/xml/jaxp/libs/test/astro/DOML3InputSourceFactoryImpl.java +++ b/jaxp/test/javax/xml/jaxp/libs/test/astro/DOML3InputSourceFactoryImpl.java @@ -23,6 +23,7 @@ package test.astro; import static jaxp.library.JAXPTestUtilities.filenameToURL; +import static jaxp.library.JAXPTestUtilities.USER_DIR; import static org.w3c.dom.ls.DOMImplementationLS.MODE_SYNCHRONOUS; import static org.w3c.dom.traversal.NodeFilter.SHOW_ELEMENT; @@ -81,7 +82,7 @@ public class DOML3InputSourceFactoryImpl implements InputSourceFactory { // Use DOM L3 LSSerializer (previously called a DOMWriter) // to serialize the xml doc DOM to a file stream. - String tmpCatalog = Files.createTempFile(Paths.get("").toAbsolutePath(), "catalog.xml", null).toString(); + String tmpCatalog = Files.createTempFile(Paths.get(USER_DIR), "catalog.xml", null).toString(); LSSerializer domserializer = impl.createLSSerializer(); domserializer.setFilter(new MyDOMWriterFilter()); diff --git a/jaxp/test/javax/xml/jaxp/module/TEST.properties b/jaxp/test/javax/xml/jaxp/module/TEST.properties deleted file mode 100644 index 85a3ae5f5c7..00000000000 --- a/jaxp/test/javax/xml/jaxp/module/TEST.properties +++ /dev/null @@ -1,5 +0,0 @@ -# Tests that must run in othervm mode -othervm.dirs= . - -# Declare module dependency -modules=java.xml diff --git a/jaxp/test/javax/xml/jaxp/unittest/TEST.properties b/jaxp/test/javax/xml/jaxp/unittest/TEST.properties index b6e235b5124..1e8f4643821 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/TEST.properties +++ b/jaxp/test/javax/xml/jaxp/unittest/TEST.properties @@ -1,9 +1,8 @@ -# jaxp test uses TestNG -TestNG.dirs = . - -lib.dirs = /javax/xml/jaxp/libs - # Declare module dependency modules=java.xml/com.sun.org.apache.xerces.internal.impl \ java.xml/com.sun.org.apache.xerces.internal.jaxp \ - java.xml/com.sun.org.apache.xml.internal.serialize + java.xml/com.sun.org.apache.xml.internal.serialize \ + java.xml/com.sun.org.apache.bcel.internal.classfile \ + java.xml/com.sun.org.apache.bcel.internal.generic \ + java.xml/com.sun.org.apache.xalan.internal.xsltc.trax \ + java.xml/com.sun.org.apache.xml.internal.utils diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport.java b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport.java index 1e88b682419..f8dbda9310a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport.java +++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport.java @@ -25,20 +25,27 @@ package catalog; import java.io.File; import java.io.StringReader; + import javax.xml.transform.Source; import javax.xml.transform.URIResolver; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stax.StAXSource; import javax.xml.transform.stream.StreamSource; + import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.ls.LSResourceResolver; import org.xml.sax.InputSource; /** + * @test * @bug 8158084 8162438 8162442 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true catalog.CatalogSupport + * @run testng/othervm catalog.CatalogSupport * @summary verifies the use of Catalog in SAX/DOM/StAX/Validation/Transform. * The two main scenarios for all processors are: * A custom resolver is used whether or not there's a Catalog; @@ -60,6 +67,7 @@ import org.xml.sax.InputSource; * * @author huizhe.wang@oracle.com */ +@Listeners({jaxp.library.FilePolicy.class, jaxp.library.NetAccessPolicy.class}) public class CatalogSupport extends CatalogSupportBase { /* * Initializing fields @@ -159,7 +167,7 @@ public class CatalogSupport extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_SAXA") - Object[][] getDataSAX() { + public Object[][] getDataSAX() { String[] systemIds = {"system.xsd"}; InputSource[] returnValues = {new InputSource(new StringReader(dtd_systemResolved))}; MyEntityHandler entityHandler = new MyEntityHandler(systemIds, returnValues, elementInSystem); @@ -175,7 +183,7 @@ public class CatalogSupport extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_XIA") - Object[][] getDataXI() { + public Object[][] getDataXI() { String[] systemIds = {"XI_simple.xml"}; InputSource[] returnValues = {new InputSource(xml_xIncludeSimple)}; MyEntityHandler entityHandler = new MyEntityHandler(systemIds, returnValues, elementInXISimple); @@ -191,7 +199,7 @@ public class CatalogSupport extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_DOMA") - Object[][] getDataDOM() { + public Object[][] getDataDOM() { String[] systemIds = {"system.xsd"}; InputSource[] returnValues = {new InputSource(new StringReader(dtd_systemResolved))}; MyEntityHandler entityHandler = new MyEntityHandler(systemIds, returnValues, elementInSystem); @@ -213,7 +221,7 @@ public class CatalogSupport extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xsd file, a LSResourceResolver */ @DataProvider(name = "data_SchemaA") - Object[][] getDataSchema() { + public Object[][] getDataSchema() { String[] systemIds = {"pathto/XMLSchema.dtd", "datatypes.dtd"}; XmlInput[] returnValues = {new XmlInput(null, dtd_xmlSchema, null), new XmlInput(null, dtd_datatypes, null)}; LSResourceResolver resolver = new SourceResolver(null, systemIds, returnValues); @@ -248,7 +256,7 @@ public class CatalogSupport extends CatalogSupportBase { Data: source, resolver1, resolver2, catalog1, a catalog2 */ @DataProvider(name = "data_ValidatorA") - Object[][] getDataValidator() { + public Object[][] getDataValidator() { DOMSource ds = getDOMSource(xml_val_test, xml_val_test_id, false, true, xml_catalog); SAXSource ss = new SAXSource(new InputSource(xml_val_test)); @@ -289,7 +297,7 @@ public class CatalogSupport extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xsl file, xml file, a URIResolver, expected result */ @DataProvider(name = "data_XSLA") - Object[][] getDataXSL() { + public Object[][] getDataXSL() { // XSLInclude.xsl has one import XSLImport_html.xsl and two includes, // XSLInclude_header.xsl and XSLInclude_footer.xsl; String[] hrefs = {"XSLImport_html.xsl", "XSLInclude_header.xsl", "XSLInclude_footer.xsl"}; @@ -319,3 +327,4 @@ public class CatalogSupport extends CatalogSupportBase { }; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport1.java b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport1.java index 40961d2a0f3..cac5e33e99c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport1.java +++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport1.java @@ -23,8 +23,12 @@ package catalog; +import static jaxp.library.JAXPTestUtilities.clearSystemProperty; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + import java.io.File; import java.io.StringReader; + import javax.xml.catalog.CatalogFeatures.Feature; import javax.xml.transform.Source; import javax.xml.transform.URIResolver; @@ -32,15 +36,21 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stax.StAXSource; import javax.xml.transform.stream.StreamSource; + import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.ls.LSResourceResolver; import org.xml.sax.InputSource; /* + * @test * @bug 8158084 8162438 8162442 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true catalog.CatalogSupport1 + * @run testng/othervm catalog.CatalogSupport1 * @summary extends CatalogSupport, verifies that the catalog file can be set * using the System property. */ @@ -51,6 +61,7 @@ import org.xml.sax.InputSource; * * @author huizhe.wang@oracle.com */ +@Listeners({jaxp.library.FilePolicy.class}) public class CatalogSupport1 extends CatalogSupportBase { /* * Initializing fields @@ -58,12 +69,12 @@ public class CatalogSupport1 extends CatalogSupportBase { @BeforeClass public void setUpClass() throws Exception { setUp(); - System.setProperty(Feature.FILES.getPropertyName(), xml_catalog); + setSystemProperty(Feature.FILES.getPropertyName(), xml_catalog); } @AfterClass public void tearDownClass() throws Exception { - System.clearProperty(Feature.FILES.getPropertyName()); + clearSystemProperty(Feature.FILES.getPropertyName()); } /* @@ -149,7 +160,7 @@ public class CatalogSupport1 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_SAXC") - Object[][] getDataSAXC() { + public Object[][] getDataSAXC() { return new Object[][]{ {false, true, null, xml_system, new MyHandler(elementInSystem), expectedWCatalog} @@ -161,7 +172,7 @@ public class CatalogSupport1 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_XIC") - Object[][] getDataXIC() { + public Object[][] getDataXIC() { return new Object[][]{ {false, true, null, xml_xInclude, new MyHandler(elementInXISimple), contentInUIutf8Catalog}, }; @@ -172,7 +183,7 @@ public class CatalogSupport1 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_DOMC") - Object[][] getDataDOMC() { + public Object[][] getDataDOMC() { return new Object[][]{ {false, true, null, xml_system, new MyHandler(elementInSystem), expectedWCatalog} }; @@ -183,7 +194,7 @@ public class CatalogSupport1 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xsd file, a LSResourceResolver */ @DataProvider(name = "data_SchemaC") - Object[][] getDataSchemaC() { + public Object[][] getDataSchemaC() { return new Object[][]{ // for resolving DTD in xsd @@ -201,7 +212,7 @@ public class CatalogSupport1 extends CatalogSupportBase { Data: source, resolver1, resolver2, catalog1, a catalog2 */ @DataProvider(name = "data_ValidatorC") - Object[][] getDataValidator() { + public Object[][] getDataValidator() { DOMSource ds = getDOMSource(xml_val_test, xml_val_test_id, false, true, null); SAXSource ss = new SAXSource(new InputSource(xml_val_test)); @@ -242,7 +253,7 @@ public class CatalogSupport1 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xsl file, xml file, a URIResolver, expected */ @DataProvider(name = "data_XSLC") - Object[][] getDataXSLC() { + public Object[][] getDataXSLC() { SAXSource xslSourceDTD = new SAXSource(new InputSource(new StringReader(xsl_includeDTD))); StreamSource xmlSourceDTD = new StreamSource(new StringReader(xml_xslDTD)); @@ -257,3 +268,4 @@ public class CatalogSupport1 extends CatalogSupportBase { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport2.java b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport2.java index 3368599b473..50cb26e3c60 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport2.java +++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport2.java @@ -23,10 +23,15 @@ package catalog; +import static jaxp.library.JAXPTestUtilities.clearSystemProperty; +import static jaxp.library.JAXPTestUtilities.getSystemProperty; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + import java.io.File; import java.io.FileNotFoundException; import java.io.StringReader; import java.net.SocketTimeoutException; + import javax.xml.transform.Source; import javax.xml.transform.TransformerException; import javax.xml.transform.URIResolver; @@ -34,9 +39,11 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stax.StAXSource; import javax.xml.transform.stream.StreamSource; + import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.ls.LSResourceResolver; import org.xml.sax.InputSource; @@ -44,7 +51,11 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test * @bug 8158084 8162438 8162442 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true catalog.CatalogSupport2 + * @run testng/othervm catalog.CatalogSupport2 * @summary extends CatalogSupport tests, verifies that the use of the Catalog may * be disabled through the System property. */ @@ -56,11 +67,12 @@ import org.xml.sax.SAXParseException; * * @author huizhe.wang@oracle.com */ +@Listeners({jaxp.library.FilePolicy.class, jaxp.library.NetAccessPolicy.class}) public class CatalogSupport2 extends CatalogSupportBase { static final String TTIMEOUTREAD = "sun.net.client.defaultReadTimeout"; static final String TIMEOUTCONNECT = "sun.net.client.defaultConnectTimeout"; - static String timeoutRead = System.getProperty(TTIMEOUTREAD); - static String timeoutConnect = System.getProperty(TIMEOUTCONNECT); + static String timeoutRead = getSystemProperty(TTIMEOUTREAD); + static String timeoutConnect = getSystemProperty(TIMEOUTCONNECT); /* * Initializing fields @@ -68,18 +80,18 @@ public class CatalogSupport2 extends CatalogSupportBase { @BeforeClass public void setUpClass() throws Exception { setUp(); - System.setProperty(SP_USE_CATALOG, "false"); - timeoutRead = System.getProperty(TTIMEOUTREAD); - timeoutConnect = System.getProperty(TIMEOUTCONNECT); - System.setProperty(TTIMEOUTREAD, "1000"); - System.setProperty(TIMEOUTCONNECT, "1000"); + setSystemProperty(SP_USE_CATALOG, "false"); + timeoutRead = getSystemProperty(TTIMEOUTREAD); + timeoutConnect = getSystemProperty(TIMEOUTCONNECT); + setSystemProperty(TTIMEOUTREAD, "1000"); + setSystemProperty(TIMEOUTCONNECT, "1000"); } @AfterClass public void tearDownClass() throws Exception { - System.clearProperty(SP_USE_CATALOG); - System.setProperty(TIMEOUTCONNECT, "-1"); - System.setProperty(TTIMEOUTREAD, "-1"); + clearSystemProperty(SP_USE_CATALOG); + setSystemProperty(TIMEOUTCONNECT, "-1"); + setSystemProperty(TTIMEOUTREAD, "-1"); } /* @@ -165,7 +177,7 @@ public class CatalogSupport2 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_SAXC") - Object[][] getDataSAXC() { + public Object[][] getDataSAXC() { return new Object[][]{ {false, true, xml_catalog, xml_system, new MyHandler(elementInSystem), expectedWCatalog} @@ -177,7 +189,7 @@ public class CatalogSupport2 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_XIC") - Object[][] getDataXIC() { + public Object[][] getDataXIC() { return new Object[][]{ {false, true, xml_catalog, xml_xInclude, new MyHandler(elementInXISimple), contentInUIutf8Catalog}, }; @@ -188,7 +200,7 @@ public class CatalogSupport2 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_DOMC") - Object[][] getDataDOMC() { + public Object[][] getDataDOMC() { return new Object[][]{ {false, true, xml_catalog, xml_system, new MyHandler(elementInSystem), expectedWCatalog} }; @@ -199,7 +211,7 @@ public class CatalogSupport2 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xsd file, a LSResourceResolver */ @DataProvider(name = "data_SchemaC") - Object[][] getDataSchemaC() { + public Object[][] getDataSchemaC() { return new Object[][]{ // for resolving DTD in xsd @@ -217,7 +229,7 @@ public class CatalogSupport2 extends CatalogSupportBase { Data: source, resolver1, resolver2, catalog1, a catalog2 */ @DataProvider(name = "data_ValidatorC") - Object[][] getDataValidator() { + public Object[][] getDataValidator() { DOMSource ds = getDOMSource(xml_val_test, xml_val_test_id, true, true, xml_catalog); SAXSource ss = new SAXSource(new InputSource(xml_val_test)); @@ -246,7 +258,7 @@ public class CatalogSupport2 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xsl file, xml file, a URIResolver, expected */ @DataProvider(name = "data_XSLC") - Object[][] getDataXSLC() { + public Object[][] getDataXSLC() { SAXSource xslSourceDTD = new SAXSource(new InputSource(new StringReader(xsl_includeDTD))); StreamSource xmlSourceDTD = new StreamSource(new StringReader(xml_xslDTD)); @@ -260,3 +272,4 @@ public class CatalogSupport2 extends CatalogSupportBase { }; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport3.java b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport3.java index 193713b6bbb..6a9b04da148 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport3.java +++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport3.java @@ -23,10 +23,14 @@ package catalog; +import static jaxp.library.JAXPTestUtilities.getSystemProperty; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + import java.io.File; import java.io.FileNotFoundException; import java.io.StringReader; import java.net.SocketTimeoutException; + import javax.xml.transform.Source; import javax.xml.transform.TransformerException; import javax.xml.transform.URIResolver; @@ -34,9 +38,11 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stax.StAXSource; import javax.xml.transform.stream.StreamSource; + import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.ls.LSResourceResolver; import org.xml.sax.InputSource; @@ -44,7 +50,11 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test * @bug 8158084 8162438 8162442 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true catalog.CatalogSupport3 + * @run testng/othervm catalog.CatalogSupport3 * @summary extends CatalogSupport tests, verifies that the use of the Catalog may * be disabled through the API property. */ @@ -56,27 +66,28 @@ import org.xml.sax.SAXParseException; * * @author huizhe.wang@oracle.com */ +@Listeners({jaxp.library.FilePolicy.class, jaxp.library.NetAccessPolicy.class}) public class CatalogSupport3 extends CatalogSupportBase { static final String TTIMEOUTREAD = "sun.net.client.defaultReadTimeout"; static final String TIMEOUTCONNECT = "sun.net.client.defaultConnectTimeout"; - static String timeoutRead = System.getProperty(TTIMEOUTREAD); - static String timeoutConnect = System.getProperty(TIMEOUTCONNECT); + static String timeoutRead = getSystemProperty(TTIMEOUTREAD); + static String timeoutConnect = getSystemProperty(TIMEOUTCONNECT); /* * Initializing fields */ @BeforeClass public void setUpClass() throws Exception { setUp(); - timeoutRead = System.getProperty(TTIMEOUTREAD); - timeoutConnect = System.getProperty(TIMEOUTCONNECT); - System.setProperty(TTIMEOUTREAD, "1000"); - System.setProperty(TIMEOUTCONNECT, "1000"); + timeoutRead = getSystemProperty(TTIMEOUTREAD); + timeoutConnect = getSystemProperty(TIMEOUTCONNECT); + setSystemProperty(TTIMEOUTREAD, "1000"); + setSystemProperty(TIMEOUTCONNECT, "1000"); } @AfterClass public void tearDownClass() throws Exception { - System.setProperty(TIMEOUTCONNECT, "-1"); - System.setProperty(TTIMEOUTREAD, "-1"); + setSystemProperty(TIMEOUTCONNECT, "-1"); + setSystemProperty(TTIMEOUTREAD, "-1"); } /* @@ -167,7 +178,7 @@ public class CatalogSupport3 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_SAXC") - Object[][] getDataSAXC() { + public Object[][] getDataSAXC() { return new Object[][]{ {true, false, xml_catalog, xml_system, new MyHandler(elementInSystem), expectedWCatalog} @@ -179,7 +190,7 @@ public class CatalogSupport3 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_XIC") - Object[][] getDataXIC() { + public Object[][] getDataXIC() { return new Object[][]{ {true, false, xml_catalog, xml_xInclude, new MyHandler(elementInXISimple), contentInUIutf8Catalog}, }; @@ -190,7 +201,7 @@ public class CatalogSupport3 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_DOMC") - Object[][] getDataDOMC() { + public Object[][] getDataDOMC() { return new Object[][]{ {true, false, xml_catalog, xml_system, new MyHandler(elementInSystem), expectedWCatalog} }; @@ -201,7 +212,7 @@ public class CatalogSupport3 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xsd file, a LSResourceResolver */ @DataProvider(name = "data_SchemaC") - Object[][] getDataSchemaC() { + public Object[][] getDataSchemaC() { return new Object[][]{ // for resolving DTD in xsd @@ -219,7 +230,7 @@ public class CatalogSupport3 extends CatalogSupportBase { Data: source, resolver1, resolver2, catalog1, a catalog2 */ @DataProvider(name = "data_ValidatorC") - Object[][] getDataValidator() { + public Object[][] getDataValidator() { DOMSource ds = getDOMSource(xml_val_test, xml_val_test_id, false, true, xml_catalog); SAXSource ss = new SAXSource(new InputSource(xml_val_test)); @@ -257,7 +268,7 @@ public class CatalogSupport3 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xsl file, xml file, a URIResolver, expected */ @DataProvider(name = "data_XSLC") - Object[][] getDataXSLC() { + public Object[][] getDataXSLC() { SAXSource xslSourceDTD = new SAXSource(new InputSource(new StringReader(xsl_includeDTD))); StreamSource xmlSourceDTD = new StreamSource(new StringReader(xml_xslDTD)); @@ -271,3 +282,4 @@ public class CatalogSupport3 extends CatalogSupportBase { }; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport4.java b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport4.java index fc905a650d9..12b15e64348 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport4.java +++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupport4.java @@ -23,23 +23,33 @@ package catalog; +import static jaxp.library.JAXPTestUtilities.clearSystemProperty; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + import java.io.File; import java.io.StringReader; + import javax.xml.transform.Source; import javax.xml.transform.URIResolver; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stax.StAXSource; import javax.xml.transform.stream.StreamSource; + import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.ls.LSResourceResolver; import org.xml.sax.InputSource; /** + * @test * @bug 8158084 8162438 8162442 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true catalog.CatalogSupport4 + * @run testng/othervm catalog.CatalogSupport4 * @summary verifies the overriding over of the USE_CATALOG feature. Extending * CatalogSupport tests, the USE_CATALOG is turned off system-wide, however, * a JAXP processor may decide to use Catalog by enabling it through the factory @@ -54,6 +64,7 @@ import org.xml.sax.InputSource; * * @author huizhe.wang@oracle.com */ +@Listeners({jaxp.library.FilePolicy.class, jaxp.library.NetAccessPolicy.class}) public class CatalogSupport4 extends CatalogSupportBase { /* * Initializing fields @@ -62,12 +73,12 @@ public class CatalogSupport4 extends CatalogSupportBase { public void setUpClass() throws Exception { setUp(); //turn off USE_CATALOG system-wide - System.setProperty(SP_USE_CATALOG, "false"); + setSystemProperty(SP_USE_CATALOG, "false"); } @AfterClass public void tearDownClass() throws Exception { - System.clearProperty(SP_USE_CATALOG); + clearSystemProperty(SP_USE_CATALOG); } /* @@ -160,7 +171,7 @@ public class CatalogSupport4 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_SAXA") - Object[][] getDataSAX() { + public Object[][] getDataSAX() { return new Object[][]{ {true, true, xml_catalog, xml_system, new MyHandler(elementInSystem), expectedWCatalog}, }; @@ -171,7 +182,7 @@ public class CatalogSupport4 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_XIA") - Object[][] getDataXI() { + public Object[][] getDataXI() { return new Object[][]{ {true, true, xml_catalog, xml_xInclude, new MyHandler(elementInXISimple), contentInUIutf8Catalog}, }; @@ -182,7 +193,7 @@ public class CatalogSupport4 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xml file, handler, expected result string */ @DataProvider(name = "data_DOMA") - Object[][] getDataDOM() { + public Object[][] getDataDOM() { return new Object[][]{ {true, true, xml_catalog, xml_system, new MyHandler(elementInSystem), expectedWCatalog}, }; @@ -197,7 +208,7 @@ public class CatalogSupport4 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xsd file, a LSResourceResolver */ @DataProvider(name = "data_SchemaA") - Object[][] getDataSchema() { + public Object[][] getDataSchema() { return new Object[][]{ // for resolving DTD in xsd {true, true, xml_catalog, xsd_xmlSchema, null}, @@ -213,7 +224,7 @@ public class CatalogSupport4 extends CatalogSupportBase { Data: source, resolver1, resolver2, catalog1, a catalog2 */ @DataProvider(name = "data_ValidatorA") - Object[][] getDataValidator() { + public Object[][] getDataValidator() { DOMSource ds = getDOMSource(xml_val_test, xml_val_test_id, true, true, xml_catalog); SAXSource ss = new SAXSource(new InputSource(xml_val_test)); @@ -242,7 +253,7 @@ public class CatalogSupport4 extends CatalogSupportBase { Data: set use_catalog, use_catalog, catalog file, xsl file, xml file, a URIResolver, expected result */ @DataProvider(name = "data_XSLA") - Object[][] getDataXSL() { + public Object[][] getDataXSL() { // XSLInclude.xsl has one import XSLImport_html.xsl and two includes, // XSLInclude_header.xsl and XSLInclude_footer.xsl; SAXSource xslSourceDTD = new SAXSource(new InputSource(new StringReader(xsl_includeDTD))); @@ -258,3 +269,4 @@ public class CatalogSupport4 extends CatalogSupportBase { }; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupportBase.java b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupportBase.java index 3e0d7259ab6..83a1520c45d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupportBase.java +++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogSupportBase.java @@ -23,6 +23,8 @@ package catalog; +import static jaxp.library.JAXPTestUtilities.getSystemProperty; + import java.io.ByteArrayInputStream; import java.io.File; import java.io.FileInputStream; @@ -33,6 +35,7 @@ import java.io.Reader; import java.io.StringReader; import java.io.StringWriter; import java.io.UnsupportedEncodingException; + import javax.xml.XMLConstants; import javax.xml.catalog.CatalogFeatures; import javax.xml.parsers.DocumentBuilder; @@ -58,8 +61,8 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; + import org.testng.Assert; -import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.w3c.dom.ls.LSInput; @@ -89,7 +92,7 @@ public class CatalogSupportBase { protected void setUp() { String file1 = getClass().getResource("CatalogSupport.xml").getFile(); - if (System.getProperty("os.name").contains("Windows")) { + if (getSystemProperty("os.name").contains("Windows")) { filepath = file1.substring(1, file1.lastIndexOf("/") + 1); slash = "/"; } else { @@ -932,3 +935,4 @@ public class CatalogSupportBase { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogTest.java b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogTest.java index 9d49258691c..4c00ef686c8 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/catalog/CatalogTest.java @@ -22,8 +22,15 @@ */ package catalog; +import static jaxp.library.JAXPTestUtilities.clearSystemProperty; +import static jaxp.library.JAXPTestUtilities.getSystemProperty; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + +import java.io.FilePermission; import java.io.IOException; import java.nio.file.Paths; +import java.util.PropertyPermission; + import javax.xml.catalog.Catalog; import javax.xml.catalog.CatalogException; import javax.xml.catalog.CatalogFeatures; @@ -35,9 +42,13 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.Source; + +import jaxp.library.JAXPTestUtilities; + import org.testng.Assert; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.Attributes; import org.xml.sax.ErrorHandler; @@ -47,9 +58,14 @@ import org.xml.sax.XMLReader; import org.xml.sax.ext.DefaultHandler2; /* - * @bug 8081248, 8144966, 8146606, 8146237, 8151154, 8150969, 8151162, 8152527, 8154220 + * @test + * @bug 8081248 8144966 8146606 8146237 8151154 8150969 8151162 8152527 8154220 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true catalog.CatalogTest + * @run testng/othervm catalog.CatalogTest * @summary Tests basic Catalog functions. */ +@Listeners({jaxp.library.FilePolicy.class}) public class CatalogTest { static final String KEY_FILES = "javax.xml.catalog.files"; @@ -61,7 +77,7 @@ public class CatalogTest { @BeforeClass public void setUpClass() throws Exception { String file1 = getClass().getResource("first_cat.xml").getFile(); - if (System.getProperty("os.name").contains("Windows")) { + if (getSystemProperty("os.name").contains("Windows")) { filepath = file1.substring(1, file1.lastIndexOf("/") + 1); } else { filepath = file1.substring(0, file1.lastIndexOf("/") + 1); @@ -112,12 +128,12 @@ public class CatalogTest { String files = file1 + ";" + file2; try { - System.setProperty(KEY_FILES, files); + setSystemProperty(KEY_FILES, files); CatalogResolver catalogResolver = CatalogManager.catalogResolver(CatalogFeatures.defaults()); String sysId = catalogResolver.resolveEntity(null, systemId).getSystemId(); Assert.assertEquals(sysId, Paths.get(filepath + expectedUri).toUri().toString().replace("///", "/"), "System ID match not right"); } finally { - System.clearProperty(KEY_FILES); + clearSystemProperty(KEY_FILES); } } @@ -203,9 +219,12 @@ public class CatalogTest { */ @Test(dataProvider = "invalidPaths", expectedExceptions = IllegalArgumentException.class) public void testFileInput(String file) { + JAXPTestUtilities.runWithTmpPermission(() -> { CatalogFeatures features = CatalogFeatures.builder() .with(CatalogFeatures.Feature.FILES, file) .build(); + }, new FilePermission("/../../..", "read"), new FilePermission("c:\\te:t", "read"), + new FilePermission("c:\\te?t", "read"), new PropertyPermission("user.dir", "read")); } /** @@ -371,7 +390,7 @@ public class CatalogTest { This DataProvider is copied from JCK ResolveTests' dataMatch1 */ @DataProvider(name = "resolveUri") - Object[][] getDataForUriResolver() { + public Object[][] getDataForUriResolver() { return new Object[][]{ {"uri.xml", "urn:publicid:-:Acme,+Inc.:DTD+Book+Version+1.0", null, "http://local/base/dtd/book.dtd", "Uri in publicId namespace is incorrectly unwrapped"}, }; @@ -382,7 +401,7 @@ public class CatalogTest { hierarchyOfCatFiles2. */ @DataProvider(name = "hierarchyOfCatFilesData") - Object[][] getHierarchyOfCatFilesData() { + public Object[][] getHierarchyOfCatFilesData() { return new Object[][]{ {"http://www.oracle.com/sequence.dtd", "first.dtd"}, {"http://www.oracle.com/sequence_next.dtd", "next.dtd"}, @@ -396,7 +415,7 @@ public class CatalogTest { catalog, prefer, systemId, publicId, expectedUri, expectedFile, msg */ @DataProvider(name = "resolveEntity") - Object[][] getDataForMatchingBothIds() { + public Object[][] getDataForMatchingBothIds() { String expected = "http://www.groupxmlbase.com/dtds/rewrite.dtd"; return new Object[][]{ {"rewriteSystem_id.xml", "system", "http://www.sys00test.com/rewrite.dtd", "PUB-404", expected, expected, "Relative rewriteSystem with xml:base at group level failed"}, @@ -411,7 +430,7 @@ public class CatalogTest { prefer, catalog, publicId, systemId, expected result */ @DataProvider(name = "matchWithPrefer") - Object[][] getDataForMatch() { + public Object[][] getDataForMatch() { return new Object[][]{ {"public", "pubOnly.xml", id, "", "http://local/base/dtd/public.dtd"}, {"public", "sysOnly.xml", id, "", null}, @@ -435,7 +454,7 @@ public class CatalogTest { prefer, catalog, publicId, systemId, expected result */ @DataProvider(name = "resolveWithPrefer") - Object[][] getDataForResolve() { + public Object[][] getDataForResolve() { return new Object[][]{ {"system", "pubOnly.xml", id, "", "http://local/base/dtd/public.dtd"}, {"system", "pubOnly.xml", "", id, null}, @@ -462,7 +481,7 @@ public class CatalogTest { The defer attribute is set to false. */ @DataProvider(name = "invalidAltCatalogs") - Object[][] getCatalogs() { + public Object[][] getCatalogs() { return new Object[][]{ {"defer_false_2.xml"}, {"defer_del_false.xml"} @@ -474,7 +493,7 @@ public class CatalogTest { the CatalogFeatures builder */ @DataProvider(name = "invalidPaths") - Object[][] getFiles() { + public Object[][] getFiles() { return new Object[][]{ {null}, {""}, @@ -493,7 +512,7 @@ public class CatalogTest { document. */ @DataProvider(name = "catalog") - Object[][] getCatalog() { + public Object[][] getCatalog() { return new Object[][]{ {"testSystem", "Test system entry", "catalog.xml", "system.xml", getParser()}, {"testRewriteSystem", "Test rewritesystem entry", "catalog.xml", "rewritesystem.xml", getParser()}, @@ -517,7 +536,6 @@ public class CatalogTest { return saxParser; } - /** * SAX handler */ @@ -536,7 +554,8 @@ public class CatalogTest { } @Override - public void startElement(String uri, String localName, String qName, Attributes attributes) throws SAXException { + public void startElement(String uri, String localName, String qName, Attributes attributes) + throws SAXException { textContent.delete(0, textContent.length()); try { System.out.println("Element: " + uri + ":" + localName + " " + qName); @@ -552,3 +571,4 @@ public class CatalogTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java index e955df49676..210db35bfb2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java +++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6350682.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,23 +23,31 @@ package common; +import static jaxp.library.JAXPTestUtilities.runWithAllPerm; + import javax.xml.parsers.SAXParserFactory; import javax.xml.transform.TransformerFactory; import javax.xml.transform.TransformerFactoryConfigurationError; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6350682 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true common.Bug6350682 + * @run testng/othervm common.Bug6350682 * @summary Test SAXParserFactory and TransformerFactory can newInstance when setContextClassLoader(null). */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6350682 { @Test public void testSAXParserFactory() { try { - Thread.currentThread().setContextClassLoader(null); + runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(null)); if (Bug6350682.class.getClassLoader() == null) System.out.println("this class loader is NULL"); else @@ -55,7 +63,7 @@ public class Bug6350682 { @Test public void testTransformerFactory() { try { - Thread.currentThread().setContextClassLoader(null); + runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(null)); TransformerFactory factory = TransformerFactory.newInstance(); Assert.assertTrue(factory != null, "Failed to get an instance of a TransformerFactory"); } catch (Exception e) { @@ -67,3 +75,4 @@ public class Bug6350682 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java index 63ac73d4973..8763290fe4e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6723276Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,6 +23,7 @@ package common; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.testng.Assert; import java.net.URL; @@ -31,9 +32,14 @@ import java.net.URLClassLoader; import javax.xml.parsers.SAXParserFactory; /* + * @test * @bug 6723276 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true common.Bug6723276Test + * @run testng/othervm common.Bug6723276Test * @summary Test JAXP class can be loaded by bootstrap classloader. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6723276Test { @Test @@ -62,3 +68,4 @@ public class Bug6723276Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java index 8f03995bc10..8bf9ea43c93 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug6941169Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,11 +23,13 @@ package common; +import static jaxp.library.JAXPTestUtilities.clearSystemProperty; +import static jaxp.library.JAXPTestUtilities.getSystemProperty; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + +import java.io.FilePermission; import java.io.InputStream; import java.io.StringWriter; -import java.security.AllPermission; -import java.security.Permission; -import java.security.Permissions; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; @@ -44,15 +46,24 @@ import javax.xml.validation.Validator; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathFactory; +import jaxp.library.JAXPTestUtilities; + import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.InputSource; /* + * @test * @bug 6941169 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true common.Bug6941169Test + * @run testng/othervm common.Bug6941169Test * @summary Test use-service-mechanism feature. */ +@Test(singleThreaded = true) +@Listeners({ jaxp.library.FilePolicy.class }) public class Bug6941169Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -71,7 +82,7 @@ public class Bug6941169Test { System.out.println("Validation using SAX Source; Service mechnism is turned off; SAX Impl should be the default:"); InputSource is = new InputSource(Bug6941169Test.class.getResourceAsStream("Bug6941169.xml")); SAXSource ss = new SAXSource(is); - System.setProperty(SAX_FACTORY_ID, "MySAXFactoryImpl"); + setSystemProperty(SAX_FACTORY_ID, "MySAXFactoryImpl"); long start = System.currentTimeMillis(); try { SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); @@ -94,7 +105,7 @@ public class Bug6941169Test { long end = System.currentTimeMillis(); double elapsedTime = ((end - start)); System.out.println("Time elapsed: " + elapsedTime); - System.clearProperty(SAX_FACTORY_ID); + clearSystemProperty(SAX_FACTORY_ID); } @Test @@ -102,7 +113,7 @@ public class Bug6941169Test { System.out.println("Validation using SAX Source. Using service mechnism (by default) to find SAX Impl:"); InputSource is = new InputSource(Bug6941169Test.class.getResourceAsStream("Bug6941169.xml")); SAXSource ss = new SAXSource(is); - System.setProperty(SAX_FACTORY_ID, "MySAXFactoryImpl"); + setSystemProperty(SAX_FACTORY_ID, "MySAXFactoryImpl"); long start = System.currentTimeMillis(); try { SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); @@ -121,18 +132,18 @@ public class Bug6941169Test { long end = System.currentTimeMillis(); double elapsedTime = ((end - start)); System.out.println("Time elapsed: " + elapsedTime); - System.clearProperty(SAX_FACTORY_ID); + clearSystemProperty(SAX_FACTORY_ID); } @Test - public void testValidation_SAX_withSM() { + public void testValidation_SAX_withSM() throws Exception { + if(System.getSecurityManager() == null) + return; + System.out.println("Validation using SAX Source with security manager:"); InputSource is = new InputSource(Bug6941169Test.class.getResourceAsStream("Bug6941169.xml")); SAXSource ss = new SAXSource(is); - System.setProperty(SAX_FACTORY_ID, "MySAXFactoryImpl"); - Permissions granted = new java.security.Permissions(); - granted.add(new AllPermission()); - System.setSecurityManager(new MySM(granted)); + setSystemProperty(SAX_FACTORY_ID, "MySAXFactoryImpl"); long start = System.currentTimeMillis(); try { @@ -152,13 +163,11 @@ public class Bug6941169Test { // System.out.println(e.getMessage()); } finally { - System.clearProperty(SAX_FACTORY_ID); - System.setSecurityManager(null); + clearSystemProperty(SAX_FACTORY_ID); } long end = System.currentTimeMillis(); double elapsedTime = ((end - start)); System.out.println("Time elapsed: " + elapsedTime); - System.setSecurityManager(null); } @@ -170,7 +179,7 @@ public class Bug6941169Test { // DOMSource domSource = new // DOMSource(getDocument(Bug6941169Test.class.getResourceAsStream("Bug6941169.xml"))); - System.setProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); + setSystemProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); long start = System.currentTimeMillis(); try { TransformerFactory factory = TransformerFactory.newInstance(); @@ -210,7 +219,7 @@ public class Bug6941169Test { long end = System.currentTimeMillis(); double elapsedTime = ((end - start)); System.out.println("Time elapsed: " + elapsedTime); - System.clearProperty(DOM_FACTORY_ID); + clearSystemProperty(DOM_FACTORY_ID); } /** this is by default */ @@ -222,7 +231,7 @@ public class Bug6941169Test { // DOMSource domSource = new // DOMSource(getDocument(Bug6941169Test.class.getResourceAsStream("Bug6941169.xml"))); - System.setProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); + setSystemProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); long start = System.currentTimeMillis(); try { TransformerFactory factory = TransformerFactory.newInstance(); @@ -254,21 +263,20 @@ public class Bug6941169Test { long end = System.currentTimeMillis(); double elapsedTime = ((end - start)); System.out.println("Time elapsed: " + elapsedTime); - System.clearProperty(DOM_FACTORY_ID); + clearSystemProperty(DOM_FACTORY_ID); } @Test - public void testTransform_DOM_withSM() { + public void testTransform_DOM_withSM() throws Exception { + if(System.getSecurityManager() == null) + return; System.out.println("Transform using DOM Source; Security Manager is set:"); DOMSource domSource = new DOMSource(); domSource.setSystemId(_xml); // DOMSource domSource = new // DOMSource(getDocument(Bug6941169Test.class.getResourceAsStream("Bug6941169.xml"))); - Permissions granted = new java.security.Permissions(); - granted.add(new AllPermission()); - System.setSecurityManager(new MySM(granted)); - System.setProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); + setSystemProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); long start = System.currentTimeMillis(); try { TransformerFactory factory = TransformerFactory.newInstance("com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl", @@ -301,13 +309,12 @@ public class Bug6941169Test { // System.out.println(e.getMessage()); } finally { - System.clearProperty(DOM_FACTORY_ID); - System.setSecurityManager(null); + clearSystemProperty(DOM_FACTORY_ID); } long end = System.currentTimeMillis(); double elapsedTime = ((end - start)); System.out.println("Time elapsed: " + elapsedTime); - System.clearProperty(DOM_FACTORY_ID); + } @Test @@ -315,7 +322,7 @@ public class Bug6941169Test { final String XPATH_EXPRESSION = "/fooTest"; System.out.println("Evaluate DOM Source; Service mechnism is turned off; Default DOM Impl should be used:"); Document doc = getDocument(Bug6941169Test.class.getResourceAsStream("Bug6941169.xml")); - System.setProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); + setSystemProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); long start = System.currentTimeMillis(); try { XPathFactory xPathFactory = XPathFactory.newInstance(); @@ -352,7 +359,7 @@ public class Bug6941169Test { long end = System.currentTimeMillis(); double elapsedTime = ((end - start)); System.out.println("Time elapsed: " + elapsedTime); - System.clearProperty(DOM_FACTORY_ID); + clearSystemProperty(DOM_FACTORY_ID); } @Test @@ -361,7 +368,7 @@ public class Bug6941169Test { System.out.println("Evaluate DOM Source; Service mechnism is on by default; It would try to use MyDOMFactoryImpl:"); InputStream input = getClass().getResourceAsStream("Bug6941169.xml"); InputSource source = new InputSource(input); - System.setProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); + setSystemProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); long start = System.currentTimeMillis(); try { XPathFactory xPathFactory = XPathFactory.newInstance(); @@ -400,19 +407,18 @@ public class Bug6941169Test { long end = System.currentTimeMillis(); double elapsedTime = ((end - start)); System.out.println("Time elapsed: " + elapsedTime); - System.clearProperty(DOM_FACTORY_ID); + clearSystemProperty(DOM_FACTORY_ID); } @Test - public void testXPath_DOM_withSM() { + public void testXPath_DOM_withSM() throws Exception { + if(System.getSecurityManager() == null) + return; final String XPATH_EXPRESSION = "/fooTest"; System.out.println("Evaluate DOM Source; Security Manager is set:"); - Permissions granted = new java.security.Permissions(); - granted.add(new AllPermission()); - System.setSecurityManager(new MySM(granted)); InputStream input = getClass().getResourceAsStream("Bug6941169.xml"); InputSource source = new InputSource(input); - System.setProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); + setSystemProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); long start = System.currentTimeMillis(); try { XPathFactory xPathFactory = XPathFactory.newInstance("http://java.sun.com/jaxp/xpath/dom", @@ -445,13 +451,12 @@ public class Bug6941169Test { // System.out.println(e.getMessage()); } finally { - System.clearProperty(DOM_FACTORY_ID); - System.setSecurityManager(null); + clearSystemProperty(DOM_FACTORY_ID); } long end = System.currentTimeMillis(); double elapsedTime = ((end - start)); System.out.println("Time elapsed: " + elapsedTime); - System.clearProperty(DOM_FACTORY_ID); + } @Test @@ -480,22 +485,5 @@ public class Bug6941169Test { return document; } - - class MySM extends SecurityManager { - Permissions granted; - - public MySM(Permissions perms) { - granted = perms; - } - - @Override - public void checkPermission(Permission perm) { - if (granted.implies(perm)) { - return; - } - super.checkPermission(perm); - } - - } - } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java b/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java index 5074da2150b..2414288b218 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/common/Bug7143711Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,9 +23,8 @@ package common; -import java.security.AllPermission; -import java.security.Permission; -import java.security.Permissions; +import static jaxp.library.JAXPTestUtilities.clearSystemProperty; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; import javax.xml.XMLConstants; import javax.xml.transform.TransformerFactory; @@ -33,12 +32,18 @@ import javax.xml.validation.SchemaFactory; import javax.xml.xpath.XPathFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 7143711 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true common.Bug7143711Test * @summary Test set use-service-mechanism shall not override what's set by the constructor in secure mode. */ +@Listeners({ jaxp.library.BasePolicy.class }) +@Test(singleThreaded = true) public class Bug7143711Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -52,10 +57,7 @@ public class Bug7143711Test { @Test public void testValidation_SAX_withSM() { System.out.println("Validation using SAX Source with security manager:"); - System.setProperty(SAX_FACTORY_ID, "MySAXFactoryImpl"); - Permissions granted = new java.security.Permissions(); - granted.add(new AllPermission()); - System.setSecurityManager(new MySM(granted)); + setSystemProperty(SAX_FACTORY_ID, "MySAXFactoryImpl"); try { SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); @@ -68,22 +70,14 @@ public class Bug7143711Test { Assert.fail(e.getMessage()); } finally { - System.clearProperty(SAX_FACTORY_ID); - System.setSecurityManager(null); + clearSystemProperty(SAX_FACTORY_ID); } - - System.setSecurityManager(null); - } @Test(enabled=false) //skipped due to bug JDK-8080097 public void testTransform_DOM_withSM() { System.out.println("Transform using DOM Source; Security Manager is set:"); - - Permissions granted = new java.security.Permissions(); - granted.add(new AllPermission()); - System.setSecurityManager(new MySM(granted)); - System.setProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); + setSystemProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); try { TransformerFactory factory = TransformerFactory.newInstance("com.sun.org.apache.xalan.internal.xsltc.trax.TransformerFactoryImpl", @@ -96,20 +90,14 @@ public class Bug7143711Test { } catch (Exception e) { Assert.fail(e.getMessage()); } finally { - System.clearProperty(DOM_FACTORY_ID); - System.setSecurityManager(null); + clearSystemProperty(DOM_FACTORY_ID); } - - System.clearProperty(DOM_FACTORY_ID); } @Test public void testXPath_DOM_withSM() { System.out.println("Evaluate DOM Source; Security Manager is set:"); - Permissions granted = new java.security.Permissions(); - granted.add(new AllPermission()); - System.setSecurityManager(new MySM(granted)); - System.setProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); + setSystemProperty(DOM_FACTORY_ID, "MyDOMFactoryImpl"); try { XPathFactory xPathFactory = XPathFactory.newInstance("http://java.sun.com/jaxp/xpath/dom", @@ -122,38 +110,8 @@ public class Bug7143711Test { } catch (Exception e) { Assert.fail(e.getMessage()); } finally { - System.clearProperty(DOM_FACTORY_ID); - System.setSecurityManager(null); - } - - System.clearProperty(DOM_FACTORY_ID); - } - - @Test - public void testSM() { - SecurityManager sm = System.getSecurityManager(); - if (System.getSecurityManager() != null) { - System.out.println("Security manager not cleared: " + sm.toString()); - } else { - System.out.println("Security manager cleared: "); + clearSystemProperty(DOM_FACTORY_ID); } } - - class MySM extends SecurityManager { - Permissions granted; - - public MySM(Permissions perms) { - granted = perms; - } - - @Override - public void checkPermission(Permission perm) { - if (granted.implies(perm)) { - return; - } - super.checkPermission(perm); - } - - } - } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/Sources.java b/jaxp/test/javax/xml/jaxp/unittest/common/Sources.java index f3deba62395..ec09062a626 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/common/Sources.java +++ b/jaxp/test/javax/xml/jaxp/unittest/common/Sources.java @@ -22,11 +22,15 @@ */ package common; +import static jaxp.library.JAXPTestUtilities.runWithTmpPermission; + import java.io.ByteArrayInputStream; import java.io.File; import java.io.StringReader; import java.io.UnsupportedEncodingException; import java.net.URISyntaxException; +import java.util.PropertyPermission; + import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; @@ -39,8 +43,10 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stax.StAXSource; import javax.xml.transform.stream.StreamSource; + import org.testng.Assert; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.InputSource; @@ -48,10 +54,15 @@ import org.xml.sax.SAXException; import org.xml.sax.XMLReader; /* + * @test * @bug 8144967 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true common.Sources + * @run testng/othervm common.Sources * @summary Tests related to the javax.xml.transform.Source * and org.xml.sax.InputSource */ +@Listeners({jaxp.library.FilePolicy.class}) public class Sources { /** @@ -88,7 +99,7 @@ public class Sources { * DataProvider: sources that are empty */ @DataProvider(name = "emptySources") - Object[][] getSources() throws URISyntaxException { + public Object[][] getSources() throws URISyntaxException { return new Object[][]{ {new DOMSource()}, @@ -108,27 +119,29 @@ public class Sources { * DataProvider: sources that are not empty */ @DataProvider(name = "nonEmptySources") - Object[][] getSourcesEx() throws URISyntaxException { + public Object[][] getSourcesEx() { StAXSource ss = null; try { ss = new StAXSource(getXMLEventReader()); - } catch (XMLStreamException ex) {} + } catch (XMLStreamException ex) { + } - return new Object[][]{ - //This will set a non-null systemId on the resulting StreamSource - {new StreamSource(new File(""))}, - //Can't tell because XMLStreamReader is a pull parser, cursor advancement - //would have been required in order to examine the reader. - {new StAXSource(getXMLStreamReader())}, - {ss} - }; + return new Object[][] { + // This will set a non-null systemId on the resulting + // StreamSource + { runWithTmpPermission(() -> new StreamSource(new File("")), new PropertyPermission("user.dir", "read")) }, + // Can't tell because XMLStreamReader is a pull parser, cursor + // advancement + // would have been required in order to examine the reader. + { new StAXSource(getXMLStreamReader()) }, + { ss } }; } /* * DataProvider: sources that are empty */ @DataProvider(name = "emptyInputSource") - Object[][] getInputSources() throws URISyntaxException { + public Object[][] getInputSources() throws URISyntaxException { byte[] utf8Bytes = null; try { utf8Bytes = "".getBytes("UTF8"); @@ -200,3 +213,4 @@ public class Sources { return r; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/TestSAXDriver.java b/jaxp/test/javax/xml/jaxp/unittest/common/TestSAXDriver.java index 033bbdefd6e..1745e460a6d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/common/TestSAXDriver.java +++ b/jaxp/test/javax/xml/jaxp/unittest/common/TestSAXDriver.java @@ -56,3 +56,4 @@ public class TestSAXDriver extends SAXParserImpl.JAXPSAXParser { private static final String ENT_EXP_LIMIT_PROP = "http://www.oracle.com/xml/jaxp/properties/entityExpansionLimit"; } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java b/jaxp/test/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java index 26659a0d8d6..310d1a4b4de 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/common/TransformationWarningsTest.java @@ -23,29 +23,37 @@ package common; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + import java.io.StringReader; import java.io.StringWriter; + import javax.xml.transform.Source; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import org.testng.annotations.Test; + import org.testng.annotations.BeforeClass; +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; /* * @test - * @modules javax.xml/com.sun.org.apache.xerces.internal.jaxp * @bug 8144593 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true common.TransformationWarningsTest + * @run testng/othervm common.TransformationWarningsTest * @summary Check that warnings about unsupported properties from parsers * are suppressed during the transformation process. */ +@Listeners({jaxp.library.BasePolicy.class}) public class TransformationWarningsTest extends WarningsTestBase { @BeforeClass public void setup() { //Set test SAX driver implementation. - System.setProperty("org.xml.sax.driver", "common.TestSAXDriver"); + setSystemProperty("org.xml.sax.driver", "common.TestSAXDriver"); } @Test @@ -91,3 +99,4 @@ public class TransformationWarningsTest extends WarningsTestBase { + ""; private static final String xml = ""; } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java b/jaxp/test/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java index 4c3e9de5f16..3b4a945a254 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/common/ValidationWarningsTest.java @@ -23,8 +23,11 @@ package common; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + import java.io.ByteArrayInputStream; import java.io.StringReader; + import javax.xml.XMLConstants; import javax.xml.transform.Source; import javax.xml.transform.sax.SAXSource; @@ -32,24 +35,29 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; -import org.testng.annotations.Test; + import org.testng.annotations.BeforeClass; +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; import org.xml.sax.InputSource; /* * @test * @bug 8144593 * @key intermittent - * @modules javax.xml/com.sun.org.apache.xerces.internal.jaxp + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true common.ValidationWarningsTest + * @run testng/othervm common.ValidationWarningsTest * @summary Check that warnings about unsupported properties from SAX * parsers are suppressed during the xml validation process. */ +@Listeners({jaxp.library.InternalAPIPolicy.class}) public class ValidationWarningsTest extends WarningsTestBase { @BeforeClass public void setup() { //Set test SAX driver implementation. - System.setProperty("org.xml.sax.driver", "common.TestSAXDriver"); + setSystemProperty("org.xml.sax.driver", "common.TestSAXDriver"); } @Test @@ -76,3 +84,4 @@ public class ValidationWarningsTest extends WarningsTestBase { private static final String xml = "Element"; } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java index 87d3829e658..5f92bd0a587 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6320118.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -28,12 +28,18 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6320118 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true datatype.Bug6320118 + * @run testng/othervm datatype.Bug6320118 * @summary Test xml datatype XMLGregorianCalendar. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6320118 { DatatypeFactory df; @@ -102,3 +108,4 @@ public class Bug6320118 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java index 161f127b9b2..1c86badd13c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937951Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -28,12 +28,18 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6937951 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true datatype.Bug6937951Test + * @run testng/othervm datatype.Bug6937951Test * @summary Test midnight is same as the start of the next day in XMLGregorianCalendar. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6937951Test { @Test @@ -51,3 +57,4 @@ public class Bug6937951Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java index 73ea2930cf2..9caf929ccf9 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug6937964Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -33,12 +33,18 @@ import javax.xml.datatype.Duration; import javax.xml.namespace.QName; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6937964 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true datatype.Bug6937964Test + * @run testng/othervm datatype.Bug6937964Test * @summary Test Duration is normalized. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6937964Test { /** * Print debugging to System.err. @@ -264,3 +270,4 @@ public class Bug6937964Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java index 3bf98f65bed..f680336edc2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/Bug7042647Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,12 +31,18 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.XMLGregorianCalendar; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 7042647 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true datatype.Bug7042647Test + * @run testng/othervm datatype.Bug7042647Test * @summary Test getFirstDayOfWeek is correct after converting XMLGregorianCalendar to a GregorianCalendar. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug7042647Test { @Test @@ -54,3 +60,4 @@ public class Bug7042647Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java index c6977e98967..6ca2985348e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/DatatypeFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -34,11 +34,17 @@ import javax.xml.datatype.XMLGregorianCalendar; import javax.xml.namespace.QName; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true datatype.DatatypeFactoryTest + * @run testng/othervm datatype.DatatypeFactoryTest * @summary Test DatatypeFactory. */ +@Listeners({jaxp.library.BasePolicy.class}) public class DatatypeFactoryTest { private static final boolean DEBUG = false; @@ -634,3 +640,4 @@ public class DatatypeFactoryTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java index ece77adc8fa..76023529624 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/DurationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -39,11 +39,17 @@ import javax.xml.namespace.QName; import org.testng.Assert; import org.testng.AssertJUnit; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true datatype.DurationTest + * @run testng/othervm datatype.DurationTest * @summary Test Duration. */ +@Listeners({jaxp.library.BasePolicy.class}) public class DurationTest { private final static boolean DEBUG = true; @@ -51,7 +57,7 @@ public class DurationTest { protected Duration duration = null; @BeforeMethod - protected void setUp() { + public void setUp() { try { duration = DatatypeFactory.newInstance().newDuration(100); } catch (DatatypeConfigurationException dce) { @@ -478,3 +484,4 @@ public class DurationTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java index 87e46373e8b..915a63c71ee 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/FactoryFindTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,45 +23,45 @@ package datatype; +import static jaxp.library.JAXPTestUtilities.runWithAllPerm; + import java.net.URL; import java.net.URLClassLoader; import javax.xml.datatype.DatatypeFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true datatype.FactoryFindTest + * @run testng/othervm datatype.FactoryFindTest * @summary Test Classloader for DatatypeFactory. */ +@Listeners({jaxp.library.BasePolicy.class}) public class FactoryFindTest { boolean myClassLoaderUsed = false; - public FactoryFindTest(String name) { - } - @Test - public void testFactoryFind() { - try { - // System.setProperty("jaxp.debug", "true"); + public void testFactoryFind() throws Exception { + DatatypeFactory factory = DatatypeFactory.newInstance(); + Assert.assertTrue(factory.getClass().getClassLoader() == null); - DatatypeFactory factory = DatatypeFactory.newInstance(); - Assert.assertTrue(factory.getClass().getClassLoader() == null); + runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(null)); - Thread.currentThread().setContextClassLoader(null); - factory = DatatypeFactory.newInstance(); - Assert.assertTrue(factory.getClass().getClassLoader() == null); - - Thread.currentThread().setContextClassLoader(new MyClassLoader()); - factory = DatatypeFactory.newInstance(); - if (System.getSecurityManager() == null) - Assert.assertTrue(myClassLoaderUsed); - else - Assert.assertFalse(myClassLoaderUsed); - } catch (Exception ex) { - } + factory = DatatypeFactory.newInstance(); + Assert.assertTrue(factory.getClass().getClassLoader() == null); + runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(new MyClassLoader())); + factory = DatatypeFactory.newInstance(); + if (System.getSecurityManager() == null) + Assert.assertTrue(myClassLoaderUsed); + else + Assert.assertFalse(myClassLoaderUsed); } class MyClassLoader extends URLClassLoader { @@ -76,3 +76,4 @@ public class FactoryFindTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java index 636cf680876..dd0720ded6e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/JDK8068839Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -27,12 +27,18 @@ import javax.xml.datatype.DatatypeFactory; import javax.xml.datatype.Duration; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 8068839 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true datatype.JDK8068839Test + * @run testng/othervm datatype.JDK8068839Test * @summary Verifies that Duration's edge cases */ +@Listeners({jaxp.library.BasePolicy.class}) public class JDK8068839Test { @Test @@ -45,3 +51,4 @@ public class JDK8068839Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java b/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java index 4c3deb901ac..89c5fc63556 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/datatype/XMLGregorianCalendarTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -30,11 +30,17 @@ import javax.xml.datatype.XMLGregorianCalendar; import org.testng.Assert; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true datatype.XMLGregorianCalendarTest + * @run testng/othervm datatype.XMLGregorianCalendarTest * @summary Test XMLGregorianCalendar. */ +@Listeners({jaxp.library.BasePolicy.class}) public class XMLGregorianCalendarTest { private static final boolean DEBUG = false; @@ -46,7 +52,7 @@ public class XMLGregorianCalendarTest { private XMLGregorianCalendar calendar; @BeforeMethod - protected void setUp() { + public void setUp() { try { calendar = DatatypeFactory.newInstance().newXMLGregorianCalendar(); } catch (DatatypeConfigurationException dce) { @@ -222,3 +228,4 @@ public class XMLGregorianCalendarTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java index 3540089c9ef..791146e6564 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4915524.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -29,16 +29,22 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; import org.xml.sax.InputSource; /* + * @test * @bug 4915524 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.Bug4915524 + * @run testng/othervm dom.Bug4915524 * @summary Test Document.adoptNode() shall not throw Exception when the source document object is created from different implementation. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug4915524 { String data = "" + "" + "'. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug4915748 { @Test @@ -68,3 +74,4 @@ public class Bug4915748 { Assert.assertTrue(hadError[0]); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java index b18f8094710..b24e9d5818b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966082.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,13 +26,19 @@ package dom; import javax.xml.parsers.DocumentBuilderFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; /* + * @test * @bug 4966082 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.Bug4966082 + * @run testng/othervm dom.Bug4966082 * @summary Test Element.getSchemaTypeInfo() returns an instance of TypeInfo instead of null when the document's schema is an XML DTD. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug4966082 { @Test @@ -47,3 +53,4 @@ public class Bug4966082 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java index 5244112fe3f..43f1e1aa410 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966138.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,14 +27,20 @@ import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilderFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.TypeInfo; /* + * @test * @bug 4966138 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.Bug4966138 + * @run testng/othervm dom.Bug4966138 * @summary Test Element's TypeInfo.getTypeName() returns a name instead of null in case the element is declared using anonymous simple type. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug4966138 { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; @@ -63,3 +69,4 @@ public class Bug4966138 { Assert.assertTrue(typeNs.length() != 0, "returned typeNamespace shouldn't be empty"); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java index 890ada5f019..5bd158e7723 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966142.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,14 +27,20 @@ import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilderFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.TypeInfo; /* + * @test * @bug 4966142 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.Bug4966142 + * @run testng/othervm dom.Bug4966142 * @summary Test TypeInfo.isDerivedFrom(...) works instead of throws UnsupportedOperationException when the TypeInfo instance refers to a simple type. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug4966142 { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; @@ -55,3 +61,4 @@ public class Bug4966142 { Assert.assertFalse(type.isDerivedFrom("testNS", "Test", TypeInfo.DERIVATION_UNION)); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java index 9cf87b200af..1cdbb466c14 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug4966143.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,15 +27,21 @@ import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilderFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.TypeInfo; /* + * @test * @bug 4966143 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.Bug4966143 + * @run testng/othervm dom.Bug4966143 * @summary Test isDerivedFrom(...) returns true only if the parameter is DERIVATION_EXTENSION, * in case TypeInfo instance refers to a complex type derived from another complex type by extension. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug4966143 { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; @@ -60,3 +66,4 @@ public class Bug4966143 { Assert.assertTrue(type.isDerivedFrom("testNS", "Test", 0)); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java index 7b611bd9993..df2eaf3f955 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6339023.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,6 +27,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DOMConfiguration; import org.w3c.dom.DOMImplementation; @@ -36,9 +37,14 @@ import org.w3c.dom.ls.LSParser; import org.w3c.dom.ls.LSSerializer; /* + * @test * @bug 6339023 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.Bug6339023 + * @run testng/othervm dom.Bug6339023 * @summary Test normalize-characters. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6339023 { /* @@ -133,3 +139,4 @@ public class Bug6339023 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java index cea41cc9a87..d2656690847 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6355326.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -34,6 +34,7 @@ import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DOMImplementation; import org.w3c.dom.Document; @@ -43,16 +44,21 @@ import org.w3c.dom.ls.LSParser; import org.xml.sax.SAXException; /* + * @test * @bug 6355326 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.Bug6355326 + * @run testng/othervm dom.Bug6355326 * @summary Test DOM implementation encoding. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6355326 { DOMImplementationLS implLS = null; String encodingXML = ""; @BeforeMethod - protected void setUp() { + public void setUp() { Document doc = null; DocumentBuilder parser = null; String xml1 = ""; @@ -112,3 +118,4 @@ public class Bug6355326 { return p; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java index c0a3e164834..b1ce0a16db9 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6367542.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -24,14 +24,20 @@ package dom; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DOMImplementation; import org.w3c.dom.bootstrap.DOMImplementationRegistry; /* + * @test * @bug 6367542 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.Bug6367542 + * @run testng/othervm dom.Bug6367542 * @summary Test DOMImplementationRegistry.getDOMImplementation("XML") returns a DOMImplementation instance. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6367542 { @Test @@ -46,3 +52,4 @@ public class Bug6367542 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java index 982d481014e..b1381c0b8aa 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6520131.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -28,6 +28,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DOMConfiguration; import org.w3c.dom.DOMError; @@ -37,9 +38,14 @@ import org.w3c.dom.Element; import org.w3c.dom.Text; /* + * @test * @bug 6520131 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.Bug6520131 + * @run testng/othervm dom.Bug6520131 * @summary Test DOMErrorHandler reports an error for invalid character. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6520131 { @Test @@ -77,3 +83,4 @@ public class Bug6520131 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java index 3c9a97644eb..300bde2159a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6521260.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,15 +31,21 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.xml.sax.SAXException; /* + * @test * @bug 6521260 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.Bug6521260 + * @run testng/othervm dom.Bug6521260 * @summary Test setAttributeNS doesn't result in an unsorted internal list of attributes. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6521260 { @Test @@ -71,3 +77,4 @@ public class Bug6521260 { Assert.assertEquals(systemId, systemId2); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java index fec67cdfe20..9108af3d7f6 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6582545Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,6 +23,8 @@ package dom; +import static jaxp.library.JAXPTestUtilities.getSystemProperty; + import java.io.File; import java.io.IOException; @@ -30,7 +32,10 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import jaxp.library.JAXPTestUtilities; + import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -38,9 +43,14 @@ import org.w3c.dom.NodeList; import org.xml.sax.SAXException; /* + * @test * @bug 6582545 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.Bug6582545Test + * @run testng/othervm dom.Bug6582545Test * @summary Test the value is correct when iterating attributes. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6582545Test { private DocumentBuilder xmlParser = null; private Document document = null; @@ -90,7 +100,7 @@ public class Bug6582545Test { } // Test specifique a node - String javaSpecificationVersion = System.getProperty("java.specification.version"); + String javaSpecificationVersion = getSystemProperty("java.specification.version"); for (int k = 0; k < attributes.getLength(); k++) { name = attributes.item(k).getNodeName(); value = attributes.item(k).getNodeValue(); @@ -113,3 +123,4 @@ public class Bug6582545Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java index b19a28ba29a..ff5cf2cda6a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/Bug6879614Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -30,14 +30,20 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.SAXException; /* + * @test * @bug 6879614 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.Bug6879614Test + * @run testng/othervm dom.Bug6879614Test * @summary Test DocumentBuilder can parse the certain xml. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6879614Test { @Test @@ -72,3 +78,4 @@ public class Bug6879614Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java index 84c06b829b4..f407e2612e8 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6333993Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -33,14 +33,20 @@ import javax.xml.xpath.XPathExpression; import javax.xml.xpath.XPathFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; /* + * @test * @bug 6333993 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.CR6333993Test + * @run testng/othervm dom.CR6333993Test * @summary Test NodeList.item(valid index) returns value after NodeList.item(NodeList.getLength()). */ +@Listeners({jaxp.library.BasePolicy.class}) public class CR6333993Test { @Test @@ -82,3 +88,4 @@ public class CR6333993Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java index 9bc2c6c3a0f..c8ee54a3acc 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517707Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,6 +32,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; @@ -40,9 +41,14 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; /* + * @test * @bug 6517707 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.CR6517707Test + * @run testng/othervm dom.CR6517707Test * @summary Test Node.setNodeValue(value) shall throw DOMException.NO_MODIFICATION_ALLOWED_ERR if the node is read-only. */ +@Listeners({jaxp.library.BasePolicy.class}) public class CR6517707Test { @Test @@ -122,3 +128,4 @@ public class CR6517707Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java index 44bab9c37f7..0b5d2e65b2f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6517717Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,6 +31,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DOMException; import org.w3c.dom.Document; @@ -39,9 +40,14 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; /* + * @test * @bug 6517717 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.CR6517717Test + * @run testng/othervm dom.CR6517717Test * @summary Test Node.setPrefix(prefix) shall throw DOMException.NO_MODIFICATION_ALLOWED_ERR if the node is read-only. */ +@Listeners({jaxp.library.BasePolicy.class}) public class CR6517717Test { @Test @@ -80,3 +86,4 @@ public class CR6517717Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java index 15dc9636af6..4b46cf9fb60 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/CR6909336Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -29,14 +29,20 @@ import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.dom.DOMResult; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.bootstrap.DOMImplementationRegistry; /* + * @test * @bug 6909336 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.CR6909336Test + * @run testng/othervm dom.CR6909336Test * @summary Test DOM writer can write more that 20 nested elements. */ +@Listeners({jaxp.library.BasePolicy.class}) public class CR6909336Test { @Test @@ -66,3 +72,4 @@ public class CR6909336Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java index 0bc4669c4e6..b4341558e8e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMConfigurationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -33,6 +33,7 @@ import javax.xml.parsers.FactoryConfigurationError; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Attr; import org.w3c.dom.CDATASection; @@ -56,8 +57,13 @@ import org.xml.sax.InputSource; import org.xml.sax.SAXException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.DOMConfigurationTest + * @run testng/othervm dom.DOMConfigurationTest * @summary Test DOMConfiguration for supported properties. */ +@Listeners({jaxp.library.FilePolicy.class}) public class DOMConfigurationTest { static class TestHandler implements DOMErrorHandler { @@ -1622,3 +1628,4 @@ public class DOMConfigurationTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java index ebd97facd4b..672c38e5fda 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/DOMXPathTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -26,13 +26,19 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DOMImplementation; /* + * @test * @bug 8042244 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.DOMXPathTest + * @run testng/othervm dom.DOMXPathTest * @summary Verifies that the experimental DOM L3 XPath implementation is no longer available. */ +@Listeners({jaxp.library.BasePolicy.class}) public class DOMXPathTest { /* Verifies that DOMImplementation::hasFeature returns false and getFeature @@ -48,3 +54,4 @@ public class DOMXPathTest { Assert.assertEquals(domImpl.getFeature("+XPath", "3.0"), null); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ElementTraversal.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ElementTraversal.java index 9227e8f565f..ef87815d166 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/ElementTraversal.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ElementTraversal.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -29,6 +29,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.DOMImplementation; @@ -36,10 +37,15 @@ import org.w3c.dom.Element; import org.xml.sax.SAXException; /* + * @test * @bug 8135283 8138721 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.ElementTraversal + * @run testng/othervm dom.ElementTraversal * @summary Tests for the Element Traversal interface. */ +@Listeners({jaxp.library.FilePolicy.class}) public class ElementTraversal { /* Verifies that ElementTraversal is supported. @@ -111,7 +117,7 @@ public class ElementTraversal { * DataProvider: a Document object */ @DataProvider(name = "doc") - Object[][] getXPath() { + public Object[][] getXPath() { return new Object[][]{{getDoc()}}; } Document getDoc() { @@ -129,3 +135,4 @@ public class ElementTraversal { return doc; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java index 4c1269cf79c..19523434cf2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/JdkXmlDomTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -22,19 +22,28 @@ */ package dom; +import static jaxp.library.JAXPTestUtilities.runWithAllPerm; + import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 8078139 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.JdkXmlDomTest + * @run testng/othervm dom.JdkXmlDomTest * @summary Verifies that jdk.xml.dom classes are loaded by the ext class loader. */ +@Listeners({jaxp.library.BasePolicy.class}) public class JdkXmlDomTest { @Test public void test() throws ClassNotFoundException { - ClassLoader cl = ClassLoader.getSystemClassLoader().getParent(); + ClassLoader cl = runWithAllPerm(() -> ClassLoader.getSystemClassLoader().getParent()); Class cls = Class.forName("org.w3c.dom.xpath.XPathEvaluator", false, cl); - Assert.assertTrue(cls.getClassLoader() != null); + Assert.assertTrue(runWithAllPerm(() -> cls.getClassLoader()) != null); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java index 4f4ece1766a..6dc3a24b68d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/TCKEncodingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,14 +31,20 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.InputSource; import org.xml.sax.SAXException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.TCKEncodingTest + * @run testng/othervm dom.TCKEncodingTest * @summary Test Document.getInputEncoding(). */ +@Listeners({jaxp.library.BasePolicy.class}) public class TCKEncodingTest { /** @@ -96,3 +102,4 @@ public class TCKEncodingTest { System.out.println("OK"); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java index b16d06c6172..42d8d2457d0 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug4973153.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -36,6 +36,7 @@ import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DOMError; import org.w3c.dom.DOMErrorHandler; @@ -49,9 +50,14 @@ import org.w3c.dom.ls.LSSerializer; import org.xml.sax.SAXException; /* + * @test * @bug 4973153 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.ls.Bug4973153 + * @run testng/othervm dom.ls.Bug4973153 * @summary Test LSSerialiser.setEncoding() raises 'unsupported-encoding' error if encoding is invalid. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug4973153 { DOMImplementationLS implLS = null; @@ -94,7 +100,7 @@ public class Bug4973153 { } @BeforeMethod - protected void setUp() { + public void setUp() { Document doc = null; DocumentBuilder parser = null; try { @@ -116,7 +122,7 @@ public class Bug4973153 { } @AfterMethod - protected void tearDown() { + public void tearDown() { implLS = null; } @@ -198,3 +204,4 @@ class DOMErrorHandlerImpl implements DOMErrorHandler { return true; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java index 9ef91451fbe..f874107cf52 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6290947.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -30,6 +30,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DOMConfiguration; import org.w3c.dom.DOMImplementation; @@ -43,10 +44,15 @@ import org.w3c.dom.ls.LSSerializerFilter; import org.w3c.dom.traversal.NodeFilter; /* + * @test * @bug 6290947 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.ls.Bug6290947 + * @run testng/othervm dom.ls.Bug6290947 * @summary Test LSSerializer writes the XML declaration when LSSerializerFilter is set that rejects all nodes and * LSSerializer's configuration set parameter "xml-declaration" to "true". */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6290947 { private static String XML_STRING = "test1"; @@ -141,3 +147,4 @@ public class Bug6290947 { return src; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java index cdaa0cf4d03..f693e33765a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6354955.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,6 +27,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.CDATASection; import org.w3c.dom.Comment; @@ -40,9 +41,14 @@ import org.w3c.dom.ls.LSSerializer; /* + * @test * @bug 6354955 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.ls.Bug6354955 + * @run testng/othervm dom.ls.Bug6354955 * @summary Test LSSerializer can writeToString on DOM Text node with white space. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6354955 { @Test @@ -136,3 +142,4 @@ public class Bug6354955 { return documentBuilder.newDocument(); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java index d4fcc32aeb9..afd0458ab22 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6376823.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -30,6 +30,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DOMConfiguration; import org.w3c.dom.DOMImplementation; @@ -43,9 +44,14 @@ import org.w3c.dom.ls.LSSerializerFilter; import org.w3c.dom.traversal.NodeFilter; /* + * @test * @bug 6376823 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.ls.Bug6376823 + * @run testng/othervm dom.ls.Bug6376823 * @summary Test LSSerializer works. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6376823 { private static String XML_STRING = "test1"; @@ -115,3 +121,4 @@ public class Bug6376823 { return src; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java index d0b95b99073..73584b3f16d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/Bug6710741Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,6 +27,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -34,9 +35,14 @@ import org.w3c.dom.ls.DOMImplementationLS; import org.w3c.dom.ls.LSException; /* + * @test * @bug 6710741 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.ls.Bug6710741Test + * @run testng/othervm dom.ls.Bug6710741Test * @summary Test there should be stack trace information if LSSerializer().writeToString reports an exception. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6710741Test { @Test @@ -74,3 +80,4 @@ public class Bug6710741Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java index 8c609fc594d..3e4f8762b44 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTCKTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,6 +31,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Attr; import org.w3c.dom.DOMImplementation; @@ -47,8 +48,13 @@ import org.w3c.dom.traversal.NodeFilter; import org.xml.sax.SAXException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.ls.LSParserTCKTest + * @run testng/othervm dom.ls.LSParserTCKTest * @summary Test Specifications and Descriptions for LSParser. */ +@Listeners({jaxp.library.BasePolicy.class}) public class LSParserTCKTest { DOMImplementationLS implLS = null; @@ -578,3 +584,4 @@ public class LSParserTCKTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java index bf24b878037..1a3c5914942 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSParserTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,6 +27,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DOMConfiguration; import org.w3c.dom.DOMError; @@ -39,8 +40,13 @@ import org.w3c.dom.ls.LSParser; import org.w3c.dom.ls.LSResourceResolver; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.ls.LSParserTest + * @run testng/othervm dom.ls.LSParserTest * @summary Test LSParser's DOMConfiguration for supported properties. */ +@Listeners({jaxp.library.BasePolicy.class}) public class LSParserTest { @Test @@ -103,3 +109,4 @@ public class LSParserTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java index 172d3299d5b..d30baa8945f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/dom/ls/LSSerializerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -33,6 +33,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.DOMConfiguration; import org.w3c.dom.DOMError; @@ -48,9 +49,14 @@ import org.xml.sax.SAXException; /* + * @test * @bug 6439439 8080906 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true dom.ls.LSSerializerTest + * @run testng/othervm dom.ls.LSSerializerTest * @summary Test LSSerializer. */ +@Listeners({jaxp.library.BasePolicy.class}) public class LSSerializerTest { private static final String DOM_FORMAT_PRETTY_PRINT = "format-pretty-print"; @@ -313,3 +319,4 @@ public class LSSerializerTest { Assert.assertEquals(XML11_DOCUMENT_OUTPUT, defaultSerialization, "Invalid serialization of XML 1.1 document: "); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java index 5c8248a065b..c0e833e318d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4674384_MAX_OCCURS_Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -29,13 +29,19 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 4674384 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug4674384_MAX_OCCURS_Test + * @run testng/othervm parsers.Bug4674384_MAX_OCCURS_Test * @summary Test large maxOccurs. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug4674384_MAX_OCCURS_Test { @Test @@ -64,3 +70,4 @@ public class Bug4674384_MAX_OCCURS_Test { System.out.println("Success: File " + XML_FILE_NAME + " was parsed with a large value of maxOccurs."); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java index 50f5514f3af..65943390953 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4934208.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,6 +27,7 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -35,9 +36,14 @@ import org.xml.sax.XMLReader; import util.DraconianErrorHandler; /* + * @test * @bug 4934208 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug4934208 + * @run testng/othervm parsers.Bug4934208 * @summary Test SAXParser can parse keyref constraint with a selector that is a union xpath expression selecting a node and its child. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug4934208 { @Test public void test1() throws Exception { @@ -68,3 +74,4 @@ public class Bug4934208 { r.parse(is); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java index 084323445a9..308b5b11bf0 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4967002.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -33,16 +33,22 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; /* + * @test * @bug 4967002 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug4967002 + * @run testng/othervm parsers.Bug4967002 * @summary Test DocumentBuilderFactory.newDocumentBuilder() throws ParserConfigurationException * when it uses the "http://java.sun.com/xml/jaxp/properties/schemaSource" property * and/or the "http://java.sun.com/xml/jaxp/properties/schemaLanguage" property * in conjunction with setting a Schema object. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug4967002 { String schemaSource = "\n" + "\n" + " \n" + " \n" + " \n" + " \n" @@ -95,3 +101,4 @@ public class Bug4967002 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java index c87f47187c7..7cc3313fad9 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4985486.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,14 +26,20 @@ package parsers; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 4985486 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug4985486 + * @run testng/othervm parsers.Bug4985486 * @summary Test SAXParser can parse large characters(more than 10000). */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug4985486 { @Test @@ -62,3 +68,4 @@ public class Bug4985486 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java index 6a50919122f..189f5efebee 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991020.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,12 +26,18 @@ package parsers; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 4991020 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug4991020 + * @run testng/othervm parsers.Bug4991020 * @summary Test XPath like "node_name/." can be parsed. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug4991020 { protected static SAXParser createParser() throws Exception { @@ -50,3 +56,4 @@ public class Bug4991020 { parser.parse(Bug4991020.class.getResource("Bug4991020.xml").toExternalForm(), new util.DraconianErrorHandler()); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java index f48e0bdc783..a30cbd8fbc9 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug4991946.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,12 +26,18 @@ package parsers; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 4991946 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug4991946 + * @run testng/othervm parsers.Bug4991946 * @summary Can parse the element type is anyType in the schema and is substituted by the simple type via the 'xsi:type' attribute in xml document. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug4991946 { protected static SAXParser createParser() throws Exception { @@ -50,3 +56,4 @@ public class Bug4991946 { parser.parse(Bug4991946.class.getResource("Bug4991946.xml").toExternalForm(), new util.DraconianErrorHandler()); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java index 68d9a170435..786a2225731 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5010072.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,15 +26,21 @@ package parsers; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 5010072 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug5010072 + * @run testng/othervm parsers.Bug5010072 * @summary Test SchemaFactory throws SAXException if xpath is "@". */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug5010072 { protected static class ErrorHandler extends DefaultHandler { @@ -71,3 +77,4 @@ public class Bug5010072 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java index 9a87104746b..86d766b282e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug5025825.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -33,15 +33,21 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.SAXException; /* + * @test * @bug 5025825 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug5025825 + * @run testng/othervm parsers.Bug5025825 * @summary Test if SAXParserFactory set a Schema object, when SAXParser sets "http://java.sun.com/xml/jaxp/properties/schemaSource" property * and/or "http://java.sun.com/xml/jaxp/properties/schemaLanguage" property, it shall throw SAXException. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug5025825 { String schemaSource = "\n" + "\n" + " \n" @@ -83,3 +89,4 @@ public class Bug5025825 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java index fc38d41c3e4..20e49c8a501 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6309988.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,6 +23,9 @@ package parsers; +import static jaxp.library.JAXPTestUtilities.clearSystemProperty; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + import java.io.File; import java.io.InputStream; @@ -33,31 +36,28 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.SAXParseException; /* + * @test * @bug 6309988 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug6309988 + * @run testng/othervm parsers.Bug6309988 * @summary Test elementAttributeLimit, maxOccurLimit, entityExpansionLimit. */ +@Test(singleThreaded = true) +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6309988 { DocumentBuilderFactory dbf = null; - static boolean _isSecureMode = false; - static { - if (System.getSecurityManager() != null) { - _isSecureMode = true; - System.out.println("Security Manager is present"); - } else { - System.out.println("Security Manager is NOT present"); - } - } /* * Given XML document has more than 10000 attributes. Exception is expected */ - @Test public void testDOMParserElementAttributeLimit() { try { dbf = DocumentBuilderFactory.newInstance(); @@ -75,7 +75,6 @@ public class Bug6309988 { * Given XML document has more than 10000 attributes. It should report an * error. */ - @Test public void testDOMNSParserElementAttributeLimit() { try { dbf = DocumentBuilderFactory.newInstance(); @@ -94,9 +93,8 @@ public class Bug6309988 { * Given XML document has more than 10000 attributes. Parsing this XML * document in non-secure mode, should not report any error. */ - @Test public void testDOMNSParserElementAttributeLimitWithoutSecureProcessing() { - if (_isSecureMode) + if (isSecureMode()) return; // jaxp secure feature can not be turned off when security // manager is present try { @@ -121,16 +119,15 @@ public class Bug6309988 { * test should be the same as * testSystemElementAttributeLimitWithSecureProcessing */ - @Test public void testSystemElementAttributeLimitWithoutSecureProcessing() { - if (_isSecureMode) + if (isSecureMode()) return; // jaxp secure feature can not be turned off when security // manager is present try { dbf = DocumentBuilderFactory.newInstance(); dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, false); dbf.setNamespaceAware(true); - System.setProperty("elementAttributeLimit", "2"); + setSystemProperty("elementAttributeLimit", "2"); DocumentBuilder parser = dbf.newDocumentBuilder(); Document doc = parser.parse(this.getClass().getResourceAsStream("DosTest3.xml")); @@ -147,7 +144,7 @@ public class Bug6309988 { Assert.fail("Unexpected error: " + e.getMessage()); } } finally { - System.clearProperty("elementAttributeLimit"); + clearSystemProperty("elementAttributeLimit"); } } @@ -155,12 +152,11 @@ public class Bug6309988 { * Given XML document has 3 attributes and System property is set to 2. * Parsing this XML document in secure mode, should report an error. */ - @Test public void testSystemElementAttributeLimitWithSecureProcessing() { try { dbf = DocumentBuilderFactory.newInstance(); dbf.setNamespaceAware(true); - System.setProperty("elementAttributeLimit", "2"); + setSystemProperty("elementAttributeLimit", "2"); DocumentBuilder parser = dbf.newDocumentBuilder(); Document doc = parser.parse(this.getClass().getResourceAsStream("DosTest3.xml")); Assert.fail("SAXParserException is expected, as given XML document contains more than 2 attributes"); @@ -169,14 +165,13 @@ public class Bug6309988 { } catch (Exception e) { Assert.fail("Exception " + e.getMessage()); } finally { - System.setProperty("elementAttributeLimit", ""); + setSystemProperty("elementAttributeLimit", ""); } } /* * Default value for secure processing feature should be true. */ - @Test public void testDOMSecureProcessingDefaultValue() { try { dbf = DocumentBuilderFactory.newInstance(); @@ -190,7 +185,6 @@ public class Bug6309988 { /* * Default value for secure processing feature should be true. */ - @Test public void testSAXSecureProcessingDefaultValue() { try { SAXParserFactory spf = SAXParserFactory.newInstance(); @@ -206,16 +200,15 @@ public class Bug6309988 { * feature is off. Given doument contains more than 2 elements and hence an * error should be reported. */ - @Test public void testSystemMaxOccurLimitWithoutSecureProcessing() { - if (_isSecureMode) + if (isSecureMode()) return; // jaxp secure feature can not be turned off when security // manager is present try { SAXParserFactory spf = SAXParserFactory.newInstance(); spf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, false); spf.setValidating(true); - System.setProperty("maxOccurLimit", "2"); + setSystemProperty("maxOccurLimit", "2"); // Set the properties for Schema Validation String SCHEMA_LANG = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; String SCHEMA_TYPE = "http://www.w3.org/2001/XMLSchema"; @@ -230,7 +223,7 @@ public class Bug6309988 { MyErrorHandler eh = new MyErrorHandler(); parser.parse(is, eh); Assert.assertFalse(eh.errorOccured, "Not Expected Error"); - System.setProperty("maxOccurLimit", ""); + setSystemProperty("maxOccurLimit", ""); } catch (Exception e) { Assert.fail("Exception occured: " + e.getMessage()); } @@ -242,9 +235,8 @@ public class Bug6309988 { * maxOccur is '3002'. Since secure processing feature is off, document * should be parsed without any errors. */ - @Test public void testValidMaxOccurLimitWithOutSecureProcessing() { - if (_isSecureMode) + if (isSecureMode()) return; // jaxp secure feature can not be turned off when security // manager is present try { @@ -279,13 +271,12 @@ public class Bug6309988 { * test should be the same as * testSystemElementAttributeLimitWithSecureProcessing */ - @Test public void testSystemEntityExpansionLimitWithOutSecureProcessing() { - if (_isSecureMode) + if (isSecureMode()) return; // jaxp secure feature can not be turned off when security // manager is present try { - System.setProperty("entityExpansionLimit", "2"); + setSystemProperty("entityExpansionLimit", "2"); dbf = DocumentBuilderFactory.newInstance(); dbf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, false); dbf.setValidating(true); @@ -304,7 +295,7 @@ public class Bug6309988 { Assert.fail("Unexpected error: " + e.getMessage()); } } finally { - System.clearProperty("entityExpansionLimit"); + clearSystemProperty("entityExpansionLimit"); } } @@ -312,12 +303,11 @@ public class Bug6309988 { * System property is set to 2. Given XML document has more than 2 entity * references. Parsing this document in secure mode, should report an error. */ - @Test public void testSystemEntityExpansionLimitWithSecureProcessing() { try { dbf = DocumentBuilderFactory.newInstance(); dbf.setValidating(true); - System.setProperty("entityExpansionLimit", "2"); + setSystemProperty("entityExpansionLimit", "2"); DocumentBuilder parser = dbf.newDocumentBuilder(); Document doc = parser.parse(this.getClass().getResourceAsStream("entity.xml")); Assert.fail("SAXParserException is expected, as given XML document contains more 2 entity references"); @@ -327,7 +317,7 @@ public class Bug6309988 { } catch (Exception e) { Assert.fail("Exception " + e.getMessage()); } finally { - System.setProperty("entityExpansionLimit", ""); + setSystemProperty("entityExpansionLimit", ""); } } @@ -335,7 +325,6 @@ public class Bug6309988 { * Given XML document has more than 64000 entity references. Parsing this * document in secure mode, should report an error. */ - @Test public void testEntityExpansionLimitWithSecureProcessing() { try { dbf = DocumentBuilderFactory.newInstance(); @@ -349,7 +338,7 @@ public class Bug6309988 { } catch (Exception e) { Assert.fail("Exception " + e.getMessage()); } finally { - System.setProperty("entityExpansionLimit", ""); + setSystemProperty("entityExpansionLimit", ""); } } @@ -357,9 +346,8 @@ public class Bug6309988 { * Given XML document has more than 64000 entity references. Parsing this * document in non-secure mode, should not report any error. */ - @Test public void testEntityExpansionLimitWithOutSecureProcessing() { - if (_isSecureMode) + if (isSecureMode()) return; // jaxp secure feature can not be turned off when security // manager is present try { @@ -374,7 +362,12 @@ public class Bug6309988 { } catch (Exception e) { Assert.fail("Exception " + e.getMessage()); } finally { - System.setProperty("entityExpansionLimit", ""); + setSystemProperty("entityExpansionLimit", ""); } } + + private boolean isSecureMode() { + return System.getSecurityManager() != null; + } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java index 94873dfaab3..5a93c1a515e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6341770.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,29 +23,38 @@ package parsers; +import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission; + import java.io.File; import java.io.FileWriter; import java.io.PrintWriter; +import java.util.PropertyPermission; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 6341770 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug6341770 + * @run testng/othervm parsers.Bug6341770 * @summary Test external entity linked to non-ASCII base URL. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6341770 { // naming a file "aux" would fail on windows. @Test public void testNonAsciiURI() { try { - File dir = File.createTempFile("sko\u0159ice", null); + File dir = new File("sko\u0159ice"); dir.delete(); dir.mkdir(); File main = new File(dir, "main.xml"); @@ -60,11 +69,13 @@ public class Bug6341770 { w.flush(); w.close(); System.out.println("Parsing: " + main); - SAXParserFactory.newInstance().newSAXParser().parse(main, new DefaultHandler() { - public void startElement(String uri, String localname, String qname, Attributes attr) throws SAXException { - System.out.println("encountered <" + qname + ">"); - } - }); + tryRunWithTmpPermission( + () -> SAXParserFactory.newInstance().newSAXParser().parse(main, new DefaultHandler() { + public void startElement(String uri, String localname, String qname, Attributes attr) + throws SAXException { + System.out.println("encountered <" + qname + ">"); + } + }), new PropertyPermission("user.dir", "read")); } catch (Exception e) { e.printStackTrace(); Assert.fail("Exception: " + e.getMessage()); @@ -72,3 +83,4 @@ public class Bug6341770 { System.out.println("OK."); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java index f3bfb88fce1..1e0e25a3bc0 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6361283.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,12 +27,18 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6361283 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug6361283 + * @run testng/othervm parsers.Bug6361283 * @summary Test SAXParser returns version as 1.1 for XML 1.1 document. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6361283 { @Test @@ -50,3 +56,4 @@ public class Bug6361283 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java index a7e82d51eab..eab6d6dbdb8 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6506304Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,21 +23,29 @@ package parsers; +import static jaxp.library.JAXPTestUtilities.getSystemProperty; + import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.XMLReader; /* + * @test * @bug 6506304 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug6506304Test + * @run testng/othervm parsers.Bug6506304Test * @summary Test MalformedURLException: unknown protocol won't be thrown when there is a space within the full path file name. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6506304Test { public static boolean isWindows = false; static { - if (System.getProperty("os.name").indexOf("Windows") > -1) { + if (getSystemProperty("os.name").indexOf("Windows") > -1) { isWindows = true; } }; @@ -63,3 +71,4 @@ public class Bug6506304Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java index c6a03542a43..ab23e378732 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6518733.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -29,15 +29,21 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.Attributes; import org.xml.sax.InputSource; import org.xml.sax.SAXException; /* + * @test * @bug 6518733 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug6518733 + * @run testng/othervm parsers.Bug6518733 * @summary Test SAX parser handles several attributes that each contain a newline within the attribute value. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6518733 { @Test @@ -61,3 +67,4 @@ public class Bug6518733 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java index e7aa719dd81..1ae8c810fd9 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6564400.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -38,6 +38,7 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -46,9 +47,14 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 6564400 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug6564400 + * @run testng/othervm parsers.Bug6564400 * @summary Test ignorable whitespace handling with schema validation. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6564400 { private boolean sawIgnorable = false; Schema schema = null; @@ -174,3 +180,4 @@ public class Bug6564400 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java index ff3d19388e6..dd12ea5e254 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -29,12 +29,18 @@ import java.io.StringBufferInputStream; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6573786 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug6573786 + * @run testng/othervm parsers.Bug6573786 * @summary Test parser error messages are formatted. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6573786 { String _cache = ""; @@ -67,3 +73,4 @@ public class Bug6573786 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java index b938eb6eb6f..f4595896db7 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6573786ErrorHandler.java @@ -45,3 +45,4 @@ public class Bug6573786ErrorHandler extends DefaultHandler { System.out.println(e.getMessage()); } // warning () } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java index a89d834642f..411bdf7c422 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6594813.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -34,14 +34,20 @@ import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamResult; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 6594813 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug6594813 + * @run testng/othervm parsers.Bug6594813 * @summary Test SAXParser output is wellformed with name space. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6594813 { public Bug6594813(String name) { @@ -169,3 +175,4 @@ public class Bug6594813 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java index db724d83e86..67f596b284f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6608841.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -30,14 +30,20 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 6608841 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug6608841 + * @run testng/othervm parsers.Bug6608841 * @summary Test SAX parses external parameter entity. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6608841 { public Bug6608841(String name) { } @@ -53,3 +59,4 @@ public class Bug6608841 { public class MyHandler extends DefaultHandler { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java index 25f536f73bb..5d4359ae368 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6690015.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -28,6 +28,7 @@ import java.io.FileInputStream; import javax.xml.parsers.DocumentBuilderFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -37,9 +38,14 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; /* + * @test * @bug 6518733 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug6690015 + * @run testng/othervm parsers.Bug6690015 * @summary Test SAX parser handles several attributes with newlines. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6690015 { public Bug6690015() { @@ -81,3 +87,4 @@ public class Bug6690015 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java index cfd2fe26a74..9e6514aded4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6760982.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,6 +31,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.NamedNodeMap; @@ -39,9 +40,14 @@ import org.w3c.dom.NodeList; import org.xml.sax.InputSource; /* + * @test * @bug 6518733 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug6760982 + * @run testng/othervm parsers.Bug6760982 * @summary Test SAX parser handles several attributes with containing ">". */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6760982 { @Test @@ -162,3 +168,4 @@ public class Bug6760982 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java index c65bd1bc285..4c9f3c0e11f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug6849942Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -29,15 +29,21 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.ProcessingInstruction; import org.xml.sax.InputSource; /* + * @test * @bug 6849942 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug6849942Test + * @run testng/othervm parsers.Bug6849942Test * @summary Test parsing an XML that starts with a processing instruction and no prolog. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6849942Test { @Test @@ -75,3 +81,4 @@ public class Bug6849942Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java index bd1e303dc17..26f3f8a595a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7157608Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,6 +23,8 @@ package parsers; +import static jaxp.library.JAXPTestUtilities.getSystemProperty; + import java.io.File; import java.io.IOException; @@ -31,6 +33,7 @@ import javax.xml.parsers.DocumentBuilderFactory; import org.testng.Assert; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.InputSource; @@ -39,13 +42,18 @@ import org.xml.sax.SAXParseException; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 7157608 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug7157608Test + * @run testng/othervm parsers.Bug7157608Test * @summary Test feature standard-uri-conformant works. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug7157608Test { public static boolean isWindows = false; static { - if (System.getProperty("os.name").indexOf("Windows") > -1) { + if (getSystemProperty("os.name").indexOf("Windows") > -1) { isWindows = true; } }; @@ -53,7 +61,7 @@ public class Bug7157608Test { String xml1, xml2; @BeforeMethod - protected void setUp() throws IOException { + public void setUp() throws IOException { File file1 = new File(getClass().getResource("Bug7157608.xml").getFile()); xml1 = file1.getPath().replace("\\", "\\\\"); File file2 = new File(getClass().getResource("Bug7157608_1.xml").getFile()); @@ -210,3 +218,4 @@ public class Bug7157608Test { boolean validating = false; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java index 7230f9c1488..ed727064128 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug7166896Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -30,14 +30,20 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.SAXException; /* + * @test * @bug 7166896 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug7166896Test + * @run testng/othervm parsers.Bug7166896Test * @summary Test DocumentBuilder.parse(String uri) supports IPv6 format. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug7166896Test { @Test @@ -74,3 +80,4 @@ public class Bug7166896Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java new file mode 100644 index 00000000000..efa75ed9838 --- /dev/null +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147Test.java @@ -0,0 +1,96 @@ +/* + * Copyright (c) 2014, 2016, 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 8003147 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @compile Bug8003147TestClass.java + * @run testng/othervm -DrunSecMngr=true parsers.Bug8003147Test + * @run testng/othervm parsers.Bug8003147Test + * @summary Test port fix for BCEL bug 39695. + */ + +package parsers; + +import static jaxp.library.JAXPTestUtilities.getSystemProperty; + +import java.io.FileOutputStream; +import java.io.FilePermission; + +import jaxp.library.JAXPTestUtilities; + +import org.testng.Assert; +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; + +import com.sun.org.apache.bcel.internal.classfile.ClassParser; +import com.sun.org.apache.bcel.internal.classfile.ConstantClass; +import com.sun.org.apache.bcel.internal.classfile.ConstantPool; +import com.sun.org.apache.bcel.internal.classfile.ConstantUtf8; +import com.sun.org.apache.bcel.internal.classfile.JavaClass; +import com.sun.org.apache.bcel.internal.classfile.Method; +import com.sun.org.apache.bcel.internal.generic.ClassGen; +import com.sun.org.apache.bcel.internal.generic.MethodGen; + +@Listeners({ jaxp.library.FilePolicy.class, jaxp.library.InternalAPIPolicy.class }) +public class Bug8003147Test { + + @Test + public void test() throws Exception { + // Note: com.sun.org.apache.bcel.internal.classfile.JavaClass doesn't + // support InvokeDynamic, so can't use lambda, also can't use string1 + + // string2, because javac will generate a dynamic call where invoking + // string1.concat(string2), so create a separate Bug8003147TestClass + JAXPTestUtilities.tryRunWithTmpPermission(() -> { + String classfile = getSystemProperty("test.classes") + "/parsers/Bug8003147TestClass.class"; + JavaClass jc = new ClassParser(classfile).parse(); + + // rename class + ConstantPool cp = jc.getConstantPool(); + int cpIndex = ((ConstantClass) cp.getConstant(jc.getClassNameIndex())).getNameIndex(); + cp.setConstant(cpIndex, new ConstantUtf8("parsers/Bug8003147TestClassPrime")); + ClassGen gen = new ClassGen(jc); + Method[] methods = jc.getMethods(); + int index; + for (index = 0; index < methods.length; index++) { + if (methods[index].getName().equals("doSomething")) { + break; + } + } + Method m = methods[index]; + MethodGen mg = new MethodGen(m, gen.getClassName(), gen.getConstantPool()); + gen.replaceMethod(m, mg.getMethod()); + String path = classfile.replace("Bug8003147TestClass", "Bug8003147TestClassPrime"); + gen.getJavaClass().dump(new FileOutputStream(path)); + + try { + Class.forName("parsers.Bug8003147TestClassPrime"); + } catch (ClassFormatError cfe) { + cfe.printStackTrace(); + Assert.fail("modified version of class does not pass verification"); + } + }, new FilePermission(getSystemProperty("test.classes") + "/-", "read,write")); + } +} + diff --git a/jaxp/test/javax/xml/jaxp/unittest/policy/PolicyUtil.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147TestClass.java similarity index 77% rename from jaxp/test/javax/xml/jaxp/unittest/policy/PolicyUtil.java rename to jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147TestClass.java index 340f5de7d55..f9da51202e1 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/policy/PolicyUtil.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8003147TestClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2016, 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 @@ -21,15 +21,15 @@ * questions. */ -package policy; +package parsers; -import java.security.Policy; +import java.util.ArrayList; -public class PolicyUtil { - - public static void changePolicy(String policyFile) { - System.setProperty("java.security.policy", policyFile); - Policy.getPolicy().refresh(); +/* + * Class for Bug8003147Test, includes a method, which has a generic argument + */ +public class Bug8003147TestClass { + public void doSomething(double d, ArrayList list) { } - } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java index 5a034c378b9..eae5319f34d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/Bug8073385.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -23,37 +23,46 @@ package parsers; +import static jaxp.library.JAXPTestUtilities.runWithAllPerm; +import static org.testng.Assert.assertTrue; + import java.io.StringReader; import java.util.Locale; -import javax.xml.parsers.DocumentBuilderFactory; + import javax.xml.parsers.DocumentBuilder; -import org.xml.sax.SAXException; -import org.xml.sax.InputSource; +import javax.xml.parsers.DocumentBuilderFactory; import org.testng.annotations.AfterClass; import org.testng.annotations.BeforeClass; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; -import static org.testng.Assert.assertTrue; +import org.xml.sax.InputSource; +import org.xml.sax.SAXException; /** + * @test * @bug 8073385 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.Bug8073385 + * @run testng/othervm parsers.Bug8073385 * @summary test that invalid XML character exception string contains * information about character value, element and attribute names */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug8073385 { private Locale defLoc; @BeforeClass - private void setup() { + public void setup() { defLoc = Locale.getDefault(); - Locale.setDefault(Locale.ENGLISH); + runWithAllPerm(() -> Locale.setDefault(Locale.ENGLISH)); } @AfterClass - private void cleanup() { - Locale.setDefault(defLoc); + public void cleanup() { + runWithAllPerm(() -> Locale.setDefault(defLoc)); } @DataProvider(name = "illegalCharactersData") @@ -91,3 +100,4 @@ public class Bug8073385 { assertTrue(exceptionText.contains("Unicode: " + hexString)); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java index 031b0fea2a2..2a4d7c17514 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/FactoryFindTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,42 +23,44 @@ package parsers; +import static jaxp.library.JAXPTestUtilities.runWithAllPerm; + import java.net.URL; import java.net.URLClassLoader; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.FactoryFindTest + * @run testng/othervm parsers.FactoryFindTest * @summary Test Classloader for SAXParserFactory. */ +@Listeners({jaxp.library.BasePolicy.class}) public class FactoryFindTest { boolean myClassLoaderUsed = false; @Test public void testFactoryFind() { - try { - // System.setProperty("jaxp.debug", "true"); + SAXParserFactory factory = SAXParserFactory.newInstance(); + Assert.assertTrue(factory.getClass().getClassLoader() == null); - SAXParserFactory factory = SAXParserFactory.newInstance(); - Assert.assertTrue(factory.getClass().getClassLoader() == null); - - Thread.currentThread().setContextClassLoader(null); - factory = SAXParserFactory.newInstance(); - Assert.assertTrue(factory.getClass().getClassLoader() == null); - - Thread.currentThread().setContextClassLoader(new MyClassLoader()); - factory = SAXParserFactory.newInstance(); - if (System.getSecurityManager() == null) - Assert.assertTrue(myClassLoaderUsed); - else - Assert.assertFalse(myClassLoaderUsed); - } catch (Exception ex) { - } + runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(null)); + factory = SAXParserFactory.newInstance(); + Assert.assertTrue(factory.getClass().getClassLoader() == null); + runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(new MyClassLoader())); + factory = SAXParserFactory.newInstance(); + if (System.getSecurityManager() == null) + Assert.assertTrue(myClassLoaderUsed); + else + Assert.assertFalse(myClassLoaderUsed); } class MyClassLoader extends URLClassLoader { @@ -73,3 +75,4 @@ public class FactoryFindTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java index c690163eb86..52874b90362 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyDefaultHandler.java @@ -45,3 +45,4 @@ public class MyDefaultHandler extends DefaultHandler { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java index 695c932f603..fb01c19171a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/MyErrorHandler.java @@ -53,3 +53,4 @@ public class MyErrorHandler extends DefaultHandler { errorOccured = true; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java index a6dafccba4c..079f25304c9 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/ParseEmptyStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -29,13 +29,19 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.helpers.DefaultHandler; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.ParseEmptyStream + * @run testng/othervm parsers.ParseEmptyStream * @summary Test SAXParser doesn't accept empty stream. */ +@Listeners({jaxp.library.BasePolicy.class}) public class ParseEmptyStream { SAXParserFactory factory = null; @@ -86,3 +92,4 @@ public class ParseEmptyStream { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java index 7430e03f5c4..63e2371d75e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/SupplementaryChars.java @@ -5,18 +5,24 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXParseException; import org.xml.sax.helpers.DefaultHandler; /** + * @test * @bug 8072081 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.SupplementaryChars + * @run testng/othervm parsers.SupplementaryChars * @summary verifies that supplementary characters are supported as character * data in xml 1.0, and also names in xml 1.1. * * Joe Wang (huizhe.wang@oracle.com) */ +@Listeners({jaxp.library.BasePolicy.class}) public class SupplementaryChars { @Test(dataProvider = "supported") @@ -34,7 +40,7 @@ public class SupplementaryChars { } @DataProvider(name = "supported") - private Object[][] supported() { + public Object[][] supported() { return new Object[][] { {"\uD840\uDC0B"}, @@ -47,7 +53,7 @@ public class SupplementaryChars { } @DataProvider(name = "unsupported") - private Object[][] unsupported() { + public Object[][] unsupported() { return new Object[][] { {"in tag name"}, {"in attribute name"} @@ -65,3 +71,4 @@ public class SupplementaryChars { return parser; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java index 841191704eb..a1c83eb9c00 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/parsers/xinclude/Bug6794483Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -37,15 +37,21 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.NodeList; /* + * @test * @bug 6794483 8080908 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true parsers.xinclude.Bug6794483Test + * @run testng/othervm parsers.xinclude.Bug6794483Test * @summary Test JAXP parser can resolve the included content properly if the * included xml contains an empty tag that ends with "/>", refer to XERCESJ-1134. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6794483Test { @Test @@ -101,3 +107,4 @@ public class Bug6794483Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/policy/common.policy b/jaxp/test/javax/xml/jaxp/unittest/policy/common.policy deleted file mode 100644 index 0ca5f742c09..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/policy/common.policy +++ /dev/null @@ -1,27 +0,0 @@ -grant { - permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; - permission java.lang.RuntimePermission "accessDeclaredMembers"; - - permission java.io.FilePermission "${test.classes}/../../-", "read, write, delete"; - permission java.io.FilePermission ".", "read, write, delete"; - permission java.util.PropertyPermission "*", "read, write"; - - permission java.lang.RuntimePermission "setSecurityManager"; - permission java.lang.RuntimePermission "createSecurityManager"; - permission java.lang.RuntimePermission "createClassLoader"; - permission java.lang.RuntimePermission "setIO"; - permission java.lang.RuntimePermission "setContextClassLoader"; - permission java.security.SecurityPermission "getPolicy"; - - permission java.io.FilePermission "${test.src}/-", "read, write, delete"; - permission java.io.FilePermission "${user.dir}/-", "read, write, delete"; - permission java.io.FilePermission "${java.io.tmpdir}/-", "read, write, delete"; - - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.bcel.internal.classfile"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.bcel.internal.generic"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.xml.internal.stream.writers"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xerces.internal.impl"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xalan.internal"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xalan.internal.xsltc.trax"; - permission java.lang.RuntimePermission "accessClassInPackage.com.sun.org.apache.xalan.internal.xslt"; -}; diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java index e8a1bba6864..a792405cce5 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Attributes2ImplTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -24,12 +24,18 @@ package sax; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ext.Attributes2Impl; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true sax.Attributes2ImplTest + * @run testng/othervm sax.Attributes2ImplTest * @summary Test Attributes2Impl. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Attributes2ImplTest { @Test @@ -147,3 +153,4 @@ public class Attributes2ImplTest { Assert.assertTrue(impl1.getQName(2).equals(impl3.getQName(2))); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java index e5043aa0f48..651e804a89d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6889654Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -30,15 +30,21 @@ import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 6889654 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true sax.Bug6889654Test + * @run testng/othervm sax.Bug6889654Test * @summary Test SAXException includes whole information. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6889654Test { final String MSG = "Failed to parse XML"; @@ -81,3 +87,4 @@ public class Bug6889654Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java index 5679ed6b262..96303049be7 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6925410Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -25,14 +25,20 @@ package sax; import javax.xml.datatype.DatatypeConfigurationException; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.testng.Assert; import org.xml.sax.helpers.XMLReaderFactory; /* + * @test * @bug 6925410 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true sax.Bug6925410Test + * @run testng/othervm sax.Bug6925410Test * @summary Test XMLReaderFactory can createXMLReader repeatedly. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6925410Test { @Test @@ -54,3 +60,4 @@ public class Bug6925410Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java index d8fd89cd29a..7a6c8618110 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6949607Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -29,15 +29,21 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.Attributes; import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 6949607 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true sax.Bug6949607Test + * @run testng/othervm sax.Bug6949607Test * @summary Test Attributes.getValue returns null when parameter uri is empty. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6949607Test { final String MSG = "Failed to parse XML"; @@ -75,3 +81,4 @@ public class Bug6949607Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java index d82fe101f47..47f076553ff 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug6992561Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,6 +31,7 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ContentHandler; import org.xml.sax.InputSource; @@ -40,9 +41,14 @@ import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 6992561 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true sax.Bug6992561Test + * @run testng/othervm sax.Bug6992561Test * @summary Test encoding of SystemId in Locator. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6992561Test { @Test @@ -80,3 +86,4 @@ public class Bug6992561Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java index 77809766d5e..198ade37101 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/Bug7057778Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,6 +23,9 @@ package sax; +import static jaxp.library.JAXPTestUtilities.getSystemProperty; +import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -33,13 +36,15 @@ import java.io.OutputStream; import java.io.OutputStreamWriter; import java.io.UnsupportedEncodingException; import java.io.Writer; +import java.util.PropertyPermission; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; -import org.testng.annotations.Test; import org.testng.Assert; +import org.testng.annotations.Listeners; +import org.testng.annotations.Test; import org.xml.sax.Attributes; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; @@ -48,9 +53,14 @@ import org.xml.sax.XMLReader; import org.xml.sax.ext.DefaultHandler2; /* + * @test * @bug 7057778 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true sax.Bug7057778Test + * @run testng/othervm sax.Bug7057778Test * @summary Test the file can be deleted after SAXParser.parse(File, DefaultHandler). */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug7057778Test { static final String xml = "Bug7057778.xml"; @@ -59,20 +69,22 @@ public class Bug7057778Test { @Test public void testParse() { File src = new File(getClass().getResource(xml).getFile()); - File dst = new File(src.getParent() + File.separator + xml1); + File dst = new File(xml1); try { copyFile(src, dst); SAXParserFactory spf = SAXParserFactory.newInstance(); SAXParser parser = spf.newSAXParser(); XMLReader xmlReader = parser.getXMLReader(); xmlReader.setProperty("http://xml.org/sax/properties/lexical-handler", new MyHandler1()); - parser.parse(dst, new MyHandler1()); + tryRunWithTmpPermission(() -> parser.parse(dst, new MyHandler1()), + new PropertyPermission("user.dir", "read")); } catch (SAXException ex) { ex.printStackTrace(); } catch (IOException ex) { // shouldn't happen } catch (ParserConfigurationException ex) { // shouldn't happen + } catch (Exception ex) { } if (dst != null) { if (dst.delete()) { @@ -173,7 +185,7 @@ public class Bug7057778Test { // Start a new line // and indent the next line appropriately private void nl() throws SAXException { - String lineEnd = System.getProperty("line.separator"); + String lineEnd = getSystemProperty("line.separator"); try { out.write(lineEnd); @@ -187,3 +199,4 @@ public class Bug7057778Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java index 15205d745cb..7d3ff8c0e2e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/DefaultHandler2Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,6 +31,7 @@ import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; import org.testng.AssertJUnit; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; import org.xml.sax.SAXNotRecognizedException; @@ -42,8 +43,13 @@ import org.xml.sax.helpers.XMLFilterImpl; import org.xml.sax.helpers.XMLReaderFactory; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true sax.DefaultHandler2Test + * @run testng/othervm sax.DefaultHandler2Test * @summary Test DefaultHandler2. */ +@Listeners({jaxp.library.FilePolicy.class}) public class DefaultHandler2Test { @Test @@ -245,3 +251,4 @@ public class DefaultHandler2Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java b/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java index b5a46472f34..6c52f6d69bd 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/IssueTracker56Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,6 +31,7 @@ import javax.xml.parsers.SAXParser; import javax.xml.parsers.SAXParserFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.Attributes; import org.xml.sax.ErrorHandler; @@ -39,9 +40,14 @@ import org.xml.sax.SAXException; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 6809409 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true sax.IssueTracker56Test + * @run testng/othervm sax.IssueTracker56Test * @summary Test SAXException has Cause. */ +@Listeners({jaxp.library.BasePolicy.class}) public class IssueTracker56Test { @Test @@ -136,3 +142,4 @@ public class IssueTracker56Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java b/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java index 44ac9fde73d..b36ae9aa88a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/MyDefaultHandler2.java @@ -198,3 +198,4 @@ public class MyDefaultHandler2 extends DefaultHandler2 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java b/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java index c04ecc7ab54..4ade4a8d76a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/NSSupportTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,12 +27,18 @@ import java.util.Enumeration; import org.testng.Assert; import org.testng.AssertJUnit; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.helpers.NamespaceSupport; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true sax.NSSupportTest + * @run testng/othervm sax.NSSupportTest * @summary Test NamespaceSupport. */ +@Listeners({jaxp.library.BasePolicy.class}) public class NSSupportTest { @Test @@ -226,3 +232,4 @@ public class NSSupportTest { Assert.assertNull(nssupport.getURI("")); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java b/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java index 9b9800d27fa..a4c0e184458 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/SAXExceptionExt.java @@ -38,3 +38,4 @@ public class SAXExceptionExt extends SAXException { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/sax/XMLReaderTest.java b/jaxp/test/javax/xml/jaxp/unittest/sax/XMLReaderTest.java index 5b0120418cd..73c92da706a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/sax/XMLReaderTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/sax/XMLReaderTest.java @@ -23,18 +23,27 @@ package sax; +import static jaxp.library.JAXPTestUtilities.clearSystemProperty; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.SAXParserFactory; + import org.testng.annotations.AfterClass; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; import org.xml.sax.helpers.XMLReaderAdapter; /* + * @test * @bug 8158246 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true sax.XMLReaderTest + * @run testng/othervm sax.XMLReaderTest * @summary This class contains tests that cover the creation of XMLReader. */ +@Listeners({jaxp.library.BasePolicy.class}) public class XMLReaderTest { private final String SAX_PROPNAME = "org.xml.sax.driver"; @@ -43,7 +52,7 @@ public class XMLReaderTest { */ @AfterClass public void cleanUp() throws Exception { - System.clearProperty(SAX_PROPNAME); + clearSystemProperty(SAX_PROPNAME); } /* @@ -57,7 +66,8 @@ public class XMLReaderTest { public void testcreateXMLReader() throws SAXException, ParserConfigurationException { String className = SAXParserFactory.newInstance().newSAXParser() .getXMLReader().getClass().getName(); - System.setProperty(SAX_PROPNAME, className + "nosuch"); + setSystemProperty(SAX_PROPNAME, className + "nosuch"); XMLReaderAdapter adapter = new XMLReaderAdapter(); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java index 01d54e05785..f9dbc0d4591 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/AttributeLocalNameTest/AttributeLocalNameTest.java @@ -30,11 +30,17 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.AttributeLocalNameTest.AttributeLocalNameTest + * @run testng/othervm stream.AttributeLocalNameTest.AttributeLocalNameTest * @summary Test XMLStreamReader.getAttributeLocalName(). */ +@Listeners({jaxp.library.BasePolicy.class}) public class AttributeLocalNameTest { static final String XML = "" + ""; @@ -60,3 +66,4 @@ public class AttributeLocalNameTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java index f386e5d5a30..97cf8292b5e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6370703.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,12 +27,18 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6370703 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.Bug6370703 + * @run testng/othervm stream.Bug6370703 * @summary Test StAX parser can parse attribute default value when START_ELEMENT. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6370703 { private static String INPUT_FILE = "sgml.xml"; @@ -63,3 +69,4 @@ public class Bug6370703 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java index f273d1f002e..8848cb4f76f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6378422.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -26,12 +26,18 @@ package stream; import javax.xml.stream.XMLInputFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6378422 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.Bug6378422 + * @run testng/othervm stream.Bug6378422 * @summary Test setting reuse-instance property on StAX factory. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6378422 { @Test @@ -45,3 +51,4 @@ public class Bug6378422 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java index 8eb6a7ffad9..6ad9bfc092a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6380870.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,12 +27,18 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6380870 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.Bug6380870 + * @run testng/othervm stream.Bug6380870 * @summary Test StAX parser can parse VoiceXML DTD. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6380870 { private static String INPUT_FILE = "basic-form.vxml"; @@ -52,3 +58,4 @@ public class Bug6380870 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java index 9cc264a4fd6..39cdcb0f9db 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6489502.java @@ -30,12 +30,18 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6489502 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.Bug6489502 + * @run testng/othervm stream.Bug6489502 * @summary Test XMLInputFactory works correctly in case it repeats to create reader. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6489502 { public java.io.File input; @@ -77,3 +83,4 @@ public class Bug6489502 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java index b92f4bf0757..54eeb8b60e4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6509774.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -28,12 +28,18 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6509774 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.Bug6509774 + * @run testng/othervm stream.Bug6509774 * @summary Test Property javax.xml.stream.supportDTD, DTD events are now returned even if supportDTD=false. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6509774 { @Test @@ -168,3 +174,4 @@ public class Bug6509774 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java index 57bb97ed144..dca27beec11 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6688002Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -34,12 +34,18 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6688002 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.Bug6688002Test + * @run testng/othervm stream.Bug6688002Test * @summary Test single instance of XMLOutputFactory/XMLInputFactory create multiple Writer/Readers in parallel. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6688002Test { private static final XMLOutputFactory outputFactory = XMLOutputFactory.newInstance(); @@ -107,3 +113,4 @@ public class Bug6688002Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java index ac317469cd7..a3f09aa7334 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/Bug6976938Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,12 +31,18 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6976938 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.Bug6976938Test + * @run testng/othervm stream.Bug6976938Test * @summary Test StAX parser won't throw StackOverflowError while reading valid XML file, in case the text content of an XML element contains many lines like "< ... >". */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6976938Test { private static final String INPUT_FILE = "Bug6976938.xml"; @@ -94,3 +100,4 @@ public class Bug6976938Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java index 70f286cefbe..0b00c3c654c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/CoalesceTest/CoalesceTest.java @@ -32,11 +32,17 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.CoalesceTest.CoalesceTest + * @run testng/othervm stream.CoalesceTest.CoalesceTest * @summary Test Coalesce property works. */ +@Listeners({jaxp.library.FilePolicy.class}) public class CoalesceTest { String countryElementContent = "START India CS}}}}}} India END"; @@ -104,3 +110,4 @@ public class CoalesceTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java index aa72e3fb139..b7947fd2f44 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EntitiesTest/EntityTest.java @@ -37,18 +37,24 @@ import javax.xml.stream.events.XMLEvent; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.EntitiesTest.EntityTest + * @run testng/othervm stream.EntitiesTest.EntityTest * @summary Test StAX parses entity. */ +@Listeners({jaxp.library.FilePolicy.class}) public class EntityTest { XMLInputFactory factory = null; String output = ""; @BeforeMethod - protected void setUp() { + public void setUp() { try { factory = XMLInputFactory.newInstance(); } catch (Exception ex) { @@ -57,7 +63,7 @@ public class EntityTest { } @AfterMethod - protected void tearDown() { + public void tearDown() { factory = null; } @@ -173,3 +179,4 @@ public class EntityTest { return true; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java index b314ff7a022..87246ebd13b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventReaderDelegateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,6 +23,7 @@ package stream; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.testng.Assert; @@ -39,8 +40,13 @@ import javax.xml.stream.events.XMLEvent; import javax.xml.stream.util.EventReaderDelegate; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.EventReaderDelegateTest + * @run testng/othervm stream.EventReaderDelegateTest * @summary Test EventReaderDelegate. */ +@Listeners({jaxp.library.FilePolicy.class}) public class EventReaderDelegateTest { public EventReaderDelegateTest(String name) { @@ -225,3 +231,4 @@ public class EventReaderDelegateTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java index 738f4e3329a..56f97c54b48 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue41Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -48,12 +48,18 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6631268 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.EventsTest.Issue41Test + * @run testng/othervm stream.EventsTest.Issue41Test * @summary Test XMLEvent.writeAsEncodedUnicode can output the event content. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Issue41Test { public java.io.File input; @@ -172,3 +178,4 @@ public class Issue41Test { System.out.println(sw.toString()); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java index b5673029449..4d3b144aca6 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue48Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -37,12 +37,18 @@ import javax.xml.stream.events.NotationDeclaration; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6620632 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.EventsTest.Issue48Test + * @run testng/othervm stream.EventsTest.Issue48Test * @summary Test XMLEventReader can parse notation and entity information from DTD Event. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Issue48Test { public java.io.File input; @@ -109,3 +115,4 @@ public class Issue48Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java index 7193d27e48f..1e30efb2ca4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue53Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,11 +27,17 @@ import javax.xml.stream.XMLEventFactory; import javax.xml.stream.events.StartDocument; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.EventsTest.Issue53Test + * @run testng/othervm stream.EventsTest.Issue53Test * @summary Test encodingSet/standaloneSet returns correct result in case encoding/standalone is set when constructing StartDocument. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Issue53Test { @Test @@ -65,3 +71,4 @@ public class Issue53Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java index 3c467411b70..8e00999acb4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/EventsTest/Issue58Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,11 +32,17 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.EventsTest.Issue58Test + * @run testng/othervm stream.EventsTest.Issue58Test * @summary Test XMLEvent.getLocation() returns a non-volatile Location. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Issue58Test { public java.io.File input; @@ -78,3 +84,4 @@ public class Issue58Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java index f016df38df4..8e908b0e37e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/FactoryFindTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,6 +23,9 @@ package stream; +import static jaxp.library.JAXPTestUtilities.getSystemProperty; +import static jaxp.library.JAXPTestUtilities.runWithAllPerm; + import java.io.File; import java.io.FileInputStream; import java.io.FileNotFoundException; @@ -36,33 +39,38 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; import org.testng.Assert; -import org.testng.annotations.BeforeClass; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.FactoryFindTest + * @run testng/othervm stream.FactoryFindTest * @summary Test SaTX factory using factory property and using ContextClassLoader. */ +@Listeners({jaxp.library.FilePolicy.class}) public class FactoryFindTest { boolean myClassLoaderUsed = false; final static String FACTORY_KEY = "javax.xml.stream.XMLInputFactory"; - @BeforeClass - public void setup(){ - policy.PolicyUtil.changePolicy(getClass().getResource("FactoryFindTest.policy").getFile()); - } +// @BeforeClass +// public void setup(){ +// policy.PolicyUtil.changePolicy(getClass().getResource("FactoryFindTest.policy").getFile()); +// } - @Test + @Test(enabled=false) // due to 8156508 public void testFactoryFindUsingStaxProperties() { // If property is defined, will take precendence so this test // is ignored :( - if (System.getProperty(FACTORY_KEY) != null) { + if (getSystemProperty(FACTORY_KEY) != null) { return; } Properties props = new Properties(); - String configFile = System.getProperty("java.home") + File.separator + "lib" + File.separator + "stax.properties"; + String configFile = getSystemProperty("java.home") + File.separator + "lib" + File.separator + "stax.properties"; File f = new File(configFile); if (f.exists()) { @@ -96,17 +104,18 @@ public class FactoryFindTest { @Test public void testFactoryFind() { try { - // System.setProperty("jaxp.debug", "true"); + // setSystemProperty("jaxp.debug", "true"); XMLInputFactory factory = XMLInputFactory.newInstance(); Assert.assertTrue(factory.getClass().getClassLoader() == null); - Thread.currentThread().setContextClassLoader(null); + runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(null)); factory = XMLInputFactory.newInstance(); Assert.assertTrue(factory.getClass().getClassLoader() == null); - Thread.currentThread().setContextClassLoader(new MyClassLoader()); + runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(new MyClassLoader())); factory = XMLInputFactory.newInstance(); + // because it's decided by having sm or not in FactoryFind code if (System.getSecurityManager() == null) Assert.assertTrue(myClassLoaderUsed); else @@ -115,11 +124,11 @@ public class FactoryFindTest { XMLOutputFactory ofactory = XMLOutputFactory.newInstance(); Assert.assertTrue(ofactory.getClass().getClassLoader() == null); - Thread.currentThread().setContextClassLoader(null); + runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(null)); ofactory = XMLOutputFactory.newInstance(); Assert.assertTrue(ofactory.getClass().getClassLoader() == null); - Thread.currentThread().setContextClassLoader(new MyClassLoader()); + runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(new MyClassLoader())); ofactory = XMLOutputFactory.newInstance(); if (System.getSecurityManager() == null) Assert.assertTrue(myClassLoaderUsed); @@ -142,3 +151,4 @@ public class FactoryFindTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java index 5475cba5d6e..44708b22e3e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/IgnoreExternalDTDTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -30,11 +30,17 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.IgnoreExternalDTDTest + * @run testng/othervm stream.IgnoreExternalDTDTest * @summary Test feature ignore-external-dtd. */ +@Listeners({jaxp.library.FilePolicy.class}) public class IgnoreExternalDTDTest { final static String FACTORY_KEY = "javax.xml.stream.XMLInputFactory"; @@ -71,3 +77,4 @@ public class IgnoreExternalDTDTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java index 1234a37a803..44a7dea91c3 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/ProcessingInstructionTest/ProcessingInstructionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -30,11 +30,17 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.ProcessingInstructionTest.ProcessingInstructionTest + * @run testng/othervm stream.ProcessingInstructionTest.ProcessingInstructionTest * @summary Test XMLStreamReader parses Processing Instruction. */ +@Listeners({jaxp.library.BasePolicy.class}) public class ProcessingInstructionTest { @Test @@ -61,3 +67,4 @@ public class ProcessingInstructionTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java index d7f9f485fc2..0568bca28bf 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/StreamReaderDelegateTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -38,11 +38,17 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.util.StreamReaderDelegate; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.StreamReaderDelegateTest + * @run testng/othervm stream.StreamReaderDelegateTest * @summary Test StreamReaderDelegate. */ +@Listeners({jaxp.library.FilePolicy.class}) public class StreamReaderDelegateTest { /** @@ -377,3 +383,4 @@ public class StreamReaderDelegateTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java index 6c760382c58..75bb79566f2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventLocationTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -28,11 +28,17 @@ import javax.xml.stream.XMLEventFactory; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLEventLocationTest + * @run testng/othervm stream.XMLEventLocationTest * @summary Test XMLEvent Location. */ +@Listeners({jaxp.library.BasePolicy.class}) public class XMLEventLocationTest { @Test @@ -76,3 +82,4 @@ public class XMLEventLocationTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java index 0d554808f79..5ac6f1a221a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6489890.java @@ -29,12 +29,18 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6489890 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLEventReaderTest.Bug6489890 + * @run testng/othervm stream.XMLEventReaderTest.Bug6489890 * @summary Test XMLEventReader's initial state is an undefined state, and nextEvent() is START_DOCUMENT. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6489890 { @Test @@ -71,3 +77,4 @@ public class Bug6489890 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java index 566186c4c33..79533441e96 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6555001.java @@ -22,6 +22,7 @@ */ package stream.XMLEventReaderTest; +import java.io.FilePermission; import java.io.StringReader; import javax.xml.stream.XMLEventReader; @@ -29,76 +30,90 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.events.EntityReference; import javax.xml.stream.events.XMLEvent; +import jaxp.library.JAXPTestUtilities; + import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6555001 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLEventReaderTest.Bug6555001 + * @run testng/othervm stream.XMLEventReaderTest.Bug6555001 * @summary Test StAX parser replaces the entity reference as setting. */ +@Listeners({ jaxp.library.BasePolicy.class }) public class Bug6555001 { - private static final String XML = "" + "'>" + "]>" - + "&def;&undef;"; + private static final String XML = "" + + "'>" + "]>" + "&def;&undef;"; @Test public void testReplacing() throws Exception { - XMLInputFactory factory = XMLInputFactory.newInstance(); - factory.setProperty("javax.xml.stream.isReplacingEntityReferences", true); + JAXPTestUtilities.tryRunWithTmpPermission(() -> { + XMLInputFactory factory = XMLInputFactory.newInstance(); + factory.setProperty("javax.xml.stream.isReplacingEntityReferences", true); - StringReader sr = new StringReader(XML); - XMLEventReader reader = factory.createXMLEventReader(sr); + StringReader sr = new StringReader(XML); + XMLEventReader reader = factory.createXMLEventReader(sr); - boolean sawUndef = false; - boolean sawDef = false; + boolean sawUndef = false; + boolean sawDef = false; - while (reader.hasNext()) { - XMLEvent event = reader.nextEvent(); - // System.out.println("Event: " + event); - if (event.isEntityReference()) { - EntityReference ref = (EntityReference) event; - if ("def".equals(ref.getName())) { - sawDef = true; - } else if ("undef".equals(ref.getName())) { - sawUndef = true; - } else { - throw new IllegalArgumentException("Unexpected entity name"); + while (reader.hasNext()) { + XMLEvent event = reader.nextEvent(); + // System.out.println("Event: " + event); + if (event.isEntityReference()) { + EntityReference ref = (EntityReference) event; + if ("def".equals(ref.getName())) { + sawDef = true; + } else if ("undef".equals(ref.getName())) { + sawUndef = true; + } else { + throw new IllegalArgumentException("Unexpected entity name"); + } } } - } - Assert.assertEquals(false, sawDef); - Assert.assertEquals(true, sawUndef); - reader.close(); + Assert.assertEquals(false, sawDef); + Assert.assertEquals(true, sawUndef); + reader.close(); + }, new FilePermission("/tmp/this/does/not/exist/but/that/is/ok", "read")); } @Test public void testNotReplacing() throws Exception { - XMLInputFactory factory = XMLInputFactory.newInstance(); - factory.setProperty("javax.xml.stream.isReplacingEntityReferences", false); + JAXPTestUtilities.tryRunWithTmpPermission(() -> { + XMLInputFactory factory = XMLInputFactory.newInstance(); + factory.setProperty("javax.xml.stream.isReplacingEntityReferences", false); - StringReader sr = new StringReader(XML); - XMLEventReader reader = factory.createXMLEventReader(sr); + StringReader sr = new StringReader(XML); + XMLEventReader reader = factory.createXMLEventReader(sr); - boolean sawUndef = false; - boolean sawDef = false; + boolean sawUndef = false; + boolean sawDef = false; - while (reader.hasNext()) { - XMLEvent event = reader.nextEvent(); - // System.out.println("Event: " + event); - if (event.isEntityReference()) { - EntityReference ref = (EntityReference) event; - if ("def".equals(ref.getName())) { - sawDef = true; - } else if ("undef".equals(ref.getName())) { - sawUndef = true; - } else { - throw new IllegalArgumentException("Unexpected entity name"); + while (reader.hasNext()) { + XMLEvent event = reader.nextEvent(); + // System.out.println("Event: " + event); + if (event.isEntityReference()) { + EntityReference ref = (EntityReference) event; + if ("def".equals(ref.getName())) { + sawDef = true; + } else if ("undef".equals(ref.getName())) { + sawUndef = true; + } else { + throw new IllegalArgumentException("Unexpected entity name"); + } } } - } - Assert.assertEquals(true, sawDef); - Assert.assertEquals(true, sawUndef); - reader.close(); + Assert.assertEquals(true, sawDef); + Assert.assertEquals(true, sawUndef); + reader.close(); + }, new FilePermission("/tmp/this/does/not/exist/but/that/is/ok", "read")); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java index 319c50ad7fa..86f2437fc85 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6586466Test.java @@ -23,6 +23,7 @@ package stream.XMLEventReaderTest; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.testng.Assert; import java.io.ByteArrayInputStream; @@ -33,9 +34,14 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.XMLEvent; /* + * @test * @bug 6586466 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLEventReaderTest.Bug6586466Test + * @run testng/othervm stream.XMLEventReaderTest.Bug6586466Test * @summary Test XMLEventReader.nextTag() shall update internal event state. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6586466Test { @Test @@ -60,3 +66,4 @@ public class Bug6586466Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java index 88d0be0c17d..43e8a6165f1 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6613059Test.java @@ -23,6 +23,7 @@ package stream.XMLEventReaderTest; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.testng.Assert; import javax.xml.namespace.QName; @@ -33,9 +34,14 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.XMLEvent; /* + * @test * @bug 6613059 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLEventReaderTest.Bug6613059Test + * @run testng/othervm stream.XMLEventReaderTest.Bug6613059Test * @summary Test XMLEventReader.nextTag() shall update internal event state, same as 6586466. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6613059Test { @Test @@ -83,3 +89,4 @@ public class Bug6613059Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java index 188d003621a..07309465f99 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6668115Test.java @@ -30,12 +30,18 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLOutputFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6668115 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLEventReaderTest.Bug6668115Test + * @run testng/othervm stream.XMLEventReaderTest.Bug6668115Test * @summary Test XMLEventReader.getElementText() shall update last event even if no peek. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6668115Test { public java.io.File input; @@ -94,3 +100,4 @@ public class Bug6668115Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java index 16bf959dc45..a89b976b618 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug6846133Test.java @@ -26,12 +26,18 @@ package stream.XMLEventReaderTest; import javax.xml.stream.XMLStreamException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6846133 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLEventReaderTest.Bug6846133Test + * @run testng/othervm stream.XMLEventReaderTest.Bug6846133Test * @summary Test method getDocumentTypeDeclaration() of DTD Event returns a valid value. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6846133Test { private static final String xml = "" + "

I am some simple html

"; @@ -77,3 +83,4 @@ public class Bug6846133Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java index f973b3bf33d..2ac01596c50 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Bug8153781.java @@ -31,15 +31,21 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import com.sun.org.apache.xerces.internal.impl.XMLEntityManager; /* + * @test * @bug 8153781 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLEventReaderTest.Bug8153781 + * @run testng/othervm stream.XMLEventReaderTest.Bug8153781 * @summary Test if method skipDTD of class XMLDTDScannerImpl will correctly skip the DTD section, * even if a call to XMLEntityScanner.scanData for skipping to the closing ']' returns true. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug8153781 { public static int DOCTYPE_SECTION_LENGTH = XMLEntityManager.DEFAULT_BUFFER_SIZE * 2; public static int DOCUMENT_LENGTH = DOCTYPE_SECTION_LENGTH + 4096; @@ -88,3 +94,4 @@ public class Bug8153781 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java index 161b6e6dcdb..4c6e0c0ffb7 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventReaderTest/Issue40Test.java @@ -32,11 +32,17 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLEventReaderTest.Issue40Test + * @run testng/othervm stream.XMLEventReaderTest.Issue40Test * @summary Test XMLEventReader.getElementText() works after calling peek(). */ +@Listeners({jaxp.library.FilePolicy.class}) public class Issue40Test { public java.io.File input; @@ -94,3 +100,4 @@ public class Issue40Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java index 1805e9922f0..d96eea1a1b4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/ReaderToWriterTest.java @@ -40,11 +40,17 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLEventWriterTest.ReaderToWriterTest + * @run testng/othervm stream.XMLEventWriterTest.ReaderToWriterTest * @summary Test XMLEventWriter. */ +@Listeners({jaxp.library.FilePolicy.class}) public class ReaderToWriterTest { private static final XMLEventFactory XML_EVENT_FACTORY = XMLEventFactory.newInstance(); @@ -208,3 +214,4 @@ public class ReaderToWriterTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java index ab076f27d6e..e04a349d92e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLEventWriterTest/XMLEventWriterTest.java @@ -36,11 +36,17 @@ import javax.xml.stream.events.XMLEvent; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLEventWriterTest.XMLEventWriterTest + * @run testng/othervm stream.XMLEventWriterTest.XMLEventWriterTest * @summary Test XMLEventWriter. */ +@Listeners({jaxp.library.FilePolicy.class}) public class XMLEventWriterTest { /** @@ -150,3 +156,4 @@ public class XMLEventWriterTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java index 17604ac6d09..3ba9ca7776b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6756677Test.java @@ -23,30 +23,42 @@ package stream.XMLInputFactoryTest; +import static jaxp.library.JAXPTestUtilities.runWithTmpPermission; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + +import java.util.PropertyPermission; + import javax.xml.stream.XMLInputFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6756677 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @compile MyInputFactory.java + * @run testng/othervm -DrunSecMngr=true stream.XMLInputFactoryTest.Bug6756677Test + * @run testng/othervm stream.XMLInputFactoryTest.Bug6756677Test * @summary Test XMLInputFactory.newFactory(String factoryId, ClassLoader classLoader). */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6756677Test { @Test public void testNewInstance() { String myFactory = "stream.XMLInputFactoryTest.MyInputFactory"; try { - System.setProperty("MyInputFactory", myFactory); - XMLInputFactory xif = XMLInputFactory.newInstance("MyInputFactory", null); + setSystemProperty("MyInputFactory", myFactory); + XMLInputFactory xif = runWithTmpPermission(() -> XMLInputFactory.newInstance("MyInputFactory", null), + new PropertyPermission("MyInputFactory", "read")); System.out.println(xif.getClass().getName()); Assert.assertTrue(xif.getClass().getName().equals(myFactory)); } catch (UnsupportedOperationException oe) { Assert.fail(oe.getMessage()); } - } // newFactory was added in StAX 1.2 @@ -55,36 +67,22 @@ public class Bug6756677Test { String myFactory = "stream.XMLInputFactoryTest.MyInputFactory"; ClassLoader cl = null; try { - System.setProperty("MyInputFactory", myFactory); - XMLInputFactory xif = XMLInputFactory.newFactory("MyInputFactory", cl); + setSystemProperty("MyInputFactory", myFactory); + XMLInputFactory xif = runWithTmpPermission(() -> XMLInputFactory.newFactory("MyInputFactory", cl), + new PropertyPermission("MyInputFactory", "read")); System.out.println(xif.getClass().getName()); Assert.assertTrue(xif.getClass().getName().equals(myFactory)); } catch (UnsupportedOperationException oe) { Assert.fail(oe.getMessage()); } - } - String Temp_Result = ""; - boolean PASSED = true; - boolean FAILED = false; String XMLInputFactoryClassName = "com.sun.xml.internal.stream.XMLInputFactoryImpl"; String XMLInputFactoryID = "javax.xml.stream.XMLInputFactory"; ClassLoader CL = null; - // jaxp-test jaxp-product-tests javax.xml.jaxp14.ptests.FactoryTest - @Test - public void test() { - if (!test29()) { - Assert.fail(Temp_Result); - } - if (!test31()) { - Assert.fail(Temp_Result); - } - } - /* * test for XMLInputFactory.newInstance(java.lang.String factoryClassName, * java.lang.ClassLoader classLoader) classloader is null and @@ -93,27 +91,10 @@ public class Bug6756677Test { * XMLInputFactory */ @Test - public boolean test29() { - try { - System.setProperty(XMLInputFactoryID, XMLInputFactoryClassName); - XMLInputFactory xif = XMLInputFactory.newInstance(XMLInputFactoryID, CL); - if (xif instanceof XMLInputFactory) { - System.out.println(" test29() passed"); - return PASSED; - } else { - System.out.println(" test29() failed"); - Temp_Result = "test29() failed: xif not an instance of XMLInputFactory "; - return FAILED; - } - } catch (javax.xml.stream.FactoryConfigurationError fce) { - System.out.println("Failed : FactoryConfigurationError in test29 " + fce); - Temp_Result = "test29() failed "; - return FAILED; - } catch (Exception e) { - System.out.println("Failed : Exception in test29 " + e); - Temp_Result = "test29() failed "; - return FAILED; - } + public void test29() throws Exception { + setSystemProperty(XMLInputFactoryID, XMLInputFactoryClassName); + XMLInputFactory xif = XMLInputFactory.newInstance(XMLInputFactoryID, CL); + Assert.assertTrue(xif instanceof XMLInputFactory, "xif should be an instance of XMLInputFactory"); } /* @@ -124,28 +105,12 @@ public class Bug6756677Test { * newInstance of XMLInputFactory */ @Test - public boolean test31() { - try { - Bug6756677Test test3 = new Bug6756677Test(); - ClassLoader cl = (test3.getClass()).getClassLoader(); - System.setProperty(XMLInputFactoryID, XMLInputFactoryClassName); - XMLInputFactory xif = XMLInputFactory.newInstance(XMLInputFactoryID, cl); - if (xif instanceof XMLInputFactory) { - System.out.println(" test31() passed"); - return PASSED; - } else { - System.out.println(" test31() failed"); - Temp_Result = "test31() failed: xif not an instance of XMLInputFactory "; - return FAILED; - } - } catch (javax.xml.stream.FactoryConfigurationError fce) { - System.out.println("Failed : FactoryConfigurationError in test31 " + fce); - Temp_Result = "test31() failed "; - return FAILED; - } catch (Exception e) { - System.out.println("Failed : Exception in test31 " + e); - Temp_Result = "test31() failed "; - return FAILED; - } + public void test31() throws Exception { + Bug6756677Test test3 = new Bug6756677Test(); + ClassLoader cl = (test3.getClass()).getClassLoader(); + setSystemProperty(XMLInputFactoryID, XMLInputFactoryClassName); + XMLInputFactory xif = XMLInputFactory.newInstance(XMLInputFactoryID, cl); + Assert.assertTrue(xif instanceof XMLInputFactory, "xif should be an instance of XMLInputFactory"); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java index 36cc136dadd..d2e29713e2b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/Bug6909759Test.java @@ -29,12 +29,18 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6909759 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLInputFactoryTest.Bug6909759Test + * @run testng/othervm stream.XMLInputFactoryTest.Bug6909759Test * @summary Test createXMLStreamReader with StreamSource. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6909759Test { @@ -60,3 +66,4 @@ public class Bug6909759Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java index 448a854d45f..dea8f732b46 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/IssueTracker38.java @@ -31,11 +31,17 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.sax.SAXSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLInputFactoryTest.IssueTracker38 + * @run testng/othervm stream.XMLInputFactoryTest.IssueTracker38 * @summary Test createXMLEventReader from DOM or SAX source is unsupported. */ +@Listeners({jaxp.library.BasePolicy.class}) public class IssueTracker38 { @Test @@ -86,3 +92,4 @@ public class IssueTracker38 { } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java index 551d3f0f8d2..d9db7a08344 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLInputFactoryTest/MyInputFactory.java @@ -158,3 +158,4 @@ public class MyInputFactory extends javax.xml.stream.XMLInputFactory { throw new UnsupportedOperationException("Not supported yet."); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java index 15afdafd751..fa764c154a5 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/Bug6846132Test.java @@ -29,13 +29,19 @@ import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.sax.SAXResult; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 6846132 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLOutputFactoryTest.Bug6846132Test + * @run testng/othervm stream.XMLOutputFactoryTest.Bug6846132Test * @summary Test createXMLStreamWriter with SAXResult won't throw a NullPointerException. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6846132Test { @Test @@ -83,3 +89,4 @@ public class Bug6846132Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java index 884c9235d24..8fec5b107da 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/DuplicateNSDeclarationTest.java @@ -31,11 +31,17 @@ import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.stream.StreamResult; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLOutputFactoryTest.DuplicateNSDeclarationTest + * @run testng/othervm stream.XMLOutputFactoryTest.DuplicateNSDeclarationTest * @summary Test the writing of duplicate namespace declarations when IS_REPAIRING_NAMESPACES is ture. */ +@Listeners({jaxp.library.BasePolicy.class}) public class DuplicateNSDeclarationTest { @Test @@ -77,3 +83,4 @@ public class DuplicateNSDeclarationTest { Assert.assertEquals(EXPECTED_OUTPUT, buffer.toString()); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java index 96d928c6572..e44a20c3138 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLOutputFactoryTest/StreamResultTest.java @@ -23,6 +23,8 @@ package stream.XMLOutputFactoryTest; +import static jaxp.library.JAXPTestUtilities.getSystemProperty; + import java.io.ByteArrayOutputStream; import javax.xml.stream.XMLEventFactory; @@ -33,11 +35,17 @@ import javax.xml.transform.stax.StAXResult; import javax.xml.transform.stream.StreamResult; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLOutputFactoryTest.StreamResultTest + * @run testng/othervm stream.XMLOutputFactoryTest.StreamResultTest * @summary Test create XMLWriter with variant Result. */ +@Listeners({jaxp.library.BasePolicy.class}) public class StreamResultTest { @Test @@ -85,7 +93,7 @@ public class StreamResultTest { @Test public void testEventWriterWithStAXResultNStreamWriter() { String encoding = ""; - if (System.getProperty("file.encoding").equals("UTF-8")) { + if (getSystemProperty("file.encoding").equals("UTF-8")) { encoding = " encoding=\"UTF-8\""; } final String EXPECTED_OUTPUT = ""; @@ -114,7 +122,7 @@ public class StreamResultTest { @Test public void testEventWriterWithStAXResultNEventWriter() { String encoding = ""; - if (System.getProperty("file.encoding").equals("UTF-8")) { + if (getSystemProperty("file.encoding").equals("UTF-8")) { encoding = " encoding=\"UTF-8\""; } final String EXPECTED_OUTPUT = ""; @@ -154,3 +162,4 @@ public class StreamResultTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java index 1a0780398d6..12e7e9a74d9 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLResolverTest/XMLResolverTest.java @@ -34,11 +34,17 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLResolverTest.XMLResolverTest + * @run testng/othervm stream.XMLResolverTest.XMLResolverTest * @summary Test XMLResolver. */ +@Listeners({jaxp.library.FilePolicy.class}) public class XMLResolverTest { @Test @@ -90,3 +96,4 @@ public class XMLResolverTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java index 3e0dda7d042..403c609db91 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamExceptionTest/ExceptionTest.java @@ -28,11 +28,17 @@ import java.io.IOException; import javax.xml.stream.XMLStreamException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamExceptionTest.ExceptionTest + * @run testng/othervm stream.XMLStreamExceptionTest.ExceptionTest * @summary Test XMLStreamException contains the message of the wrapped exception. */ +@Listeners({jaxp.library.BasePolicy.class}) public class ExceptionTest { @Test @@ -47,3 +53,4 @@ public class ExceptionTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java index 1aa221969d3..5ab83c987f8 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481615.java @@ -30,12 +30,18 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6481615 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamFilterTest.Bug6481615 + * @run testng/othervm stream.XMLStreamFilterTest.Bug6481615 * @summary Test Filtered XMLStreamReader can return the event type if current state is START_ELEMENT. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6481615 { static final String XML = "" + ""; @@ -62,3 +68,4 @@ public class Bug6481615 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java index 9b3273ac09e..ea79d530b11 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/Bug6481678.java @@ -35,12 +35,18 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6481678 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamFilterTest.Bug6481678 + * @run testng/othervm stream.XMLStreamFilterTest.Bug6481678 * @summary Test Filtered XMLStreamReader parses namespace correctly. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6481678 { String rootElement = "fruits"; @@ -219,3 +225,4 @@ public class Bug6481678 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java index 3df73ae0472..c573a8dfb6b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTest.java @@ -30,11 +30,17 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamFilterTest.HasNextTest + * @run testng/othervm stream.XMLStreamFilterTest.HasNextTest * @summary Test Filtered XMLStreamReader hasNext() always return the correct value if repeat to call it. */ +@Listeners({jaxp.library.FilePolicy.class}) public class HasNextTest { private static String INPUT_FILE = "HasNextTest.xml"; @@ -139,3 +145,4 @@ public class HasNextTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java index 1fd6e20fe08..19748b3afdb 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamFilterTest/HasNextTypeFilter.java @@ -47,3 +47,4 @@ public class HasNextTypeFilter implements EventFilter, StreamFilter { return types[r.getEventType()]; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java index b253e95b1b0..3fa5bec18e7 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BOMTest.java @@ -27,12 +27,18 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6218794 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.BOMTest + * @run testng/othervm stream.XMLStreamReaderTest.BOMTest * @summary Test XMLStreamReader parses BOM UTF-8 and BOM UTF-16 big endian stream. */ +@Listeners({jaxp.library.FilePolicy.class}) public class BOMTest { // UTF-8 BOM test file private static final String INPUT_FILE1 = "UTF8-BOM.xml.data"; @@ -61,3 +67,4 @@ public class BOMTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java index c73348c744c..a981ba10c77 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6388460.java @@ -35,13 +35,19 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; /* + * @test * @bug 6388460 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.Bug6388460 + * @run testng/othervm stream.XMLStreamReaderTest.Bug6388460 * @summary Test StAX parser can parse UTF-16 wsdl. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6388460 { @Test @@ -70,3 +76,4 @@ public class Bug6388460 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java index c22dde736de..cd083359e1d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6472982Test.java @@ -30,12 +30,18 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6472982 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.Bug6472982Test + * @run testng/othervm stream.XMLStreamReaderTest.Bug6472982Test * @summary Test XMLStreamReader.getNamespaceContext().getPrefix("") won't throw IllegalArgumentException. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6472982Test { String namespaceURI = "foobar.com"; String rootElement = "foo"; @@ -73,3 +79,4 @@ public class Bug6472982Test { return sbuffer.toString(); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java index b9ffde7fefd..5a4c0be28a7 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6767322Test.java @@ -29,12 +29,18 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6767322 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.Bug6767322Test + * @run testng/othervm stream.XMLStreamReaderTest.Bug6767322Test * @summary Test XMLStreamReader.getVersion() returns null if a version isn't declared. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6767322Test { private static final String INPUT_FILE = "Bug6767322.xml"; @@ -70,3 +76,4 @@ public class Bug6767322Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java index 2480b727d90..cfe1ade63ad 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Bug6847819Test.java @@ -23,6 +23,7 @@ package stream.XMLStreamReaderTest; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.testng.Assert; import java.io.StringReader; @@ -31,9 +32,14 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamException; /* + * @test * @bug 6847819 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.Bug6847819Test + * @run testng/othervm stream.XMLStreamReaderTest.Bug6847819Test * @summary Test StAX parser shall throw XMLStreamException for illegal xml declaration. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6847819Test { @Test @@ -63,3 +69,4 @@ public class Bug6847819Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java index 15e01a21896..a2cf3c2ae9b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/BugTest.java @@ -30,11 +30,17 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.BugTest + * @run testng/othervm stream.XMLStreamReaderTest.BugTest * @summary Test StAX parser can parse xml without declaration. */ +@Listeners({jaxp.library.BasePolicy.class}) public class BugTest { @Test @@ -45,3 +51,4 @@ public class BugTest { Assert.assertEquals(XMLStreamConstants.START_DOCUMENT, r.getEventType()); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java index 6ce3bd4568d..10db94b8203 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DefaultAttributeTest.java @@ -34,11 +34,17 @@ import javax.xml.stream.events.StartElement; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.DefaultAttributeTest + * @run testng/othervm stream.XMLStreamReaderTest.DefaultAttributeTest * @summary Test StAX parses namespace and attribute. */ +@Listeners({jaxp.library.FilePolicy.class}) public class DefaultAttributeTest { private static final String INPUT_FILE = "ExternalDTD.xml"; @@ -102,3 +108,4 @@ public class DefaultAttributeTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java index df1ced6bb61..493d6b31545 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/DoubleXmlnsTest.java @@ -30,11 +30,17 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.DoubleXmlnsTest + * @run testng/othervm stream.XMLStreamReaderTest.DoubleXmlnsTest * @summary Test double namespaces and nested namespaces. */ +@Listeners({jaxp.library.BasePolicy.class}) public class DoubleXmlnsTest { @Test @@ -112,3 +118,4 @@ public class DoubleXmlnsTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java index 06dc2665a7f..1f447928aa7 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IsValidatingTest.java @@ -28,12 +28,18 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6440324 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.IsValidatingTest + * @run testng/othervm stream.XMLStreamReaderTest.IsValidatingTest * @summary Test StAX can accept non-existent DTD if IS_VALIDATING if false. */ +@Listeners({jaxp.library.FilePolicy.class}) public class IsValidatingTest { /** @@ -159,3 +165,4 @@ public class IsValidatingTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java index 082aa87d0c4..9ef51e64d02 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue44Test.java @@ -27,12 +27,18 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6631262 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.Issue44Test + * @run testng/othervm stream.XMLStreamReaderTest.Issue44Test * @summary Test XMLStreamReader.getName() shall throw IllegalStateException if current event is not start/end element. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Issue44Test { @Test @@ -53,3 +59,4 @@ public class Issue44Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java index 7d868423677..ad2d8dc0293 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Issue47Test.java @@ -30,12 +30,18 @@ import javax.xml.stream.XMLStreamReader; import org.testng.Assert; import org.testng.AssertJUnit; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6631265 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.Issue47Test + * @run testng/othervm stream.XMLStreamReaderTest.Issue47Test * @summary Test XMLStreamReader.standaloneSet() presents if input document has a value for "standalone" attribute in xml declaration. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Issue47Test { @Test @@ -83,3 +89,4 @@ public class Issue47Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java index dd0fb1a0bf9..b259576202c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker24.java @@ -29,11 +29,17 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.IssueTracker24 + * @run testng/othervm stream.XMLStreamReaderTest.IssueTracker24 * @summary Test no prefix is represented by "", not null. */ +@Listeners({jaxp.library.BasePolicy.class}) public class IssueTracker24 { @Test @@ -55,3 +61,4 @@ public class IssueTracker24 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java index 1aa8d6b4c7c..d98e249c48e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker35.java @@ -30,11 +30,17 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.IssueTracker35 + * @run testng/othervm stream.XMLStreamReaderTest.IssueTracker35 * @summary Test StAX parse xsd document including external DTD. */ +@Listeners({jaxp.library.FilePolicy.class}) public class IssueTracker35 { @Test @@ -53,3 +59,4 @@ public class IssueTracker35 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java index c616a3aa669..33cc4b87574 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/IssueTracker70.java @@ -31,11 +31,17 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.IssueTracker70 + * @run testng/othervm stream.XMLStreamReaderTest.IssueTracker70 * @summary Test it can retrieve attribute with null or empty name space. */ +@Listeners({jaxp.library.FilePolicy.class}) public class IssueTracker70 { static private final File testFile = new File(IssueTracker70.class.getResource("IssueTracker70.xml").getFile()); @@ -70,3 +76,4 @@ public class IssueTracker70 { Assert.assertNotNull(value, "should have attribute value"); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java index 50dfed8a487..3505fd59f50 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req5Test.java @@ -28,11 +28,17 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.Jsr173MR1Req5Test + * @run testng/othervm stream.XMLStreamReaderTest.Jsr173MR1Req5Test * @summary Test XMLStreamReader parses namespace declaration within element when NamespaceAware turns off and on. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Jsr173MR1Req5Test { private static final String INPUT_FILE1 = "Jsr173MR1Req5.xml"; @@ -85,3 +91,4 @@ public class Jsr173MR1Req5Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java index d1c007402ff..b6e703e93f8 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/Jsr173MR1Req8Test.java @@ -28,11 +28,17 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.Jsr173MR1Req8Test + * @run testng/othervm stream.XMLStreamReaderTest.Jsr173MR1Req8Test * @summary Test XMLStreamReader parses attribute with namespace aware. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Jsr173MR1Req8Test { private static final String INPUT_FILE1 = "Jsr173MR1Req8.xml"; @@ -63,3 +69,4 @@ public class Jsr173MR1Req8Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java index 5c9440d0998..2ea93e90950 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/NamespaceTest.java @@ -32,11 +32,17 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.NamespaceTest + * @run testng/othervm stream.XMLStreamReaderTest.NamespaceTest * @summary Test StAX parser processes namespace. */ +@Listeners({jaxp.library.BasePolicy.class}) public class NamespaceTest { String namespaceURI = "foobar.com"; @@ -147,3 +153,4 @@ public class NamespaceTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java index cbaa37863cf..cc01f89ebda 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/StreamReaderTest.java @@ -28,11 +28,17 @@ import javax.xml.stream.XMLStreamConstants; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.StreamReaderTest + * @run testng/othervm stream.XMLStreamReaderTest.StreamReaderTest * @summary Test XMLStreamReader.hasName() returns false for ENTITY_REFERENCE. */ +@Listeners({jaxp.library.FilePolicy.class}) public class StreamReaderTest { /** @@ -56,3 +62,4 @@ public class StreamReaderTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java index 1a2e325fdd2..ca51c6e1094 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/SupportDTDTest.java @@ -38,9 +38,14 @@ import javax.xml.stream.events.EntityReference; import javax.xml.stream.events.XMLEvent; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.SupportDTDTest + * @run testng/othervm stream.XMLStreamReaderTest.SupportDTDTest * @summary Test SUPPORT_DTD and IS_REPLACING_ENTITY_REFERENCES. */ @@ -72,6 +77,7 @@ import org.testng.annotations.Test; * The current jaxp implementation actually throws a nullpointexception. A better error message could be used. * */ +@Listeners({jaxp.library.FilePolicy.class}) public class SupportDTDTest { final boolean DEBUG = false; final String _file = "ExternalDTD.xml"; @@ -282,3 +288,4 @@ public class SupportDTDTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java index 5befcb70609..216bf0d6536 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/VoiceXMLDTDTest.java @@ -27,11 +27,17 @@ import javax.xml.stream.XMLInputFactory; import javax.xml.stream.XMLStreamReader; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.VoiceXMLDTDTest + * @run testng/othervm stream.XMLStreamReaderTest.VoiceXMLDTDTest * @summary Test parsing Voice XML DTD. */ +@Listeners({jaxp.library.FilePolicy.class}) public class VoiceXMLDTDTest { private static final String INPUT_FILE1 = "voicexml.xml"; @@ -52,3 +58,4 @@ public class VoiceXMLDTDTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java index ac98279175d..f69166a2be8 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamReaderTest/XML11Test.java @@ -27,11 +27,17 @@ import javax.xml.stream.XMLEventReader; import javax.xml.stream.XMLInputFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamReaderTest.XML11Test + * @run testng/othervm stream.XMLStreamReaderTest.XML11Test * @summary Test parsing xml 1.1. */ +@Listeners({jaxp.library.FilePolicy.class}) public class XML11Test { @Test @@ -48,3 +54,4 @@ public class XML11Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java index 7a426c93f8d..811f0bf1173 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/AttributeEscapeTest.java @@ -34,13 +34,19 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.SAXException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.AttributeEscapeTest + * @run testng/othervm stream.XMLStreamWriterTest.AttributeEscapeTest * @summary Test XMLStreamWriter shall escape the illegal characters. */ +@Listeners({jaxp.library.BasePolicy.class}) public class AttributeEscapeTest { /** @@ -97,3 +103,4 @@ public class AttributeEscapeTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java index b3148c60502..595c58d44a2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6452107.java @@ -31,12 +31,18 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6452107 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.Bug6452107 + * @run testng/othervm stream.XMLStreamWriterTest.Bug6452107 * @summary Test StAX can write ISO-8859-1 encoding XML. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6452107 { /** @@ -58,3 +64,4 @@ public class Bug6452107 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java index f34b559f86c..f8cb256404c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6600882Test.java @@ -29,12 +29,18 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamWriter; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6600882 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.Bug6600882Test + * @run testng/othervm stream.XMLStreamWriterTest.Bug6600882Test * @summary Test toString(), hashCode() of XMLStreamWriter . */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6600882Test { @@ -53,3 +59,4 @@ public class Bug6600882Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java index e52fb4acbd4..25cd9327513 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug6675332Test.java @@ -30,14 +30,20 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import util.BaseStAXUT; /* + * @test * @bug 6675332 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.Bug6675332Test + * @run testng/othervm stream.XMLStreamWriterTest.Bug6675332Test * @summary Test XMLStreamWriter writeAttribute when IS_REPAIRING_NAMESPACES is true. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6675332Test extends BaseStAXUT { private static final XMLOutputFactory XML_OUTPUT_FACTORY = XMLOutputFactory.newInstance(); @@ -158,3 +164,4 @@ public class Bug6675332Test extends BaseStAXUT { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java index 7c1e50264d5..a157d7c84a1 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/Bug7037352Test.java @@ -30,12 +30,18 @@ import javax.xml.stream.XMLStreamWriter; import javax.xml.transform.stream.StreamResult; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 7037352 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.Bug7037352Test + * @run testng/othervm stream.XMLStreamWriterTest.Bug7037352Test * @summary Test XMLStreamWriter.getNamespaceContext().getPrefix with XML_NS_URI and XMLNS_ATTRIBUTE_NS_URI. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug7037352Test { @Test @@ -59,3 +65,4 @@ public class Bug7037352Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java index f59ef011018..929cbda273f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DOMUtil.java @@ -221,3 +221,4 @@ public class DOMUtil { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java index d2c2491e36e..466a51ce506 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/DomUtilTest.java @@ -41,18 +41,23 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Element; import org.w3c.dom.Node; import org.xml.sax.SAXException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.DomUtilTest + * @run testng/othervm stream.XMLStreamWriterTest.DomUtilTest * @summary Test XMLStreamWriter writes a soap message. */ +@Listeners({jaxp.library.FilePolicy.class}) public class DomUtilTest { private XMLOutputFactory staxOut; - final File folder = new File(System.getProperty("tempdir") + "/classes/soapmessages"); private static final String INPUT_FILE1 = "message_12.xml"; public void setup() { @@ -119,3 +124,4 @@ public class DomUtilTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java index b813ef5607c..be4cc62d4a3 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EmptyElementTest.java @@ -29,11 +29,17 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamWriter; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.EmptyElementTest + * @run testng/othervm stream.XMLStreamWriterTest.EmptyElementTest * @summary Test XMLStreamWriter writes namespace and attribute after writeEmptyElement. */ +@Listeners({jaxp.library.BasePolicy.class}) public class EmptyElementTest { // expected output @@ -79,3 +85,4 @@ public class EmptyElementTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java index 50973152487..deff9cc9d1e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/EncodingTest.java @@ -29,11 +29,17 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamWriter; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.EncodingTest + * @run testng/othervm stream.XMLStreamWriterTest.EncodingTest * @summary Test XMLStreamWriter writes a document with encoding setting. */ +@Listeners({jaxp.library.BasePolicy.class}) public class EncodingTest { private static final XMLOutputFactory XML_OUTPUT_FACTORY = XMLOutputFactory.newInstance(); @@ -104,3 +110,4 @@ public class EncodingTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java index 24d89a08ba6..04ad1d7b12e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NamespaceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,11 +32,17 @@ import javax.xml.stream.XMLStreamWriter; import org.testng.Assert; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.NamespaceTest + * @run testng/othervm stream.XMLStreamWriterTest.NamespaceTest * @summary Test the writing of Namespaces. */ +@Listeners({jaxp.library.BasePolicy.class}) public class NamespaceTest { /** debug output? */ @@ -1428,3 +1434,4 @@ public class NamespaceTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java index 3eb0222cbaf..e4d0bfc9c92 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/NullUriDetectionTest.java @@ -28,12 +28,18 @@ import java.io.StringWriter; import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamWriter; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6391922 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.NullUriDetectionTest + * @run testng/othervm stream.XMLStreamWriterTest.NullUriDetectionTest * @summary Test XMLStreamWriter can writeDefaultNamespace(null). */ +@Listeners({jaxp.library.BasePolicy.class}) public class NullUriDetectionTest { @Test public void test1() throws Exception { @@ -48,3 +54,4 @@ public class NullUriDetectionTest { w.writeCharacters("---"); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java index 90ca0f313a2..a5d76495376 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SqeLinuxTest.java @@ -29,11 +29,17 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamWriter; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.SqeLinuxTest + * @run testng/othervm stream.XMLStreamWriterTest.SqeLinuxTest * @summary Test XMLStreamWriter can output multiple declarations if IS_REPAIRING_NAMESPACES is false. */ +@Listeners({jaxp.library.BasePolicy.class}) public class SqeLinuxTest { // note that expected output will have multiple declarations, @@ -82,3 +88,4 @@ public class SqeLinuxTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java index a24c6b8b54f..4208cc9b24d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/SurrogatesTest.java @@ -38,6 +38,7 @@ import javax.xml.stream.XMLStreamReader; import javax.xml.stream.XMLStreamWriter; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.testng.annotations.DataProvider; @@ -45,10 +46,15 @@ import org.testng.annotations.DataProvider; * @test * @bug 8145974 * @modules javax.xml + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.SurrogatesTest + * @run testng/othervm stream.XMLStreamWriterTest.SurrogatesTest * @summary Check that XMLStreamWriter generates valid xml with surrogate pair * used within element text */ +@Listeners({jaxp.library.BasePolicy.class}) public class SurrogatesTest { // Test that valid surrogate characters can be written/readen by xml stream @@ -152,7 +158,7 @@ public class SurrogatesTest { } @DataProvider(name = "validData") - Object[][] getValidData() { + public Object[][] getValidData() { return new Object[][] { {"Don't Worry Be \uD83D\uDE0A"}, {"BMP characters \uE000\uFFFD"}, @@ -161,7 +167,7 @@ public class SurrogatesTest { } @DataProvider(name = "invalidData") - Object[][] getInvalidData() { + public Object[][] getInvalidData() { return new Object[][] { {"Unbalanced surrogate \uD83D"}, {"Unbalanced surrogate \uD83Dis here"}, @@ -169,3 +175,4 @@ public class SurrogatesTest { }; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java index 5e05fd82394..95bb8965ab7 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/UnprefixedNameTest.java @@ -28,12 +28,18 @@ import javax.xml.stream.XMLStreamException; import javax.xml.stream.XMLStreamWriter; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6394074 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.UnprefixedNameTest + * @run testng/othervm stream.XMLStreamWriterTest.UnprefixedNameTest * @summary Test XMLStreamWriter namespace prefix with writeDefaultNamespace. */ +@Listeners({jaxp.library.BasePolicy.class}) public class UnprefixedNameTest { @Test @@ -119,3 +125,4 @@ public class UnprefixedNameTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java index adb43d95e0a..c7148edb187 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/WriterTest.java @@ -40,11 +40,17 @@ import javax.xml.stream.XMLStreamWriter; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.WriterTest + * @run testng/othervm stream.XMLStreamWriterTest.WriterTest * @summary Test XMLStreamWriter functionality. */ +@Listeners({jaxp.library.FilePolicy.class}) public class WriterTest { final String ENCODING = "UTF-8"; @@ -57,7 +63,7 @@ public class WriterTest { String output = ""; @BeforeMethod - protected void setUp() { + public void setUp() { try { outputFactory = XMLOutputFactory.newInstance(); inputFactory = XMLInputFactory.newInstance(); @@ -67,7 +73,7 @@ public class WriterTest { } @AfterMethod - protected void tearDown() { + public void tearDown() { outputFactory = null; inputFactory = null; } @@ -778,3 +784,4 @@ public class WriterTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java index 2bc71a315ce..0d063043ba0 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/stream/XMLStreamWriterTest/XMLStreamWriterTest.java @@ -29,24 +29,20 @@ import javax.xml.stream.XMLOutputFactory; import javax.xml.stream.XMLStreamWriter; import org.testng.Assert; -import org.testng.annotations.AfterMethod; -import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6347190 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true stream.XMLStreamWriterTest.XMLStreamWriterTest + * @run testng/othervm stream.XMLStreamWriterTest.XMLStreamWriterTest * @summary Test StAX Writer won't insert comment into element inside. */ +@Listeners({jaxp.library.BasePolicy.class}) public class XMLStreamWriterTest { - @BeforeMethod - protected void setUp() throws Exception { - } - - @AfterMethod - protected void tearDown() throws Exception { - } - /** * Test of main method, of class TestXMLStreamWriter. */ @@ -77,3 +73,4 @@ public class XMLStreamWriterTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java index 8daef2e5cce..63869afc6ec 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4693341Test.java @@ -37,14 +37,20 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 4693341 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug4693341Test + * @run testng/othervm transform.Bug4693341Test * @summary Test transform with external dtd. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug4693341Test { // save dtd file to current working directory to avoid writing into source repository public void copyDTDtoWorkDir() throws IOException { @@ -88,3 +94,4 @@ public class Bug4693341Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java index e65bdaf6058..ed348885b33 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug4892774.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -36,6 +36,7 @@ import javax.xml.transform.stream.StreamResult; import org.testng.Assert; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import transform.util.DOMUtil; @@ -44,10 +45,15 @@ import transform.util.StAXUtil; import transform.util.StreamUtil; /* + * @test * @bug 4892774 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug4892774 + * @run testng/othervm transform.Bug4892774 * @summary Test identity transformer with all possible types of Source and Result combinations for doucment version and encoding information. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug4892774 { private final String XML_FILE = "catalog.xml"; @@ -62,7 +68,7 @@ public class Bug4892774 { private static StAXUtil staxUtil = null; @BeforeMethod - protected void setUp() { + public void setUp() { File tmpFile = new File(TEMP_FILE); if (tmpFile.exists()) tmpFile.delete(); @@ -81,7 +87,7 @@ public class Bug4892774 { } @AfterMethod - protected void tearDown() { + public void tearDown() { File tmpFile = new File(TEMP_FILE); if (tmpFile.exists()) tmpFile.delete(); @@ -371,3 +377,4 @@ public class Bug4892774 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java index 4d406747c8a..750f38c811c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug5073477.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,13 +27,19 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.transform.dom.DOMResult; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; /* + * @test * @bug 5073477 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug5073477 + * @run testng/othervm transform.Bug5073477 * @summary Test DOMResult.setNextSibling works correctly. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug5073477 { @Test @@ -49,3 +55,4 @@ public class Bug5073477 { r.setNextSibling(r.getNode().getFirstChild()); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java index bb3c7d61a29..0cfcfa0e05e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6175602.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -29,12 +29,18 @@ import javax.xml.transform.Templates; import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamSource; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6175602 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6175602 + * @run testng/othervm transform.Bug6175602 * @summary Test compilation of MsWordXMLImport.xsl. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6175602 { public Bug6175602() { @@ -48,3 +54,4 @@ public class Bug6175602 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java index eaaa3f77908..1947d7e7f93 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6206491.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -39,15 +39,21 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test * @bug 6206491 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6206491 + * @run testng/othervm transform.Bug6206491 * @summary Test key searches over more than one document. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6206491 { private String getResource(String s) { @@ -128,3 +134,4 @@ public class Bug6206491 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java index 275fd8c5af1..291eb372eeb 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6216226Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,8 +23,11 @@ package transform; +import static jaxp.library.JAXPTestUtilities.runWithTmpPermission; + import java.io.File; import java.io.StringReader; +import java.util.PropertyPermission; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerFactory; @@ -32,12 +35,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6216226 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6216226Test + * @run testng/othervm transform.Bug6216226Test * @summary Test StreamResult(File) is closed after transform(). */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6216226Test { @Test @@ -48,7 +57,7 @@ public class Bug6216226Test { Transformer xformer = tf.newTransformer(); StringReader st = new StringReader(""); StreamSource s = new StreamSource(st); - StreamResult r = new StreamResult(test); + StreamResult r = runWithTmpPermission(() -> new StreamResult(test), new PropertyPermission("user.dir", "read")); xformer.transform(s, r); if (!test.delete()) { Assert.fail("cannot delete file: " + test.getPath()); @@ -60,3 +69,4 @@ public class Bug6216226Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java index db6925d00e4..adc49f1ed3d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6311448.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -33,14 +33,20 @@ import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; /* + * @test * @bug 6311448 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6311448 + * @run testng/othervm transform.Bug6311448 * @summary Test XML transformer can output Unicode surrorate pair. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6311448 { @Test @@ -79,3 +85,4 @@ public class Bug6311448 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java index 680398bf037..3e7bc97d12f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6384805.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -35,12 +35,18 @@ import javax.xml.xpath.XPathConstants; import javax.xml.xpath.XPathFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6384805 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6384805 + * @run testng/othervm transform.Bug6384805 * @summary Test XSLTC can parse XML namespace when nodeset is created within a template. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6384805 { @Test @@ -88,3 +94,4 @@ public class Bug6384805 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java index 80d5139e7c3..881bd808038 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6465722.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -34,13 +34,19 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; /* + * @test * @bug 6465722 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6465722 + * @run testng/othervm transform.Bug6465722 * @summary Test Transformer can transform the node attribute prefixed with a namespace. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6465722 { public Bug6465722(String name) { @@ -66,3 +72,4 @@ public class Bug6465722 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java index 7a7fb1aa074..86f9436c9f6 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6467808.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -33,12 +33,18 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6467808 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6467808 + * @run testng/othervm transform.Bug6467808 * @summary Test Transformer can parse re-declare prefixed namespace mappings. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6467808 { private static final String TESTXML = "\n" @@ -70,3 +76,4 @@ public class Bug6467808 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java index 4385fb245bf..7301108e272 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490380.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,12 +32,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6490380 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6490380 + * @run testng/othervm transform.Bug6490380 * @summary Test only a single DOCTYPE declaration is generated through transforming. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6490380 { @Test @@ -55,3 +61,4 @@ public class Bug6490380 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java index 38f72d5a89f..759467caffc 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6490921.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,6 +23,8 @@ package transform; +import static jaxp.library.JAXPTestUtilities.setSystemProperty; + import java.io.IOException; import java.io.StringReader; import java.io.StringWriter; @@ -37,15 +39,21 @@ import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.stream.StreamResult; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.SAXException; import org.xml.sax.helpers.XMLFilterImpl; /* + * @test * @bug 6490921 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6490921 + * @run testng/othervm transform.Bug6490921 * @summary Test property org.xml.sax.driver is always applied in transformer API. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6490921 { public static class ReaderStub extends XMLFilterImpl { @@ -71,7 +79,7 @@ public class Bug6490921 { public void test01() { String xml = ""; ReaderStub.used = false; - System.setProperty("org.xml.sax.driver", ""); + setSystemProperty("org.xml.sax.driver", ""); // Don't set 'org.xml.sax.driver' here, just use default try { @@ -91,7 +99,7 @@ public class Bug6490921 { public void test02() { String xml = ""; ReaderStub.used = false; - System.setProperty("org.xml.sax.driver", ReaderStub.class.getName()); + setSystemProperty("org.xml.sax.driver", ReaderStub.class.getName()); try { TransformerFactory transFactory = TransformerFactory.newInstance(); Transformer transformer = transFactory.newTransformer(); @@ -111,7 +119,7 @@ public class Bug6490921 { + " Hello World!\n" + "\n"; ReaderStub.used = false; - System.setProperty("org.xml.sax.driver", ReaderStub.class.getName()); + setSystemProperty("org.xml.sax.driver", ReaderStub.class.getName()); try { TransformerFactory transFactory = TransformerFactory.newInstance(); if (transFactory.getFeature(SAXTransformerFactory.FEATURE) == false) { @@ -137,3 +145,4 @@ public class Bug6490921 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java index da26d64e2ec..26a51f339e5 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6513892.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -34,13 +34,19 @@ import javax.xml.transform.stream.StreamSource; import org.testng.Assert; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; /* + * @test * @bug 6513892 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6513892 + * @run testng/othervm transform.Bug6513892 * @summary Test the output encoding of the transform is the same as that of the redirect extension. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6513892 { @BeforeClass public void setup(){ @@ -71,3 +77,4 @@ public class Bug6513892 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java index c75ff71b584..b77ec5d5900 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6537167.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,12 +32,18 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6537167 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6537167 + * @run testng/othervm transform.Bug6537167 * @summary Test transforming for particular xsl files. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6537167 { @Test @@ -79,3 +85,4 @@ public class Bug6537167 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java index 2c76ad694fa..90cbfccd0f4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6540545.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,12 +31,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6540545 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6540545 + * @run testng/othervm transform.Bug6540545 * @summary Test XSLT as expected. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6540545 { @Test @@ -58,3 +64,4 @@ public class Bug6540545 { } } + diff --git a/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/bug6551616/Bug6551616.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6551616.java similarity index 86% rename from jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/bug6551616/Bug6551616.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/Bug6551616.java index 6a072573c1f..3bd1e7adbc9 100644 --- a/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/bug6551616/Bug6551616.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6551616.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,21 +23,27 @@ /* * @test - * @modules java.xml/com.sun.org.apache.xalan.internal.xsltc.trax * @bug 6551616 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6551616 + * @run testng/othervm transform.Bug6551616 * @summary Test SAX2StAXEventWriter. */ +package transform; + import java.io.InputStream; import java.io.StringBufferInputStream; import javax.xml.stream.XMLEventWriter; import javax.xml.stream.XMLOutputFactory; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import com.sun.org.apache.xalan.internal.xsltc.trax.SAX2StAXEventWriter; +@Listeners({jaxp.library.InternalAPIPolicy.class}) public class Bug6551616 { String _cache = ""; @@ -62,3 +68,4 @@ public class Bug6551616 { // if it doesn't blow up, it succeeded. } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java index 162c92a2e8a..05a5e1c9e83 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6559595.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -35,12 +35,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6559595 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6559595 + * @run testng/othervm transform.Bug6559595 * @summary Test ampersand in href attribute is not handled specially even if output is set to HTML. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6559595 { @Test @@ -64,3 +70,4 @@ public class Bug6559595 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java index 3b0f6361b1d..6a56d55518b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6565260.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,12 +31,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6565260 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6565260 + * @run testng/othervm transform.Bug6565260 * @summary Test use-attribute-sets attribute is not used for the root node. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6565260 { @Test @@ -58,3 +64,4 @@ public class Bug6565260 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java index 41f7279506a..628310c0d33 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Bug6940416.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -39,12 +39,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6940416 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Bug6940416 + * @run testng/othervm transform.Bug6940416 * @summary Test transforming correctly. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6940416 { @Test @@ -109,3 +115,4 @@ public class Bug6940416 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java index 5f5fa0e8fdd..e41107089d5 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/BugDB12665704Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -43,12 +43,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6935697 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.BugDB12665704Test + * @run testng/othervm transform.BugDB12665704Test * @summary Test Transformer can compile large xsl file. */ +@Listeners({jaxp.library.FilePolicy.class}) public class BugDB12665704Test { @Test @@ -151,3 +157,4 @@ public class BugDB12665704Test { return sb.toString(); } } + diff --git a/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/cli/CLITest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CLITest.java similarity index 63% rename from jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/cli/CLITest.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/CLITest.java index 7401f50351f..e72fc26d4f6 100644 --- a/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/cli/CLITest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CLITest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,23 +23,31 @@ /* * @test - * @modules java.xml/com.sun.org.apache.xml.internal.utils + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.CLITest + * @run testng/othervm transform.CLITest * @summary Test internal transform CLI. */ -import org.testng.Assert; +package transform; + +import java.util.PropertyPermission; + +import jaxp.library.JAXPTestUtilities; + +import org.testng.annotations.Listeners; import org.testng.annotations.Test; +@Listeners({ jaxp.library.FilePolicy.class }) public class CLITest { @Test - public void testCLI() { - try { - String[] args = new String[] { "-XSLTC", "-XSL", getClass().getResource("tigertest.xsl").toString(), "-IN", - getClass().getResource("tigertest-in.xml").toString(), }; + public void testCLI() throws Exception { + JAXPTestUtilities.tryRunWithTmpPermission(() -> { + String[] args = new String[] { "-XSLTC", "-XSL", getClass().getResource("tigertest.xsl").toString(), + "-IN", getClass().getResource("tigertest-in.xml").toString(), }; ProcessXSLT.main(args); - } catch (Exception e) { - Assert.fail(e.getMessage()); - } + }, new PropertyPermission("*", "read,write")); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java index 7a2c5427633..b7af4a5841f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6401137Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -37,12 +37,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6401137 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.CR6401137Test + * @run testng/othervm transform.CR6401137Test * @summary Test transform certain xsl. */ +@Listeners({jaxp.library.FilePolicy.class}) public class CR6401137Test { @Test @@ -88,3 +94,4 @@ public class CR6401137Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600.policy b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600.policy deleted file mode 100644 index 381c067b376..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600.policy +++ /dev/null @@ -1,22 +0,0 @@ -grant { - permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; - permission java.lang.RuntimePermission "accessDeclaredMembers"; - - permission java.io.FilePermission "${test.classes}/../../-", "read, write, delete"; - permission java.io.FilePermission ".", "read, write, delete"; - permission java.util.PropertyPermission "*", "read, write"; - - permission java.lang.RuntimePermission "setSecurityManager"; - permission java.lang.RuntimePermission "createSecurityManager"; - permission java.lang.RuntimePermission "createClassLoader"; - permission java.lang.RuntimePermission "setIO"; - permission java.lang.RuntimePermission "setContextClassLoader"; - permission java.security.SecurityPermission "getPolicy"; - - permission java.io.FilePermission "${test.src}/-", "read, write, delete"; - permission java.io.FilePermission "${user.dir}/-", "read, write, delete"; - permission java.io.FilePermission "${java.io.tmpdir}/-", "read, write, delete"; - - permission java.io.FilePermission "//localhost/C$/xslt_unc_test.xml", "read, write, delete"; - -}; diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java index f364f5d2332..d08dddffca0 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6551600Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,7 +23,10 @@ package transform; +import static jaxp.library.JAXPTestUtilities.getSystemProperty; + import java.io.File; +import java.io.FilePermission; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; @@ -32,57 +35,63 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.dom.DOMSource; import javax.xml.transform.stream.StreamResult; +import jaxp.library.JAXPTestUtilities; + import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; /* + * @test * @bug 6551600 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.CR6551600Test + * @run testng/othervm transform.CR6551600Test * @summary Test using UNC path as StreamResult. */ +@Listeners({ jaxp.library.BasePolicy.class }) public class CR6551600Test { @Test public final void testUNCPath() { - String hostName = ""; - try { - hostName = java.net.InetAddress.getLocalHost().getHostName(); - } catch (java.net.UnknownHostException e) { - // falls through - } + boolean isWindows = getSystemProperty("os.name").contains("Windows"); + JAXPTestUtilities.runWithTmpPermission(() -> { + String hostName = ""; + try { + hostName = java.net.InetAddress.getLocalHost().getHostName(); + } catch (java.net.UnknownHostException e) { + // falls through + } - String path = "\\\\" + hostName + "\\C$\\xslt_unc_test.xml"; - String os = System.getProperty("os.name"); - if (os.indexOf("Windows") < 0) { - path = "///tmp/test.xml"; - } - else { - policy.PolicyUtil.changePolicy(getClass().getResource("CR6551600.policy").getFile()); - } + String path = isWindows ? "\\\\" + hostName + "\\C$\\xslt_unc_test.xml" : "///tmp/test.xml"; - try { - DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); - DocumentBuilder builder = factory.newDocumentBuilder(); - Document doc = builder.newDocument(); - Element root = doc.createElement("test"); - doc.appendChild(root); - // create an identity transform - Transformer t = TransformerFactory.newInstance().newTransformer(); - File f = new File(path); - StreamResult result = new StreamResult(f); - DOMSource source = new DOMSource(doc); - System.out.println("Writing to " + f); - t.transform(source, result); - } catch (Exception e) { - // unexpected failure - e.printStackTrace(); - Assert.fail(e.toString()); - } + try { + DocumentBuilderFactory factory = DocumentBuilderFactory.newInstance(); + DocumentBuilder builder = factory.newDocumentBuilder(); + Document doc = builder.newDocument(); + Element root = doc.createElement("test"); + doc.appendChild(root); + // create an identity transform + Transformer t = TransformerFactory.newInstance().newTransformer(); + File f = new File(path); + StreamResult result = new StreamResult(f); + DOMSource source = new DOMSource(doc); + System.out.println("Writing to " + f); + t.transform(source, result); + } catch (Exception e) { + // unexpected failure + e.printStackTrace(); + Assert.fail(e.toString()); + } - File file = new File(path); - if (file.exists()) { - file.deleteOnExit(); - } + File file = new File(path); + if (file.exists()) { + file.deleteOnExit(); + } + }, isWindows ? new FilePermission("//localhost/C$/xslt_unc_test.xml", "read,write,delete") + : new FilePermission("///tmp/test.xml", "read,write,delete")); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java index 70767a47d3b..3602f80b809 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6577667Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -30,12 +30,18 @@ import javax.xml.transform.TransformerFactory; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6577667 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.CR6577667Test + * @run testng/othervm transform.CR6577667Test * @summary Test XSLT can parse statement "not(preceding-sibling::* or following-sibling::*)" in stylesheet file. */ +@Listeners({jaxp.library.FilePolicy.class}) public class CR6577667Test { @Test @@ -53,3 +59,4 @@ public class CR6577667Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java index 9be065fb038..057238513d2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6652519Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -33,13 +33,19 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; /* + * @test * @bug 6652519 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.CR6652519Test + * @run testng/othervm transform.CR6652519Test * @summary Test transfoming from StreamSource to DOMResult. */ +@Listeners({jaxp.library.FilePolicy.class}) public class CR6652519Test { @Test @@ -73,3 +79,4 @@ public class CR6652519Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java index 91da2f6d4fd..cdfcae7d550 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6689809Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -30,12 +30,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6689809 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.CR6689809Test + * @run testng/othervm transform.CR6689809Test * @summary Test Transformer can handle XPath predicates in xsl:key elements. */ +@Listeners({jaxp.library.FilePolicy.class}) public class CR6689809Test { @Test @@ -58,3 +64,4 @@ public class CR6689809Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java index 60de73f31e0..33f9957bc85 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6905829Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,12 +32,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6905829 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.CR6905829Test + * @run testng/othervm transform.CR6905829Test * @summary Test XSLT can parse certain xsl. */ +@Listeners({jaxp.library.FilePolicy.class}) public class CR6905829Test { @Test @@ -59,3 +65,4 @@ public class CR6905829Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java index 6742d3fe47e..3db8bc3af6e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6935697Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -34,12 +34,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6935697 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.CR6935697Test + * @run testng/othervm transform.CR6935697Test * @summary Test XSLT can parse the certain xsl. */ +@Listeners({jaxp.library.FilePolicy.class}) public class CR6935697Test { @Test @@ -71,3 +77,4 @@ public class CR6935697Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java index 07a18b6ad14..8fd89254737 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6941869Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,12 +32,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6941869 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.CR6941869Test + * @run testng/othervm transform.CR6941869Test * @summary Test XSLT evaluate "count(.|key('props', d/e)[1])" correctly. */ +@Listeners({jaxp.library.FilePolicy.class}) public class CR6941869Test { @Test @@ -70,3 +76,4 @@ public class CR6941869Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java index 3d9a74012b1..4e4e7ddb05c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR6957215Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -39,12 +39,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6957215 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.CR6957215Test + * @run testng/othervm transform.CR6957215Test * @summary Test XSLT generates the element content using xsl:attribute instructions. */ +@Listeners({jaxp.library.FilePolicy.class}) public class CR6957215Test { @Test @@ -93,3 +99,4 @@ public class CR6957215Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java index d67a58ad847..c84a512e1ec 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/CR7098746Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -34,12 +34,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 7098746 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.CR7098746Test + * @run testng/othervm transform.CR7098746Test * @summary Test transforming as expected. */ +@Listeners({jaxp.library.FilePolicy.class}) public class CR7098746Test { @Test @@ -84,3 +90,4 @@ public class CR7098746Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java index b21fadd8724..bf46190ee35 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/DOMResultTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,6 +23,7 @@ package transform; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.testng.Assert; @@ -46,8 +47,13 @@ import org.w3c.dom.Node; import org.xml.sax.SAXException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.DOMResultTest + * @run testng/othervm transform.DOMResultTest * @summary Test DOMResult. */ +@Listeners({jaxp.library.FilePolicy.class}) public class DOMResultTest { @Test @@ -209,3 +215,4 @@ public class DOMResultTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java b/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java index 81227c7d691..f9a93513112 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/DocumentExtFunc.java @@ -33,3 +33,4 @@ public class DocumentExtFunc { return "["+node.getNodeName() + ":" + node.getTextContent()+"]"; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java index c0f17b8d5c0..56eff4001df 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/FactoryFindTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,43 +23,44 @@ package transform; +import static jaxp.library.JAXPTestUtilities.runWithAllPerm; + import java.net.URL; import java.net.URLClassLoader; import javax.xml.transform.TransformerFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.FactoryFindTest + * @run testng/othervm transform.FactoryFindTest * @summary Test creating TransformerFactory with ContextClassLoader. */ +@Listeners({jaxp.library.BasePolicy.class}) public class FactoryFindTest { boolean myClassLoaderUsed = false; @Test - public void testFactoryFind() { - try { - // System.setProperty("jaxp.debug", "true"); + public void testFactoryFind() throws Exception { + TransformerFactory factory = TransformerFactory.newInstance(); + Assert.assertTrue(factory.getClass().getClassLoader() == null); - TransformerFactory factory = TransformerFactory.newInstance(); - Assert.assertTrue(factory.getClass().getClassLoader() == null); - - Thread.currentThread().setContextClassLoader(null); - factory = TransformerFactory.newInstance(); - Assert.assertTrue(factory.getClass().getClassLoader() == null); - - Thread.currentThread().setContextClassLoader(new MyClassLoader()); - factory = TransformerFactory.newInstance(); - if (System.getSecurityManager() == null) - Assert.assertTrue(myClassLoaderUsed); - else - Assert.assertFalse(myClassLoaderUsed); - } catch (Exception ex) { - Assert.fail(ex.toString()); - } + runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(null)); + factory = TransformerFactory.newInstance(); + Assert.assertTrue(factory.getClass().getClassLoader() == null); + runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(new MyClassLoader())); + factory = TransformerFactory.newInstance(); + if (System.getSecurityManager() == null) + Assert.assertTrue(myClassLoaderUsed); + else + Assert.assertFalse(myClassLoaderUsed); } class MyClassLoader extends URLClassLoader { @@ -74,3 +75,4 @@ public class FactoryFindTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java index b0912eb8479..52f41c46715 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2204Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,12 +31,18 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6905829 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Issue2204Test + * @run testng/othervm transform.Issue2204Test * @summary Test XSLT can work against the certain xsl. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Issue2204Test { @Test @@ -61,3 +67,4 @@ public class Issue2204Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java index b2be968bea6..10ba8615c44 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/Issue2290Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -41,11 +41,17 @@ import org.w3c.dom.Document; import org.w3c.dom.DocumentFragment; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.Issue2290Test + * @run testng/othervm transform.Issue2290Test * @summary Test XSL extension for RTF works, for https://issues.apache.org/jira/i#browse/XALANJ-2290. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Issue2290Test { @Test @@ -90,3 +96,4 @@ public class Issue2290Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java b/jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java index abe964f55c5..4fceeaacbc4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/OpenJDK100017Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,13 +32,19 @@ import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /* + * @test * @bug 6883209 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.OpenJDK100017Test + * @run testng/othervm transform.OpenJDK100017Test * @summary Test XSLT won't cause StackOverflow when it handle many characters. */ +@Listeners({jaxp.library.BasePolicy.class}) public class OpenJDK100017Test { @Test @@ -60,3 +66,4 @@ public class OpenJDK100017Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/cli/ProcessXSLT.java b/jaxp/test/javax/xml/jaxp/unittest/transform/ProcessXSLT.java similarity index 99% rename from jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/cli/ProcessXSLT.java rename to jaxp/test/javax/xml/jaxp/unittest/transform/ProcessXSLT.java index 323d940cfd7..3425585fb22 100644 --- a/jaxp/test/javax/xml/jaxp/internaltest/javax/xml/transform/cli/ProcessXSLT.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/ProcessXSLT.java @@ -31,18 +31,29 @@ // We however don't have a hard dependency on it. We will use // our own ErrorHandler if the default one is not accessible. // + +package transform; + +import static jaxp.library.JAXPTestUtilities.getSystemProperty; + import java.io.FileOutputStream; import java.io.FileWriter; import java.io.PrintWriter; import java.io.StringReader; +import java.lang.reflect.Constructor; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; import java.util.Properties; import javax.xml.XMLConstants; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import javax.xml.transform.ErrorListener; import javax.xml.transform.OutputKeys; import javax.xml.transform.Source; +import javax.xml.transform.SourceLocator; import javax.xml.transform.Templates; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; @@ -58,16 +69,9 @@ import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.sax.TransformerHandler; import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; -import java.lang.reflect.Constructor; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import javax.xml.transform.ErrorListener; -import javax.xml.transform.SourceLocator; import org.w3c.dom.Document; import org.w3c.dom.Node; - import org.xml.sax.ContentHandler; import org.xml.sax.EntityResolver; import org.xml.sax.ErrorHandler; @@ -267,7 +271,7 @@ public class ProcessXSLT } else if ("-V".equalsIgnoreCase(argv[i])) { diagnosticsWriter.println(">>>>>>> Java Version " - + System.getProperty("java.version") + ", " + + getSystemProperty("java.version") + ", " + /* xmlProcessorLiaison.getParserDescription()+ */ "<<<<<<<"); } // J2SE does not support Xalan interpretive /* diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java index 6e3a9afeb36..1dc5cfbab7e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SAX2DOMTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,6 +31,7 @@ import javax.xml.transform.dom.DOMResult; import javax.xml.transform.sax.SAXSource; import javax.xml.transform.stream.StreamSource; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; @@ -45,8 +46,13 @@ import org.xml.sax.helpers.AttributesImpl; import org.xml.sax.helpers.XMLFilterImpl; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.SAX2DOMTest + * @run testng/othervm transform.SAX2DOMTest * @summary Test Transforming from SAX to DOM. */ +@Listeners({jaxp.library.FilePolicy.class}) public class SAX2DOMTest { @Test @@ -192,3 +198,4 @@ public class SAX2DOMTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java index 888f278edd7..27a03bf4e44 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SecureProcessingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,14 +23,10 @@ package transform; -import java.io.IOException; import java.io.InputStream; import java.io.StringWriter; import javax.xml.XMLConstants; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; -import javax.xml.parsers.ParserConfigurationException; import javax.xml.transform.Transformer; import javax.xml.transform.TransformerConfigurationException; import javax.xml.transform.TransformerException; @@ -39,29 +35,19 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; -import org.testng.annotations.Test; -import org.w3c.dom.Document; -import org.xml.sax.SAXException; +import org.testng.annotations.Listeners; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.SecureProcessingTest + * @run testng/othervm transform.SecureProcessingTest * @summary Test XSLT shall report TransformerException for unsafe xsl when FEATURE_SECURE_PROCESSING is true. */ +@Listeners({jaxp.library.FilePolicy.class}) public class SecureProcessingTest { - static boolean _isSecureMode = false; - static { - if (System.getSecurityManager() != null) { - _isSecureMode = true; - System.out.println("Security Manager is present"); - } else { - System.out.println("Security Manager is NOT present"); - } - } - - - - @Test - public final void testSecureProcessing() { - + public void testSecureProcessing() { + boolean _isSecureMode = System.getSecurityManager() != null; // SECURE_PROCESSING == false // the style sheet @@ -149,3 +135,4 @@ public class SecureProcessingTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java index d0e7ae34d6e..76507bfca1f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/SourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -35,11 +35,17 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.SourceTest + * @run testng/othervm transform.SourceTest * @summary Test Sources. */ +@Listeners({jaxp.library.FilePolicy.class}) public class SourceTest { @Test @@ -142,3 +148,4 @@ public class SourceTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java index dc149f49031..cfa20d1b47a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/StAXSourceTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -40,11 +40,17 @@ import javax.xml.transform.stax.StAXResult; import javax.xml.transform.stax.StAXSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.StAXSourceTest + * @run testng/othervm transform.StAXSourceTest * @summary Test parsing from StAXSource. */ +@Listeners({jaxp.library.FilePolicy.class}) public class StAXSourceTest { @Test @@ -123,3 +129,4 @@ public class StAXSourceTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/TemplatesTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/TemplatesTest.java index 19509ed87de..e2a4fc2ca08 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/TemplatesTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TemplatesTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -29,11 +29,17 @@ import java.io.StringReader; import javax.xml.transform.*; import javax.xml.transform.stream.StreamSource; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.TemplatesTest + * @run testng/othervm transform.TemplatesTest * @summary This class contains tests for Templates. */ +@Listeners({jaxp.library.BasePolicy.class}) public class TemplatesTest { /** @@ -60,7 +66,7 @@ public class TemplatesTest { * DataProvider: Templates */ @DataProvider(name = "templates") - Object[][] getTemplates() throws Exception { + public Object[][] getTemplates() throws Exception { return new Object[][]{{TransformerFactory.newInstance(). newTemplates(new StreamSource(new StringReader(XSL)))}}; } @@ -77,3 +83,4 @@ public class TemplatesTest { + " contains($validAffectsRelClasses, @Class)]/@OBID)\"/>" + ""; } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java index 62b84977bb7..2d6dfbf8aae 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerFactoryTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -42,13 +42,19 @@ import javax.xml.transform.stax.StAXSource; import javax.xml.transform.stream.StreamSource; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.SAXException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.TransformerFactoryTest + * @run testng/othervm transform.TransformerFactoryTest * @summary Test TransformerFactory. */ +@Listeners({jaxp.library.FilePolicy.class}) public class TransformerFactoryTest { private static URIResolver resolver = new URIResolver() { @@ -147,3 +153,4 @@ public class TransformerFactoryTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java index 6511a1b844e..199a4bac62a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerTest.java @@ -23,8 +23,7 @@ package transform; -import com.sun.org.apache.xml.internal.serialize.OutputFormat; -import com.sun.org.apache.xml.internal.serialize.XMLSerializer; +import static jaxp.library.JAXPTestUtilities.getSystemProperty; import java.io.BufferedReader; import java.io.ByteArrayInputStream; @@ -45,6 +44,7 @@ import javax.xml.transform.stream.StreamSource; import org.testng.Assert; import org.testng.AssertJUnit; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; @@ -60,10 +60,18 @@ import org.xml.sax.SAXNotSupportedException; import org.xml.sax.XMLReader; import org.xml.sax.helpers.AttributesImpl; +import com.sun.org.apache.xml.internal.serialize.OutputFormat; +import com.sun.org.apache.xml.internal.serialize.XMLSerializer; + /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.TransformerTest + * @run testng/othervm transform.TransformerTest * @summary Transformer Tests * @bug 6272879 6305029 6505031 8150704 8162598 */ +@Listeners({jaxp.library.FilePolicy.class}) public class TransformerTest { private Transformer createTransformer() throws TransformerException { return TransformerFactory.newInstance().newTransformer(); @@ -245,7 +253,7 @@ public class TransformerTest { */ @Test public final void testBug6272879() throws IOException, TransformerException { - final String LINE_SEPARATOR = System.getProperty("line.separator"); + final String LINE_SEPARATOR = getSystemProperty("line.separator"); final String xsl = "" + LINE_SEPARATOR + @@ -380,7 +388,7 @@ public class TransformerTest { */ @Test public final void testBug8162598() throws IOException, TransformerException { - final String LINE_SEPARATOR = System.getProperty("line.separator"); + final String LINE_SEPARATOR = getSystemProperty("line.separator"); final String xsl = "" + LINE_SEPARATOR + @@ -431,3 +439,4 @@ public class TransformerTest { Assert.assertNull(document.getElementsByTagName("test6").item(0).getNamespaceURI(), "unexpected namespace for test6"); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java index 793dd7ad6ac..dade0b6b56f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/TransformerUtilFactory.java @@ -56,3 +56,4 @@ public class TransformerUtilFactory { return null; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java index ff8fbfe189b..f79ecd6bdde 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionDefaultHandler.java @@ -62,3 +62,4 @@ public class VersionDefaultHandler extends DefaultHandler { return encoding; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java index 51ff18c421d..e7fe77b039f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/VersionEventWriter.java @@ -82,3 +82,4 @@ public class VersionEventWriter implements XMLEventWriter { return encoding; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java b/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java index fbc602cdf38..51df5915037 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/XSLTFunctionsTest.java @@ -35,14 +35,21 @@ import javax.xml.transform.stream.StreamResult; import javax.xml.transform.stream.StreamSource; import org.testng.annotations.DataProvider; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import static org.testng.Assert.assertEquals; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @compile DocumentExtFunc.java + * @run testng/othervm -DrunSecMngr=true transform.XSLTFunctionsTest + * @run testng/othervm transform.XSLTFunctionsTest * @summary This class contains tests for XSLT functions. */ +//@Listeners({jaxp.library.BasePolicy.class}) //uncomment this line after 8161454 is resolved public class XSLTFunctionsTest { /** @@ -65,6 +72,7 @@ public class XSLTFunctionsTest { // Create factory and transformer TransformerFactory tf = TransformerFactory.newInstance(); + tf.setFeature("http://www.oracle.com/xml/jaxp/properties/enableExtensionFunctions", true); Transformer t = tf.newTransformer( xslsrc ); t.setErrorListener(tf.getErrorListener()); @@ -126,3 +134,4 @@ public class XSLTFunctionsTest { static final String documentTesteExpectedResult = "" + "[Test:Doc][Test:External Doc]"; } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java b/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java index a299656033e..662c20b13aa 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/sax/Bug6451633.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -29,14 +29,20 @@ import javax.xml.transform.sax.SAXTransformerFactory; import javax.xml.transform.sax.TransformerHandler; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.helpers.AttributesImpl; /* + * @test * @bug 6451633 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true transform.sax.Bug6451633 + * @run testng/othervm transform.sax.Bug6451633 * @summary Test TransformerHandler ignores empty text node. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6451633 { @Test @@ -56,3 +62,4 @@ public class Bug6451633 { Assert.assertEquals(0, ((Document) result.getNode()).getDocumentElement().getChildNodes().getLength()); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java index 988da74f834..832c10f062e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/DOMUtil.java @@ -68,3 +68,4 @@ public class DOMUtil extends TransformerUtil { Assert.assertTrue(version.equals(resultVersion), "Expected XML Version is 1.1, but actual version " + resultVersion); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java index 9e257ebf9a6..5bee6019cbb 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/SAXUtil.java @@ -70,3 +70,4 @@ public class SAXUtil extends TransformerUtil { Assert.assertTrue(encoding.equals(resultEncoding), "Expected XML Version is " + encoding + " , but actual encoding " + resultEncoding); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java index 26374d76ab0..91423dae161 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StAXUtil.java @@ -92,3 +92,4 @@ public class StAXUtil extends TransformerUtil { ((StreamUtil) TransformerUtilFactory.getUtil(TransformerUtilFactory.STREAM)).checkStream(new FileInputStream(TEMP_FILE), version); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java index 019c2f16b1e..91a37a909cb 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java +++ b/jaxp/test/javax/xml/jaxp/unittest/transform/util/StreamUtil.java @@ -23,10 +23,14 @@ package transform.util; +import static jaxp.library.JAXPTestUtilities.runWithTmpPermission; +import static jaxp.library.JAXPTestUtilities.tryRunWithTmpPermission; + import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; import java.io.InputStream; +import java.util.PropertyPermission; import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.SAXParser; @@ -65,7 +69,7 @@ public class StreamUtil extends TransformerUtil { public Result prepareResult() throws Exception { FileOutputStream fos = new FileOutputStream(TEMP_FILE); - return new StreamResult(fos); + return runWithTmpPermission(() -> new StreamResult(fos), new PropertyPermission("user.dir", "read")); } public void checkResult(Result result, String inputVersion) throws Exception { @@ -85,8 +89,9 @@ public class StreamUtil extends TransformerUtil { // use sax parser, as encoding info cannot be set on DOM document SAXParser parser = SAXParserFactory.newInstance().newSAXParser(); VersionDefaultHandler dh = new VersionDefaultHandler(); - parser.parse(new File(TEMP_FILE), dh); + tryRunWithTmpPermission(() -> parser.parse(new File(TEMP_FILE), dh), new PropertyPermission("user.dir", "read")); Assert.assertTrue(dh.getVersion().equals(version), "Expected version is " + version + " actual version " + dh.getVersion()); Assert.assertTrue(dh.getEncoding().equals(encoding), "Expected version is " + encoding + " actual version " + dh.getEncoding()); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java b/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java index 2088452af58..d142b7ad331 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java +++ b/jaxp/test/javax/xml/jaxp/unittest/util/BOMInputStream.java @@ -78,3 +78,4 @@ public class BOMInputStream { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java b/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java index 86a54335249..c3211c50e5b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java +++ b/jaxp/test/javax/xml/jaxp/unittest/util/BaseStAXUT.java @@ -557,3 +557,4 @@ public class BaseStAXUT implements XMLStreamConstants { System.err.println("Skipping " + clsName + "#" + method + ": entity expansion does not seem to be functioning properly" + msg + "."); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/6773084.policy b/jaxp/test/javax/xml/jaxp/unittest/validation/6773084.policy deleted file mode 100644 index b4547934b44..00000000000 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/6773084.policy +++ /dev/null @@ -1,23 +0,0 @@ -grant { - permission java.lang.reflect.ReflectPermission "suppressAccessChecks"; - permission java.lang.RuntimePermission "accessDeclaredMembers"; - - permission java.io.FilePermission "${test.classes}/../../-", "read, write, delete"; - permission java.io.FilePermission ".", "read, write, delete"; - permission java.util.PropertyPermission "*", "read, write"; - - permission java.lang.RuntimePermission "setSecurityManager"; - permission java.lang.RuntimePermission "createSecurityManager"; - permission java.lang.RuntimePermission "createClassLoader"; - permission java.lang.RuntimePermission "setIO"; - permission java.lang.RuntimePermission "setContextClassLoader"; - permission java.security.SecurityPermission "getPolicy"; - - permission java.io.FilePermission "${test.src}/-", "read, write, delete"; - permission java.io.FilePermission "${user.dir}/-", "read, write, delete"; - permission java.io.FilePermission "${java.io.tmpdir}/-", "read, write, delete"; - - - permission java.lang.RuntimePermission "modifyThread"; - -}; diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java index a1218b1616e..8c615c5d3a0 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/AnyElementTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -23,7 +23,11 @@ package validation; /* + * @test * @bug 8080907 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.AnyElementTest + * @run testng/othervm validation.AnyElementTest * @summary Test processContents attribute of any element */ import static javax.xml.XMLConstants.W3C_XML_SCHEMA_NS_URI; @@ -35,10 +39,12 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.annotations.BeforeClass; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; +@Listeners({jaxp.library.FilePolicy.class}) public class AnyElementTest { @BeforeClass public void setup() throws URISyntaxException, SAXException { @@ -79,3 +85,4 @@ public class AnyElementTest { private Validator validator; } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java index 1e9d473fb5c..3c0c6db7b46 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966232.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -30,14 +30,20 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.InputSource; /* + * @test * @bug 4966232 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.Bug4966232 + * @run testng/othervm validation.Bug4966232 * @summary Test SchemaFactory.newSchema(Source) returns a Schema instance for DOMSource & SAXSource. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug4966232 { // test for W3C XML Schema 1.0 - newSchema(Source schema) @@ -69,3 +75,4 @@ public class Bug4966232 { Assert.assertNotNull(s); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java index e081f37f072..4eafe25cac9 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4966254.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -29,15 +29,21 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; import util.DraconianErrorHandler; /* + * @test * @bug 4966254 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.Bug4966254 + * @run testng/othervm validation.Bug4966254 * @summary Test validate(StreamSource) & validate(StreamSource,null) works instead of throws IOException. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug4966254 { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; @@ -72,3 +78,4 @@ public class Bug4966254 { return s; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java index d04395e6615..31770d19436 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug4969042.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -34,6 +34,7 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.ValidatorHandler; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -41,10 +42,15 @@ import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 4969042 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.Bug4969042 + * @run testng/othervm validation.Bug4969042 * @summary Test ValidationHandler shall invoke ignorableWhitespace() of the * user-defined ContentHandler once the validator detects any ignorable whitespaces. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug4969042 { public static final String XSD = "\n" + "" + "CheetahTech" @@ -59,21 +67,17 @@ public class Bug6457662 { private static final SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); @Test - public void test() { - try { - final Schema sc = factory.newSchema(writeSchema()); - final Validator validator = sc.newValidator(); - validator.validate(new StreamSource(new StringReader(xml))); - validator.validate(new StreamSource(new StringReader(xml))); - validator.validate(new StreamSource(new StringReader(xml))); - validator.validate(new StreamSource(new StringReader(xml))); - } catch (Throwable ex) { - Assert.fail("Exception: " + ex.getMessage()); - } + public void test() throws Exception { + final Schema sc = factory.newSchema(writeSchema()); + final Validator validator = sc.newValidator(); + validator.validate(new StreamSource(new StringReader(xml))); + validator.validate(new StreamSource(new StringReader(xml))); + validator.validate(new StreamSource(new StringReader(xml))); + validator.validate(new StreamSource(new StringReader(xml))); } private File writeSchema() throws IOException { - final File rtn = File.createTempFile("scheam", "xsd"); + final File rtn = File.createTempFile("scheam", "xsd", Paths.get(USER_DIR).toFile()); final OutputStream out = new FileOutputStream(rtn); final OutputStreamWriter writer = new OutputStreamWriter(out, "UTF-8"); writer.write(schema); @@ -82,3 +86,4 @@ public class Bug6457662 { return rtn; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java index 4ebce561e3f..b5ebcb6dd31 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6467424Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -43,14 +43,20 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.SAXException; /* + * @test * @bug 6467424 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.Bug6467424Test + * @run testng/othervm validation.Bug6467424Test * @summary Test Validator augments the default delement value if feature element-default is on. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6467424Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -199,3 +205,4 @@ public class Bug6467424Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java index f5947130ee7..ceebedf2212 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6483188.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,29 +31,25 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXParseException; /* + * @test * @bug 6483188 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.Bug6483188 + * @run testng/othervm validation.Bug6483188 * @summary Test Schema Validator can handle element with having large maxOccurs, but doesn't accept sequence with having large maxOccurs in FEATURE_SECURE_PROCESSING mode. */ +@Test(singleThreaded = true) +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6483188 { - static boolean _isSecureMode = false; - static { - if (System.getSecurityManager() != null) { - _isSecureMode = true; - System.out.println("Security Manager is present"); - } else { - System.out.println("Security Manager is NOT present"); - } - } - SchemaFactory sf = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); - @Test public void testLargeElementNoSecurity() { - if (_isSecureMode) + if (System.getSecurityManager() != null) return; // jaxp secure feature can not be turned off when security // manager is present try { @@ -66,7 +62,6 @@ public class Bug6483188 { } } - @Test public void testLargeElementWithSecurity() { try { sf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE); @@ -78,7 +73,6 @@ public class Bug6483188 { } } - @Test public void testLargeSequenceWithSecurity() { try { sf.setFeature(XMLConstants.FEATURE_SECURE_PROCESSING, Boolean.TRUE); @@ -94,3 +88,4 @@ public class Bug6483188 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java index 2da6c45a1fb..ed790064c7f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6493687.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,13 +23,19 @@ package validation; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; /* + * @test * @bug 6493687 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.Bug6493687 + * @run testng/othervm validation.Bug6493687 * @summary Test validator.validate(new DOMSource(node)) without any exception. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6493687 { @Test @@ -42,3 +48,4 @@ public class Bug6493687 { System.out.println("Got here3"); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java index 2c9906c9711..8e32d70ab19 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6509668.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -36,6 +36,7 @@ import javax.xml.validation.TypeInfoProvider; import javax.xml.validation.ValidatorHandler; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.TypeInfo; import org.xml.sax.Attributes; @@ -45,9 +46,14 @@ import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 6509668 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.Bug6509668 + * @run testng/othervm validation.Bug6509668 * @summary Test TypeInfoProvider.getElementTypeInfo() for union type when startElement and endElement. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6509668 { public static final String XSD = "\n" + "\n" @@ -64,3 +70,4 @@ public class Bug6531160 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java index e70dbff8a11..c0f85a31e0e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6695843Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -35,14 +35,20 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.SAXException; /* + * @test * @bug 6695843 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.Bug6695843Test + * @run testng/othervm validation.Bug6695843Test * @summary Test Validator should report accurate element type if there is a violation on a complexType with simpleContent that extends a base complexType. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6695843Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -76,3 +82,4 @@ public class Bug6695843Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java index 98737edebaf..4ac7b5b977b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6773084Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,6 +23,8 @@ package validation; +import static jaxp.library.JAXPTestUtilities.runWithAllPerm; + import java.io.File; import java.io.FileFilter; import java.io.IOException; @@ -43,7 +45,7 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; -import org.testng.annotations.BeforeClass; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.ErrorHandler; @@ -51,9 +53,14 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test * @bug 6773084 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.Bug6773084Test + * @run testng/othervm validation.Bug6773084Test * @summary Test Schema object is thread safe. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6773084Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -68,11 +75,6 @@ public class Bug6773084Test { private static Schema schema; - @BeforeClass - public void setup(){ - policy.PolicyUtil.changePolicy(getClass().getResource("6773084.policy").getFile()); - } - @Test public void test() throws Exception { SchemaFactory factory = SchemaFactory.newInstance(XMLConstants.W3C_XML_SCHEMA_NS_URI); @@ -94,7 +96,7 @@ public class Bug6773084Test { for (int i = 0; i < files.length; i++) { EXEC.execute(new XMLValiddator(files[i], i)); } - EXEC.shutdown(); + runWithAllPerm(() -> EXEC.shutdown()); } @@ -164,3 +166,4 @@ public class Bug6773084Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java index 1bb0d046499..aafc2974ec1 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6859210.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,15 +32,21 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test * @bug 6859210 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.Bug6859210 + * @run testng/othervm validation.Bug6859210 * @summary Test Schema Validator can parse xml when maxOccurs is large. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6859210 { boolean errorFound; @@ -94,3 +100,4 @@ public class Bug6859210 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java index b3fad32adb0..cc36b1e541d 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6925531Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -40,6 +40,7 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; import org.xml.sax.SAXException; @@ -47,9 +48,14 @@ import org.xml.sax.SAXNotRecognizedException; import org.xml.sax.SAXNotSupportedException; /* + * @test * @bug 6925531 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.Bug6925531Test + * @run testng/othervm validation.Bug6925531Test * @summary Test Validator can validate SAXSource when SecurityManager is set or FEATURE_SECURE_PROCESSING is on. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug6925531Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -204,3 +210,4 @@ public class Bug6925531Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java index 5f0b19d50dc..e5dda822b03 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6946312Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -35,6 +35,7 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; @@ -44,9 +45,14 @@ import org.xml.sax.SAXException; import org.xml.sax.XMLReader; /* + * @test * @bug 6946312 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.Bug6946312Test + * @run testng/othervm validation.Bug6946312Test * @summary Test XML parser shall callback to ContentHandler when receiving characters data. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6946312Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -122,3 +128,4 @@ public class Bug6946312Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java index 5118754af73..38eebc162bc 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Bug6954738_Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,15 +31,21 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test * @bug 6954738 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.Bug6954738_Test + * @run testng/othervm validation.Bug6954738_Test * @summary Test Validator can process a XML document containing an element with 8000 characters. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6954738_Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -77,3 +83,4 @@ public class Bug6954738_Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java index 7c9b0bd83e1..8221278929b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6708840Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -38,12 +38,18 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6708840 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.CR6708840Test + * @run testng/othervm validation.CR6708840Test * @summary Test Validator can process StAXSource. */ +@Listeners({jaxp.library.FilePolicy.class}) public class CR6708840Test { @Test @@ -134,3 +140,4 @@ public class CR6708840Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java index 26a239b2854..31af92f26fc 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/CR6740048.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -30,6 +30,7 @@ import javax.xml.parsers.DocumentBuilder; import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.testng.Assert; import org.w3c.dom.Document; @@ -38,9 +39,14 @@ import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test * @bug 6740048 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.CR6740048 + * @run testng/othervm validation.CR6740048 * @summary Test DocumentBuilder can be reused when the DocumentBuilderFactory sets schema. */ +@Listeners({jaxp.library.FilePolicy.class}) public class CR6740048 { private static final String TAG_INFO = "containerInfo"; private static final String SCHEMA_LANGUAGE_URL = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; @@ -51,9 +57,6 @@ public class CR6740048 { public final void testReusingDocumentBuilder() { try { - //ClassLoader loader = CR6740048.class.getClassLoader(); - - // Object xsd = loader.getResourceAsStream("CR6740048.xsd"); InputStream xsd = this.getClass().getResourceAsStream("CR6740048.xsd"); // create document builder DocumentBuilderFactory docBuilderFactory = DocumentBuilderFactory.newInstance(); @@ -128,3 +131,4 @@ public class CR6740048 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java index 95806ed3f21..775fdd07c6a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ErrorHandlerImpl.java @@ -45,3 +45,4 @@ public class ErrorHandlerImpl implements ErrorHandler { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java index e1753f06817..943f23d1b8c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/Issue682Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,6 +32,7 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.testng.Assert; import org.xml.sax.InputSource; @@ -39,8 +40,13 @@ import org.xml.sax.XMLReader; import org.xml.sax.helpers.DefaultHandler; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.Issue682Test + * @run testng/othervm validation.Issue682Test * @summary Test comination of fields in , for https://issues.apache.org/jira/browse/XERCESJ-682. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Issue682Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -72,3 +78,4 @@ public class Issue682Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java index 765fa1329c5..68ba8c10152 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/IssueTracker30.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,14 +32,20 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.IssueTracker30 + * @run testng/othervm validation.IssueTracker30 * @summary Test maxOccurs validation. */ +@Listeners({jaxp.library.FilePolicy.class}) public class IssueTracker30 { boolean errorFound; @@ -126,3 +132,4 @@ public class IssueTracker30 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java index e590b221330..4b506680016 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue43Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -38,15 +38,21 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Element; import org.w3c.dom.NodeList; /* + * @test * @bug 6631318 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.JaxpIssue43Test + * @run testng/othervm validation.JaxpIssue43Test * @summary Test creating schema from a DOM fragment with namespace. */ +@Listeners({jaxp.library.FilePolicy.class}) public class JaxpIssue43Test { @Test @@ -78,3 +84,4 @@ public class JaxpIssue43Test { return list.toArray(new Source[list.size()]); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java index aec363119a1..b53a10ee86e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/JaxpIssue49.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -38,13 +38,19 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Node; /* + * @test * @bug 6684227 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.JaxpIssue49 + * @run testng/othervm validation.JaxpIssue49 * @summary Test property current-element-node works. */ +@Listeners({jaxp.library.FilePolicy.class}) public class JaxpIssue49 { private Schema schema; @@ -88,3 +94,4 @@ public class JaxpIssue49 { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java index d78322723c7..6681ab76918 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/LargeMaxOccursTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,11 +31,17 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.LargeMaxOccursTest + * @run testng/othervm validation.LargeMaxOccursTest * @summary Test Validator shall report error for maxOccurs > 5000 when FEATURE_SECURE_PROCESSING is on, except the schema can be applied for constant-space algorithm. */ +@Listeners({jaxp.library.FilePolicy.class}) public class LargeMaxOccursTest { @Test @@ -103,3 +109,4 @@ public class LargeMaxOccursTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java index 014e8af7dad..33340dd6a29 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,14 +32,20 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.MultiOccursTest + * @run testng/othervm validation.MultiOccursTest * @summary Test Schema Validator can parse multiple or unbounded occurs. */ +@Listeners({jaxp.library.FilePolicy.class}) public class MultiOccursTest { boolean errorFound; @@ -141,3 +147,4 @@ public class MultiOccursTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java index b6069c26a3b..8330ac5de52 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/MultiOccursUnboundedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,14 +32,20 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.MultiOccursUnboundedTest + * @run testng/othervm validation.MultiOccursUnboundedTest * @summary Test Schema Validator can parse multiple or unbounded occurs. */ +@Listeners({jaxp.library.FilePolicy.class}) public class MultiOccursUnboundedTest { boolean errorFound; @@ -109,3 +115,4 @@ public class MultiOccursUnboundedTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java index 0cb9177760c..bce2b0d2d42 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,14 +32,20 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.OccursTest + * @run testng/othervm validation.OccursTest * @summary Test Schema Validator can parse multiple or unbounded occurs. */ +@Listeners({jaxp.library.FilePolicy.class}) public class OccursTest { boolean errorFound; @@ -141,3 +147,4 @@ public class OccursTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java index df0e07829dd..a986cc1f669 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursUnboundedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,14 +32,20 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.OccursUnboundedTest + * @run testng/othervm validation.OccursUnboundedTest * @summary Test Schema Validator can parse multiple or unbounded occurs. */ +@Listeners({jaxp.library.FilePolicy.class}) public class OccursUnboundedTest { boolean errorFound; @@ -109,3 +115,4 @@ public class OccursUnboundedTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java index 36b97cf9361..649dcd27d73 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,14 +32,20 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.OccursWildcardTest + * @run testng/othervm validation.OccursWildcardTest * @summary Test Schema Validator can parse multiple or unbounded occurs. */ +@Listeners({jaxp.library.FilePolicy.class}) public class OccursWildcardTest { boolean errorFound; @@ -141,3 +147,4 @@ public class OccursWildcardTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java index b454db97b22..ee82f528855 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/OccursWildcardUnbounded.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,14 +32,20 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.OccursWildcardUnbounded + * @run testng/othervm validation.OccursWildcardUnbounded * @summary Test Schema Validator can parse multiple or unbounded occurs. */ +@Listeners({jaxp.library.FilePolicy.class}) public class OccursWildcardUnbounded { boolean errorFound; @@ -109,3 +115,4 @@ public class OccursWildcardUnbounded { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java index 74169f4af09..aa9540d911c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesId005Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,14 +32,20 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.ParticlesId005Test + * @run testng/othervm validation.ParticlesId005Test * @summary Test Schema Validator can parse multiple or unbounded occurs. */ +@Listeners({jaxp.library.FilePolicy.class}) public class ParticlesId005Test { boolean errorFound; @@ -93,3 +99,4 @@ public class ParticlesId005Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java index 2fe1a305e2a..f08dbad1e54 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesIg004Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,11 +31,17 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.ParticlesIg004Test + * @run testng/othervm validation.ParticlesIg004Test * @summary Test particlesIg004.xsd. */ +@Listeners({jaxp.library.FilePolicy.class}) public class ParticlesIg004Test { @Test @@ -51,3 +57,4 @@ public class ParticlesIg004Test { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java index 33e73d5ce80..05d727f536a 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ParticlesQ013Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,14 +32,20 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.ParticlesQ013Test + * @run testng/othervm validation.ParticlesQ013Test * @summary Test Schema Validator can parse multiple or unbounded occurs. */ +@Listeners({jaxp.library.FilePolicy.class}) public class ParticlesQ013Test { boolean errorFound; @@ -92,3 +98,4 @@ public class ParticlesQ013Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/SchemaTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/SchemaTest.java index f8a5e62ac55..ef2bf3741c4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/SchemaTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/SchemaTest.java @@ -28,12 +28,18 @@ import java.io.File; import javax.xml.XMLConstants; import javax.xml.validation.SchemaFactory; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.SchemaTest + * @run testng/othervm validation.SchemaTest * @summary Test Schema creation * @bug 8149915 */ +@Listeners({jaxp.library.FilePolicy.class}) public class SchemaTest { /* @@ -48,3 +54,4 @@ public class SchemaTest { factory.newSchema(new File(getClass().getResource("Bug8149915.xsd").getFile())); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java index c88c09b85f5..79fecdcf9f5 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/TCKGroupA008Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -30,12 +30,18 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.TCKGroupA008Test + * @run testng/othervm validation.TCKGroupA008Test * @summary Test groupA008.xsd. */ +@Listeners({jaxp.library.FilePolicy.class}) public class TCKGroupA008Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -54,3 +60,4 @@ public class TCKGroupA008Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java index 9dd421a4a26..720164f09cd 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/ValidatorTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,9 +23,12 @@ package validation; +import static jaxp.library.JAXPTestUtilities.runWithTmpPermission; + import java.io.File; import java.io.FileInputStream; import java.io.FileWriter; +import java.util.PropertyPermission; import javax.xml.XMLConstants; import javax.xml.stream.XMLEventReader; @@ -39,12 +42,18 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.ValidatorTest + * @run testng/othervm validation.ValidatorTest * @summary Test Validator.validate(Source, Result). */ +@Listeners({jaxp.library.FilePolicy.class}) public class ValidatorTest { @Test @@ -83,10 +92,11 @@ public class ValidatorTest { if (resultFile.exists()) { resultFile.delete(); } - // Validate this instance document against the // Instance document supplied - Result xmlResult = new javax.xml.transform.stream.StreamResult(resultFile); + File resultAlias = resultFile; + Result xmlResult = runWithTmpPermission(() -> new javax.xml.transform.stream.StreamResult( + resultAlias), new PropertyPermission("user.dir", "read")); Source xmlSource = new javax.xml.transform.stream.StreamSource(new File(ValidatorTest.class.getResource("toys.xml").toURI())); validate("toys.xsd", xmlSource, xmlResult); @@ -114,7 +124,9 @@ public class ValidatorTest { // Validate this instance document against the // Instance document supplied - Result xmlResult = new javax.xml.transform.stream.StreamResult(resultFile); + File resultAlias = resultFile; + Result xmlResult = runWithTmpPermission(() -> new javax.xml.transform.stream.StreamResult( + resultAlias), new PropertyPermission("user.dir", "read")); Source xmlSource = new javax.xml.transform.stream.StreamSource(new File(ValidatorTest.class.getResource("gMonths.xml").toURI())); validate("gMonths.xsd", xmlSource, xmlResult); @@ -196,3 +208,4 @@ public class ValidatorTest { return xmlr; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java index de9b0d935e4..bdd8107daba 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLDocBuilder.java @@ -141,3 +141,4 @@ public class XMLDocBuilder { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java index beb05e56afb..b09a6b77674 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/XMLSchemaValidator.java @@ -59,3 +59,4 @@ public class XMLSchemaValidator { validator.validate(new DOMSource(node)); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java index 67dbb9a4b80..286094eb69f 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6943252Test.java @@ -31,13 +31,19 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /* + * @test * @bug 6943252 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.tck.Bug6943252Test + * @run testng/othervm validation.tck.Bug6943252Test * @summary Test Schema doesn't allow to use value more than allowed by base type. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6943252Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -63,3 +69,4 @@ public class Bug6943252Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java index 1734c536359..969c66d27ce 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963124Test.java @@ -29,13 +29,19 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /* + * @test * @bug 6963124 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.tck.Bug6963124Test + * @run testng/othervm validation.tck.Bug6963124Test * @summary Test Schema doesn't allow maxOccurs > 1 for reference to all model group. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6963124Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -55,3 +61,4 @@ public class Bug6963124Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java index 269d7b36192..ea2f0894e37 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6963468Test.java @@ -36,6 +36,7 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; @@ -45,9 +46,14 @@ import org.xml.sax.SAXParseException; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 6963468 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.tck.Bug6963468Test + * @run testng/othervm validation.tck.Bug6963468Test * @summary Test Validation allows element a is a union type and element b specifies a as its substitution group and b type is or is derived from one of the member types of the union. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6963468Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -142,3 +148,4 @@ public class Bug6963468Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java index ca0b6509498..0536cbe3514 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6964720Test.java @@ -29,13 +29,19 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /* + * @test * @bug 6964720 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.tck.Bug6964720Test + * @run testng/othervm validation.tck.Bug6964720Test * @summary Test Schema doesn't allow the inexpressible union of two attribute wildcards. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6964720Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -52,3 +58,4 @@ public class Bug6964720Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java index 66d2e0bb254..06e4ce81c92 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6967214Test.java @@ -31,13 +31,19 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /* + * @test * @bug 6967214 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.tck.Bug6967214Test + * @run testng/othervm validation.tck.Bug6967214Test * @summary Test Schema doesn't allow unpaired parenthesises in regex. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6967214Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -64,3 +70,4 @@ public class Bug6967214Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java index 460989a2877..3e3afac5889 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6970890Test.java @@ -29,13 +29,19 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /* + * @test * @bug 6970890 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.tck.Bug6970890Test + * @run testng/othervm validation.tck.Bug6970890Test * @summary Test Schema allows [-] in regex. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6970890Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -66,3 +72,4 @@ public class Bug6970890Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java index 89e1c3d8ef4..ca733947c0e 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6971190Test.java @@ -32,13 +32,19 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /* + * @test * @bug 6971190 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.tck.Bug6971190Test + * @run testng/othervm validation.tck.Bug6971190Test * @summary Test Validation accepts UTF lexical presentation. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6971190Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -96,3 +102,4 @@ public class Bug6971190Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java index f2248a4fc16..f4d3581f00c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6974551Test.java @@ -34,15 +34,21 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; import org.xml.sax.SAXParseException; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 6974551 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.tck.Bug6974551Test + * @run testng/othervm validation.tck.Bug6974551Test * @summary Test Validation for SAXParser can expose whitespace facet for xs:anySimpleType. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6974551Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -116,3 +122,4 @@ public class Bug6974551Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java index 2a5f557a81a..12ed8261b60 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6975265Test.java @@ -31,13 +31,19 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /* + * @test * @bug 6975265 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.tck.Bug6975265Test + * @run testng/othervm validation.tck.Bug6975265Test * @summary Test Schema doesn't allow some Element Information Items contain other element information item. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6975265Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -65,3 +71,4 @@ public class Bug6975265Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java index f5b6e497838..df77551338b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6977201Test.java @@ -30,12 +30,18 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6977201 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.tck.Bug6977201Test + * @run testng/othervm validation.tck.Bug6977201Test * @summary Test Validator interprets regex "" correctly. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6977201Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -65,3 +71,4 @@ public class Bug6977201Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java index 94682bb15d1..d1be119584b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug6989956Test.java @@ -36,6 +36,7 @@ import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.ErrorHandler; import org.xml.sax.SAXException; @@ -45,9 +46,14 @@ import org.xml.sax.SAXParseException; import org.xml.sax.helpers.DefaultHandler; /* + * @test * @bug 6989956 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.tck.Bug6989956Test + * @run testng/othervm validation.tck.Bug6989956Test * @summary Test Validation can process correctly that maxOccurs in Choice less than maxOccurs in Elements contained in the Choice. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug6989956Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -142,3 +148,4 @@ public class Bug6989956Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java index f6316c962fa..025c972c288 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/Bug7014246Test.java @@ -29,13 +29,19 @@ import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /* + * @test * @bug 7014246 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.tck.Bug7014246Test + * @run testng/othervm validation.tck.Bug7014246Test * @summary Test Schema doesn't allow maxInclusive of derived time type greater than the base. */ +@Listeners({jaxp.library.FilePolicy.class}) public class Bug7014246Test { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -53,3 +59,4 @@ public class Bug7014246Test { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java index f82e4d28158..19a9eb77d68 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/ParticleTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -28,16 +28,22 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /* + * @test * @bug 8142463 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.tck.ParticleTest + * @run testng/othervm validation.tck.ParticleTest * @summary Tests that verify bug fixes for Particles (http://www.w3.org/TR/xmlschema11-1/#cParticles) * @author Joe Wang (huizhe.wang@oracle.com) */ +@Listeners({jaxp.library.FilePolicy.class}) public class ParticleTest { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -57,3 +63,4 @@ public class ParticleTest { validator.validate(new StreamSource(ParticleTest.class.getResourceAsStream("upa01.xml"))); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/RegexWord.java b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/RegexWord.java index dd59b93a378..a46c7c720b2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/validation/tck/RegexWord.java +++ b/jaxp/test/javax/xml/jaxp/unittest/validation/tck/RegexWord.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -28,15 +28,21 @@ import javax.xml.transform.stream.StreamSource; import javax.xml.validation.Schema; import javax.xml.validation.SchemaFactory; import javax.xml.validation.Validator; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.SAXException; /* + * @test * @bug 8142900 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true validation.tck.RegexWord + * @run testng/othervm validation.tck.RegexWord * @summary Verifies that all characters except the set of "punctuation", * "separator" and "other" characters are accepted by \w [#x0000-#x10FFFF]-[\p{P}\p{Z}\p{C}] * @author Joe Wang */ +@Listeners({jaxp.library.FilePolicy.class}) public class RegexWord { static final String SCHEMA_LANGUAGE = "http://java.sun.com/xml/jaxp/properties/schemaLanguage"; static final String SCHEMA_SOURCE = "http://java.sun.com/xml/jaxp/properties/schemaSource"; @@ -57,3 +63,4 @@ public class RegexWord { validator.validate(new StreamSource(RegexWord.class.getResourceAsStream("reZ003vExc23082309.xml"))); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java index aa37ec70959..a8f65a22b48 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java +++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991857.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -29,14 +29,20 @@ import javax.xml.xpath.XPathExpressionException; import javax.xml.xpath.XPathFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; /* + * @test * @bug 4991857 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true xpath.Bug4991857 + * @run testng/othervm xpath.Bug4991857 * @summary XPath.evaluate(...) throws XPathExpressionException when context is null and expression refers to the context. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug4991857 { Document d = null; @@ -86,3 +92,4 @@ public class Bug4991857 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java index 206c6aa1b2a..d201f489461 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java +++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4991939.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -29,12 +29,18 @@ import javax.xml.xpath.XPath; import javax.xml.xpath.XPathFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 4991939 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true xpath.Bug4991939 + * @run testng/othervm xpath.Bug4991939 * @summary XPath.evaluate(...) throws IllegalArgumentException if returnType is not one of the types defined in XPathConstants. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug4991939 { @Test @@ -55,3 +61,4 @@ public class Bug4991939 { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java index 2b4f9c29078..4da3e2de999 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java +++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992788.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -31,13 +31,19 @@ import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactoryConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; /* + * @test * @bug 4992788 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true xpath.Bug4992788 + * @run testng/othervm xpath.Bug4992788 * @summary Test XPath.evaluate(expression,source,returnType) throws NPE if source is null. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug4992788 { private static String expression = "/widgets/widget[@name='a']/@quantity"; @@ -76,3 +82,4 @@ public class Bug4992788 { return xpath; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java index 5810cd6f59b..2e4a4128ff9 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java +++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992793.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -33,13 +33,19 @@ import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactoryConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; /* + * @test * @bug 4992793 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true xpath.Bug4992793 + * @run testng/othervm xpath.Bug4992793 * @summary Test XPath.evaluate(expression,source,returnType) throws NPE if expression is null. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug4992793 { @@ -77,3 +83,4 @@ public class Bug4992793 { return xpath; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java index b847febc112..97a9abfcca4 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java +++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/Bug4992805.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -32,13 +32,19 @@ import javax.xml.xpath.XPathFactory; import javax.xml.xpath.XPathFactoryConfigurationException; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.xml.sax.InputSource; /* + * @test * @bug 4992805 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true xpath.Bug4992805 + * @run testng/othervm xpath.Bug4992805 * @summary Test XPath.evaluate(expression,source,returnType) throws NPE if returnType is null. */ +@Listeners({jaxp.library.BasePolicy.class}) public class Bug4992805 { private static String expression = "/widgets/widget[@name='a']/@quantity"; @@ -64,3 +70,4 @@ public class Bug4992805 { return xpath; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java index 9a3a66a6b2f..d5a52bda8a2 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/ClassLoaderTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -23,21 +23,29 @@ package xpath; +import static jaxp.library.JAXPTestUtilities.runWithAllPerm; + import javax.xml.xpath.XPathFactory; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6354969 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true xpath.ClassLoaderTest + * @run testng/othervm xpath.ClassLoaderTest * @summary Test XPathFactory newInstance() with ContextClassLoader. */ +@Listeners({jaxp.library.BasePolicy.class}) public class ClassLoaderTest { @Test public void testClassLoader() { - MyClassLoader cl = new MyClassLoader(); - Thread.currentThread().setContextClassLoader(cl); + MyClassLoader cl = runWithAllPerm(() -> new MyClassLoader()); + runWithAllPerm(() -> Thread.currentThread().setContextClassLoader(cl)); XPathFactory xPathFactory = XPathFactory.newInstance(); if (!cl.isCalled()) { @@ -46,3 +54,4 @@ public class ClassLoaderTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java index d333e7053a6..39a0d72815c 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java +++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/MyClassLoader.java @@ -47,3 +47,4 @@ public class MyClassLoader extends ClassLoader { return isCalled; } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java index cbd44e920f0..a78c1e1439b 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/SecureProcessingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -43,26 +43,23 @@ import javax.xml.xpath.XPathFunctionException; import javax.xml.xpath.XPathFunctionResolver; import org.testng.Assert; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.xml.sax.SAXException; /* + * @test + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true xpath.SecureProcessingTest + * @run testng/othervm xpath.SecureProcessingTest * @summary Test when FEATURE_SECURE_PROCESSING is true, calling an external function will cause XPathFunctionException. */ +@Test +@Listeners({jaxp.library.FilePolicy.class}) public class SecureProcessingTest { - static boolean _isSecureMode = false; - static { - if (System.getSecurityManager() != null) { - _isSecureMode = true; - System.out.println("Security Manager is present"); - } else { - System.out.println("Security Manager is NOT present"); - } - } - - @Test public final void testSecureProcessing() { + boolean _isSecureMode = System.getSecurityManager() != null; final String XPATH_EXPRESSION = "ext:helloWorld()"; @@ -150,7 +147,7 @@ public class SecureProcessingTest { } } - public class MyXPathFunctionResolver implements XPathFunctionResolver { + private class MyXPathFunctionResolver implements XPathFunctionResolver { public XPathFunction resolveFunction(QName functionName, int arity) { @@ -159,7 +156,7 @@ public class SecureProcessingTest { } } - public class MyXPathFunction implements XPathFunction { + private class MyXPathFunction implements XPathFunction { public Object evaluate(List list) throws XPathFunctionException { @@ -167,7 +164,7 @@ public class SecureProcessingTest { } } - public class MyNamespaceContext implements NamespaceContext { + private class MyNamespaceContext implements NamespaceContext { public String getNamespaceURI(String prefix) { if (prefix == null) { @@ -199,3 +196,4 @@ public class SecureProcessingTest { } } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java index c42101a334a..6ba9ceb48bd 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathAnyTypeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -32,15 +32,21 @@ import javax.xml.xpath.XPathExpressionException; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; /* + * @test * @bug 8054196 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true xpath.XPathAnyTypeTest + * @run testng/othervm xpath.XPathAnyTypeTest * @summary Test for the project XPath: support any type. This test covers the new * evaluateExpression methods of XPath, as well as XPathNodes and XPathEvaluationResult. */ +@Listeners({jaxp.library.BasePolicy.class}) public class XPathAnyTypeTest extends XPathTestBase { /* Test for resolveFunction(QName functionName,int arity); evaluate throws @@ -194,3 +200,4 @@ public class XPathAnyTypeTest extends XPathTestBase { verifyResult(result, "Customer"); } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java index ab9750732bd..f661fe9a035 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathExpAnyTypeTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -34,15 +34,21 @@ import javax.xml.xpath.XPathEvaluationResult; import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertTrue; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; import org.w3c.dom.Document; import org.w3c.dom.Node; /* + * @test * @bug 8054196 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true xpath.XPathExpAnyTypeTest + * @run testng/othervm xpath.XPathExpAnyTypeTest * @summary Test for the project XPath: support any type. This test covers the new * evaluateExpression methods of XPathExpression. */ +@Listeners({jaxp.library.BasePolicy.class}) public class XPathExpAnyTypeTest extends XPathTestBase { /* @@ -181,3 +187,4 @@ public class XPathExpAnyTypeTest extends XPathTestBase { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTest.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTest.java index ee6687949b3..a6c80541968 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTest.java +++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -27,12 +27,18 @@ import javax.xml.namespace.NamespaceContext; import javax.xml.xpath.XPath; import javax.xml.xpath.XPathFactory; +import org.testng.annotations.Listeners; import org.testng.annotations.Test; /* + * @test * @bug 6376058 + * @library /javax/xml/jaxp/libs /javax/xml/jaxp/unittest + * @run testng/othervm -DrunSecMngr=true xpath.XPathTest + * @run testng/othervm xpath.XPathTest * @summary Test XPath.getNamespaceContext() is supported. */ +@Listeners({jaxp.library.BasePolicy.class}) public class XPathTest { @Test @@ -45,3 +51,4 @@ public class XPathTest { } } + diff --git a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTestBase.java b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTestBase.java index 4d9666afd0a..8ee45dec579 100644 --- a/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTestBase.java +++ b/jaxp/test/javax/xml/jaxp/unittest/xpath/XPathTestBase.java @@ -115,7 +115,7 @@ class XPathTestBase { * DataProvider: XPath object */ @DataProvider(name = "xpath") - Object[][] getXPath() { + public Object[][] getXPath() { return new Object[][]{{XPathFactory.newInstance().newXPath()}}; } @@ -123,7 +123,7 @@ class XPathTestBase { * DataProvider: Numeric types not supported */ @DataProvider(name = "invalidNumericTypes") - Object[][] getInvalidNumericTypes() { + public Object[][] getInvalidNumericTypes() { XPath xpath = XPathFactory.newInstance().newXPath(); return new Object[][]{{xpath, AtomicInteger.class}, {xpath, AtomicInteger.class}, @@ -140,7 +140,7 @@ class XPathTestBase { * DataProvider: XPath and Document objects */ @DataProvider(name = "document") - Object[][] getDocument() throws Exception { + public Object[][] getDocument() throws Exception { DocumentBuilderFactory dBF = DocumentBuilderFactory.newInstance(); dBF.setValidating(false); dBF.setNamespaceAware(true); diff --git a/jaxws/.hgtags b/jaxws/.hgtags index 751e7020260..0d23a61cd3e 100644 --- a/jaxws/.hgtags +++ b/jaxws/.hgtags @@ -375,3 +375,4 @@ c42decd28bbfa817347112ed6053b5fbd30517a2 jdk-9+123 06d706c70634775418dc79a2671780ba1c624fd2 jdk-9+127 fe4e11bd2423635dc0f5f5cb9a64eb2f2cce7f4c jdk-9+128 46a02f57218e4a8c334dbccf656fb048f823f163 jdk-9+129 +39c6293131d91aec7f2f5120395e070a937b8858 jdk-9+130 diff --git a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java index 979cd435f36..367a82acbf4 100644 --- a/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java +++ b/jaxws/src/java.xml.bind/share/classes/javax/xml/bind/ValidationEvent.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -60,8 +60,8 @@ public interface ValidationEvent { * Retrieve the severity code for this warning/error. * *

- * Must be one of {@code ValidationError.WARNING}, - * {@code ValidationError.ERROR}, or {@code ValidationError.FATAL_ERROR}. + * Must be one of {@code ValidationEvent.WARNING}, + * {@code ValidationEvent.ERROR}, or {@code ValidationEvent.FATAL_ERROR}. * * @return the severity code for this warning/error */ diff --git a/jdk/.hgtags b/jdk/.hgtags index cad3e226a3c..4dbe1d44592 100644 --- a/jdk/.hgtags +++ b/jdk/.hgtags @@ -372,3 +372,4 @@ c40c8739bcdc88892ff58ebee3fd8a3f287be94d jdk-9+123 7a97b89ba83077ca62e4aa5a05437adc8f315343 jdk-9+127 9446c534f0222b4eecfd9d9e25ab37c4fd4400a5 jdk-9+128 47699aa2e69ec2702542dc73eb01de3bfb61aea0 jdk-9+129 +6c827500e34587061af97ad6fef0e859280255c5 jdk-9+130 diff --git a/jdk/make/launcher/Launcher-jdk.hotspot.agent.gmk b/jdk/make/launcher/Launcher-jdk.hotspot.agent.gmk index 9acc6ea5884..cbf04bfb5ab 100644 --- a/jdk/make/launcher/Launcher-jdk.hotspot.agent.gmk +++ b/jdk/make/launcher/Launcher-jdk.hotspot.agent.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2011, 2016, 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 @@ -25,12 +25,6 @@ include LauncherCommon.gmk -$(eval $(call SetupBuildLauncher, jsadebugd, \ - MAIN_CLASS := sun.jvm.hotspot.jdi.SADebugServer, \ - MACOSX_SIGNED := true, \ -)) - - $(eval $(call SetupBuildLauncher, jhsdb, \ MAIN_CLASS := sun.jvm.hotspot.SALauncher, \ MACOSX_SIGNED := true, \ diff --git a/jdk/make/lib/Awt2dLibraries.gmk b/jdk/make/lib/Awt2dLibraries.gmk index 85e46e0f483..c7d296bf907 100644 --- a/jdk/make/lib/Awt2dLibraries.gmk +++ b/jdk/make/lib/Awt2dLibraries.gmk @@ -56,9 +56,6 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBMLIB_IMAGE, \ OPTIMIZATION := HIGHEST, \ CFLAGS := $(CFLAGS_JDKLIB) \ $(BUILD_LIBMLIB_CFLAGS), \ - DISABLED_WARNINGS_gcc := parentheses array-bounds, \ - DISABLED_WARNINGS_clang := parentheses, \ - DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -119,7 +116,6 @@ ifeq ($(OPENJDK_TARGET_OS)-$(OPENJDK_TARGET_CPU_ARCH), solaris-sparc) CFLAGS := -xarch=sparcvis \ $(LIBMLIB_IMAGE_V_CFLAGS) \ $(CFLAGS_JDKLIB), \ - DISABLED_WARNINGS_solstudio := E_STATEMENT_NOT_REACHED, \ MAPFILE := $(BUILD_LIBMLIB_IMAGE_MAPFILE), \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ @@ -147,8 +143,6 @@ endif ifeq ($(OPENJDK_TARGET_OS), windows) LIBAWT_DIRS += $(JDK_TOPDIR)/src/java.desktop/share/native/common/awt/utility -else - LIBAWT_EXFILES := java2d/ShaderList.c endif ifneq ($(filter $(OPENJDK_TARGET_OS), solaris linux macosx aix), ) @@ -350,8 +344,6 @@ ifeq ($(findstring $(OPENJDK_TARGET_OS),windows macosx),) BUILD_LIBAWT_XAWT_awt_Font.c_CFLAGS := -w # initializing a declared 'extern' BUILD_LIBAWT_XAWT_debug_mem.c_CFLAGS := -w - # decimal constant is unsigned only in ISO C90 (JAVASE_EMBEDDED) - BUILD_LIBAWT_XAWT_XToolkit.c_CFLAGS := -w endif $(eval $(call SetupNativeCompilation,BUILD_LIBAWT_XAWT, \ @@ -498,9 +490,7 @@ $(eval $(call SetupNativeCompilation,BUILD_LIBJAVAJPEG, \ CFLAGS := $(CFLAGS_JDKLIB) $(BUILD_LIBJAVAJPEG_HEADERS) \ $(LIBJAVA_HEADER_FLAGS) \ -I$(SUPPORT_OUTPUTDIR)/headers/java.desktop, \ - DISABLED_WARNINGS_gcc := clobbered parentheses array-bounds shift-negative-value, \ - DISABLED_WARNINGS_clang := logical-op-parentheses, \ - DISABLED_WARNINGS_microsoft := 4267, \ + DISABLED_WARNINGS_gcc := clobbered, \ MAPFILE := $(JDK_TOPDIR)/make/mapfiles/libjpeg/mapfile-vers, \ LDFLAGS := $(LDFLAGS_JDKLIB) \ $(call SET_SHARED_LIBRARY_ORIGIN), \ diff --git a/jdk/src/demo/share/jvmti/compiledMethodLoad/sample.makefile.txt b/jdk/src/demo/share/jvmti/compiledMethodLoad/sample.makefile.txt index 3c4c5dee595..3da8383d912 100644 --- a/jdk/src/demo/share/jvmti/compiledMethodLoad/sample.makefile.txt +++ b/jdk/src/demo/share/jvmti/compiledMethodLoad/sample.makefile.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -45,12 +45,12 @@ LIBNAME=compiledMethodLoad SOURCES=compiledMethodLoad.c ../agent_util/agent_util.c -# Solaris Sun C Compiler Version 5.5 +# Solaris Studio C Compiler Version 12.4 ifeq ($(OSNAME), solaris) # Sun Solaris Compiler options needed COMMON_FLAGS=-mt -KPIC # Options that help find errors - COMMON_FLAGS+= -Xa -v -xstrconst -xc99=%none + COMMON_FLAGS+= -Xa -v -xc99=%none # Check LIBARCH for any special compiler options LIBARCH=$(shell uname -p) ifeq ($(LIBARCH), sparc) diff --git a/jdk/src/demo/share/jvmti/gctest/sample.makefile.txt b/jdk/src/demo/share/jvmti/gctest/sample.makefile.txt index 5e5d0720bf9..46afeb498ce 100644 --- a/jdk/src/demo/share/jvmti/gctest/sample.makefile.txt +++ b/jdk/src/demo/share/jvmti/gctest/sample.makefile.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -45,12 +45,12 @@ LIBNAME=gctest SOURCES=gctest.c ../agent_util/agent_util.c -# Solaris Sun C Compiler Version 5.5 +# Solaris Studio C Compiler Version 12.4 ifeq ($(OSNAME), solaris) # Sun Solaris Compiler options needed COMMON_FLAGS=-mt -KPIC # Options that help find errors - COMMON_FLAGS+= -Xa -v -xstrconst -xc99=%none + COMMON_FLAGS+= -Xa -v -xc99=%none # Check LIBARCH for any special compiler options LIBARCH=$(shell uname -p) ifeq ($(LIBARCH), sparc) diff --git a/jdk/src/demo/share/jvmti/heapTracker/sample.makefile.txt b/jdk/src/demo/share/jvmti/heapTracker/sample.makefile.txt index d6e964ff39b..e094bc8206f 100644 --- a/jdk/src/demo/share/jvmti/heapTracker/sample.makefile.txt +++ b/jdk/src/demo/share/jvmti/heapTracker/sample.makefile.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -49,12 +49,12 @@ JAVA_SOURCES=HeapTracker.java # Name of jar file that needs to be created JARFILE=heapTracker.jar -# Solaris Sun C Compiler Version 5.5 +# Solaris Studio C Compiler Version 12.4 ifeq ($(OSNAME), solaris) # Sun Solaris Compiler options needed COMMON_FLAGS=-mt -KPIC # Options that help find errors - COMMON_FLAGS+= -Xa -v -xstrconst -xc99=%none + COMMON_FLAGS+= -Xa -v -xc99=%none # Check LIBARCH for any special compiler options LIBARCH=$(shell uname -p) ifeq ($(LIBARCH), sparc) diff --git a/jdk/src/demo/share/jvmti/heapViewer/sample.makefile.txt b/jdk/src/demo/share/jvmti/heapViewer/sample.makefile.txt index a18c9d1494c..59693c298eb 100644 --- a/jdk/src/demo/share/jvmti/heapViewer/sample.makefile.txt +++ b/jdk/src/demo/share/jvmti/heapViewer/sample.makefile.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -45,12 +45,12 @@ LIBNAME=heapViewer SOURCES=heapViewer.c ../agent_util/agent_util.c -# Solaris Sun C Compiler Version 5.5 +# Solaris Studio C Compiler Version 12.4 ifeq ($(OSNAME), solaris) # Sun Solaris Compiler options needed COMMON_FLAGS=-mt -KPIC # Options that help find errors - COMMON_FLAGS+= -Xa -v -xstrconst -xc99=%none + COMMON_FLAGS+= -Xa -v -xc99=%none # Check LIBARCH for any special compiler options LIBARCH=$(shell uname -p) ifeq ($(LIBARCH), sparc) diff --git a/jdk/src/demo/share/jvmti/java_crw_demo/sample.makefile.txt b/jdk/src/demo/share/jvmti/java_crw_demo/sample.makefile.txt index 35dbbe4b5e0..81ce07938d4 100644 --- a/jdk/src/demo/share/jvmti/java_crw_demo/sample.makefile.txt +++ b/jdk/src/demo/share/jvmti/java_crw_demo/sample.makefile.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -45,12 +45,12 @@ LIBNAME=java_crw_demo SOURCES=java_crw_demo.c -# Solaris Sun C Compiler Version 5.5 +# Solaris Studio C Compiler Version 12.4 ifeq ($(OSNAME), solaris) # Sun Solaris Compiler options needed COMMON_FLAGS=-mt -KPIC # Options that help find errors - COMMON_FLAGS+= -Xa -v -xstrconst -xc99=%none + COMMON_FLAGS+= -Xa -v -xc99=%none # Check LIBARCH for any special compiler options LIBARCH=$(shell uname -p) ifeq ($(LIBARCH), sparc) diff --git a/jdk/src/demo/share/jvmti/minst/sample.makefile.txt b/jdk/src/demo/share/jvmti/minst/sample.makefile.txt index 94bb4c56ccc..5c8f422fb40 100644 --- a/jdk/src/demo/share/jvmti/minst/sample.makefile.txt +++ b/jdk/src/demo/share/jvmti/minst/sample.makefile.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2006, 2016, Oracle and/or its affiliates. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -49,12 +49,12 @@ JAVA_SOURCES=Minst.java # Name of jar file that needs to be created JARFILE=minst.jar -# Solaris Sun C Compiler Version 5.5 +# Solaris Studio C Compiler Version 12.4 ifeq ($(OSNAME), solaris) # Sun Solaris Compiler options needed COMMON_FLAGS=-mt -KPIC # Options that help find errors - COMMON_FLAGS+= -Xa -v -xstrconst -xc99=%none + COMMON_FLAGS+= -Xa -v -xc99=%none # Check LIBARCH for any special compiler options LIBARCH=$(shell uname -p) ifeq ($(LIBARCH), sparc) diff --git a/jdk/src/demo/share/jvmti/mtrace/sample.makefile.txt b/jdk/src/demo/share/jvmti/mtrace/sample.makefile.txt index 46ceb7e59ef..b342e785020 100644 --- a/jdk/src/demo/share/jvmti/mtrace/sample.makefile.txt +++ b/jdk/src/demo/share/jvmti/mtrace/sample.makefile.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -49,12 +49,12 @@ JAVA_SOURCES=Mtrace.java # Name of jar file that needs to be created JARFILE=mtrace.jar -# Solaris Sun C Compiler Version 5.5 +# Solaris Studio C Compiler Version 12.4 ifeq ($(OSNAME), solaris) # Sun Solaris Compiler options needed COMMON_FLAGS=-mt -KPIC # Options that help find errors - COMMON_FLAGS+= -Xa -v -xstrconst -xc99=%none + COMMON_FLAGS+= -Xa -v -xc99=%none # Check LIBARCH for any special compiler options LIBARCH=$(shell uname -p) ifeq ($(LIBARCH), sparc) diff --git a/jdk/src/demo/share/jvmti/versionCheck/sample.makefile.txt b/jdk/src/demo/share/jvmti/versionCheck/sample.makefile.txt index 7a586ed734c..01240330398 100644 --- a/jdk/src/demo/share/jvmti/versionCheck/sample.makefile.txt +++ b/jdk/src/demo/share/jvmti/versionCheck/sample.makefile.txt @@ -1,5 +1,5 @@ # -# Copyright (c) 2004, 2012, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2004, 2016, Oracle and/or its affiliates. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions @@ -45,12 +45,12 @@ LIBNAME=versionCheck SOURCES=versionCheck.c ../agent_util/agent_util.c -# Solaris Sun C Compiler Version 5.5 +# Solaris Studio C Compiler Version 12.4 ifeq ($(OSNAME), solaris) # Sun Solaris Compiler options needed COMMON_FLAGS=-mt -KPIC # Options that help find errors - COMMON_FLAGS+= -Xa -v -xstrconst -xc99=%none + COMMON_FLAGS+= -Xa -v -xc99=%none # Check LIBARCH for any special compiler options LIBARCH=$(shell uname -p) ifeq ($(LIBARCH), sparc) diff --git a/jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c b/jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c index cae982e7904..7792569aba2 100644 --- a/jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c +++ b/jdk/src/java.base/linux/native/libjava/ProcessHandleImpl_linux.c @@ -146,6 +146,7 @@ void os_getCmdlineAndUserInfo(JNIEnv *env, jobject jinfo, pid_t pid) { snprintf(fn, sizeof fn, "/proc/%d", pid); if (stat(fn, &stat_buf) == 0) { unix_getUserInfo(env, jinfo, stat_buf.st_uid); + JNU_CHECK_EXCEPTION(env); } /* diff --git a/jdk/src/java.base/share/classes/java/lang/Class.java b/jdk/src/java.base/share/classes/java/lang/Class.java index 7ac3d50202c..25d4a3b5b9f 100644 --- a/jdk/src/java.base/share/classes/java/lang/Class.java +++ b/jdk/src/java.base/share/classes/java/lang/Class.java @@ -70,6 +70,7 @@ import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.ConstantPool; import jdk.internal.reflect.Reflection; import jdk.internal.reflect.ReflectionFactory; +import jdk.internal.vm.annotation.ForceInline; import sun.reflect.generics.factory.CoreReflectionFactory; import sun.reflect.generics.factory.GenericsFactory; import sun.reflect.generics.repository.ClassRepository; @@ -802,6 +803,7 @@ public final class Class implements java.io.Serializable, * @see java.lang.RuntimePermission */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public ClassLoader getClassLoader() { ClassLoader cl = getClassLoader0(); if (cl == null) diff --git a/jdk/src/java.base/share/classes/java/lang/VersionProps.java.template b/jdk/src/java.base/share/classes/java/lang/VersionProps.java.template index a51702fa093..d3c86a2befe 100644 --- a/jdk/src/java.base/share/classes/java/lang/VersionProps.java.template +++ b/jdk/src/java.base/share/classes/java/lang/VersionProps.java.template @@ -166,10 +166,6 @@ class VersionProps { ps.print(java_runtime_name + " (" + jdk_debug_level + "build " + java_runtime_version); - if (java_runtime_name.indexOf("Embedded") != -1 && isHeadless) { - // embedded builds report headless state - ps.print(", headless"); - } ps.println(')'); /* Third line: JVM information. */ diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java b/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java index fe77e01fcc7..c980fb80f69 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/DirectMethodHandle.java @@ -27,6 +27,7 @@ package java.lang.invoke; import jdk.internal.misc.Unsafe; import jdk.internal.vm.annotation.ForceInline; +import jdk.internal.vm.annotation.Stable; import sun.invoke.util.ValueConversions; import sun.invoke.util.VerifyAccess; import sun.invoke.util.VerifyType; @@ -198,6 +199,7 @@ class DirectMethodHandle extends MethodHandle { case LF_NEWINVSPECIAL: linkerName = "linkToSpecial"; lambdaName = "DMH.newInvokeSpecial"; break; default: throw new InternalError("which="+which); } + MethodType mtypeWithArg = mtype.appendParameterTypes(MemberName.class); if (doesAlloc) mtypeWithArg = mtypeWithArg @@ -240,11 +242,26 @@ class DirectMethodHandle extends MethodHandle { names[LINKER_CALL] = new Name(linker, outArgs); lambdaName += "_" + shortenSignature(basicTypeSignature(mtype)); LambdaForm lform = new LambdaForm(lambdaName, ARG_LIMIT, names, result); + // This is a tricky bit of code. Don't send it through the LF interpreter. - lform.compileToBytecode(); + lform.compileToBytecode(Holder.class); return lform; } + /* + * NOTE: This method acts as an API hook for use by the + * GenerateJLIClassesPlugin to generate a class wrapping DirectMethodHandle + * methods for an array of method types. + */ + static byte[] generateDMHClassBytes(String className, MethodType[] methodTypes, int[] types) { + LambdaForm[] forms = new LambdaForm[methodTypes.length]; + for (int i = 0; i < forms.length; i++) { + forms[i] = makePreparedLambdaForm(methodTypes[i], types[i]); + methodTypes[i] = forms[i].methodType(); + } + return InvokerBytecodeGenerator.generateCodeBytesForMultiple(className, forms, methodTypes); + } + static Object findDirectMethodHandle(Name name) { if (name.function == NF_internalMemberName || name.function == NF_internalMemberNameEnsureInit || @@ -487,7 +504,7 @@ class DirectMethodHandle extends MethodHandle { } // Caching machinery for field accessors: - private static byte + private static final byte AF_GETFIELD = 0, AF_PUTFIELD = 1, AF_GETSTATIC = 2, @@ -497,7 +514,7 @@ class DirectMethodHandle extends MethodHandle { AF_LIMIT = 6; // Enumerate the different field kinds using Wrapper, // with an extra case added for checked references. - private static int + private static final int FT_LAST_WRAPPER = Wrapper.values().length-1, FT_UNCHECKED_REF = Wrapper.OBJECT.ordinal(), FT_CHECKED_REF = FT_LAST_WRAPPER+1, @@ -507,6 +524,7 @@ class DirectMethodHandle extends MethodHandle { + (isVolatile ? FT_LIMIT : 0) + ftypeKind); } + @Stable private static final LambdaForm[] ACCESSOR_FORMS = new LambdaForm[afIndex(AF_LIMIT, false, 0)]; private static int ftypeKind(Class ftype) { @@ -549,10 +567,11 @@ class DirectMethodHandle extends MethodHandle { return lform; } private static LambdaForm preparedFieldLambdaForm(byte formOp, boolean isVolatile, Class ftype) { - int afIndex = afIndex(formOp, isVolatile, ftypeKind(ftype)); + int ftypeKind = ftypeKind(ftype); + int afIndex = afIndex(formOp, isVolatile, ftypeKind); LambdaForm lform = ACCESSOR_FORMS[afIndex]; if (lform != null) return lform; - lform = makePreparedFieldLambdaForm(formOp, isVolatile, ftypeKind(ftype)); + lform = makePreparedFieldLambdaForm(formOp, isVolatile, ftypeKind); ACCESSOR_FORMS[afIndex] = lform; // don't bother with a CAS return lform; } @@ -682,4 +701,15 @@ class DirectMethodHandle extends MethodHandle { throw newInternalError(ex); } } + + static { + // The DMH class will contain pre-generated DirectMethodHandles resolved + // speculatively using MemberName.getFactory().resolveOrNull. However, that + // doesn't initialize the class, which subtly breaks inlining etc. By forcing + // initialization of the Holder class we avoid these issues. + UNSAFE.ensureClassInitialized(Holder.class); + } + + /* Placeholder class for DirectMethodHandles generated ahead of time */ + private final class Holder {} } diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java index d42bad62892..507bcdb4c61 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/InvokerBytecodeGenerator.java @@ -70,7 +70,7 @@ class InvokerBytecodeGenerator { private static final String LLV_SIG = "(L" + OBJ + ";L" + OBJ + ";)V"; /** Name of its super class*/ - private static final String superName = OBJ; + private static final String INVOKER_SUPER_NAME = OBJ; /** Name of new class */ private final String className; @@ -296,12 +296,15 @@ class InvokerBytecodeGenerator { /** * Set up class file generation. */ - private void classFilePrologue() { + private ClassWriter classFilePrologue() { final int NOT_ACC_PUBLIC = 0; // not ACC_PUBLIC cw = new ClassWriter(ClassWriter.COMPUTE_MAXS + ClassWriter.COMPUTE_FRAMES); - cw.visit(Opcodes.V1_8, NOT_ACC_PUBLIC + Opcodes.ACC_FINAL + Opcodes.ACC_SUPER, className, null, superName, null); + cw.visit(Opcodes.V1_8, NOT_ACC_PUBLIC + Opcodes.ACC_FINAL + Opcodes.ACC_SUPER, className, null, INVOKER_SUPER_NAME, null); cw.visitSource(sourceFile, null); + return cw; + } + private void methodPrologue() { String invokerDesc = invokerType.toMethodDescriptorString(); mv = cw.visitMethod(Opcodes.ACC_STATIC, invokerName, invokerDesc, null, null); } @@ -309,7 +312,7 @@ class InvokerBytecodeGenerator { /** * Tear down class file generation. */ - private void classFileEpilogue() { + private void methodEpilogue() { mv.visitMaxs(0, 0); mv.visitEnd(); } @@ -644,6 +647,44 @@ class InvokerBytecodeGenerator { */ private byte[] generateCustomizedCodeBytes() { classFilePrologue(); + addMethod(); + bogusMethod(lambdaForm); + + final byte[] classFile = toByteArray(); + maybeDump(className, classFile); + return classFile; + } + + /* + * NOTE: This is used from GenerateJLIClassesPlugin via + * DirectMethodHandle::generateDMHClassBytes. + * + * Generate customized code for a set of LambdaForms of specified types into + * a class with a specified name. + */ + static byte[] generateCodeBytesForMultiple(String className, + LambdaForm[] forms, MethodType[] types) { + assert(forms.length == types.length); + + ClassWriter cw = new ClassWriter(ClassWriter.COMPUTE_MAXS + ClassWriter.COMPUTE_FRAMES); + cw.visit(Opcodes.V1_8, Opcodes.ACC_PRIVATE + Opcodes.ACC_FINAL + Opcodes.ACC_SUPER, + className, null, INVOKER_SUPER_NAME, null); + cw.visitSource(className.substring(className.lastIndexOf('/') + 1), null); + for (int i = 0; i < forms.length; i++) { + InvokerBytecodeGenerator g + = new InvokerBytecodeGenerator(className, forms[i], types[i]); + g.setClassWriter(cw); + g.addMethod(); + } + return cw.toByteArray(); + } + + private void setClassWriter(ClassWriter cw) { + this.cw = cw; + } + + private void addMethod() { + methodPrologue(); // Suppress this method in backtraces displayed to the user. mv.visitAnnotation(LF_HIDDEN_SIG, true); @@ -748,19 +789,19 @@ class InvokerBytecodeGenerator { // return statement emitReturn(onStack); - classFileEpilogue(); - bogusMethod(lambdaForm); + methodEpilogue(); + } - final byte[] classFile; + /* + * @throws BytecodeGenerationException if something goes wrong when + * generating the byte code + */ + private byte[] toByteArray() { try { - classFile = cw.toByteArray(); + return cw.toByteArray(); } catch (RuntimeException e) { - // ASM throws RuntimeException if something goes wrong - capture these and wrap them in a meaningful - // exception to support falling back to LambdaForm interpretation throw new BytecodeGenerationException(e); } - maybeDump(className, classFile); - return classFile; } @SuppressWarnings("serial") @@ -1607,6 +1648,7 @@ class InvokerBytecodeGenerator { private byte[] generateLambdaFormInterpreterEntryPointBytes() { classFilePrologue(); + methodPrologue(); // Suppress this method in backtraces displayed to the user. mv.visitAnnotation(LF_HIDDEN_SIG, true); @@ -1645,7 +1687,7 @@ class InvokerBytecodeGenerator { // return statement emitReturnInsn(basicType(rtype)); - classFileEpilogue(); + methodEpilogue(); bogusMethod(invokerType); final byte[] classFile = cw.toByteArray(); @@ -1666,6 +1708,7 @@ class InvokerBytecodeGenerator { private byte[] generateNamedFunctionInvokerImpl(MethodTypeForm typeForm) { MethodType dstType = typeForm.erasedType(); classFilePrologue(); + methodPrologue(); // Suppress this method in backtraces displayed to the user. mv.visitAnnotation(LF_HIDDEN_SIG, true); @@ -1685,7 +1728,6 @@ class InvokerBytecodeGenerator { // Maybe unbox Class dptype = dstType.parameterType(i); if (dptype.isPrimitive()) { - Class sptype = dstType.basicType().wrap().parameterType(i); Wrapper dstWrapper = Wrapper.forBasicType(dptype); Wrapper srcWrapper = dstWrapper.isSubwordOrInt() ? Wrapper.INT : dstWrapper; // narrow subword from int emitUnboxing(srcWrapper); @@ -1713,7 +1755,7 @@ class InvokerBytecodeGenerator { } emitReturnInsn(L_TYPE); // NOTE: NamedFunction invokers always return a reference value. - classFileEpilogue(); + methodEpilogue(); bogusMethod(dstType); final byte[] classFile = cw.toByteArray(); diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/LambdaForm.java b/jdk/src/java.base/share/classes/java/lang/invoke/LambdaForm.java index 2a722db28e0..535c0fb9e98 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/LambdaForm.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/LambdaForm.java @@ -773,6 +773,28 @@ class LambdaForm { } } + /** + * Generate optimizable bytecode for this form after first looking for a + * pregenerated version in a specified class. + */ + void compileToBytecode(Class lookupClass) { + if (vmentry != null && isCompiled) { + return; // already compiled somehow + } + MethodType invokerType = methodType(); + assert(vmentry == null || vmentry.getMethodType().basicType().equals(invokerType)); + int dot = debugName.indexOf('.'); + String methodName = (dot > 0) ? debugName.substring(dot + 1) : debugName; + MemberName member = new MemberName(lookupClass, methodName, invokerType, REF_invokeStatic); + MemberName resolvedMember = MemberName.getFactory().resolveOrNull(REF_invokeStatic, member, lookupClass); + if (resolvedMember != null) { + vmentry = resolvedMember; + isCompiled = true; + } else { + compileToBytecode(); + } + } + private static void computeInitialPreparedForms() { // Find all predefined invokers and associate them with canonical empty lambda forms. for (MemberName m : MemberName.getFactory().getMethods(LambdaForm.class, false, null, null, null)) { diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java index adaca60874f..6702a89f0ce 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandleImpl.java @@ -30,6 +30,7 @@ import jdk.internal.org.objectweb.asm.ClassWriter; import jdk.internal.org.objectweb.asm.MethodVisitor; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.Reflection; +import jdk.internal.vm.annotation.ForceInline; import jdk.internal.vm.annotation.Stable; import sun.invoke.empty.Empty; import sun.invoke.util.ValueConversions; @@ -44,7 +45,6 @@ import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.function.Function; -import java.util.stream.Collectors; import java.util.stream.Stream; import static java.lang.invoke.LambdaForm.*; @@ -1246,6 +1246,7 @@ import static jdk.internal.org.objectweb.asm.Opcodes.*; } @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization private static boolean checkCallerClass(Class expected) { // This method is called via MH_checkCallerClass and so it's correct to ask for the immediate caller here. Class actual = Reflection.getCallerClass(); diff --git a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java index 14f7d32e2e2..60077a889b0 100644 --- a/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java +++ b/jdk/src/java.base/share/classes/java/lang/invoke/MethodHandles.java @@ -29,6 +29,7 @@ import jdk.internal.org.objectweb.asm.ClassWriter; import jdk.internal.org.objectweb.asm.Opcodes; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.Reflection; +import jdk.internal.vm.annotation.ForceInline; import sun.invoke.util.ValueConversions; import sun.invoke.util.VerifyAccess; import sun.invoke.util.Wrapper; @@ -104,6 +105,7 @@ public class MethodHandles { * @return a lookup object for the caller of this method, with private access */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public static Lookup lookup() { return new Lookup(Reflection.getCallerClass()); } diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java b/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java index af5fd1d8482..c8d93cfe269 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/Constructor.java @@ -29,6 +29,7 @@ import jdk.internal.misc.SharedSecrets; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.ConstructorAccessor; import jdk.internal.reflect.Reflection; +import jdk.internal.vm.annotation.ForceInline; import sun.reflect.annotation.TypeAnnotation; import sun.reflect.annotation.TypeAnnotationParser; import sun.reflect.generics.repository.ConstructorRepository; @@ -435,6 +436,7 @@ public final class Constructor extends Executable { * by this method fails. */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public T newInstance(Object ... initargs) throws InstantiationException, IllegalAccessException, IllegalArgumentException, InvocationTargetException diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Field.java b/jdk/src/java.base/share/classes/java/lang/reflect/Field.java index 7474f59d923..853d1cf8e12 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/Field.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/Field.java @@ -29,6 +29,7 @@ import jdk.internal.misc.SharedSecrets; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.FieldAccessor; import jdk.internal.reflect.Reflection; +import jdk.internal.vm.annotation.ForceInline; import sun.reflect.generics.repository.FieldRepository; import sun.reflect.generics.factory.CoreReflectionFactory; import sun.reflect.generics.factory.GenericsFactory; @@ -396,6 +397,7 @@ class Field extends AccessibleObject implements Member { * by this method fails. */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public Object get(Object obj) throws IllegalArgumentException, IllegalAccessException { @@ -429,6 +431,7 @@ class Field extends AccessibleObject implements Member { * @see Field#get */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public boolean getBoolean(Object obj) throws IllegalArgumentException, IllegalAccessException { @@ -462,6 +465,7 @@ class Field extends AccessibleObject implements Member { * @see Field#get */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public byte getByte(Object obj) throws IllegalArgumentException, IllegalAccessException { @@ -497,6 +501,7 @@ class Field extends AccessibleObject implements Member { * @see Field#get */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public char getChar(Object obj) throws IllegalArgumentException, IllegalAccessException { @@ -532,6 +537,7 @@ class Field extends AccessibleObject implements Member { * @see Field#get */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public short getShort(Object obj) throws IllegalArgumentException, IllegalAccessException { @@ -567,6 +573,7 @@ class Field extends AccessibleObject implements Member { * @see Field#get */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public int getInt(Object obj) throws IllegalArgumentException, IllegalAccessException { @@ -602,6 +609,7 @@ class Field extends AccessibleObject implements Member { * @see Field#get */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public long getLong(Object obj) throws IllegalArgumentException, IllegalAccessException { @@ -637,6 +645,7 @@ class Field extends AccessibleObject implements Member { * @see Field#get */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public float getFloat(Object obj) throws IllegalArgumentException, IllegalAccessException { @@ -672,6 +681,7 @@ class Field extends AccessibleObject implements Member { * @see Field#get */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public double getDouble(Object obj) throws IllegalArgumentException, IllegalAccessException { @@ -749,6 +759,7 @@ class Field extends AccessibleObject implements Member { * by this method fails. */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public void set(Object obj, Object value) throws IllegalArgumentException, IllegalAccessException { @@ -784,6 +795,7 @@ class Field extends AccessibleObject implements Member { * @see Field#set */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public void setBoolean(Object obj, boolean z) throws IllegalArgumentException, IllegalAccessException { @@ -819,6 +831,7 @@ class Field extends AccessibleObject implements Member { * @see Field#set */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public void setByte(Object obj, byte b) throws IllegalArgumentException, IllegalAccessException { @@ -854,6 +867,7 @@ class Field extends AccessibleObject implements Member { * @see Field#set */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public void setChar(Object obj, char c) throws IllegalArgumentException, IllegalAccessException { @@ -889,6 +903,7 @@ class Field extends AccessibleObject implements Member { * @see Field#set */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public void setShort(Object obj, short s) throws IllegalArgumentException, IllegalAccessException { @@ -924,6 +939,7 @@ class Field extends AccessibleObject implements Member { * @see Field#set */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public void setInt(Object obj, int i) throws IllegalArgumentException, IllegalAccessException { @@ -959,6 +975,7 @@ class Field extends AccessibleObject implements Member { * @see Field#set */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public void setLong(Object obj, long l) throws IllegalArgumentException, IllegalAccessException { @@ -994,6 +1011,7 @@ class Field extends AccessibleObject implements Member { * @see Field#set */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public void setFloat(Object obj, float f) throws IllegalArgumentException, IllegalAccessException { @@ -1029,6 +1047,7 @@ class Field extends AccessibleObject implements Member { * @see Field#set */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization public void setDouble(Object obj, double d) throws IllegalArgumentException, IllegalAccessException { diff --git a/jdk/src/java.base/share/classes/java/lang/reflect/Method.java b/jdk/src/java.base/share/classes/java/lang/reflect/Method.java index 0476c523f63..54d373f0844 100644 --- a/jdk/src/java.base/share/classes/java/lang/reflect/Method.java +++ b/jdk/src/java.base/share/classes/java/lang/reflect/Method.java @@ -30,6 +30,7 @@ import jdk.internal.misc.SharedSecrets; import jdk.internal.reflect.CallerSensitive; import jdk.internal.reflect.MethodAccessor; import jdk.internal.reflect.Reflection; +import jdk.internal.vm.annotation.ForceInline; import sun.reflect.annotation.ExceptionProxy; import sun.reflect.annotation.TypeNotPresentExceptionProxy; import sun.reflect.generics.repository.MethodRepository; @@ -517,6 +518,7 @@ public final class Method extends Executable { * provoked by this method fails. */ @CallerSensitive + @ForceInline // to ensure Reflection.getCallerClass optimization @HotSpotIntrinsicCandidate public Object invoke(Object obj, Object... args) throws IllegalAccessException, IllegalArgumentException, diff --git a/jdk/src/java.base/share/classes/java/net/Inet4Address.java b/jdk/src/java.base/share/classes/java/net/Inet4Address.java index 1a2f7b6166b..a79a178fedd 100644 --- a/jdk/src/java.base/share/classes/java/net/Inet4Address.java +++ b/jdk/src/java.base/share/classes/java/net/Inet4Address.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, 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 @@ -164,7 +164,7 @@ class Inet4Address extends InetAddress { } /** - * Utility routine to check if the InetAddress in a wildcard address. + * Utility routine to check if the InetAddress is a wildcard address. * @return a {@code boolean} indicating if the Inetaddress is * a wildcard address. * @since 1.4 diff --git a/jdk/src/java.base/share/classes/java/net/Inet6Address.java b/jdk/src/java.base/share/classes/java/net/Inet6Address.java index 0daac2f2b03..8584db6f275 100644 --- a/jdk/src/java.base/share/classes/java/net/Inet6Address.java +++ b/jdk/src/java.base/share/classes/java/net/Inet6Address.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, 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 @@ -691,7 +691,7 @@ class Inet6Address extends InetAddress { } /** - * Utility routine to check if the InetAddress in a wildcard address. + * Utility routine to check if the InetAddress is a wildcard address. * * @return a {@code boolean} indicating if the Inetaddress is * a wildcard address. diff --git a/jdk/src/java.base/share/classes/java/net/InetAddress.java b/jdk/src/java.base/share/classes/java/net/InetAddress.java index 33e70ea1b43..4a59099c0e7 100644 --- a/jdk/src/java.base/share/classes/java/net/InetAddress.java +++ b/jdk/src/java.base/share/classes/java/net/InetAddress.java @@ -361,7 +361,7 @@ class InetAddress implements java.io.Serializable { } /** - * Utility routine to check if the InetAddress in a wildcard address. + * Utility routine to check if the InetAddress is a wildcard address. * @return a {@code boolean} indicating if the Inetaddress is * a wildcard address. * @since 1.4 diff --git a/jdk/src/java.base/share/classes/java/net/Socket.java b/jdk/src/java.base/share/classes/java/net/Socket.java index 47971df5fbb..b875ce7cd0f 100644 --- a/jdk/src/java.base/share/classes/java/net/Socket.java +++ b/jdk/src/java.base/share/classes/java/net/Socket.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1995, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1995, 2016, 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 @@ -907,7 +907,6 @@ class Socket implements java.io.Closeable { throw new SocketException("Socket is not connected"); if (isInputShutdown()) throw new SocketException("Socket input is shutdown"); - final Socket s = this; InputStream is = null; try { is = AccessController.doPrivileged( @@ -947,7 +946,6 @@ class Socket implements java.io.Closeable { throw new SocketException("Socket is not connected"); if (isOutputShutdown()) throw new SocketException("Socket output is shutdown"); - final Socket s = this; OutputStream os = null; try { os = AccessController.doPrivileged( diff --git a/jdk/src/java.base/share/classes/java/net/URLConnection.java b/jdk/src/java.base/share/classes/java/net/URLConnection.java index 4ad051cafe2..7a125faf145 100644 --- a/jdk/src/java.base/share/classes/java/net/URLConnection.java +++ b/jdk/src/java.base/share/classes/java/net/URLConnection.java @@ -291,12 +291,7 @@ public abstract class URLConnection { /** * @since 1.1 */ - private static FileNameMap fileNameMap; - - /** - * @since 1.2.2 - */ - private static boolean fileNameMapLoaded = false; + private static volatile FileNameMap fileNameMap; /** * Loads filename map (a mimetable) from a data file. It will @@ -308,18 +303,21 @@ public abstract class URLConnection { * @since 1.2 * @see #setFileNameMap(java.net.FileNameMap) */ - public static synchronized FileNameMap getFileNameMap() { - if ((fileNameMap == null) && !fileNameMapLoaded) { - fileNameMap = sun.net.www.MimeTable.loadTable(); - fileNameMapLoaded = true; + public static FileNameMap getFileNameMap() { + FileNameMap map = fileNameMap; + + if (map == null) { + fileNameMap = map = new FileNameMap() { + private FileNameMap internalMap = + sun.net.www.MimeTable.loadTable(); + + public String getContentTypeFor(String fileName) { + return internalMap.getContentTypeFor(fileName); + } + }; } - return new FileNameMap() { - private FileNameMap map = fileNameMap; - public String getContentTypeFor(String fileName) { - return map.getContentTypeFor(fileName); - } - }; + return map; } /** diff --git a/jdk/src/java.base/share/classes/java/nio/Bits.java b/jdk/src/java.base/share/classes/java/nio/Bits.java index d8b3024f781..8a7dcf77253 100644 --- a/jdk/src/java.base/share/classes/java/nio/Bits.java +++ b/jdk/src/java.base/share/classes/java/nio/Bits.java @@ -25,14 +25,14 @@ package java.nio; -import java.util.concurrent.atomic.AtomicLong; - -import jdk.internal.misc.JavaNioAccess; import jdk.internal.misc.JavaLangRefAccess; +import jdk.internal.misc.JavaNioAccess; import jdk.internal.misc.SharedSecrets; import jdk.internal.misc.Unsafe; import jdk.internal.misc.VM; +import java.util.concurrent.atomic.AtomicLong; + /** * Access to bits, native and otherwise. */ @@ -61,504 +61,10 @@ class Bits { // package-private } - // -- get/put char -- - - private static char makeChar(byte b1, byte b0) { - return (char)((b1 << 8) | (b0 & 0xff)); - } - - static char getCharL(ByteBuffer bb, int bi) { - return makeChar(bb._get(bi + 1), - bb._get(bi )); - } - - static char getCharL(long a) { - return makeChar(_get(a + 1), - _get(a )); - } - - static char getCharB(ByteBuffer bb, int bi) { - return makeChar(bb._get(bi ), - bb._get(bi + 1)); - } - - static char getCharB(long a) { - return makeChar(_get(a ), - _get(a + 1)); - } - - static char getChar(ByteBuffer bb, int bi, boolean bigEndian) { - return bigEndian ? getCharB(bb, bi) : getCharL(bb, bi); - } - - static char getChar(long a, boolean bigEndian) { - return bigEndian ? getCharB(a) : getCharL(a); - } - - private static byte char1(char x) { return (byte)(x >> 8); } - private static byte char0(char x) { return (byte)(x ); } - - static void putCharL(ByteBuffer bb, int bi, char x) { - bb._put(bi , char0(x)); - bb._put(bi + 1, char1(x)); - } - - static void putCharL(long a, char x) { - _put(a , char0(x)); - _put(a + 1, char1(x)); - } - - static void putCharB(ByteBuffer bb, int bi, char x) { - bb._put(bi , char1(x)); - bb._put(bi + 1, char0(x)); - } - - static void putCharB(long a, char x) { - _put(a , char1(x)); - _put(a + 1, char0(x)); - } - - static void putChar(ByteBuffer bb, int bi, char x, boolean bigEndian) { - if (bigEndian) - putCharB(bb, bi, x); - else - putCharL(bb, bi, x); - } - - static void putChar(long a, char x, boolean bigEndian) { - if (bigEndian) - putCharB(a, x); - else - putCharL(a, x); - } - - - // -- get/put short -- - - private static short makeShort(byte b1, byte b0) { - return (short)((b1 << 8) | (b0 & 0xff)); - } - - static short getShortL(ByteBuffer bb, int bi) { - return makeShort(bb._get(bi + 1), - bb._get(bi )); - } - - static short getShortL(long a) { - return makeShort(_get(a + 1), - _get(a )); - } - - static short getShortB(ByteBuffer bb, int bi) { - return makeShort(bb._get(bi ), - bb._get(bi + 1)); - } - - static short getShortB(long a) { - return makeShort(_get(a ), - _get(a + 1)); - } - - static short getShort(ByteBuffer bb, int bi, boolean bigEndian) { - return bigEndian ? getShortB(bb, bi) : getShortL(bb, bi); - } - - static short getShort(long a, boolean bigEndian) { - return bigEndian ? getShortB(a) : getShortL(a); - } - - private static byte short1(short x) { return (byte)(x >> 8); } - private static byte short0(short x) { return (byte)(x ); } - - static void putShortL(ByteBuffer bb, int bi, short x) { - bb._put(bi , short0(x)); - bb._put(bi + 1, short1(x)); - } - - static void putShortL(long a, short x) { - _put(a , short0(x)); - _put(a + 1, short1(x)); - } - - static void putShortB(ByteBuffer bb, int bi, short x) { - bb._put(bi , short1(x)); - bb._put(bi + 1, short0(x)); - } - - static void putShortB(long a, short x) { - _put(a , short1(x)); - _put(a + 1, short0(x)); - } - - static void putShort(ByteBuffer bb, int bi, short x, boolean bigEndian) { - if (bigEndian) - putShortB(bb, bi, x); - else - putShortL(bb, bi, x); - } - - static void putShort(long a, short x, boolean bigEndian) { - if (bigEndian) - putShortB(a, x); - else - putShortL(a, x); - } - - - // -- get/put int -- - - private static int makeInt(byte b3, byte b2, byte b1, byte b0) { - return (((b3 ) << 24) | - ((b2 & 0xff) << 16) | - ((b1 & 0xff) << 8) | - ((b0 & 0xff) )); - } - - static int getIntL(ByteBuffer bb, int bi) { - return makeInt(bb._get(bi + 3), - bb._get(bi + 2), - bb._get(bi + 1), - bb._get(bi )); - } - - static int getIntL(long a) { - return makeInt(_get(a + 3), - _get(a + 2), - _get(a + 1), - _get(a )); - } - - static int getIntB(ByteBuffer bb, int bi) { - return makeInt(bb._get(bi ), - bb._get(bi + 1), - bb._get(bi + 2), - bb._get(bi + 3)); - } - - static int getIntB(long a) { - return makeInt(_get(a ), - _get(a + 1), - _get(a + 2), - _get(a + 3)); - } - - static int getInt(ByteBuffer bb, int bi, boolean bigEndian) { - return bigEndian ? getIntB(bb, bi) : getIntL(bb, bi) ; - } - - static int getInt(long a, boolean bigEndian) { - return bigEndian ? getIntB(a) : getIntL(a) ; - } - - private static byte int3(int x) { return (byte)(x >> 24); } - private static byte int2(int x) { return (byte)(x >> 16); } - private static byte int1(int x) { return (byte)(x >> 8); } - private static byte int0(int x) { return (byte)(x ); } - - static void putIntL(ByteBuffer bb, int bi, int x) { - bb._put(bi + 3, int3(x)); - bb._put(bi + 2, int2(x)); - bb._put(bi + 1, int1(x)); - bb._put(bi , int0(x)); - } - - static void putIntL(long a, int x) { - _put(a + 3, int3(x)); - _put(a + 2, int2(x)); - _put(a + 1, int1(x)); - _put(a , int0(x)); - } - - static void putIntB(ByteBuffer bb, int bi, int x) { - bb._put(bi , int3(x)); - bb._put(bi + 1, int2(x)); - bb._put(bi + 2, int1(x)); - bb._put(bi + 3, int0(x)); - } - - static void putIntB(long a, int x) { - _put(a , int3(x)); - _put(a + 1, int2(x)); - _put(a + 2, int1(x)); - _put(a + 3, int0(x)); - } - - static void putInt(ByteBuffer bb, int bi, int x, boolean bigEndian) { - if (bigEndian) - putIntB(bb, bi, x); - else - putIntL(bb, bi, x); - } - - static void putInt(long a, int x, boolean bigEndian) { - if (bigEndian) - putIntB(a, x); - else - putIntL(a, x); - } - - - // -- get/put long -- - - private static long makeLong(byte b7, byte b6, byte b5, byte b4, - byte b3, byte b2, byte b1, byte b0) - { - return ((((long)b7 ) << 56) | - (((long)b6 & 0xff) << 48) | - (((long)b5 & 0xff) << 40) | - (((long)b4 & 0xff) << 32) | - (((long)b3 & 0xff) << 24) | - (((long)b2 & 0xff) << 16) | - (((long)b1 & 0xff) << 8) | - (((long)b0 & 0xff) )); - } - - static long getLongL(ByteBuffer bb, int bi) { - return makeLong(bb._get(bi + 7), - bb._get(bi + 6), - bb._get(bi + 5), - bb._get(bi + 4), - bb._get(bi + 3), - bb._get(bi + 2), - bb._get(bi + 1), - bb._get(bi )); - } - - static long getLongL(long a) { - return makeLong(_get(a + 7), - _get(a + 6), - _get(a + 5), - _get(a + 4), - _get(a + 3), - _get(a + 2), - _get(a + 1), - _get(a )); - } - - static long getLongB(ByteBuffer bb, int bi) { - return makeLong(bb._get(bi ), - bb._get(bi + 1), - bb._get(bi + 2), - bb._get(bi + 3), - bb._get(bi + 4), - bb._get(bi + 5), - bb._get(bi + 6), - bb._get(bi + 7)); - } - - static long getLongB(long a) { - return makeLong(_get(a ), - _get(a + 1), - _get(a + 2), - _get(a + 3), - _get(a + 4), - _get(a + 5), - _get(a + 6), - _get(a + 7)); - } - - static long getLong(ByteBuffer bb, int bi, boolean bigEndian) { - return bigEndian ? getLongB(bb, bi) : getLongL(bb, bi); - } - - static long getLong(long a, boolean bigEndian) { - return bigEndian ? getLongB(a) : getLongL(a); - } - - private static byte long7(long x) { return (byte)(x >> 56); } - private static byte long6(long x) { return (byte)(x >> 48); } - private static byte long5(long x) { return (byte)(x >> 40); } - private static byte long4(long x) { return (byte)(x >> 32); } - private static byte long3(long x) { return (byte)(x >> 24); } - private static byte long2(long x) { return (byte)(x >> 16); } - private static byte long1(long x) { return (byte)(x >> 8); } - private static byte long0(long x) { return (byte)(x ); } - - static void putLongL(ByteBuffer bb, int bi, long x) { - bb._put(bi + 7, long7(x)); - bb._put(bi + 6, long6(x)); - bb._put(bi + 5, long5(x)); - bb._put(bi + 4, long4(x)); - bb._put(bi + 3, long3(x)); - bb._put(bi + 2, long2(x)); - bb._put(bi + 1, long1(x)); - bb._put(bi , long0(x)); - } - - static void putLongL(long a, long x) { - _put(a + 7, long7(x)); - _put(a + 6, long6(x)); - _put(a + 5, long5(x)); - _put(a + 4, long4(x)); - _put(a + 3, long3(x)); - _put(a + 2, long2(x)); - _put(a + 1, long1(x)); - _put(a , long0(x)); - } - - static void putLongB(ByteBuffer bb, int bi, long x) { - bb._put(bi , long7(x)); - bb._put(bi + 1, long6(x)); - bb._put(bi + 2, long5(x)); - bb._put(bi + 3, long4(x)); - bb._put(bi + 4, long3(x)); - bb._put(bi + 5, long2(x)); - bb._put(bi + 6, long1(x)); - bb._put(bi + 7, long0(x)); - } - - static void putLongB(long a, long x) { - _put(a , long7(x)); - _put(a + 1, long6(x)); - _put(a + 2, long5(x)); - _put(a + 3, long4(x)); - _put(a + 4, long3(x)); - _put(a + 5, long2(x)); - _put(a + 6, long1(x)); - _put(a + 7, long0(x)); - } - - static void putLong(ByteBuffer bb, int bi, long x, boolean bigEndian) { - if (bigEndian) - putLongB(bb, bi, x); - else - putLongL(bb, bi, x); - } - - static void putLong(long a, long x, boolean bigEndian) { - if (bigEndian) - putLongB(a, x); - else - putLongL(a, x); - } - - - // -- get/put float -- - - static float getFloatL(ByteBuffer bb, int bi) { - return Float.intBitsToFloat(getIntL(bb, bi)); - } - - static float getFloatL(long a) { - return Float.intBitsToFloat(getIntL(a)); - } - - static float getFloatB(ByteBuffer bb, int bi) { - return Float.intBitsToFloat(getIntB(bb, bi)); - } - - static float getFloatB(long a) { - return Float.intBitsToFloat(getIntB(a)); - } - - static float getFloat(ByteBuffer bb, int bi, boolean bigEndian) { - return bigEndian ? getFloatB(bb, bi) : getFloatL(bb, bi); - } - - static float getFloat(long a, boolean bigEndian) { - return bigEndian ? getFloatB(a) : getFloatL(a); - } - - static void putFloatL(ByteBuffer bb, int bi, float x) { - putIntL(bb, bi, Float.floatToRawIntBits(x)); - } - - static void putFloatL(long a, float x) { - putIntL(a, Float.floatToRawIntBits(x)); - } - - static void putFloatB(ByteBuffer bb, int bi, float x) { - putIntB(bb, bi, Float.floatToRawIntBits(x)); - } - - static void putFloatB(long a, float x) { - putIntB(a, Float.floatToRawIntBits(x)); - } - - static void putFloat(ByteBuffer bb, int bi, float x, boolean bigEndian) { - if (bigEndian) - putFloatB(bb, bi, x); - else - putFloatL(bb, bi, x); - } - - static void putFloat(long a, float x, boolean bigEndian) { - if (bigEndian) - putFloatB(a, x); - else - putFloatL(a, x); - } - - - // -- get/put double -- - - static double getDoubleL(ByteBuffer bb, int bi) { - return Double.longBitsToDouble(getLongL(bb, bi)); - } - - static double getDoubleL(long a) { - return Double.longBitsToDouble(getLongL(a)); - } - - static double getDoubleB(ByteBuffer bb, int bi) { - return Double.longBitsToDouble(getLongB(bb, bi)); - } - - static double getDoubleB(long a) { - return Double.longBitsToDouble(getLongB(a)); - } - - static double getDouble(ByteBuffer bb, int bi, boolean bigEndian) { - return bigEndian ? getDoubleB(bb, bi) : getDoubleL(bb, bi); - } - - static double getDouble(long a, boolean bigEndian) { - return bigEndian ? getDoubleB(a) : getDoubleL(a); - } - - static void putDoubleL(ByteBuffer bb, int bi, double x) { - putLongL(bb, bi, Double.doubleToRawLongBits(x)); - } - - static void putDoubleL(long a, double x) { - putLongL(a, Double.doubleToRawLongBits(x)); - } - - static void putDoubleB(ByteBuffer bb, int bi, double x) { - putLongB(bb, bi, Double.doubleToRawLongBits(x)); - } - - static void putDoubleB(long a, double x) { - putLongB(a, Double.doubleToRawLongBits(x)); - } - - static void putDouble(ByteBuffer bb, int bi, double x, boolean bigEndian) { - if (bigEndian) - putDoubleB(bb, bi, x); - else - putDoubleL(bb, bi, x); - } - - static void putDouble(long a, double x, boolean bigEndian) { - if (bigEndian) - putDoubleB(a, x); - else - putDoubleL(a, x); - } - - // -- Unsafe access -- private static final Unsafe unsafe = Unsafe.getUnsafe(); - private static byte _get(long a) { - return unsafe.getByte(a); - } - - private static void _put(long a, byte b) { - unsafe.putByte(a, b); - } - static Unsafe unsafe() { return unsafe; } diff --git a/jdk/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template b/jdk/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template index bae622550ac..3ceb4122b62 100644 --- a/jdk/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template +++ b/jdk/src/java.base/share/classes/java/nio/ByteBufferAs-X-Buffer.java.template @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, 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 @@ -27,6 +27,8 @@ package java.nio; +import jdk.internal.misc.Unsafe; + class ByteBufferAs$Type$Buffer$RW$$BO$ // package-private extends {#if[ro]?ByteBufferAs}$Type$Buffer{#if[ro]?$BO$} @@ -34,8 +36,10 @@ class ByteBufferAs$Type$Buffer$RW$$BO$ // package-private #if[rw] + // Cached unsafe-access object + private static final Unsafe unsafe = Bits.unsafe(); + protected final ByteBuffer bb; - protected final int offset; #end[rw] @@ -50,7 +54,7 @@ class ByteBufferAs$Type$Buffer$RW$$BO$ // package-private this.limit(cap); int pos = this.position(); assert (pos <= cap); - offset = pos; + address = bb.address; #else[rw] super(bb); #end[rw] @@ -58,14 +62,15 @@ class ByteBufferAs$Type$Buffer$RW$$BO$ // package-private ByteBufferAs$Type$Buffer$RW$$BO$(ByteBuffer bb, int mark, int pos, int lim, int cap, - int off) + long addr) { #if[rw] super(mark, pos, lim, cap); this.bb = bb; - offset = off; + address = addr; + assert address >= bb.address; #else[rw] - super(bb, mark, pos, lim, cap, off); + super(bb, mark, pos, lim, cap, addr); #end[rw] } @@ -74,9 +79,8 @@ class ByteBufferAs$Type$Buffer$RW$$BO$ // package-private int lim = this.limit(); assert (pos <= lim); int rem = (pos <= lim ? lim - pos : 0); - int off = (pos << $LG_BYTES_PER_VALUE$) + offset; - assert (off >= 0); - return new ByteBufferAs$Type$Buffer$RW$$BO$(bb, -1, 0, rem, rem, off); + long addr = byteOffset(pos); + return new ByteBufferAs$Type$Buffer$RW$$BO$(bb, -1, 0, rem, rem, addr); } public $Type$Buffer duplicate() { @@ -85,7 +89,7 @@ class ByteBufferAs$Type$Buffer$RW$$BO$ // package-private this.position(), this.limit(), this.capacity(), - offset); + address); } public $Type$Buffer asReadOnlyBuffer() { @@ -95,7 +99,7 @@ class ByteBufferAs$Type$Buffer$RW$$BO$ // package-private this.position(), this.limit(), this.capacity(), - offset); + address); #else[rw] return duplicate(); #end[rw] @@ -103,21 +107,32 @@ class ByteBufferAs$Type$Buffer$RW$$BO$ // package-private #if[rw] - protected int ix(int i) { - return (i << $LG_BYTES_PER_VALUE$) + offset; + private int ix(int i) { + int off = (int) (address - bb.address); + return (i << $LG_BYTES_PER_VALUE$) + off; + } + + protected long byteOffset(long i) { + return (i << $LG_BYTES_PER_VALUE$) + address; } public $type$ get() { - return Bits.get$Type$$BO$(bb, ix(nextGetIndex())); + $memtype$ x = unsafe.get$Memtype$Unaligned(bb.hb, byteOffset(nextGetIndex()), + {#if[boB]?true:false}); + return $fromBits$(x); } public $type$ get(int i) { - return Bits.get$Type$$BO$(bb, ix(checkIndex(i))); + $memtype$ x = unsafe.get$Memtype$Unaligned(bb.hb, byteOffset(checkIndex(i)), + {#if[boB]?true:false}); + return $fromBits$(x); } #if[streamableType] $type$ getUnchecked(int i) { - return Bits.get$Type$$BO$(bb, ix(i)); + $memtype$ x = unsafe.get$Memtype$Unaligned(bb.hb, byteOffset(i), + {#if[boB]?true:false}); + return $fromBits$(x); } #end[streamableType] @@ -125,7 +140,9 @@ class ByteBufferAs$Type$Buffer$RW$$BO$ // package-private public $Type$Buffer put($type$ x) { #if[rw] - Bits.put$Type$$BO$(bb, ix(nextPutIndex()), x); + $memtype$ y = $toBits$(x); + unsafe.put$Memtype$Unaligned(bb.hb, byteOffset(nextPutIndex()), y, + {#if[boB]?true:false}); return this; #else[rw] throw new ReadOnlyBufferException(); @@ -134,7 +151,9 @@ class ByteBufferAs$Type$Buffer$RW$$BO$ // package-private public $Type$Buffer put(int i, $type$ x) { #if[rw] - Bits.put$Type$$BO$(bb, ix(checkIndex(i)), x); + $memtype$ y = $toBits$(x); + unsafe.put$Memtype$Unaligned(bb.hb, byteOffset(checkIndex(i)), y, + {#if[boB]?true:false}); return this; #else[rw] throw new ReadOnlyBufferException(); @@ -207,7 +226,7 @@ class ByteBufferAs$Type$Buffer$RW$$BO$ // package-private pos + start, pos + end, capacity(), - offset); + address); } #end[char] diff --git a/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template b/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template index 538bd5f02c6..6179776100d 100644 --- a/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template +++ b/jdk/src/java.base/share/classes/java/nio/Direct-X-Buffer-bin.java.template @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, 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 @@ -32,11 +32,8 @@ class XXX { #if[rw] private $type$ get$Type$(long a) { - if (unaligned) { - $memtype$ x = unsafe.get$Memtype$(a); - return $fromBits$(nativeByteOrder ? x : Bits.swap(x)); - } - return Bits.get$Type$(a, bigEndian); + $memtype$ x = unsafe.get$Memtype$Unaligned(null, a, bigEndian); + return $fromBits$(x); } public $type$ get$Type$() { @@ -51,12 +48,8 @@ class XXX { private ByteBuffer put$Type$(long a, $type$ x) { #if[rw] - if (unaligned) { - $memtype$ y = $toBits$(x); - unsafe.put$Memtype$(a, (nativeByteOrder ? y : Bits.swap(y))); - } else { - Bits.put$Type$(a, x, bigEndian); - } + $memtype$ y = $toBits$(x); + unsafe.put$Memtype$Unaligned(null, a, y, bigEndian); return this; #else[rw] throw new ReadOnlyBufferException(); @@ -95,13 +88,13 @@ class XXX { 0, size, size, - off)) + address + off)) : ($Type$Buffer)(new ByteBufferAs$Type$Buffer$RW$L(this, -1, 0, size, size, - off))); + address + off))); } else { return (nativeByteOrder ? ($Type$Buffer)(new Direct$Type$Buffer$RW$U(this, diff --git a/jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template b/jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template index 65f6cb31b27..69e65a099c7 100644 --- a/jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template +++ b/jdk/src/java.base/share/classes/java/nio/Heap-X-Buffer.java.template @@ -325,20 +325,20 @@ class Heap$Type$Buffer$RW$ public CharBuffer asCharBuffer() { int size = this.remaining() >> 1; - int off = offset + position(); + long addr = address + position(); return (bigEndian ? (CharBuffer)(new ByteBufferAsCharBuffer$RW$B(this, -1, 0, size, size, - off)) + addr)) : (CharBuffer)(new ByteBufferAsCharBuffer$RW$L(this, -1, 0, size, size, - off))); + addr))); } @@ -376,20 +376,20 @@ class Heap$Type$Buffer$RW$ public ShortBuffer asShortBuffer() { int size = this.remaining() >> 1; - int off = offset + position(); + long addr = address + position(); return (bigEndian ? (ShortBuffer)(new ByteBufferAsShortBuffer$RW$B(this, -1, 0, size, size, - off)) + addr)) : (ShortBuffer)(new ByteBufferAsShortBuffer$RW$L(this, -1, 0, size, size, - off))); + addr))); } @@ -427,20 +427,20 @@ class Heap$Type$Buffer$RW$ public IntBuffer asIntBuffer() { int size = this.remaining() >> 2; - int off = offset + position(); + long addr = address + position(); return (bigEndian ? (IntBuffer)(new ByteBufferAsIntBuffer$RW$B(this, -1, 0, size, size, - off)) + addr)) : (IntBuffer)(new ByteBufferAsIntBuffer$RW$L(this, -1, 0, size, size, - off))); + addr))); } @@ -478,20 +478,20 @@ class Heap$Type$Buffer$RW$ public LongBuffer asLongBuffer() { int size = this.remaining() >> 3; - int off = offset + position(); + long addr = address + position(); return (bigEndian ? (LongBuffer)(new ByteBufferAsLongBuffer$RW$B(this, -1, 0, size, size, - off)) + addr)) : (LongBuffer)(new ByteBufferAsLongBuffer$RW$L(this, -1, 0, size, size, - off))); + addr))); } @@ -533,20 +533,20 @@ class Heap$Type$Buffer$RW$ public FloatBuffer asFloatBuffer() { int size = this.remaining() >> 2; - int off = offset + position(); + long addr = address + position(); return (bigEndian ? (FloatBuffer)(new ByteBufferAsFloatBuffer$RW$B(this, -1, 0, size, size, - off)) + addr)) : (FloatBuffer)(new ByteBufferAsFloatBuffer$RW$L(this, -1, 0, size, size, - off))); + addr))); } @@ -588,20 +588,20 @@ class Heap$Type$Buffer$RW$ public DoubleBuffer asDoubleBuffer() { int size = this.remaining() >> 3; - int off = offset + position(); + long addr = address + position(); return (bigEndian ? (DoubleBuffer)(new ByteBufferAsDoubleBuffer$RW$B(this, -1, 0, size, size, - off)) + addr)) : (DoubleBuffer)(new ByteBufferAsDoubleBuffer$RW$L(this, -1, 0, size, size, - off))); + addr))); } diff --git a/jdk/src/java.base/share/classes/java/nio/file/FileTreeWalker.java b/jdk/src/java.base/share/classes/java/nio/file/FileTreeWalker.java index b0cf0d36afc..13bb629807f 100644 --- a/jdk/src/java.base/share/classes/java/nio/file/FileTreeWalker.java +++ b/jdk/src/java.base/share/classes/java/nio/file/FileTreeWalker.java @@ -168,7 +168,7 @@ class FileTreeWalker implements Closeable { * @throws IllegalArgumentException * if {@code maxDepth} is negative * @throws ClassCastException - * if (@code options} contains an element that is not a + * if {@code options} contains an element that is not a * {@code FileVisitOption} * @throws NullPointerException * if {@code options} is {@ocde null} or the options diff --git a/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java b/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java index e9187e4a81b..9beb6955c0c 100644 --- a/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java +++ b/jdk/src/java.base/share/classes/java/time/format/DateTimeFormatterBuilder.java @@ -810,7 +810,7 @@ public final class DateTimeFormatterBuilder { * The localized decimal style is not used. *

* The instant is obtained using {@link ChronoField#INSTANT_SECONDS INSTANT_SECONDS} - * and optionally (@code NANO_OF_SECOND). The value of {@code INSTANT_SECONDS} + * and optionally {@code NANO_OF_SECOND}. The value of {@code INSTANT_SECONDS} * may be outside the maximum range of {@code LocalDateTime}. *

* The {@linkplain ResolverStyle resolver style} has no effect on instant parsing. @@ -848,7 +848,7 @@ public final class DateTimeFormatterBuilder { * digits from zero to nine are accepted. *

* The instant is obtained using {@link ChronoField#INSTANT_SECONDS INSTANT_SECONDS} - * and optionally (@code NANO_OF_SECOND). The value of {@code INSTANT_SECONDS} + * and optionally {@code NANO_OF_SECOND}. The value of {@code INSTANT_SECONDS} * may be outside the maximum range of {@code LocalDateTime}. *

* The {@linkplain ResolverStyle resolver style} has no effect on instant parsing. diff --git a/jdk/src/java.base/share/classes/jdk/internal/reflect/MethodAccessorGenerator.java b/jdk/src/java.base/share/classes/jdk/internal/reflect/MethodAccessorGenerator.java index c4acdffe4d6..d0108b8c2df 100644 --- a/jdk/src/java.base/share/classes/jdk/internal/reflect/MethodAccessorGenerator.java +++ b/jdk/src/java.base/share/classes/jdk/internal/reflect/MethodAccessorGenerator.java @@ -437,17 +437,6 @@ class MethodAccessorGenerator extends AccessorGenerator { cb.opc_new(targetClass); cb.opc_dup(); } else { - // Setup before iterating down argument list - if (isPrimitive(returnType)) { - // new - // dup - // ... (see below:) - // invokespecial - // areturn - cb.opc_new(indexForPrimitiveType(returnType)); - cb.opc_dup(); - } - // Get target object on operand stack if necessary. // We need to do an explicit null check here; we won't see diff --git a/jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileTypeDetector.java b/jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileTypeDetector.java index 4b4e623275c..7a92479876e 100644 --- a/jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileTypeDetector.java +++ b/jdk/src/java.base/share/classes/sun/nio/fs/AbstractFileTypeDetector.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2016, 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 @@ -25,6 +25,8 @@ package sun.nio.fs; +import java.net.FileNameMap; +import java.net.URLConnection; import java.nio.file.Path; import java.nio.file.spi.FileTypeDetector; import java.util.Locale; @@ -71,6 +73,16 @@ public abstract class AbstractFileTypeDetector if (file == null) throw new NullPointerException("'file' is null"); String result = implProbeContentType(file); + + // Fall back to content types property. + if (result == null) { + Path fileName = file.getFileName(); + if (fileName != null) { + FileNameMap fileNameMap = URLConnection.getFileNameMap(); + result = fileNameMap.getContentTypeFor(fileName.toString()); + } + } + return (result == null) ? null : parse(result); } diff --git a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java index cd9dd9ab675..d3a58fe1b8a 100644 --- a/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java +++ b/jdk/src/java.base/share/classes/sun/reflect/annotation/AnnotationInvocationHandler.java @@ -30,7 +30,7 @@ import java.lang.annotation.*; import java.lang.reflect.*; import java.io.Serializable; import java.util.*; -import java.util.stream.Collectors; +import java.util.stream.*; import java.security.AccessController; import java.security.PrivilegedAction; @@ -163,47 +163,167 @@ class AnnotationInvocationHandler implements InvocationHandler, Serializable { */ private static String memberValueToString(Object value) { Class type = value.getClass(); - if (!type.isArray()) { // primitive, string, class, enum const, - // or annotation + if (!type.isArray()) { + // primitive value, string, class, enum const, or annotation if (type == Class.class) - return classValueToString((Class) value); + return toSourceString((Class) value); + else if (type == String.class) + return toSourceString((String) value); + if (type == Character.class) + return toSourceString((char) value); + else if (type == Double.class) + return toSourceString((double) value); + else if (type == Float.class) + return toSourceString((float) value); + else if (type == Long.class) + return toSourceString((long) value); else return value.toString(); - } + } else { + Stream stringStream; + if (type == byte[].class) + stringStream = convert((byte[]) value); + else if (type == char[].class) + stringStream = convert((char[]) value); + else if (type == double[].class) + stringStream = DoubleStream.of((double[]) value) + .mapToObj(AnnotationInvocationHandler::toSourceString); + else if (type == float[].class) + stringStream = convert((float[]) value); + else if (type == int[].class) + stringStream = IntStream.of((int[]) value).mapToObj(String::valueOf); + else if (type == long[].class) { + stringStream = LongStream.of((long[]) value) + .mapToObj(AnnotationInvocationHandler::toSourceString); + } else if (type == short[].class) + stringStream = convert((short[]) value); + else if (type == boolean[].class) + stringStream = convert((boolean[]) value); + else if (type == Class[].class) + stringStream = + Arrays.stream((Class[]) value). + map(AnnotationInvocationHandler::toSourceString); + else if (type == String[].class) + stringStream = + Arrays.stream((String[])value). + map(AnnotationInvocationHandler::toSourceString); + else + stringStream = Arrays.stream((Object[])value).map(Objects::toString); - if (type == byte[].class) - return Arrays.toString((byte[]) value); - if (type == char[].class) - return Arrays.toString((char[]) value); - if (type == double[].class) - return Arrays.toString((double[]) value); - if (type == float[].class) - return Arrays.toString((float[]) value); - if (type == int[].class) - return Arrays.toString((int[]) value); - if (type == long[].class) - return Arrays.toString((long[]) value); - if (type == short[].class) - return Arrays.toString((short[]) value); - if (type == boolean[].class) - return Arrays.toString((boolean[]) value); - if (type == Class[].class) - return classArrayValueToString((Class[])value); - return Arrays.toString((Object[]) value); + return stringStreamToString(stringStream); + } } /** * Translates a Class value to a form suitable for use in the * string representation of an annotation. */ - private static String classValueToString(Class clazz) { - return clazz.getName() + ".class" ; + private static String toSourceString(Class clazz) { + Class finalComponent = clazz; + StringBuilder arrayBackets = new StringBuilder(); + + while(finalComponent.isArray()) { + finalComponent = finalComponent.getComponentType(); + arrayBackets.append("[]"); + } + + return finalComponent.getName() + arrayBackets.toString() + ".class" ; } - private static String classArrayValueToString(Class[] classes) { - return Arrays.stream(classes) - .map(AnnotationInvocationHandler::classValueToString) - .collect(Collectors.joining(", ", "{", "}")); + private static String toSourceString(float f) { + if (Float.isFinite(f)) + return Float.toString(f) + "f" ; + else { + if (Float.isInfinite(f)) { + return (f < 0.0f) ? "-1.0f/0.0f": "1.0f/0.0f"; + } else + return "0.0f/0.0f"; + } + } + + private static String toSourceString(double d) { + if (Double.isFinite(d)) + return Double.toString(d); + else { + if (Double.isInfinite(d)) { + return (d < 0.0f) ? "-1.0/0.0": "1.0/0.0"; + } else + return "0.0/0.0"; + } + } + + private static String toSourceString(char c) { + StringBuilder sb = new StringBuilder(); + sb.append("'"); + if (c == '\'') + sb.append("\\'"); + else + sb.append(c); + sb.append("'"); + return sb.toString(); + } + + private static String toSourceString(long ell) { + return (Math.abs(ell) <= Integer.MAX_VALUE) ? + String.valueOf(ell) : + (String.valueOf(ell) + "L"); + } + + /** + * Return a string suitable for use in the string representation + * of an annotation. + */ + private static String toSourceString(String s) { + StringBuilder sb = new StringBuilder(); + sb.append('"'); + // Escape embedded quote characters, if present, but don't do + // anything more heroic. + if (s.indexOf('"') != -1) { + s = s.replace("\"", "\\\""); + } + sb.append(s); + sb.append('"'); + return sb.toString(); + } + + private static Stream convert(byte[] values) { + List list = new ArrayList<>(values.length); + for (byte b : values) + list.add(Byte.toString(b)); + return list.stream(); + } + + private static Stream convert(char[] values) { + List list = new ArrayList<>(values.length); + for (char c : values) + list.add(toSourceString(c)); + return list.stream(); + } + + private static Stream convert(float[] values) { + List list = new ArrayList<>(values.length); + for (float f : values) { + list.add(toSourceString(f)); + } + return list.stream(); + } + + private static Stream convert(short[] values) { + List list = new ArrayList<>(values.length); + for (short s : values) + list.add(Short.toString(s)); + return list.stream(); + } + + private static Stream convert(boolean[] values) { + List list = new ArrayList<>(values.length); + for (boolean b : values) + list.add(Boolean.toString(b)); + return list.stream(); + } + + private static String stringStreamToString(Stream stream) { + return stream.collect(Collectors.joining(", ", "{", "}")); } /** diff --git a/jdk/src/java.base/share/classes/sun/util/locale/LocaleMatcher.java b/jdk/src/java.base/share/classes/sun/util/locale/LocaleMatcher.java index 9e62b2eba23..3af00e4ce9e 100644 --- a/jdk/src/java.base/share/classes/sun/util/locale/LocaleMatcher.java +++ b/jdk/src/java.base/share/classes/sun/util/locale/LocaleMatcher.java @@ -28,16 +28,12 @@ package sun.util.locale; import java.util.ArrayList; import java.util.Collection; import java.util.HashMap; -import java.util.Iterator; -import java.util.LinkedHashMap; -import java.util.LinkedList; import java.util.List; import java.util.Locale; import java.util.Locale.*; import static java.util.Locale.FilteringMode.*; import static java.util.Locale.LanguageRange.*; import java.util.Map; -import java.util.Set; /** * Implementation for BCP47 Locale matching @@ -111,10 +107,22 @@ public final class LocaleMatcher { private static List filterBasic(List priorityList, Collection tags) { + int splitIndex = splitRanges(priorityList); + List nonZeroRanges; + List zeroRanges; + if (splitIndex != -1) { + nonZeroRanges = priorityList.subList(0, splitIndex); + zeroRanges = priorityList.subList(splitIndex, priorityList.size()); + } else { + nonZeroRanges = priorityList; + zeroRanges = List.of(); + } + List list = new ArrayList<>(); - for (LanguageRange lr : priorityList) { + for (LanguageRange lr : nonZeroRanges) { String range = lr.getRange(); if (range.equals("*")) { + tags = removeTagsMatchingBasicZeroRange(zeroRanges, tags); return new ArrayList(tags); } else { for (String tag : tags) { @@ -122,7 +130,8 @@ public final class LocaleMatcher { if (tag.startsWith(range)) { int len = range.length(); if ((tag.length() == len || tag.charAt(len) == '-') - && !list.contains(tag)) { + && !list.contains(tag) + && !shouldIgnoreFilterBasicMatch(zeroRanges, tag)) { list.add(tag); } } @@ -133,12 +142,76 @@ public final class LocaleMatcher { return list; } - private static List filterExtended(List priorityList, - Collection tags) { - List list = new ArrayList<>(); - for (LanguageRange lr : priorityList) { + /** + * Removes the tag(s) which are falling in the basic exclusion range(s) i.e + * range(s) with q=0 and returns the updated collection. If the basic + * language ranges contains '*' as one of its non zero range then instead of + * returning all the tags, remove those which are matching the range with + * quality weight q=0. + */ + private static Collection removeTagsMatchingBasicZeroRange( + List zeroRange, Collection tags) { + if (zeroRange.isEmpty()) { + return tags; + } + + List matchingTags = new ArrayList<>(); + for (String tag : tags) { + tag = tag.toLowerCase(Locale.ROOT); + if (!shouldIgnoreFilterBasicMatch(zeroRange, tag)) { + matchingTags.add(tag); + } + } + + return matchingTags; + } + + /** + * The tag which is falling in the basic exclusion range(s) should not + * be considered as the matching tag. Ignores the tag matching with the + * non-zero ranges, if the tag also matches with one of the basic exclusion + * ranges i.e. range(s) having quality weight q=0 + */ + private static boolean shouldIgnoreFilterBasicMatch( + List zeroRange, String tag) { + if (zeroRange.isEmpty()) { + return false; + } + + for (LanguageRange lr : zeroRange) { String range = lr.getRange(); if (range.equals("*")) { + return true; + } + if (tag.startsWith(range)) { + int len = range.length(); + if ((tag.length() == len || tag.charAt(len) == '-')) { + return true; + } + } + } + + return false; + } + + private static List filterExtended(List priorityList, + Collection tags) { + int splitIndex = splitRanges(priorityList); + List nonZeroRanges; + List zeroRanges; + if (splitIndex != -1) { + nonZeroRanges = priorityList.subList(0, splitIndex); + zeroRanges = priorityList.subList(splitIndex, priorityList.size()); + } else { + nonZeroRanges = priorityList; + zeroRanges = List.of(); + } + + List list = new ArrayList<>(); + for (LanguageRange lr : nonZeroRanges) { + String range = lr.getRange(); + if (range.equals("*")) { + tags = removeTagsMatchingExtendedZeroRange(zeroRanges, tags); return new ArrayList(tags); } String[] rangeSubtags = range.split("-"); @@ -150,33 +223,101 @@ public final class LocaleMatcher { continue; } - int rangeIndex = 1; - int tagIndex = 1; - - while (rangeIndex < rangeSubtags.length - && tagIndex < tagSubtags.length) { - if (rangeSubtags[rangeIndex].equals("*")) { - rangeIndex++; - } else if (rangeSubtags[rangeIndex].equals(tagSubtags[tagIndex])) { - rangeIndex++; - tagIndex++; - } else if (tagSubtags[tagIndex].length() == 1 - && !tagSubtags[tagIndex].equals("*")) { - break; - } else { - tagIndex++; - } - } - - if (rangeSubtags.length == rangeIndex && !list.contains(tag)) { - list.add(tag); - } + int rangeIndex = matchFilterExtendedSubtags(rangeSubtags, + tagSubtags); + if (rangeSubtags.length == rangeIndex && !list.contains(tag) + && !shouldIgnoreFilterExtendedMatch(zeroRanges, tag)) { + list.add(tag); + } } } return list; } + /** + * Removes the tag(s) which are falling in the extended exclusion range(s) + * i.e range(s) with q=0 and returns the updated collection. If the extended + * language ranges contains '*' as one of its non zero range then instead of + * returning all the tags, remove those which are matching the range with + * quality weight q=0. + */ + private static Collection removeTagsMatchingExtendedZeroRange( + List zeroRange, Collection tags) { + if (zeroRange.isEmpty()) { + return tags; + } + + List matchingTags = new ArrayList<>(); + for (String tag : tags) { + tag = tag.toLowerCase(Locale.ROOT); + if (!shouldIgnoreFilterExtendedMatch(zeroRange, tag)) { + matchingTags.add(tag); + } + } + + return matchingTags; + } + + /** + * The tag which is falling in the extended exclusion range(s) should + * not be considered as the matching tag. Ignores the tag matching with the + * non zero range(s), if the tag also matches with one of the extended + * exclusion range(s) i.e. range(s) having quality weight q=0 + */ + private static boolean shouldIgnoreFilterExtendedMatch( + List zeroRange, String tag) { + if (zeroRange.isEmpty()) { + return false; + } + + String[] tagSubtags = tag.split("-"); + for (LanguageRange lr : zeroRange) { + String range = lr.getRange(); + if (range.equals("*")) { + return true; + } + + String[] rangeSubtags = range.split("-"); + + if (!rangeSubtags[0].equals(tagSubtags[0]) + && !rangeSubtags[0].equals("*")) { + continue; + } + + int rangeIndex = matchFilterExtendedSubtags(rangeSubtags, + tagSubtags); + if (rangeSubtags.length == rangeIndex) { + return true; + } + } + + return false; + } + + private static int matchFilterExtendedSubtags(String[] rangeSubtags, + String[] tagSubtags) { + int rangeIndex = 1; + int tagIndex = 1; + + while (rangeIndex < rangeSubtags.length + && tagIndex < tagSubtags.length) { + if (rangeSubtags[rangeIndex].equals("*")) { + rangeIndex++; + } else if (rangeSubtags[rangeIndex] + .equals(tagSubtags[tagIndex])) { + rangeIndex++; + tagIndex++; + } else if (tagSubtags[tagIndex].length() == 1 + && !tagSubtags[tagIndex].equals("*")) { + break; + } else { + tagIndex++; + } + } + return rangeIndex; + } + public static Locale lookup(List priorityList, Collection locales) { if (priorityList.isEmpty() || locales.isEmpty()) { @@ -205,7 +346,18 @@ public final class LocaleMatcher { return null; } - for (LanguageRange lr : priorityList) { + int splitIndex = splitRanges(priorityList); + List nonZeroRanges; + List zeroRanges; + if (splitIndex != -1) { + nonZeroRanges = priorityList.subList(0, splitIndex); + zeroRanges = priorityList.subList(splitIndex, priorityList.size()); + } else { + nonZeroRanges = priorityList; + zeroRanges = List.of(); + } + + for (LanguageRange lr : nonZeroRanges) { String range = lr.getRange(); // Special language range ("*") is ignored in lookup. @@ -217,31 +369,83 @@ public final class LocaleMatcher { while (rangeForRegex.length() > 0) { for (String tag : tags) { tag = tag.toLowerCase(Locale.ROOT); - if (tag.matches(rangeForRegex)) { + if (tag.matches(rangeForRegex) + && !shouldIgnoreLookupMatch(zeroRanges, tag)) { return tag; } } // Truncate from the end.... - int index = rangeForRegex.lastIndexOf('-'); - if (index >= 0) { - rangeForRegex = rangeForRegex.substring(0, index); - - // if range ends with an extension key, truncate it. - index = rangeForRegex.lastIndexOf('-'); - if (index >= 0 && index == rangeForRegex.length()-2) { - rangeForRegex = - rangeForRegex.substring(0, rangeForRegex.length()-2); - } - } else { - rangeForRegex = ""; - } + rangeForRegex = truncateRange(rangeForRegex); } } return null; } + /** + * The tag which is falling in the exclusion range(s) should not be + * considered as the matching tag. Ignores the tag matching with the + * non zero range(s), if the tag also matches with one of the exclusion + * range(s) i.e. range(s) having quality weight q=0. + */ + private static boolean shouldIgnoreLookupMatch(List zeroRange, + String tag) { + for (LanguageRange lr : zeroRange) { + String range = lr.getRange(); + + // Special language range ("*") is ignored in lookup. + if (range.equals("*")) { + continue; + } + + String rangeForRegex = range.replaceAll("\\x2A", "\\\\p{Alnum}*"); + while (rangeForRegex.length() > 0) { + if (tag.matches(rangeForRegex)) { + return true; + } + // Truncate from the end.... + rangeForRegex = truncateRange(rangeForRegex); + } + } + + return false; + } + + /* Truncate the range from end during the lookup match */ + private static String truncateRange(String rangeForRegex) { + int index = rangeForRegex.lastIndexOf('-'); + if (index >= 0) { + rangeForRegex = rangeForRegex.substring(0, index); + + // if range ends with an extension key, truncate it. + index = rangeForRegex.lastIndexOf('-'); + if (index >= 0 && index == rangeForRegex.length() - 2) { + rangeForRegex + = rangeForRegex.substring(0, rangeForRegex.length() - 2); + } + } else { + rangeForRegex = ""; + } + + return rangeForRegex; + } + + /* Returns the split index of the priority list, if it contains + * language range(s) with quality weight as 0 i.e. q=0, else -1 + */ + private static int splitRanges(List priorityList) { + int size = priorityList.size(); + for (int index = 0; index < size; index++) { + LanguageRange range = priorityList.get(index); + if (range.getWeight() == 0) { + return index; + } + } + + return -1; // no q=0 range exists + } + public static List parse(String ranges) { ranges = ranges.replaceAll(" ", "").toLowerCase(Locale.ROOT); if (ranges.startsWith("accept-language:")) { diff --git a/jdk/src/java.base/unix/classes/sun/net/www/content-types.properties b/jdk/src/java.base/unix/classes/sun/net/www/content-types.properties index 025e7908c4c..c02dfa632b0 100644 --- a/jdk/src/java.base/unix/classes/sun/net/www/content-types.properties +++ b/jdk/src/java.base/unix/classes/sun/net/www/content-types.properties @@ -144,6 +144,10 @@ application/x-ustar: \ file_extensions=.ustar;\ action=save +audio/aac: \ + description=Advanced Audio Coding Audio;\ + file_extensions=.aac + audio/basic: \ description=Basic Audio;\ file_extensions=.snd,.au;\ @@ -151,6 +155,22 @@ audio/basic: \ action=application;\ application=audiotool %s +audio/flac: \ + description=Free Lossless Audio Codec Audio;\ + file_extensions=.flac + +audio/mp4: \ + description=MPEG-4 Audio;\ + file_extensions=.m4a + +audio/mpeg: \ + description=MPEG Audio;\ + file_extensions=.mp2,.mp3 + +audio/ogg: \ + description=Ogg Audio;\ + file_extensions=.oga,.ogg,.opus,.spx + audio/x-aiff: \ description=Audio Interchange Format File;\ file_extensions=.aifc,.aif,.aiff;\ @@ -178,6 +198,10 @@ image/jpeg: \ action=browser;\ application=imagetool %s +image/svg+xml: \ + description=Scalable Vector Graphics;\ + file_extensions=.svg,.svgz + image/tiff: \ description=TIFF Image;\ file_extensions=.tif,.tiff;\ @@ -248,6 +272,10 @@ text/x-setext: \ description=Structure Enhanced Text;\ file_extensions=.etx +video/mp4: \ + description=MPEG-4 Video;\ + file_extensions=.m4v,.mp4 + video/mpeg: \ description=MPEG Video Clip;\ file_extensions=.mpg,.mpe,.mpeg;\ @@ -255,10 +283,18 @@ video/mpeg: \ action=application;\ application=mpeg_play %s +video/ogg: \ + description=Ogg Video;\ + file_extensions=.ogv + video/quicktime: \ description=QuickTime Video Clip;\ file_extensions=.mov,.qt +video/webm: \ + description=WebM Video;\ + file_extensions=.webm + application/x-troff-msvideo: \ description=AVI Video;\ file_extensions=.avi;\ diff --git a/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c b/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c index afbe1e275ee..6c0e1cc1cd1 100644 --- a/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c +++ b/jdk/src/java.base/unix/native/libjava/ProcessHandleImpl_unix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -34,7 +34,6 @@ #include #include #include -#include #include #include #include @@ -46,6 +45,12 @@ #include #include +/* For POSIX-compliant getpwuid_r on Solaris */ +#if defined(__solaris__) +#define _POSIX_PTHREAD_SEMANTICS +#endif +#include + #ifdef _AIX #include #endif @@ -429,7 +434,9 @@ void unix_fillArgArray(JNIEnv *env, jobject jinfo, int nargs, char *cp, if (nargs >= 1) { // Create a String array for nargs-1 elements - argsArray = (*env)->NewObjectArray(env, nargs - 1, JNU_ClassString(env), NULL); + jclass clazzString = JNU_ClassString(env); + CHECK_NULL(clazzString); + argsArray = (*env)->NewObjectArray(env, nargs - 1, clazzString, NULL); CHECK_NULL(argsArray); for (i = 0; i < nargs - 1; i++) { @@ -468,12 +475,7 @@ void unix_getUserInfo(JNIEnv* env, jobject jinfo, uid_t uid) { } else { struct passwd pwent; struct passwd* p = NULL; - -#ifdef __solaris__ - RESTARTABLE_RETURN_PTR(getpwuid_r(uid, &pwent, pwbuf, (size_t)getpw_buf_size), p); -#else RESTARTABLE(getpwuid_r(uid, &pwent, pwbuf, (size_t)getpw_buf_size, &p), result); -#endif // Create the Java String if a name was found if (result == 0 && p != NULL && diff --git a/jdk/src/java.base/unix/native/libjava/java_props_md.c b/jdk/src/java.base/unix/native/libjava/java_props_md.c index b03bd6ac8f1..78e1b7b99c6 100644 --- a/jdk/src/java.base/unix/native/libjava/java_props_md.c +++ b/jdk/src/java.base/unix/native/libjava/java_props_md.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, 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 @@ -68,11 +68,6 @@ #endif #endif /* !_ALLBSD_SOURCE */ -#ifdef JAVASE_EMBEDDED -#include -#include -#endif - /* Take an array of string pairs (map of key->value) and a string (key). * Examine each pair in the map to see if the first string (key) matches the * string. If so, store the second string of the pair (value) in the value and @@ -350,36 +345,6 @@ static int ParseLocale(JNIEnv* env, int cat, char ** std_language, char ** std_s return 1; } -#ifdef JAVASE_EMBEDDED -/* Determine the default embedded toolkit based on whether libawt_xawt - * exists in the JRE. This can still be overridden by -Dawt.toolkit=XXX - */ -static char* getEmbeddedToolkit() { - Dl_info dlinfo; - char buf[MAXPATHLEN]; - int32_t len; - char *p; - struct stat statbuf; - - /* Get address of this library and the directory containing it. */ - dladdr((void *)getEmbeddedToolkit, &dlinfo); - realpath((char *)dlinfo.dli_fname, buf); - len = strlen(buf); - p = strrchr(buf, '/'); - /* Default AWT Toolkit on Linux and Solaris is XAWT (libawt_xawt.so). */ - strncpy(p, "/libawt_xawt.so", MAXPATHLEN-len-1); - /* Check if it exists */ - if (stat(buf, &statbuf) == -1 && errno == ENOENT) { - /* No - this is a reduced-headless-jre so use special HToolkit */ - return "sun.awt.HToolkit"; - } - else { - /* Yes - this is a headful JRE so fallback to SE defaults */ - return NULL; - } -} -#endif - /* This function gets called very early, before VM_CALLS are setup. * Do not use any of the VM_CALLS entries!!! */ @@ -424,10 +389,6 @@ GetJavaProperties(JNIEnv *env) sprops.awt_headless = isInAquaSession() ? NULL : "true"; #else sprops.graphics_env = "sun.awt.X11GraphicsEnvironment"; -#ifdef JAVASE_EMBEDDED - sprops.awt_toolkit = getEmbeddedToolkit(); - if (sprops.awt_toolkit == NULL) // default as below -#endif sprops.awt_toolkit = "sun.awt.X11.XToolkit"; #endif diff --git a/jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c b/jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c index fe203cdf2dc..81b37db572f 100644 --- a/jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c +++ b/jdk/src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2016, 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 @@ -29,8 +29,6 @@ #include #include #include -#include -#include #include #include #include @@ -43,6 +41,13 @@ #endif #include +/* For POSIX-compliant getpwuid_r, getgrgid_r on Solaris */ +#if defined(__solaris__) +#define _POSIX_PTHREAD_SEMANTICS +#endif +#include +#include + #ifdef __solaris__ #include #endif @@ -1022,11 +1027,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_getpwuid(JNIEnv* env, jclass this, jint uid int res = 0; errno = 0; - #ifdef __solaris__ - RESTARTABLE_RETURN_PTR(getpwuid_r((uid_t)uid, &pwent, pwbuf, (size_t)buflen), p); - #else - RESTARTABLE(getpwuid_r((uid_t)uid, &pwent, pwbuf, (size_t)buflen, &p), res); - #endif + RESTARTABLE(getpwuid_r((uid_t)uid, &pwent, pwbuf, (size_t)buflen, &p), res); if (res != 0 || p == NULL || p->pw_name == NULL || *(p->pw_name) == '\0') { /* not found or error */ @@ -1071,11 +1072,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_getgrgid(JNIEnv* env, jclass this, jint gid } errno = 0; - #ifdef __solaris__ - RESTARTABLE_RETURN_PTR(getgrgid_r((gid_t)gid, &grent, grbuf, (size_t)buflen), g); - #else - RESTARTABLE(getgrgid_r((gid_t)gid, &grent, grbuf, (size_t)buflen, &g), res); - #endif + RESTARTABLE(getgrgid_r((gid_t)gid, &grent, grbuf, (size_t)buflen, &g), res); retry = 0; if (res != 0 || g == NULL || g->gr_name == NULL || *(g->gr_name) == '\0') { @@ -1126,11 +1123,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_getpwnam0(JNIEnv* env, jclass this, const char* name = (const char*)jlong_to_ptr(nameAddress); errno = 0; - #ifdef __solaris__ - RESTARTABLE_RETURN_PTR(getpwnam_r(name, &pwent, pwbuf, (size_t)buflen), p); - #else - RESTARTABLE(getpwnam_r(name, &pwent, pwbuf, (size_t)buflen, &p), res); - #endif + RESTARTABLE(getpwnam_r(name, &pwent, pwbuf, (size_t)buflen, &p), res); if (res != 0 || p == NULL || p->pw_name == NULL || *(p->pw_name) == '\0') { /* not found or error */ @@ -1171,11 +1164,7 @@ Java_sun_nio_fs_UnixNativeDispatcher_getgrnam0(JNIEnv* env, jclass this, } errno = 0; - #ifdef __solaris__ - RESTARTABLE_RETURN_PTR(getgrnam_r(name, &grent, grbuf, (size_t)buflen), g); - #else - RESTARTABLE(getgrnam_r(name, &grent, grbuf, (size_t)buflen, &g), res); - #endif + RESTARTABLE(getgrnam_r(name, &grent, grbuf, (size_t)buflen, &g), res); retry = 0; if (res != 0 || g == NULL || g->gr_name == NULL || *(g->gr_name) == '\0') { diff --git a/jdk/src/java.base/windows/classes/sun/net/www/content-types.properties b/jdk/src/java.base/windows/classes/sun/net/www/content-types.properties index ace2f1301ed..34e8286a3c5 100644 --- a/jdk/src/java.base/windows/classes/sun/net/www/content-types.properties +++ b/jdk/src/java.base/windows/classes/sun/net/www/content-types.properties @@ -142,11 +142,31 @@ application/x-ustar: \ file_extensions=.ustar;\ action=save +audio/aac: \ + description=Advanced Audio Coding Audio;\ + file_extensions=.aac + audio/basic: \ description=Basic Audio;\ file_extensions=.snd,.au;\ icon=audio +audio/flac: \ + description=Free Lossless Audio Codec Audio;\ + file_extensions=.flac + +audio/mp4: \ + description=MPEG-4 Audio;\ + file_extensions=.m4a + +audio/mpeg: \ + description=MPEG Audio;\ + file_extensions=.mp2,.mp3 + +audio/ogg: \ + description=Ogg Audio;\ + file_extensions=.oga,.ogg,.opus,.spx + audio/x-aiff: \ description=Audio Interchange Format File;\ file_extensions=.aifc,.aif,.aiff;\ @@ -175,6 +195,10 @@ image/jpeg: \ icon=jpeg;\ action=browser +image/svg+xml: \ + description=Scalable Vector Graphics;\ + file_extensions=.svg,.svgz + image/tiff: \ description=TIFF Image;\ file_extensions=.tif,.tiff;\ @@ -245,15 +269,27 @@ text/x-setext: \ description=Structure Enhanced Text;\ file_extensions=.etx +video/mp4: \ + description=MPEG-4 Video;\ + file_extensions=.m4v,.mp4 + video/mpeg: \ description=MPEG Video Clip;\ file_extensions=.mpg,.mpe,.mpeg;\ icon=mpeg +video/ogg: \ + description=Ogg Video;\ + file_extensions=.ogv + video/quicktime: \ description=QuickTime Video Clip;\ file_extensions=.mov,.qt +video/webm: \ + description=WebM Video;\ + file_extensions=.webm + application/x-troff-msvideo: \ description=AVI Video;\ file_extensions=.avi;\ diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java index e7911bbea81..6fe6987cdfc 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java +++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/jpeg/JPEGImageReader.java @@ -561,6 +561,7 @@ public class JPEGImageReader extends ImageReader { throw new IOException("skipImage : Found extra SOI" + " marker before getting to EOI"); case 0: + case 255: // markers which doesn't contain length data case JPEG.RST0: case JPEG.RST1: diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java index d0d5c3e5ce0..9b5e7543203 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java +++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFImageWriter.java @@ -263,15 +263,15 @@ public class TIFFImageWriter extends ImageWriter { } public void setOutput(Object output) { - super.setOutput(output); - if (output != null) { - reset(); - if (!(output instanceof ImageOutputStream)) { throw new IllegalArgumentException ("output not an ImageOutputStream!"); } + + // reset() must precede setOutput() as it sets output to null + reset(); + this.stream = (ImageOutputStream)output; // @@ -312,6 +312,8 @@ public class TIFFImageWriter extends ImageWriter { } else { this.stream = null; } + + super.setOutput(output); } public IIOMetadata diff --git a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGCompressor.java b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGCompressor.java index 7b6cfcf5b28..b1f14532d5d 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGCompressor.java +++ b/jdk/src/java.desktop/share/classes/com/sun/imageio/plugins/tiff/TIFFJPEGCompressor.java @@ -79,10 +79,8 @@ public class TIFFJPEGCompressor extends TIFFBaseJPEGCompressor { try { IIORegistry registry = IIORegistry.getDefaultInstance(); - Class imageReaderClass = - Class.forName("javax.imageio.spi.ImageReaderSpi"); Iterator readerSPIs = - registry.getServiceProviders(imageReaderClass, + registry.getServiceProviders(ImageReaderSpi.class, new JPEGSPIFilter(), true); if(readerSPIs.hasNext()) { diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java index a8868ff67f6..b1b30da2454 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java +++ b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKGraphicsUtils.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, 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 @@ -49,16 +49,18 @@ class GTKGraphicsUtils extends SynthGraphicsUtils { int componentState = context.getComponentState(); if ((componentState & SynthConstants.DISABLED) == SynthConstants.DISABLED){ - Color orgColor = g.getColor(); - g.setColor(context.getStyle().getColor(context, - GTKColorType.WHITE)); - x += 1; - y += 1; - super.paintText(context, g, text, x, y, mnemonicIndex); + if (!GTKLookAndFeel.is3()) { + Color orgColor = g.getColor(); + g.setColor(context.getStyle().getColor(context, + GTKColorType.WHITE)); + x += 1; + y += 1; + super.paintText(context, g, text, x, y, mnemonicIndex); - g.setColor(orgColor); - x -= 1; - y -= 1; + g.setColor(orgColor); + x -= 1; + y -= 1; + } super.paintText(context, g, text, x, y, mnemonicIndex); } else { diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java index f19ac21e14d..46f8d3ff189 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java +++ b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKIconFactory.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, 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 @@ -214,6 +214,18 @@ class GTKIconFactory { Region region = context.getRegion(); GTKStyle style = (GTKStyle) context.getStyle(); + if (GTKLookAndFeel.is3() && region == Region.MENU) { + Object value = style.getClassSpecificValue("arrow-scaling"); + if (value instanceof Number) { + iconDimension = (int)(((Number) value).floatValue() * + (style.getFont(context).getSize2D() + + 2 * style.getClassSpecificIntValue(context, + "indicator-spacing", DEFAULT_ICON_SPACING))); + if (iconDimension > 0) { + return iconDimension; + } + } + } iconDimension = style.getClassSpecificIntValue(context, "indicator-size", (region == Region.CHECK_BOX_MENU_ITEM || diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java index be422a6275b..fea2b08309e 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java +++ b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKLookAndFeel.java @@ -65,12 +65,6 @@ public class GTKLookAndFeel extends SynthLookAndFeel { */ static Map aaTextInfo; - /** - * Solaris, or Linux with Sun JDS in a CJK Locale. - * Used to determine if Sun's high quality CJK fonts are present. - */ - private static boolean isSunCJK; - /* * Used to override if system (desktop) text anti-aliasing settings should * be used. The reasons for this are are is that currently its "off" @@ -107,36 +101,6 @@ public class GTKLookAndFeel extends SynthLookAndFeel { */ private static String gtkThemeName = "Default"; - static { - String language = Locale.getDefault().getLanguage(); - boolean cjkLocale = - (Locale.CHINESE.getLanguage().equals(language) || - Locale.JAPANESE.getLanguage().equals(language) || - Locale.KOREAN.getLanguage().equals(language)); - - if (cjkLocale) { - boolean isSunDesktop = false; - switch (OSInfo.getOSType()) { - case SOLARIS: - isSunDesktop = true; - break; - - case LINUX: - Boolean val = AccessController.doPrivileged( - new PrivilegedAction() { - public Boolean run() { - File f = new File("/etc/sun-release"); - return Boolean.valueOf(f.exists()); - } - }); - isSunDesktop = val.booleanValue(); - } - if (isSunDesktop && !sun.java2d.SunGraphicsEnvironment.isOpenSolaris) { - isSunCJK = true; - } - } - } - /** * Returns true if running on system containing at least 2.2. */ @@ -1474,19 +1438,10 @@ public class GTKLookAndFeel extends SynthLookAndFeel { /* * Check if system AA font settings should be used. - * Sun's JDS (for Linux and Solaris) ships with high quality CJK - * fonts and specifies via fontconfig that these be rendered in - * B&W to take advantage of the embedded bitmaps. - * If is a Sun CJK locale or remote display, indicate by the condition - * variable that in this case the L&F recommends ignoring desktop - * settings. On other Unixes (eg Linux) this doesn't apply. - * REMIND 1: The isSunCJK test is really just a place holder - * until we can properly query fontconfig and use the properties - * set for specific fonts. - * REMIND 2: See comment on isLocalDisplay() definition regarding + * REMIND: See comment on isLocalDisplay() definition regarding * XRender. */ - gtkAAFontSettingsCond = !isSunCJK && SwingUtilities2.isLocalDisplay(); + gtkAAFontSettingsCond = SwingUtilities2.isLocalDisplay(); aaTextInfo = new HashMap<>(2); SwingUtilities2.putAATextInfo(gtkAAFontSettingsCond, aaTextInfo); } diff --git a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java index 56ec905ba33..94408916d8f 100644 --- a/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java +++ b/jdk/src/java.desktop/share/classes/com/sun/java/swing/plaf/gtk/GTKPainter.java @@ -649,10 +649,19 @@ class GTKPainter extends SynthPainter { y += insets.top; if (orientation == JSeparator.HORIZONTAL) { w -= (insets.left + insets.right); - detail = "hseparator"; } else { h -= (insets.top + insets.bottom); - detail = "vseparator"; + } + if (GTKLookAndFeel.is3()) { + if (id == Region.POPUP_MENU_SEPARATOR) { + detail = "menuitem"; + h -= (insets.top + insets.bottom); + } else { + detail = "separator"; + } + } else { + detail = orientation == JSeparator.HORIZONTAL ? + "hseparator" : "vseparator"; } synchronized (UNIXToolkit.GTK_LOCK) { if (! ENGINE.paintCachedImage(g, x, y, w, h, id, state, @@ -1381,8 +1390,13 @@ class GTKPainter extends SynthPainter { if (gtkState == SynthConstants.MOUSE_OVER) { shadow = ShadowType.IN; } + if (!GTKLookAndFeel.is3()) { + x += 3; + y += 3; + w = h = 7; + } ENGINE.paintArrow(g, context, Region.MENU_ITEM, gtkState, shadow, - dir, "menuitem", x + 3, y + 3, 7, 7); + dir, "menuitem", x, y, w, h); } public void paintCheckBoxMenuItemCheckIcon(SynthContext context, diff --git a/jdk/src/java.desktop/share/classes/java/awt/HeadlessException.java b/jdk/src/java.desktop/share/classes/java/awt/HeadlessException.java index 5809ffd9faf..55ba37b1e82 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/HeadlessException.java +++ b/jdk/src/java.desktop/share/classes/java/awt/HeadlessException.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, 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 @@ -28,10 +28,14 @@ package java.awt; /** * Thrown when code that is dependent on a keyboard, display, or mouse * is called in an environment that does not support a keyboard, display, - * or mouse. + * or mouse. Any code that depends on any of those devices should firstly + * ensure their availability using the {@code GraphicsEnvironment.isHeadless()} + * method and throw {@code HeadlessException} if the latter returns + * {@code true}. * * @since 1.4 * @author Michael Martak + * @see GraphicsEnvironment#isHeadless */ public class HeadlessException extends UnsupportedOperationException { /* @@ -40,12 +44,24 @@ public class HeadlessException extends UnsupportedOperationException { private static final long serialVersionUID = 167183644944358563L; /** - * Constructs new {@code HeadlessException} + * Constructs new {@code HeadlessException} with empty message. + * For such {@code HeadlessException} the default headless error message + * may be auto-generated for some platforms. + * The text of the default headless message may depend on + * whether the GraphicsEnvironment is in fact headless. + * That is, the default headless message is both system and environmentally + * dependent. */ public HeadlessException() {} /** * Create a new instance with the specified detailed error message. + * For some platforms the default headless error message may be + * added at the end of the specified message. + * The text of the default headless message may depend on + * whether the GraphicsEnvironment is in fact headless. + * That is, the default headless message is both system and environmentally + * dependent. * * @param msg the error message */ @@ -54,7 +70,16 @@ public class HeadlessException extends UnsupportedOperationException { } /** - * {@inheritDoc} + * Returns the detail message string of this {@code HeadlessException}. + * Depending on the platform the message specified in the constructor may + * be followed by the default headless error message. + * The text of the default headless message may depend on + * whether the GraphicsEnvironment is in fact headless. + * That is, the default headless message is both system and environmentally + * dependent. + * + * @return the detail message string of this {@code HeadlessException} + * instance (which may be {@code null}). */ public String getMessage() { String superMessage = super.getMessage(); diff --git a/jdk/src/java.desktop/share/classes/java/awt/TrayIcon.java b/jdk/src/java.desktop/share/classes/java/awt/TrayIcon.java index 08ad08d8820..7c7a5f9af6f 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/TrayIcon.java +++ b/jdk/src/java.desktop/share/classes/java/awt/TrayIcon.java @@ -47,7 +47,8 @@ import java.security.AccessController; * of the events by itself. For example, by default, when the * right-mouse click is performed on the {@code TrayIcon} it * displays the specified popup menu. When the mouse hovers - * over the {@code TrayIcon} the tooltip is displayed. + * over the {@code TrayIcon} the tooltip is displayed (this behaviour is + * platform dependent). * *

Note: When the {@code MouseEvent} is * dispatched to its registered listeners its {@code component} @@ -174,7 +175,7 @@ public class TrayIcon { /** * Creates a {@code TrayIcon} with the specified image and - * tooltip text. + * tooltip text. Tooltip may be not visible on some platforms. * * @param image the {@code Image} to be used * @param tooltip the string to be used as tooltip text; if the @@ -200,7 +201,7 @@ public class TrayIcon { /** * Creates a {@code TrayIcon} with the specified image, - * tooltip and popup menu. + * tooltip and popup menu. Tooltip may be not visible on some platforms. * * @param image the {@code Image} to be used * @param tooltip the string to be used as tooltip text; if the @@ -330,8 +331,8 @@ public class TrayIcon { /** * Sets the tooltip string for this {@code TrayIcon}. The * tooltip is displayed automatically when the mouse hovers over - * the icon. Setting the tooltip to {@code null} removes any - * tooltip text. + * the icon. Tooltip may be not visible on some platforms. + * Setting the tooltip to {@code null} removes any tooltip text. * * When displayed, the tooltip string may be truncated on some platforms; * the number of characters that may be displayed is platform-dependent. diff --git a/jdk/src/java.desktop/share/classes/java/awt/image/LookupOp.java b/jdk/src/java.desktop/share/classes/java/awt/image/LookupOp.java index b83c1002253..2897c11719f 100644 --- a/jdk/src/java.desktop/share/classes/java/awt/image/LookupOp.java +++ b/jdk/src/java.desktop/share/classes/java/awt/image/LookupOp.java @@ -1,6 +1,6 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2016, 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 @@ -253,7 +253,6 @@ public class LookupOp implements BufferedImageOp, RasterOp { */ public final WritableRaster filter (Raster src, WritableRaster dst) { int numBands = src.getNumBands(); - int dstLength = dst.getNumBands(); int height = src.getHeight(); int width = src.getWidth(); int srcPix[] = new int[numBands]; @@ -268,7 +267,7 @@ public class LookupOp implements BufferedImageOp, RasterOp { IllegalArgumentException ("Width or height of Rasters do not "+ "match"); } - dstLength = dst.getNumBands(); + int dstLength = dst.getNumBands(); if (numBands != dstLength) { throw new diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java index 76e28bc9743..c9ac7374a00 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java +++ b/jdk/src/java.desktop/share/classes/javax/imageio/metadata/IIOMetadata.java @@ -414,14 +414,23 @@ public abstract class IIOMetadata { } } + // If updating this method also see the same in ImageReaderWriterSpi.java private Class getMetadataFormatClass(String formatClassName) { Module thisModule = IIOMetadata.class.getModule(); Module targetModule = this.getClass().getModule(); - Class c = Class.forName(targetModule, formatClassName); + Class c = null; + try { + ClassLoader cl = this.getClass().getClassLoader(); + c = Class.forName(formatClassName, false, cl); + if (!IIOMetadataFormat.class.isAssignableFrom(c)) { + return null; + } + } catch (ClassNotFoundException e) { + } if (thisModule.equals(targetModule) || c == null) { return c; } - if (thisModule.isNamed()) { + if (targetModule.isNamed()) { int i = formatClassName.lastIndexOf("."); String pn = i > 0 ? formatClassName.substring(0, i) : ""; if (!targetModule.isExported(pn, thisModule)) { diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java index 8a1fbf20b5d..edcb086cb45 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java +++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFField.java @@ -517,18 +517,18 @@ public class TIFFField implements Cloneable { * @param count The number of data values. * @param data The actual data content of the field. * - * @throws NullPointerException if {@code tag == null}. + * @throws NullPointerException if {@code tag == null}. * @throws IllegalArgumentException if {@code type} is not * one of the {@code TIFFTag.TIFF_*} data type constants. * @throws IllegalArgumentException if {@code type} is an unacceptable * data type for the supplied {@code TIFFTag}. - * @throws IllegalArgumentException if {@code count < 0}. - * @throws IllegalArgumentException if {@code count < 1} + * @throws IllegalArgumentException if {@code count < 0}. + * @throws IllegalArgumentException if {@code count < 1} * and {@code type} is {@code TIFF_RATIONAL} or * {@code TIFF_SRATIONAL}. - * @throws IllegalArgumentException if {@code count ≠ 1} + * @throws IllegalArgumentException if {@code count != 1} * and {@code type} is {@code TIFF_IFD_POINTER}. - * @throws NullPointerException if {@code data == null}. + * @throws NullPointerException if {@code data == null}. * @throws IllegalArgumentException if {@code data} is an instance of * a class incompatible with the specified type. * @throws IllegalArgumentException if the size of the data array is wrong. @@ -632,12 +632,12 @@ public class TIFFField implements Cloneable { * @param type One of the {@code TIFFTag.TIFF_*} constants * indicating the data type of the field as written to the TIFF stream. * @param count The number of data values. - * @throws NullPointerException if {@code tag == null}. + * @throws NullPointerException if {@code tag == null}. * @throws IllegalArgumentException if {@code type} is not * one of the {@code TIFFTag.TIFF_*} data type constants. * @throws IllegalArgumentException if {@code type} is an unacceptable * data type for the supplied {@code TIFFTag}. - * @throws IllegalArgumentException if {@code count < 0}. + * @throws IllegalArgumentException if {@code count < 0}. * @see #TIFFField(TIFFTag,int,int,Object) */ public TIFFField(TIFFTag tag, int type, int count) { @@ -649,16 +649,16 @@ public class TIFFField implements Cloneable { * value. * The field will have type * {@link TIFFTag#TIFF_SHORT TIFF_SHORT} if - * {@code val < 65536} and type + * {@code val < 65536} and type * {@link TIFFTag#TIFF_LONG TIFF_LONG} otherwise. The count * of the field will be unity. * * @param tag The tag to associate with this field. * @param value The value to associate with this field. - * @throws NullPointerException if {@code tag == null}. + * @throws NullPointerException if {@code tag == null}. * @throws IllegalArgumentException if the derived type is unacceptable * for the supplied {@code TIFFTag}. - * @throws IllegalArgumentException if {@code value < 0}. + * @throws IllegalArgumentException if {@code value < 0}. */ public TIFFField(TIFFTag tag, int value) { if(tag == null) { @@ -705,19 +705,26 @@ public class TIFFField implements Cloneable { * @param offset The IFD offset. * @param dir The directory. * - * @throws NullPointerException if {@code tag == null}. - * @throws IllegalArgumentException if {@code type} is neither - * {@code TIFFTag.TIFF_LONG} nor {@code TIFFTag.TIFF_IFD_POINTER}. + * @throws NullPointerException if {@code tag == null}. * @throws IllegalArgumentException if {@code type} is an unacceptable * data type for the supplied {@code TIFFTag}. - * @throws IllegalArgumentException if {@code offset} is non-positive. - * @throws NullPointerException if {@code dir == null}. + * @throws IllegalArgumentException if {@code type} is neither + * {@code TIFFTag.TIFF_LONG} nor {@code TIFFTag.TIFF_IFD_POINTER}. + * @throws IllegalArgumentException if {@code offset <= 0}. + * @throws NullPointerException if {@code dir == null}. * * @see #TIFFField(TIFFTag,int,int,Object) */ public TIFFField(TIFFTag tag, int type, long offset, TIFFDirectory dir) { - this(tag, type, 1, new long[] {offset}); - if (type != TIFFTag.TIFF_LONG && type != TIFFTag.TIFF_IFD_POINTER) { + if (tag == null) { + throw new NullPointerException("tag == null!"); + } else if (type < TIFFTag.MIN_DATATYPE || type > TIFFTag.MAX_DATATYPE) { + throw new IllegalArgumentException("Unknown data type "+type); + } else if (!tag.isDataTypeOK(type)) { + throw new IllegalArgumentException("Illegal data type " + type + + " for " + tag.getName() + " tag"); + } else if (type != TIFFTag.TIFF_LONG + && type != TIFFTag.TIFF_IFD_POINTER) { throw new IllegalArgumentException("type " + type + " is neither TIFFTag.TIFF_LONG nor TIFFTag.TIFF_IFD_POINTER"); } else if (offset <= 0) { @@ -726,6 +733,13 @@ public class TIFFField implements Cloneable { } else if (dir == null) { throw new NullPointerException("dir == null"); } + + this.tag = tag; + this.tagNumber = tag.getNumber(); + this.type = type; + this.count = 1; + this.data = new long[] {offset}; + this.dir = dir; } @@ -739,7 +753,7 @@ public class TIFFField implements Cloneable { } /** - * Retrieves the tag number in the range {@code [0, 65535]}. + * Retrieves the tag number in the range {@code [0,65535]}. * * @return The tag number. */ @@ -804,7 +818,7 @@ public class TIFFField implements Cloneable { * * @throws IllegalArgumentException if {@code dataType} is not * one of the {@code TIFFTag.TIFF_*} data type constants. - * @throws IllegalArgumentException if {@code count < 0}. + * @throws IllegalArgumentException if {@code count < 0}. */ public static Object createArrayForType(int dataType, int count) { if(count < 0) { diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFTag.java b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFTag.java index c312bd55419..33f88f9e34c 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFTag.java +++ b/jdk/src/java.desktop/share/classes/javax/imageio/plugins/tiff/TIFFTag.java @@ -334,8 +334,8 @@ public class TIFFTag { * an IFD pointer if and only if its {@code TIFFTagSet} is * non-{@code null} or the data type {@code TIFF_IFD_POINTER} is * legal. This condition will be satisfied if and only if either - * {@code getTagSet() != null} or - * {@code isDataTypeOK(TIFF_IFD_POINTER) == true}. + * {@code getTagSet() != null} or + * {@code isDataTypeOK(TIFF_IFD_POINTER) == true}. * *

Many TIFF extensions use the IFD mechanism in order to limit the * number of new tags that may appear in the root IFD.

diff --git a/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java b/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java index d46711aedc7..e5961b90e4a 100644 --- a/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java +++ b/jdk/src/java.desktop/share/classes/javax/imageio/spi/ImageReaderWriterSpi.java @@ -604,14 +604,23 @@ public abstract class ImageReaderWriterSpi extends IIOServiceProvider { } } + // If updating this method also see the same in IIOMetadata.java private Class getMetadataFormatClass(String formatClassName) { Module thisModule = ImageReaderWriterSpi.class.getModule(); Module targetModule = this.getClass().getModule(); - Class c = Class.forName(targetModule, formatClassName); + Class c = null; + try { + ClassLoader cl = this.getClass().getClassLoader(); + c = Class.forName(formatClassName, false, cl); + if (!IIOMetadataFormat.class.isAssignableFrom(c)) { + return null; + } + } catch (ClassNotFoundException e) { + } if (thisModule.equals(targetModule) || c == null) { return c; } - if (thisModule.isNamed()) { + if (targetModule.isNamed()) { int i = formatClassName.lastIndexOf("."); String pn = i > 0 ? formatClassName.substring(0, i) : ""; if (!targetModule.isExported(pn, thisModule)) { diff --git a/jdk/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java b/jdk/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java index 508d7db8fe8..1ece19ee805 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/event/TableModelEvent.java @@ -177,7 +177,7 @@ public class TableModelEvent extends java.util.EventObject * @param lastRow the last row affected by this event * @param column the column index of cells changed; {@code ALL_COLUMNS} * signifies all cells in the specified range of rows are changed. - * @param type the type of change signified by this even, @code INSERT}, + * @param type the type of change signified by this even, {@code INSERT}, * {@code DELETE } or {@code UPDATE} */ public TableModelEvent(TableModel source, int firstRow, int lastRow, int column, int type) { diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonListener.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonListener.java index 1fda40ee5df..3a1883329fe 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonListener.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicButtonListener.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2016, 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 @@ -229,10 +229,13 @@ public class BasicButtonListener implements MouseListener, MouseMotionListener, AbstractButton b = (AbstractButton) e.getSource(); if(b.contains(e.getX(), e.getY())) { - long multiClickThreshhold = b.getMultiClickThreshhold(); long lastTime = lastPressedTimestamp; - long currentTime = lastPressedTimestamp = e.getWhen(); - if (lastTime != -1 && currentTime - lastTime < multiClickThreshhold) { + lastPressedTimestamp = e.getWhen(); + long timeSinceLastClick = lastPressedTimestamp - lastTime; + if (lastTime != -1 && + timeSinceLastClick > 0 && + timeSinceLastClick < b.getMultiClickThreshhold()) { + shouldDiscardRelease = true; return; } @@ -325,4 +328,4 @@ public class BasicButtonListener implements MouseListener, MouseMotionListener, !((AbstractButton)sender).getModel().isEnabled()); } } -} \ No newline at end of file +} diff --git a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java index 2941cc9e85b..64894fbb2b1 100644 --- a/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java +++ b/jdk/src/java.desktop/share/classes/javax/swing/plaf/basic/BasicTextUI.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2016, 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 @@ -940,9 +940,10 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory { rootView.setSize(d.width - i.left - i.right - caretMargin, d.height - i.top - i.bottom); } - else if (d.width <= 0 || d.height <= 0) { + else if (!rootViewInitialized && (d.width <= 0 || d.height <= 0)) { // Probably haven't been layed out yet, force some sort of // initial sizing. + rootViewInitialized = true; rootView.setSize(Integer.MAX_VALUE, Integer.MAX_VALUE); } d.width = (int) Math.min((long) rootView.getPreferredSpan(View.X_AXIS) + @@ -1346,6 +1347,7 @@ public abstract class BasicTextUI extends TextUI implements ViewFactory { private static final Position.Bias[] discardBias = new Position.Bias[1]; private DefaultCaret dropCaret; private int caretMargin; + private boolean rootViewInitialized; /** * Root view that acts as a gateway between the component diff --git a/jdk/src/java.desktop/share/classes/sun/awt/FontConfiguration.java b/jdk/src/java.desktop/share/classes/sun/awt/FontConfiguration.java index b4deecebc8a..d5190db0a0e 100644 --- a/jdk/src/java.desktop/share/classes/sun/awt/FontConfiguration.java +++ b/jdk/src/java.desktop/share/classes/sun/awt/FontConfiguration.java @@ -251,12 +251,24 @@ public abstract class FontConfiguration { private File findImpl(String fname) { File f = new File(fname + ".properties"); + if (FontUtilities.debugFonts()) { + logger.info("Looking for text fontconfig file : " + f); + } if (f.canRead()) { + if (FontUtilities.debugFonts()) { + logger.info("Found file : " + f); + } isProperties = true; return f; } f = new File(fname + ".bfc"); + if (FontUtilities.debugFonts()) { + logger.info("Looking for binary fontconfig file : " + f); + } if (f.canRead()) { + if (FontUtilities.debugFonts()) { + logger.info("Found file : " + f); + } isProperties = false; return f; } @@ -305,6 +317,9 @@ public abstract class FontConfiguration { if (configFile != null) { return configFile; } + if (FontUtilities.debugFonts()) { + logger.info("Did not find a fontconfig file."); + } return null; } diff --git a/jdk/src/java.desktop/share/classes/sun/awt/IconInfo.java b/jdk/src/java.desktop/share/classes/sun/awt/IconInfo.java index 8473fdee764..4d3e04425f6 100644 --- a/jdk/src/java.desktop/share/classes/sun/awt/IconInfo.java +++ b/jdk/src/java.desktop/share/classes/sun/awt/IconInfo.java @@ -25,10 +25,12 @@ package sun.awt; import java.awt.*; import java.awt.color.*; +import java.awt.geom.AffineTransform; import java.awt.image.*; import sun.awt.image.ToolkitImage; import sun.awt.image.ImageRepresentation; import java.util.Arrays; +import sun.java2d.pipe.Region; public class IconInfo { /** @@ -101,7 +103,7 @@ public class IconInfo { } this.scaledWidth = width; this.scaledHeight = height; - this.rawLength = width * height + 2; + this.rawLength = getScaledRawLength(); } /* @@ -110,7 +112,27 @@ public class IconInfo { public void setScaledSize(int width, int height) { this.scaledWidth = width; this.scaledHeight = height; - this.rawLength = width * height + 2; + this.rawLength = getScaledRawLength(); + } + + /* + * returns scaled raw length. + */ + private int getScaledRawLength() { + int scaledWidthAndHeight[] = getScaledWidthAndHeight(width, height); + return scaledWidthAndHeight[0] * scaledWidthAndHeight[1] + 2; + } + + /* + * returns the scaled width and height. + */ + private static int[] getScaledWidthAndHeight(int width, int height) { + AffineTransform tx = GraphicsEnvironment.getLocalGraphicsEnvironment(). + getDefaultScreenDevice().getDefaultConfiguration(). + getDefaultTransform(); + int w = Region.clipScale(width, tx.getScaleX()); + int h = Region.clipScale(height, tx.getScaleY()); + return new int[]{w, h}; } public boolean isValid() { @@ -215,6 +237,9 @@ public class IconInfo { new DirectColorModel(ColorSpace.getInstance(ColorSpace.CS_sRGB), 32, 0x00ff0000, 0x0000ff00, 0x000000ff, 0xff000000, false, DataBuffer.TYPE_INT); + int scaledWidthAndHeight[] = getScaledWidthAndHeight(width, height); + width = scaledWidthAndHeight[0]; + height = scaledWidthAndHeight[1]; DataBufferInt buffer = new DataBufferInt(width * height); WritableRaster raster = Raster.createPackedRaster(buffer, width, height, diff --git a/jdk/src/java.desktop/share/classes/sun/awt/RequestFocusController.java b/jdk/src/java.desktop/share/classes/sun/awt/RequestFocusController.java index 29c94c6ab1b..61a61919fa7 100644 --- a/jdk/src/java.desktop/share/classes/sun/awt/RequestFocusController.java +++ b/jdk/src/java.desktop/share/classes/sun/awt/RequestFocusController.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2016, 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 diff --git a/jdk/src/java.desktop/share/classes/sun/font/FontUtilities.java b/jdk/src/java.desktop/share/classes/sun/font/FontUtilities.java index bfbd4559448..0a243cd0e24 100644 --- a/jdk/src/java.desktop/share/classes/sun/font/FontUtilities.java +++ b/jdk/src/java.desktop/share/classes/sun/font/FontUtilities.java @@ -50,12 +50,6 @@ public final class FontUtilities { public static boolean isMacOSX; - public static boolean isSolaris8; - - public static boolean isSolaris9; - - public static boolean isOpenSolaris; - public static boolean useT2K; public static boolean isWindows; @@ -88,37 +82,6 @@ public final class FontUtilities { } else { useT2K = false; } - if (isSolaris) { - String version = System.getProperty("os.version", "0.0"); - isSolaris8 = version.startsWith("5.8"); - isSolaris9 = version.startsWith("5.9"); - float ver = Float.parseFloat(version); - if (ver > 5.10f) { - File f = new File("/etc/release"); - String line = null; - try { - FileInputStream fis = new FileInputStream(f); - InputStreamReader isr = new InputStreamReader( - fis, "ISO-8859-1"); - BufferedReader br = new BufferedReader(isr); - line = br.readLine(); - fis.close(); - } catch (Exception ex) { - // Nothing to do here. - } - if (line != null && line.indexOf("OpenSolaris") >= 0) { - isOpenSolaris = true; - } else { - isOpenSolaris = false; - } - } else { - isOpenSolaris = false; - } - } else { - isSolaris8 = false; - isSolaris9 = false; - isOpenSolaris = false; - } isWindows = osName.startsWith("Windows"); String jreLibDirName = System.getProperty("java.home", "") + File.separator + "lib"; diff --git a/jdk/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java b/jdk/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java index de79dbbb33c..fee43f1ce26 100644 --- a/jdk/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java +++ b/jdk/src/java.desktop/share/classes/sun/font/TrueTypeGlyphMapper.java @@ -32,8 +32,6 @@ public class TrueTypeGlyphMapper extends CharToGlyphMapper { static final char REVERSE_SOLIDUS = 0x005c; // the backslash char. static final char JA_YEN = 0x00a5; - static final char JA_FULLWIDTH_TILDE_CHAR = 0xff5e; - static final char JA_WAVE_DASH_CHAR = 0x301c; /* if running on Solaris and default Locale is ja_JP then * we map need to remap reverse solidus (backslash) to Yen as @@ -41,7 +39,6 @@ public class TrueTypeGlyphMapper extends CharToGlyphMapper { */ static final boolean isJAlocale = Locale.JAPAN.equals(Locale.getDefault()); private final boolean needsJAremapping; - private boolean remapJAWaveDash; TrueTypeFont font; CMap cmap; @@ -66,10 +63,6 @@ public class TrueTypeGlyphMapper extends CharToGlyphMapper { } if (FontUtilities.isSolaris && isJAlocale && font.supportsJA()) { needsJAremapping = true; - if (FontUtilities.isSolaris8 && - getGlyphFromCMAP(JA_WAVE_DASH_CHAR) == missingGlyph) { - remapJAWaveDash = true; - } } else { needsJAremapping = false; } @@ -113,35 +106,12 @@ public class TrueTypeGlyphMapper extends CharToGlyphMapper { cmap = CMap.theNullCmap; } - @SuppressWarnings("fallthrough") private final char remapJAChar(char unicode) { - switch (unicode) { - case REVERSE_SOLIDUS: - return JA_YEN; - /* This is a workaround for bug 4533422. - * Japanese wave dash missing from Solaris JA TrueType fonts. - */ - case JA_WAVE_DASH_CHAR: - if (remapJAWaveDash) { - return JA_FULLWIDTH_TILDE_CHAR; - } - default: return unicode; - } + return (unicode == REVERSE_SOLIDUS) ? JA_YEN : unicode; } - @SuppressWarnings("fallthrough") + private final int remapJAIntChar(int unicode) { - switch (unicode) { - case REVERSE_SOLIDUS: - return JA_YEN; - /* This is a workaround for bug 4533422. - * Japanese wave dash missing from Solaris JA TrueType fonts. - */ - case JA_WAVE_DASH_CHAR: - if (remapJAWaveDash) { - return JA_FULLWIDTH_TILDE_CHAR; - } - default: return unicode; - } + return (unicode == REVERSE_SOLIDUS) ? JA_YEN : unicode; } public int charToGlyph(char unicode) { diff --git a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java index 146c11a8ff6..b8c3bc7d5fd 100644 --- a/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java +++ b/jdk/src/java.desktop/share/classes/sun/java2d/pipe/RenderingEngine.java @@ -297,7 +297,7 @@ public abstract class RenderingEngine { * If {@code lw1} and {@code lw2} are both greater than zero, then * the parallelogram figure is doubled by both expanding and contracting * each delta vector by its corresponding {@code lw} value. - * If either (@code lw1) or {@code lw2} are also greater than 1, then + * If either {@code lw1} or {@code lw2} are also greater than 1, then * the inner (contracted) parallelogram disappears and the figure is * simply a single expanded parallelogram. * The {@code clip} parameter specifies the current clip in effect diff --git a/jdk/src/java.desktop/share/classes/sun/print/PSPrinterJob.java b/jdk/src/java.desktop/share/classes/sun/print/PSPrinterJob.java index 511fd3a6195..abe8bd9ab7a 100644 --- a/jdk/src/java.desktop/share/classes/sun/print/PSPrinterJob.java +++ b/jdk/src/java.desktop/share/classes/sun/print/PSPrinterJob.java @@ -105,6 +105,7 @@ import java.nio.file.Files; //REMIND: Remove use of this class when IPPPrintService is moved to share directory. import java.lang.reflect.Method; +import javax.print.attribute.standard.JobSheets; /** * A class which initiates and executes a PostScript printer job. @@ -1573,10 +1574,10 @@ public class PSPrinterJob extends RasterPrinterJob { private String[] printExecCmd(String printer, String options, boolean noJobSheet, - String banner, int copies, String spoolFile) { + String jobTitle, int copies, String spoolFile) { int PRINTER = 0x1; int OPTIONS = 0x2; - int BANNER = 0x4; + int JOBTITLE = 0x4; int COPIES = 0x8; int NOSHEET = 0x10; int pFlags = 0; @@ -1592,8 +1593,8 @@ public class PSPrinterJob extends RasterPrinterJob { pFlags |= OPTIONS; ncomps+=1; } - if (banner != null && !banner.equals("")) { - pFlags |= BANNER; + if (jobTitle != null && !jobTitle.equals("")) { + pFlags |= JOBTITLE; ncomps+=1; } if (copies > 1) { @@ -1603,23 +1604,29 @@ public class PSPrinterJob extends RasterPrinterJob { if (noJobSheet) { pFlags |= NOSHEET; ncomps+=1; + } else if (getPrintService(). + isAttributeCategorySupported(JobSheets.class)) { + ncomps+=1; // for jobsheet } - String osname = System.getProperty("os.name"); - if (osname.equals("Linux") || osname.contains("OS X")) { + String osname = System.getProperty("os.name"); + if (osname.equals("Linux") || osname.contains("OS X")) { execCmd = new String[ncomps]; execCmd[n++] = "/usr/bin/lpr"; if ((pFlags & PRINTER) != 0) { execCmd[n++] = "-P" + printer; } - if ((pFlags & BANNER) != 0) { - execCmd[n++] = "-J" + banner; + if ((pFlags & JOBTITLE) != 0) { + execCmd[n++] = "-J" + jobTitle; } if ((pFlags & COPIES) != 0) { execCmd[n++] = "-#" + copies; } if ((pFlags & NOSHEET) != 0) { execCmd[n++] = "-h"; + } else if (getPrintService(). + isAttributeCategorySupported(JobSheets.class)) { + execCmd[n++] = "-o job-sheets=standard"; } if ((pFlags & OPTIONS) != 0) { execCmd[n++] = new String(options); @@ -1632,14 +1639,17 @@ public class PSPrinterJob extends RasterPrinterJob { if ((pFlags & PRINTER) != 0) { execCmd[n++] = "-d" + printer; } - if ((pFlags & BANNER) != 0) { - execCmd[n++] = "-t" + banner; + if ((pFlags & JOBTITLE) != 0) { + execCmd[n++] = "-t" + jobTitle; } if ((pFlags & COPIES) != 0) { execCmd[n++] = "-n" + copies; } if ((pFlags & NOSHEET) != 0) { execCmd[n++] = "-o nobanner"; + } else if (getPrintService(). + isAttributeCategorySupported(JobSheets.class)) { + execCmd[n++] = "-o job-sheets=standard"; } if ((pFlags & OPTIONS) != 0) { execCmd[n++] = "-o" + options; diff --git a/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java b/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java index 3bfb7577e8e..20a3db38b36 100644 --- a/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java +++ b/jdk/src/java.desktop/share/classes/sun/print/PSStreamPrintService.java @@ -283,7 +283,16 @@ public class PSStreamPrintService extends StreamPrintService } else if (category == OrientationRequested.class) { if (flavor == null || flavor.equals(DocFlavor.SERVICE_FORMATTED.PAGEABLE) || - flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE)) { + flavor.equals(DocFlavor.SERVICE_FORMATTED.PRINTABLE) || + flavor.equals(DocFlavor.INPUT_STREAM.GIF) || + flavor.equals(DocFlavor.INPUT_STREAM.JPEG) || + flavor.equals(DocFlavor.INPUT_STREAM.PNG) || + flavor.equals(DocFlavor.BYTE_ARRAY.GIF) || + flavor.equals(DocFlavor.BYTE_ARRAY.JPEG) || + flavor.equals(DocFlavor.BYTE_ARRAY.PNG) || + flavor.equals(DocFlavor.URL.GIF) || + flavor.equals(DocFlavor.URL.JPEG) || + flavor.equals(DocFlavor.URL.PNG)) { OrientationRequested []arr = new OrientationRequested[3]; arr[0] = OrientationRequested.PORTRAIT; arr[1] = OrientationRequested.LANDSCAPE; diff --git a/jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java b/jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java index cd6793a8786..e2813a59544 100644 --- a/jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java +++ b/jdk/src/java.desktop/share/classes/sun/print/RasterPrinterJob.java @@ -1271,6 +1271,12 @@ public abstract class RasterPrinterJob extends PrinterJob { JobSheets jobSheets = (JobSheets)attributes.get(JobSheets.class); if (jobSheets != null) { noJobSheet = jobSheets == JobSheets.NONE; + } else { + JobSheets js = (JobSheets)getPrintService(). + getDefaultAttributeValue(JobSheets.class); + if (js != null && js.equals(JobSheets.NONE)) { + noJobSheet = true; + } } JobName jobName = (JobName)attributes.get(JobName.class); diff --git a/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java b/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java index 58565e11d9b..ba2f6370150 100644 --- a/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java +++ b/jdk/src/java.desktop/share/classes/sun/print/ServiceDialog.java @@ -2759,10 +2759,10 @@ public class ServiceDialog extends JDialog implements ActionListener { if (js == null) { js = (JobSheets)psCurrent.getDefaultAttributeValue(jsCategory); if (js == null) { - js = JobSheets.NONE; + js = JobSheets.STANDARD; } } - cbJobSheets.setSelected(js != JobSheets.NONE); + cbJobSheets.setSelected(js != JobSheets.NONE && jsSupported); cbJobSheets.setEnabled(jsSupported); // setup JobPriority spinner diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.c b/jdk/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.c index 742dfeb428f..6a70d404f84 100644 --- a/jdk/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.c +++ b/jdk/src/java.desktop/share/native/libawt/java2d/loops/GraphicsPrimitiveMgr.c @@ -104,40 +104,47 @@ Java_sun_java2d_loops_GraphicsPrimitiveMgr_initIDs { return; } - RegisterID = (*env)->GetStaticMethodID(env, GPMgr, - RegisterName, RegisterSig); - pNativePrimID = (*env)->GetFieldID(env, GP, "pNativePrim", "J"); - pixelID = (*env)->GetFieldID(env, SG2D, "pixel", "I"); - eargbID = (*env)->GetFieldID(env, SG2D, "eargb", "I"); - clipRegionID = (*env)->GetFieldID(env, SG2D, "clipRegion", - "Lsun/java2d/pipe/Region;"); - compositeID = (*env)->GetFieldID(env, SG2D, "composite", - "Ljava/awt/Composite;"); - lcdTextContrastID = - (*env)->GetFieldID(env, SG2D, "lcdTextContrast", "I"); - getRgbID = (*env)->GetMethodID(env, Color, "getRGB", "()I"); - xorPixelID = (*env)->GetFieldID(env, XORComp, "xorPixel", "I"); - xorColorID = (*env)->GetFieldID(env, XORComp, "xorColor", - "Ljava/awt/Color;"); - alphaMaskID = (*env)->GetFieldID(env, XORComp, "alphaMask", "I"); - ruleID = (*env)->GetFieldID(env, AlphaComp, "rule", "I"); - extraAlphaID = (*env)->GetFieldID(env, AlphaComp, "extraAlpha", "F"); + CHECK_NULL(RegisterID = + (*env)->GetStaticMethodID(env, GPMgr, RegisterName, RegisterSig)); + CHECK_NULL(pNativePrimID = (*env)->GetFieldID(env, GP, "pNativePrim", "J")); + CHECK_NULL(pixelID = (*env)->GetFieldID(env, SG2D, "pixel", "I")); + CHECK_NULL(eargbID = (*env)->GetFieldID(env, SG2D, "eargb", "I")); + CHECK_NULL(clipRegionID = + (*env)->GetFieldID(env, SG2D, "clipRegion", "Lsun/java2d/pipe/Region;")); + CHECK_NULL(compositeID = + (*env)->GetFieldID(env, SG2D, "composite", "Ljava/awt/Composite;")); + CHECK_NULL(lcdTextContrastID = + (*env)->GetFieldID(env, SG2D, "lcdTextContrast", "I")); + CHECK_NULL(getRgbID = (*env)->GetMethodID(env, Color, "getRGB", "()I")); + CHECK_NULL(xorPixelID = (*env)->GetFieldID(env, XORComp, "xorPixel", "I")); + CHECK_NULL(xorColorID = + (*env)->GetFieldID(env, XORComp, "xorColor", "Ljava/awt/Color;")); + CHECK_NULL(alphaMaskID = + (*env)->GetFieldID(env, XORComp, "alphaMask", "I")); + CHECK_NULL(ruleID = (*env)->GetFieldID(env, AlphaComp, "rule", "I")); + CHECK_NULL(extraAlphaID = + (*env)->GetFieldID(env, AlphaComp, "extraAlpha", "F")); - m00ID = (*env)->GetFieldID(env, AT, "m00", "D"); - m01ID = (*env)->GetFieldID(env, AT, "m01", "D"); - m02ID = (*env)->GetFieldID(env, AT, "m02", "D"); - m10ID = (*env)->GetFieldID(env, AT, "m10", "D"); - m11ID = (*env)->GetFieldID(env, AT, "m11", "D"); - m12ID = (*env)->GetFieldID(env, AT, "m12", "D"); + CHECK_NULL(m00ID = (*env)->GetFieldID(env, AT, "m00", "D")); + CHECK_NULL(m01ID = (*env)->GetFieldID(env, AT, "m01", "D")); + CHECK_NULL(m02ID = (*env)->GetFieldID(env, AT, "m02", "D")); + CHECK_NULL(m10ID = (*env)->GetFieldID(env, AT, "m10", "D")); + CHECK_NULL(m11ID = (*env)->GetFieldID(env, AT, "m11", "D")); + CHECK_NULL(m12ID = (*env)->GetFieldID(env, AT, "m12", "D")); - path2DTypesID = (*env)->GetFieldID(env, Path2D, "pointTypes", "[B"); - path2DNumTypesID = (*env)->GetFieldID(env, Path2D, "numTypes", "I"); - path2DWindingRuleID = (*env)->GetFieldID(env, Path2D, "windingRule", "I"); - path2DFloatCoordsID = (*env)->GetFieldID(env, Path2DFloat, - "floatCoords", "[F"); - sg2dStrokeHintID = (*env)->GetFieldID(env, SG2D, "strokeHint", "I"); - fid = (*env)->GetStaticFieldID(env, SHints, "INTVAL_STROKE_PURE", "I"); + CHECK_NULL(path2DTypesID = + (*env)->GetFieldID(env, Path2D, "pointTypes", "[B")); + CHECK_NULL(path2DNumTypesID = + (*env)->GetFieldID(env, Path2D, "numTypes", "I")); + CHECK_NULL(path2DWindingRuleID = + (*env)->GetFieldID(env, Path2D, "windingRule", "I")); + CHECK_NULL(path2DFloatCoordsID = + (*env)->GetFieldID(env, Path2DFloat, "floatCoords", "[F")); + CHECK_NULL(sg2dStrokeHintID = + (*env)->GetFieldID(env, SG2D, "strokeHint", "I")); + CHECK_NULL(fid = + (*env)->GetStaticFieldID(env, SHints, "INTVAL_STROKE_PURE", "I")); sunHints_INTVAL_STROKE_PURE = (*env)->GetStaticIntField(env, SHints, fid); } diff --git a/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c b/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c index 00c6ee1fa44..485c42a7b96 100644 --- a/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c +++ b/jdk/src/java.desktop/share/native/libfontmanager/HBShaper.c @@ -278,6 +278,12 @@ JNIEXPORT jboolean JNICALL Java_sun_font_SunLayoutEngine_shape hb_buffer_set_direction(buffer, direction); chars = (*env)->GetCharArrayElements(env, text, NULL); + if ((*env)->ExceptionCheck(env)) { + hb_buffer_destroy(buffer); + hb_font_destroy(hbfont); + free((void*)jdkFontInfo); + return JNI_FALSE; + } len = (*env)->GetArrayLength(env, text); hb_buffer_add_utf16(buffer, chars, len, offset, limit-offset); @@ -309,6 +315,7 @@ JNIEXPORT jboolean JNICALL Java_sun_font_SunLayoutEngine_shape hb_font_destroy(hbfont); free((void*)jdkFontInfo); if (features != NULL) free(features); + (*env)->ReleaseCharArrayElements(env, text, chars, JNI_ABORT); return JNI_TRUE; } diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c b/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c index 81fe9117d04..c872c523b62 100644 --- a/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c +++ b/jdk/src/java.desktop/share/native/libjavajpeg/imageioJPEG.c @@ -952,7 +952,7 @@ imageio_fill_input_buffer(j_decompress_ptr cinfo) sb->hstreamBuffer, 0, sb->bufferLength); if ((ret > 0) && ((unsigned int)ret > sb->bufferLength)) { - ret = sb->bufferLength; + ret = (int)sb->bufferLength; } if ((*env)->ExceptionOccurred(env) || !GET_ARRAYS(env, data, &(src->next_input_byte))) { @@ -1050,7 +1050,7 @@ imageio_fill_suspended_buffer(j_decompress_ptr cinfo) JPEGImageReader_readInputDataID, sb->hstreamBuffer, offset, buflen); - if ((ret > 0) && ((unsigned int)ret > buflen)) ret = buflen; + if ((ret > 0) && ((unsigned int)ret > buflen)) ret = (int)buflen; if ((*env)->ExceptionOccurred(env) || !GET_ARRAYS(env, data, &(src->next_input_byte))) { cinfo->err->error_exit((j_common_ptr) cinfo); @@ -1774,8 +1774,8 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_readImageHeader v_samp1 = cinfo->comp_info[1].v_samp_factor; v_samp2 = cinfo->comp_info[2].v_samp_factor; - if ((h_samp1 > h_samp0) && (h_samp2 > h_samp0) || - (v_samp1 > v_samp0) && (v_samp2 > v_samp0)) + if (((h_samp1 > h_samp0) && (h_samp2 > h_samp0)) || + ((v_samp1 > v_samp0) && (v_samp2 > v_samp0))) { cinfo->jpeg_color_space = JCS_YCCK; /* Leave the output space as CMYK */ @@ -1866,7 +1866,6 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageReader_readImage pixelBufferPtr pb; sun_jpeg_error_ptr jerr; boolean done; - boolean mustScale = FALSE; boolean progressive = FALSE; boolean orderedBands = TRUE; imageIODataPtr data = (imageIODataPtr)jlong_to_ptr(ptr); @@ -2634,6 +2633,18 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeTables RELEASE_ARRAYS(env, data, NULL); } +static void freeArray(UINT8** arr, jint size) { + int i; + if (arr != NULL) { + for (i = 0; i < size; i++) { + if (arr[i] != NULL) { + free(arr[i]); + } + } + free(arr); + } +} + JNIEXPORT jboolean JNICALL Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage (JNIEnv *env, @@ -2742,6 +2753,8 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage scale = (UINT8**) calloc(numBands, sizeof(UINT8*)); if (scale == NULL) { + (*env)->ReleaseIntArrayElements(env, bandSizes, + bandSize, JNI_ABORT); JNU_ThrowByName( env, "java/lang/OutOfMemoryError", "Writing JPEG Stream"); return JNI_FALSE; @@ -2758,6 +2771,8 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage free(scale[j]); } free(scale); + (*env)->ReleaseIntArrayElements(env, bandSizes, + bandSize, JNI_ABORT); JNU_ThrowByName( env, "java/lang/OutOfMemoryError", "Writing JPEG Stream"); return JNI_FALSE; @@ -2782,21 +2797,14 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage pb = &data->pixelBuf; if (setPixelBuffer(env, pb, buffer) == NOT_OK) { - if (scale != NULL) { - for (i = 0; i < numBands; i++) { - if (scale[i] != NULL) { - free(scale[i]); - } - } - free(scale); - } + freeArray(scale, numBands); return data->abortFlag; // We already threw an out of memory exception } // Allocate a 1-scanline buffer scanLinePtr = (JSAMPROW)malloc(scanLineSize); if (scanLinePtr == NULL) { - RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte)); + freeArray(scale, numBands); JNU_ThrowByName( env, "java/lang/OutOfMemoryError", "Writing JPEG Stream"); @@ -2818,15 +2826,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage JNU_ThrowByName(env, "javax/imageio/IIOException", buffer); } - if (scale != NULL) { - for (i = 0; i < numBands; i++) { - if (scale[i] != NULL) { - free(scale[i]); - } - } - free(scale); - } - + freeArray(scale, numBands); free(scanLinePtr); return data->abortFlag; } @@ -2874,7 +2874,11 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage if (qsels) { (*env)->ReleaseIntArrayElements(env, QtableSelectors, qsels, JNI_ABORT); } - if (!success) return data->abortFlag; + if (!success) { + freeArray(scale, numBands); + free(scanLinePtr); + return data->abortFlag; + } jpeg_suppress_tables(cinfo, TRUE); // Disable writing any current @@ -2892,6 +2896,8 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage if (GET_ARRAYS(env, data, (const JOCTET **)(&dest->next_output_byte)) == NOT_OK) { (*env)->ExceptionClear(env); + freeArray(scale, numBands); + free(scanLinePtr); JNU_ThrowByName(env, "javax/imageio/IIOException", "Array pin failed"); @@ -2926,7 +2932,12 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage cinfo->scan_info = cinfo->script_space; scanptr = (int *) cinfo->script_space; scanData = (*env)->GetIntArrayElements(env, scanInfo, NULL); - CHECK_NULL_RETURN(scanData, data->abortFlag); + if (scanData == NULL) { + RELEASE_ARRAYS(env, data, (const JOCTET *)(dest->next_output_byte)); + freeArray(scale, numBands); + free(scanLinePtr); + return data->abortFlag; + } // number of jints per scan is 9 // We avoid a memcpy to handle different size ints for (i = 0; i < numScans*9; i++) { @@ -3022,15 +3033,7 @@ Java_com_sun_imageio_plugins_jpeg_JPEGImageWriter_writeImage jpeg_abort((j_common_ptr)cinfo); } - if (scale != NULL) { - for (i = 0; i < numBands; i++) { - if (scale[i] != NULL) { - free(scale[i]); - } - } - free(scale); - } - + freeArray(scale, numBands); free(scanLinePtr); RELEASE_ARRAYS(env, data, NULL); return data->abortFlag; diff --git a/jdk/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c b/jdk/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c index 1cd05ab09c2..ea83cb36151 100644 --- a/jdk/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c +++ b/jdk/src/java.desktop/share/native/libjavajpeg/jpegdecoder.c @@ -358,7 +358,7 @@ sun_jpeg_fill_suspended_buffer(j_decompress_ptr cinfo) } ret = (*env)->CallIntMethod(env, src->hInputStream, InputStream_readID, src->hInputBuffer, offset, buflen); - if ((ret > 0) && ((unsigned int)ret > buflen)) ret = buflen; + if ((ret > 0) && ((unsigned int)ret > buflen)) ret = (int)buflen; if ((*env)->ExceptionOccurred(env) || !GET_ARRAYS(env, src)) { cinfo->err->error_exit((struct jpeg_common_struct *) cinfo); } diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsalpha.c b/jdk/src/java.desktop/share/native/liblcms/cmsalpha.c new file mode 100644 index 00000000000..277ed5598c3 --- /dev/null +++ b/jdk/src/java.desktop/share/native/liblcms/cmsalpha.c @@ -0,0 +1,547 @@ +/* + * 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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 file is available under and governed by the GNU General Public +// License version 2 only, as published by the Free Software Foundation. +// However, the following notice accompanied the original version of this +// file: +// +//--------------------------------------------------------------------------------- +// +// Little Color Management System +// Copyright (c) 1998-2016 Marti Maria Saguer +// +// Permission is hereby granted, free of charge, to any person obtaining +// a copy of this software and associated documentation files (the "Software"), +// to deal in the Software without restriction, including without limitation +// the rights to use, copy, modify, merge, publish, distribute, sublicense, +// and/or sell copies of the Software, and to permit persons to whom the Software +// is furnished to do so, subject to the following conditions: +// +// The above copyright notice and this permission notice shall be included in +// all copies or substantial portions of the Software. +// +// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, +// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO +// THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND +// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE +// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION +// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION +// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. +// +//--------------------------------------------------------------------------------- +// + +#include "lcms2_internal.h" + + +// Alpha copy ------------------------------------------------------------------------------------------------------------------ + +// Floor to byte, taking care of saturation +cmsINLINE cmsUInt8Number _cmsQuickSaturateByte(cmsFloat64Number d) +{ + d += 0.5; + if (d <= 0) return 0; + if (d >= 255.0) return 255; + + return (cmsUInt8Number) _cmsQuickFloorWord(d); +} + + +// Return the size in bytes of a given formatter +static +int trueBytesSize(cmsUInt32Number Format) +{ + int fmt_bytes = T_BYTES(Format); + + // For double, the T_BYTES field returns zero + if (fmt_bytes == 0) + return sizeof(double); + + // Otherwise, it is already correct for all formats + return fmt_bytes; +} + + +// Several format converters + +typedef void(*cmsFormatterAlphaFn)(void* dst, const void* src); + + +// From 8 + +static +void copy8(void* dst, const void* src) +{ + memmove(dst, src, 1); +} + +static +void from8to16(void* dst, const void* src) +{ + cmsUInt8Number n = *(cmsUInt8Number*)src; + *(cmsUInt16Number*) dst = FROM_8_TO_16(n); +} + +static +void from8toFLT(void* dst, const void* src) +{ + *(cmsFloat32Number*)dst = (*(cmsUInt8Number*)src) / 255.0f; +} + +static +void from8toDBL(void* dst, const void* src) +{ + *(cmsFloat64Number*)dst = (*(cmsUInt8Number*)src) / 255.0; +} + +static +void from8toHLF(void* dst, const void* src) +{ + cmsFloat32Number n = (*(cmsUInt8Number*)src) / 255.0f; + *(cmsUInt16Number*)dst = _cmsFloat2Half(n); +} + +// From 16 + +static +void from16to8(void* dst, const void* src) +{ + cmsUInt16Number n = *(cmsUInt16Number*)src; + *(cmsUInt8Number*) dst = FROM_16_TO_8(n); +} + +static +void copy16(void* dst, const void* src) +{ + memmove(dst, src, 2); +} + +void from16toFLT(void* dst, const void* src) +{ + *(cmsFloat32Number*)dst = (*(cmsUInt16Number*)src) / 65535.0f; +} + +void from16toDBL(void* dst, const void* src) +{ + *(cmsFloat64Number*)dst = (*(cmsUInt16Number*)src) / 65535.0f; +} + +static +void from16toHLF(void* dst, const void* src) +{ + cmsFloat32Number n = (*(cmsUInt16Number*)src) / 65535.0f; + *(cmsUInt16Number*)dst = _cmsFloat2Half(n); +} + +// From Float + +static +void fromFLTto8(void* dst, const void* src) +{ + cmsFloat32Number n = *(cmsFloat32Number*)src; + *(cmsUInt8Number*)dst = _cmsQuickSaturateByte(n * 255.0f); +} + +static +void fromFLTto16(void* dst, const void* src) +{ + cmsFloat32Number n = *(cmsFloat32Number*)src; + *(cmsUInt16Number*)dst = _cmsQuickSaturateWord(n * 65535.0f); +} + +static +void copy32(void* dst, const void* src) +{ + memmove(dst, src, sizeof(cmsFloat32Number)); +} + +static +void fromFLTtoDBL(void* dst, const void* src) +{ + cmsFloat32Number n = *(cmsFloat32Number*)src; + *(cmsFloat64Number*)dst = (cmsFloat64Number)n; +} + +static +void fromFLTtoHLF(void* dst, const void* src) +{ + cmsFloat32Number n = *(cmsFloat32Number*)src; + *(cmsUInt16Number*)dst = _cmsFloat2Half(n); +} + + +// From HALF + +static +void fromHLFto8(void* dst, const void* src) +{ + cmsFloat32Number n = _cmsHalf2Float(*(cmsUInt16Number*)src); + *(cmsUInt8Number*)dst = _cmsQuickSaturateByte(n * 255.0f); +} + +static +void fromHLFto16(void* dst, const void* src) +{ + cmsFloat32Number n = _cmsHalf2Float(*(cmsUInt16Number*)src); + *(cmsUInt16Number*)dst = _cmsQuickSaturateWord(n * 65535.0f); +} + +static +void fromHLFtoFLT(void* dst, const void* src) +{ + *(cmsFloat32Number*)dst = _cmsHalf2Float(*(cmsUInt16Number*)src); +} + +static +void fromHLFtoDBL(void* dst, const void* src) +{ + *(cmsFloat64Number*)dst = (cmsFloat64Number)_cmsHalf2Float(*(cmsUInt16Number*)src); +} + +// From double +static +void fromDBLto8(void* dst, const void* src) +{ + cmsFloat64Number n = *(cmsFloat64Number*)src; + *(cmsUInt8Number*)dst = _cmsQuickSaturateByte(n * 255.0); +} + +static +void fromDBLto16(void* dst, const void* src) +{ + cmsFloat64Number n = *(cmsFloat64Number*)src; + *(cmsUInt16Number*)dst = _cmsQuickSaturateWord(n * 65535.0f); +} + +static +void fromDBLtoFLT(void* dst, const void* src) +{ + cmsFloat64Number n = *(cmsFloat64Number*)src; + *(cmsFloat32Number*)dst = (cmsFloat32Number) n; +} + +static +void fromDBLtoHLF(void* dst, const void* src) +{ + cmsFloat32Number n = (cmsFloat32Number) *(cmsFloat64Number*)src; + *(cmsUInt16Number*)dst = _cmsFloat2Half(n); +} + +static +void copy64(void* dst, const void* src) +{ + memmove(dst, src, sizeof(cmsFloat64Number)); +} + + +// Returns the position (x or y) of the formatter in the table of functions +static +int FormatterPos(cmsUInt32Number frm) +{ + int b = T_BYTES(frm); + + if (b == 0 && T_FLOAT(frm)) + return 4; // DBL + if (b == 2 && T_FLOAT(frm)) + return 2; // HLF + if (b == 4 && T_FLOAT(frm)) + return 3; // FLT + if (b == 2 && !T_FLOAT(frm)) + return 1; // 16 + if (b == 1 && !T_FLOAT(frm)) + return 0; // 8 + + return -1; // not recognized + +} + +// Obtains a alpha-to-alpha funmction formatter +static +cmsFormatterAlphaFn _cmsGetFormatterAlpha(cmsContext id, cmsUInt32Number in, cmsUInt32Number out) +{ +static cmsFormatterAlphaFn FormattersAlpha[5][5] = { + + /* from 8 */ { copy8, from8to16, from8toHLF, from8toFLT, from8toDBL }, + /* from 16*/ { from16to8, copy16, from16toHLF, from16toFLT, from16toDBL }, + /* from HLF*/ { fromHLFto8, fromHLFto16, copy16, fromHLFtoFLT, fromHLFtoDBL }, + /* from FLT*/ { fromFLTto8, fromFLTto16, fromFLTtoHLF, copy32, fromFLTtoDBL }, + /* from DBL*/ { fromDBLto8, fromDBLto16, fromDBLtoHLF, fromDBLtoFLT, copy64 }}; + + int in_n = FormatterPos(in); + int out_n = FormatterPos(out); + + if (in_n < 0 || out_n < 0 || in_n > 4 || out_n > 4) { + + cmsSignalError(id, cmsERROR_UNKNOWN_EXTENSION, "Unrecognized alpha channel width"); + return NULL; + } + + return FormattersAlpha[in_n][out_n]; +} + + + +// This function computes the distance from each component to the next one in bytes. +static +void ComputeIncrementsForChunky(cmsUInt32Number Format, + cmsUInt32Number ComponentStartingOrder[], + cmsUInt32Number ComponentPointerIncrements[]) +{ + cmsUInt32Number channels[cmsMAXCHANNELS]; + int extra = T_EXTRA(Format); + int nchannels = T_CHANNELS(Format); + int total_chans = nchannels + extra; + int i; + int channelSize = trueBytesSize(Format); + int pixelSize = channelSize * total_chans; + + // Sanity check + if (total_chans <= 0 || total_chans >= cmsMAXCHANNELS) + return; + + memset(channels, 0, sizeof(channels)); + + // Separation is independent of starting point and only depends on channel size + for (i = 0; i < extra; i++) + ComponentPointerIncrements[i] = pixelSize; + + // Handle do swap + for (i = 0; i < total_chans; i++) + { + if (T_DOSWAP(Format)) { + channels[i] = total_chans - i - 1; + } + else { + channels[i] = i; + } + } + + // Handle swap first (ROL of positions), example CMYK -> KCMY | 0123 -> 3012 + if (T_SWAPFIRST(Format) && total_chans > 1) { + + cmsUInt32Number tmp = channels[0]; + for (i = 0; i < total_chans-1; i++) + channels[i] = channels[i + 1]; + + channels[total_chans - 1] = tmp; + } + + // Handle size + if (channelSize > 1) + for (i = 0; i < total_chans; i++) { + channels[i] *= channelSize; + } + + for (i = 0; i < extra; i++) + ComponentStartingOrder[i] = channels[i + nchannels]; +} + + + +// On planar configurations, the distance is the stride added to any non-negative +static +void ComputeIncrementsForPlanar(cmsUInt32Number Format, + cmsUInt32Number BytesPerPlane, + cmsUInt32Number ComponentStartingOrder[], + cmsUInt32Number ComponentPointerIncrements[]) +{ + cmsUInt32Number channels[cmsMAXCHANNELS]; + int extra = T_EXTRA(Format); + int nchannels = T_CHANNELS(Format); + int total_chans = nchannels + extra; + int i; + int channelSize = trueBytesSize(Format); + + // Sanity check + if (total_chans <= 0 || total_chans >= cmsMAXCHANNELS) + return; + + memset(channels, 0, sizeof(channels)); + + // Separation is independent of starting point and only depends on channel size + for (i = 0; i < extra; i++) + ComponentPointerIncrements[i] = channelSize; + + // Handle do swap + for (i = 0; i < total_chans; i++) + { + if (T_DOSWAP(Format)) { + channels[i] = total_chans - i - 1; + } + else { + channels[i] = i; + } + } + + // Handle swap first (ROL of positions), example CMYK -> KCMY | 0123 -> 3012 + if (T_SWAPFIRST(Format) && total_chans > 0) { + + cmsUInt32Number tmp = channels[0]; + for (i = 0; i < total_chans - 1; i++) + channels[i] = channels[i + 1]; + + channels[total_chans - 1] = tmp; + } + + // Handle size + for (i = 0; i < total_chans; i++) { + channels[i] *= BytesPerPlane; + } + + for (i = 0; i < extra; i++) + ComponentStartingOrder[i] = channels[i + nchannels]; +} + + + +// Dispatcher por chunky and planar RGB +static +void ComputeComponentIncrements(cmsUInt32Number Format, + cmsUInt32Number BytesPerPlane, + cmsUInt32Number ComponentStartingOrder[], + cmsUInt32Number ComponentPointerIncrements[]) +{ + if (T_PLANAR(Format)) { + + ComputeIncrementsForPlanar(Format, BytesPerPlane, ComponentStartingOrder, ComponentPointerIncrements); + } + else { + ComputeIncrementsForChunky(Format, ComponentStartingOrder, ComponentPointerIncrements); + } + +} + + + +// Handles extra channels copying alpha if requested by the flags +void _cmsHandleExtraChannels(_cmsTRANSFORM* p, const void* in, + void* out, + cmsUInt32Number PixelsPerLine, + cmsUInt32Number LineCount, + const cmsStride* Stride) +{ + cmsUInt32Number i, j, k; + cmsUInt32Number nExtra; + cmsUInt32Number SourceStartingOrder[cmsMAXCHANNELS]; + cmsUInt32Number SourceIncrements[cmsMAXCHANNELS]; + cmsUInt32Number DestStartingOrder[cmsMAXCHANNELS]; + cmsUInt32Number DestIncrements[cmsMAXCHANNELS]; + + cmsFormatterAlphaFn copyValueFn; + + // Make sure we need some copy + if (!(p->dwOriginalFlags & cmsFLAGS_COPY_ALPHA)) + return; + + // Exit early if in-place color-management is occurring - no need to copy extra channels to themselves. + if (p->InputFormat == p->OutputFormat && in == out) + return; + + // Make sure we have same number of alpha channels. If not, just return as this should be checked at transform creation time. + nExtra = T_EXTRA(p->InputFormat); + if (nExtra != T_EXTRA(p->OutputFormat)) + return; + + // Anything to do? + if (nExtra == 0) + return; + + // Compute the increments + ComputeComponentIncrements(p->InputFormat, Stride->BytesPerPlaneIn, SourceStartingOrder, SourceIncrements); + ComputeComponentIncrements(p->OutputFormat, Stride->BytesPerPlaneOut, DestStartingOrder, DestIncrements); + + // Check for conversions 8, 16, half, float, dbl + copyValueFn = _cmsGetFormatterAlpha(p->ContextID, p->InputFormat, p->OutputFormat); + + if (nExtra == 1) { // Optimized routine for copying a single extra channel quickly + + cmsUInt8Number* SourcePtr; + cmsUInt8Number* DestPtr; + + cmsUInt32Number SourceStrideIncrement = 0; + cmsUInt32Number DestStrideIncrement = 0; + + // The loop itself + for (i = 0; i < LineCount; i++) { + + // Prepare pointers for the loop + SourcePtr = (cmsUInt8Number*)in + SourceStartingOrder[0] + SourceStrideIncrement; + DestPtr = (cmsUInt8Number*)out + DestStartingOrder[0] + DestStrideIncrement; + + for (j = 0; j < PixelsPerLine; j++) { + + copyValueFn(DestPtr, SourcePtr); + + SourcePtr += SourceIncrements[0]; + DestPtr += DestIncrements[0]; + } + + SourceStrideIncrement += Stride->BytesPerLineIn; + DestStrideIncrement += Stride->BytesPerLineOut; + } + + } + else { // General case with more than one extra channel + + cmsUInt8Number* SourcePtr[cmsMAXCHANNELS]; + cmsUInt8Number* DestPtr[cmsMAXCHANNELS]; + + cmsUInt32Number SourceStrideIncrements[cmsMAXCHANNELS]; + cmsUInt32Number DestStrideIncrements[cmsMAXCHANNELS]; + + memset(SourceStrideIncrements, 0, sizeof(SourceStrideIncrements)); + memset(DestStrideIncrements, 0, sizeof(DestStrideIncrements)); + + // The loop itself + for (i = 0; i < LineCount; i++) { + + // Prepare pointers for the loop + for (j = 0; j < nExtra; j++) { + + SourcePtr[j] = (cmsUInt8Number*)in + SourceStartingOrder[j] + SourceStrideIncrements[j]; + DestPtr[j] = (cmsUInt8Number*)out + DestStartingOrder[j] + DestStrideIncrements[j]; + } + + for (j = 0; j < PixelsPerLine; j++) { + + for (k = 0; k < nExtra; k++) { + + copyValueFn(DestPtr[k], SourcePtr[k]); + + SourcePtr[k] += SourceIncrements[k]; + DestPtr[k] += DestIncrements[k]; + } + } + + for (j = 0; j < nExtra; j++) { + + SourceStrideIncrements[j] += Stride->BytesPerLineIn; + DestStrideIncrements[j] += Stride->BytesPerLineOut; + } + } + } +} + + diff --git a/jdk/src/java.desktop/share/native/liblcms/cmscam02.c b/jdk/src/java.desktop/share/native/liblcms/cmscam02.c index 86ec167cd95..ae7038c5ea9 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmscam02.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmscam02.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2012 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/jdk/src/java.desktop/share/native/liblcms/cmscgats.c b/jdk/src/java.desktop/share/native/liblcms/cmscgats.c index 664a3c9eca7..9e033168f81 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmscgats.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmscgats.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2012 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -625,7 +625,7 @@ void ReadReal(cmsIT8* it8, int inum) } // Parses a float number -// This can not call directly atof because it uses locale dependant +// This can not call directly atof because it uses locale dependent // parsing, while CCMX files always use . as decimal separator static cmsFloat64Number ParseFloatNumber(const char *Buffer) @@ -830,11 +830,11 @@ void InSymbol(cmsIT8* it8) if (it8 ->sy == SINUM) { - sprintf(it8->id, "%d", it8->inum); + snprintf(it8->id, 127, "%d", it8->inum); } else { - sprintf(it8->id, it8 ->DoubleFormatter, it8->dnum); + snprintf(it8->id, 127, it8 ->DoubleFormatter, it8->dnum); } k = (int) strlen(it8 ->id); @@ -1392,7 +1392,7 @@ cmsBool CMSEXPORT cmsIT8SetPropertyDbl(cmsHANDLE hIT8, const char* cProp, cmsFlo cmsIT8* it8 = (cmsIT8*) hIT8; char Buffer[1024]; - sprintf(Buffer, it8->DoubleFormatter, Val); + snprintf(Buffer, 1023, it8->DoubleFormatter, Val); return AddToList(it8, &GetTable(it8)->HeaderList, cProp, NULL, Buffer, WRITE_UNCOOKED) != NULL; } @@ -1402,7 +1402,7 @@ cmsBool CMSEXPORT cmsIT8SetPropertyHex(cmsHANDLE hIT8, const char* cProp, cmsUIn cmsIT8* it8 = (cmsIT8*) hIT8; char Buffer[1024]; - sprintf(Buffer, "%u", Val); + snprintf(Buffer, 1023, "%u", Val); return AddToList(it8, &GetTable(it8)->HeaderList, cProp, NULL, Buffer, WRITE_HEXADECIMAL) != NULL; } @@ -1846,7 +1846,7 @@ cmsBool CMSEXPORT cmsIT8SaveToMem(cmsHANDLE hIT8, void *MemPtr, cmsUInt32Number* } -// -------------------------------------------------------------- Higer level parsing +// -------------------------------------------------------------- Higher level parsing static cmsBool DataFormatSection(cmsIT8* it8) @@ -2149,7 +2149,7 @@ cmsBool ParseIT8(cmsIT8* it8, cmsBool nosheet) -// Init usefull pointers +// Init useful pointers static void CookPointers(cmsIT8* it8) @@ -2546,9 +2546,9 @@ int LocateSample(cmsIT8* it8, const char* cSample) fld = GetDataFormat(it8, i); if (fld != NULL) { - if (cmsstrcasecmp(fld, cSample) == 0) - return i; - } + if (cmsstrcasecmp(fld, cSample) == 0) + return i; + } } return -1; @@ -2606,7 +2606,7 @@ cmsBool CMSEXPORT cmsIT8SetDataRowColDbl(cmsHANDLE hIT8, int row, int col, cmsFl _cmsAssert(hIT8 != NULL); - sprintf(Buff, it8->DoubleFormatter, Val); + snprintf(Buff, 255, it8->DoubleFormatter, Val); return SetData(it8, row, col, Buff); } diff --git a/jdk/src/java.desktop/share/native/liblcms/cmscnvrt.c b/jdk/src/java.desktop/share/native/liblcms/cmscnvrt.c index f6ef06c1eca..2ac99be19e4 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmscnvrt.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmscnvrt.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2012 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -136,7 +136,7 @@ static cmsIntentsList DefaultIntents[] = { }; -// A pointer to the begining of the list +// A pointer to the beginning of the list _cmsIntentsPluginChunkType _cmsIntentsPluginChunk = { NULL }; // Duplicates the zone of memory used by the plug-in in the new context @@ -299,6 +299,7 @@ cmsBool ComputeAbsoluteIntent(cmsFloat64Number AdaptationState, cmsMAT3 Scale, m1, m2, m3, m4; // TODO: Follow Marc Mahy's recommendation to check if CHAD is same by using M1*M2 == M2*M1. If so, do nothing. + // TODO: Add support for ArgyllArts tag // Adaptation state if (AdaptationState == 1.0) { @@ -917,7 +918,7 @@ int BlackPreservingSampler(register const cmsUInt16Number In[], register cmsUInt return TRUE; } - // Make sure to pass thru K (which now is fixed) + // Make sure to pass through K (which now is fixed) Outf[3] = LabK[3]; // Apply TAC if needed @@ -985,7 +986,7 @@ cmsPipeline* BlackPreservingKPlaneIntents(cmsContext ContextID, memset(&bp, 0, sizeof(bp)); // We need the input LUT of the last profile, assuming this one is responsible of - // black generation. This LUT will be seached in inverse order. + // black generation. This LUT will be searched in inverse order. bp.LabK2cmyk = _cmsReadInputLUT(hProfiles[nProfiles-1], INTENT_RELATIVE_COLORIMETRIC); if (bp.LabK2cmyk == NULL) goto Cleanup; diff --git a/jdk/src/java.desktop/share/native/liblcms/cmserr.c b/jdk/src/java.desktop/share/native/liblcms/cmserr.c index a7089970941..fc74aa7fa01 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmserr.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmserr.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2015 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -227,7 +227,7 @@ void _cmsAllocMemPluginChunk(struct _cmsContext_struct* ctx, const struct _cmsCo } } -// Auxiliar to fill memory management functions from plugin (or context 0 defaults) +// Auxiliary to fill memory management functions from plugin (or context 0 defaults) void _cmsInstallAllocFunctions(cmsPluginMemHandler* Plugin, _cmsMemPluginChunkType* ptr) { if (Plugin == NULL) { @@ -459,14 +459,14 @@ void* _cmsSubAllocDup(_cmsSubAllocator* s, const void *ptr, cmsUInt32Number size // Error logging ****************************************************************** -// There is no error handling at all. When a funtion fails, it returns proper value. +// There is no error handling at all. When a function fails, it returns proper value. // For example, all create functions does return NULL on failure. Other return FALSE // It may be interesting, for the developer, to know why the function is failing. // for that reason, lcms2 does offer a logging function. This function does recive // a ENGLISH string with some clues on what is going wrong. You can show this // info to the end user, or just create some sort of log. // The logging function should NOT terminate the program, as this obviously can leave -// resources. It is the programmer's responsability to check each function return code +// resources. It is the programmer's responsibility to check each function return code // to make sure it didn't fail. // Error messages are limited to MAX_ERROR_MESSAGE_LEN diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsgamma.c b/jdk/src/java.desktop/share/native/liblcms/cmsgamma.c index e68f2585d0e..e940fe28feb 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmsgamma.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmsgamma.c @@ -596,7 +596,7 @@ cmsFloat64Number DefaultEvalParametricFn(cmsInt32Number Type, const cmsFloat64Nu return Val; } -// Evaluate a segmented funtion for a single value. Return -1 if no valid segment found . +// Evaluate a segmented function for a single value. Return -1 if no valid segment found . // If fn type is 0, perform an interpolation on the table static cmsFloat64Number EvalSegmentedFn(const cmsToneCurve *g, cmsFloat64Number R) diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsgmt.c b/jdk/src/java.desktop/share/native/liblcms/cmsgmt.c index 0be9173948a..81254c2ad9b 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmsgmt.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmsgmt.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2012 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -56,7 +56,7 @@ #include "lcms2_internal.h" -// Auxiliar: append a Lab identity after the given sequence of profiles +// Auxiliary: append a Lab identity after the given sequence of profiles // and return the transform. Lab profile is closed, rest of profiles are kept open. cmsHTRANSFORM _cmsChain2Lab(cmsContext ContextID, cmsUInt32Number nProfiles, @@ -201,7 +201,7 @@ cmsToneCurve* _cmsBuildKToneCurve(cmsContext ContextID, } // Build the relationship. This effectively limits the maximum accuracy to 16 bits, but - // since this is used on black-preserving LUTs, we are not loosing accuracy in any case + // since this is used on black-preserving LUTs, we are not losing accuracy in any case KTone = cmsJoinToneCurve(ContextID, in, out, nPoints); // Get rid of components @@ -307,7 +307,7 @@ int GamutSampler(register const cmsUInt16Number In[], register cmsUInt16Number O } // Does compute a gamut LUT going back and forth across pcs -> relativ. colorimetric intent -> pcs -// the dE obtained is then annotated on the LUT. Values truely out of gamut are clipped to dE = 0xFFFE +// the dE obtained is then annotated on the LUT. Values truly out of gamut are clipped to dE = 0xFFFE // and values changed are supposed to be handled by any gamut remapping, so, are out of gamut as well. // // **WARNING: This algorithm does assume that gamut remapping algorithms does NOT move in-gamut colors, diff --git a/jdk/src/java.desktop/share/native/liblcms/cmshalf.c b/jdk/src/java.desktop/share/native/liblcms/cmshalf.c index 11efe3adf71..ddcaf48b8b4 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmshalf.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmshalf.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2012 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsintrp.c b/jdk/src/java.desktop/share/native/liblcms/cmsintrp.c index b40bc1d0dc4..dbe8b45eb62 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmsintrp.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmsintrp.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2012 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -185,7 +185,7 @@ cmsInterpParams* _cmsComputeInterpParams(cmsContext ContextID, int nSamples, int int i; cmsUInt32Number Samples[MAX_INPUT_DIMENSIONS]; - // Fill the auxiliar array + // Fill the auxiliary array for (i=0; i < MAX_INPUT_DIMENSIONS; i++) Samples[i] = nSamples; diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsio0.c b/jdk/src/java.desktop/share/native/liblcms/cmsio0.c index cbaffb8a1c7..9e982aecf69 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmsio0.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmsio0.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2012 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -353,7 +353,7 @@ cmsUInt32Number FileRead(cmsIOHANDLER* iohandler, void *Buffer, cmsUInt32Number return nReaded; } -// Postion file pointer in the file +// Position file pointer in the file static cmsBool FileSeek(cmsIOHANDLER* iohandler, cmsUInt32Number offset) { @@ -397,6 +397,7 @@ cmsIOHANDLER* CMSEXPORT cmsOpenIOhandlerFromFile(cmsContext ContextID, const cha { cmsIOHANDLER* iohandler = NULL; FILE* fm = NULL; + cmsInt32Number fileLen; _cmsAssert(FileName != NULL); _cmsAssert(AccessMode != NULL); @@ -413,7 +414,16 @@ cmsIOHANDLER* CMSEXPORT cmsOpenIOhandlerFromFile(cmsContext ContextID, const cha cmsSignalError(ContextID, cmsERROR_FILE, "File '%s' not found", FileName); return NULL; } - iohandler -> ReportedSize = (cmsUInt32Number) cmsfilelength(fm); + fileLen = cmsfilelength(fm); + if (fileLen < 0) + { + fclose(fm); + _cmsFree(ContextID, iohandler); + cmsSignalError(ContextID, cmsERROR_FILE, "Cannot get size of file '%s'", FileName); + return NULL; + } + + iohandler -> ReportedSize = (cmsUInt32Number) fileLen; break; case 'w': @@ -453,6 +463,14 @@ cmsIOHANDLER* CMSEXPORT cmsOpenIOhandlerFromFile(cmsContext ContextID, const cha cmsIOHANDLER* CMSEXPORT cmsOpenIOhandlerFromStream(cmsContext ContextID, FILE* Stream) { cmsIOHANDLER* iohandler = NULL; + cmsInt32Number fileSize; + + fileSize = cmsfilelength(Stream); + if (fileSize < 0) + { + cmsSignalError(ContextID, cmsERROR_FILE, "Cannot get size of stream"); + return NULL; + } iohandler = (cmsIOHANDLER*) _cmsMallocZero(ContextID, sizeof(cmsIOHANDLER)); if (iohandler == NULL) return NULL; @@ -460,7 +478,7 @@ cmsIOHANDLER* CMSEXPORT cmsOpenIOhandlerFromStream(cmsContext ContextID, FILE* S iohandler -> ContextID = ContextID; iohandler -> stream = (void*) Stream; iohandler -> UsedSpace = 0; - iohandler -> ReportedSize = (cmsUInt32Number) cmsfilelength(Stream); + iohandler -> ReportedSize = (cmsUInt32Number) fileSize; iohandler -> PhysicalFile[0] = 0; iohandler ->Read = FileRead; @@ -652,7 +670,7 @@ cmsBool _cmsNewTag(_cmsICCPROFILE* Icc, cmsTagSignature sig, int* NewPos) } -// Check existance +// Check existence cmsBool CMSEXPORT cmsIsTag(cmsHPROFILE hProfile, cmsTagSignature sig) { _cmsICCPROFILE* Icc = (_cmsICCPROFILE*) (void*) hProfile; @@ -708,7 +726,7 @@ cmsBool _cmsReadHeader(_cmsICCPROFILE* Icc) return FALSE; } - // Adjust endianess of the used parameters + // Adjust endianness of the used parameters Icc -> DeviceClass = (cmsProfileClassSignature) _cmsAdjustEndianess32(Header.deviceClass); Icc -> ColorSpace = (cmsColorSpaceSignature) _cmsAdjustEndianess32(Header.colorSpace); Icc -> PCS = (cmsColorSpaceSignature) _cmsAdjustEndianess32(Header.pcs); @@ -826,7 +844,7 @@ cmsBool _cmsWriteHeader(_cmsICCPROFILE* Icc, cmsUInt32Number UsedSpace) memset(&Header.reserved, 0, sizeof(Header.reserved)); - // Set profile ID. Endianess is always big endian + // Set profile ID. Endianness is always big endian memmove(&Header.profileID, &Icc ->ProfileID, 16); // Dump the header @@ -836,7 +854,7 @@ cmsBool _cmsWriteHeader(_cmsICCPROFILE* Icc, cmsUInt32Number UsedSpace) // Get true count for (i=0; i < Icc -> TagCount; i++) { - if (Icc ->TagNames[i] != 0) + if (Icc ->TagNames[i] != (cmsTagSignature) 0) Count++; } @@ -845,7 +863,7 @@ cmsBool _cmsWriteHeader(_cmsICCPROFILE* Icc, cmsUInt32Number UsedSpace) for (i=0; i < Icc -> TagCount; i++) { - if (Icc ->TagNames[i] == 0) continue; // It is just a placeholder + if (Icc ->TagNames[i] == (cmsTagSignature) 0) continue; // It is just a placeholder Tag.sig = (cmsTagSignature) _cmsAdjustEndianess32((cmsInt32Number) Icc -> TagNames[i]); Tag.offset = _cmsAdjustEndianess32((cmsInt32Number) Icc -> TagOffsets[i]); @@ -1195,7 +1213,7 @@ cmsBool SaveTags(_cmsICCPROFILE* Icc, _cmsICCPROFILE* FileOrig) for (i=0; i < Icc -> TagCount; i++) { - if (Icc ->TagNames[i] == 0) continue; + if (Icc ->TagNames[i] == (cmsTagSignature) 0) continue; // Linked tags are not written if (Icc ->TagLinked[i] != (cmsTagSignature) 0) continue; @@ -1329,11 +1347,15 @@ cmsUInt32Number CMSEXPORT cmsSaveProfileToIOhandler(cmsHPROFILE hProfile, cmsIOH _cmsAssert(hProfile != NULL); + if (!_cmsLockMutex(Icc->ContextID, Icc->UsrMutex)) return 0; memmove(&Keep, Icc, sizeof(_cmsICCPROFILE)); ContextID = cmsGetProfileContextID(hProfile); PrevIO = Icc ->IOhandler = cmsOpenIOhandlerFromNULL(ContextID); - if (PrevIO == NULL) return 0; + if (PrevIO == NULL) { + _cmsUnlockMutex(Icc->ContextID, Icc->UsrMutex); + return 0; + } // Pass #1 does compute offsets @@ -1353,7 +1375,10 @@ cmsUInt32Number CMSEXPORT cmsSaveProfileToIOhandler(cmsHPROFILE hProfile, cmsIOH } memmove(Icc, &Keep, sizeof(_cmsICCPROFILE)); - if (!cmsCloseIOhandler(PrevIO)) return 0; + if (!cmsCloseIOhandler(PrevIO)) + UsedSpace = 0; // As a error marker + + _cmsUnlockMutex(Icc->ContextID, Icc->UsrMutex); return UsedSpace; @@ -1361,6 +1386,8 @@ cmsUInt32Number CMSEXPORT cmsSaveProfileToIOhandler(cmsHPROFILE hProfile, cmsIOH Error: cmsCloseIOhandler(PrevIO); memmove(Icc, &Keep, sizeof(_cmsICCPROFILE)); + _cmsUnlockMutex(Icc->ContextID, Icc->UsrMutex); + return 0; } @@ -1564,7 +1591,7 @@ void* CMSEXPORT cmsReadTag(cmsHPROFILE hProfile, cmsTagSignature sig) LocalTypeHandler.ICCVersion = Icc ->Version; Icc -> TagPtrs[n] = LocalTypeHandler.ReadPtr(&LocalTypeHandler, io, &ElemCount, TagSize); - // The tag type is supported, but something wrong happend and we cannot read the tag. + // The tag type is supported, but something wrong happened and we cannot read the tag. // let know the user about this (although it is just a warning) if (Icc -> TagPtrs[n] == NULL) { @@ -1883,7 +1910,7 @@ cmsBool CMSEXPORT cmsWriteRawTag(cmsHPROFILE hProfile, cmsTagSignature sig, cons _cmsUnlockMutex(Icc->ContextID, Icc ->UsrMutex); if (Icc->TagPtrs[i] == NULL) { - Icc->TagNames[i] = 0; + Icc->TagNames[i] = (cmsTagSignature) 0; return FALSE; } return TRUE; diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsio1.c b/jdk/src/java.desktop/share/native/liblcms/cmsio1.c index 4c259f8d401..c478b2ec75e 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmsio1.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmsio1.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2012 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -157,7 +157,7 @@ cmsBool _cmsReadCHAD(cmsMAT3* Dest, cmsHPROFILE hProfile) } -// Auxiliar, read colorants as a MAT3 structure. Used by any function that needs a matrix-shaper +// Auxiliary, read colorants as a MAT3 structure. Used by any function that needs a matrix-shaper static cmsBool ReadICCMatrixRGB2XYZ(cmsMAT3* r, cmsHPROFILE hProfile) { @@ -343,7 +343,7 @@ cmsPipeline* _cmsReadInputLUT(cmsHPROFILE hProfile, int Intent) cmsTagSignature tagFloat; cmsContext ContextID = cmsGetProfileContextID(hProfile); - // On named color, take the appropiate tag + // On named color, take the appropriate tag if (cmsGetDeviceClass(hProfile) == cmsSigNamedColorClass) { cmsPipeline* Lut; @@ -365,9 +365,9 @@ cmsPipeline* _cmsReadInputLUT(cmsHPROFILE hProfile, int Intent) return Lut; } - // This is an attempt to reuse this funtion to retrieve the matrix-shaper as pipeline no + // This is an attempt to reuse this function to retrieve the matrix-shaper as pipeline no // matter other LUT are present and have precedence. Intent = -1 means just this. - if (Intent != -1) { + if (Intent >= INTENT_PERCEPTUAL && Intent <= INTENT_ABSOLUTE_COLORIMETRIC) { tag16 = Device2PCS16[Intent]; tagFloat = Device2PCSFloat[Intent]; @@ -423,7 +423,7 @@ Error: // Check if this is a grayscale profile. if (cmsGetColorSpace(hProfile) == cmsSigGrayData) { - // if so, build appropiate conversion tables. + // if so, build appropriate conversion tables. // The tables are the PCS iluminant, scaled across GrayTRC return BuildGrayInputMatrixPipeline(hProfile); } @@ -578,7 +578,7 @@ cmsPipeline* _cmsReadFloatOutputTag(cmsHPROFILE hProfile, cmsTagSignature tagFlo if (Lut == NULL) return NULL; // If PCS is Lab or XYZ, the floating point tag is accepting data in the space encoding, - // and since the formatter has already accomodated to 0..1.0, we should undo this change + // and since the formatter has already accommodated to 0..1.0, we should undo this change if ( PCS == cmsSigLabData) { if (!cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageNormalizeToLabFloat(ContextID))) @@ -619,7 +619,7 @@ cmsPipeline* _cmsReadOutputLUT(cmsHPROFILE hProfile, int Intent) cmsContext ContextID = cmsGetProfileContextID(hProfile); - if (Intent != -1) { + if (Intent >= INTENT_PERCEPTUAL && Intent <= INTENT_ABSOLUTE_COLORIMETRIC) { tag16 = PCS2Device16[Intent]; tagFloat = PCS2DeviceFloat[Intent]; @@ -680,7 +680,7 @@ Error: // Check if this is a grayscale profile. if (cmsGetColorSpace(hProfile) == cmsSigGrayData) { - // if so, build appropiate conversion tables. + // if so, build appropriate conversion tables. // The tables are the PCS iluminant, scaled across GrayTRC return BuildGrayOutputPipeline(hProfile); } @@ -738,15 +738,21 @@ cmsPipeline* _cmsReadDevicelinkLUT(cmsHPROFILE hProfile, int Intent) { cmsPipeline* Lut; cmsTagTypeSignature OriginalType; - cmsTagSignature tag16 = Device2PCS16[Intent]; - cmsTagSignature tagFloat = Device2PCSFloat[Intent]; + cmsTagSignature tag16; + cmsTagSignature tagFloat; cmsContext ContextID = cmsGetProfileContextID(hProfile); - // On named color, take the appropiate tag + if (Intent < INTENT_PERCEPTUAL || Intent > INTENT_ABSOLUTE_COLORIMETRIC) + return NULL; + + tag16 = Device2PCS16[Intent]; + tagFloat = Device2PCSFloat[Intent]; + + // On named color, take the appropriate tag if (cmsGetDeviceClass(hProfile) == cmsSigNamedColorClass) { - cmsNAMEDCOLORLIST* nc = (cmsNAMEDCOLORLIST*) cmsReadTag(hProfile, cmsSigNamedColor2Tag); + cmsNAMEDCOLORLIST* nc = (cmsNAMEDCOLORLIST*)cmsReadTag(hProfile, cmsSigNamedColor2Tag); if (nc == NULL) return NULL; @@ -762,12 +768,13 @@ cmsPipeline* _cmsReadDevicelinkLUT(cmsHPROFILE hProfile, int Intent) goto Error; return Lut; -Error: + Error: cmsPipelineFree(Lut); cmsFreeNamedColorList(nc); return NULL; } + if (cmsIsTag(hProfile, tagFloat)) { // Float tag takes precedence // Floating point LUT are always V @@ -777,19 +784,19 @@ Error: tagFloat = Device2PCSFloat[0]; if (cmsIsTag(hProfile, tagFloat)) { - return cmsPipelineDup((cmsPipeline*) cmsReadTag(hProfile, tagFloat)); + return cmsPipelineDup((cmsPipeline*)cmsReadTag(hProfile, tagFloat)); } if (!cmsIsTag(hProfile, tag16)) { // Is there any LUT-Based table? - tag16 = Device2PCS16[0]; + tag16 = Device2PCS16[0]; if (!cmsIsTag(hProfile, tag16)) return NULL; } // Check profile version and LUT type. Do the necessary adjustments if needed // Read the tag - Lut = (cmsPipeline*) cmsReadTag(hProfile, tag16); + Lut = (cmsPipeline*)cmsReadTag(hProfile, tag16); if (Lut == NULL) return NULL; // The profile owns the Lut, so we need to copy it @@ -802,7 +809,7 @@ Error: ChangeInterpolationToTrilinear(Lut); // After reading it, we have info about the original type - OriginalType = _cmsGetTagTrueType(hProfile, tag16); + OriginalType = _cmsGetTagTrueType(hProfile, tag16); // We need to adjust data for Lab16 on output if (OriginalType != cmsSigLut16Type) return Lut; @@ -810,12 +817,12 @@ Error: // Here it is possible to get Lab on both sides if (cmsGetColorSpace(hProfile) == cmsSigLabData) { - if(!cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageAllocLabV4ToV2(ContextID))) + if (!cmsPipelineInsertStage(Lut, cmsAT_BEGIN, _cmsStageAllocLabV4ToV2(ContextID))) goto Error2; } if (cmsGetPCS(hProfile) == cmsSigLabData) { - if(!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocLabV2ToV4(ContextID))) + if (!cmsPipelineInsertStage(Lut, cmsAT_END, _cmsStageAllocLabV2ToV4(ContextID))) goto Error2; } @@ -950,7 +957,7 @@ cmsBool _cmsWriteProfileSequence(cmsHPROFILE hProfile, const cmsSEQ* seq) } -// Auxiliar, read and duplicate a MLU if found. +// Auxiliary, read and duplicate a MLU if found. static cmsMLU* GetMLUFromProfile(cmsHPROFILE h, cmsTagSignature sig) { diff --git a/jdk/src/java.desktop/share/native/liblcms/cmslut.c b/jdk/src/java.desktop/share/native/liblcms/cmslut.c index 69d2fd29cde..6c4b8ce4b40 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmslut.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmslut.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2012 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -534,7 +534,7 @@ void* CLUTElemDup(cmsStage* mpe) goto Error; } else { NewElem ->Tab.T = (cmsUInt16Number*) _cmsDupMem(mpe ->ContextID, Data ->Tab.T, Data ->nEntries * sizeof (cmsUInt16Number)); - if (NewElem ->Tab.TFloat == NULL) + if (NewElem ->Tab.T == NULL) goto Error; } } @@ -1482,7 +1482,8 @@ cmsPipeline* CMSEXPORT cmsPipelineDup(const cmsPipeline* lut) First = FALSE; } else { - Anterior ->Next = NewMPE; + if (Anterior != NULL) + Anterior ->Next = NewMPE; } Anterior = NewMPE; @@ -1836,3 +1837,5 @@ cmsBool CMSEXPORT cmsPipelineEvalReverseFloat(cmsFloat32Number Target[], return TRUE; } + + diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsmd5.c b/jdk/src/java.desktop/share/native/liblcms/cmsmd5.c index c238e4168eb..619c94edf4c 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmsmd5.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmsmd5.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2012 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsmtrx.c b/jdk/src/java.desktop/share/native/liblcms/cmsmtrx.c index 6fcdc317674..2bc6a497775 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmsmtrx.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmsmtrx.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2012 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -67,7 +67,7 @@ void CMSEXPORT _cmsVEC3init(cmsVEC3* r, cmsFloat64Number x, cmsFloat64Number y, r -> n[VZ] = z; } -// Vector substraction +// Vector subtraction void CMSEXPORT _cmsVEC3minus(cmsVEC3* r, const cmsVEC3* a, const cmsVEC3* b) { r -> n[VX] = a -> n[VX] - b -> n[VX]; @@ -201,3 +201,5 @@ void CMSEXPORT _cmsMAT3eval(cmsVEC3* r, const cmsMAT3* a, const cmsVEC3* v) r->n[VY] = a->v[1].n[VX]*v->n[VX] + a->v[1].n[VY]*v->n[VY] + a->v[1].n[VZ]*v->n[VZ]; r->n[VZ] = a->v[2].n[VX]*v->n[VX] + a->v[2].n[VY]*v->n[VY] + a->v[2].n[VZ]*v->n[VZ]; } + + diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsnamed.c b/jdk/src/java.desktop/share/native/liblcms/cmsnamed.c index fd4e56521e9..870936fddf6 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmsnamed.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmsnamed.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2012 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -121,7 +121,7 @@ cmsBool GrowMLUpool(cmsMLU* mlu) static cmsBool GrowMLUtable(cmsMLU* mlu) { - int AllocatedEntries; + cmsUInt32Number AllocatedEntries; _cmsMLUentry *NewPtr; // Sanity check @@ -147,7 +147,7 @@ cmsBool GrowMLUtable(cmsMLU* mlu) static int SearchMLUEntry(cmsMLU* mlu, cmsUInt16Number LanguageCode, cmsUInt16Number CountryCode) { - int i; + cmsUInt32Number i; // Sanity check if (mlu == NULL) return -1; @@ -207,15 +207,42 @@ cmsBool AddMLUBlock(cmsMLU* mlu, cmsUInt32Number size, const wchar_t *Block, return TRUE; } +// Convert from a 3-char code to a cmsUInt16Number. It is done inthis way because some +// compilers don't properly align beginning of strings -// Add an ASCII entry. +static +cmsUInt16Number strTo16(const char str[3]) +{ + cmsUInt16Number n = ((cmsUInt16Number) str[0] << 8) | str[1]; + + return n; // Always big endian in this case +} + +static +void strFrom16(char str[3], cmsUInt16Number n) +{ + // Assiming this would be aligned + union { + + cmsUInt16Number n; + char str[2]; + + } c; + + c.n = n; // Always big endian in this case + + str[0] = c.str[0]; str[1] = c.str[1]; str[2] = 0; + +} + +// Add an ASCII entry. Do not add any \0 termination (ICC1v43_2010-12.pdf page 61) cmsBool CMSEXPORT cmsMLUsetASCII(cmsMLU* mlu, const char LanguageCode[3], const char CountryCode[3], const char* ASCIIString) { - cmsUInt32Number i, len = (cmsUInt32Number) strlen(ASCIIString)+1; + cmsUInt32Number i, len = (cmsUInt32Number) strlen(ASCIIString); wchar_t* WStr; cmsBool rc; - cmsUInt16Number Lang = _cmsAdjustEndianess16(*(cmsUInt16Number*) LanguageCode); - cmsUInt16Number Cntry = _cmsAdjustEndianess16(*(cmsUInt16Number*) CountryCode); + cmsUInt16Number Lang = strTo16(LanguageCode); + cmsUInt16Number Cntry = strTo16(CountryCode); if (mlu == NULL) return FALSE; @@ -245,18 +272,17 @@ cmsUInt32Number mywcslen(const wchar_t *s) return (cmsUInt32Number)(p - s); } - -// Add a wide entry +// Add a wide entry. Do not add any \0 terminator (ICC1v43_2010-12.pdf page 61) cmsBool CMSEXPORT cmsMLUsetWide(cmsMLU* mlu, const char Language[3], const char Country[3], const wchar_t* WideString) { - cmsUInt16Number Lang = _cmsAdjustEndianess16(*(cmsUInt16Number*) Language); - cmsUInt16Number Cntry = _cmsAdjustEndianess16(*(cmsUInt16Number*) Country); + cmsUInt16Number Lang = strTo16(Language); + cmsUInt16Number Cntry = strTo16(Country); cmsUInt32Number len; if (mlu == NULL) return FALSE; if (WideString == NULL) return FALSE; - len = (cmsUInt32Number) (mywcslen(WideString) + 1) * sizeof(wchar_t); + len = (cmsUInt32Number) (mywcslen(WideString)) * sizeof(wchar_t); return AddMLUBlock(mlu, len, WideString, Lang, Cntry); } @@ -327,8 +353,8 @@ const wchar_t* _cmsMLUgetWide(const cmsMLU* mlu, cmsUInt16Number LanguageCode, cmsUInt16Number CountryCode, cmsUInt16Number* UsedLanguageCode, cmsUInt16Number* UsedCountryCode) { - int i; - int Best = -1; + cmsUInt32Number i; + cmsInt32Number Best = -1; _cmsMLUentry* v; if (mlu == NULL) return NULL; @@ -379,8 +405,8 @@ cmsUInt32Number CMSEXPORT cmsMLUgetASCII(const cmsMLU* mlu, cmsUInt32Number StrLen = 0; cmsUInt32Number ASCIIlen, i; - cmsUInt16Number Lang = _cmsAdjustEndianess16(*(cmsUInt16Number*) LanguageCode); - cmsUInt16Number Cntry = _cmsAdjustEndianess16(*(cmsUInt16Number*) CountryCode); + cmsUInt16Number Lang = strTo16(LanguageCode); + cmsUInt16Number Cntry = strTo16(CountryCode); // Sanitize if (mlu == NULL) return 0; @@ -423,8 +449,8 @@ cmsUInt32Number CMSEXPORT cmsMLUgetWide(const cmsMLU* mlu, const wchar_t *Wide; cmsUInt32Number StrLen = 0; - cmsUInt16Number Lang = _cmsAdjustEndianess16(*(cmsUInt16Number*) LanguageCode); - cmsUInt16Number Cntry = _cmsAdjustEndianess16(*(cmsUInt16Number*) CountryCode); + cmsUInt16Number Lang = strTo16(LanguageCode); + cmsUInt16Number Cntry = strTo16(CountryCode); // Sanitize if (mlu == NULL) return 0; @@ -456,8 +482,8 @@ CMSAPI cmsBool CMSEXPORT cmsMLUgetTranslation(const cmsMLU* mlu, { const wchar_t *Wide; - cmsUInt16Number Lang = _cmsAdjustEndianess16(*(cmsUInt16Number*) LanguageCode); - cmsUInt16Number Cntry = _cmsAdjustEndianess16(*(cmsUInt16Number*) CountryCode); + cmsUInt16Number Lang = strTo16(LanguageCode); + cmsUInt16Number Cntry = strTo16(CountryCode); cmsUInt16Number ObtLang, ObtCode; // Sanitize @@ -467,10 +493,9 @@ CMSAPI cmsBool CMSEXPORT cmsMLUgetTranslation(const cmsMLU* mlu, if (Wide == NULL) return FALSE; // Get used language and code - *(cmsUInt16Number *)ObtainedLanguage = _cmsAdjustEndianess16(ObtLang); - *(cmsUInt16Number *)ObtainedCountry = _cmsAdjustEndianess16(ObtCode); + strFrom16(ObtainedLanguage, ObtLang); + strFrom16(ObtainedCountry, ObtCode); - ObtainedLanguage[2] = ObtainedCountry[2] = 0; return TRUE; } @@ -493,12 +518,12 @@ cmsBool CMSEXPORT cmsMLUtranslationsCodes(const cmsMLU* mlu, if (mlu == NULL) return FALSE; - if (idx >= (cmsUInt32Number) mlu->UsedEntries) return FALSE; + if (idx >= mlu->UsedEntries) return FALSE; entry = &mlu->Entries[idx]; - *(cmsUInt16Number *)LanguageCode = _cmsAdjustEndianess16(entry->Language); - *(cmsUInt16Number *)CountryCode = _cmsAdjustEndianess16(entry->Country); + strFrom16(LanguageCode, entry->Language); + strFrom16(CountryCode, entry->Country); return TRUE; } diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsopt.c b/jdk/src/java.desktop/share/native/liblcms/cmsopt.c index 892ec0a4040..d40993b083f 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmsopt.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmsopt.c @@ -27,11 +27,10 @@ // However, the following notice accompanied the original version of this // file: // - //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2011 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -258,11 +257,10 @@ cmsBool _MultiplyMatrix(cmsPipeline* Lut) // We can not get rid of full matrix cmsStage* Multmat = cmsStageAllocMatrix(Lut->ContextID, 3, 3, (const cmsFloat64Number*) &res, NULL); + if (Multmat == NULL) return FALSE; // Should never happen // Recover the chain - if (Multmat != NULL) { - Multmat->Next = chain; - } + Multmat->Next = chain; *pt1 = Multmat; } @@ -560,7 +558,7 @@ cmsBool PatchLUT(cmsStage* CLUT, cmsUInt16Number At[], cmsUInt16Number Value[], return TRUE; } -// Auxiliar, to see if two values are equal or very different +// Auxiliary, to see if two values are equal or very different static cmsBool WhitesAreEqual(int n, cmsUInt16Number White1[], cmsUInt16Number White2[] ) { @@ -568,7 +566,7 @@ cmsBool WhitesAreEqual(int n, cmsUInt16Number White1[], cmsUInt16Number White2[] for (i=0; i < n; i++) { - if (abs(White1[i] - White2[i]) > 0xf000) return TRUE; // Values are so extremly different that the fixup should be avoided + if (abs(White1[i] - White2[i]) > 0xf000) return TRUE; // Values are so extremely different that the fixup should be avoided if (White1[i] != White2[i]) return FALSE; } return TRUE; @@ -706,7 +704,7 @@ cmsBool OptimizeByResampling(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUInt3 cmsStage* PreLin = cmsPipelineGetPtrToFirstStage(Src); // Check if suitable - if (PreLin ->Type == cmsSigCurveSetElemType) { + if (PreLin && PreLin ->Type == cmsSigCurveSetElemType) { // Maybe this is a linear tram, so we can avoid the whole stuff if (!AllCurvesAreLinear(PreLin)) { @@ -739,7 +737,7 @@ cmsBool OptimizeByResampling(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUInt3 cmsStage* PostLin = cmsPipelineGetPtrToLastStage(Src); // Check if suitable - if (cmsStageType(PostLin) == cmsSigCurveSetElemType) { + if (PostLin && cmsStageType(PostLin) == cmsSigCurveSetElemType) { // Maybe this is a linear tram, so we can avoid the whole stuff if (!AllCurvesAreLinear(PostLin)) { @@ -1041,8 +1039,8 @@ cmsBool IsDegenerated(const cmsToneCurve* g) } if (Zeros == 1 && Poles == 1) return FALSE; // For linear tables - if (Zeros > (nEntries / 4)) return TRUE; // Degenerated, mostly zeros - if (Poles > (nEntries / 4)) return TRUE; // Degenerated, mostly poles + if (Zeros > (nEntries / 20)) return TRUE; // Degenerated, many zeros + if (Poles > (nEntries / 20)) return TRUE; // Degenerated, many poles return FALSE; } @@ -1064,17 +1062,19 @@ cmsBool OptimizeByComputingLinearization(cmsPipeline** Lut, cmsUInt32Number Inte cmsColorSpaceSignature ColorSpace, OutputColorSpace; cmsStage* OptimizedPrelinMpe; cmsStage* mpe; - cmsToneCurve** OptimizedPrelinCurves; - _cmsStageCLutData* OptimizedPrelinCLUT; + cmsToneCurve** OptimizedPrelinCurves; + _cmsStageCLutData* OptimizedPrelinCLUT; // This is a loosy optimization! does not apply in floating-point cases if (_cmsFormatterIsFloat(*InputFormat) || _cmsFormatterIsFloat(*OutputFormat)) return FALSE; - // Only on RGB + // Only on chunky RGB if (T_COLORSPACE(*InputFormat) != PT_RGB) return FALSE; - if (T_COLORSPACE(*OutputFormat) != PT_RGB) return FALSE; + if (T_PLANAR(*InputFormat)) return FALSE; + if (T_COLORSPACE(*OutputFormat) != PT_RGB) return FALSE; + if (T_PLANAR(*OutputFormat)) return FALSE; // On 16 bits, user has to specify the feature if (!_cmsFormatterIs8bit(*InputFormat)) { @@ -1098,6 +1098,22 @@ cmsBool OptimizeByComputingLinearization(cmsPipeline** Lut, cmsUInt32Number Inte memset(Trans, 0, sizeof(Trans)); memset(TransReverse, 0, sizeof(TransReverse)); + // If the last stage of the original lut are curves, and those curves are + // degenerated, it is likely the transform is squeezing and clipping + // the output from previous CLUT. We cannot optimize this case + { + cmsStage* last = cmsPipelineGetPtrToLastStage(OriginalLut); + + if (cmsStageType(last) == cmsSigCurveSetElemType) { + + _cmsStageToneCurvesData* Data = (_cmsStageToneCurvesData*)cmsStageData(last); + for (i = 0; i < Data->nCurves; i++) { + if (IsDegenerated(Data->TheCurves[i])) + goto Error; + } + } + } + for (t = 0; t < OriginalLut ->InputChannels; t++) { Trans[t] = cmsBuildTabulatedToneCurve16(OriginalLut ->ContextID, PRELINEARIZATION_POINTS, NULL); if (Trans[t] == NULL) goto Error; @@ -1431,7 +1447,10 @@ cmsBool OptimizeByJoiningCurves(cmsPipeline** Lut, cmsUInt32Number Intent, cmsUI GammaTables[i] = NULL; } - if (GammaTables != NULL) _cmsFree(Src ->ContextID, GammaTables); + if (GammaTables != NULL) { + _cmsFree(Src->ContextID, GammaTables); + GammaTables = NULL; + } // Maybe the curves are linear at the end if (!AllCurvesAreLinear(ObtainedCurves)) { diff --git a/jdk/src/java.desktop/share/native/liblcms/cmspack.c b/jdk/src/java.desktop/share/native/liblcms/cmspack.c index e389c4e3f97..a9087f6fc8a 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmspack.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmspack.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2010 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -110,7 +110,7 @@ typedef struct { #define ANYFLAVOR FLAVOR_SH(1) -// Supress waning about info never being used +// Suppress waning about info never being used #ifdef _MSC_VER #pragma warning(disable : 4100) @@ -3188,6 +3188,8 @@ cmsFormatter _cmsGetStockOutputFormatter(cmsUInt32Number dwInput, cmsUInt32Numbe cmsUInt32Number i; cmsFormatter fr; + // Optimization is only a hint + dwInput &= ~OPTIMIZED_SH(1); switch (dwFlags) { diff --git a/jdk/src/java.desktop/share/native/liblcms/cmspcs.c b/jdk/src/java.desktop/share/native/liblcms/cmspcs.c index d4ef69442a5..f2ebf53bf96 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmspcs.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmspcs.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2010 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -337,7 +337,7 @@ void CMSEXPORT cmsFloat2LabEncoded(cmsUInt16Number wLab[3], const cmsCIELab* fLa wLab[2] = ab2Fix4(Lab.b); } -// Auxiliar: convert to Radians +// Auxiliary: convert to Radians static cmsFloat64Number RADIANS(cmsFloat64Number deg) { @@ -345,7 +345,7 @@ cmsFloat64Number RADIANS(cmsFloat64Number deg) } -// Auxiliar: atan2 but operating in degrees and returning 0 if a==b==0 +// Auxiliary: atan2 but operating in degrees and returning 0 if a==b==0 static cmsFloat64Number atan2deg(cmsFloat64Number a, cmsFloat64Number b) { @@ -368,7 +368,7 @@ cmsFloat64Number atan2deg(cmsFloat64Number a, cmsFloat64Number b) } -// Auxiliar: Square +// Auxiliary: Square static cmsFloat64Number Sqr(cmsFloat64Number v) { diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsplugin.c b/jdk/src/java.desktop/share/native/liblcms/cmsplugin.c index 9fe6bc3b6b8..683c8305980 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmsplugin.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmsplugin.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2010 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -136,7 +136,7 @@ void CMSEXPORT _cmsAdjustEndianess64(cmsUInt64Number* Result, cmsUInt64Number* #endif } -// Auxiliar -- read 8, 16 and 32-bit numbers +// Auxiliary -- read 8, 16 and 32-bit numbers cmsBool CMSEXPORT _cmsReadUInt8Number(cmsIOHANDLER* io, cmsUInt8Number* n) { cmsUInt8Number tmp; @@ -201,13 +201,13 @@ cmsBool CMSEXPORT _cmsReadFloat32Number(cmsIOHANDLER* io, cmsFloat32Number* n) _cmsAssert(io != NULL); - if (io -> Read(io, &tmp, sizeof(cmsFloat32Number), 1) != 1) + if (io -> Read(io, &tmp, sizeof(cmsUInt32Number), 1) != 1) return FALSE; if (n != NULL) { tmp = _cmsAdjustEndianess32(tmp); - *n = *(cmsFloat32Number*) &tmp; + *n = *(cmsFloat32Number*) (void*) &tmp; } return TRUE; } @@ -244,22 +244,6 @@ cmsBool CMSEXPORT _cmsRead15Fixed16Number(cmsIOHANDLER* io, cmsFloat64Number* n } -// Jun-21-2000: Some profiles (those that comes with W2K) comes -// with the media white (media black?) x 100. Add a sanity check - -static -void NormalizeXYZ(cmsCIEXYZ* Dest) -{ - while (Dest -> X > 2. && - Dest -> Y > 2. && - Dest -> Z > 2.) { - - Dest -> X /= 10.; - Dest -> Y /= 10.; - Dest -> Z /= 10.; - } -} - cmsBool CMSEXPORT _cmsReadXYZNumber(cmsIOHANDLER* io, cmsCIEXYZ* XYZ) { cmsEncodedXYZNumber xyz; @@ -273,8 +257,6 @@ cmsBool CMSEXPORT _cmsReadXYZNumber(cmsIOHANDLER* io, cmsCIEXYZ* XYZ) XYZ->X = _cms15Fixed16toDouble(_cmsAdjustEndianess32(xyz.X)); XYZ->Y = _cms15Fixed16toDouble(_cmsAdjustEndianess32(xyz.Y)); XYZ->Z = _cms15Fixed16toDouble(_cmsAdjustEndianess32(xyz.Z)); - - NormalizeXYZ(XYZ); } return TRUE; } @@ -336,7 +318,7 @@ cmsBool CMSEXPORT _cmsWriteFloat32Number(cmsIOHANDLER* io, cmsFloat32Number n) _cmsAssert(io != NULL); - tmp = *(cmsUInt32Number*) &n; + tmp = *(cmsUInt32Number*) (void*) &n; tmp = _cmsAdjustEndianess32(tmp); if (io -> Write(io, sizeof(cmsUInt32Number), &tmp) != 1) return FALSE; @@ -532,7 +514,10 @@ cmsBool CMSEXPORT _cmsIOPrintf(cmsIOHANDLER* io, const char* frm, ...) va_start(args, frm); len = vsnprintf((char*) Buffer, 2047, frm, args); - if (len < 0) return FALSE; // Truncated, which is a fatal error for us + if (len < 0) { + va_end(args); + return FALSE; // Truncated, which is a fatal error for us + } rc = io ->Write(io, len, Buffer); @@ -554,6 +539,7 @@ void* _cmsPluginMalloc(cmsContext ContextID, cmsUInt32Number size) if (ContextID == NULL) { ctx->MemPool = _cmsCreateSubAlloc(0, 2*1024); + if (ctx->MemPool == NULL) return NULL; } else { cmsSignalError(ContextID, cmsERROR_CORRUPTION_DETECTED, "NULL memory pool on context"); @@ -989,3 +975,5 @@ void* CMSEXPORT cmsGetContextUserData(cmsContext ContextID) { return _cmsContextGetClientChunk(ContextID, UserPtr); } + + diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsps2.c b/jdk/src/java.desktop/share/native/liblcms/cmsps2.c index 22089d094ab..03d476bc367 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmsps2.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmsps2.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2011 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -608,7 +608,7 @@ void EmitNGamma(cmsIOHANDLER* m, int n, cmsToneCurve* g[]) // // Each row contains Pipeline values for all but first component. So, I // detect row changing by keeping a copy of last value of first -// component. -1 is used to mark begining of whole block. +// component. -1 is used to mark beginning of whole block. static int OutputValueSampler(register const cmsUInt16Number In[], register cmsUInt16Number Out[], register void* Cargo) @@ -1422,14 +1422,15 @@ void BuildColorantList(char *Colorant, int nColorant, cmsUInt16Number Out[]) if (nColorant > cmsMAXCHANNELS) nColorant = cmsMAXCHANNELS; - for (j=0; j < nColorant; j++) { + for (j = 0; j < nColorant; j++) { - sprintf(Buff, "%.3f", Out[j] / 65535.0); - strcat(Colorant, Buff); - if (j < nColorant -1) - strcat(Colorant, " "); + snprintf(Buff, 31, "%.3f", Out[j] / 65535.0); + Buff[31] = 0; + strcat(Colorant, Buff); + if (j < nColorant - 1) + strcat(Colorant, " "); - } + } } diff --git a/jdk/src/java.desktop/share/native/liblcms/cmssamp.c b/jdk/src/java.desktop/share/native/liblcms/cmssamp.c index bcd9d50be76..b22c427323e 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmssamp.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmssamp.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2014 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), diff --git a/jdk/src/java.desktop/share/native/liblcms/cmssm.c b/jdk/src/java.desktop/share/native/liblcms/cmssm.c index 783f3c31bf5..1923a02841a 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmssm.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmssm.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2011 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -247,7 +247,8 @@ cmsBool ClosestLineToLine(cmsVEC3* r, const cmsLine* line1, const cmsLine* line2 { cmsFloat64Number a, b, c, d, e, D; cmsFloat64Number sc, sN, sD; - cmsFloat64Number tc, tN, tD; + //cmsFloat64Number tc; // left for future use + cmsFloat64Number tN, tD; cmsVEC3 w0; _cmsVEC3minus(&w0, &line1 ->a, &line2 ->a); @@ -315,7 +316,7 @@ cmsBool ClosestLineToLine(cmsVEC3* r, const cmsLine* line1, const cmsLine* line2 } // finally do the division to get sc and tc sc = (fabs(sN) < MATRIX_DET_TOLERANCE ? 0.0 : sN / sD); - tc = (fabs(tN) < MATRIX_DET_TOLERANCE ? 0.0 : tN / tD); + //tc = (fabs(tN) < MATRIX_DET_TOLERANCE ? 0.0 : tN / tD); // left for future use. GetPointOfLine(r, line1, sc); return TRUE; @@ -346,7 +347,7 @@ void CMSEXPORT cmsGBDFree(cmsHANDLE hGBD) } -// Auxiliar to retrieve a pointer to the segmentr containing the Lab value +// Auxiliary to retrieve a pointer to the segmentr containing the Lab value static cmsGDBPoint* GetPoint(cmsGDB* gbd, const cmsCIELab* Lab, cmsSpherical* sp) { @@ -358,7 +359,7 @@ cmsGDBPoint* GetPoint(cmsGDB* gbd, const cmsCIELab* Lab, cmsSpherical* sp) _cmsAssert(Lab != NULL); _cmsAssert(sp != NULL); - // Center L* by substracting half of its domain, that's 50 + // Center L* by subtracting half of its domain, that's 50 _cmsVEC3init(&v, Lab ->L - 50.0, Lab ->a, Lab ->b); // Convert to spherical coordinates diff --git a/jdk/src/java.desktop/share/native/liblcms/cmstypes.c b/jdk/src/java.desktop/share/native/liblcms/cmstypes.c index 684a2059296..2563a62cc96 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmstypes.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmstypes.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2014 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -59,7 +59,7 @@ // This file implements every single tag and tag type as described in the ICC spec. Some types // have been deprecated, like ncl and Data. There is no implementation for those types as there // are no profiles holding them. The programmer can also extend this list by defining his own types -// by using the appropiate plug-in. There are three types of plug ins regarding that. First type +// by using the appropriate plug-in. There are three types of plug ins regarding that. First type // allows to define new tags using any existing type. Next plug-in type allows to define new types // and the third one is very specific: allows to extend the number of elements in the multiprocessing // elements special type. @@ -142,7 +142,7 @@ cmsTagTypeHandler* GetHandler(cmsTagTypeSignature sig, _cmsTagTypeLinkedList* Pl } -// Auxiliar to convert UTF-32 to UTF-16 in some cases +// Auxiliary to convert UTF-32 to UTF-16 in some cases static cmsBool _cmsWriteWCharArray(cmsIOHANDLER* io, cmsUInt32Number n, const wchar_t* Array) { @@ -158,7 +158,7 @@ cmsBool _cmsWriteWCharArray(cmsIOHANDLER* io, cmsUInt32Number n, const wchar_t* return TRUE; } -// Auxiliar to read an array of wchar_t +// Auxiliary to read an array of wchar_t static cmsBool _cmsReadWCharArray(cmsIOHANDLER* io, cmsUInt32Number n, wchar_t* Array) { @@ -189,7 +189,7 @@ typedef cmsBool (* PositionTableEntryFn)(struct _cms_typehandler_struct* self, cmsUInt32Number n, cmsUInt32Number SizeOfTag); -// Helper function to deal with position tables as decribed in ICC spec 4.3 +// Helper function to deal with position tables as described in ICC spec 4.3 // A table of n elements is readed, where first comes n records containing offsets and sizes and // then a block containing the data itself. This allows to reuse same data in more than one entry static @@ -980,7 +980,7 @@ cmsBool Type_Text_Description_Write(struct _cms_typehandler_struct* self, cmsIO cmsMLU* mlu = (cmsMLU*) Ptr; char *Text = NULL; wchar_t *Wide = NULL; - cmsUInt32Number len, len_aligned, len_filler_alignment; + cmsUInt32Number len, len_text, len_tag_requirement, len_aligned; cmsBool rc = FALSE; char Filler[68]; @@ -990,17 +990,18 @@ cmsBool Type_Text_Description_Write(struct _cms_typehandler_struct* self, cmsIO // Get the len of string len = cmsMLUgetASCII(mlu, cmsNoLanguage, cmsNoCountry, NULL, 0); - // From ICC3.4: It has been found that textDescriptionType can contain misaligned data + // Specification ICC.1:2001-04 (v2.4.0): It has been found that textDescriptionType can contain misaligned data //(see clause 4.1 for the definition of “aligned”). Because the Unicode language // code and Unicode count immediately follow the ASCII description, their // alignment is not correct if the ASCII count is not a multiple of four. The // ScriptCode code is misaligned when the ASCII count is odd. Profile reading and // writing software must be written carefully in order to handle these alignment // problems. - - // Compute an aligned size - len_aligned = _cmsALIGNLONG(len); - len_filler_alignment = len_aligned - len; + // + // The above last sentence suggest to handle alignment issues in the + // parser. The provided example (Table 69 on Page 60) makes this clear. + // The padding only in the ASCII count is not sufficient for a aligned tag + // size, with the same text size in ASCII and Unicode. // Null strings if (len <= 0) { @@ -1021,6 +1022,12 @@ cmsBool Type_Text_Description_Write(struct _cms_typehandler_struct* self, cmsIO cmsMLUgetWide(mlu, cmsNoLanguage, cmsNoCountry, Wide, len * sizeof(wchar_t)); } + // Tell the real text len including the null terminator and padding + len_text = (cmsUInt32Number) strlen(Text) + 1; + // Compute an total tag size requirement + len_tag_requirement = (8+4+len_text+4+4+2*len_text+2+1+67); + len_aligned = _cmsALIGNLONG(len_tag_requirement); + // * cmsUInt32Number count; * Description length // * cmsInt8Number desc[count] * NULL terminated ascii string // * cmsUInt32Number ucLangCode; * UniCode language code @@ -1030,20 +1037,14 @@ cmsBool Type_Text_Description_Write(struct _cms_typehandler_struct* self, cmsIO // * cmsUInt8Number scCount; * ScriptCode count // * cmsInt8Number scDesc[67]; * ScriptCode Description - if (!_cmsWriteUInt32Number(io, len_aligned)) goto Error; - if (!io ->Write(io, len, Text)) goto Error; - if (!io ->Write(io, len_filler_alignment, Filler)) goto Error; + if (!_cmsWriteUInt32Number(io, len_text)) goto Error; + if (!io ->Write(io, len_text, Text)) goto Error; if (!_cmsWriteUInt32Number(io, 0)) goto Error; // ucLanguageCode - // This part is tricky: we need an aligned tag size, and the ScriptCode part - // takes 70 bytes, so we need 2 extra bytes to do the alignment - - if (!_cmsWriteUInt32Number(io, len_aligned+1)) goto Error; - + if (!_cmsWriteUInt32Number(io, len_text)) goto Error; // Note that in some compilers sizeof(cmsUInt16Number) != sizeof(wchar_t) - if (!_cmsWriteWCharArray(io, len, Wide)) goto Error; - if (!_cmsWriteUInt16Array(io, len_filler_alignment+1, (cmsUInt16Number*) Filler)) goto Error; + if (!_cmsWriteWCharArray(io, len_text, Wide)) goto Error; // ScriptCode Code & count (unused) if (!_cmsWriteUInt16Number(io, 0)) goto Error; @@ -1051,6 +1052,10 @@ cmsBool Type_Text_Description_Write(struct _cms_typehandler_struct* self, cmsIO if (!io ->Write(io, 67, Filler)) goto Error; + // possibly add pad at the end of tag + if(len_aligned - len_tag_requirement > 0) + if (!io ->Write(io, len_aligned - len_tag_requirement, Filler)) goto Error; + rc = TRUE; Error: @@ -1498,7 +1503,7 @@ void *Type_MLU_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsU LargestPosition = EndOfThisString; } - // Now read the remaining of tag and fill all strings. Substract the directory + // Now read the remaining of tag and fill all strings. Subtract the directory SizeOfTag = (LargestPosition * sizeof(wchar_t)) / sizeof(cmsUInt16Number); if (SizeOfTag == 0) { @@ -1532,7 +1537,7 @@ cmsBool Type_MLU_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsMLU* mlu =(cmsMLU*) Ptr; cmsUInt32Number HeaderSize; cmsUInt32Number Len, Offset; - int i; + cmsUInt32Number i; if (Ptr == NULL) { @@ -3133,6 +3138,8 @@ void *Type_NamedColor_Read(struct _cms_typehandler_struct* self, cmsIOHANDLER* i memset(Colorant, 0, sizeof(Colorant)); if (io -> Read(io, Root, 32, 1) != 1) return NULL; + Root[32] = 0; // To prevent exploits + if (!_cmsReadUInt16Array(io, 3, PCS)) goto Error; if (!_cmsReadUInt16Array(io, nDeviceCoords, Colorant)) goto Error; @@ -3155,8 +3162,8 @@ static cmsBool Type_NamedColor_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems) { cmsNAMEDCOLORLIST* NamedColorList = (cmsNAMEDCOLORLIST*) Ptr; - char prefix[32]; // Prefix for each color name - char suffix[32]; // Suffix for each color name + char prefix[33]; // Prefix for each color name + char suffix[33]; // Suffix for each color name int i, nColors; nColors = cmsNamedColorCount(NamedColorList); @@ -3168,7 +3175,7 @@ cmsBool Type_NamedColor_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER strncpy(prefix, (const char*) NamedColorList->Prefix, 32); strncpy(suffix, (const char*) NamedColorList->Suffix, 32); - suffix[31] = prefix[31] = 0; + suffix[32] = prefix[32] = 0; if (!io ->Write(io, 32, prefix)) return FALSE; if (!io ->Write(io, 32, suffix)) return FALSE; @@ -3180,6 +3187,7 @@ cmsBool Type_NamedColor_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER char Root[33]; if (!cmsNamedColorInfo(NamedColorList, i, Root, NULL, NULL, PCS, Colorant)) return 0; + Root[32] = 0; if (!io ->Write(io, 32 , Root)) return FALSE; if (!_cmsWriteUInt16Array(io, 3, PCS)) return FALSE; if (!_cmsWriteUInt16Array(io, NamedColorList ->ColorantCount, Colorant)) return FALSE; @@ -3630,7 +3638,7 @@ country varies for each element: -// Auxiliar, read an string specified as count + string +// Auxiliary, read an string specified as count + string static cmsBool ReadCountAndSting(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, cmsMLU* mlu, cmsUInt32Number* SizeOfTag, const char* Section) { @@ -3879,7 +3887,7 @@ cmsBool Type_ViewingConditions_Write(struct _cms_typehandler_struct* self, cmsIO static void* Type_ViewingConditions_Dup(struct _cms_typehandler_struct* self, const void *Ptr, cmsUInt32Number n) { - return _cmsDupMem(self ->ContextID, Ptr, sizeof(cmsScreening)); + return _cmsDupMem(self->ContextID, Ptr, sizeof(cmsICCViewingConditions)); cmsUNUSED_PARAMETER(n); } @@ -4333,13 +4341,13 @@ Error: static cmsBool Type_MPEclut_Write(struct _cms_typehandler_struct* self, cmsIOHANDLER* io, void* Ptr, cmsUInt32Number nItems) { - cmsUInt8Number Dimensions8[16]; + cmsUInt8Number Dimensions8[16]; // 16 because the spec says 16 and not max number of channels cmsUInt32Number i; cmsStage* mpe = (cmsStage*) Ptr; _cmsStageCLutData* clut = (_cmsStageCLutData*) mpe ->Data; - // Check for maximum number of channels - if (mpe -> InputChannels > 15) return FALSE; + // Check for maximum number of channels supported by lcms + if (mpe -> InputChannels > MAX_INPUT_DIMENSIONS) return FALSE; // Only floats are supported in MPE if (clut ->HasFloatValues == FALSE) return FALSE; @@ -5477,8 +5485,9 @@ static _cmsTagLinkedList SupportedTags[] = { { cmsSigScreeningTag, { 1, 1, { cmsSigScreeningType}, NULL }, &SupportedTags[59]}, { cmsSigVcgtTag, { 1, 1, { cmsSigVcgtType}, NULL }, &SupportedTags[60]}, { cmsSigMetaTag, { 1, 1, { cmsSigDictType}, NULL }, &SupportedTags[61]}, - { cmsSigProfileSequenceIdTag, { 1, 1, { cmsSigProfileSequenceIdType}, NULL }, &SupportedTags[62]}, - { cmsSigProfileDescriptionMLTag,{ 1, 1, { cmsSigMultiLocalizedUnicodeType}, NULL}, NULL} + { cmsSigProfileSequenceIdTag, { 1, 1, { cmsSigProfileSequenceIdType}, NULL }, &SupportedTags[62]}, + { cmsSigProfileDescriptionMLTag,{ 1, 1, { cmsSigMultiLocalizedUnicodeType}, NULL}, &SupportedTags[63]}, + { cmsSigArgyllArtsTag, { 9, 1, { cmsSigS15Fixed16ArrayType}, NULL}, NULL} }; diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsvirt.c b/jdk/src/java.desktop/share/native/liblcms/cmsvirt.c index 6c84f1387bc..8d353b369d7 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmsvirt.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmsvirt.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2014 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -1167,15 +1167,20 @@ cmsHPROFILE CMSEXPORT cmsTransform2DeviceLink(cmsHTRANSFORM hTransform, cmsFloat // If no way, then force CLUT that for sure can be written if (AllowedLUT == NULL) { + cmsStage* FirstStage; + cmsStage* LastStage; + dwFlags |= cmsFLAGS_FORCE_CLUT; _cmsOptimizePipeline(ContextID, &LUT, xform ->RenderingIntent, &FrmIn, &FrmOut, &dwFlags); // Put identity curves if needed - if (cmsPipelineGetPtrToFirstStage(LUT) ->Type != cmsSigCurveSetElemType) + FirstStage = cmsPipelineGetPtrToFirstStage(LUT); + if (FirstStage != NULL && FirstStage ->Type != cmsSigCurveSetElemType) if (!cmsPipelineInsertStage(LUT, cmsAT_BEGIN, _cmsStageAllocIdentityCurves(ContextID, ChansIn))) goto Error; - if (cmsPipelineGetPtrToLastStage(LUT) ->Type != cmsSigCurveSetElemType) + LastStage = cmsPipelineGetPtrToLastStage(LUT); + if (LastStage != NULL && LastStage ->Type != cmsSigCurveSetElemType) if (!cmsPipelineInsertStage(LUT, cmsAT_END, _cmsStageAllocIdentityCurves(ContextID, ChansOut))) goto Error; diff --git a/jdk/src/java.desktop/share/native/liblcms/cmswtpnt.c b/jdk/src/java.desktop/share/native/liblcms/cmswtpnt.c index 5dceaabb9f8..d23b29f1b00 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmswtpnt.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmswtpnt.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2014 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -376,3 +376,5 @@ cmsBool CMSEXPORT cmsAdaptToIlluminant(cmsCIEXYZ* Result, return TRUE; } + + diff --git a/jdk/src/java.desktop/share/native/liblcms/cmsxform.c b/jdk/src/java.desktop/share/native/liblcms/cmsxform.c index c0a069338aa..dfedd7f5cf9 100644 --- a/jdk/src/java.desktop/share/native/liblcms/cmsxform.c +++ b/jdk/src/java.desktop/share/native/liblcms/cmsxform.c @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2014 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -208,12 +208,18 @@ void CMSEXPORT cmsDoTransform(cmsHTRANSFORM Transform, { _cmsTRANSFORM* p = (_cmsTRANSFORM*) Transform; + cmsStride stride; - p -> xform(p, InputBuffer, OutputBuffer, Size, Size); + stride.BytesPerLineIn = 0; // Not used + stride.BytesPerLineOut = 0; + stride.BytesPerPlaneIn = Size; + stride.BytesPerPlaneOut = Size; + + p -> xform(p, InputBuffer, OutputBuffer, Size, 1, &stride); } -// Apply transform. +// This is a legacy stride for planar void CMSEXPORT cmsDoTransformStride(cmsHTRANSFORM Transform, const void* InputBuffer, void* OutputBuffer, @@ -221,10 +227,40 @@ void CMSEXPORT cmsDoTransformStride(cmsHTRANSFORM Transform, { _cmsTRANSFORM* p = (_cmsTRANSFORM*) Transform; + cmsStride stride; - p -> xform(p, InputBuffer, OutputBuffer, Size, Stride); + stride.BytesPerLineIn = 0; + stride.BytesPerLineOut = 0; + stride.BytesPerPlaneIn = Stride; + stride.BytesPerPlaneOut = Stride; + + p -> xform(p, InputBuffer, OutputBuffer, Size, 1, &stride); } +// This is the "fast" function for plugins +void CMSEXPORT cmsDoTransformLineStride(cmsHTRANSFORM Transform, + const void* InputBuffer, + void* OutputBuffer, + cmsUInt32Number PixelsPerLine, + cmsUInt32Number LineCount, + cmsUInt32Number BytesPerLineIn, + cmsUInt32Number BytesPerLineOut, + cmsUInt32Number BytesPerPlaneIn, + cmsUInt32Number BytesPerPlaneOut) + +{ + _cmsTRANSFORM* p = (_cmsTRANSFORM*) Transform; + cmsStride stride; + + stride.BytesPerLineIn = BytesPerLineIn; + stride.BytesPerLineOut = BytesPerLineOut; + stride.BytesPerPlaneIn = BytesPerPlaneIn; + stride.BytesPerPlaneOut = BytesPerPlaneOut; + + p->xform(p, InputBuffer, OutputBuffer, PixelsPerLine, LineCount, &stride); +} + + // Transform routines ---------------------------------------------------------------------------------------------------------- @@ -233,49 +269,64 @@ void CMSEXPORT cmsDoTransformStride(cmsHTRANSFORM Transform, static void FloatXFORM(_cmsTRANSFORM* p, const void* in, - void* out, cmsUInt32Number Size, cmsUInt32Number Stride) + void* out, + cmsUInt32Number PixelsPerLine, + cmsUInt32Number LineCount, + const cmsStride* Stride) { cmsUInt8Number* accum; cmsUInt8Number* output; cmsFloat32Number fIn[cmsMAXCHANNELS], fOut[cmsMAXCHANNELS]; cmsFloat32Number OutOfGamut; - cmsUInt32Number i, j; + cmsUInt32Number i, j, c, strideIn, strideOut; - accum = (cmsUInt8Number*) in; - output = (cmsUInt8Number*) out; + _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride); - for (i=0; i < Size; i++) { + strideIn = 0; + strideOut = 0; - accum = p -> FromInputFloat(p, fIn, accum, Stride); + for (i = 0; i < LineCount; i++) { - // Any gamut chack to do? - if (p ->GamutCheck != NULL) { + accum = (cmsUInt8Number*)in + strideIn; + output = (cmsUInt8Number*)out + strideOut; - // Evaluate gamut marker. - cmsPipelineEvalFloat( fIn, &OutOfGamut, p ->GamutCheck); + for (j = 0; j < PixelsPerLine; j++) { - // Is current color out of gamut? - if (OutOfGamut > 0.0) { + accum = p->FromInputFloat(p, fIn, accum, Stride->BytesPerPlaneIn); - // Certainly, out of gamut - for (j=0; j < cmsMAXCHANNELS; j++) - fOut[j] = -1.0; + // Any gamut chack to do? + if (p->GamutCheck != NULL) { + // Evaluate gamut marker. + cmsPipelineEvalFloat(fIn, &OutOfGamut, p->GamutCheck); + + // Is current color out of gamut? + if (OutOfGamut > 0.0) { + + // Certainly, out of gamut + for (c = 0; c < cmsMAXCHANNELS; c++) + fOut[c] = -1.0; + + } + else { + // No, proceed normally + cmsPipelineEvalFloat(fIn, fOut, p->Lut); + } } else { - // No, proceed normally - cmsPipelineEvalFloat(fIn, fOut, p -> Lut); + + // No gamut check at all + cmsPipelineEvalFloat(fIn, fOut, p->Lut); } - } - else { - // No gamut check at all - cmsPipelineEvalFloat(fIn, fOut, p -> Lut); + + output = p->ToOutputFloat(p, fOut, output, Stride->BytesPerPlaneOut); } - // Back to asked representation - output = p -> ToOutputFloat(p, fOut, output, Stride); + strideIn += Stride->BytesPerLineIn; + strideOut += Stride->BytesPerLineOut; } + } @@ -283,22 +334,34 @@ static void NullFloatXFORM(_cmsTRANSFORM* p, const void* in, void* out, - cmsUInt32Number Size, - cmsUInt32Number Stride) + cmsUInt32Number PixelsPerLine, + cmsUInt32Number LineCount, + const cmsStride* Stride) + { cmsUInt8Number* accum; cmsUInt8Number* output; cmsFloat32Number fIn[cmsMAXCHANNELS]; - cmsUInt32Number i, n; + cmsUInt32Number i, j, strideIn, strideOut; - accum = (cmsUInt8Number*) in; - output = (cmsUInt8Number*) out; - n = Size; + _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride); - for (i=0; i < n; i++) { + strideIn = 0; + strideOut = 0; - accum = p -> FromInputFloat(p, fIn, accum, Stride); - output = p -> ToOutputFloat(p, fIn, output, Stride); + for (i = 0; i < LineCount; i++) { + + accum = (cmsUInt8Number*) in + strideIn; + output = (cmsUInt8Number*) out + strideOut; + + for (j = 0; j < PixelsPerLine; j++) { + + accum = p->FromInputFloat(p, fIn, accum, Stride ->BytesPerPlaneIn); + output = p->ToOutputFloat(p, fIn, output, Stride->BytesPerPlaneOut); + } + + strideIn += Stride->BytesPerLineIn; + strideOut += Stride->BytesPerLineOut; } } @@ -308,23 +371,36 @@ void NullFloatXFORM(_cmsTRANSFORM* p, static void NullXFORM(_cmsTRANSFORM* p, const void* in, - void* out, cmsUInt32Number Size, - cmsUInt32Number Stride) + void* out, + cmsUInt32Number PixelsPerLine, + cmsUInt32Number LineCount, + const cmsStride* Stride) { cmsUInt8Number* accum; cmsUInt8Number* output; cmsUInt16Number wIn[cmsMAXCHANNELS]; - cmsUInt32Number i, n; + cmsUInt32Number i, j, strideIn, strideOut; - accum = (cmsUInt8Number*) in; - output = (cmsUInt8Number*) out; - n = Size; // Buffer len + _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride); - for (i=0; i < n; i++) { + strideIn = 0; + strideOut = 0; - accum = p -> FromInput(p, wIn, accum, Stride); - output = p -> ToOutput(p, wIn, output, Stride); + for (i = 0; i < LineCount; i++) { + + accum = (cmsUInt8Number*)in + strideIn; + output = (cmsUInt8Number*)out + strideOut; + + for (j = 0; j < PixelsPerLine; j++) { + + accum = p->FromInput(p, wIn, accum, Stride->BytesPerPlaneIn); + output = p->ToOutput(p, wIn, output, Stride->BytesPerPlaneOut); } + + strideIn += Stride->BytesPerLineIn; + strideOut += Stride->BytesPerLineOut; + } + } @@ -332,27 +408,41 @@ void NullXFORM(_cmsTRANSFORM* p, static void PrecalculatedXFORM(_cmsTRANSFORM* p, const void* in, - void* out, cmsUInt32Number Size, cmsUInt32Number Stride) + void* out, + cmsUInt32Number PixelsPerLine, + cmsUInt32Number LineCount, + const cmsStride* Stride) { register cmsUInt8Number* accum; register cmsUInt8Number* output; cmsUInt16Number wIn[cmsMAXCHANNELS], wOut[cmsMAXCHANNELS]; - cmsUInt32Number i, n; + cmsUInt32Number i, j, strideIn, strideOut; - accum = (cmsUInt8Number*) in; - output = (cmsUInt8Number*) out; - n = Size; + _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride); - for (i=0; i < n; i++) { + strideIn = 0; + strideOut = 0; - accum = p -> FromInput(p, wIn, accum, Stride); - p ->Lut ->Eval16Fn(wIn, wOut, p -> Lut->Data); - output = p -> ToOutput(p, wOut, output, Stride); + for (i = 0; i < LineCount; i++) { + + accum = (cmsUInt8Number*)in + strideIn; + output = (cmsUInt8Number*)out + strideOut; + + for (j = 0; j < PixelsPerLine; j++) { + + accum = p->FromInput(p, wIn, accum, Stride->BytesPerPlaneIn); + p->Lut->Eval16Fn(wIn, wOut, p->Lut->Data); + output = p->ToOutput(p, wOut, output, Stride->BytesPerPlaneOut); + } + + strideIn += Stride->BytesPerLineIn; + strideOut += Stride->BytesPerLineOut; } + } -// Auxiliar: Handle precalculated gamut check. The retrieval of context may be alittle bit slow, but this function is not critical. +// Auxiliary: Handle precalculated gamut check. The retrieval of context may be alittle bit slow, but this function is not critical. static void TransformOnePixelWithGamutCheck(_cmsTRANSFORM* p, const cmsUInt16Number wIn[], @@ -379,22 +469,35 @@ void TransformOnePixelWithGamutCheck(_cmsTRANSFORM* p, static void PrecalculatedXFORMGamutCheck(_cmsTRANSFORM* p, const void* in, - void* out, cmsUInt32Number Size, cmsUInt32Number Stride) + void* out, + cmsUInt32Number PixelsPerLine, + cmsUInt32Number LineCount, + const cmsStride* Stride) { cmsUInt8Number* accum; cmsUInt8Number* output; cmsUInt16Number wIn[cmsMAXCHANNELS], wOut[cmsMAXCHANNELS]; - cmsUInt32Number i, n; + cmsUInt32Number i, j, strideIn, strideOut; - accum = (cmsUInt8Number*) in; - output = (cmsUInt8Number*) out; - n = Size; // Buffer len + _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride); - for (i=0; i < n; i++) { + strideIn = 0; + strideOut = 0; - accum = p -> FromInput(p, wIn, accum, Stride); - TransformOnePixelWithGamutCheck(p, wIn, wOut); - output = p -> ToOutput(p, wOut, output, Stride); + for (i = 0; i < LineCount; i++) { + + accum = (cmsUInt8Number*)in + strideIn; + output = (cmsUInt8Number*)out + strideOut; + + for (j = 0; j < PixelsPerLine; j++) { + + accum = p->FromInput(p, wIn, accum, Stride->BytesPerPlaneIn); + TransformOnePixelWithGamutCheck(p, wIn, wOut); + output = p->ToOutput(p, wOut, output, Stride->BytesPerPlaneOut); + } + + strideIn += Stride->BytesPerLineIn; + strideOut += Stride->BytesPerLineOut; } } @@ -403,94 +506,120 @@ void PrecalculatedXFORMGamutCheck(_cmsTRANSFORM* p, static void CachedXFORM(_cmsTRANSFORM* p, const void* in, - void* out, cmsUInt32Number Size, cmsUInt32Number Stride) + void* out, + cmsUInt32Number PixelsPerLine, + cmsUInt32Number LineCount, + const cmsStride* Stride) { cmsUInt8Number* accum; cmsUInt8Number* output; cmsUInt16Number wIn[cmsMAXCHANNELS], wOut[cmsMAXCHANNELS]; - cmsUInt32Number i, n; _cmsCACHE Cache; + cmsUInt32Number i, j, strideIn, strideOut; - accum = (cmsUInt8Number*) in; - output = (cmsUInt8Number*) out; - n = Size; // Buffer len + _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride); // Empty buffers for quick memcmp - memset(wIn, 0, sizeof(wIn)); + memset(wIn, 0, sizeof(wIn)); memset(wOut, 0, sizeof(wOut)); // Get copy of zero cache - memcpy(&Cache, &p ->Cache, sizeof(Cache)); + memcpy(&Cache, &p->Cache, sizeof(Cache)); - for (i=0; i < n; i++) { + strideIn = 0; + strideOut = 0; - accum = p -> FromInput(p, wIn, accum, Stride); + for (i = 0; i < LineCount; i++) { - if (memcmp(wIn, Cache.CacheIn, sizeof(Cache.CacheIn)) == 0) { + accum = (cmsUInt8Number*)in + strideIn; + output = (cmsUInt8Number*)out + strideOut; - memcpy(wOut, Cache.CacheOut, sizeof(Cache.CacheOut)); - } - else { + for (j = 0; j < PixelsPerLine; j++) { - p ->Lut ->Eval16Fn(wIn, wOut, p -> Lut->Data); + accum = p->FromInput(p, wIn, accum, Stride->BytesPerPlaneIn); - memcpy(Cache.CacheIn, wIn, sizeof(Cache.CacheIn)); - memcpy(Cache.CacheOut, wOut, sizeof(Cache.CacheOut)); + if (memcmp(wIn, Cache.CacheIn, sizeof(Cache.CacheIn)) == 0) { + + memcpy(wOut, Cache.CacheOut, sizeof(Cache.CacheOut)); + } + else { + p->Lut->Eval16Fn(wIn, wOut, p->Lut->Data); + + memcpy(Cache.CacheIn, wIn, sizeof(Cache.CacheIn)); + memcpy(Cache.CacheOut, wOut, sizeof(Cache.CacheOut)); + } + + output = p->ToOutput(p, wOut, output, Stride->BytesPerPlaneOut); } - output = p -> ToOutput(p, wOut, output, Stride); + strideIn += Stride->BytesPerLineIn; + strideOut += Stride->BytesPerLineOut; } - } - // All those nice features together static void CachedXFORMGamutCheck(_cmsTRANSFORM* p, const void* in, - void* out, cmsUInt32Number Size, cmsUInt32Number Stride) + void* out, + cmsUInt32Number PixelsPerLine, + cmsUInt32Number LineCount, + const cmsStride* Stride) { - cmsUInt8Number* accum; - cmsUInt8Number* output; - cmsUInt16Number wIn[cmsMAXCHANNELS], wOut[cmsMAXCHANNELS]; - cmsUInt32Number i, n; - _cmsCACHE Cache; + cmsUInt8Number* accum; + cmsUInt8Number* output; + cmsUInt16Number wIn[cmsMAXCHANNELS], wOut[cmsMAXCHANNELS]; + _cmsCACHE Cache; + cmsUInt32Number i, j, strideIn, strideOut; - accum = (cmsUInt8Number*) in; - output = (cmsUInt8Number*) out; - n = Size; // Buffer len + _cmsHandleExtraChannels(p, in, out, PixelsPerLine, LineCount, Stride); - // Empty buffers for quick memcmp - memset(wIn, 0, sizeof(cmsUInt16Number) * cmsMAXCHANNELS); - memset(wOut, 0, sizeof(cmsUInt16Number) * cmsMAXCHANNELS); + // Empty buffers for quick memcmp + memset(wIn, 0, sizeof(wIn)); + memset(wOut, 0, sizeof(wOut)); - // Get copy of zero cache - memcpy(&Cache, &p ->Cache, sizeof(Cache)); + // Get copy of zero cache + memcpy(&Cache, &p->Cache, sizeof(Cache)); - for (i=0; i < n; i++) { + strideIn = 0; + strideOut = 0; - accum = p -> FromInput(p, wIn, accum, Stride); + for (i = 0; i < LineCount; i++) { + + accum = (cmsUInt8Number*)in + strideIn; + output = (cmsUInt8Number*)out + strideOut; + + for (j = 0; j < PixelsPerLine; j++) { + + accum = p->FromInput(p, wIn, accum, Stride->BytesPerPlaneIn); if (memcmp(wIn, Cache.CacheIn, sizeof(Cache.CacheIn)) == 0) { - memcpy(wOut, Cache.CacheOut, sizeof(Cache.CacheOut)); + + memcpy(wOut, Cache.CacheOut, sizeof(Cache.CacheOut)); } else { - TransformOnePixelWithGamutCheck(p, wIn, wOut); - memcpy(Cache.CacheIn, wIn, sizeof(Cache.CacheIn)); - memcpy(Cache.CacheOut, wOut, sizeof(Cache.CacheOut)); + TransformOnePixelWithGamutCheck(p, wIn, wOut); + + memcpy(Cache.CacheIn, wIn, sizeof(Cache.CacheIn)); + memcpy(Cache.CacheOut, wOut, sizeof(Cache.CacheOut)); } - output = p -> ToOutput(p, wOut, output, Stride); - } + output = p->ToOutput(p, wOut, output, Stride->BytesPerPlaneOut); + } + strideIn += Stride->BytesPerLineIn; + strideOut += Stride->BytesPerLineOut; + } } -// ------------------------------------------------------------------------------------------------------------- +// Transform plug-ins ---------------------------------------------------------------------------------------------------- // List of used-defined transform factories typedef struct _cmsTransformCollection_st { - _cmsTransformFactory Factory; + _cmsTransform2Factory Factory; + cmsBool OldXform; // Factory returns xform function in the old style + struct _cmsTransformCollection_st *Next; } _cmsTransformCollection; @@ -533,6 +662,7 @@ void DupPluginTransformList(struct _cmsContext_struct* ctx, ctx ->chunks[TransformPlugin] = _cmsSubAllocDup(ctx->MemPool, &newHead, sizeof(_cmsTransformPluginChunkType)); } +// Allocates memory for transform plugin factory void _cmsAllocTransformPluginChunk(struct _cmsContext_struct* ctx, const struct _cmsContext_struct* src) { @@ -547,6 +677,35 @@ void _cmsAllocTransformPluginChunk(struct _cmsContext_struct* ctx, } } +// Adaptor for old versions of plug-in +static +void _cmsTransform2toTransformAdaptor(struct _cmstransform_struct *CMMcargo, + const void* InputBuffer, + void* OutputBuffer, + cmsUInt32Number PixelsPerLine, + cmsUInt32Number LineCount, + const cmsStride* Stride) +{ + + cmsUInt32Number i, strideIn, strideOut; + + _cmsHandleExtraChannels(CMMcargo, InputBuffer, OutputBuffer, PixelsPerLine, LineCount, Stride); + + strideIn = 0; + strideOut = 0; + + for (i = 0; i < LineCount; i++) { + + void *accum = (cmsUInt8Number*)InputBuffer + strideIn; + void *output = (cmsUInt8Number*)OutputBuffer + strideOut; + + CMMcargo->OldXform(CMMcargo, accum, output, PixelsPerLine, Stride->BytesPerPlaneIn); + + strideIn += Stride->BytesPerLineIn; + strideOut += Stride->BytesPerLineOut; + } +} + // Register new ways to transform @@ -564,14 +723,22 @@ cmsBool _cmsRegisterTransformPlugin(cmsContext ContextID, cmsPluginBase* Data) } // Factory callback is required - if (Plugin ->Factory == NULL) return FALSE; + if (Plugin->factories.xform == NULL) return FALSE; fl = (_cmsTransformCollection*) _cmsPluginMalloc(ContextID, sizeof(_cmsTransformCollection)); if (fl == NULL) return FALSE; + // Check for full xform plug-ins previous to 2.8, we would need an adapter in that case + if (Plugin->base.ExpectedVersion < 2080) { + + fl->OldXform = TRUE; + } + else + fl->OldXform = FALSE; + // Copy the parameters - fl ->Factory = Plugin ->Factory; + fl->Factory = Plugin->factories.xform; // Keep linked list fl ->Next = ctx->TransformCollection; @@ -656,6 +823,12 @@ _cmsTRANSFORM* AllocEmptyTransform(cmsContext ContextID, cmsPipeline* lut, p->FromInputFloat = _cmsGetFormatter(ContextID, *InputFormat, cmsFormatterInput, CMS_PACK_FLAGS_FLOAT).FmtFloat; p->ToOutputFloat = _cmsGetFormatter(ContextID, *OutputFormat, cmsFormatterOutput, CMS_PACK_FLAGS_FLOAT).FmtFloat; + // Save the day? + if (Plugin->OldXform) { + p->OldXform = (_cmsTransformFn) p->xform; + p->xform = _cmsTransform2toTransformAdaptor; + } + return p; } } @@ -816,6 +989,22 @@ cmsBool IsProperColorSpace(cmsColorSpaceSignature Check, cmsUInt32Number dwForm // ---------------------------------------------------------------------------------------------------------------- +// Jun-21-2000: Some profiles (those that comes with W2K) comes +// with the media white (media black?) x 100. Add a sanity check + +static +void NormalizeXYZ(cmsCIEXYZ* Dest) +{ + while (Dest -> X > 2. && + Dest -> Y > 2. && + Dest -> Z > 2.) { + + Dest -> X /= 10.; + Dest -> Y /= 10.; + Dest -> Z /= 10.; + } +} + static void SetWhitePoint(cmsCIEXYZ* wtPt, const cmsCIEXYZ* src) { @@ -828,6 +1017,8 @@ void SetWhitePoint(cmsCIEXYZ* wtPt, const cmsCIEXYZ* src) wtPt ->X = src->X; wtPt ->Y = src->Y; wtPt ->Z = src->Z; + + NormalizeXYZ(wtPt); } } @@ -1138,7 +1329,6 @@ cmsBool CMSEXPORT cmsChangeBuffersFormat(cmsHTRANSFORM hTransform, cmsUInt32Number InputFormat, cmsUInt32Number OutputFormat) { - _cmsTRANSFORM* xform = (_cmsTRANSFORM*) hTransform; cmsFormatter16 FromInput, ToOutput; diff --git a/jdk/src/java.desktop/share/native/liblcms/lcms2.h b/jdk/src/java.desktop/share/native/liblcms/lcms2.h index 0d66b26217a..9f148e54d1b 100644 --- a/jdk/src/java.desktop/share/native/liblcms/lcms2.h +++ b/jdk/src/java.desktop/share/native/liblcms/lcms2.h @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2014 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -52,7 +52,7 @@ // //--------------------------------------------------------------------------------- // -// Version 2.7 +// Version 2.8 // #ifndef _lcms2_H @@ -104,7 +104,7 @@ extern "C" { #endif // Version/release -#define LCMS_VERSION 2070 +#define LCMS_VERSION 2080 // I will give the chance of redefining basic types for compilers that are not fully C99 compliant #ifndef CMS_BASIC_TYPES_ALREADY_DEFINED @@ -202,43 +202,44 @@ typedef int cmsBool; # define CMS_IS_WINDOWS_ 1 #endif -// Try to detect big endian platforms. This list can be endless, so only some checks are performed over here. -// you can pass this toggle to the compiler by using -DCMS_USE_BIG_ENDIAN or something similar +// Try to detect big endian platforms. This list can be endless, so primarily rely on the configure script +// on Unix-like systems, and allow it to be set on the compiler command line using +// -DCMS_USE_BIG_ENDIAN or something similar +#ifdef CMS_USE_BIG_ENDIAN // set at compiler command line takes overall precedence -#if defined(__sgi__) || defined(__sgi) || defined(sparc) -# define CMS_USE_BIG_ENDIAN 1 -#endif +# if CMS_USE_BIG_ENDIAN == 0 +# undef CMS_USE_BIG_ENDIAN +# endif -#if defined(__s390__) || defined(__s390x__) -# define CMS_USE_BIG_ENDIAN 1 -#endif +#else // CMS_USE_BIG_ENDIAN +# ifdef WORDS_BIGENDIAN // set by configure (or explicitly on compiler command line) +# define CMS_USE_BIG_ENDIAN 1 +# else // WORDS_BIGENDIAN +// Fall back to platform/compiler specific tests +# if defined(__sgi__) || defined(__sgi) || defined(sparc) +# define CMS_USE_BIG_ENDIAN 1 +# endif -#if defined(__powerpc__) || defined(__ppc__) || defined(TARGET_CPU_PPC) -# if __powerpc__ || __ppc__ || TARGET_CPU_PPC -# define CMS_USE_BIG_ENDIAN 1 -# if defined (__GNUC__) && defined(__BYTE_ORDER__) && defined(__ORDER_LITTLE_ENDIAN__) -# if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__ - // Don't use big endian for PowerPC little endian mode -# undef CMS_USE_BIG_ENDIAN -# endif -# endif -# endif -#endif +# if defined(__s390__) || defined(__s390x__) +# define CMS_USE_BIG_ENDIAN 1 +# endif -#ifdef macintosh -# ifdef __BIG_ENDIAN__ -# define CMS_USE_BIG_ENDIAN 1 -# endif -# ifdef __LITTLE_ENDIAN__ -# undef CMS_USE_BIG_ENDIAN -# endif -#endif +# ifdef macintosh +# ifdef __BIG_ENDIAN__ +# define CMS_USE_BIG_ENDIAN 1 +# endif +# ifdef __LITTLE_ENDIAN__ +# undef CMS_USE_BIG_ENDIAN +# endif +# endif +# endif // WORDS_BIGENDIAN -// WORDS_BIGENDIAN takes precedence -#if defined(_HOST_BIG_ENDIAN) || defined(__BIG_ENDIAN__) || defined(WORDS_BIGENDIAN) -# define CMS_USE_BIG_ENDIAN 1 -#endif +# if defined(_HOST_BIG_ENDIAN) || defined(__BIG_ENDIAN__) +# define CMS_USE_BIG_ENDIAN 1 +# endif + +#endif // CMS_USE_BIG_ENDIAN // Calling convention -- this is hardly platform and compiler dependent @@ -248,7 +249,7 @@ typedef int cmsBool; # define CMSEXPORT __stdcall _export # define CMSAPI # else -# define CMSEXPORT _stdcall +# define CMSEXPORT __stdcall # ifdef CMS_DLL_BUILD # define CMSAPI __declspec(dllexport) # else @@ -410,7 +411,8 @@ typedef enum { cmsSigViewingCondDescTag = 0x76756564, // 'vued' cmsSigViewingConditionsTag = 0x76696577, // 'view' cmsSigVcgtTag = 0x76636774, // 'vcgt' - cmsSigMetaTag = 0x6D657461 // 'meta' + cmsSigMetaTag = 0x6D657461, // 'meta' + cmsSigArgyllArtsTag = 0x61727473 // 'arts' } cmsTagSignature; @@ -683,7 +685,7 @@ typedef void* cmsHTRANSFORM; // T: Pixeltype // F: Flavor 0=MinIsBlack(Chocolate) 1=MinIsWhite(Vanilla) // P: Planar? 0=Chunky, 1=Planar -// X: swap 16 bps endianess? +// X: swap 16 bps endianness? // S: Do swap? ie, BGR, KYMC // E: Extra samples // C: Channels (Samples per pixel) @@ -926,7 +928,7 @@ typedef void* cmsHTRANSFORM; #define TYPE_ARGB_FLT (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4)|SWAPFIRST_SH(1)) #define TYPE_BGR_FLT (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|CHANNELS_SH(3)|BYTES_SH(4)|DOSWAP_SH(1)) #define TYPE_BGRA_FLT (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4)|DOSWAP_SH(1)|SWAPFIRST_SH(1)) -#define TYPE_ABGR_FLT (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|CHANNELS_SH(3)|BYTES_SH(4)|DOSWAP_SH(1)) +#define TYPE_ABGR_FLT (FLOAT_SH(1)|COLORSPACE_SH(PT_RGB)|EXTRA_SH(1)|CHANNELS_SH(3)|BYTES_SH(4)|DOSWAP_SH(1)) #define TYPE_CMYK_FLT (FLOAT_SH(1)|COLORSPACE_SH(PT_CMYK)|CHANNELS_SH(4)|BYTES_SH(4)) @@ -1043,7 +1045,7 @@ CMSAPI long int CMSEXPORT cmsfilelength(FILE* f); // Context handling -------------------------------------------------------------------------------------------------------- // Each context holds its owns globals and its own plug-ins. There is a global context with the id = 0 for lecacy compatibility -// though using the global context is not recomended. Proper context handling makes lcms more thread-safe. +// though using the global context is not recommended. Proper context handling makes lcms more thread-safe. typedef struct _cmsContext_struct* cmsContext; @@ -1412,7 +1414,7 @@ typedef struct { typedef struct { cmsUInt32Number n; - cmsContext ContextID; + cmsContext ContextID; cmsPSEQDESC* seq; } cmsSEQ; @@ -1679,6 +1681,8 @@ CMSAPI cmsUInt32Number CMSEXPORT cmsGetSupportedIntentsTHR(cmsContext ContextID // Specific to unbounded mode #define cmsFLAGS_NONEGATIVES 0x8000 // Prevent negative numbers in floating point transforms +// Copy alpha channels when transforming +#define cmsFLAGS_COPY_ALPHA 0x04000000 // Alpha channels are copied on cmsDoTransform() // Fine-tune control over number of gridpoints #define cmsFLAGS_GRIDPOINTS(n) (((n) & 0xFF) << 16) @@ -1757,12 +1761,22 @@ CMSAPI void CMSEXPORT cmsDoTransform(cmsHTRANSFORM Transform, void * OutputBuffer, cmsUInt32Number Size); -CMSAPI void CMSEXPORT cmsDoTransformStride(cmsHTRANSFORM Transform, +CMSAPI void CMSEXPORT cmsDoTransformStride(cmsHTRANSFORM Transform, // Deprecated const void * InputBuffer, void * OutputBuffer, cmsUInt32Number Size, cmsUInt32Number Stride); +CMSAPI void CMSEXPORT cmsDoTransformLineStride(cmsHTRANSFORM Transform, + const void* InputBuffer, + void* OutputBuffer, + cmsUInt32Number PixelsPerLine, + cmsUInt32Number LineCount, + cmsUInt32Number BytesPerLineIn, + cmsUInt32Number BytesPerLineOut, + cmsUInt32Number BytesPerPlaneIn, + cmsUInt32Number BytesPerPlaneOut); + CMSAPI void CMSEXPORT cmsSetAlarmCodes(const cmsUInt16Number NewAlarm[cmsMAXCHANNELS]); CMSAPI void CMSEXPORT cmsGetAlarmCodes(cmsUInt16Number NewAlarm[cmsMAXCHANNELS]); diff --git a/jdk/src/java.desktop/share/native/liblcms/lcms2_internal.h b/jdk/src/java.desktop/share/native/liblcms/lcms2_internal.h index c6cfbd68eb2..90094728823 100644 --- a/jdk/src/java.desktop/share/native/liblcms/lcms2_internal.h +++ b/jdk/src/java.desktop/share/native/liblcms/lcms2_internal.h @@ -30,7 +30,7 @@ // // Little Color Management System -// Copyright (c) 1998-2014 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -86,7 +86,15 @@ #define _cmsALIGNLONG(x) (((x)+(sizeof(cmsUInt32Number)-1)) & ~(sizeof(cmsUInt32Number)-1)) // Alignment to memory pointer -#define _cmsALIGNMEM(x) (((x)+(sizeof(void *) - 1)) & ~(sizeof(void *) - 1)) + +// (Ultra)SPARC with gcc requires ptr alignment of 8 bytes +// even though sizeof(void *) is only four: for greatest flexibility +// allow the build to specify ptr alignment. +#ifndef CMS_PTR_ALIGNMENT +# define CMS_PTR_ALIGNMENT sizeof(void *) +#endif + +#define _cmsALIGNMEM(x) (((x)+(CMS_PTR_ALIGNMENT - 1)) & ~(CMS_PTR_ALIGNMENT - 1)) // Maximum encodeable values in floating point #define MAX_ENCODEABLE_XYZ (1.0 + 32767.0/32768.0) @@ -122,7 +130,7 @@ // A fast way to convert from/to 16 <-> 8 bits #define FROM_8_TO_16(rgb) (cmsUInt16Number) ((((cmsUInt16Number) (rgb)) << 8)|(rgb)) -#define FROM_16_TO_8(rgb) (cmsUInt8Number) ((((rgb) * 65281 + 8388608) >> 24) & 0xFF) +#define FROM_16_TO_8(rgb) (cmsUInt8Number) ((((cmsUInt32Number)(rgb) * 65281U + 8388608U) >> 24) & 0xFFU) // Code analysis is broken on asserts #ifdef _MSC_VER @@ -691,8 +699,8 @@ struct _cms_MLU_struct { cmsContext ContextID; // The directory - int AllocatedEntries; - int UsedEntries; + cmsUInt32Number AllocatedEntries; + cmsUInt32Number UsedEntries; _cmsMLUentry* Entries; // Array of pointers to strings allocated in MemPool // The Pool @@ -760,7 +768,7 @@ typedef struct _cms_iccprofile_struct { // Dictionary cmsUInt32Number TagCount; cmsTagSignature TagNames[MAX_TABLE_TAG]; - cmsTagSignature TagLinked[MAX_TABLE_TAG]; // The tag to wich is linked (0=none) + cmsTagSignature TagLinked[MAX_TABLE_TAG]; // The tag to which is linked (0=none) cmsUInt32Number TagSizes[MAX_TABLE_TAG]; // Size on disk cmsUInt32Number TagOffsets[MAX_TABLE_TAG]; cmsBool TagSaveAsRaw[MAX_TABLE_TAG]; // True to write uncooked @@ -988,7 +996,7 @@ typedef struct _cmstransform_struct { cmsUInt32Number InputFormat, OutputFormat; // Keep formats for further reference // Points to transform code - _cmsTransformFn xform; + _cmsTransform2Fn xform; // Formatters, cannot be embedded into LUT because cache cmsFormatter16 FromInput; @@ -1034,9 +1042,20 @@ typedef struct _cmstransform_struct { void* UserData; _cmsFreeUserDataFn FreeUserData; + // A way to provide backwards compatibility with full xform plugins + _cmsTransformFn OldXform; + } _cmsTRANSFORM; -// -------------------------------------------------------------------------------------------------- +// Copies extra channels from input to output if the original flags in the transform structure +// instructs to do so. This function is called on all standard transform functions. +void _cmsHandleExtraChannels(_cmsTRANSFORM* p, const void* in, + void* out, + cmsUInt32Number PixelsPerLine, + cmsUInt32Number LineCount, + const cmsStride* Stride); + +// ----------------------------------------------------------------------------------------------------------------------- cmsHTRANSFORM _cmsChain2Lab(cmsContext ContextID, cmsUInt32Number nProfiles, diff --git a/jdk/src/java.desktop/share/native/liblcms/lcms2_plugin.h b/jdk/src/java.desktop/share/native/liblcms/lcms2_plugin.h index 77ff22846eb..aff3b48d7ec 100644 --- a/jdk/src/java.desktop/share/native/liblcms/lcms2_plugin.h +++ b/jdk/src/java.desktop/share/native/liblcms/lcms2_plugin.h @@ -30,7 +30,7 @@ //--------------------------------------------------------------------------------- // // Little Color Management System -// Copyright (c) 1998-2011 Marti Maria Saguer +// Copyright (c) 1998-2016 Marti Maria Saguer // // Permission is hereby granted, free of charge, to any person obtaining // a copy of this software and associated documentation files (the "Software"), @@ -157,7 +157,7 @@ struct _cms_io_handler { const void* Buffer); }; -// Endianess adjust functions +// Endianness adjust functions CMSAPI cmsUInt16Number CMSEXPORT _cmsAdjustEndianess16(cmsUInt16Number Word); CMSAPI cmsUInt32Number CMSEXPORT _cmsAdjustEndianess32(cmsUInt32Number Value); CMSAPI void CMSEXPORT _cmsAdjustEndianess64(cmsUInt64Number* Result, cmsUInt64Number* QWord); @@ -371,8 +371,8 @@ struct _cmstransform_struct; typedef cmsUInt8Number* (* cmsFormatter16)(register struct _cmstransform_struct* CMMcargo, register cmsUInt16Number Values[], - register cmsUInt8Number* Buffer, - register cmsUInt32Number Stride); + register cmsUInt8Number* Buffer, + register cmsUInt32Number Stride); typedef cmsUInt8Number* (* cmsFormatterFloat)(struct _cmstransform_struct* CMMcargo, cmsFloat32Number Values[], @@ -600,11 +600,28 @@ typedef struct { //---------------------------------------------------------------------------------------------------------- // Full xform -typedef void (* _cmsTransformFn)(struct _cmstransform_struct *CMMcargo, + +typedef struct { + cmsUInt32Number BytesPerLineIn; + cmsUInt32Number BytesPerLineOut; + cmsUInt32Number BytesPerPlaneIn; + cmsUInt32Number BytesPerPlaneOut; + +} cmsStride; + +typedef void (* _cmsTransformFn)(struct _cmstransform_struct *CMMcargo, // Legacy function, handles just ONE scanline. const void* InputBuffer, void* OutputBuffer, cmsUInt32Number Size, - cmsUInt32Number Stride); + cmsUInt32Number Stride); // Stride in bytes to the next plana in planar formats + + +typedef void (*_cmsTransform2Fn)(struct _cmstransform_struct *CMMcargo, + const void* InputBuffer, + void* OutputBuffer, + cmsUInt32Number PixelsPerLine, + cmsUInt32Number LineCount, + const cmsStride* Stride); typedef cmsBool (* _cmsTransformFactory)(_cmsTransformFn* xform, void** UserData, @@ -614,6 +631,14 @@ typedef cmsBool (* _cmsTransformFactory)(_cmsTransformFn* xform, cmsUInt32Number* OutputFormat, cmsUInt32Number* dwFlags); +typedef cmsBool (* _cmsTransform2Factory)(_cmsTransform2Fn* xform, + void** UserData, + _cmsFreeUserDataFn* FreePrivateDataFn, + cmsPipeline** Lut, + cmsUInt32Number* InputFormat, + cmsUInt32Number* OutputFormat, + cmsUInt32Number* dwFlags); + // Retrieve user data as specified by the factory CMSAPI void CMSEXPORT _cmsSetTransformUserData(struct _cmstransform_struct *CMMcargo, void* ptr, _cmsFreeUserDataFn FreePrivateDataFn); @@ -628,7 +653,10 @@ typedef struct { cmsPluginBase base; // Transform entry point - _cmsTransformFactory Factory; + union { + _cmsTransformFactory legacy_xform; + _cmsTransform2Factory xform; + } factories; } cmsPluginTransform; diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c index 5b91abab872..f84ce28fcf0 100644 --- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c +++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageAffine_NN_Bit.c @@ -84,8 +84,7 @@ void mlib_ImageAffine_bit_1ch_nn(mlib_affine_param *param, ySrc = MLIB_POINTER_SHIFT(Y); srcPixelPtr = MLIB_POINTER_GET(lineAddr, ySrc); - res = (res & ~(1 << bit)) | (((srcPixelPtr[X >> (MLIB_SHIFT + 3)] >> (7 - (X >> MLIB_SHIFT) & 7)) & 1) << - bit); + res = (res & ~(1 << bit)) | (((srcPixelPtr[X >> (MLIB_SHIFT + 3)] >> (7 - ((X >> MLIB_SHIFT) & 7))) & 1) << bit); X += dX; Y += dY; @@ -150,7 +149,7 @@ void mlib_ImageAffine_bit_1ch_nn(mlib_affine_param *param, ySrc = MLIB_POINTER_SHIFT(Y); srcPixelPtr = MLIB_POINTER_GET(lineAddr, ySrc); - res = (res & ~(1 << bit)) | (((srcPixelPtr[X >> (MLIB_SHIFT + 3)] >> (7 - (X >> MLIB_SHIFT) & 7)) & 1) << bit); + res = (res & ~(1 << bit)) | (((srcPixelPtr[X >> (MLIB_SHIFT + 3)] >> (7 - ((X >> MLIB_SHIFT) & 7))) & 1) << bit); X += dX; Y += dY; diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h index dc4b6bd4cd7..2528fb1eae7 100644 --- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h +++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_ImageConv.h @@ -34,11 +34,9 @@ extern "C" { // Shared macro defined for cleanup of allocated memory. #ifndef FREE_AND_RETURN_STATUS #define FREE_AND_RETURN_STATUS \ -{ \ if (pbuff != buff) mlib_free(pbuff); \ if (k != akernel) mlib_free(k); \ -return status; \ -} +return status #endif /* FREE_AND_RETURN_STATUS */ mlib_status mlib_convMxNext_s32(mlib_image *dst, diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h index 8097c7d11ed..e3b67f07d84 100644 --- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h +++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageConv.h @@ -34,11 +34,9 @@ extern "C" { // Shared macro defined for cleanup of allocated memory. #ifndef FREE_AND_RETURN_STATUS #define FREE_AND_RETURN_STATUS \ -{ \ if (pbuff != buff) mlib_free(pbuff); \ if (k != akernel) mlib_free(k); \ -return status; \ -} +return status #endif /* FREE_AND_RETURN_STATUS */ mlib_status mlib_c_convMxNnw_u8(mlib_image *dst, diff --git a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c index d1481fcd123..270a5a74bfb 100644 --- a/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c +++ b/jdk/src/java.desktop/share/native/libmlib_image/mlib_c_ImageCopy.c @@ -182,7 +182,7 @@ mlib_status mlib_ImageCopy(mlib_image *dst, #define STRIP(pd, ps, w, h, data_type) { \ data_type s0, s1; \ for ( i = 0; i < h; i++ ) { \ - if (j = w & 1) \ + if ((j = (w & 1))) \ pd[i * dst_stride] = ps[i * src_stride]; \ for (; j < w; j += 2) { \ s0 = ps[i * src_stride + j]; \ @@ -546,7 +546,8 @@ void mlib_c_ImageCopy_s32(const mlib_image *src, mlib_u32 *psrc_row = psrc + i * src_stride, *pdst_row = pdst + i * dst_stride; if (!(((mlib_addr) psrc_row ^ (mlib_addr) pdst_row) & 7)) { - if (j = ((mlib_s32) ((mlib_addr) psrc_row & 4) >> 2)) { + j = (mlib_s32) ((mlib_addr) psrc_row & 4) >> 2; + if (j != 0) { pdst_row[0] = psrc_row[0]; } @@ -575,8 +576,10 @@ void mlib_c_ImageCopy_s32(const mlib_image *src, { mlib_u64 *ps, src0, src1; - if (j = ((mlib_s32) ((mlib_addr) pdst_row & 4) >> 2)) + j = (mlib_s32) ((mlib_addr) pdst_row & 4) >> 2; + if (j != 0) { pdst_row[0] = psrc_row[0]; + } ps = (mlib_u64 *) (psrc_row + j - 1); src1 = ps[0]; #ifdef __SUNPRO_C diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java index a392a307adb..66fc0272279 100644 --- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java +++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDecoratedPeer.java @@ -266,6 +266,12 @@ abstract class XDecoratedPeer extends XWindowPeer { return new Insets(i.top, i.left, i.bottom, i.right); } + private Insets copyAndScaleDown(Insets i) { + return new Insets(scaleDown(i.top), scaleDown(i.left), + scaleDown(i.bottom), scaleDown(i.right)); + } + + // insets which we get from WM (e.g from _NET_FRAME_EXTENTS) private Insets wm_set_insets; @@ -289,7 +295,7 @@ abstract class XDecoratedPeer extends XWindowPeer { } if (wm_set_insets != null) { - wm_set_insets = copy(wm_set_insets); + wm_set_insets = copyAndScaleDown(wm_set_insets); } return wm_set_insets; } @@ -386,6 +392,9 @@ abstract class XDecoratedPeer extends XWindowPeer { } } else { correctWM = XWM.getWM().getInsets(this, xe.get_window(), xe.get_parent()); + if (correctWM != null) { + correctWM = copyAndScaleDown(correctWM); + } if (insLog.isLoggable(PlatformLogger.Level.FINER)) { if (correctWM != null) { @@ -470,6 +479,9 @@ abstract class XDecoratedPeer extends XWindowPeer { Insets res = getWMSetInsets(null); if (res == null) { res = XWM.getWM().guessInsets(this); + if (res != null) { + res = copyAndScaleDown(res); + } } return res; } @@ -756,7 +768,7 @@ abstract class XDecoratedPeer extends XWindowPeer { } } if (correctWM != null) { - handleCorrectInsets(correctWM); + handleCorrectInsets(copyAndScaleDown(correctWM)); } else { //Only one attempt to correct insets is made (to lower risk) //if insets are still not available we simply set the flag diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java index b3d1c559442..384e65e0793 100644 --- a/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java +++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11/XDesktopPeer.java @@ -60,7 +60,7 @@ public class XDesktopPeer implements DesktopPeer { try { if (!initExecuted) { nativeLibraryLoaded = init(UNIXToolkit.getEnabledGtkVersion() - .ordinal(), UNIXToolkit.isGtkVerbose()); + .getNumber(), UNIXToolkit.isGtkVerbose()); } } finally { initExecuted = true; diff --git a/jdk/src/java.desktop/unix/classes/sun/awt/X11FontManager.java b/jdk/src/java.desktop/unix/classes/sun/awt/X11FontManager.java index f49d4d44f35..2ae8e194a14 100644 --- a/jdk/src/java.desktop/unix/classes/sun/awt/X11FontManager.java +++ b/jdk/src/java.desktop/unix/classes/sun/awt/X11FontManager.java @@ -742,28 +742,20 @@ public final class X11FontManager extends FcFontManager { protected FontConfiguration createFontConfiguration() { /* The logic here decides whether to use a preconfigured * fontconfig.properties file, or synthesise one using platform APIs. - * On Solaris (as opposed to OpenSolaris) we try to use the + * On Solaris we try to use the * pre-configured ones, but if the files it specifies are missing * we fail-safe to synthesising one. This might happen if Solaris * changes its fonts. - * For OpenSolaris I don't expect us to ever create fontconfig files, - * so it will always synthesise. Note that if we misidentify - * OpenSolaris as Solaris, then the test for the presence of - * Solaris-only font files will correct this. * For Linux we require an exact match of distro and version to - * use the preconfigured file, and also that it points to - * existent fonts. + * use the preconfigured file. * If synthesising fails, we fall back to any preconfigured file * and do the best we can. For the commercial JDK this will be * fine as it includes the Lucida fonts. OpenJDK should not hit * this as the synthesis should always work on its platforms. */ FontConfiguration mFontConfig = new MFontConfiguration(this); - if (FontUtilities.isOpenSolaris || - (FontUtilities.isLinux && - (!mFontConfig.foundOsSpecificFile() || - !mFontConfig.fontFilesArePresent()) || - (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent()))) { + if ((FontUtilities.isLinux && !mFontConfig.foundOsSpecificFile()) || + (FontUtilities.isSolaris && !mFontConfig.fontFilesArePresent())) { FcFontConfiguration fcFontConfig = new FcFontConfiguration(this); if (fcFontConfig.init()) { @@ -773,6 +765,7 @@ public final class X11FontManager extends FcFontManager { mFontConfig.init(); return mFontConfig; } + public FontConfiguration createFontConfiguration(boolean preferLocaleFonts, boolean preferPropFonts) { diff --git a/jdk/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java b/jdk/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java index f62e46446aa..26791b74ddf 100644 --- a/jdk/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java +++ b/jdk/src/java.desktop/unix/classes/sun/font/MFontConfiguration.java @@ -88,21 +88,13 @@ public class MFontConfiguration extends FontConfiguration { reorderMap.put("UTF-8.th", "thai"); reorderMap.put("UTF-8.zh.TW", "chinese-big5"); reorderMap.put("UTF-8.zh.HK", split("chinese-big5,chinese-hkscs")); - if (FontUtilities.isSolaris8) { - reorderMap.put("UTF-8.zh.CN", split("chinese-gb2312,chinese-big5")); - } else { - reorderMap.put("UTF-8.zh.CN", - split("chinese-gb18030-0,chinese-gb18030-1")); - } + reorderMap.put("UTF-8.zh.CN", + split("chinese-gb18030-0,chinese-gb18030-1")); reorderMap.put("UTF-8.zh", split("chinese-big5,chinese-hkscs,chinese-gb18030-0,chinese-gb18030-1")); reorderMap.put("Big5", "chinese-big5"); reorderMap.put("Big5-HKSCS", split("chinese-big5,chinese-hkscs")); - if (! FontUtilities.isSolaris8 && ! FontUtilities.isSolaris9) { - reorderMap.put("GB2312", split("chinese-gbk,chinese-gb2312")); - } else { - reorderMap.put("GB2312","chinese-gb2312"); - } + reorderMap.put("GB2312", split("chinese-gbk,chinese-gb2312")); reorderMap.put("x-EUC-TW", split("chinese-cns11643-1,chinese-cns11643-2,chinese-cns11643-3")); reorderMap.put("GBK", "chinese-gbk"); diff --git a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java index 58ebf7193b7..2cfd8c2a456 100644 --- a/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java +++ b/jdk/src/java.desktop/unix/classes/sun/java2d/xr/XRPMBlitLoops.java @@ -127,7 +127,11 @@ public class XRPMBlitLoops { vImgSurfaceType = SurfaceType.IntArgbPre; } - if (vImg == null || vImg.getWidth() < w || vImg.getHeight() < h) { + if (vImg == null || vImg.getWidth() < w || vImg.getHeight() < h || + // Sometimes we get volatile image of wrong dest surface type, + // so recreating it + !(vImg.getDestSurface() instanceof XRSurfaceData)) + { if (vImg != null) { vImg.flush(); } @@ -142,6 +146,11 @@ public class XRPMBlitLoops { } Blit swToSurfaceBlit = Blit.getFromCache(src.getSurfaceType(), CompositeType.SrcNoEa, vImgSurfaceType); + + if (!(vImg.getDestSurface() instanceof XRSurfaceData)) { + throw new InvalidPipeException("wrong surface data type: " + vImg.getDestSurface()); + } + XRSurfaceData vImgSurface = (XRSurfaceData) vImg.getDestSurface(); swToSurfaceBlit.Blit(src, vImgSurface, AlphaComposite.Src, null, sx, sy, 0, 0, w, h); diff --git a/jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java b/jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java index ea89e9027aa..9f351b0ab66 100644 --- a/jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java +++ b/jdk/src/java.desktop/unix/classes/sun/print/IPPPrintService.java @@ -1684,7 +1684,6 @@ public class IPPPrintService implements PrintService, SunPrinterJobService { } connection = (HttpURLConnection)urlc; connection.setUseCaches(false); - connection.setDefaultUseCaches(false); connection.setDoInput(true); connection.setDoOutput(true); connection.setRequestProperty("Content-type", "application/ipp"); diff --git a/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java b/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java index a0891b4b4ff..7d79243d393 100644 --- a/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java +++ b/jdk/src/java.desktop/unix/classes/sun/print/UnixPrintJob.java @@ -126,6 +126,11 @@ public class UnixPrintJob implements CancelablePrintJob { mDestination = ((IPPPrintService)service).getDest(); } mDestType = UnixPrintJob.DESTPRINTER; + JobSheets js = (JobSheets)(service. + getDefaultAttributeValue(JobSheets.class)); + if (js != null && js.equals(JobSheets.NONE)) { + mNoJobSheet = true; + } } public PrintService getPrintService() { @@ -848,10 +853,10 @@ public class UnixPrintJob implements CancelablePrintJob { private String[] printExecCmd(String printer, String options, boolean noJobSheet, - String banner, int copies, String spoolFile) { + String jobTitle, int copies, String spoolFile) { int PRINTER = 0x1; int OPTIONS = 0x2; - int BANNER = 0x4; + int JOBTITLE = 0x4; int COPIES = 0x8; int NOSHEET = 0x10; int pFlags = 0; @@ -868,8 +873,8 @@ public class UnixPrintJob implements CancelablePrintJob { pFlags |= OPTIONS; ncomps+=1; } - if (banner != null && !banner.equals("")) { - pFlags |= BANNER; + if (jobTitle != null && !jobTitle.equals("")) { + pFlags |= JOBTITLE; ncomps+=1; } if (copies > 1) { @@ -879,6 +884,9 @@ public class UnixPrintJob implements CancelablePrintJob { if (noJobSheet) { pFlags |= NOSHEET; ncomps+=1; + } else if (getPrintService(). + isAttributeCategorySupported(JobSheets.class)) { + ncomps+=1; } if (PrintServiceLookupProvider.osname.equals("SunOS")) { ncomps+=1; // lp uses 1 more arg than lpr (make a copy) @@ -888,15 +896,18 @@ public class UnixPrintJob implements CancelablePrintJob { if ((pFlags & PRINTER) != 0) { execCmd[n++] = "-d" + printer; } - if ((pFlags & BANNER) != 0) { + if ((pFlags & JOBTITLE) != 0) { String quoteChar = "\""; - execCmd[n++] = "-t " + quoteChar+banner+quoteChar; + execCmd[n++] = "-t " + quoteChar+jobTitle+quoteChar; } if ((pFlags & COPIES) != 0) { execCmd[n++] = "-n " + copies; } if ((pFlags & NOSHEET) != 0) { execCmd[n++] = "-o nobanner"; + } else if (getPrintService(). + isAttributeCategorySupported(JobSheets.class)) { + execCmd[n++] = "-o job-sheets=standard"; } if ((pFlags & OPTIONS) != 0) { execCmd[n++] = "-o " + options; @@ -907,14 +918,17 @@ public class UnixPrintJob implements CancelablePrintJob { if ((pFlags & PRINTER) != 0) { execCmd[n++] = "-P" + printer; } - if ((pFlags & BANNER) != 0) { - execCmd[n++] = "-J " + banner; + if ((pFlags & JOBTITLE) != 0) { + execCmd[n++] = "-J " + jobTitle; } if ((pFlags & COPIES) != 0) { execCmd[n++] = "-#" + copies; } if ((pFlags & NOSHEET) != 0) { execCmd[n++] = "-h"; + } else if (getPrintService(). + isAttributeCategorySupported(JobSheets.class)) { + execCmd[n++] = "-o job-sheets=standard"; } if ((pFlags & OPTIONS) != 0) { execCmd[n++] = "-o" + options; diff --git a/jdk/src/java.desktop/unix/native/common/awt/fontpath.c b/jdk/src/java.desktop/unix/native/common/awt/fontpath.c index 9a2e0277caf..9b2b413ae7c 100644 --- a/jdk/src/java.desktop/unix/native/common/awt/fontpath.c +++ b/jdk/src/java.desktop/unix/native/common/awt/fontpath.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, 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 @@ -805,30 +805,36 @@ static char **getFontConfigLocations() { pattern = (*FcPatternBuild)(NULL, FC_OUTLINE, FcTypeBool, FcTrue, NULL); objset = (*FcObjectSetBuild)(FC_FILE, NULL); fontSet = (*FcFontList)(NULL, pattern, objset); - fontdirs = (char**)calloc(fontSet->nfont+1, sizeof(char*)); - for (f=0; f < fontSet->nfont; f++) { - FcChar8 *file; - FcChar8 *dir; - if ((*FcPatternGetString)(fontSet->fonts[f], FC_FILE, 0, &file) == - FcResultMatch) { - dir = (*FcStrDirname)(file); - found = 0; - for (i=0;infont+1, sizeof(char*)); + for (f=0; f < fontSet->nfont; f++) { + FcChar8 *file; + FcChar8 *dir; + if ((*FcPatternGetString)(fontSet->fonts[f], FC_FILE, 0, &file) == + FcResultMatch) { + dir = (*FcStrDirname)(file); + found = 0; + for (i=0;iGetStringUTFRegion(env, filename, 0, len, filename_str); diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c b/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c index db32a22ec6c..0b452b4cf57 100644 --- a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c +++ b/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/XToolkit.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, 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 @@ -122,11 +122,7 @@ Java_sun_awt_X11_XToolkit_initIDs JNIEXPORT jlong JNICALL Java_sun_awt_X11_XToolkit_getTrayIconDisplayTimeout (JNIEnv *env, jclass clazz) { -#ifndef JAVASE_EMBEDDED return (jlong) 2000; -#else - return (jlong) 10000; -#endif } /* @@ -369,12 +365,7 @@ static uint32_t get_poll_timeout(jlong nextTaskTime); #define AWT_READPIPE (awt_pipe_fds[0]) #define AWT_WRITEPIPE (awt_pipe_fds[1]) -#ifdef JAVASE_EMBEDDED - #define DEF_AWT_MAX_POLL_TIMEOUT ((uint32_t)4000000000) /* milliseconds */ -#else - #define DEF_AWT_MAX_POLL_TIMEOUT ((uint32_t)500) /* milliseconds */ -#endif - +#define DEF_AWT_MAX_POLL_TIMEOUT ((uint32_t)500) /* milliseconds */ #define DEF_AWT_FLUSH_TIMEOUT ((uint32_t)100) /* milliseconds */ #define AWT_MIN_POLL_TIMEOUT ((uint32_t)0) /* milliseconds */ @@ -391,11 +382,7 @@ static uint32_t get_poll_timeout(jlong nextTaskTime); // Static fields -#ifdef JAVASE_EMBEDDED - static int awt_poll_alg = AWT_POLL_AGING_FAST; -#else - static int awt_poll_alg = AWT_POLL_AGING_SLOW; -#endif +static int awt_poll_alg = AWT_POLL_AGING_SLOW; static uint32_t AWT_FLUSH_TIMEOUT = DEF_AWT_FLUSH_TIMEOUT; /* milliseconds */ static uint32_t AWT_MAX_POLL_TIMEOUT = DEF_AWT_MAX_POLL_TIMEOUT; /* milliseconds */ @@ -1021,9 +1008,9 @@ int32_t getNumButtons() { * before calling XTestFakeButtonEvent(). */ xinputAvailable = XQueryExtension(awt_display, INAME, &major_opcode, &first_event, &first_error); - DTRACE_PRINTLN3("RobotPeer: XQueryExtension(XINPUT) returns major_opcode = %d, first_event = %d, first_error = %d", - major_opcode, first_event, first_error); if (xinputAvailable) { + DTRACE_PRINTLN3("RobotPeer: XQueryExtension(XINPUT) returns major_opcode = %d, first_event = %d, first_error = %d", + major_opcode, first_event, first_error); devices = XListInputDevices(awt_display, &numDevices); for (devIdx = 0; devIdx < numDevices; devIdx++) { aDevice = &(devices[devIdx]); diff --git a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.h b/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.h index bfd764364d7..86ea796ba7e 100644 --- a/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.h +++ b/jdk/src/java.desktop/unix/native/libawt_xawt/xawt/gnome_interface.h @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2016 Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 diff --git a/jdk/src/java.desktop/unix/native/libjawt/jawt.c b/jdk/src/java.desktop/unix/native/libjawt/jawt.c index 1b7c0499258..b6a5240a7c1 100644 --- a/jdk/src/java.desktop/unix/native/libjawt/jawt.c +++ b/jdk/src/java.desktop/unix/native/libjawt/jawt.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -39,10 +39,6 @@ DEF_STATIC_JNI_OnLoad */ JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt) { -#if defined(JAVASE_EMBEDDED) && defined(HEADLESS) - /* there are no AWT libs available at all */ - return JNI_FALSE; -#else if (awt == NULL) { return JNI_FALSE; } @@ -62,5 +58,4 @@ JNIEXPORT jboolean JNICALL JAWT_GetAWT(JNIEnv* env, JAWT* awt) } return JNI_TRUE; -#endif } diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/ShaderList.c b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.c similarity index 98% rename from jdk/src/java.desktop/share/native/libawt/java2d/ShaderList.c rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.c index d7f69f754fe..e129bcd2a85 100644 --- a/jdk/src/java.desktop/share/native/libawt/java2d/ShaderList.c +++ b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.c @@ -49,7 +49,7 @@ ShaderList_AddProgram(ShaderList *programList, info = (ShaderInfo *)malloc(sizeof(ShaderInfo)); if (info == NULL) { J2dTraceLn(J2D_TRACE_ERROR, - "OGLContext_AddProgram: could not allocate ShaderInfo"); + "D3DContext_AddProgram: could not allocate ShaderInfo"); return; } diff --git a/jdk/src/java.desktop/share/native/libawt/java2d/ShaderList.h b/jdk/src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.h similarity index 100% rename from jdk/src/java.desktop/share/native/libawt/java2d/ShaderList.h rename to jdk/src/java.desktop/windows/native/libawt/java2d/d3d/ShaderList.h diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp index be1c41e840f..8376f0abc2b 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Choice.cpp @@ -345,7 +345,7 @@ jobject AwtChoice::PreferredItemSize(JNIEnv *env) * drop down item height. */ env->SetIntField(dimension, AwtDimension::heightID, - GetFontHeight(env)); + ScaleUpY(GetFontHeight(env))); return dimension; } diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp index 13b061eb31a..1e889dcffcd 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Component.cpp @@ -3852,10 +3852,12 @@ MsgRouting AwtComponent::WmImeNotify(WPARAM subMsg, LPARAM bitsCandType) if (!m_useNativeCompWindow) { if (subMsg == IMN_OPENCANDIDATE) { m_bitsCandType = subMsg; - } else if (subMsg != IMN_SETCANDIDATEPOS) { + InquireCandidatePosition(); + } else if (subMsg == IMN_OPENSTATUSWINDOW || + subMsg == WM_IME_STARTCOMPOSITION) { m_bitsCandType = 0; + InquireCandidatePosition(); } - InquireCandidatePosition(); return mrConsume; } return mrDoDefault; diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp index d6a27dff8f1..2e7c77952e4 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Font.cpp @@ -1685,6 +1685,8 @@ CSegTable* CSegTableManager::GetTable(LPCWSTR lpszFontName, BOOL fEUDC) CSegTableManager g_segTableManager; +#define KEYLEN 16 + class CCombinedSegTable : public CSegTableComponent { public: @@ -1695,7 +1697,7 @@ public: private: LPSTR GetCodePageSubkey(); void GetEUDCFileName(LPWSTR lpszFileName, int cchFileName); - static char m_szCodePageSubkey[16]; + static char m_szCodePageSubkey[KEYLEN]; static WCHAR m_szDefaultEUDCFile[_MAX_PATH]; static BOOL m_fEUDCSubKeyExist; static BOOL m_fTTEUDCFileExist; @@ -1703,7 +1705,7 @@ private: CEUDCSegTable* m_pEUDCSegTable; }; -char CCombinedSegTable::m_szCodePageSubkey[16] = ""; +char CCombinedSegTable::m_szCodePageSubkey[KEYLEN] = ""; WCHAR CCombinedSegTable::m_szDefaultEUDCFile[_MAX_PATH] = L""; @@ -1735,8 +1737,11 @@ LPSTR CCombinedSegTable::GetCodePageSubkey() } lpszCP++; // cf lpszCP = "932" - char szSubKey[80]; + char szSubKey[KEYLEN]; strcpy(szSubKey, "EUDC\\"); + if ((strlen(szSubKey) + strlen(lpszCP)) >= KEYLEN) { + return NULL; + } strcpy(&(szSubKey[strlen(szSubKey)]), lpszCP); strcpy(m_szCodePageSubkey, szSubKey); return m_szCodePageSubkey; diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp index ed8311ff3b3..fd7c0899e15 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Frame.cpp @@ -1374,7 +1374,6 @@ void AwtFrame::_SetState(void *param) } else { // zoom == iconify == FALSE wp.showCmd = focusable ? SW_RESTORE : SW_SHOWNOACTIVATE; } - ::ShowWindow(hwnd, wp.showCmd); if (zoom && iconify) { wp.flags |= WPF_RESTORETOMAXIMIZED; } else { diff --git a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp index 3baf7f7448c..6666a6e2c95 100644 --- a/jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp +++ b/jdk/src/java.desktop/windows/native/libawt/windows/awt_Robot.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 2016, 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 @@ -335,7 +335,17 @@ void AwtRobot::DoKeyEvent( jint jkey, DWORD dwFlags ) } else { // get the scancode from the virtual key scancode = ::MapVirtualKey(vkey, 0); - if (vkey == VK_RMENU) { + if (vkey == VK_RMENU || + vkey == VK_DELETE || + vkey == VK_INSERT || + vkey == VK_NEXT || + vkey == VK_PRIOR || + vkey == VK_HOME || + vkey == VK_END || + vkey == VK_LEFT || + vkey == VK_RIGHT || + vkey == VK_UP || + vkey == VK_DOWN) { dwFlags |= KEYEVENTF_EXTENDEDKEY; } keybd_event(vkey, scancode, dwFlags, 0); diff --git a/jdk/src/java.httpclient/share/classes/java/net/http/AuthenticationFilter.java b/jdk/src/java.httpclient/share/classes/java/net/http/AuthenticationFilter.java index 5bd425b5557..1f098f91c48 100644 --- a/jdk/src/java.httpclient/share/classes/java/net/http/AuthenticationFilter.java +++ b/jdk/src/java.httpclient/share/classes/java/net/http/AuthenticationFilter.java @@ -189,7 +189,7 @@ class AuthenticationFilter implements HeaderFilter { } boolean proxy = status == PROXY_UNAUTHORIZED; - String authname = proxy ? "Proxy-Authentication" : "WWW-Authenticate"; + String authname = proxy ? "Proxy-Authenticate" : "WWW-Authenticate"; String authval = hdrs.firstValue(authname).orElseThrow(() -> { return new IOException("Invalid auth header"); }); diff --git a/jdk/src/java.management/share/classes/java/lang/management/ThreadInfo.java b/jdk/src/java.management/share/classes/java/lang/management/ThreadInfo.java index 46f92a248e4..c859d337c69 100644 --- a/jdk/src/java.management/share/classes/java/lang/management/ThreadInfo.java +++ b/jdk/src/java.management/share/classes/java/lang/management/ThreadInfo.java @@ -771,6 +771,14 @@ public class ThreadInfo { * Type * * + * moduleName + * {@code java.lang.String} + * + * + * moduleVersion + * {@code java.lang.String} + * + * * className * {@code java.lang.String} * diff --git a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSContextSpi.java b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSContextSpi.java index 8611642715a..0a3ec9c146e 100644 --- a/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSContextSpi.java +++ b/jdk/src/java.security.jgss/share/classes/sun/security/jgss/spi/GSSContextSpi.java @@ -395,7 +395,7 @@ public interface GSSContextSpi { public void dispose() throws GSSException; /** - * Return the mechanism-specific attribute associated with (@code type}. + * Return the mechanism-specific attribute associated with {@code type}. * * @param type the type of the attribute requested * @return the attribute diff --git a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java index 10dcb2731b9..15b6c6d637e 100644 --- a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java +++ b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Main.java @@ -70,7 +70,6 @@ import sun.security.util.*; * @author Roland Schemers * @author Jan Luehe */ -@SuppressWarnings("deprecation") public class Main { // for i18n @@ -98,7 +97,6 @@ public class Main { static final String VERSION = "1.0"; static final int IN_KEYSTORE = 0x01; // signer is in keystore - static final int IN_SCOPE = 0x02; static final int NOT_ALIAS = 0x04; // alias list is NOT empty and // signer is not in alias list static final int SIGNED_BY_ALIAS = 0x08; // signer is in alias list @@ -676,14 +674,13 @@ public class Main { hasUnsignedEntry |= !je.isDirectory() && !isSigned && !signatureRelated(name); - int inStoreOrScope = inKeyStore(signers); + int inStoreWithAlias = inKeyStore(signers); - boolean inStore = (inStoreOrScope & IN_KEYSTORE) != 0; - boolean inScope = (inStoreOrScope & IN_SCOPE) != 0; + boolean inStore = (inStoreWithAlias & IN_KEYSTORE) != 0; - notSignedByAlias |= (inStoreOrScope & NOT_ALIAS) != 0; + notSignedByAlias |= (inStoreWithAlias & NOT_ALIAS) != 0; if (keystore != null) { - aliasNotInStore |= isSigned && (!inStore && !inScope); + aliasNotInStore |= isSigned && !inStore; } // Only used when -verbose provided @@ -697,8 +694,7 @@ public class Main { sb.append(isSigned ? rb.getString("s") : rb.getString("SPACE")) .append(inManifest ? rb.getString("m") : rb.getString("SPACE")) .append(inStore ? rb.getString("k") : rb.getString("SPACE")) - .append(inScope ? rb.getString("i") : rb.getString("SPACE")) - .append((inStoreOrScope & NOT_ALIAS) != 0 ? 'X' : ' ') + .append((inStoreWithAlias & NOT_ALIAS) != 0 ? 'X' : ' ') .append(rb.getString("SPACE")); sb.append('|'); } @@ -800,8 +796,6 @@ public class Main { ".m.entry.is.listed.in.manifest")); System.out.println(rb.getString( ".k.at.least.one.certificate.was.found.in.keystore")); - System.out.println(rb.getString( - ".i.at.least.one.certificate.was.found.in.identity.scope")); if (ckaliases.size() > 0) { System.out.println(rb.getString( ".X.not.signed.by.specified.alias.es.")); @@ -1076,8 +1070,6 @@ public class Main { if (alias != null) { if (alias.startsWith("(")) { result |= IN_KEYSTORE; - } else if (alias.startsWith("[")) { - result |= IN_SCOPE; } if (ckaliases.contains(alias.substring(1, alias.length() - 1))) { result |= SIGNED_BY_ALIAS; diff --git a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java index 6198cd40ce9..97ea20eb939 100644 --- a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java +++ b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources.java @@ -130,7 +130,6 @@ public class Resources extends java.util.ListResourceBundle { {"s", "s"}, {"m", "m"}, {"k", "k"}, - {"i", "i"}, {".and.d.more.", "(and %d more)"}, {".s.signature.was.verified.", " s = signature was verified "}, @@ -138,8 +137,6 @@ public class Resources extends java.util.ListResourceBundle { " m = entry is listed in manifest"}, {".k.at.least.one.certificate.was.found.in.keystore", " k = at least one certificate was found in keystore"}, - {".i.at.least.one.certificate.was.found.in.identity.scope", - " i = at least one certificate was found in identity scope"}, {".X.not.signed.by.specified.alias.es.", " X = not signed by specified alias(es)"}, {"no.manifest.", "no manifest."}, diff --git a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java index d398fb29c96..6751b1870d9 100644 --- a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java +++ b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_ja.java @@ -123,7 +123,6 @@ public class Resources_ja extends java.util.ListResourceBundle { {"s", "s"}, {"m", "m"}, {"k", "k"}, - {"i", "i"}, {".and.d.more.", "(\u4ED6\u306B\u3082%d\u500B)"}, {".s.signature.was.verified.", " s=\u7F72\u540D\u304C\u691C\u8A3C\u3055\u308C\u307E\u3057\u305F "}, @@ -131,8 +130,6 @@ public class Resources_ja extends java.util.ListResourceBundle { " m=\u30A8\u30F3\u30C8\u30EA\u304C\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u5185\u306B\u30EA\u30B9\u30C8\u3055\u308C\u307E\u3059"}, {".k.at.least.one.certificate.was.found.in.keystore", " k=1\u3064\u4EE5\u4E0A\u306E\u8A3C\u660E\u66F8\u304C\u30AD\u30FC\u30B9\u30C8\u30A2\u3067\u691C\u51FA\u3055\u308C\u307E\u3057\u305F"}, - {".i.at.least.one.certificate.was.found.in.identity.scope", - " i=1\u3064\u4EE5\u4E0A\u306E\u8A3C\u660E\u66F8\u304C\u30A2\u30A4\u30C7\u30F3\u30C6\u30A3\u30C6\u30A3\u30FB\u30B9\u30B3\u30FC\u30D7\u3067\u691C\u51FA\u3055\u308C\u307E\u3057\u305F"}, {".X.not.signed.by.specified.alias.es.", " X =\u6307\u5B9A\u3057\u305F\u5225\u540D\u3067\u7F72\u540D\u3055\u308C\u3066\u3044\u307E\u305B\u3093"}, {"no.manifest.", "\u30DE\u30CB\u30D5\u30A7\u30B9\u30C8\u306F\u5B58\u5728\u3057\u307E\u305B\u3093\u3002"}, diff --git a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java index d3f0371c6a5..1e6956daec6 100644 --- a/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java +++ b/jdk/src/jdk.jartool/share/classes/sun/security/tools/jarsigner/Resources_zh_CN.java @@ -123,7 +123,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle { {"s", "s"}, {"m", "m"}, {"k", "k"}, - {"i", "i"}, {".and.d.more.", "(%d \u53CA\u4EE5\u4E0A)"}, {".s.signature.was.verified.", " s = \u5DF2\u9A8C\u8BC1\u7B7E\u540D "}, @@ -131,8 +130,6 @@ public class Resources_zh_CN extends java.util.ListResourceBundle { " m = \u5728\u6E05\u5355\u4E2D\u5217\u51FA\u6761\u76EE"}, {".k.at.least.one.certificate.was.found.in.keystore", " k = \u5728\u5BC6\u94A5\u5E93\u4E2D\u81F3\u5C11\u627E\u5230\u4E86\u4E00\u4E2A\u8BC1\u4E66"}, - {".i.at.least.one.certificate.was.found.in.identity.scope", - " i = \u5728\u8EAB\u4EFD\u4F5C\u7528\u57DF\u5185\u81F3\u5C11\u627E\u5230\u4E86\u4E00\u4E2A\u8BC1\u4E66"}, {".X.not.signed.by.specified.alias.es.", " X = \u672A\u7531\u6307\u5B9A\u522B\u540D\u7B7E\u540D"}, {"no.manifest.", "\u6CA1\u6709\u6E05\u5355\u3002"}, diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java index dc0742a5952..1b37140ed55 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/builder/DefaultImageBuilder.java @@ -56,7 +56,6 @@ import java.util.Optional; import java.util.Properties; import java.util.Set; import jdk.tools.jlink.internal.BasicImageWriter; -import jdk.tools.jlink.internal.plugins.FileCopierPlugin; import jdk.tools.jlink.internal.plugins.FileCopierPlugin.SymImageFile; import jdk.tools.jlink.internal.ExecutableImage; import jdk.tools.jlink.plugin.ResourcePool; @@ -184,10 +183,6 @@ public final class DefaultImageBuilder implements ImageBuilder { files.moduleView().modules().forEach(m -> { // Only add modules that contain packages if (!m.packages().isEmpty()) { - // Skip the fake module used by FileCopierPlugin when copying files. - if (m.name().equals(FileCopierPlugin.FAKE_MODULE)) { - return; - } modules.add(m.name()); } }); @@ -228,6 +223,7 @@ public final class DefaultImageBuilder implements ImageBuilder { desc.osName().ifPresent(s -> props.setProperty("OS_NAME", s)); desc.osVersion().ifPresent(s -> props.setProperty("OS_VERSION", s)); desc.osArch().ifPresent(s -> props.setProperty("OS_ARCH", s)); + props.setProperty("JAVA_VERSION", System.getProperty("java.version")); }); Optional release = pool.findEntry("/java.base/release"); diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java index 54b1f7e3b8e..47447c99ec2 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/ResourcePoolManager.java @@ -83,8 +83,8 @@ public class ResourcePoolManager { if (!path.startsWith("/")) { path = "/" + path; } - if (!path.startsWith("/" + name)) { - path = "/" + name + path; + if (!path.startsWith("/" + name + "/")) { + path = "/" + name + path; // path already starts with '/' } return Optional.ofNullable(moduleContent.get(path)); } @@ -213,7 +213,6 @@ public class ResourcePoolManager { private final Map resources = new LinkedHashMap<>(); private final Map modules = new LinkedHashMap<>(); - private final ResourcePoolModuleImpl fileCopierModule = new ResourcePoolModuleImpl(FileCopierPlugin.FAKE_MODULE); private final ByteOrder order; private final StringTable table; private final ResourcePool poolImpl; @@ -272,11 +271,6 @@ public class ResourcePoolManager { } String modulename = data.moduleName(); ResourcePoolModuleImpl m = (ResourcePoolModuleImpl)modules.get(modulename); - // ## TODO: FileCopierPlugin should not add content to a module - // FAKE_MODULE is not really a module to be added in the image - if (FileCopierPlugin.FAKE_MODULE.equals(modulename)) { - m = fileCopierModule; - } if (m == null) { m = new ResourcePoolModuleImpl(modulename); modules.put(modulename, m); diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java index 4bfe522f3a6..df824856282 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/ExcludeVMPlugin.java @@ -38,6 +38,7 @@ import java.util.stream.Collectors; import jdk.tools.jlink.plugin.Plugin; import jdk.tools.jlink.plugin.ResourcePool; import jdk.tools.jlink.plugin.ResourcePoolBuilder; +import jdk.tools.jlink.plugin.ResourcePoolModule; import jdk.tools.jlink.plugin.ResourcePoolEntry; import jdk.tools.jlink.plugin.PluginException; @@ -98,9 +99,8 @@ public final class ExcludeVMPlugin implements Plugin { * e.g.: /java.base/native/amd64/server/libjvm.so * /java.base/native/server/libjvm.dylib */ - private List getVMs(ResourcePool in) { - String jvmlib = jvmlib(); - List ret = in.moduleView().findModule("java.base").get().entries().filter((t) -> { + private List getVMs(ResourcePoolModule javaBase, String jvmlib) { + List ret = javaBase.entries().filter((t) -> { return t.path().endsWith("/" + jvmlib); }).collect(Collectors.toList()); return ret; @@ -108,12 +108,13 @@ public final class ExcludeVMPlugin implements Plugin { @Override public ResourcePool transform(ResourcePool in, ResourcePoolBuilder out) { - String jvmlib = jvmlib(); + ResourcePoolModule javaBase = in.moduleView().findModule("java.base").get(); + String jvmlib = jvmlib(javaBase.descriptor().osName().get()); TreeSet existing = new TreeSet<>(new JvmComparator()); TreeSet removed = new TreeSet<>(new JvmComparator()); if (!keepAll) { // First retrieve all available VM names and removed VM - List jvms = getVMs(in); + List jvms = getVMs(javaBase, jvmlib); for (Jvm jvm : Jvm.values()) { for (ResourcePoolEntry md : jvms) { if (md.path().endsWith("/" + jvm.getName() + "/" + jvmlib)) { @@ -247,21 +248,21 @@ public final class ExcludeVMPlugin implements Plugin { return orig.copyWithContent(content); } - private static String jvmlib() { + private static String jvmlib(String osName) { String lib = "libjvm.so"; - if (isWindows()) { + if (isWindows(osName)) { lib = "jvm.dll"; - } else if (isMac()) { + } else if (isMac(osName)) { lib = "libjvm.dylib"; } return lib; } - private static boolean isWindows() { - return System.getProperty("os.name").startsWith("Windows"); + private static boolean isWindows(String osName) { + return osName.startsWith("Windows"); } - private static boolean isMac() { - return System.getProperty("os.name").startsWith("Mac OS"); + private static boolean isMac(String osName) { + return osName.startsWith("Mac OS") || osName.startsWith("Darwin"); } } diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/FileCopierPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/FileCopierPlugin.java index 15f529c85df..a0384bb7fd7 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/FileCopierPlugin.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/FileCopierPlugin.java @@ -58,8 +58,6 @@ public class FileCopierPlugin implements Plugin { Path source; Path target; } - public static final String FAKE_MODULE = "$jlink-file-copier"; - private final List files = new ArrayList<>(); /** @@ -159,7 +157,7 @@ public class FileCopierPlugin implements Plugin { Objects.requireNonNull(file); Objects.requireNonNull(path); ResourcePoolEntry impl = ResourcePoolEntry.create( - "/" + FAKE_MODULE + "/other/" + path, + "/java.base/other/" + path, ResourcePoolEntry.Type.OTHER, file); try { pool.add(impl); diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java index 0fdd27ec01d..c50860aa517 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/GenerateJLIClassesPlugin.java @@ -24,9 +24,11 @@ */ package jdk.tools.jlink.internal.plugins; +import java.lang.invoke.MethodType; import java.lang.reflect.Method; import java.util.Arrays; import java.util.EnumSet; +import java.util.HashMap; import java.util.List; import java.util.Map; import java.util.Set; @@ -48,14 +50,26 @@ public final class GenerateJLIClassesPlugin implements Plugin { private static final String BMH_SPECIES_PARAM = "bmh-species"; + private static final String DMH_PARAM = "dmh"; + private static final String DESCRIPTION = PluginsResourceBundle.getDescription(NAME); private static final String BMH = "java/lang/invoke/BoundMethodHandle"; + private static final Method BMH_FACTORY_METHOD; - private static final Method FACTORY_METHOD; + private static final String DMH = "java/lang/invoke/DirectMethodHandle$Holder"; + private static final String DMH_INVOKE_VIRTUAL = "invokeVirtual"; + private static final String DMH_INVOKE_STATIC = "invokeStatic"; + private static final String DMH_INVOKE_SPECIAL = "invokeSpecial"; + private static final String DMH_NEW_INVOKE_SPECIAL = "newInvokeSpecial"; + private static final String DMH_INVOKE_INTERFACE = "invokeInterface"; + private static final String DMH_INVOKE_STATIC_INIT = "invokeStaticInit"; + private static final Method DMH_FACTORY_METHOD; List speciesTypes; + Map> dmhMethods; + public GenerateJLIClassesPlugin() { } @@ -87,11 +101,9 @@ public final class GenerateJLIClassesPlugin implements Plugin { /** * @return the default Species forms to generate. * - * This list was derived from running a Java concatenating strings - * with -Djava.lang.invoke.stringConcat=MH_INLINE_SIZED_EXACT set - * plus a subset of octane. A better long-term solution is to define - * and run a set of quick generators and extracting this list as a - * step in the build process. + * This list was derived from running a small startup benchmark. + * A better long-term solution is to define and run a set of quick + * generators and extracting this list as a step in the build process. */ public static List defaultSpecies() { return List.of("LL", "L3", "L4", "L5", "L6", "L7", "L7I", @@ -100,18 +112,51 @@ public final class GenerateJLIClassesPlugin implements Plugin { "LILL", "I", "LLILL"); } + /** + * @return the list of default DirectMethodHandle methods to generate. + */ + public static Map> defaultDMHMethods() { + return Map.of( + DMH_INVOKE_VIRTUAL, List.of("_L", "L_L", "LI_I", "LL_V"), + DMH_INVOKE_SPECIAL, List.of("L_I", "L_L", "LF_L", "LD_L", "LL_L", + "L3_L", "L4_L", "L5_L", "L6_L", "L7_L", "LI_I", "LI_L", "LIL_I", + "LII_I", "LII_L", "LLI_L", "LLI_I", "LILI_I", "LIIL_L", + "LIILL_L", "LIILL_I", "LIIL_I", "LILIL_I", "LILILL_I", + "LILII_I", "LI3_I", "LI3L_I", "LI3LL_I", "LI3_L", "LI4_I"), + DMH_INVOKE_STATIC, List.of("II_I", "IL_I", "ILIL_I", "ILII_I", + "_I", "_L", "_V", "D_L", "F_L", "I_I", "II_L", "LI_L", + "L_V", "L_L", "LL_L", "L3_L", "L4_L", "L5_L", "L6_L", + "L7_L", "L8_L", "L9_L", "L9I_L", "L9II_L", "L9IIL_L", + "L10_L", "L11_L", "L12_L", "L13_L", "L13I_L", "L13II_L") + ); + } + + // Map from DirectMethodHandle method type to internal ID + private static final Map DMH_METHOD_TYPE_MAP = + Map.of( + DMH_INVOKE_VIRTUAL, 0, + DMH_INVOKE_STATIC, 1, + DMH_INVOKE_SPECIAL, 2, + DMH_NEW_INVOKE_SPECIAL, 3, + DMH_INVOKE_INTERFACE, 4, + DMH_INVOKE_STATIC_INIT, 5 + ); + @Override public void configure(Map config) { String mainArgument = config.get(NAME); // Enable by default boolean bmhEnabled = true; + boolean dmhEnabled = true; if (mainArgument != null) { - Set args = Arrays.stream(mainArgument.split(",")) - .collect(Collectors.toSet()); + List args = Arrays.asList(mainArgument.split(",")); if (!args.contains(BMH_PARAM)) { bmhEnabled = false; } + if (!args.contains(DMH_PARAM)) { + dmhEnabled = false; + } } if (!bmhEnabled) { @@ -132,40 +177,63 @@ public final class GenerateJLIClassesPlugin implements Plugin { speciesTypes = bmhSpecies.stream() .map(type -> expandSignature(type)) .collect(Collectors.toList()); + } - // Validation check - for (String type : speciesTypes) { - for (char c : type.toCharArray()) { - if ("LIJFD".indexOf(c) < 0) { - throw new PluginException("All characters must " - + "correspond to a basic field type: LIJFD"); + // DirectMethodHandles + if (!dmhEnabled) { + dmhMethods = Map.of(); + } else { + dmhMethods = new HashMap<>(); + for (String dmhParam : DMH_METHOD_TYPE_MAP.keySet()) { + String args = config.get(dmhParam); + if (args != null && !args.isEmpty()) { + List dmhMethodTypes = Arrays.stream(args.split(",")) + .map(String::trim) + .filter(s -> !s.isEmpty()) + .collect(Collectors.toList()); + dmhMethods.put(dmhParam, dmhMethodTypes); + // Validation check + for (String type : dmhMethodTypes) { + String[] typeParts = type.split("_"); + // check return type (second part) + if (typeParts.length != 2 || typeParts[1].length() != 1 + || "LJIFDV".indexOf(typeParts[1].charAt(0)) == -1) { + throw new PluginException( + "Method type signature must be of form [LJIFD]*_[LJIFDV]"); + } + // expand and check arguments (first part) + expandSignature(typeParts[0]); } } } + if (dmhMethods.isEmpty()) { + dmhMethods = defaultDMHMethods(); + } + } + } + + private static void requireBasicType(char c) { + if ("LIJFD".indexOf(c) < 0) { + throw new PluginException( + "Character " + c + " must correspond to a basic field type: LIJFD"); } } @Override public ResourcePool transform(ResourcePool in, ResourcePoolBuilder out) { - in.entries().forEach(data -> { - if (("/java.base/" + BMH + ".class").equals(data.path())) { - // Add BoundMethodHandle unchanged - out.add(data); - speciesTypes.forEach(types -> generateConcreteClass(types, data, out)); - } else { - out.add(data); - } - }); - + // Copy all but DMH_ENTRY to out + in.transformAndCopy(entry -> entry.path().equals(DMH_ENTRY) ? null : entry, out); + speciesTypes.forEach(types -> generateBMHClass(types, out)); + generateDMHClass(out); return out.build(); } @SuppressWarnings("unchecked") - private void generateConcreteClass(String types, ResourcePoolEntry data, ResourcePoolBuilder out) { + private void generateBMHClass(String types, ResourcePoolBuilder out) { try { // Generate class Map.Entry result = (Map.Entry) - FACTORY_METHOD.invoke(null, types); + BMH_FACTORY_METHOD.invoke(null, types); String className = result.getKey(); byte[] bytes = result.getValue(); @@ -179,13 +247,47 @@ public final class GenerateJLIClassesPlugin implements Plugin { } } + private void generateDMHClass(ResourcePoolBuilder out) { + int count = 0; + for (List entry : dmhMethods.values()) { + count += entry.size(); + } + MethodType[] methodTypes = new MethodType[count]; + int[] dmhTypes = new int[count]; + int index = 0; + for (Map.Entry> entry : dmhMethods.entrySet()) { + String dmhType = entry.getKey(); + for (String type : entry.getValue()) { + methodTypes[index] = asMethodType(type); + dmhTypes[index] = DMH_METHOD_TYPE_MAP.get(dmhType); + index++; + } + } + try { + byte[] bytes = (byte[])DMH_FACTORY_METHOD + .invoke(null, + DMH, + methodTypes, + dmhTypes); + ResourcePoolEntry ndata = ResourcePoolEntry.create(DMH_ENTRY, bytes); + out.add(ndata); + } catch (Exception ex) { + throw new PluginException(ex); + } + } + private static final String DMH_ENTRY = "/java.base/" + DMH + ".class"; + static { try { Class BMHFactory = Class.forName("java.lang.invoke.BoundMethodHandle$Factory"); - Method genClassMethod = BMHFactory.getDeclaredMethod("generateConcreteBMHClassBytes", + BMH_FACTORY_METHOD = BMHFactory.getDeclaredMethod("generateConcreteBMHClassBytes", String.class); - genClassMethod.setAccessible(true); - FACTORY_METHOD = genClassMethod; + BMH_FACTORY_METHOD.setAccessible(true); + + Class DMHFactory = Class.forName("java.lang.invoke.DirectMethodHandle"); + DMH_FACTORY_METHOD = DMHFactory.getDeclaredMethod("generateDMHClassBytes", + String.class, MethodType[].class, int[].class); + DMH_FACTORY_METHOD.setAccessible(true); } catch (Exception e) { throw new PluginException(e); } @@ -202,6 +304,7 @@ public final class GenerateJLIClassesPlugin implements Plugin { count *= 10; count += (c - '0'); } else { + requireBasicType(c); for (int j = 1; j < count; j++) { sb.append(last); } @@ -210,9 +313,52 @@ public final class GenerateJLIClassesPlugin implements Plugin { count = 0; } } - for (int j = 1; j < count; j++) { - sb.append(last); + + // ended with a number, e.g., "L2": append last char count - 1 times + if (count > 1) { + requireBasicType(last); + for (int j = 1; j < count; j++) { + sb.append(last); + } } return sb.toString(); } + + private static MethodType asMethodType(String basicSignatureString) { + String[] parts = basicSignatureString.split("_"); + assert(parts.length == 2); + assert(parts[1].length() == 1); + String parameters = expandSignature(parts[0]); + Class rtype = primitiveType(parts[1].charAt(0)); + Class[] ptypes = new Class[parameters.length()]; + for (int i = 0; i < ptypes.length; i++) { + ptypes[i] = primitiveType(parameters.charAt(i)); + } + return MethodType.methodType(rtype, ptypes); + } + + private static Class primitiveType(char c) { + switch (c) { + case 'F': + return float.class; + case 'D': + return double.class; + case 'I': + return int.class; + case 'L': + return Object.class; + case 'J': + return long.class; + case 'V': + return void.class; + case 'Z': + case 'B': + case 'S': + case 'C': + throw new IllegalArgumentException("Not a valid primitive: " + c + + " (use I instead)"); + default: + throw new IllegalArgumentException("Not a primitive: " + c); + } + } } diff --git a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java index d8f9d79f6b7..b6e29bfccdc 100644 --- a/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java +++ b/jdk/src/jdk.jlink/share/classes/jdk/tools/jlink/internal/plugins/IncludeLocalesPlugin.java @@ -31,6 +31,7 @@ import java.util.IllformedLocaleException; import java.util.Locale; import java.util.List; import java.util.Map; +import java.util.Objects; import java.util.Optional; import static java.util.ResourceBundle.Control; import java.util.Set; @@ -342,9 +343,8 @@ public final class IncludeLocalesPlugin implements Plugin, ResourcePrevisitor { // locales from the pre-filtered list. locales.stream() .filter(l -> l.toString().equalsIgnoreCase(loc.toString())) - .findAny() - .orElse(Locale.ROOT)) - .filter(loc -> !loc.equals(Locale.ROOT)) + .findAny()) + .flatMap(Optional::stream) .flatMap(IncludeLocalesPlugin::localeToTags) .distinct() .collect(Collectors.toList()); @@ -373,40 +373,42 @@ public final class IncludeLocalesPlugin implements Plugin, ResourcePrevisitor { } private static Stream localeToTags(Locale loc) { + Objects.requireNonNull(loc); + String tag = loc.toLanguageTag(); - Stream ret = null; + List tags = null; switch (loc.getLanguage()) { // ISO3166 compatibility case "iw": - ret = List.of(tag, tag.replaceFirst("^he", "iw")).stream(); + tags = List.of(tag, tag.replaceFirst("^he", "iw")); break; case "in": - ret = List.of(tag, tag.replaceFirst("^id", "in")).stream(); + tags = List.of(tag, tag.replaceFirst("^id", "in")); break; case "ji": - ret = List.of(tag, tag.replaceFirst("^yi", "ji")).stream(); + tags = List.of(tag, tag.replaceFirst("^yi", "ji")); break; // Special COMPAT provider locales case "ja": if (loc.getCountry() == "JP") { - ret = List.of(tag, jaJPJPTag).stream(); + tags = List.of(tag, jaJPJPTag); } break; case "no": case "nn": if (loc.getCountry() == "NO") { - ret = List.of(tag, noNONYTag).stream(); + tags = List.of(tag, noNONYTag); } break; case "th": if (loc.getCountry() == "TH") { - ret = List.of(tag, thTHTHTag).stream(); + tags = List.of(tag, thTHTHTag); } break; } - return ret == null ? List.of(tag).stream() : ret; + return tags == null ? List.of(tag).stream() : tags.stream(); } } diff --git a/jdk/src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java b/jdk/src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java index 7ef7e3bc905..c7a11bc5096 100644 --- a/jdk/src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java +++ b/jdk/src/jdk.jsobject/share/classes/netscape/javascript/JSObject.java @@ -149,7 +149,13 @@ public abstract class JSObject { * {@code null} if we are not connected to a browser. * @throws JSException when an error is reported from the browser or * JavaScript engine or if applet is {@code null} + * + * @deprecated The Applet API is deprecated. See the + * + * java.applet package documentation for further information. */ + + @Deprecated(since = "9") public static JSObject getWindow(Applet applet) throws JSException { return ProviderLoader.callGetWindow(applet); } diff --git a/jdk/src/jdk.management/share/classes/com/sun/management/internal/GcInfoBuilder.java b/jdk/src/jdk.management/share/classes/com/sun/management/internal/GcInfoBuilder.java index ab5f795f147..0ceb1f6b6d2 100644 --- a/jdk/src/jdk.management/share/classes/com/sun/management/internal/GcInfoBuilder.java +++ b/jdk/src/jdk.management/share/classes/com/sun/management/internal/GcInfoBuilder.java @@ -79,7 +79,7 @@ public class GcInfoBuilder { } public String[] getPoolNames() { - return poolNames; + return poolNames.clone(); } int getGcExtItemCount() { diff --git a/jdk/src/jdk.management/share/native/libmanagement_ext/Flag.c b/jdk/src/jdk.management/share/native/libmanagement_ext/Flag.c index 1629468f398..c5dd5999360 100644 --- a/jdk/src/jdk.management/share/native/libmanagement_ext/Flag.c +++ b/jdk/src/jdk.management/share/native/libmanagement_ext/Flag.c @@ -141,6 +141,13 @@ Java_com_sun_management_internal_Flag_getFlags // ignore unsupported type continue; } + + if (valueObj == NULL && globals[i].type != JMM_VMGLOBAL_TYPE_JSTRING) { + free(globals); + JNU_ThrowOutOfMemoryError(env, 0); + return 0; + } + switch (globals[i].origin) { case JMM_VMGLOBAL_ORIGIN_DEFAULT: origin = default_origin; diff --git a/jdk/src/jdk.security.auth/solaris/native/libjaas/Solaris.c b/jdk/src/jdk.security.auth/solaris/native/libjaas/Solaris.c index 1d251a65656..438b3b7318d 100644 --- a/jdk/src/jdk.security.auth/solaris/native/libjaas/Solaris.c +++ b/jdk/src/jdk.security.auth/solaris/native/libjaas/Solaris.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, 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 @@ -26,10 +26,14 @@ #include #include "com_sun_security_auth_module_SolarisSystem.h" #include -#include #include #include #include + +/* For POSIX-compliant getpwuid_r on Solaris */ +#if defined(__solaris__) +#define _POSIX_PTHREAD_SEMANTICS +#endif #include static void throwIllegalArgumentException(JNIEnv *env, const char *msg) { @@ -43,8 +47,10 @@ Java_com_sun_security_auth_module_SolarisSystem_getSolarisInfo (JNIEnv *env, jobject obj) { int i; - char pwd_buf[1024]; + long pwd_bufsize; + char *pwd_buf = NULL; struct passwd pwd; + struct passwd* p = NULL; jsize numSuppGroups = getgroups(0, NULL); jfieldID fid; jstring jstr; @@ -53,20 +59,31 @@ Java_com_sun_security_auth_module_SolarisSystem_getSolarisInfo gid_t *groups; jclass cls; + pwd_bufsize = sysconf(_SC_GETPW_R_SIZE_MAX); + if (pwd_bufsize == -1) { + pwd_bufsize = 1024; + } + pwd_buf = (char *)malloc(pwd_bufsize); groups = (gid_t *)calloc(numSuppGroups, sizeof(gid_t)); - if (groups == NULL) { - jclass cls = (*env)->FindClass(env,"java/lang/OutOfMemoryError"); - if (cls != NULL) + if (pwd_buf == NULL || groups == NULL) { + if (pwd_buf != NULL) { + free(pwd_buf); + } + if (groups != NULL) { + free(groups); + } + cls = (*env)->FindClass(env,"java/lang/OutOfMemoryError"); + if (cls != NULL) { (*env)->ThrowNew(env, cls, NULL); + } return; } cls = (*env)->GetObjectClass(env, obj); - memset(pwd_buf, 0, sizeof(pwd_buf)); - if (getpwuid_r(getuid(), &pwd, pwd_buf, sizeof(pwd_buf)) != NULL && - getgroups(numSuppGroups, groups) != -1) { + if (getpwuid_r(getuid(), &pwd, pwd_buf, sizeof(pwd_buf), &p) != 0 && + p != NULL && getgroups(numSuppGroups, groups) != -1) { /* * set username @@ -129,7 +146,7 @@ Java_com_sun_security_auth_module_SolarisSystem_getSolarisInfo (*env)->SetObjectField(env, obj, fid, jgroups); } cleanupAndReturn: + free(pwd_buf); free(groups); - return; } diff --git a/jdk/src/jdk.security.auth/unix/native/libjaas/Unix.c b/jdk/src/jdk.security.auth/unix/native/libjaas/Unix.c index 76737ab76a3..fdee7d3b935 100644 --- a/jdk/src/jdk.security.auth/unix/native/libjaas/Unix.c +++ b/jdk/src/jdk.security.auth/unix/native/libjaas/Unix.c @@ -1,5 +1,5 @@ /* - * Copyright (c) 2000, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2000, 2016, 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 @@ -23,20 +23,21 @@ * questions. */ -#ifdef __solaris__ -#define _POSIX_C_SOURCE 199506L -#endif - #include #include "jni_util.h" #include "com_sun_security_auth_module_UnixSystem.h" #include -#include #include #include #include #include +/* For POSIX-compliant getpwuid_r on Solaris */ +#if defined(__solaris__) +#define _POSIX_PTHREAD_SEMANTICS +#endif +#include + /* * Declare library specific JNI_Onload entry if static build */ diff --git a/jdk/test/ProblemList.txt b/jdk/test/ProblemList.txt index 5585c01c1e8..a6af75c47bb 100644 --- a/jdk/test/ProblemList.txt +++ b/jdk/test/ProblemList.txt @@ -297,9 +297,6 @@ sun/security/ssl/SSLSocketImpl/AsyncSSLSocketClose.java 8161232 macosx-a ############################################################################ # jdk_imageio -javax/imageio/plugins/shared/CanWriteSequence.java 8148454 generic-all -javax/imageio/plugins/tiff/MultiPageTest/MultiPageTest.java 8148454 generic-all -javax/imageio/plugins/tiff/WriteToSequenceAfterAbort.java 8148454 generic-all ############################################################################ @@ -318,7 +315,7 @@ sanity/client/SwingSet/src/ButtonDemoScreenshotTest.java 8157338 generic- ############################################################################ -# jdk_tools +# core_tools tools/pack200/CommandLineTests.java 7143279,8059906 generic-all @@ -344,6 +341,8 @@ com/sun/jdi/CatchPatternTest.sh 8068645 generic- com/sun/jdi/GetLocalVariables4Test.sh 8067354 windows-all +com/sun/jdi/sde/SourceDebugExtensionTest.java 8158066 windows-all + ############################################################################ # jdk_time @@ -368,7 +367,9 @@ java/util/BitSet/BitSetStreamTest.java 8079538 generic- sun/tools/jcmd/TestJcmdSanity.java 8031482 windows-all -sun/tools/jmap/heapconfig/JMapHeapConfigTest.java 8072131,8132452 generic-all +sun/tools/jhsdb/BasicLauncherTest.java 8160376 macosx-all + +sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java 8160376 macosx-all sun/tools/jstatd/TestJstatdExternalRegistry.java 8046285 generic-all @@ -376,12 +377,8 @@ sun/tools/jps/TestJpsJar.java 8160923 generic- sun/tools/jps/TestJpsJarRelative.java 6456333 generic-all -sun/tools/jinfo/JInfoRunningProcessFlagTest.java 6734748 generic-all - sun/jvmstat/monitor/MonitoredVm/MonitorVmStartTerminate.java 8057732 generic-all -sun/tools/jinfo/JInfoSanityTest.java 8059035 generic-all - demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java 8151899 generic-all ############################################################################ @@ -391,9 +388,3 @@ demo/jvmti/compiledMethodLoad/CompiledMethodLoadTest.java 8151899 generic- com/sun/jndi/ldap/DeadSSLLdapTimeoutTest.java 8141370 linux-i586,macosx-all ############################################################################ - -# core_tools - -tools/jlink/JLinkOptimTest.java 8159264 generic-all - -############################################################################ diff --git a/jdk/test/TEST.groups b/jdk/test/TEST.groups index 86fb263da4f..be1540695df 100644 --- a/jdk/test/TEST.groups +++ b/jdk/test/TEST.groups @@ -27,7 +27,6 @@ tier1 = \ :jdk_lang \ - -java/lang/ProcessBuilder/Zombies.java \ :jdk_util \ -java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java \ -java/util/concurrent/forkjoin/FJExceptionTableLeak.java \ @@ -38,7 +37,6 @@ tier1 = \ tools/pack200 tier2 = \ - java/lang/ProcessBuilder/Zombies.java \ java/util/concurrent/ThreadPoolExecutor/ConfigChanges.java \ java/util/concurrent/forkjoin/FJExceptionTableLeak.java \ :jdk_io \ diff --git a/jdk/test/com/sun/java/accessibility/util/8051626/Bug8051626.java b/jdk/test/com/sun/java/accessibility/util/8051626/Bug8051626.java index 4dccef55edb..4751d55ad6f 100644 --- a/jdk/test/com/sun/java/accessibility/util/8051626/Bug8051626.java +++ b/jdk/test/com/sun/java/accessibility/util/8051626/Bug8051626.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8051626 * @summary Ensure no failure when using Java Accessibility Utility with security manager * @modules java.desktop jdk.accessibility diff --git a/jdk/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java b/jdk/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java index 23c46ff533d..94595a1bde3 100644 --- a/jdk/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java +++ b/jdk/test/com/sun/java/swing/plaf/windows/8016551/bug8016551.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8016551 * @summary JMenuItem in WindowsLookAndFeel can't paint default icons * @author Leonid Romanov diff --git a/jdk/test/java/awt/Checkbox/SetStateExcessEvent/SetStateExcessEvent.java b/jdk/test/java/awt/Checkbox/SetStateExcessEvent/SetStateExcessEvent.java index f7235beeb35..3a8d65b183b 100644 --- a/jdk/test/java/awt/Checkbox/SetStateExcessEvent/SetStateExcessEvent.java +++ b/jdk/test/java/awt/Checkbox/SetStateExcessEvent/SetStateExcessEvent.java @@ -29,6 +29,7 @@ import java.awt.Robot; /** * @test + * @key headful * @bug 8074500 * @summary Checkbox.setState() call should not post ItemEvent * @author Sergey Bylokhov diff --git a/jdk/test/java/awt/Choice/ChoiceHiDpi/ChoiceTest.java b/jdk/test/java/awt/Choice/ChoiceHiDpi/ChoiceTest.java new file mode 100644 index 00000000000..fd23b478ca0 --- /dev/null +++ b/jdk/test/java/awt/Choice/ChoiceHiDpi/ChoiceTest.java @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2016, 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 8144594 + * @summary HiDPI: awt.Choice looks improperly (Win 8) + * @run main ChoiceTest + */ +import java.awt.Frame; +import java.awt.Choice; +import java.awt.Font; +import java.util.stream.Stream; + +public class ChoiceTest { + + private static void UI() { + Frame frame = new Frame("Test frame"); + Choice choice = new Choice(); + + Stream.of(new String[]{"item 1", "item 2", "item 3"}).forEach(choice::add); + frame.add(choice); + frame.setBounds(100, 100, 400, 200); + + frame.setVisible(true); + Font font = choice.getFont(); + int size = font.getSize(); + int height = choice.getBounds().height; + try { + if (height < size) { + throw new RuntimeException("Test failed"); + } + } finally { + frame.dispose(); + } + } + + public static void main(String[] args) throws Exception { + ChoiceTest.UI(); + } +} + diff --git a/jdk/test/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java b/jdk/test/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java index c3bc8905385..78c83185cbe 100644 --- a/jdk/test/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java +++ b/jdk/test/java/awt/Choice/ChoiceLocationTest/ChoiceLocationTest.java @@ -22,13 +22,14 @@ */ /* - @test - @bug 7159566 - @summary The choice positioned in the top of applet when clicking the choice. - @author Petr Pchelko - @library ../../regtesthelpers - @build Util - @run main ChoiceLocationTest + * @test + * @key headful + * @bug 7159566 + * @summary The choice positioned in the top of applet when clicking the choice. + * @author Petr Pchelko + * @library ../../regtesthelpers + * @build Util + * @run main ChoiceLocationTest */ import java.awt.*; diff --git a/jdk/test/java/awt/Choice/DragMouseOutAndRelease/DragMouseOutAndRelease.java b/jdk/test/java/awt/Choice/DragMouseOutAndRelease/DragMouseOutAndRelease.java index 272b30ddc6d..1909392bc14 100644 --- a/jdk/test/java/awt/Choice/DragMouseOutAndRelease/DragMouseOutAndRelease.java +++ b/jdk/test/java/awt/Choice/DragMouseOutAndRelease/DragMouseOutAndRelease.java @@ -22,6 +22,7 @@ */ /* @test + @key headful @bug 6322625 @summary REG:Choice does not trigger MouseReleased when dragging and releasing the mouse outside choice, XAWT @author andrei.dmitriev area=awt.choice diff --git a/jdk/test/java/awt/Choice/GetSizeTest/GetSizeTest.java b/jdk/test/java/awt/Choice/GetSizeTest/GetSizeTest.java index 583763331d1..54bb22ccd9e 100644 --- a/jdk/test/java/awt/Choice/GetSizeTest/GetSizeTest.java +++ b/jdk/test/java/awt/Choice/GetSizeTest/GetSizeTest.java @@ -22,6 +22,7 @@ */ /* @test + @key headful @bug 4255631 @summary Solaris: Size returned by Choice.getSize() does not match actual size @author Andrei Dmitriev : area=Choice diff --git a/jdk/test/java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java b/jdk/test/java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java index 26e05aa69cb..5e6ca75caba 100644 --- a/jdk/test/java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java +++ b/jdk/test/java/awt/Choice/ResizeAutoClosesChoice/ResizeAutoClosesChoice.java @@ -22,6 +22,7 @@ */ /* @test + @key headful @bug 6399679 @summary Choice is not invalidated when the frame gets resized programmatically when the drop-down is visible @author andrei.dmitriev area=awt.choice diff --git a/jdk/test/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java b/jdk/test/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java index 322e3584260..be087417512 100644 --- a/jdk/test/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java +++ b/jdk/test/java/awt/Choice/UnfocusableCB_ERR/UnfocusableCB_ERR.java @@ -22,6 +22,7 @@ */ /* @test + @key headful @bug 6390103 @summary Non-Focusable choice throws exception when selecting an item, Win32 @author andrei.dmitriev area=awt.choice diff --git a/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java b/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java index bdde570b252..17587f9526c 100644 --- a/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java +++ b/jdk/test/java/awt/Choice/UnfocusableToplevel/UnfocusableToplevel.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6566434 8039467 @library ../../regtesthelpers @build Util Sysout AbstractTest diff --git a/jdk/test/java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java b/jdk/test/java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java index c84486c7fa6..3e4ecd62284 100644 --- a/jdk/test/java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java +++ b/jdk/test/java/awt/Component/DimensionEncapsulation/DimensionEncapsulation.java @@ -90,6 +90,7 @@ import static javax.swing.UIManager.getInstalledLookAndFeels; /** * @test + * @key headful * @bug 6459798 * @author Sergey Bylokhov */ diff --git a/jdk/test/java/awt/Component/GetScreenLocTest/GetScreenLocTest.java b/jdk/test/java/awt/Component/GetScreenLocTest/GetScreenLocTest.java index 36f44c76a77..6fb2d9fe0e0 100644 --- a/jdk/test/java/awt/Component/GetScreenLocTest/GetScreenLocTest.java +++ b/jdk/test/java/awt/Component/GetScreenLocTest/GetScreenLocTest.java @@ -38,6 +38,7 @@ import java.awt.event.MouseEvent; /** * @test + * @key headful * @bug 4356202 * @summary Tests that getLocationOnScreen returns valid value(WindowMaker * only). diff --git a/jdk/test/java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java b/jdk/test/java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java index 846051cff54..cc99318a928 100644 --- a/jdk/test/java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java +++ b/jdk/test/java/awt/Component/InsetsEncapsulation/InsetsEncapsulation.java @@ -74,6 +74,7 @@ import static javax.swing.UIManager.getInstalledLookAndFeels; /** * @test + * @key headful * @bug 6459800 * @author Sergey Bylokhov */ diff --git a/jdk/test/java/awt/Component/PaintAll/PaintAll.java b/jdk/test/java/awt/Component/PaintAll/PaintAll.java index 483f1a5bd5a..21b76a89c62 100644 --- a/jdk/test/java/awt/Component/PaintAll/PaintAll.java +++ b/jdk/test/java/awt/Component/PaintAll/PaintAll.java @@ -43,6 +43,7 @@ import java.awt.image.BufferedImage; /* @test + @key headful @bug 6596915 @summary Test Component.paintAll() method @author sergey.bylokhov@oracle.com: area=awt.component diff --git a/jdk/test/java/awt/Component/Revalidate/Revalidate.java b/jdk/test/java/awt/Component/Revalidate/Revalidate.java index 386e5394c6f..211a2a85a84 100644 --- a/jdk/test/java/awt/Component/Revalidate/Revalidate.java +++ b/jdk/test/java/awt/Component/Revalidate/Revalidate.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 7036669 @summary Test Component.revalidate() method @author anthony.petrov@oracle.com: area=awt.component diff --git a/jdk/test/java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java b/jdk/test/java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java index a597e853f59..f44b18a47e0 100644 --- a/jdk/test/java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java +++ b/jdk/test/java/awt/Component/SetEnabledPerformance/SetEnabledPerformance.java @@ -31,6 +31,7 @@ import javax.swing.SwingUtilities; /** * @test + * @key headful * @bug 8071306 * @author Sergey Bylokhov */ diff --git a/jdk/test/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java b/jdk/test/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java index fa888ecfec5..334191f938a 100644 --- a/jdk/test/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java +++ b/jdk/test/java/awt/Container/CheckZOrderChange/CheckZOrderChange.java @@ -22,12 +22,14 @@ */ /* - @test %I% %E% - @bug 2161766 - @summary Component is missing after changing the z-order of the component & focus is not transfered in - @author Andrei Dmitriev : area=awt.container - @run main CheckZOrderChange -*/ + * @test %I% %E% + * @key headful + * @bug 2161766 + * @summary Component is missing after changing the z-order of the component & focus is not transfered in + * @author Andrei Dmitriev : area=awt.container + * @run main CheckZOrderChange + */ + import java.awt.*; import java.awt.event.*; diff --git a/jdk/test/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java b/jdk/test/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java index 6c03c99d0f6..dd438330508 100644 --- a/jdk/test/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java +++ b/jdk/test/java/awt/Container/ValidateRoot/InvalidateMustRespectValidateRoots.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6852592 @summary invalidate() must stop when it encounters a validate root @author anthony.petrov@sun.com diff --git a/jdk/test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java b/jdk/test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java new file mode 100644 index 00000000000..5769f88938f --- /dev/null +++ b/jdk/test/java/awt/Desktop/DesktopGtkLoadTest/DesktopGtkLoadTest.java @@ -0,0 +1,66 @@ +/* + * Copyright (c) 2016, 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 8157827 + * @summary AWT_Desktop/Automated/Exceptions/BasicTest loads incorrect GTK + * version when jdk.gtk.version=3 + * @requires (os.family == "linux") + * @run main DesktopGtkLoadTest + */ + + +import java.awt.*; +import java.io.*; + +public class DesktopGtkLoadTest { + public static class RunDesktop { + public static void main(String[] args) { + Desktop.getDesktop(); + } + } + + public static void main(String[] args) throws Exception { + Process p = Runtime.getRuntime().exec(System.getProperty("java.home") + + "/bin/java -Djdk.gtk.version=3 -Djdk.gtk.verbose=true " + + "-cp " + System.getProperty("java.class.path", ".") + + " DesktopGtkLoadTest$RunDesktop"); + p.waitFor(); + try (BufferedReader br = new BufferedReader( + new InputStreamReader(p.getErrorStream()))) { + String line; + while ((line = br.readLine()) != null) { + System.out.println(line); + if (line.contains("Looking for GTK2 library")) { + break; + } + if (line.contains("Looking for GTK3 library")) { + return; + } + } + throw new RuntimeException("Wrong GTK library version: \n" + line); + } + + } + +} diff --git a/jdk/test/java/awt/Dialog/ChildProperties/ChildDialogProperties.java b/jdk/test/java/awt/Dialog/ChildProperties/ChildDialogProperties.java index 1a963aa9898..a17c032f4f3 100644 --- a/jdk/test/java/awt/Dialog/ChildProperties/ChildDialogProperties.java +++ b/jdk/test/java/awt/Dialog/ChildProperties/ChildDialogProperties.java @@ -21,12 +21,14 @@ * questions. */ - /* - @test - @bug 8057574 - @summary Verify that child Dialog does not inherit parent's Properties - @run main ChildDialogProperties +/* + * @test + * @key headful + * @bug 8057574 + * @summary Verify that child Dialog does not inherit parent's Properties + * @run main ChildDialogProperties */ + import java.awt.Color; import java.awt.Dialog; import java.awt.Font; diff --git a/jdk/test/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java b/jdk/test/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java index 3e3e83f1069..20a9dd51d17 100644 --- a/jdk/test/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java +++ b/jdk/test/java/awt/Dialog/MakeWindowAlwaysOnTop/MakeWindowAlwaysOnTop.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6829546 @summary tests that an always-on-top modal dialog doesn't make any windows always-on-top @author artem.ananiev: area=awt.modal diff --git a/jdk/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java b/jdk/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java index 9f72f2a14bf..e35877ceb88 100644 --- a/jdk/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java +++ b/jdk/test/java/awt/Dialog/ValidateOnShow/ValidateOnShow.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 7027013 @summary Dialog.show() should validate the window unconditionally @author anthony.petrov@oracle.com: area=awt.toplevel diff --git a/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java b/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java index 603f786506d..86207ff54a9 100644 --- a/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java +++ b/jdk/test/java/awt/EventDispatchThread/LoopRobustness/LoopRobustness.java @@ -24,7 +24,8 @@ /** * * @bug 4023283 - * @summary Checks that an Error which propogate up to the EventDispatch + * @key headful + * @summary Checks that an Error which propogates up to the EventDispatch * loop does not crash AWT. * @author Andrei Dmitriev: area=awt.event * @library ../../regtesthelpers diff --git a/jdk/test/java/awt/Focus/6981400/Test1.java b/jdk/test/java/awt/Focus/6981400/Test1.java index a78c9479e7c..730e10804fa 100644 --- a/jdk/test/java/awt/Focus/6981400/Test1.java +++ b/jdk/test/java/awt/Focus/6981400/Test1.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6981400 * @summary Tabbing between textfiled do not work properly when ALT+TAB * @author anton.tarasov diff --git a/jdk/test/java/awt/Focus/6981400/Test2.java b/jdk/test/java/awt/Focus/6981400/Test2.java index 6afcf6f8999..acb61577599 100644 --- a/jdk/test/java/awt/Focus/6981400/Test2.java +++ b/jdk/test/java/awt/Focus/6981400/Test2.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6981400 * @summary Tabbing between textfiled do not work properly when ALT+TAB * @author anton.tarasov diff --git a/jdk/test/java/awt/Focus/6981400/Test3.java b/jdk/test/java/awt/Focus/6981400/Test3.java index 2c6d5143e9f..b423cc7571c 100644 --- a/jdk/test/java/awt/Focus/6981400/Test3.java +++ b/jdk/test/java/awt/Focus/6981400/Test3.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6981400 * @summary Tabbing between textfiled do not work properly when ALT+TAB * @author anton.tarasov diff --git a/jdk/test/java/awt/Focus/8013611/JDK8013611.java b/jdk/test/java/awt/Focus/8013611/JDK8013611.java index 346f235071e..c8254de2154 100644 --- a/jdk/test/java/awt/Focus/8013611/JDK8013611.java +++ b/jdk/test/java/awt/Focus/8013611/JDK8013611.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 8013611 @summary Tests showing a modal dialog with requesting focus in frame. @author Anton.Tarasov: area=awt.focus diff --git a/jdk/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java b/jdk/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java index 7acf7f5dfc7..dcfc38da19e 100644 --- a/jdk/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java +++ b/jdk/test/java/awt/Focus/8073453/AWTFocusTransitionTest.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8073453 * @summary Focus doesn't move when pressing Shift + Tab keys * @author Dmitry Markov diff --git a/jdk/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java b/jdk/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java index c9947cca3c5..727514ec5cf 100644 --- a/jdk/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java +++ b/jdk/test/java/awt/Focus/8073453/SwingFocusTransitionTest.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8073453 * @summary Focus doesn't move when pressing Shift + Tab keys * @author Dmitry Markov diff --git a/jdk/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java b/jdk/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java index b760fc7283f..d693a58dd7d 100644 --- a/jdk/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java +++ b/jdk/test/java/awt/Focus/ActualFocusedWindowTest/ActualFocusedWindowRetaining.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 4823903 @summary Tests actual focused window retaining. @author Anton.Tarasov: area=awt.focus diff --git a/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java b/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java index f4c1c49581c..1ac186182f3 100644 --- a/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java +++ b/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusSetVisibleTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6187066 @summary Tests the Window.autoRequestFocus property for the Window.setVisible() method. @author anton.tarasov: area=awt.focus diff --git a/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java b/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java index f26c0b25dd7..dba872a8b1e 100644 --- a/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java +++ b/jdk/test/java/awt/Focus/AutoRequestFocusTest/AutoRequestFocusToFrontTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6187066 @summary Tests the Window.autoRequestFocus property for the Window.toFront() method. @author anton.tarasov: area=awt.focus diff --git a/jdk/test/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java b/jdk/test/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java index 623f75e4b81..5ff7124f4da 100644 --- a/jdk/test/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java +++ b/jdk/test/java/awt/Focus/ClearGlobalFocusOwnerTest/ClearGlobalFocusOwnerTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 4390555 @summary Synopsis: clearGlobalFocusOwner() is not trigerring permanent FOCUS_LOST event @author son@sparc.spb.su, anton.tarasov: area=awt.focus diff --git a/jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java b/jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java index cfeba585fd4..2813a3f479a 100644 --- a/jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java +++ b/jdk/test/java/awt/Focus/KeyEventForBadFocusOwnerTest/KeyEventForBadFocusOwnerTest.java @@ -22,6 +22,7 @@ */ /* @test + @key headful @bug 4476629 @library ../../../../javax/swing/regtesthelpers @build Util diff --git a/jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java b/jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java index c5abf9c0712..651030f9504 100644 --- a/jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java +++ b/jdk/test/java/awt/Focus/MouseClickRequestFocusRaceTest/MouseClickRequestFocusRaceTest.java @@ -42,6 +42,7 @@ import jdk.testlibrary.OSInfo; /** * @test + * @key headful * @bug 5028014 * @summary Focus request & mouse click being performed nearly synchronously * shouldn't break the focus subsystem diff --git a/jdk/test/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java b/jdk/test/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java index 1419d9765e6..97ad2613c8e 100644 --- a/jdk/test/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java +++ b/jdk/test/java/awt/Focus/RemoveAfterRequest/RemoveAfterRequest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6411406 @summary Components automatically transfer focus on removal, even if developer requests focus elsewhere first @author oleg.sukhodolsky, anton.tarasov: area=awt.focus diff --git a/jdk/test/java/awt/Focus/RollbackFocusFromAnotherWindowTest/RollbackFocusFromAnotherWindowTest.java b/jdk/test/java/awt/Focus/RollbackFocusFromAnotherWindowTest/RollbackFocusFromAnotherWindowTest.java index 8d94f0d11cb..3a718e05306 100644 --- a/jdk/test/java/awt/Focus/RollbackFocusFromAnotherWindowTest/RollbackFocusFromAnotherWindowTest.java +++ b/jdk/test/java/awt/Focus/RollbackFocusFromAnotherWindowTest/RollbackFocusFromAnotherWindowTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 8139218 @summary Dialog that opens and closes quickly changes focus in original focusowner diff --git a/jdk/test/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java b/jdk/test/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java index fde5797aa0e..a63d8194714 100644 --- a/jdk/test/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java +++ b/jdk/test/java/awt/Focus/SimpleWindowActivationTest/SimpleWindowActivationTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6385277 * @summary Tests that override redirect window gets activated on click. * @author anton.tarasov@sun.com: area=awt.focus diff --git a/jdk/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java b/jdk/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java index bf2252832f8..33ab24e414c 100644 --- a/jdk/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java +++ b/jdk/test/java/awt/Focus/TranserFocusToWindow/TranserFocusToWindow.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6562853 7035459 @summary Tests that focus transfered directy to window w/o transfering it to frame. @author Oleg Sukhodolsky: area=awt.focus diff --git a/jdk/test/java/awt/Focus/TypeAhead/TestFocusFreeze.java b/jdk/test/java/awt/Focus/TypeAhead/TestFocusFreeze.java index 5127d009659..64d48d3d56a 100644 --- a/jdk/test/java/awt/Focus/TypeAhead/TestFocusFreeze.java +++ b/jdk/test/java/awt/Focus/TypeAhead/TestFocusFreeze.java @@ -22,14 +22,15 @@ */ /* - @test - @bug 6183877 6216005 6225560 - @library ../../regtesthelpers - @build Util - @summary Tests that keyboard input doesn't freeze due to type-ahead problems - @author Denis.Mikhalkin, Anton.Tarasov: area=awt.focus - @run main TestFocusFreeze -*/ + * @test + * @key headful + * @bug 6183877 6216005 6225560 + * @library ../../regtesthelpers + * @build Util + * @summary Tests that keyboard input doesn't freeze due to type-ahead problems + * @author Denis.Mikhalkin, Anton.Tarasov: area=awt.focus + * @run main TestFocusFreeze + */ import java.awt.Component; import java.awt.DefaultKeyboardFocusManager; diff --git a/jdk/test/java/awt/Frame/8158918/SetExtendedState.java b/jdk/test/java/awt/Frame/8158918/SetExtendedState.java new file mode 100644 index 00000000000..04aa64c5be6 --- /dev/null +++ b/jdk/test/java/awt/Frame/8158918/SetExtendedState.java @@ -0,0 +1,48 @@ +/* + * Copyright (c) 2016, 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 8158918 + * @summary setExtendedState(1) for maximized Frame results in state==7 + * @run main SetExtendedState + */ +import java.awt.Frame; + +public class SetExtendedState { + + public static void main(String[] args) { + Frame frame = new Frame("frame"); + frame.setBounds(100, 100, 200, 200); + frame.setVisible(true); + frame.setExtendedState(Frame.MAXIMIZED_BOTH); + frame.setExtendedState(Frame.ICONIFIED); + if (frame.getExtendedState() != Frame.ICONIFIED) { + frame.dispose(); + throw new RuntimeException("Test Failed"); + } + frame.dispose(); + } +} + + diff --git a/jdk/test/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java b/jdk/test/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java index 8dca632bb57..27d22c65565 100644 --- a/jdk/test/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java +++ b/jdk/test/java/awt/Frame/DecoratedExceptions/DecoratedExceptions.java @@ -25,6 +25,7 @@ import java.awt.*; /* * @test + * @key headful * @summary An attempt to set non-trivial background, shape, or translucency * to a decorated toplevel should end with an exception. * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com) diff --git a/jdk/test/java/awt/Frame/DisposeParentGC/DisposeParentGC.java b/jdk/test/java/awt/Frame/DisposeParentGC/DisposeParentGC.java index 53aa13dee75..4bdf97a9f1c 100644 --- a/jdk/test/java/awt/Frame/DisposeParentGC/DisposeParentGC.java +++ b/jdk/test/java/awt/Frame/DisposeParentGC/DisposeParentGC.java @@ -30,6 +30,7 @@ import java.util.Vector; /* * @test + * @key headful * @summary Display a dialog with a parent, the dialog contains all awt components * added to it & each components are setted with different cursors types. * Dispose the parent & collect GC. Garbage collection should happen diff --git a/jdk/test/java/awt/Frame/FramesGC/FramesGC.java b/jdk/test/java/awt/Frame/FramesGC/FramesGC.java index 56207179bb1..9d8e3d95bf0 100644 --- a/jdk/test/java/awt/Frame/FramesGC/FramesGC.java +++ b/jdk/test/java/awt/Frame/FramesGC/FramesGC.java @@ -30,6 +30,7 @@ import java.util.Vector; /* * @test + * @key headful * @summary Verify that disposed frames are collected with GC * @author Dmitriy Ermashov (dmitriy.ermashov@oracle.com) * @library ../../../../lib/testlibrary diff --git a/jdk/test/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java b/jdk/test/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java index 39e3c354514..39ee540e844 100644 --- a/jdk/test/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java +++ b/jdk/test/java/awt/Frame/MiscUndecorated/ActiveAWTWindowTest.java @@ -22,14 +22,15 @@ */ /* -* @test -* @summary To check proper WINDOW_EVENTS are triggered when Frame gains or losses the focus -* @author Jitender(jitender.singh@eng.sun.com) area=AWT -* @author yan -* @library ../../../../lib/testlibrary -* @build ExtendedRobot -* @run main ActiveAWTWindowTest -*/ + * @test + * @key headful + * @summary To check proper WINDOW_EVENTS are triggered when Frame gains or losses the focus + * @author Jitender(jitender.singh@eng.sun.com) area=AWT + * @author yan + * @library ../../../../lib/testlibrary + * @build ExtendedRobot + * @run main ActiveAWTWindowTest + */ import java.awt.*; import java.awt.event.*; diff --git a/jdk/test/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java b/jdk/test/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java index 24b3ab600ed..6513a9830a0 100644 --- a/jdk/test/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java +++ b/jdk/test/java/awt/Frame/MiscUndecorated/ActiveSwingWindowTest.java @@ -22,14 +22,15 @@ */ /* -* @test -* @summary To check proper WINDOW_EVENTS are triggered when JFrame gains or losses the focus -* @author Jitender(jitender.singh@eng.sun.com) area=AWT -* @author yan -* @library ../../../../lib/testlibrary -* @build ExtendedRobot -* @run main ActiveSwingWindowTest -*/ + * @test + * @key headful + * @summary To check proper WINDOW_EVENTS are triggered when JFrame gains or losses the focus + * @author Jitender(jitender.singh@eng.sun.com) area=AWT + * @author yan + * @library ../../../../lib/testlibrary + * @build ExtendedRobot + * @run main ActiveSwingWindowTest + */ import java.awt.*; import java.awt.event.*; diff --git a/jdk/test/java/awt/Frame/MiscUndecorated/FrameCloseTest.java b/jdk/test/java/awt/Frame/MiscUndecorated/FrameCloseTest.java index 105285bf329..8a43f651ebc 100644 --- a/jdk/test/java/awt/Frame/MiscUndecorated/FrameCloseTest.java +++ b/jdk/test/java/awt/Frame/MiscUndecorated/FrameCloseTest.java @@ -22,14 +22,15 @@ */ /* -* @test -* @summary To make sure Undecorated Frame triggers correct windows events while closing -* @author Jitender(jitender.singh@eng.sun.com) area=AWT* -* @author yan -* @library ../../../../lib/testlibrary -* @build ExtendedRobot -* @run main FrameCloseTest -*/ + * @test + * @key headful + * @summary To make sure Undecorated Frame triggers correct windows events while closing + * @author Jitender(jitender.singh@eng.sun.com) area=AWT* + * @author yan + * @library ../../../../lib/testlibrary + * @build ExtendedRobot + * @run main FrameCloseTest + */ import java.awt.*; import java.awt.event.*; diff --git a/jdk/test/java/awt/Frame/MiscUndecorated/RepaintTest.java b/jdk/test/java/awt/Frame/MiscUndecorated/RepaintTest.java index 3e982fa6e50..50e09028c3c 100644 --- a/jdk/test/java/awt/Frame/MiscUndecorated/RepaintTest.java +++ b/jdk/test/java/awt/Frame/MiscUndecorated/RepaintTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -20,16 +20,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ + /* -* @test -* @summary Make sure that on changing state of Undecorated Frame, -* all the components on it are repainted correctly -* @author Jitender(jitender.singh@eng.sun.com) area=AWT -* @author yan -* @library ../../../../lib/testlibrary -* @build ExtendedRobot -* @run main RepaintTest -*/ + * @test + * @key headful + * @summary Make sure that on changing state of Undecorated Frame, + * all the components on it are repainted correctly + * @author Jitender(jitender.singh@eng.sun.com) area=AWT + * @author yan + * @library ../../../../lib/testlibrary + * @build ExtendedRobot + * @run main RepaintTest + */ import java.awt.*; import java.awt.event.*; diff --git a/jdk/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java b/jdk/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java index af9c3616043..efc80d4bded 100644 --- a/jdk/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java +++ b/jdk/test/java/awt/Frame/ShapeNotSetSometimes/ShapeNotSetSometimes.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6988428 @summary Tests whether shape is always set @author anthony.petrov@oracle.com: area=awt.toplevel diff --git a/jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java b/jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java index 35ab7dc906f..b5b9577504a 100644 --- a/jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java +++ b/jdk/test/java/awt/FullScreen/TranslucentWindow/TranslucentWindow.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6837004 * @summary Checks that non-opaque window can be made a fullscreen window * @author Artem Ananiev diff --git a/jdk/test/java/awt/Graphics2D/WhiteTextColorTest.java b/jdk/test/java/awt/Graphics2D/WhiteTextColorTest.java index 8c2ddf41a89..9801d9aa6a8 100644 --- a/jdk/test/java/awt/Graphics2D/WhiteTextColorTest.java +++ b/jdk/test/java/awt/Graphics2D/WhiteTextColorTest.java @@ -27,11 +27,13 @@ import javax.swing.*; /** * @test + * @key headful * @bug 8056009 * @summary tests whether Graphics.setColor-calls with Color.white are ignored directly * after pipeline initialization for a certain set of operations. * @author ceisserer */ + public class WhiteTextColorTest extends Frame { public static volatile boolean success = false; diff --git a/jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java b/jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java index 86f7a7a8b3a..f2869ea14f2 100644 --- a/jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java +++ b/jdk/test/java/awt/GridLayout/ChangeGridSize/ChangeGridSize.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2016, 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 @@ -26,6 +26,7 @@ import java.awt.event.*; /* * @test + * @key headful * @summary Have different components having different preferred sizes * added to a grid layout. Change the rows and columns of the * grid layout and check the components are re-laid out. @@ -33,14 +34,13 @@ import java.awt.event.*; * depending on the preferred sizes and gaps and click the cornors * of the components to check if events are triggered * @library ../../../../lib/testlibrary/ - * @build ExtendedRobot * @run main ChangeGridSize * @run main ChangeGridSize -hg 20 -vg 20 */ public class ChangeGridSize { - private int width = 200; + private int width = 300; private int height = 200; private final int hGap, vGap; private final int rows = 3; @@ -50,7 +50,7 @@ public class ChangeGridSize { private Button[] buttons; private Frame frame; - private ExtendedRobot robot; + private Robot robot; private GridLayout layout; private volatile boolean actionPerformed = false; @@ -58,7 +58,7 @@ public class ChangeGridSize { public ChangeGridSize(int hGap, int vGap) throws Exception { this.hGap = hGap; this.vGap = vGap; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait( () -> { frame = new Frame("Test frame"); frame.setSize(width, height); @@ -122,10 +122,12 @@ public class ChangeGridSize { robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); robot.delay(500); robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); - robot.waitForIdle(3000); + robot.delay(3000); - if(!actionPerformed) + if (!actionPerformed) { + frame.dispose(); throw new RuntimeException("Clicking on the left top of button did not trigger action event"); + } actionPerformed = false; robot.mouseMove(bottomRightX, bottomRightY); @@ -133,10 +135,12 @@ public class ChangeGridSize { robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); robot.delay(500); robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); - robot.waitForIdle(3000); + robot.delay(3000); - if(!actionPerformed) + if (!actionPerformed) { + frame.dispose(); throw new RuntimeException("Clicking on the bottom right of button did not trigger action event"); + } } private void doTest() throws Exception { @@ -154,6 +158,7 @@ public class ChangeGridSize { for (int i = 0; i < buttons.length; i++) { if (buttons[i].getSize().width != componentWidth || buttons[i].getSize().height != componentHeight) { + frame.dispose(); throw new RuntimeException( "FAIL: Button " + i + " not of proper size" + "Expected: " + componentWidth + "*" + componentHeight + diff --git a/jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java b/jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java index d8ceac748c8..3e60c26497e 100644 --- a/jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java +++ b/jdk/test/java/awt/GridLayout/ComponentPreferredSize/ComponentPreferredSize.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2006, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2006, 2016, 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 @@ -26,6 +26,7 @@ import java.awt.event.InputEvent; /* * @test + * @key headful * @summary Have different components having different preferred sizes * added to a grid layout having various values of row/columns. * Check if the compnents are correctly laid out. @@ -33,14 +34,13 @@ import java.awt.event.InputEvent; * depending on the preferred sizes and gaps and click the cornors * of the components to check if events are triggered * @library ../../../../lib/testlibrary/ - * @build ExtendedRobot * @run main ComponentPreferredSize * @run main ComponentPreferredSize -hg 20 -vg 20 */ public class ComponentPreferredSize { - private int width = 200; + private int width = 300; private int height = 200; private final int hGap, vGap; private final int rows = 3; @@ -50,7 +50,7 @@ public class ComponentPreferredSize { private Button[] buttons; private Frame frame; - private ExtendedRobot robot; + private Robot robot; private GridLayout layout; private volatile boolean actionPerformed = false; @@ -58,7 +58,7 @@ public class ComponentPreferredSize { public ComponentPreferredSize(int hGap, int vGap) throws Exception { this.hGap = hGap; this.vGap = vGap; - robot = new ExtendedRobot(); + robot = new Robot(); EventQueue.invokeAndWait( () -> { frame = new Frame("Test frame"); frame.setSize(width, height); @@ -115,10 +115,12 @@ public class ComponentPreferredSize { robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); robot.delay(500); robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); - robot.waitForIdle(3000); + robot.delay(3000); - if(!actionPerformed) + if (!actionPerformed) { + frame.dispose(); throw new RuntimeException("Clicking on the left top of button did not trigger action event"); + } actionPerformed = false; robot.mouseMove(bottomRightX, bottomRightY); @@ -126,10 +128,12 @@ public class ComponentPreferredSize { robot.mousePress(InputEvent.BUTTON1_DOWN_MASK); robot.delay(500); robot.mouseRelease(InputEvent.BUTTON1_DOWN_MASK); - robot.waitForIdle(3000); + robot.delay(3000); - if(!actionPerformed) + if (!actionPerformed) { + frame.dispose(); throw new RuntimeException("Clicking on the bottom right of button did not trigger action event"); + } } private void doTest() throws Exception { @@ -146,6 +150,7 @@ public class ComponentPreferredSize { for (int i = 0; i < buttons.length; i++) { if (buttons[i].getSize().width != componentWidth || buttons[i].getSize().height != componentHeight) { + frame.dispose(); throw new RuntimeException( "FAIL: Button " + i + " not of proper size" + "Expected: " + componentWidth + "*" + componentHeight + diff --git a/jdk/test/java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java b/jdk/test/java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java index 4c729282101..7f1ddeb77db 100644 --- a/jdk/test/java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java +++ b/jdk/test/java/awt/LightweightComponent/LightweightEventTest/LightweightEventTest.java @@ -23,6 +23,7 @@ /** * @test + * @key headful * @summary Test of mouse move messages to lightweight components * @library ../../regtesthelpers * @build Util diff --git a/jdk/test/java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java b/jdk/test/java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java index 706ae38c4e9..22a68122995 100644 --- a/jdk/test/java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java +++ b/jdk/test/java/awt/LightweightDispatcher/LWDispatcherMemoryLeakTest.java @@ -38,6 +38,7 @@ import test.java.awt.regtesthelpers.Util; /* @test + @key headful @bug 7079254 @summary Toolkit eventListener leaks memory @library ../regtesthelpers diff --git a/jdk/test/java/awt/List/EmptyListEventTest/EmptyListEventTest.java b/jdk/test/java/awt/List/EmptyListEventTest/EmptyListEventTest.java index 81f5378fb27..baa7df93186 100644 --- a/jdk/test/java/awt/List/EmptyListEventTest/EmptyListEventTest.java +++ b/jdk/test/java/awt/List/EmptyListEventTest/EmptyListEventTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6366126 * @summary List throws ArrayIndexOutOfBoundsException when pressing ENTER after removing all the items, Win32 * @author Dmitry Cherepanov area=awt.list diff --git a/jdk/test/java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java b/jdk/test/java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java index 02448b24f60..298e6629675 100644 --- a/jdk/test/java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java +++ b/jdk/test/java/awt/List/NofocusListDblClickTest/NofocusListDblClickTest.java @@ -22,6 +22,7 @@ */ /* @test + @key headful @bug 6240202 @summary Tests that non-focusable List in a Window generates ActionEvent. @author anton.tarasov@sun.com: area=awt-list diff --git a/jdk/test/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java b/jdk/test/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java index 9199c7a03b2..1ae8eb41d8e 100644 --- a/jdk/test/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java +++ b/jdk/test/java/awt/MenuBar/MenuBarSetFont/MenuBarSetFont.java @@ -37,6 +37,7 @@ import jdk.testlibrary.OSInfo; /** * @test + * @key headful * @bug 6263470 * @summary Tries to change font of MenuBar. Test passes if the font has changed * fails otherwise. diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java index d2a21a9a93d..e37d7491e33 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks an application modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java index e9d2b1591ee..c1ff3fb6ecb 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks an application modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java index adc9709d928..c20a96f37cb 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks an application modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java index 9dc6149beb4..eec804bab01 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks an application modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java index 3bb80e399da..c7de419ad8f 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks an application modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java index 16f03f7d7d9..75e0da8dfeb 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogAppModal6Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks an application modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java index 4ff0bcef4dc..3816a0c54d1 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks a document modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java index a8179c133aa..164a68e4a99 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks a document modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java index 5b95dbc00dc..c63c735f686 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks a document modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java index 0c5de04e49e..6fe1b77ad46 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks a document modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java index e27c97c5db1..c42766cc5e9 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks a document modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java index 9aa2f2ac311..6ce9d722aa3 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal6Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks a document modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java index d3c0a687213..471de5b0c62 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogDocModal7Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 7186009 * @summary Check whether a FileDialog set to document modality behaves as expected. * diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal1Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal1Test.java index f9cae23b85e..dc0004f37d5 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal1Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal1Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks a modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal2Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal2Test.java index 037f5969081..ef43a93cf0b 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal2Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal2Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks a modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal3Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal3Test.java index b2423e35827..ba80f71c9e7 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal3Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal3Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks a modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal4Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal4Test.java index 0899eb39d4d..be47237783d 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal4Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal4Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks a modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal5Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal5Test.java index d2940397a69..54e78b8a9f2 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal5Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal5Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks a modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal6Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal6Test.java index 8cbee49e871..758aed461f7 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogModal6Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogModal6Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks a modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java index b941c09865d..5ef0f211d7d 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal1Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054359 7186009 * * @summary Check whether FileDialog blocks a non-modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java index a35d39f5252..11ffa9632b0 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal2Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054359 * * @summary Check whether FileDialog blocks a non-modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java index 83b7a468a21..0987b6e981a 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal3Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054359 * * @summary Check whether FileDialog blocks a non-modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java index b7d1641132f..0a89f8aef2d 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal4Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054359 * * @summary Check whether FileDialog blocks a non-modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java index d2ff38ade9a..c7031411365 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal5Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054359 * * @summary Check whether FileDialog blocks a non-modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java index 49b5ce07dac..c75a061a3f5 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal6Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054359 * * @summary Check whether FileDialog blocks a non-modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java index 3712112dd3c..6fc761aab85 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogNonModal7Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 * @summary Check whether a modeless FileDialog behaves as expected. * diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java index b9c6e05284c..5d23dab50eb 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 8055752 * * @summary Check whether FileDialog blocks a toolkit modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java index 36db1d01775..ecfe45df57a 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 8055752 * * @summary Check whether FileDialog blocks a toolkit modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java index 99a177aa386..87bf1fe38b0 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 8055752 * * @summary Check whether FileDialog blocks a toolkit modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java index abc6cb60232..0ee9b04f4b9 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 8055752 * * @summary Check whether FileDialog blocks a toolkit modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java index 8e84650dd29..f3dc2df7365 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 8055752 * * @summary Check whether FileDialog blocks a toolkit modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java index 4e0d1d1b481..bf47ece5e58 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal6Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 8055752 * * @summary Check whether FileDialog blocks a toolkit modal Dialog diff --git a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java index f4a2ac34692..77e9ade10b6 100644 --- a/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java +++ b/jdk/test/java/awt/Modal/FileDialog/FileDialogTKModal7Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054359 7186009 * @summary Check whether a FileDialog set to toolkit modality behaves as expected. * diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java index b04cd70db7e..a918cdc20af 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDAppModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether an application modal Dialog created with a Dialog * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java index e73867ed495..78cea798a5a 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDDocModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a document modal Dialog created with a Dialog * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java index f38c3d68898..353957d8dfb 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDModelessTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modeless Dialog created with a Dialog * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java index f3f558e7170..92f224f8302 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDNonModalTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a non-modal Dialog created with a Dialog * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java index 3b89dadb667..5dc0a5df21b 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDSetModalTest.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modal Dialog created with a Dialog * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java index e386dc1b123..a68fa4f665e 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDDToolkitModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a toolkit modal Dialog created with a Dialog * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java index 7ebc7657cec..9f3fa8140eb 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFAppModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether an application modal Dialog created with a Frame * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java index 790d5e03b7c..995287fc578 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFSetModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modal Dialog created with a Frame * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java index de09b5d05d2..673f230fddd 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFToolkitModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a toolkit modal Dialog created with a Frame * constructor receives focus, whether its components receives focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java index 5c9c3f3fc77..5d6d14b08f5 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modeless Dialog created with a Frame * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java index 430dff23d0e..cf69eb0b7dd 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWModeless2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modeless Dialog created with a Dialog * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java index 58242e425cf..d929b24ef12 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal1Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a non-modal Dialog created with a Frame * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java index acd9fb8b0ae..31ca236fafc 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDFWNonModal2Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a non-modal Dialog created with a Dialog * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java index 638c67a5507..3ae730f3584 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingDocModalTest.java @@ -28,6 +28,7 @@ import static jdk.testlibrary.Asserts.*; /* * @test + * @key headful * @bug 8049617 * @summary Test if a document modality works as expected: * whether all the windows lying down the document root diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java index e446498c0fc..ddfea7f6889 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDAppModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether an application modal Dialog created with a Frame * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java index 1f9168fbcf2..014cb0bcd29 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDDocModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a document modal Dialog created with a Frame * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java index d63d1f3d11c..aedff9f100c 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDModelessTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modeless Dialog created with a Frame * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java index f91bcfb23f9..27cafe9ab0d 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDNonModalTest.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a non-modal Dialog created with a Frame * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java index 21f1720861e..f4837b7fd5f 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDSetModalTest.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modal Dialog created with a Frame * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java index f907276fc44..f92b50178e8 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDToolkitModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a toolkit modal Dialog created with a Frame * constructor receives focus, whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java index 8f24edc2444..6c6834e6a2b 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a document modal Dialog created with a null Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java index 41b3f07119d..d0b315ae0ac 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a document modal Dialog created with a null Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java index 4cc992e5e1a..cbf56ee16a3 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a document modal Dialog created with a hidden Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java index a84af093f24..6003cb0fb55 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWDocModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a document modal Dialog created with a hidden Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java index 2872d59c4ed..5cb47bff2c7 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modeless Dialog created with a null Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java index d8a9417d78b..0f47b4ea47a 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modeless Dialog created with a null Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java index b85b23df383..81dd2981267 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modeless Dialog created with a hidden Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java index 37a04b434e0..47b70251cc5 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWModeless4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modeless Dialog created with a hidden Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java index 440d42882c7..e6a914f837c 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal1Test.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a non-modal Dialog created with a null Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java index ece48092250..6b7b2cb0980 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal2Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a non-modal Dialog created with a null Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java index 759967a2de8..eda2f4f800a 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal3Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a non-modal Dialog created with a hidden Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java index e24f818a238..a7770159e28 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingFDWNonModal4Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a non-modal Dialog created with a hidden Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java index 4a840f8ca63..3a5846426e0 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether an application modal Dialog created with a null Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java index 46a37f86a62..ee0fde88f49 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether an application modal Dialog created with a null Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java index c58fe745773..8d677129d58 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether an application modal Dialog created with a hidden Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java index 651ef125fbd..f9d7768c93d 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether an application modal Dialog created with a hidden Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java index 0fd12ae0f1d..f960e3d54cb 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether an application modal Dialog created with a Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java index 39ae804586e..718f8bfa183 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsAppModal6Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether an application modal Dialog created with a Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java index dbb13829c40..4af7dfbf072 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a document modal Dialog created with a Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java index da39e5db2af..db13a65f0a4 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsDocModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a document modal Dialog created with a Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java index c4b7e366e42..461d92e6d47 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal1Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modal Dialog created with a null Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java index 5eccd050d8b..0d2b5cb77fe 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal2Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modal Dialog created with a null Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java index 7bfdc05ee95..b3ca9e9c70a 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal3Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modal Dialog created with a hidden Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java index 1019335ec6d..49079049960 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal4Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modal Dialog created with a hidden Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java index 067cd4e0f4a..fb97a8c05b1 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal5Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modal Dialog created with a Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java index 57d43ca3043..6958db487ca 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsSetModal6Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modal Dialog created with a Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java index 0a9d6a18ba0..a2c837e58ee 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a toolkit modal Dialog created with a null Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java index 32080274b9d..db8e50ab7b2 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a toolkit modal Dialog created with a null Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java index 6b4aaf7e5c7..2bb2d21475b 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a toolkit modal Dialog created with a hidden Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java index f8ddae7c0d7..0b0249e8cc9 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a toolkit modal Dialog created with a hidden Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java index cb55619792e..4e8dee96f6c 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a toolkit modal Dialog created with a Frame * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java index 6407def149e..f4cbcf4072c 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/BlockingWindowsToolkitModal6Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a toolkit modal Dialog created with a Dialog * constructor receives focus; whether its components receive focus diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java index 81965d281b2..e90679e4762 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogAppModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether an application modal Dialog receives focus; check * if its components receive focus and respond to key events diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java index ce4fb9d302f..edeb86b7973 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogDocModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a document modal Dialog receives focus; check * if its components receive focus and respond to key events diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java index e566b718e3b..0b49687f507 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogModelessTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modeless Dialog receives focus; check * if its components receive focus and respond to key events diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java index 664ddc709f8..683fe42d1e6 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogNonModalTest.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a non-modal Dialog receives focus; check * if its components receive focus and respond to key events diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java index 4c7996b496d..01789259e74 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogSetModalTest.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8049617 * @summary Check whether a modal Dialog receives focus; check * if its components receive focus and respond to key events diff --git a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java index 213d0297385..b3e6c93f32e 100644 --- a/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java +++ b/jdk/test/java/awt/Modal/ModalBlockingTests/UnblockedDialogToolkitModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8049617 * @summary Check whether a toolkit modal Dialog receives focus; check * if its components receive focus and respond to key events diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java index b86c2b2c2ef..ebbba07bdd7 100644 --- a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java +++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogFileTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047179 8044429 * @summary Check whether a FileDialog blocks an application modality excluded Dialog * (it shouldn't). Checks also whether setting a parent dialog to be diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java index c3b083b4e76..dca252c2105 100644 --- a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java +++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPageSetupTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 7125054 8044429 * @summary Check whether a pageDialog blocks an application modality excluded Dialog * (it shouldn't). Checks also whether setting a parent dialog to be diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java index 8bd4330efdf..f2f5e43acc2 100644 --- a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java +++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeDialogPrintSetupTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 7125054 8044429 * @summary Check whether a printDialog blocks an application modality excluded Dialog * (it shouldn't). Checks also whether setting a parent dialog to be diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java index 83ebdff711d..2e0553a6281 100644 --- a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java +++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFrameFileTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047179 8044429 * @summary Check whether a FileDialog blocks an application modality excluded Frame * (it shouldn't). Checks also whether setting a parent frame to be diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java index ce34348dbc8..3965b8c72b3 100644 --- a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java +++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePageSetupTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 7125054 8044429 * @summary Check whether a pageDialog blocks an application modality excluded Frame * (it shouldn't). Checks also whether setting a parent frame to be diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java index 66aeb64e08b..3763bf43b4f 100644 --- a/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java +++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ApplicationExcludeFramePrintSetupTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 7125054 8044429 * @summary Check whether a printDialog blocks an application modality excluded Frame * (it shouldn't). Checks also whether setting a parent frame to be diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java index 78c612d3d53..5b4db15e852 100644 --- a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java +++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogFileTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047179 8044429 * @summary Check whether a FileDialog blocks a toolkit modality excluded Dialog * (it shouldn't). Checks also whether setting a parent dialog to be diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java index 4e67f651c0a..aa1b7cc0646 100644 --- a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java +++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPageSetupTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 7125054 8044429 * @summary Check whether a pageDialog blocks a toolkit modality excluded Dialog * (it shouldn't). Checks also whether setting a parent dialog to be diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java index 5f0bd425915..2de113bc08a 100644 --- a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java +++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeDialogPrintSetupTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 7125054 8044429 * @summary Check whether a printDialog blocks a toolkit modality excluded Dialog * (it shouldn't). Checks also whether setting a parent dialog to be diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java index ec845086ae4..29c7b6b714e 100644 --- a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java +++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFrameFileTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047179 8044429 * @summary Check whether a FileDialog blocks a toolkit modality excluded Frame * (it shouldn't). Checks also whether setting a parent frame to be diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java index f26bc8feaed..f5c18cda8a4 100644 --- a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java +++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePageSetupTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 7125054 8044429 * @summary Check whether a pageDialog blocks a toolkit modality excluded Frame * (it shouldn't). Checks also whether setting a parent frame to be diff --git a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java index 809dd20bd10..cf6c7921006 100644 --- a/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java +++ b/jdk/test/java/awt/Modal/ModalExclusionTests/ToolkitExcludeFramePrintSetupTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 7125054 8044429 * @summary Check whether a printDialog blocks a toolkit modality excluded Frame * (it shouldn't). Checks also whether setting a parent frame to be diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java index 20f15fbe4de..7f16a93c8f5 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFAppModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when the following * happens: an application modal dialog (D) having null frame owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java index bb70a4fc090..fb08782e8ad 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFDocModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the * following happens: a document modal dialog (D) having null frame owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java index eb2ca1ecd08..98f4589c7f6 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFModelessTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the * following happens: a modeless dialog (D) having null frame owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java index 697c5c3d409..4ba23f071f8 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDWFNonModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following * happens: a non-modal dialog (D) having null frame owner is shown; a window having D diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java index 900c3889786..22905f7e801 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsAppModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: an application modal dialog (D1) having a null diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java index 62e04584dc6..dba856753e7 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsDocModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a document modal dialog (D1) having a null diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java index 2215b5a9b36..def17c1c01d 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsModelessTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a modeless dialog (D1) having a null diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java index dc87c0f4268..20b2a0bdd26 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferDialogsNonModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a non-modal dialog (D1) having a null diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java index f3fc961d460..51f189ef3d9 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWAppModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a frame is shown; an application modal dialog (D) diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java index 9a163e47bbc..ff5b1ebb5c8 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWDocModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a frame is shown; a document modal dialog (D) diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java index 41dce55fea8..e801611c566 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWModelessTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a frame is shown; a modeless dialog (D) diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java index 32117624ecb..370ebf33761 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFDWNonModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a frame is shown; a non-modal dialog (D) diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java index 121aeb5494f..8fe9df35047 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; an application modal dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java index ba1ff589406..8b4bbd08571 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; an application modal dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java index 5098658d7e9..618f8c0e888 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; an application modal dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java index f4ae06489aa..855eb8fc6ea 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDAppModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; an application modal dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java index 4f3958f98d4..dcd587cdf37 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; a document modal dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java index f68eb0e3a63..7f2955988a7 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; a document modal dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java index 7ad9e8e3d4a..cc0fa6aa60d 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; a document modal dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java index d689b61be83..1fd811f6547 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDDocModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; a document modal dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java index bdf00c0ca24..f1de5654389 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; a modeless dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java index a1d31e4328a..0d78e4ffb55 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; a modeless dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java index 6ed6f9eab21..ae1bcd61288 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; a modeless dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java index 956b69127bb..32cbc0892f0 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDModeless4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; a modeless dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java index fd06036bce7..7b63ce7062e 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java index 82283113c8c..241d16e0f17 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java index 4475351ba43..9b57220aa16 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java index 6ceed537376..548d42944ef 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferFWDNonModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8049339 * @summary Check whether the focus transfer between windows occurs correctly when the following happens: * a frame (F) is shown; a window having F as owner is shown; a non-modal dialog having diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java index d23593634c1..8cad4285cb9 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a window having a hidden frame owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java index e37420f3cdb..ff18a364f06 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 8048263 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a window having a hidden frame owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java index f75c869272a..58679b79621 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFAppModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a window having a frame (F) owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java index cd1e9e8f9d9..89b1ce79ee8 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a window having a hidden frame owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java index 9f3a1f88cc8..6f1a848beb8 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a window having a hidden frame owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java index 2c116b09677..cf8bafeaf77 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFDocModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a window having a frame (F) owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java index 73d36b65bf0..7113c283014 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a window having a hidden frame owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java index e496e253f58..f17f2394c5b 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a window having a hidden frame owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java index df3ff81dc3d..dfa56f5f62d 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFModeless3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a window having a frame (F) owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java index c700a054136..75fbd3a7675 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a window having a hidden frame owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java index 5e36b8d50a7..cac3e9603f3 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a window having a hidden frame owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java index e0d3ebbb1f2..5a05a76322b 100644 --- a/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java +++ b/jdk/test/java/awt/Modal/ModalFocusTransferTests/FocusTransferWDFNonModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8047367 * @summary Check whether the focus transfer between windows occurs correctly when * the following happens: a window having a frame (F) owner is shown; diff --git a/jdk/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java b/jdk/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java index 10d445a196d..284140116ae 100644 --- a/jdk/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java +++ b/jdk/test/java/awt/Modal/ModalInternalFrameTest/ModalInternalFrameTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6518753 @summary Tests the functionality of modal Swing internal frames @author artem.ananiev: area=awt.modal diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java index e7fed021d78..b8fc67b3632 100644 --- a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java +++ b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs1Test.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8054358 * @summary Check whether a set of dialogs created with a toolkit excluded Frame * parent has a proper modal blocking behavior. Also show a document modal diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java index 323b4ef9538..a3e25a59651 100644 --- a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java +++ b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs2Test.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8054358 * @summary Check whether a set of dialogs created with an application excluded Frame * parent has a proper modal blocking behavior. Also show a document modal diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java index dc93cda4770..771bd5f2f57 100644 --- a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java +++ b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs3Test.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8054358 * @summary Check correctness of modal blocking behavior for a chain of Dialogs * having different modality types with a Frame as a document root. diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java index 64abf11aa1f..524dadae6c3 100644 --- a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java +++ b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs4Test.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8054358 8055003 * @summary Check whether application and document modality levels for Dialog * work properly. Also check whether the blocking dialogs are diff --git a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java index 09be71858c2..457940b6379 100644 --- a/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java +++ b/jdk/test/java/awt/Modal/MultipleDialogs/MultipleDialogs5Test.java @@ -23,9 +23,10 @@ /* * @test + * @key headful * @bug 8054358 * @summary This is a simple check if a chain of dialogs having different - * modality types block each other properly. + * modality types block each other properly. * * @library ../helpers ../../../../lib/testlibrary/ * @build ExtendedRobot diff --git a/jdk/test/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java b/jdk/test/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java index f8632ff14df..559bea01c05 100644 --- a/jdk/test/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java +++ b/jdk/test/java/awt/Modal/NullModalityDialogTest/NullModalityDialogTest.java @@ -29,6 +29,7 @@ import static jdk.testlibrary.Asserts.*; /* * @test + * @key headful * @bug 8047367 * @summary Check whether a Dialog set with null modality type * behaves like a modeless dialog diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal1Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal1Test.java index 9ff150c373f..ce33ec4c9a0 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal1Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether an application modal Dialog created with null Frame * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal2Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal2Test.java index 21de602a752..4a09ac79313 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal2Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether an application modal Dialog created with null Dialog * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal3Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal3Test.java index 9cf58c15f6c..d903fbf2ebf 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal3Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether an application modal Dialog created with hidden Frame * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal4Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal4Test.java index 0fce109a6d8..0e938f6bb28 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal4Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether an application modal Dialog created with hidden Dialog * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal5Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal5Test.java index ef0610a2ab9..4cc3db673a3 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal5Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether an application modal Dialog created with visible Frame * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal6Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal6Test.java index 730d698fabe..381041601ff 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopAppModal6Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopAppModal6Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether an application modal Dialog created with visible * Dialog constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal1Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal1Test.java index c3f8f9d7a82..5ad2a45e145 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal1Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a document modal Dialog created with null Frame * constructor follows normal Z order. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal2Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal2Test.java index 8f6ff61c96e..20c4e3ef17a 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal2Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a document modal Dialog created with null Dialog * constructor follows normal Z order. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal3Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal3Test.java index e6b508bdcf3..f182e1add5a 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal3Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a document modal Dialog created with hidden Frame * constructor follows normal Z order. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal4Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal4Test.java index 486d60ed0a8..ba989c2bdcf 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal4Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a document modal Dialog created with hidden Dialog * constructor follows normal Z order. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal5Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal5Test.java index 735646e9f01..1b6e80c38ff 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal5Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a document modal Dialog created with visible Frame * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal6Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal6Test.java index 5697006606b..cbe4e9024cc 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopDocModal6Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopDocModal6Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a document modal Dialog created with visible * Dialog constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal1Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModal1Test.java index 6f817eea416..b78e8503b4f 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopModal1Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a modal Dialog created with null Frame * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal2Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModal2Test.java index 6e4799e1c14..805c72a5561 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopModal2Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a modal Dialog created with null Dialog * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal3Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModal3Test.java index 5c696b37bd5..bd3f82dde78 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopModal3Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a modal Dialog created with hidden Frame * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal4Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModal4Test.java index 770fafbf747..8284962a4d9 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopModal4Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a modal Dialog created with hidden Dialog * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal5Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModal5Test.java index 1b6fbe765a1..67219a94b87 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopModal5Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a modal Dialog created with visible Frame * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModal6Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModal6Test.java index a7d57a69bf2..94a2f16d1fa 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopModal6Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopModal6Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a modal Dialog created with visible Dialog * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless1Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModeless1Test.java index 723c1422506..f897721dc5a 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopModeless1Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a modeless Dialog created with a * null Frame constructor follows normal Z Order. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless2Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModeless2Test.java index dd7d3089d42..352a310dac3 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopModeless2Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a modeless Dialog created with a * null Dialog constructor follows normal Z Order. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless3Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModeless3Test.java index 54cf8995a6e..6373355b246 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopModeless3Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a modeless Dialog created with a * hidden Frame constructor follows normal Z Order. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless4Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModeless4Test.java index 9b5cfa41ffd..c5864ab781f 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopModeless4Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a modeless Dialog created with a * hidden Dialog constructor follows normal Z Order. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless5Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModeless5Test.java index 9df9a6289a9..ef5d40f90fb 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopModeless5Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a modeless Dialog created with a * visible Frame constructor follows normal Z Order. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopModeless6Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopModeless6Test.java index e03e6cd2ccc..1feef2a0537 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopModeless6Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopModeless6Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a modeless Dialog created with a visible Dialog * constructor follows a normal Z order. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal1Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal1Test.java index 5ab64a6dd7c..eb1d702d8a0 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal1Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a toolkit modal Dialog created with null Frame * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal2Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal2Test.java index 904e509442f..e743570e575 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal2Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a toolkit modal Dialog created with null Dialog * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal3Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal3Test.java index 2ecb970104f..3d6a9088f51 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal3Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a toolkit modal Dialog created with hidden Frame * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal4Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal4Test.java index f535ab27106..2434879e01a 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal4Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a toolkit modal Dialog created with hidden Dialog * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal5Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal5Test.java index 52f860de8f4..c5e85d201d0 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal5Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a toolkit modal Dialog created with visible Frame * constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal6Test.java b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal6Test.java index eda000fbccb..e35a499f821 100644 --- a/jdk/test/java/awt/Modal/OnTop/OnTopTKModal6Test.java +++ b/jdk/test/java/awt/Modal/OnTop/OnTopTKModal6Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8052012 * @summary Check whether a toolkit modal Dialog created with visible * Dialog constructor stays on top of the windows it blocks. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal1Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal1Test.java index 9d60a6d15bf..bba8d40d9aa 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal1Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether an application modal dialog having a null Frame * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal2Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal2Test.java index d6915355e7c..d992375f307 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal2Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether an application modal dialog having a null Dialog * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal3Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal3Test.java index 9db72a778bc..ab57cd7e8ab 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal3Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether an application modal dialog having a hidden Frame * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal4Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal4Test.java index eef0e92fa21..7a20e916c0b 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal4Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether an application modal dialog having a hidden Dialog * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal5Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal5Test.java index a1b845a8340..8772441cee2 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal5Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether an application modal dialog having a visible Frame * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal6Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal6Test.java index fccb53cf267..a5f71fe8355 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackAppModal6Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackAppModal6Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether an application modal dialog having a visible Dialog * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal1Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal1Test.java index 27efa65d88d..b7dea73ca5c 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal1Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check if toBack method works correctly for * a document modal dialog with null Frame parent. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal2Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal2Test.java index 646b5ef2a22..21c324441c5 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal2Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check if toBack method works correctly for * a document modal dialog with null Dialog parent. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal3Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal3Test.java index d79387f3eaa..729942814ca 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal3Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check if toBack method works correctly for * a document modal dialog with hidden Frame parent. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal4Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal4Test.java index 2ace15343e1..e1de93015f9 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal4Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check if toBack method works correctly for * a document modal dialog with hidden Dialog parent. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal5Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal5Test.java index b2925ea06d0..625680633fc 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal5Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether a document modal dialog having a visible Frame * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal6Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal6Test.java index 6dfc7fbc3d7..feedec222c7 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackDocModal6Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackDocModal6Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether a document modal dialog having a visible Dialog * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal1Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModal1Test.java index f0c4b3751a2..0ac34f3301f 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackModal1Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackModal1Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054143 * @summary Check whether a modal dialog having a null Frame * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal2Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModal2Test.java index 15a45e2c517..c7f76cb551b 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackModal2Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackModal2Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054143 * @summary Check whether a modal dialog having a null Dialog * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal3Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModal3Test.java index dea6a8a6e8a..425ab3a1e27 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackModal3Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackModal3Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054143 * @summary Check whether a modal dialog having a hidden Frame * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal4Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModal4Test.java index d9e8577ef45..a6a18ac8fb5 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackModal4Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackModal4Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054143 * @summary Check whether a modal dialog having a hidden Dialog * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal5Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModal5Test.java index caf58ee60d2..fb5d219a397 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackModal5Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackModal5Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054143 * @summary Check whether a modal dialog having a visible Frame * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModal6Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModal6Test.java index 692f90428b2..f4d2a094229 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackModal6Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackModal6Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054143 * @summary Check whether a modal dialog having a visible Dialog * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless1Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModeless1Test.java index 18562547ced..a05c9434998 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackModeless1Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackModeless1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether a modeless dialog having a null Frame constructor * goes behind other windows when toBack is called for it. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless2Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModeless2Test.java index b9b0356d77c..40681897696 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackModeless2Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackModeless2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether a modeless dialog having a null Dialog constructor * goes behind other windows when toBack is called for it. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless3Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModeless3Test.java index b6a93800036..df9885fbe0d 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackModeless3Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackModeless3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether a modeless dialog having a hidden Frame constructor * goes behind other windows when toBack is called for it. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless4Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModeless4Test.java index 282b509ff37..22218de59d6 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackModeless4Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackModeless4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether a modeless dialog having a hidden Dialog constructor * goes behind other windows when toBack is called for it. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless5Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModeless5Test.java index 1c38e21b875..950418bc3ce 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackModeless5Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackModeless5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check if toBack method works correctly for a modeless dialog * having a visible Frame constructor. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackModeless6Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackModeless6Test.java index c5c53059dda..df56012a029 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackModeless6Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackModeless6Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check if toBack method works correctly for a modeless dialog * having a visible Dialog constructor. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal1Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal1Test.java index 12ea002a1d7..c175449f159 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal1Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal1Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054143 * @summary Check whether a non-modal dialog having a null Frame constructor * goes behind other windows when toBack is called for it. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal2Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal2Test.java index 5ccf7a71743..e5b8edcfba2 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal2Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal2Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054143 * @summary Check whether a non-modal dialog having a null Dialog constructor * goes behind other windows when toBack is called for it. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal3Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal3Test.java index 7bb68293543..6b9781a9565 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal3Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal3Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054143 * @summary Check whether a non-modal dialog having a hidden Frame constructor * goes behind other windows when toBack is called for it. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal4Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal4Test.java index d2efc41b7ef..00839a61ebf 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal4Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal4Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054143 * @summary Check whether a non-modal dialog having a hidden Dialog constructor * goes behind other windows when toBack is called for it. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal5Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal5Test.java index ad1646d1943..c3fac48e66e 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal5Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal5Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054143 * @summary Check if toBack method works correctly for a non-modal dialog * having a visible Frame constructor. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal6Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal6Test.java index b8204da2991..dda242073c7 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackNonModal6Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackNonModal6Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8054143 * @summary Check if toBack method works correctly for a non-modal dialog * having a visible Dialog constructor. diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal1Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal1Test.java index 80520537b25..e0eeec648dd 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal1Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether a toolkit modal dialog having a null Frame * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal2Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal2Test.java index f2ffdaa941f..9914428b95b 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal2Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether a toolkit modal dialog having a null Dialog * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal3Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal3Test.java index 675fb24b9b6..763489c3231 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal3Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether a toolkit modal dialog having a hidden Frame * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal4Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal4Test.java index c78e26d5358..bb521df59ff 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal4Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether a toolkit modal dialog having a hidden Dialog * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal5Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal5Test.java index 5aa519c892c..675fdc3e35d 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal5Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether a toolkit modal dialog having a visible Frame * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal6Test.java b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal6Test.java index 6e373a937c9..d8015a424eb 100644 --- a/jdk/test/java/awt/Modal/ToBack/ToBackTKModal6Test.java +++ b/jdk/test/java/awt/Modal/ToBack/ToBackTKModal6Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8054143 * @summary Check whether a toolkit modal dialog having a visible Dialog * constructor still stays on top of the blocked windows even diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java index 41d27d979f3..863ceaad159 100644 --- a/jdk/test/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java +++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontAppModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a dialog in presence of * blocking application modal dialog does not bring it to the top diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java index 65cf9ffc71b..a79b620ee76 100644 --- a/jdk/test/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java +++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontDocModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a dialog in presence of * blocking document modal dialog does not bring it to the top diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalTest.java index 6c20549cf63..8833302c524 100644 --- a/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalTest.java +++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModalTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a dialog in presence of * blocking modal dialog does not bring it to the top diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java index be5da090994..56d32dc20bd 100644 --- a/jdk/test/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java +++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontModeless1Test.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method does not bring a dialog to the top * of a child modeless dialog. diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java index 6e6b70f83df..ef89f22a4cf 100644 --- a/jdk/test/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java +++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontNonModalTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method does not bring a dialog to the top * of a non-modal child dialog. diff --git a/jdk/test/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java b/jdk/test/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java index c48eac093ca..c5d3505afb3 100644 --- a/jdk/test/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java +++ b/jdk/test/java/awt/Modal/ToFront/DialogToFrontTKModalTest.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a dialog in presence of * blocking toolkit modal dialog does not bring it to the top diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java index 0b32758a3ae..b2192ef8448 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking application modal dialog having a null Frame parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java index 7a8e8ebea4e..e3882ac0fd5 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking application modal dialog having a null Dialog parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java index d57d1e32d02..012ee2431b3 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking application modal dialog having a hidden Frame parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java index 447a13ec0c7..7e26568ba80 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking application modal dialog having a hidden Dialog parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java index 3165711cddb..295e0a4fb96 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontAppModal5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking application modal dialog having a visible Frame parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java index 357be00b444..dd5a7d1ff94 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking document modal dialog having a visible Frame parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java index 4524afbbe87..66d24faf69c 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontDocModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check if toFront method works correctly for a document modal dialog. * diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal1Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal1Test.java index eb1d4e7dff0..eb05af8a831 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal1Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal1Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking modal dialog having a null Frame parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal2Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal2Test.java index 4e1ab89ec66..bddabdd3a13 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal2Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal2Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking modal dialog having a null Dialog parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal3Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal3Test.java index da6dc06e1c9..84dfe451e42 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal3Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal3Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking modal dialog having a hidden Frame parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal4Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal4Test.java index e967d4b63fd..793ad63ccb3 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal4Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal4Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking modal dialog having a hidden Dialog parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal5Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal5Test.java index ba3ae7d9338..a7e8feafa1b 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal5Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModal5Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking modal dialog having a visible Frame parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java index 29be38f5cfa..cf04e33e6e3 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontModeless1Test.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method does not bring a frame to the top of * a modeless child dialog. diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java index 5e16f141446..dcc79268751 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontNonModalTest.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method does not bring a frame to the top * of a non-modal child dialog. diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java index 528847e7e68..6972f4b903e 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal1Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking modal toolkit dialog having a null Frame parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java index 7cd3122d2c8..72db1dc2b3d 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal2Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking toolkit modal dialog having a null Dialog parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java index 90eff046b4e..689bc0d8b21 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal3Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking toolkit modal dialog having a hidden Frame parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java index 625ced92854..b88d0cddeca 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal4Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking toolkit modal dialog having a hidden Dialog parent diff --git a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java index 1e91e9a5488..5b044914ce2 100644 --- a/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java +++ b/jdk/test/java/awt/Modal/ToFront/FrameToFrontTKModal5Test.java @@ -25,6 +25,7 @@ import java.awt.Dialog; /* * @test + * @key headful * @bug 8050885 * @summary Check that calling toFront method for a frame in presence of * blocking toolkit modal dialog having a visible Frame parent diff --git a/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java b/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java index 8f386fa136a..1648df9c065 100644 --- a/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java +++ b/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowOutOfFrameTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 7154048 * @summary Window created under a mouse does not receive mouse enter event. * Mouse Entered/Exited events should be generated during dragging the window diff --git a/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java b/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java index 909559a5f92..4067bcea32e 100644 --- a/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java +++ b/jdk/test/java/awt/Mouse/EnterExitEvents/DragWindowTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 7154048 * @summary Window created under a mouse does not receive mouse enter event. * Mouse Entered/Exited events are wrongly generated during dragging the window diff --git a/jdk/test/java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java b/jdk/test/java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java index 2591b390611..51e5dd353a9 100644 --- a/jdk/test/java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java +++ b/jdk/test/java/awt/Mouse/EnterExitEvents/ResizingFrameTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 7154048 * @summary Programmatically resized window does not receive mouse entered/exited events * @author alexandr.scherbatiy area=awt.event diff --git a/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java b/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java index 3cb1b735837..a466c031ccd 100644 --- a/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java +++ b/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithOverlay.java @@ -29,6 +29,7 @@ import java.util.concurrent.atomic.AtomicReference; /** * @test + * @key headful * @bug 8012026 * @summary Component.getMousePosition() does not work in an applet on MacOS * @author Petr Pchelko diff --git a/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java b/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java index d04b50087ad..7ff5e0f31d2 100644 --- a/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java +++ b/jdk/test/java/awt/Mouse/GetMousePositionTest/GetMousePositionWithPopup.java @@ -30,6 +30,7 @@ import java.awt.event.MouseMotionAdapter; /** * @test + * @key headful * @bug 8012026 * @summary Component.getMousePosition() does not work in an applet on MacOS * @author Petr Pchelko diff --git a/jdk/test/java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java b/jdk/test/java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java index 07b798f91d0..3c4eb32998f 100644 --- a/jdk/test/java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java +++ b/jdk/test/java/awt/Mouse/MouseComboBoxTest/MouseComboBoxTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8032872 * @summary Tests JComboBox selection via the mouse * @author Dmitry Markov diff --git a/jdk/test/java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java b/jdk/test/java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java index 0e75224a9df..9e0285630de 100644 --- a/jdk/test/java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java +++ b/jdk/test/java/awt/Mouse/MouseDragEvent/MouseDraggedTest.java @@ -26,6 +26,7 @@ import java.awt.event.*; import javax.swing.*; /* * @test + * @key headful * @bug 8080137 * @summary Dragged events for extra mouse buttons (4,5,6) are not generated * on JSplitPane diff --git a/jdk/test/java/awt/Mouse/RemovedComponentMouseListener/RemovedComponentMouseListener.java b/jdk/test/java/awt/Mouse/RemovedComponentMouseListener/RemovedComponentMouseListener.java index 7c5d8b21e80..8e95cbb9506 100644 --- a/jdk/test/java/awt/Mouse/RemovedComponentMouseListener/RemovedComponentMouseListener.java +++ b/jdk/test/java/awt/Mouse/RemovedComponentMouseListener/RemovedComponentMouseListener.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8061636 * @summary fix for 7079254 changes behavior of MouseListener, MouseMotionListener * @library ../../regtesthelpers diff --git a/jdk/test/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java b/jdk/test/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java index da79c617269..cf916deff7d 100644 --- a/jdk/test/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java +++ b/jdk/test/java/awt/MouseAdapter/MouseAdapterUnitTest/MouseAdapterUnitTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 4453162 @summary MouseAdapter should implement MouseMotionListener and MouseWheelListener @author andrei.dmitriev: area= diff --git a/jdk/test/java/awt/MouseInfo/JContainerMousePositionTest.java b/jdk/test/java/awt/MouseInfo/JContainerMousePositionTest.java index 211a29d2a5e..f04c06314a6 100644 --- a/jdk/test/java/awt/MouseInfo/JContainerMousePositionTest.java +++ b/jdk/test/java/awt/MouseInfo/JContainerMousePositionTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @summary unit test for a new method in Container class: getMousePosition(boolean) @author dav@sparc.spb.su: area= @bug 4009555 diff --git a/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java b/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java index 705f253bfd6..07b13302d63 100644 --- a/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java +++ b/jdk/test/java/awt/Multiscreen/LocationRelativeToTest/LocationRelativeToTest.java @@ -22,15 +22,16 @@ */ /* - @test - @bug 6232687 - @summary Tests that Window.setLocationRelativeTo() method works correctly -for different multiscreen configurations - @author artem.ananiev, area=awt.multiscreen - @library ../../regtesthelpers - @build Util - @run main LocationRelativeToTest -*/ + * @test + * @key headful + * @bug 6232687 + * @summary Tests that Window.setLocationRelativeTo() method works correctly + * for different multiscreen configurations + * @author artem.ananiev, area=awt.multiscreen + * @library ../../regtesthelpers + * @build Util + * @run main LocationRelativeToTest + */ import java.awt.*; import java.awt.event.*; diff --git a/jdk/test/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java b/jdk/test/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java index 137f48d1ac3..9ba0f8ebf89 100644 --- a/jdk/test/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java +++ b/jdk/test/java/awt/Multiscreen/TranslucencyThrowsExceptionWhenFullScreen/TranslucencyThrowsExceptionWhenFullScreen.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6838089 @summary Translucent windows should throw exception in FS mode @author dmitry.cherepanov@oracle.com: area=awt-multiscreen diff --git a/jdk/test/java/awt/Paint/ExposeOnEDT.java b/jdk/test/java/awt/Paint/ExposeOnEDT.java index 21f7dc00c29..971735f487d 100644 --- a/jdk/test/java/awt/Paint/ExposeOnEDT.java +++ b/jdk/test/java/awt/Paint/ExposeOnEDT.java @@ -26,6 +26,7 @@ import java.awt.*; /** * @test + * @key headful * @bug 7090424 * @author Sergey Bylokhov * @library ../../../lib/testlibrary/ diff --git a/jdk/test/java/awt/Paint/PaintNativeOnUpdate.java b/jdk/test/java/awt/Paint/PaintNativeOnUpdate.java index 6036cd5c54c..a1fb63df577 100644 --- a/jdk/test/java/awt/Paint/PaintNativeOnUpdate.java +++ b/jdk/test/java/awt/Paint/PaintNativeOnUpdate.java @@ -31,6 +31,7 @@ import java.awt.Point; /** * @test + * @key headful * @bug 7157680 * @library ../../../lib/testlibrary * @build ExtendedRobot diff --git a/jdk/test/java/awt/Paint/bug8024864.java b/jdk/test/java/awt/Paint/bug8024864.java index 42580a4c94f..e39ff5df702 100644 --- a/jdk/test/java/awt/Paint/bug8024864.java +++ b/jdk/test/java/awt/Paint/bug8024864.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8024864 8031422 * @summary [macosx] Problems with rendering of controls * @author Petr Pchelko diff --git a/jdk/test/java/awt/PrintJob/PrinterException.java b/jdk/test/java/awt/PrintJob/PrinterException.java index 32fa544d2fe..781d011888b 100644 --- a/jdk/test/java/awt/PrintJob/PrinterException.java +++ b/jdk/test/java/awt/PrintJob/PrinterException.java @@ -22,6 +22,7 @@ */ /* * @test + * @key headful * @bug 7161283 8158520 * @summary Toolkit.getPrintJob throws NPE if no printer available * @run main PrinterException diff --git a/jdk/test/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java b/jdk/test/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java index 922244babff..4d913e4acb9 100644 --- a/jdk/test/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java +++ b/jdk/test/java/awt/Robot/AcceptExtraMouseButtons/AcceptExtraMouseButtons.java @@ -23,6 +23,7 @@ /* @test %I% %E% + @key headful @bug 6315717 @summary verifies that Robot is accepting extra mouse buttons @author Andrei Dmitriev : area=awt.mouse diff --git a/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotEnhancedKeyTest.java b/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotEnhancedKeyTest.java new file mode 100644 index 00000000000..20182d06977 --- /dev/null +++ b/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotEnhancedKeyTest.java @@ -0,0 +1,257 @@ +/* + * Copyright (c) 2007, 2016, 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.awt.BorderLayout; +import java.awt.Canvas; +import java.awt.EventQueue; +import java.awt.Frame; +import java.awt.event.FocusAdapter; +import java.awt.event.FocusEvent; +import java.awt.event.InputEvent; +import java.awt.event.KeyAdapter; +import java.awt.event.KeyEvent; +import java.awt.event.MouseEvent; + +import static jdk.testlibrary.Asserts.assertTrue; + +/* + * NOTE: this is no intentionally a manual test (i.e. has no test tag) because + * even on Windows, the various tested key-combination may get partially + * intercepted by other applications and this can leave the whole system in an + * inconsistent state. For example on my Windows machine with Intel Graphics + * the key combinations "Ctl-Alt-F11" and "Ctl-Alt-F12" triggers some Intel + * Graphics utilities by default. If the test is run in such an environment, + * some key events of the test are intercepted by those utilities with the + * result that the test fails and no more keyboard input will be possible at + * all. + * + * To execute the test add a '@' before the 'test' keyword below to make it a tag. + */ + +/* + * test 8155742 + * + * @summary Make sure that modifier key mask is set when robot press + * some key with one or more modifiers. + * @library ../../../../lib/testlibrary/ + * @build ExtendedRobot + * @key headful + * @run main/timeout=600 ModifierRobotEnhancedKeyTest + */ + +public class ModifierRobotEnhancedKeyTest extends KeyAdapter { + + private boolean focusGained = false; + private boolean startTest = false; + private ExtendedRobot robot; + private Frame frame; + private Canvas canvas; + + private volatile boolean tempPress = false; + + private int[] textKeys, modifierKeys, inputMasks; + private boolean[] modifierStatus, textStatus; + + private final static int waitDelay = 5000; + private Object tempLock = new Object(); + private Object keyLock = new Object(); + + public static void main(String[] args) throws Exception { + String os = System.getProperty("os.name").toLowerCase(); + if (!os.contains("windows")) { + System.out.println("*** this test is for windows only because some of the tested key combinations " + + "might be caught by the os and therefore don't reach the canvas ***"); + return; + } + + ModifierRobotEnhancedKeyTest test = new ModifierRobotEnhancedKeyTest(); + test.doTest(); + } + + public ModifierRobotEnhancedKeyTest() throws Exception { + modifierKeys = new int[4]; + modifierKeys[0] = KeyEvent.VK_SHIFT; + modifierKeys[1] = KeyEvent.VK_CONTROL; + modifierKeys[2] = KeyEvent.VK_ALT; + modifierKeys[3] = KeyEvent.VK_ALT_GRAPH; + + inputMasks = new int[4]; + inputMasks[0] = InputEvent.SHIFT_MASK; + inputMasks[1] = InputEvent.CTRL_MASK; + inputMasks[2] = InputEvent.ALT_MASK; + inputMasks[3] = InputEvent.ALT_GRAPH_MASK; + + modifierStatus = new boolean[modifierKeys.length]; + + textKeys = new int[6]; + textKeys[0] = KeyEvent.VK_A; + textKeys[1] = KeyEvent.VK_S; + textKeys[2] = KeyEvent.VK_DELETE; + textKeys[3] = KeyEvent.VK_HOME; + textKeys[4] = KeyEvent.VK_F12; + textKeys[5] = KeyEvent.VK_LEFT; + + textStatus = new boolean[textKeys.length]; + + EventQueue.invokeAndWait( () -> { initializeGUI(); }); + } + + public void keyPressed(KeyEvent event) { + + tempPress = true; + synchronized (tempLock) { tempLock.notifyAll(); } + + if (! startTest) { + return; + } + for (int x = 0; x < inputMasks.length; x++) { + if ((event.getModifiers() & inputMasks[x]) != 0) { + System.out.println("Modifier set: " + event.getKeyModifiersText(inputMasks[x])); + modifierStatus[x] = true; + } + } + for (int x = 0; x < textKeys.length; x++) { + if (event.getKeyCode() == textKeys[x]) { + System.out.println("Text set: " + event.getKeyText(textKeys[x])); + textStatus[x] = true; + } + } + + synchronized (keyLock) { keyLock.notifyAll(); } + } + + private void initializeGUI() { + frame = new Frame("Test frame"); + canvas = new Canvas(); + canvas.addFocusListener(new FocusAdapter() { + public void focusGained(FocusEvent event) { focusGained = true; } + }); + canvas.addKeyListener(this); + frame.setLayout(new BorderLayout()); + frame.add(canvas); + frame.setSize(200, 200); + frame.setVisible(true); + } + + public void doTest() throws Exception { + robot = new ExtendedRobot(); + + robot.mouseMove((int) frame.getLocationOnScreen().getX() + frame.getSize().width / 2, + (int) frame.getLocationOnScreen().getY() + frame.getSize().height / 2); + robot.click(MouseEvent.BUTTON1_MASK); + robot.waitForIdle(); + + assertTrue(focusGained, "FAIL: Canvas gained focus!"); + + for (int i = 0; i < modifierKeys.length; i++) { + for (int j = 0; j < textKeys.length; j++) { + tempPress = false; + robot.keyPress(modifierKeys[i]); + robot.waitForIdle(); + if (! tempPress) { + synchronized (tempLock) { tempLock.wait(waitDelay); } + } + assertTrue(tempPress, "FAIL: keyPressed triggered for i=" + i); + + resetStatus(); + startTest = true; + robot.keyPress(textKeys[j]); + robot.waitForIdle(); + if (! modifierStatus[i] || ! textStatus[j]) { + synchronized (keyLock) { keyLock.wait(waitDelay); } + } + + + assertTrue(modifierStatus[i] && textStatus[j], + "FAIL: KeyEvent not proper!"+ + "Key checked: i=" + i + "; j=" + j+ + "ModifierStatus = " + modifierStatus[i]+ + "TextStatus = " + textStatus[j]); + startTest = false; + robot.keyRelease(textKeys[j]); + robot.waitForIdle(); + robot.keyRelease(modifierKeys[i]); + robot.waitForIdle(); + } + } + + for (int i = 0; i < modifierKeys.length; i++) { + for (int j = i + 1; j < modifierKeys.length; j++) { + for (int k = 0; k < textKeys.length; k++) { + tempPress = false; + robot.keyPress(modifierKeys[i]); + robot.waitForIdle(); + if (! tempPress) { + synchronized (tempLock) { tempLock.wait(waitDelay); } + } + + assertTrue(tempPress, "FAIL: MultiKeyTest: keyPressed triggered for i=" + i); + + tempPress = false; + robot.keyPress(modifierKeys[j]); + robot.waitForIdle(); + if (! tempPress) { + synchronized (tempLock) { tempLock.wait(waitDelay); } + } + assertTrue(tempPress, "FAIL: MultiKeyTest keyPressed triggered for j=" + j); + + resetStatus(); + startTest = true; + robot.keyPress(textKeys[k]); + robot.waitForIdle(); + if (! modifierStatus[i] || ! modifierStatus[j] || ! textStatus[k]) { + synchronized (keyLock) { + keyLock.wait(waitDelay); + } + } + assertTrue(modifierStatus[i] && modifierStatus[j] && textStatus[k], + "FAIL: KeyEvent not proper!"+ + "Key checked: i=" + i + "; j=" + j + "; k=" + k+ + "Modifier1Status = " + modifierStatus[i]+ + "Modifier2Status = " + modifierStatus[j]+ + "TextStatus = " + textStatus[k]); + + startTest = false; + robot.keyRelease(textKeys[k]); + robot.waitForIdle(); + robot.keyRelease(modifierKeys[j]); + robot.waitForIdle(); + robot.keyRelease(modifierKeys[i]); + robot.waitForIdle(); + } + } + } + + frame.dispose(); + } + + private void resetStatus() { + for (int i = 0; i < modifierStatus.length; i++) { + modifierStatus[i] = false; + } + for (int i = 0; i < textStatus.length; i++) { + textStatus[i] = false; + } + } + +} diff --git a/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java b/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java index 1e941473061..43e37ef21f2 100644 --- a/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java +++ b/jdk/test/java/awt/Robot/ModifierRobotKey/ModifierRobotKeyTest.java @@ -36,6 +36,7 @@ import static jdk.testlibrary.Asserts.assertTrue; /* * @test 8155742 + * @key headful * @summary Make sure that modifier key mask is set when robot press * some key with one or more modifiers. * @library ../../../../lib/testlibrary/ diff --git a/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java b/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java index 02d891990b2..32217e8de3d 100644 --- a/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java +++ b/jdk/test/java/awt/TextArea/TextAreaCaretVisibilityTest/bug7129742.java @@ -26,7 +26,9 @@ */ -/* @test +/* + * @test + * @key headful * @bug 7129742 * @summary Focus in non-editable TextArea is not shown on Linux. * @requires (os.family == "linux" | os.family == "solaris") diff --git a/jdk/test/java/awt/TextArea/TextAreaEditing/TextAreaEditing.java b/jdk/test/java/awt/TextArea/TextAreaEditing/TextAreaEditing.java index 6b7dcfaf2c0..71d5d25c913 100644 --- a/jdk/test/java/awt/TextArea/TextAreaEditing/TextAreaEditing.java +++ b/jdk/test/java/awt/TextArea/TextAreaEditing/TextAreaEditing.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 8040322 8060137 @library ../../regtesthelpers @build Util diff --git a/jdk/test/java/awt/TextField/TextFieldEditing/TextFieldEditing.java b/jdk/test/java/awt/TextField/TextFieldEditing/TextFieldEditing.java index 503b6e35129..091ab63ec4e 100644 --- a/jdk/test/java/awt/TextField/TextFieldEditing/TextFieldEditing.java +++ b/jdk/test/java/awt/TextField/TextFieldEditing/TextFieldEditing.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 8060137 @library ../../regtesthelpers @build Util diff --git a/jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh b/jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh index 0b83b09e973..e23120a475d 100644 --- a/jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh +++ b/jdk/test/java/awt/Toolkit/AutoShutdown/ShowExitTest/ShowExitTest.sh @@ -25,6 +25,7 @@ # # @test ShowExitTest.sh +# @key headful # @bug 6513421 # @summary Java process does not terminate on closing the Main Application Frame # diff --git a/jdk/test/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java b/jdk/test/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java index 37aef352a15..edd8e0ec6f6 100644 --- a/jdk/test/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java +++ b/jdk/test/java/awt/Toolkit/LockingKeyStateTest/LockingKeyStateTest.java @@ -26,6 +26,7 @@ import java.awt.event.KeyEvent; /* @test + @key headful @summary verify LOCK buttons toogle @author Yuri.Nesterenko, Dmitriy.Ermashov @library ../../../../lib/testlibrary diff --git a/jdk/test/java/awt/Toolkit/SecurityTest/SecurityTest2.java b/jdk/test/java/awt/Toolkit/SecurityTest/SecurityTest2.java index 3424d02501d..4fa3a7c294a 100644 --- a/jdk/test/java/awt/Toolkit/SecurityTest/SecurityTest2.java +++ b/jdk/test/java/awt/Toolkit/SecurityTest/SecurityTest2.java @@ -22,13 +22,14 @@ */ /* - @test - @bug 6599601 - @summary tests that a simple GUI application runs without any -exceptions thrown - @author Artem.Ananiev area=awt.Toolkit - @run main SecurityTest2 -*/ + * @test + * @key headful + * @bug 6599601 + * @summary tests that a simple GUI application runs without any + * exceptions thrown + * @author Artem.Ananiev area=awt.Toolkit + * @run main SecurityTest2 + */ import java.awt.*; diff --git a/jdk/test/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java b/jdk/test/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java index 5220546fd63..1b607817698 100644 --- a/jdk/test/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java +++ b/jdk/test/java/awt/TrayIcon/PopupMenuLeakTest/PopupMenuLeakTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 8007220 @summary Reference to the popup leaks after the TrayIcon is removed @author Petr Pchelko diff --git a/jdk/test/java/awt/Window/8027025/Test8027025.java b/jdk/test/java/awt/Window/8027025/Test8027025.java index e798354264f..5436b9d6e5a 100644 --- a/jdk/test/java/awt/Window/8027025/Test8027025.java +++ b/jdk/test/java/awt/Window/8027025/Test8027025.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8027025 * @summary [macosx] getLocationOnScreen returns 0 if parent invisible * @author Petr Pchelko diff --git a/jdk/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopFieldTest.java b/jdk/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopFieldTest.java index 5cfaa00419c..dfba6da9adf 100644 --- a/jdk/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopFieldTest.java +++ b/jdk/test/java/awt/Window/AlwaysOnTop/AlwaysOnTopFieldTest.java @@ -26,6 +26,7 @@ import java.awt.Robot; import java.awt.Window; /** * @test + * @key headful * @bug 7081594 * @author Alexander Scherbatiy * @summary Windows owned by an always-on-top window DO NOT automatically become always-on-top @@ -37,7 +38,7 @@ public class AlwaysOnTopFieldTest { Robot robot; try { robot = new Robot(); - }catch(Exception ex) { + } catch(Exception ex) { ex.printStackTrace(); throw new RuntimeException("Unexpected failure"); } diff --git a/jdk/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java b/jdk/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java index 7fee84fd01c..70dd0a47a62 100644 --- a/jdk/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java +++ b/jdk/test/java/awt/Window/AlwaysOnTop/AutoTestOnTop.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 4632143 @summary Unit test for the RFE window/frame/dialog always on top @author dom@sparc.spb.su: area=awt.toplevel diff --git a/jdk/test/java/awt/Window/ChildProperties/ChildWindowProperties.java b/jdk/test/java/awt/Window/ChildProperties/ChildWindowProperties.java index a6a23184d39..c2ee10f1cdb 100644 --- a/jdk/test/java/awt/Window/ChildProperties/ChildWindowProperties.java +++ b/jdk/test/java/awt/Window/ChildProperties/ChildWindowProperties.java @@ -21,12 +21,14 @@ * questions. */ - /* - @test - @bug 8057574 - @summary Verify that child Window does not inherit parent's Properties - @run main ChildWindowProperties +/* + * @test + * @key headful + * @bug 8057574 + * @summary Verify that child Window does not inherit parent's Properties + * @run main ChildWindowProperties */ + import java.awt.Color; import java.awt.Dialog; import java.awt.Font; diff --git a/jdk/test/java/awt/Window/GetScreenLocation/GetScreenLocationTest.java b/jdk/test/java/awt/Window/GetScreenLocation/GetScreenLocationTest.java index 5aba90b4b80..af7940bc5a7 100644 --- a/jdk/test/java/awt/Window/GetScreenLocation/GetScreenLocationTest.java +++ b/jdk/test/java/awt/Window/GetScreenLocation/GetScreenLocationTest.java @@ -23,8 +23,9 @@ /** * @test @summary setLocationRelativeTo stopped working in Ubuntu 13.10 (Unity) - * @bug 8036915 - * @run main GetScreenLocationTest + * @bug 8036915 8161273 + * @run main/othervm -Dsun.java2d.uiScale=1 GetScreenLocationTest + * @run main/othervm -Dsun.java2d.uiScale=2 GetScreenLocationTest */ import java.awt.*; @@ -33,28 +34,28 @@ public class GetScreenLocationTest { public static void main(String[] args) throws Exception { Robot robot = new Robot(); Window frame = null; - for(int i = 0; i < 50; i++) { + for(int i = 0; i < 30; i++) { if(frame != null) frame.dispose(); frame = new Dialog((Frame)null); - frame.setBounds(0, 0, 200, 200); + frame.setBounds(0, 0, 200, 100); frame.setVisible(true); robot.waitForIdle(); robot.delay(200); - frame.setLocation(321, 321); + frame.setLocation(321, 121); robot.waitForIdle(); robot.delay(200); Dimension size = frame.getSize(); - if(size.width != 200 || size.height != 200) { + if(size.width != 200 || size.height != 100) { frame.dispose(); throw new RuntimeException("getSize() is wrong " + size); } Rectangle r = frame.getBounds(); frame.dispose(); - if(r.x != 321 || r.y != 321) { + if(r.x != 321 || r.y != 121) { throw new RuntimeException("getLocation() returns " + "wrong coordinates " + r.getLocation()); } - if(r.width != 200 || r.height != 200) { + if(r.width != 200 || r.height != 100) { throw new RuntimeException("getSize() is wrong " + r.getSize()); } } diff --git a/jdk/test/java/awt/Window/MaximizeOffscreen/MaximizeOffscreenTest.java b/jdk/test/java/awt/Window/MaximizeOffscreen/MaximizeOffscreenTest.java index 78155f3b9b3..31d931ef244 100644 --- a/jdk/test/java/awt/Window/MaximizeOffscreen/MaximizeOffscreenTest.java +++ b/jdk/test/java/awt/Window/MaximizeOffscreen/MaximizeOffscreenTest.java @@ -23,6 +23,7 @@ /** * @test @summary JVM crash if the frame maximized from offscreen + * @key headful * @bug 8020210 * @author Petr Pchelko * @library ../../regtesthelpers diff --git a/jdk/test/java/awt/Window/OwnedWindowsSerialization/OwnedWindowsSerialization.java b/jdk/test/java/awt/Window/OwnedWindowsSerialization/OwnedWindowsSerialization.java index 9100c500674..0b3b7995593 100644 --- a/jdk/test/java/awt/Window/OwnedWindowsSerialization/OwnedWindowsSerialization.java +++ b/jdk/test/java/awt/Window/OwnedWindowsSerialization/OwnedWindowsSerialization.java @@ -28,7 +28,9 @@ import java.io.ByteArrayOutputStream; import java.io.ObjectInputStream; import java.io.ObjectOutputStream; -/* @test +/* + * @test + * @key headful * @bug 8027152 * @summary Checks that ownedWindowList is serialized and deserialized properly and alwaysOnTop works after deserialization * @author Petr Pchelko diff --git a/jdk/test/java/awt/Window/TopLevelLocation/TopLevelLocation.java b/jdk/test/java/awt/Window/TopLevelLocation/TopLevelLocation.java index 9e229b7198f..15301882151 100644 --- a/jdk/test/java/awt/Window/TopLevelLocation/TopLevelLocation.java +++ b/jdk/test/java/awt/Window/TopLevelLocation/TopLevelLocation.java @@ -23,6 +23,7 @@ /** * @test + * @key headful * @bug 8027628 * @author Oleg Pekhovskiy * @summary JWindow jumps to (0, 0) after mouse clicked diff --git a/jdk/test/java/awt/Window/WindowGCInFullScreen/WindowGCInFullScreen.java b/jdk/test/java/awt/Window/WindowGCInFullScreen/WindowGCInFullScreen.java index 2b044def4b0..edc7bcedd19 100644 --- a/jdk/test/java/awt/Window/WindowGCInFullScreen/WindowGCInFullScreen.java +++ b/jdk/test/java/awt/Window/WindowGCInFullScreen/WindowGCInFullScreen.java @@ -32,6 +32,7 @@ import javax.swing.SwingUtilities; /** * @test + * @key headful * @bug 8019591 * @author Sergey Bylokhov */ diff --git a/jdk/test/java/awt/Window/WindowJumpingTest/WindowJumpingTest.java b/jdk/test/java/awt/Window/WindowJumpingTest/WindowJumpingTest.java index f2e210053e7..f73f0585450 100644 --- a/jdk/test/java/awt/Window/WindowJumpingTest/WindowJumpingTest.java +++ b/jdk/test/java/awt/Window/WindowJumpingTest/WindowJumpingTest.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8080729 * @summary Dialogs on multiscreen jump to parent frame on focus gain * @author Dmitry Markov diff --git a/jdk/test/java/awt/Window/WindowsLeak/WindowsLeak.java b/jdk/test/java/awt/Window/WindowsLeak/WindowsLeak.java index 584025fd5ab..7dca9e9c2c2 100644 --- a/jdk/test/java/awt/Window/WindowsLeak/WindowsLeak.java +++ b/jdk/test/java/awt/Window/WindowsLeak/WindowsLeak.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8013563 8028486 * @summary Tests that windows are removed from windows list * @library /javax/swing/regtesthelpers diff --git a/jdk/test/java/awt/datatransfer/DataFlavor/NullDataFlavorTest.java b/jdk/test/java/awt/datatransfer/DataFlavor/NullDataFlavorTest.java index 6880f3e2551..4b7ab8498ac 100644 --- a/jdk/test/java/awt/datatransfer/DataFlavor/NullDataFlavorTest.java +++ b/jdk/test/java/awt/datatransfer/DataFlavor/NullDataFlavorTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 4682039 @summary Tests that DataTransferer.getFormatsForFlavors() does not throw NullPointerException if some of given as parameter data flavors diff --git a/jdk/test/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java b/jdk/test/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java index 844ca26c787..3a7ea0c5995 100644 --- a/jdk/test/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java +++ b/jdk/test/java/awt/datatransfer/UnicodeTransferTest/UnicodeTransferTest.java @@ -24,6 +24,7 @@ /* @test + @key headful @bug 4718897 @summary tests that a Unicode string can be transferred between JVMs. @author das@sparc.spb.su area=datatransfer diff --git a/jdk/test/java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java b/jdk/test/java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java index a2a4f519214..f632be72a10 100644 --- a/jdk/test/java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java +++ b/jdk/test/java/awt/dnd/AcceptDropMultipleTimes/AcceptDropMultipleTimes.java @@ -23,6 +23,7 @@ /** * @test + * @key headful * @bug 8029979 * @summary Checks if acceptDrop() can be called several times * @library ../../regtesthelpers diff --git a/jdk/test/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java b/jdk/test/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java index bfeb4bda85a..93a1bad46eb 100644 --- a/jdk/test/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java +++ b/jdk/test/java/awt/dnd/DisposeFrameOnDragCrash/DisposeFrameOnDragTest.java @@ -23,6 +23,7 @@ /** * @test @summary JVM crash if the frame is disposed in DropTargetListener + * @key headful * @author Petr Pchelko * @library ../../regtesthelpers * @build Util diff --git a/jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java b/jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java index 16d938f98f6..cafd01b0daa 100644 --- a/jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java +++ b/jdk/test/java/awt/dnd/DropTargetEnterExitTest/ExtraDragEnterTest.java @@ -23,6 +23,7 @@ /** * @test + * @key headful * @bug 8024163 * @summary Checks the dragEnter event is correctly generated * @library ../../regtesthelpers diff --git a/jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java b/jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java index 3863667c8b2..7b53573b10d 100644 --- a/jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java +++ b/jdk/test/java/awt/dnd/DropTargetEnterExitTest/MissedDragExitTest.java @@ -23,6 +23,7 @@ /** * @test + * @key headful * @bug 8024163 * @summary Checks that dragExit is generated when the new DropTarget is created under the drag * @library ../../regtesthelpers diff --git a/jdk/test/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java b/jdk/test/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java index 8854c7d74a5..5a5b225f5a4 100644 --- a/jdk/test/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java +++ b/jdk/test/java/awt/dnd/MissingDragExitEventTest/MissingDragExitEventTest.java @@ -23,6 +23,7 @@ /** * @test + * @key headful * @bug 8027913 * @library ../../regtesthelpers * @build Util diff --git a/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java b/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java index 9eac6021fe4..50b86b360d2 100644 --- a/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java +++ b/jdk/test/java/awt/event/KeyEvent/AltCharAcceleratorTest/AltCharAcceleratorTest.java @@ -22,13 +22,14 @@ */ /* -@test -@bug 8068283 -@summary Checks that +Char accelerators work when pressed in a text component -@author Anton Nashatyrev -@modules java.desktop/sun.awt -@run main AltCharAcceleratorTest -*/ + * @test + * @key headful + * @bug 8068283 + * @summary Checks that +Char accelerators work when pressed in a text component + * @author Anton Nashatyrev + * @modules java.desktop/sun.awt + * @run main AltCharAcceleratorTest + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java b/jdk/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java index 259f1fcd458..9b2c9045b85 100644 --- a/jdk/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java +++ b/jdk/test/java/awt/event/KeyEvent/CorrectTime/CorrectTime.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6451578 @library ../../../regtesthelpers @build Sysout AbstractTest Util diff --git a/jdk/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java b/jdk/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java index 8acf2e44afe..8c4a38eb647 100644 --- a/jdk/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java +++ b/jdk/test/java/awt/event/KeyEvent/ExtendedKeyCode/ExtendedKeyCodeTest.java @@ -28,6 +28,7 @@ import java.awt.event.KeyAdapter; /* * @test + * @key headful * @bug 8007156 8025126 * @summary Extended key code is not set for a key event * @author Alexandr Scherbatiy diff --git a/jdk/test/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java b/jdk/test/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java index ee473eabdd5..dd9786e2166 100644 --- a/jdk/test/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java +++ b/jdk/test/java/awt/event/KeyEvent/ExtendedModifiersTest/ExtendedModifiersTest.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8043126 8145116 * @summary Check whether * 1. correct extended modifiers are returned @@ -281,4 +282,4 @@ public class ExtendedModifiersTest implements KeyListener { ExtendedModifiersTest test = new ExtendedModifiersTest(); test.doTest(); } -} \ No newline at end of file +} diff --git a/jdk/test/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java b/jdk/test/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java index 3400444ebbd..2b8dc0d2f72 100644 --- a/jdk/test/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java +++ b/jdk/test/java/awt/event/KeyEvent/KeyMaskTest/KeyMaskTest.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 8043126 * @summary Check whether KeyEvent.getModifiers() returns correct modifiers * when Ctrl, Alt or Shift keys are pressed. diff --git a/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java b/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java index 5b62bf6712a..ddf5a0fd745 100644 --- a/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java +++ b/jdk/test/java/awt/event/KeyEvent/SwallowKeyEvents/SwallowKeyEvents.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 7154072 7161320 @summary Tests that key events with modifiers are not swallowed. @author anton.tarasov: area=awt.focus diff --git a/jdk/test/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java b/jdk/test/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java index 3da25c6d9c0..d16cd41088e 100644 --- a/jdk/test/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java +++ b/jdk/test/java/awt/event/MouseEvent/DisabledComponents/DisabledComponentsTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 4173714 @summary java.awt.button behaves differently under Win32/Solaris @author tdv@sparc.spb.su diff --git a/jdk/test/java/awt/event/MouseEvent/EnterAsGrabbedEvent/EnterAsGrabbedEvent.java b/jdk/test/java/awt/event/MouseEvent/EnterAsGrabbedEvent/EnterAsGrabbedEvent.java index 8f62e4ffd8a..9757b4032fd 100644 --- a/jdk/test/java/awt/event/MouseEvent/EnterAsGrabbedEvent/EnterAsGrabbedEvent.java +++ b/jdk/test/java/awt/event/MouseEvent/EnterAsGrabbedEvent/EnterAsGrabbedEvent.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6317481 8012325 @summary REG:Pressing the mouse, dragging and releasing it outside the button triggers ActionEvent, XAWT @author Dmitry.Cherepanov@SUN.COM area=awt.event diff --git a/jdk/test/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java b/jdk/test/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java index 850679c6d44..8733b3af7f1 100644 --- a/jdk/test/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java +++ b/jdk/test/java/awt/event/MouseEvent/MouseButtonsAndKeyMasksTest/MouseButtonsAndKeyMasksTest.java @@ -40,6 +40,7 @@ import test.java.awt.event.helpers.lwcomponents.LWList; /* * @test + * @key headful * @bug 8043126 * @summary Check whether MouseEvent.getModifiers(), MouseEvent.getModifiersEx() * and KeyEvent.getModifiers() return correct modifiers when pressing diff --git a/jdk/test/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java b/jdk/test/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java index cc36b0c35b8..49459e49404 100644 --- a/jdk/test/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java +++ b/jdk/test/java/awt/event/MouseEvent/MouseButtonsTest/MouseButtonsTest.java @@ -38,6 +38,7 @@ import static jdk.testlibrary.Asserts.*; /* * @test + * @key headful * @bug 8043126 * @summary Check whether getButton() returns correct mouse button * number when the mouse buttons are pressed and getModifiers() diff --git a/jdk/test/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java b/jdk/test/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java index df143b78c05..11527a3d047 100644 --- a/jdk/test/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java +++ b/jdk/test/java/awt/event/MouseEvent/MultipleMouseButtonsTest/MultipleMouseButtonsTest.java @@ -32,6 +32,7 @@ import static jdk.testlibrary.Asserts.*; /* * @test + * @key headful * @bug 8043126 * @summary Check whether correct modifiers set when multiple mouse buttons were pressed; * check number of received events. diff --git a/jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java b/jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java index 42695a51763..d942395bc8a 100644 --- a/jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java +++ b/jdk/test/java/awt/event/MouseEvent/SpuriousExitEnter/SpuriousExitEnter_3.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6479820 @library ../../../regtesthelpers @build Util diff --git a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java index f0efaf12cc6..e2c42d3940a 100644 --- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java +++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6480024 @library ../../../regtesthelpers @build Util Sysout AbstractTest diff --git a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java index 0b6639a073e..c5f7d174be6 100644 --- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java +++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_1.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6480024 @library ../../../regtesthelpers @build Util Sysout AbstractTest diff --git a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java index bf8fa1bb112..5dd576f7ff3 100644 --- a/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java +++ b/jdk/test/java/awt/event/MouseWheelEvent/InfiniteRecursion/InfiniteRecursion_4.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6480024 @library ../../../regtesthelpers @build Util Sysout AbstractTest diff --git a/jdk/test/java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java b/jdk/test/java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java index 28fd50a2664..8f16b03747e 100644 --- a/jdk/test/java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java +++ b/jdk/test/java/awt/event/MouseWheelEvent/WheelModifier/WheelModifier.java @@ -21,11 +21,14 @@ * questions. */ -/* @test +/* + @test + @key headful @bug 8041470 @summary JButtons stay pressed after they have lost focus if you use the mouse wheel @author Anton Nashatyrev -*/ + */ + import javax.swing.*; import java.awt.*; import java.awt.event.*; diff --git a/jdk/test/java/awt/event/TextEvent/TextEventSequenceTest/TextEventSequenceTest.java b/jdk/test/java/awt/event/TextEvent/TextEventSequenceTest/TextEventSequenceTest.java index 0c06ba162eb..416d88e900b 100644 --- a/jdk/test/java/awt/event/TextEvent/TextEventSequenceTest/TextEventSequenceTest.java +++ b/jdk/test/java/awt/event/TextEvent/TextEventSequenceTest/TextEventSequenceTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 4028580 * @summary TextArea does not send TextEvent when setText. Does for insert * @author kdm@sparc.spb.su: area= awt.TextAvent diff --git a/jdk/test/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java b/jdk/test/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java index 88103514d2c..04b21ecbff0 100644 --- a/jdk/test/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java +++ b/jdk/test/java/awt/grab/GrabOnUnfocusableToplevel/GrabOnUnfocusableToplevel.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6539458 @summary JPopupMenu does not display if invoker is instance of JWindow @author oleg.sukhodolsky area=awt.grab diff --git a/jdk/test/java/awt/im/memoryleak/InputContextMemoryLeakTest.java b/jdk/test/java/awt/im/memoryleak/InputContextMemoryLeakTest.java index 04e4a333cdd..a557702b669 100644 --- a/jdk/test/java/awt/im/memoryleak/InputContextMemoryLeakTest.java +++ b/jdk/test/java/awt/im/memoryleak/InputContextMemoryLeakTest.java @@ -36,6 +36,7 @@ import test.java.awt.regtesthelpers.Util; /* @test + @key headful @bug 7079260 @summary XInputContext leaks memory by needRecetXXIClient field @author Petr Pchelko diff --git a/jdk/test/java/awt/image/LookupOp/RasterOpNullDestinationRasterTest.java b/jdk/test/java/awt/image/LookupOp/RasterOpNullDestinationRasterTest.java new file mode 100644 index 00000000000..dd705adb2bb --- /dev/null +++ b/jdk/test/java/awt/image/LookupOp/RasterOpNullDestinationRasterTest.java @@ -0,0 +1,61 @@ +/* + * Copyright (c) 2016, 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 6427331 + * @summary Test to check there is no NullPointerException raised if + * null raster is provided as destination in case of RasterOp.filter() + * @run main RasterOpNullDestinationRasterTest + */ + +import java.awt.Point; +import java.awt.image.ByteLookupTable; +import java.awt.image.DataBuffer; +import java.awt.image.DataBufferByte; +import java.awt.image.LookupOp; +import java.awt.image.PixelInterleavedSampleModel; +import java.awt.image.Raster; +import java.awt.image.RasterOp; +import java.awt.image.SampleModel; + +public class RasterOpNullDestinationRasterTest { + + public static void main(String[] args) { + + byte[][] data = new byte[1][10]; + ByteLookupTable lut = new ByteLookupTable(0, data); + RasterOp op = new LookupOp(lut, null); + + int[] bandOffsets = {0}; + Point location = new Point(0, 0); + DataBuffer db = new DataBufferByte(10 * 10); + SampleModel sm = new PixelInterleavedSampleModel(DataBuffer.TYPE_BYTE, + 10, 10, 1, 10, + bandOffsets); + + Raster src = Raster.createRaster(sm, db, location); + + op.filter(src, null); // this used to result in NullPointerException + } +} diff --git a/jdk/test/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java b/jdk/test/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java index 9a09f5c300f..a50940cbf38 100644 --- a/jdk/test/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java +++ b/jdk/test/java/awt/image/multiresolution/MenuMultiresolutionIconTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8150258 * @author a.stepanov * @summary Check that correct resolution variants are chosen for menu icons diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionIcon/IconTest.java b/jdk/test/java/awt/image/multiresolution/MultiResolutionIcon/IconTest.java new file mode 100644 index 00000000000..985041f6a1c --- /dev/null +++ b/jdk/test/java/awt/image/multiresolution/MultiResolutionIcon/IconTest.java @@ -0,0 +1,163 @@ +/** + * Copyright (c) 2016, 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 8147648 + * @summary [hidpi] multiresolution image: wrong resolution variant is used as + * icon in the Unity panel + * @run main/othervm -Dsun.java2d.uiScale=2 IconTest + */ +import java.awt.Color; +import java.awt.Graphics; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.image.BaseMultiResolutionImage; +import java.awt.image.BufferedImage; +import java.util.concurrent.CountDownLatch; +import javax.swing.ImageIcon; +import javax.swing.JButton; +import javax.swing.JFrame; +import javax.swing.JLabel; +import javax.swing.JPanel; +import javax.swing.SwingUtilities; + +public class IconTest { + + private final static int SZ = 8; + private static GridBagLayout layout; + private static JPanel mainControlPanel; + private static JPanel resultButtonPanel; + private static JLabel instructionText; + private static JButton passButton; + private static JButton failButton; + private static JButton testButton; + private static JFrame f; + private static CountDownLatch latch; + + private static BufferedImage generateImage(int scale, Color c) { + int x = SZ * scale; + BufferedImage img = new BufferedImage(x, x, BufferedImage.TYPE_INT_RGB); + Graphics g = img.getGraphics(); + try { + if (g != null) { + g.setColor(c); + g.fillRect(0, 0, x, x); + g.setColor(Color.YELLOW); + g.drawRect(0, 0, x-1, x-1); + } + } finally { + g.dispose(); + } + return img; + } + + + private static void createUI() throws Exception { + SwingUtilities.invokeAndWait(new Runnable() { + public void run() { + f = new JFrame("TrayIcon Test"); + + final BaseMultiResolutionImage IMG = new BaseMultiResolutionImage( + new BufferedImage[]{generateImage(1, Color.RED), generateImage(2, Color.BLUE)}); + layout = new GridBagLayout(); + mainControlPanel = new JPanel(layout); + resultButtonPanel = new JPanel(layout); + f.setIconImage(IMG); + GridBagConstraints gbc = new GridBagConstraints(); + String instructions + = "INSTRUCTIONS:
" + + "Check if test button and unity icons are both blue with yellow border.

" + + "If Icon color is blue press pass" + + " else press fail.

"; + + instructionText = new JLabel(); + instructionText.setText(instructions); + + gbc.gridx = 0; + gbc.gridy = 0; + gbc.fill = GridBagConstraints.HORIZONTAL; + mainControlPanel.add(instructionText, gbc); + testButton = new JButton("Test"); + testButton.setActionCommand("Test"); + mainControlPanel.add(testButton, gbc); + + testButton.setIcon(new ImageIcon(IMG)); + gbc.gridx = 0; + gbc.gridy = 0; + resultButtonPanel.add(testButton, gbc); + + passButton = new JButton("Pass"); + passButton.setActionCommand("Pass"); + passButton.addActionListener((ActionEvent e) -> { + latch.countDown(); + f.dispose(); + }); + failButton = new JButton("Fail"); + failButton.setActionCommand("Fail"); + failButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + latch.countDown(); + f.dispose(); + throw new RuntimeException("Test Failed"); + } + }); + gbc.gridx = 1; + gbc.gridy = 0; + resultButtonPanel.add(passButton, gbc); + gbc.gridx = 2; + gbc.gridy = 0; + resultButtonPanel.add(failButton, gbc); + + gbc.gridx = 0; + gbc.gridy = 1; + mainControlPanel.add(resultButtonPanel, gbc); + + f.add(mainControlPanel); + f.setSize(400, 200); + f.setLocationRelativeTo(null); + f.setVisible(true); + + f.addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + latch.countDown(); + f.dispose(); + } + }); + } + }); + } + + public static void main(String[] args) throws Exception { + latch = new CountDownLatch(1); + createUI(); + latch.await(); + } +} + diff --git a/jdk/test/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java b/jdk/test/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java index ea3cee55515..4f829144750 100644 --- a/jdk/test/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java +++ b/jdk/test/java/awt/image/multiresolution/MultiResolutionJOptionPaneIconTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 8150176 8150844 @author a.stepanov @summary Check if correct resolution variant is used diff --git a/jdk/test/java/awt/print/PrinterJob/BannerTest.java b/jdk/test/java/awt/print/PrinterJob/BannerTest.java new file mode 100644 index 00000000000..85f3329a36c --- /dev/null +++ b/jdk/test/java/awt/print/PrinterJob/BannerTest.java @@ -0,0 +1,160 @@ +/* + * Copyright (c) 2016, 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 6575247 + * @summary Verifies if Banner page is printed + * @requires (os.family == "linux" | os.family == "solaris") + * @run main/manual BannerTest + */ + +import java.awt.BorderLayout; +import java.awt.FlowLayout; +import java.awt.Graphics; +import java.awt.event.WindowAdapter; +import java.awt.event.WindowEvent; +import java.awt.print.PageFormat; +import java.awt.print.Printable; +import static java.awt.print.Printable.NO_SUCH_PAGE; +import static java.awt.print.Printable.PAGE_EXISTS; +import java.awt.print.PrinterException; +import java.awt.print.PrinterJob; +import javax.swing.JButton; +import javax.swing.JDialog; +import javax.swing.JPanel; +import javax.swing.JTextArea; +import javax.swing.SwingUtilities; + + +public class BannerTest implements Printable { + private static Thread mainThread; + private static boolean testPassed; + private static boolean testGeneratedInterrupt; + + public static void main(String[] args) throws Exception { + SwingUtilities.invokeAndWait(() -> { + doTest(BannerTest::printTest); + }); + mainThread = Thread.currentThread(); + try { + Thread.sleep(180000); + } catch (InterruptedException e) { + if (!testPassed && testGeneratedInterrupt) { + throw new RuntimeException("Banner page did not print"); + } + } + if (!testGeneratedInterrupt) { + throw new RuntimeException("user has not executed the test"); + } + } + + private static void printTest() { + PrinterJob job = PrinterJob.getPrinterJob(); + if (job.getPrintService() == null) { + System.out.println("No printers. Test cannot continue"); + return; + } + job.setPrintable(new BannerTest()); + if(job.printDialog()) { + try { + job.print(); + } catch (PrinterException e) { + e.printStackTrace(); + fail(); + } + } + } + + public static synchronized void pass() { + testPassed = true; + testGeneratedInterrupt = true; + mainThread.interrupt(); + } + + public static synchronized void fail() { + testPassed = false; + testGeneratedInterrupt = true; + mainThread.interrupt(); + } + + private static void doTest(Runnable action) { + String description + = " A print dialog will be shown.\n" + + " Click on the \"Appearance\" tab.\n " + + " Select the \"Banner page\" checkbox.\n" + + " Click on Print, and check if Banner page is printed.\n " + + " If Banner page is printed, press PASS else press FAIL"; + + final JDialog dialog = new JDialog(); + dialog.setTitle("printBannerTest"); + JTextArea textArea = new JTextArea(description); + textArea.setEditable(false); + final JButton testButton = new JButton("Start Test"); + final JButton passButton = new JButton("PASS"); + passButton.setEnabled(false); + passButton.addActionListener((e) -> { + dialog.dispose(); + pass(); + }); + final JButton failButton = new JButton("FAIL"); + failButton.setEnabled(false); + failButton.addActionListener((e) -> { + dialog.dispose(); + fail(); + }); + testButton.addActionListener((e) -> { + testButton.setEnabled(false); + action.run(); + passButton.setEnabled(true); + failButton.setEnabled(true); + }); + JPanel mainPanel = new JPanel(new BorderLayout()); + mainPanel.add(textArea, BorderLayout.CENTER); + JPanel buttonPanel = new JPanel(new FlowLayout()); + buttonPanel.add(testButton); + buttonPanel.add(passButton); + buttonPanel.add(failButton); + mainPanel.add(buttonPanel, BorderLayout.SOUTH); + dialog.add(mainPanel); + dialog.pack(); + dialog.setVisible(true); + dialog.addWindowListener(new WindowAdapter() { + @Override + public void windowClosing(WindowEvent e) { + System.out.println("main dialog closing"); + testGeneratedInterrupt = false; + mainThread.interrupt(); + } + }); + } + + @Override + public int print(Graphics g, PageFormat pf, int pi) + throws PrinterException { + System.out.println("pi = " + pi); + g.drawString("Testing", 100, 100); + if (pi == 1) + return NO_SUCH_PAGE; + return PAGE_EXISTS; + } +} diff --git a/jdk/test/java/awt/print/PrinterJob/LandscapeStackOverflow.java b/jdk/test/java/awt/print/PrinterJob/LandscapeStackOverflow.java index 66a4ebd369c..ced2385a7c4 100644 --- a/jdk/test/java/awt/print/PrinterJob/LandscapeStackOverflow.java +++ b/jdk/test/java/awt/print/PrinterJob/LandscapeStackOverflow.java @@ -22,6 +22,7 @@ */ /* * @test + * @key headful * @bug 6842011 8158758 * @summary Test if StackOverflowError occurs during printing landscape with * scale and transform. diff --git a/jdk/test/java/lang/ProcessBuilder/Zombies.java b/jdk/test/java/lang/ProcessBuilder/Zombies.java index 91cbd210653..30f296cc513 100644 --- a/jdk/test/java/lang/ProcessBuilder/Zombies.java +++ b/jdk/test/java/lang/ProcessBuilder/Zombies.java @@ -23,7 +23,8 @@ /* * @test - * @bug 6474073 + * @run main/othervm Zombies + * @bug 6474073 6180151 * @key intermittent * @summary Make sure zombies don't get created on Unix * @author Martin Buchholz @@ -65,22 +66,21 @@ public class Zombies { Process p = rt.exec(TrueCommand); ProcessHandle pp = p.toHandle().parent().orElse(null); - System.out.printf("pid: %d, parent: %s%n", p.getPid(), pp); + System.out.printf("%s pid: %d, parent: %s%n", TrueCommand, p.getPid(), pp); p.waitFor(); // Count all the zombies that are children of this Java process final String[] zombieCounter = { "/usr/bin/perl", "-e", - "exit @{[`/bin/ps -eo ppid,s` =~ /^ *@{[getppid]} +Z$/mog]}" + "$a=`/bin/ps -eo ppid,pid,s,command`;" + + "print @b=$a=~/^ *@{[getppid]} +[0-9]+ +Z.*$/mog;" + + "exit @b" }; - int zombies = rt.exec(zombieCounter).waitFor(); + ProcessBuilder pb = new ProcessBuilder(zombieCounter); + pb.inheritIO(); + int zombies = pb.start().waitFor(); if (zombies != 0) { - // Log remaining processes - ProcessBuilder pb = new ProcessBuilder("/bin/ps", "-ef"); - pb.inheritIO(); - Process p2 = pb.start(); - p2.waitFor(); throw new Error(zombies + " zombies!"); } } diff --git a/jdk/test/java/lang/Runtime/exec/LotsOfOutput.java b/jdk/test/java/lang/Runtime/exec/LotsOfOutput.java index a77ffcb01a0..33d35f093f6 100644 --- a/jdk/test/java/lang/Runtime/exec/LotsOfOutput.java +++ b/jdk/test/java/lang/Runtime/exec/LotsOfOutput.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2002, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2002, 2016, 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 @@ -25,7 +25,6 @@ * @test * @bug 4369826 8078582 * @summary Process with lots of output should not crash VM - * @key intermittent * @author kladko */ diff --git a/jdk/test/java/lang/StackWalker/VerifyStackTrace.java b/jdk/test/java/lang/StackWalker/VerifyStackTrace.java index 829fb17b756..eb4a5085a5a 100644 --- a/jdk/test/java/lang/StackWalker/VerifyStackTrace.java +++ b/jdk/test/java/lang/StackWalker/VerifyStackTrace.java @@ -205,6 +205,8 @@ public class VerifyStackTrace { .replaceAll("java.base@(\\d+\\.){0,3}(\\d+)/", "java.base/") .replaceAll("/[0-9]+\\.run", "/xxxxxxxx.run") .replaceAll("/[0-9]+\\.invoke", "/xxxxxxxx.invoke") + .replaceAll("DirectMethodHandle\\$Holder", "LambdaForm\\$DMH") + .replaceAll("DMH\\.invoke", "DMH/xxxxxxxx.invoke") .replaceAll("\\$[0-9]+", "\\$??"); } else { return produced; diff --git a/jdk/test/java/lang/annotation/AnnotationToStringTest.java b/jdk/test/java/lang/annotation/AnnotationToStringTest.java new file mode 100644 index 00000000000..ffcbcb4229d --- /dev/null +++ b/jdk/test/java/lang/annotation/AnnotationToStringTest.java @@ -0,0 +1,293 @@ +/* + * Copyright (c) 2016, 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 8162817 + * @summary Test of toString on normal annotations + */ + +import java.lang.annotation.*; +import java.lang.reflect.*; +import java.util.*; + +/** + * The expected string values are stored in @ExpectedString + * annotations. The essence of the test is comparing the toString() + * result of annotations to the corresponding ExpectedString.value(). + */ + +public class AnnotationToStringTest { + public static void main(String... args) throws Exception { + int failures = 0; + + failures += check(PrimHost.class.getAnnotation(ExpectedString.class).value(), + PrimHost.class.getAnnotation(MostlyPrimitive.class).toString()); + failures += classyTest(); + failures += arrayAnnotationTest(); + + if (failures > 0) + throw new RuntimeException(failures + " failures"); + } + + private static int check(String expected, String actual) { + if (!expected.equals(actual)) { + System.err.printf("ERROR: Expected ''%s'';%ngot ''%s''.\n", + expected, actual); + return 1; + } else + return 0; + } + + @ExpectedString( + "@MostlyPrimitive(c0='a', "+ + "c1='\\'', " + + "i0=1, " + + "i1=2, " + + "f0=1.0f, " + + "f1=0.0f/0.0f, " + + "d0=0.0, " + + "d1=1.0/0.0, " + + "l0=5, " + + "l1=9223372036854775807L, " + + "s0=\"Hello world.\", " + + "s1=\"a\\\"b\", " + + "class0=Obj[].class)") + @MostlyPrimitive( + c0='a', + c1='\'', + i0=1, + i1=2, + f0=1.0f, + f1=Float.NaN, + d0=0.0, + d1=2.0/0.0, + l0=5, + l1=Long.MAX_VALUE, + s0="Hello world.", + s1="a\"b", + class0=Obj[].class + ) + static class PrimHost{} + + private static int classyTest() { + int failures = 0; + for (Field f : AnnotationHost.class.getFields()) { + Annotation a = f.getAnnotation(Classy.class); + System.out.println(a); + failures += check(f.getAnnotation(ExpectedString.class).value(), + a.toString()); + } + return failures; + } + + static class AnnotationHost { + @ExpectedString( + "@Classy(value=Obj.class)") + @Classy(value=Obj.class) + public int f0; + + @ExpectedString( + "@Classy(value=Obj[].class)") + @Classy(value=Obj[].class) + public int f1; + + @ExpectedString( + "@Classy(value=Obj[][].class)") + @Classy(value=Obj[][].class) + public int f2; + + @ExpectedString( + "@Classy(value=Obj[][][].class)") + @Classy(value=Obj[][][].class) + public int f3; + + @ExpectedString( + "@Classy(value=int.class)") + @Classy(value=int.class) + public int f4; + + @ExpectedString( + "@Classy(value=int[][][].class)") + @Classy(value=int[][][].class) + public int f5; + } + + /** + * Each field should have two annotations, the first being + * @ExpectedString and the second the annotation under test. + */ + private static int arrayAnnotationTest() { + int failures = 0; + for (Field f : ArrayAnnotationHost.class.getFields()) { + Annotation[] annotations = f.getAnnotations(); + System.out.println(annotations[1]); + failures += check(((ExpectedString)annotations[0]).value(), + annotations[1].toString()); + } + return failures; + } + + static class ArrayAnnotationHost { + @ExpectedString( + "@BooleanArray(value={true, false, true})") + @BooleanArray(value={true, false, true}) + public boolean[] f0; + + @ExpectedString( + "@FloatArray(value={3.0f, 4.0f, 0.0f/0.0f, -1.0f/0.0f, 1.0f/0.0f})") + @FloatArray(value={3.0f, 4.0f, Float.NaN, Float.NEGATIVE_INFINITY, Float.POSITIVE_INFINITY}) + public float[] f1; + + @ExpectedString( + "@DoubleArray(value={1.0, 2.0, 0.0/0.0, 1.0/0.0, -1.0/0.0})") + @DoubleArray(value={1.0, 2.0, Double.NaN, Double.POSITIVE_INFINITY, Double.NEGATIVE_INFINITY,}) + public double[] f2; + + @ExpectedString( + "@ByteArray(value={10, 11, 12})") + @ByteArray(value={10, 11, 12}) + public byte[] f3; + + @ExpectedString( + "@ShortArray(value={0, 4, 5})") + @ShortArray(value={0, 4, 5}) + public short[] f4; + + @ExpectedString( + "@CharArray(value={'a', 'b', 'c', '\\''})") + @CharArray(value={'a', 'b', 'c', '\''}) + public char[] f5; + + @ExpectedString( + "@IntArray(value={1})") + @IntArray(value={1}) + public int[] f6; + + @ExpectedString( + "@LongArray(value={-2147483647, 2147483648L, 9223372036854775807L})") + @LongArray(value={-Integer.MAX_VALUE, Integer.MAX_VALUE+1L, Long.MAX_VALUE}) + public long[] f7; + + @ExpectedString( + "@StringArray(value={\"A\", \"B\", \"C\", \"\\\"Quote\\\"\"})") + @StringArray(value={"A", "B", "C", "\"Quote\""}) + public String[] f8; + + @ExpectedString( + "@ClassArray(value={int.class, Obj[].class})") + @ClassArray(value={int.class, Obj[].class}) + public Class[] f9; + + @ExpectedString( + "@EnumArray(value={SOURCE})") + @EnumArray(value={RetentionPolicy.SOURCE}) + public RetentionPolicy[] f10; + } +} + +// ------------ Supporting types ------------ + +class Obj {} + +@Retention(RetentionPolicy.RUNTIME) +@interface ExpectedString { + String value(); +} + +@Retention(RetentionPolicy.RUNTIME) +@interface Classy { + Class value(); +} + +@Retention(RetentionPolicy.RUNTIME) +@interface BooleanArray { + boolean[] value(); +} + +@Retention(RetentionPolicy.RUNTIME) +@interface FloatArray { + float[] value(); +} + +@Retention(RetentionPolicy.RUNTIME) +@interface DoubleArray { + double[] value(); +} + +@Retention(RetentionPolicy.RUNTIME) +@interface ByteArray { + byte[] value(); +} + +@Retention(RetentionPolicy.RUNTIME) +@interface ShortArray { + short[] value(); +} + +@Retention(RetentionPolicy.RUNTIME) +@interface CharArray { + char[] value(); +} + +@Retention(RetentionPolicy.RUNTIME) +@interface IntArray { + int[] value(); +} + +@Retention(RetentionPolicy.RUNTIME) +@interface LongArray { + long[] value(); +} + +@Retention(RetentionPolicy.RUNTIME) +@interface ClassArray { + Class[] value() default {int.class, Obj[].class}; +} + +@Retention(RetentionPolicy.RUNTIME) +@interface StringArray { + String[] value(); +} + +@Retention(RetentionPolicy.RUNTIME) +@interface EnumArray { + RetentionPolicy[] value(); +} + +@Retention(RetentionPolicy.RUNTIME) +@interface MostlyPrimitive { + char c0(); + char c1(); + int i0(); + int i1(); + float f0(); + float f1(); + double d0(); + double d1(); + long l0(); + long l1(); + String s0(); + String s1(); + Class class0(); +} diff --git a/jdk/test/java/lang/annotation/ParameterAnnotations.java b/jdk/test/java/lang/annotation/ParameterAnnotations.java index 4ea72d1ca70..623b4dc8982 100644 --- a/jdk/test/java/lang/annotation/ParameterAnnotations.java +++ b/jdk/test/java/lang/annotation/ParameterAnnotations.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2008, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 6761678 + * @bug 6761678 8162817 * @summary Check properties of Annotations returned from * getParameterAnnotations, including freedom from security * exceptions. @@ -89,8 +89,8 @@ public class ParameterAnnotations { equal(ann.length, 2); Annotation foo = ann[0][0]; Annotation bar = ann[1][0]; - equal(foo.toString(), "@Named(value=foo)"); - equal(bar.toString(), "@Named(value=bar)"); + equal(foo.toString(), "@Named(value=\"foo\")"); + equal(bar.toString(), "@Named(value=\"bar\")"); check(foo.equals(foo)); check(! foo.equals(bar)); } diff --git a/jdk/test/java/lang/invoke/VMAnonymousClass.java b/jdk/test/java/lang/invoke/VMAnonymousClass.java index 8cd24d21c41..f686b24c113 100644 --- a/jdk/test/java/lang/invoke/VMAnonymousClass.java +++ b/jdk/test/java/lang/invoke/VMAnonymousClass.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2014, 2016, 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 @@ -45,6 +45,7 @@ public class VMAnonymousClass { test.testJavaUtil(); test.testJdkInternalMisc(); test.testJavaLangInvoke(); + test.testProhibitedJavaPkg(); System.out.println("TEST PASSED"); } @@ -54,13 +55,29 @@ public class VMAnonymousClass { @Test public void testJavaUtil() throws Throwable { test("java/util"); } @Test public void testJdkInternalMisc() throws Throwable { test("jdk/internal/misc"); } @Test public void testJavaLangInvoke() throws Throwable { test("java/lang/invoke"); } + @Test public void testProhibitedJavaPkg() throws Throwable { + try { + test("java/prohibited"); + } catch (SecurityException e) { + return; + } + throw new RuntimeException("Expected SecurityException"); + } private static Unsafe unsafe = getUnsafe(); private static void test(String pkg) throws Throwable { byte[] bytes = dumpClass(pkg); - // Define VM anonymous class in privileged context (on BCP). - Class anonClass = unsafe.defineAnonymousClass(Object.class, bytes, null); + Class host_class; + if (pkg.equals("java/prohibited")) { + VMAnonymousClass sampleclass = new VMAnonymousClass(); + host_class = (Class)sampleclass.getClass(); + } else { + host_class = Object.class; + } + + // Define VM anonymous class + Class anonClass = unsafe.defineAnonymousClass(host_class, bytes, null); MethodType t = MethodType.methodType(Object.class, int.class); MethodHandle target = MethodHandles.lookup().findStatic(anonClass, "get", t); diff --git a/jdk/test/java/nio/Buffer/ByteBufferViews.java b/jdk/test/java/nio/Buffer/ByteBufferViews.java new file mode 100644 index 00000000000..dfa3f55c0ff --- /dev/null +++ b/jdk/test/java/nio/Buffer/ByteBufferViews.java @@ -0,0 +1,746 @@ +/* + * Copyright (c) 2016, 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 + * @summary Binary data and view tests for byte buffers + * @bug 8159257 + * @run testng ByteBufferViews + */ + +import org.testng.annotations.DataProvider; +import org.testng.annotations.Test; + +import java.nio.Buffer; +import java.nio.ByteBuffer; +import java.nio.ByteOrder; +import java.nio.CharBuffer; +import java.nio.DoubleBuffer; +import java.nio.FloatBuffer; +import java.nio.IntBuffer; +import java.nio.LongBuffer; +import java.nio.ShortBuffer; +import java.util.List; +import java.util.Map; +import java.util.function.Function; +import java.util.function.IntFunction; +import java.util.function.IntUnaryOperator; +import java.util.function.UnaryOperator; +import java.util.stream.Collectors; + +import static org.testng.Assert.*; + +public class ByteBufferViews { + static final int SIZE = 32; + + // List of buffer allocator functions + static final List>> BYTE_BUFFER_ALLOCATE_FUNCTIONS = List.of( + // Heap + Map.entry("ByteBuffer.allocate(ba)", + size -> ByteBuffer.allocate(size)), + // Aligned + Map.entry("ByteBuffer.allocate(size).position(8)", + size -> ByteBuffer.allocate(size).position(8)), + Map.entry("ByteBuffer.allocate(size).position(8).slice()", + size -> ByteBuffer.allocate(size).position(8).slice()), + Map.entry("ByteBuffer.allocate(size).position(8).slice().duplicate()", + size -> ByteBuffer.allocate(size).position(8).slice().duplicate()), + // Unaligned + Map.entry("ByteBuffer.allocate(size).position(1)", + size -> ByteBuffer.allocate(size).position(1)), + Map.entry("ByteBuffer.allocate(size).position(1).slice()", + size -> ByteBuffer.allocate(size).position(1).slice()), + Map.entry("ByteBuffer.allocate(size).position(1).slice().duplicate()", + size -> ByteBuffer.allocate(size).position(1).slice().duplicate()), + + // Off-heap + Map.entry("ByteBuffer.allocateDirect(size)", + size -> ByteBuffer.allocateDirect(size)), + // Aligned + Map.entry("ByteBuffer.allocateDirect(size).position(8)", + size -> ByteBuffer.allocateDirect(size).position(8)), + Map.entry("ByteBuffer.allocateDirect(size).position(8).slice()", + size -> ByteBuffer.allocateDirect(size).position(8).slice()), + Map.entry("ByteBuffer.allocateDirect(size).position(8).slice().duplicate()", + size -> ByteBuffer.allocateDirect(size).position(8).slice().duplicate()), + // Unaligned + Map.entry("ByteBuffer.allocateDirect(size).position(1)", + size -> ByteBuffer.allocateDirect(size).position(1)), + Map.entry("ByteBuffer.allocateDirect(size).position(1).slice()", + size -> ByteBuffer.allocateDirect(size).position(1).slice()), + Map.entry("ByteBuffer.allocateDirect(size).position(1).slice().duplicate()", + size -> ByteBuffer.allocateDirect(size).position(1).slice().duplicate()) + ); + + // List of buffer byte order functions + static final List>> BYTE_BUFFER_ORDER_FUNCTIONS = List.of( + Map.entry("order(ByteOrder.BIG_ENDIAN)", + (ByteBuffer bb) -> bb.order(ByteOrder.BIG_ENDIAN)), + Map.entry("order(ByteOrder.LITTLE_ENDIAN)", + (ByteBuffer bb) -> bb.order(ByteOrder.LITTLE_ENDIAN)) + ); + + // Produce a composition of allocation and byte order buffer functions + static List>> composeBufferFunctions( + List>> af, + List>> of) { + return af.stream().flatMap(afe -> of.stream(). + map(ofe -> { + String s = afe.getKey() + "." + ofe.getKey(); + IntFunction f = size -> ofe.getValue(). + apply(afe.getValue().apply(size)); + return Map.entry(s, f); + }) + ).collect(Collectors.toList()); + } + + // List of buffer allocator functions to test + static final List>> BYTE_BUFFER_FUNCTIONS = + composeBufferFunctions(BYTE_BUFFER_ALLOCATE_FUNCTIONS, BYTE_BUFFER_ORDER_FUNCTIONS); + + // Creates a cross product of test arguments for + // buffer allocator functions and buffer view functions + static Object[][] product(List> la, + List> lb) { + return la.stream().flatMap(lae -> lb.stream(). + map(lbe -> List.of( + lae.getKey() + " -> " + lbe.getKey(), + lae.getValue(), + lbe.getValue()).toArray() + )).toArray(Object[][]::new); + } + + static void assertValues(int i, Object bValue, Object bbValue, ByteBuffer bb) { + if (!bValue.equals(bbValue)) { + fail(String.format("Values %s and %s differ at index %d for %s", + bValue, bbValue, i, bb)); + } + } + + static void assertValues(int i, Object bbValue, Object bvValue, ByteBuffer bb, Buffer bv) { + if (!bbValue.equals(bvValue)) { + fail(String.format("Values %s and %s differ at index %d for %s and %s", + bbValue, bvValue, i, bb, bv)); + } + } + + static ByteBuffer allocate(IntFunction f) { + return allocate(f, i -> i); + } + + static ByteBuffer allocate(IntFunction f, IntUnaryOperator o) { + return fill(f.apply(SIZE), o); + } + + static ByteBuffer fill(ByteBuffer bb, IntUnaryOperator o) { + for (int i = 0; i < bb.limit(); i++) { + bb.put(i, (byte) o.applyAsInt(i)); + } + return bb; + } + + + @DataProvider + public static Object[][] shortViewProvider() { + List>> bfs = List.of( + Map.entry("bb.asShortBuffer()", + bb -> bb.asShortBuffer()), + Map.entry("bb.asShortBuffer().slice()", + bb -> bb.asShortBuffer().slice()), + Map.entry("bb.asShortBuffer().slice().duplicate()", + bb -> bb.asShortBuffer().slice().duplicate()) + ); + + return product(BYTE_BUFFER_FUNCTIONS, bfs); + } + + @Test(dataProvider = "shortViewProvider") + public void testShortGet(String desc, IntFunction fbb, + Function fbi) { + ByteBuffer bb = allocate(fbb); + ShortBuffer vb = fbi.apply(bb); + int o = bb.position(); + + for (int i = 0; i < vb.limit(); i++) { + short fromBytes = getShortFromBytes(bb, o + i * 2); + short fromMethodView = bb.getShort(o + i * 2); + assertValues(i, fromBytes, fromMethodView, bb); + + short fromBufferView = vb.get(i); + assertValues(i, fromMethodView, fromBufferView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + short v = getShortFromBytes(bb, o + i * 2); + short a = bb.getShort(); + assertValues(i, v, a, bb); + + short b = vb.get(); + assertValues(i, a, b, bb, vb); + } + + } + + @Test(dataProvider = "shortViewProvider") + public void testShortPut(String desc, IntFunction fbb, + Function fbi) { + ByteBuffer bbfilled = allocate(fbb); + ByteBuffer bb = allocate(fbb, i -> 0); + ShortBuffer vb = fbi.apply(bb); + int o = bb.position(); + + for (int i = 0; i < vb.limit(); i++) { + short fromFilled = bbfilled.getShort(o + i * 2); + + vb.put(i, fromFilled); + short fromMethodView = bb.getShort(o + i * 2); + assertValues(i, fromFilled, fromMethodView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + short fromFilled = bbfilled.getShort(o + i * 2); + + vb.put(fromFilled); + short fromMethodView = bb.getShort(); + assertValues(i, fromFilled, fromMethodView, bb, vb); + } + + + fill(bb, i -> 0); + bb.clear().position(o); + vb.clear(); + + for (int i = 0; i < vb.limit(); i++) { + short fromFilled = bbfilled.getShort(o + i * 2); + + bb.putShort(o + i * 2, fromFilled); + short fromBufferView = vb.get(i); + assertValues(i, fromFilled, fromBufferView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + short fromFilled = bbfilled.getShort(o + i * 2); + + bb.putShort(fromFilled); + short fromBufferView = vb.get(); + assertValues(i, fromFilled, fromBufferView, bb, vb); + } + } + + static short getShortFromBytes(ByteBuffer bb, int i) { + int a = bb.get(i) & 0xFF; + int b = bb.get(i + 1) & 0xFF; + + if (bb.order() == ByteOrder.BIG_ENDIAN) { + return (short) ((a << 8) | b); + } + else { + return (short) ((b << 8) | a); + } + } + + @DataProvider + public static Object[][] charViewProvider() { + List>> bfs = List.of( + Map.entry("bb.asCharBuffer()", + bb -> bb.asCharBuffer()), + Map.entry("bb.asCharBuffer().slice()", + bb -> bb.asCharBuffer().slice()), + Map.entry("bb.asCharBuffer().slice().duplicate()", + bb -> bb.asCharBuffer().slice().duplicate()) + ); + + return product(BYTE_BUFFER_FUNCTIONS, bfs); + } + + @Test(dataProvider = "charViewProvider") + public void testCharGet(String desc, IntFunction fbb, + Function fbi) { + ByteBuffer bb = allocate(fbb); + CharBuffer vb = fbi.apply(bb); + int o = bb.position(); + + for (int i = 0; i < vb.limit(); i++) { + char fromBytes = getCharFromBytes(bb, o + i * 2); + char fromMethodView = bb.getChar(o + i * 2); + assertValues(i, fromBytes, fromMethodView, bb); + + char fromBufferView = vb.get(i); + assertValues(i, fromMethodView, fromBufferView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + char fromBytes = getCharFromBytes(bb, o + i * 2); + char fromMethodView = bb.getChar(); + assertValues(i, fromBytes, fromMethodView, bb); + + char fromBufferView = vb.get(); + assertValues(i, fromMethodView, fromBufferView, bb, vb); + } + + } + + @Test(dataProvider = "charViewProvider") + public void testCharPut(String desc, IntFunction fbb, + Function fbi) { + ByteBuffer bbfilled = allocate(fbb); + ByteBuffer bb = allocate(fbb, i -> 0); + CharBuffer vb = fbi.apply(bb); + int o = bb.position(); + + for (int i = 0; i < vb.limit(); i++) { + char fromFilled = bbfilled.getChar(o + i * 2); + + vb.put(i, fromFilled); + char fromMethodView = bb.getChar(o + i * 2); + assertValues(i, fromFilled, fromMethodView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + char fromFilled = bbfilled.getChar(o + i * 2); + + vb.put(fromFilled); + char fromMethodView = bb.getChar(); + assertValues(i, fromFilled, fromMethodView, bb, vb); + } + + + fill(bb, i -> 0); + bb.clear().position(o); + vb.clear(); + + for (int i = 0; i < vb.limit(); i++) { + char fromFilled = bbfilled.getChar(o + i * 2); + + bb.putChar(o + i * 2, fromFilled); + char fromBufferView = vb.get(i); + assertValues(i, fromFilled, fromBufferView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + char fromFilled = bbfilled.getChar(o + i * 2); + + bb.putChar(fromFilled); + char fromBufferView = vb.get(); + assertValues(i, fromFilled, fromBufferView, bb, vb); + } + } + + static char getCharFromBytes(ByteBuffer bb, int i) { + return (char) getShortFromBytes(bb, i); + } + + + @DataProvider + public static Object[][] intViewProvider() { + List>> bfs = List.of( + Map.entry("bb.asIntBuffer()", + bb -> bb.asIntBuffer()), + Map.entry("bb.asIntBuffer().slice()", + bb -> bb.asIntBuffer().slice()), + Map.entry("bb.asIntBuffer().slice().duplicate()", + bb -> bb.asIntBuffer().slice().duplicate()) + ); + + return product(BYTE_BUFFER_FUNCTIONS, bfs); + } + + @Test(dataProvider = "intViewProvider") + public void testIntGet(String desc, IntFunction fbb, + Function fbi) { + ByteBuffer bb = allocate(fbb); + IntBuffer vb = fbi.apply(bb); + int o = bb.position(); + + for (int i = 0; i < vb.limit(); i++) { + int fromBytes = getIntFromBytes(bb, o + i * 4); + int fromMethodView = bb.getInt(o + i * 4); + assertValues(i, fromBytes, fromMethodView, bb); + + int fromBufferView = vb.get(i); + assertValues(i, fromMethodView, fromBufferView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + int v = getIntFromBytes(bb, o + i * 4); + int a = bb.getInt(); + assertValues(i, v, a, bb); + + int b = vb.get(); + assertValues(i, a, b, bb, vb); + } + + } + + @Test(dataProvider = "intViewProvider") + public void testIntPut(String desc, IntFunction fbb, + Function fbi) { + ByteBuffer bbfilled = allocate(fbb); + ByteBuffer bb = allocate(fbb, i -> 0); + IntBuffer vb = fbi.apply(bb); + int o = bb.position(); + + for (int i = 0; i < vb.limit(); i++) { + int fromFilled = bbfilled.getInt(o + i * 4); + + vb.put(i, fromFilled); + int fromMethodView = bb.getInt(o + i * 4); + assertValues(i, fromFilled, fromMethodView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + int fromFilled = bbfilled.getInt(o + i * 4); + + vb.put(fromFilled); + int fromMethodView = bb.getInt(); + assertValues(i, fromFilled, fromMethodView, bb, vb); + } + + + fill(bb, i -> 0); + bb.clear().position(o); + vb.clear(); + + for (int i = 0; i < vb.limit(); i++) { + int fromFilled = bbfilled.getInt(o + i * 4); + + bb.putInt(o + i * 4, fromFilled); + int fromBufferView = vb.get(i); + assertValues(i, fromFilled, fromBufferView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + int fromFilled = bbfilled.getInt(o + i * 4); + + bb.putInt(fromFilled); + int fromBufferView = vb.get(); + assertValues(i, fromFilled, fromBufferView, bb, vb); + } + } + + static int getIntFromBytes(ByteBuffer bb, int i) { + int a = bb.get(i) & 0xFF; + int b = bb.get(i + 1) & 0xFF; + int c = bb.get(i + 2) & 0xFF; + int d = bb.get(i + 3) & 0xFF; + + if (bb.order() == ByteOrder.BIG_ENDIAN) { + return ((a << 24) | (b << 16) | (c << 8) | d); + } + else { + return ((d << 24) | (c << 16) | (b << 8) | a); + } + } + + + @DataProvider + public static Object[][] longViewProvider() { + List>> bfs = List.of( + Map.entry("bb.asLongBuffer()", + bb -> bb.asLongBuffer()), + Map.entry("bb.asLongBuffer().slice()", + bb -> bb.asLongBuffer().slice()), + Map.entry("bb.asLongBuffer().slice().duplicate()", + bb -> bb.asLongBuffer().slice().duplicate()) + ); + + return product(BYTE_BUFFER_FUNCTIONS, bfs); + } + + @Test(dataProvider = "longViewProvider") + public void testLongGet(String desc, IntFunction fbb, + Function fbi) { + ByteBuffer bb = allocate(fbb); + LongBuffer vb = fbi.apply(bb); + int o = bb.position(); + + for (int i = 0; i < vb.limit(); i++) { + long fromBytes = getLongFromBytes(bb, o + i * 8); + long fromMethodView = bb.getLong(o + i * 8); + assertValues(i, fromBytes, fromMethodView, bb); + + long fromBufferView = vb.get(i); + assertValues(i, fromMethodView, fromBufferView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + long v = getLongFromBytes(bb, o + i * 8); + long a = bb.getLong(); + assertValues(i, v, a, bb); + + long b = vb.get(); + assertValues(i, a, b, bb, vb); + } + + } + + @Test(dataProvider = "longViewProvider") + public void testLongPut(String desc, IntFunction fbb, + Function fbi) { + ByteBuffer bbfilled = allocate(fbb); + ByteBuffer bb = allocate(fbb, i -> 0); + LongBuffer vb = fbi.apply(bb); + int o = bb.position(); + + for (int i = 0; i < vb.limit(); i++) { + long fromFilled = bbfilled.getLong(o + i * 8); + + vb.put(i, fromFilled); + long fromMethodView = bb.getLong(o + i * 8); + assertValues(i, fromFilled, fromMethodView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + long fromFilled = bbfilled.getLong(o + i * 8); + + vb.put(fromFilled); + long fromMethodView = bb.getLong(); + assertValues(i, fromFilled, fromMethodView, bb, vb); + } + + + fill(bb, i -> 0); + bb.clear().position(o); + vb.clear(); + + for (int i = 0; i < vb.limit(); i++) { + long fromFilled = bbfilled.getLong(o + i * 8); + + bb.putLong(o + i * 8, fromFilled); + long fromBufferView = vb.get(i); + assertValues(i, fromFilled, fromBufferView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + long fromFilled = bbfilled.getLong(o + i * 8); + + bb.putLong(fromFilled); + long fromBufferView = vb.get(); + assertValues(i, fromFilled, fromBufferView, bb, vb); + } + } + + static long getLongFromBytes(ByteBuffer bb, int i) { + long a = bb.get(i) & 0xFF; + long b = bb.get(i + 1) & 0xFF; + long c = bb.get(i + 2) & 0xFF; + long d = bb.get(i + 3) & 0xFF; + long e = bb.get(i + 4) & 0xFF; + long f = bb.get(i + 5) & 0xFF; + long g = bb.get(i + 6) & 0xFF; + long h = bb.get(i + 7) & 0xFF; + + if (bb.order() == ByteOrder.BIG_ENDIAN) { + return ((a << 56) | (b << 48) | (c << 40) | (d << 32) | + (e << 24) | (f << 16) | (g << 8) | h); + } + else { + return ((h << 56) | (g << 48) | (f << 40) | (e << 32) | + (d << 24) | (c << 16) | (b << 8) | a); + } + } + + + @DataProvider + public static Object[][] floatViewProvider() { + List>> bfs = List.of( + Map.entry("bb.asFloatBuffer()", + bb -> bb.asFloatBuffer()), + Map.entry("bb.asFloatBuffer().slice()", + bb -> bb.asFloatBuffer().slice()), + Map.entry("bb.asFloatBuffer().slice().duplicate()", + bb -> bb.asFloatBuffer().slice().duplicate()) + ); + + return product(BYTE_BUFFER_FUNCTIONS, bfs); + } + + @Test(dataProvider = "floatViewProvider") + public void testFloatGet(String desc, IntFunction fbb, + Function fbi) { + ByteBuffer bb = allocate(fbb); + FloatBuffer vb = fbi.apply(bb); + int o = bb.position(); + + for (int i = 0; i < vb.limit(); i++) { + float fromBytes = getFloatFromBytes(bb, o + i * 4); + float fromMethodView = bb.getFloat(o + i * 4); + assertValues(i, fromBytes, fromMethodView, bb); + + float fromBufferView = vb.get(i); + assertValues(i, fromMethodView, fromBufferView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + float v = getFloatFromBytes(bb, o + i * 4); + float a = bb.getFloat(); + assertValues(i, v, a, bb); + + float b = vb.get(); + assertValues(i, a, b, bb, vb); + } + + } + + @Test(dataProvider = "floatViewProvider") + public void testFloatPut(String desc, IntFunction fbb, + Function fbi) { + ByteBuffer bbfilled = allocate(fbb); + ByteBuffer bb = allocate(fbb, i -> 0); + FloatBuffer vb = fbi.apply(bb); + int o = bb.position(); + + for (int i = 0; i < vb.limit(); i++) { + float fromFilled = bbfilled.getFloat(o + i * 4); + + vb.put(i, fromFilled); + float fromMethodView = bb.getFloat(o + i * 4); + assertValues(i, fromFilled, fromMethodView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + float fromFilled = bbfilled.getFloat(o + i * 4); + + vb.put(fromFilled); + float fromMethodView = bb.getFloat(); + assertValues(i, fromFilled, fromMethodView, bb, vb); + } + + + fill(bb, i -> 0); + bb.clear().position(o); + vb.clear(); + + for (int i = 0; i < vb.limit(); i++) { + float fromFilled = bbfilled.getFloat(o + i * 4); + + bb.putFloat(o + i * 4, fromFilled); + float fromBufferView = vb.get(i); + assertValues(i, fromFilled, fromBufferView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + float fromFilled = bbfilled.getFloat(o + i * 4); + + bb.putFloat(fromFilled); + float fromBufferView = vb.get(); + assertValues(i, fromFilled, fromBufferView, bb, vb); + } + } + + static float getFloatFromBytes(ByteBuffer bb, int i) { + return Float.intBitsToFloat(getIntFromBytes(bb, i)); + } + + + + @DataProvider + public static Object[][] doubleViewProvider() { + List>> bfs = List.of( + Map.entry("bb.asDoubleBuffer()", + bb -> bb.asDoubleBuffer()), + Map.entry("bb.asDoubleBuffer().slice()", + bb -> bb.asDoubleBuffer().slice()), + Map.entry("bb.asDoubleBuffer().slice().duplicate()", + bb -> bb.asDoubleBuffer().slice().duplicate()) + ); + + return product(BYTE_BUFFER_FUNCTIONS, bfs); + } + + @Test(dataProvider = "doubleViewProvider") + public void testDoubleGet(String desc, IntFunction fbb, + Function fbi) { + ByteBuffer bb = allocate(fbb); + DoubleBuffer vb = fbi.apply(bb); + int o = bb.position(); + + for (int i = 0; i < vb.limit(); i++) { + double fromBytes = getDoubleFromBytes(bb, o + i * 8); + double fromMethodView = bb.getDouble(o + i * 8); + assertValues(i, fromBytes, fromMethodView, bb); + + double fromBufferView = vb.get(i); + assertValues(i, fromMethodView, fromBufferView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + double v = getDoubleFromBytes(bb, o + i * 8); + double a = bb.getDouble(); + assertValues(i, v, a, bb); + + double b = vb.get(); + assertValues(i, a, b, bb, vb); + } + + } + + @Test(dataProvider = "doubleViewProvider") + public void testDoublePut(String desc, IntFunction fbb, + Function fbi) { + ByteBuffer bbfilled = allocate(fbb); + ByteBuffer bb = allocate(fbb, i -> 0); + DoubleBuffer vb = fbi.apply(bb); + int o = bb.position(); + + for (int i = 0; i < vb.limit(); i++) { + double fromFilled = bbfilled.getDouble(o + i * 8); + + vb.put(i, fromFilled); + double fromMethodView = bb.getDouble(o + i * 8); + assertValues(i, fromFilled, fromMethodView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + double fromFilled = bbfilled.getDouble(o + i * 8); + + vb.put(fromFilled); + double fromMethodView = bb.getDouble(); + assertValues(i, fromFilled, fromMethodView, bb, vb); + } + + + fill(bb, i -> 0); + bb.clear().position(o); + vb.clear(); + + for (int i = 0; i < vb.limit(); i++) { + double fromFilled = bbfilled.getDouble(o + i * 8); + + bb.putDouble(o + i * 8, fromFilled); + double fromBufferView = vb.get(i); + assertValues(i, fromFilled, fromBufferView, bb, vb); + } + + for (int i = 0; i < vb.limit(); i++) { + double fromFilled = bbfilled.getDouble(o + i * 8); + + bb.putDouble(fromFilled); + double fromBufferView = vb.get(); + assertValues(i, fromFilled, fromBufferView, bb, vb); + } + } + + static double getDoubleFromBytes(ByteBuffer bb, int i) { + return Double.longBitsToDouble(getLongFromBytes(bb, i)); + } +} diff --git a/jdk/test/java/nio/file/Files/probeContentType/Basic.java b/jdk/test/java/nio/file/Files/probeContentType/Basic.java index b71e8a2f9c0..bb48ca71995 100644 --- a/jdk/test/java/nio/file/Files/probeContentType/Basic.java +++ b/jdk/test/java/nio/file/Files/probeContentType/Basic.java @@ -22,7 +22,7 @@ */ /* @test - * @bug 4313887 8129632 8129633 8162624 + * @bug 4313887 8129632 8129633 8162624 8146215 8162745 * @summary Unit test for probeContentType method * @library ../.. * @build Basic SimpleFileTypeDetector @@ -38,7 +38,6 @@ import java.util.stream.Stream; * set of file extension to content type mappings. */ public class Basic { - private static final boolean IS_UNIX = ! System.getProperty("os.name").startsWith("Windows"); @@ -55,6 +54,23 @@ public class Basic { return Files.createTempFile("red", ".grape"); } + private static void checkMimeTypesFile(Path mimeTypes) { + if (!Files.exists(mimeTypes)) { + System.out.println(mimeTypes + " does not exist"); + } else if (!Files.isReadable(mimeTypes)) { + System.out.println(mimeTypes + " is not readable"); + } else { + System.out.println(mimeTypes + " contents:"); + try (Stream lines = Files.lines(mimeTypes)) { + lines.forEach(System.out::println); + System.out.println(""); + } catch (IOException ioe) { + System.err.printf("Problem reading %s: %s%n", + mimeTypes, ioe.getMessage()); + } + } + } + private static int checkContentTypes(String expected, String actual) { assert expected != null; assert actual != null; @@ -63,36 +79,10 @@ public class Basic { if (IS_UNIX) { Path userMimeTypes = Paths.get(System.getProperty("user.home"), ".mime.types"); - if (!Files.exists(userMimeTypes)) { - System.out.println(userMimeTypes + " does not exist"); - } else if (!Files.isReadable(userMimeTypes)) { - System.out.println(userMimeTypes + " is not readable"); - } else { - System.out.println(userMimeTypes + " contents:"); - try (Stream lines = Files.lines(userMimeTypes)) { - lines.forEach(System.out::println); - System.out.println(""); - } catch (IOException ioe) { - System.err.println("Problem reading " - + userMimeTypes); - } - } + checkMimeTypesFile(userMimeTypes); Path etcMimeTypes = Paths.get("/etc/mime.types"); - if (!Files.exists(etcMimeTypes)) { - System.out.println(etcMimeTypes + " does not exist"); - } else if (!Files.isReadable(etcMimeTypes)) { - System.out.println(etcMimeTypes + " is not readable"); - } else { - System.out.println(etcMimeTypes + " contents:"); - try (Stream lines = Files.lines(etcMimeTypes)) { - lines.forEach(System.out::println); - System.out.println(""); - } catch (IOException ioe) { - System.err.println("Problem reading " - + etcMimeTypes); - } - } + checkMimeTypesFile(etcMimeTypes); } System.err.println("Expected \"" + expected @@ -105,11 +95,11 @@ public class Basic { return 0; } - static int checkOSXContentTypes(String[] extensions, String[] expectedTypes) + static int checkContentTypes(String[] extensions, String[] expectedTypes) throws IOException { if (extensions.length != expectedTypes.length) { - throw new IllegalArgumentException - ("Parameter array lengths differ"); + System.err.println("Parameter array lengths differ"); + return 1; } int failures = 0; @@ -157,25 +147,25 @@ public class Basic { file = createGrapeFile(); try { String type = Files.probeContentType(file); - if (type == null) - throw new RuntimeException("Custom file type detector not installed?"); - failures += checkContentTypes("grape/unknown", type); + if (type == null) { + System.err.println("Custom file type detector not installed?"); + failures++; + } else { + failures += checkContentTypes("grape/unknown", type); + } } finally { Files.delete(file); } - // Verify that common file extensions are mapped to the correct content - // types on Mac OS X only which has consistent Uniform Type Identifiers. - if (System.getProperty("os.name").contains("OS X")) { - String[] extensions = new String[]{ - "jpg", "mp3", "mp4", "pdf", "png" - }; - String[] expectedTypes = new String[]{ - "image/jpeg", "audio/mpeg", "video/mp4", "application/pdf", - "image/png" - }; - failures += checkOSXContentTypes(extensions, expectedTypes); - } + // Verify that certain media extensions are mapped to the correct type. + String[] extensions = new String[]{ + "aac", "flac", "jpg", "mp3", "mp4", "pdf", "png", "webm" + }; + String[] expectedTypes = new String[]{ + "audio/aac", "audio/flac", "image/jpeg", "audio/mpeg", + "video/mp4", "application/pdf", "image/png", "video/webm" + }; + failures += checkContentTypes(extensions, expectedTypes); if (failures > 0) { throw new RuntimeException("Test failed!"); diff --git a/jdk/test/java/nio/file/WatchService/DeleteInterference.java b/jdk/test/java/nio/file/WatchService/DeleteInterference.java index 032d02a574b..459b17ecbc7 100644 --- a/jdk/test/java/nio/file/WatchService/DeleteInterference.java +++ b/jdk/test/java/nio/file/WatchService/DeleteInterference.java @@ -38,6 +38,7 @@ import java.util.concurrent.ExecutorService; import java.util.concurrent.Executors; import java.util.concurrent.Future; +import static java.lang.System.out; import static java.nio.file.StandardWatchEventKinds.*; public class DeleteInterference { @@ -66,22 +67,28 @@ public class DeleteInterference { private static void openAndCloseWatcher(Path dir) { FileSystem fs = FileSystems.getDefault(); for (int i = 0; i < ITERATIONS_COUNT; i++) { + out.printf("open %d begin%n", i); try (WatchService watcher = fs.newWatchService()) { dir.register(watcher, ENTRY_CREATE, ENTRY_DELETE, ENTRY_MODIFY); } catch (IOException ioe) { // ignore + } finally { + out.printf("open %d end%n", i); } } } private static void deleteAndRecreateDirectory(Path dir) { for (int i = 0; i < ITERATIONS_COUNT; i++) { + out.printf("del %d begin%n", i); try { deleteFileTree(dir); Path subdir = Files.createDirectories(dir.resolve("subdir")); Files.createFile(subdir.resolve("test")); } catch (IOException ioe) { // ignore + } finally { + out.printf("del %d end%n", i); } } } diff --git a/jdk/test/java/util/Locale/Bug8035133.java b/jdk/test/java/util/Locale/Bug8035133.java new file mode 100644 index 00000000000..8d86ca02498 --- /dev/null +++ b/jdk/test/java/util/Locale/Bug8035133.java @@ -0,0 +1,159 @@ +/* + * Copyright (c) 2016, 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 8035133 + * @summary Checks that the tags matching the range with quality weight q=0 + * e.g. en;q=0 must be elimited and must not be the part of output + */ + +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; +import java.util.Locale; + + +public class Bug8035133 { + + private static boolean err = false; + + public static void main(String[] args) { + + // checking Locale.lookup with de-ch;q=0 + checkLookup("en;q=0.1, *-ch;q=0.5, de-ch;q=0", + "de-ch, en, fr-ch", "fr-CH"); + + /* checking Locale.lookup with *;q=0 '*' should be ignored + * in lookup + */ + checkLookup("en;q=0.1, *-ch;q=0.5, *;q=0", + "de-ch, en, fr-ch", "de-CH"); + + // checking Locale.filter with fr-ch;q=0 in BASIC_FILTERING + checkFilter("en;q=0.1, fr-ch;q=0.0, de-ch;q=0.5", + "de-ch, en, fr-ch", "de-CH, en"); + + // checking Locale.filter with *;q=0 in BASIC_FILTERING + checkFilter("de-ch;q=0.6, *;q=0", "de-ch, fr-ch", ""); + + // checking Locale.filter with *;q=0 in BASIC_FILTERING + checkFilter("de-ch;q=0.6, de;q=0", "de-ch", ""); + + // checking Locale.filter with *;q=0.6, en;q=0 in BASIC_FILTERING + checkFilter("*;q=0.6, en;q=0", "de-ch, hi-in, en", "de-CH, hi-IN"); + + // checking Locale.filter with de-ch;q=0 in EXTENDED_FILTERING + checkFilter("en;q=0.1, *-ch;q=0.5, de-ch;q=0", + "de-ch, en, fr-ch", "fr-CH, en"); + + /* checking Locale.filter with *-ch;q=0 in EXTENDED_FILTERING which + * must make filter to return "" empty or no match + */ + checkFilter("de-ch;q=0.5, *-ch;q=0", "de-ch, fr-ch", ""); + + /* checking Locale.filter with *;q=0 in EXTENDED_FILTERING which + * must make filter to return "" empty or no match + */ + checkFilter("*-ch;q=0.5, *;q=0", "de-ch, fr-ch", ""); + + /* checking Locale.filter with *;q=0.6, *-Latn;q=0 in + * EXTENDED_FILTERING + */ + checkFilter("*;q=0.6, *-Latn;q=0", "de-ch, hi-in, en-Latn", + "de-CH, hi-IN"); + + if (err) { + throw new RuntimeException("[LocaleMatcher method(s) failed]"); + } + + } + + private static void checkLookup(String ranges, String tags, + String expectedLocale) { + + List priorityList = Locale.LanguageRange + .parse(ranges); + List localeList = generateLocales(tags); + Locale loc = Locale.lookup(priorityList, localeList); + String actualLocale + = loc.toLanguageTag(); + + if (!actualLocale.equals(expectedLocale)) { + System.err.println("Locale.lookup failed with ranges: " + ranges + + " Expected: " + expectedLocale + + " Actual: " + actualLocale); + err = true; + } + + } + + private static void checkFilter(String ranges, String tags, + String expectedLocales) { + + List priorityList = Locale.LanguageRange + .parse(ranges); + List localeList = generateLocales(tags); + String actualLocales = getLocalesAsString( + Locale.filter(priorityList, localeList)); + + if (!actualLocales.equals(expectedLocales)) { + System.err.println("Locale.filter failed with ranges: " + ranges + + " Expected: " + expectedLocales + + " Actual: " + actualLocales); + err = true; + } + + } + + private static List generateLocales(String tags) { + if (tags == null) { + return null; + } + + List localeList = new ArrayList<>(); + if (tags.equals("")) { + return localeList; + } + String[] t = tags.split(", "); + for (String tag : t) { + localeList.add(Locale.forLanguageTag(tag)); + } + return localeList; + } + + private static String getLocalesAsString(List locales) { + StringBuilder sb = new StringBuilder(); + + Iterator itr = locales.iterator(); + if (itr.hasNext()) { + sb.append(itr.next().toLanguageTag()); + } + while (itr.hasNext()) { + sb.append(", "); + sb.append(itr.next().toLanguageTag()); + } + + return sb.toString().trim(); + } + +} diff --git a/jdk/test/javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh b/jdk/test/javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh index 196189a0c42..60e8fc04b2a 100644 --- a/jdk/test/javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh +++ b/jdk/test/javax/imageio/plugins/external_plugin_tests/TestClassPathPlugin.sh @@ -22,7 +22,7 @@ # # @test -# @bug 8081729 +# @bug 8081729 8140314 # @summary Test external plugin as classpath jar and as a modular jar. # Test both cases with and without a security manager. diff --git a/jdk/test/javax/imageio/plugins/jpeg/ReadAllThumbnailsTest.java b/jdk/test/javax/imageio/plugins/jpeg/ReadAllThumbnailsTest.java new file mode 100644 index 00000000000..04d5e0c790b --- /dev/null +++ b/jdk/test/javax/imageio/plugins/jpeg/ReadAllThumbnailsTest.java @@ -0,0 +1,126 @@ +/* + * Copyright (c) 2004, 2016, 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 4958271 8160943 + * @summary This test verifies that ImageReader.readAll() method is able to read + * all the thumbnails present in the input source without throwing any + * exception while reading through Jpeg data. + * @run main ReadAllThumbnailsTest + */ + +import java.util.Iterator; +import java.io.File; +import javax.imageio.IIOImage; +import javax.imageio.ImageIO; +import javax.imageio.ImageReader; +import javax.imageio.stream.ImageInputStream; + +public class ReadAllThumbnailsTest { + + public ReadAllThumbnailsTest() { + + try { + ImageReader reader = null; + + String fileName = "thumbimg.jpg"; + String sep = System.getProperty("file.separator"); + String dir = System.getProperty("test.src", "."); + String filePath = dir+sep+fileName; + System.out.println("Test file: " + filePath); + File f = new File(filePath); + + ImageInputStream iis = ImageIO.createImageInputStream(f); + Iterator readerIt = ImageIO.getImageReaders(iis); + if (readerIt.hasNext()) { + reader = (ImageReader) readerIt.next(); + } + + if (reader == null) { + error("FAIL: Reader is not available for reading a " + + "JPG image with thumbnails. Test Aborted !!"); + } + + reader.setInput(iis); + + if (!reader.readerSupportsThumbnails()) { + error("FAIL: JPG Reader fails to support thumbnails." + + " Test aborted !!"); + } + + int numThumbnails = reader.getNumThumbnails(0); + if (numThumbnails <= 0) { + error(" FAIL: Reader.getNumThumbnails() returns 0 when the " + + "input image contains some thumbnails"); + } + IIOImage iioImg = reader.readAll(0, null); + int thumbnailsRead = iioImg.getNumThumbnails(); + + if (numThumbnails == thumbnailsRead) { + System.out.println("PASS: Thumbnails are read properly by" + + " ImageReader.readAll(index, readParam) "); + } else { + error("FAIL: Some of the thumbnails are not read" + + " from the input source when calling" + + " ImageReader.readAll(index, readParam) "); + } + + iis = ImageIO.createImageInputStream(f); + reader.setInput(iis); + + iioImg = null; + Iterator imgIter = reader.readAll(null); + if (imgIter.hasNext()) { + iioImg = (IIOImage) imgIter.next(); + thumbnailsRead = iioImg.getNumThumbnails(); + + if (numThumbnails == thumbnailsRead) { + System.out.println("PASS: Thumbnails are read properly by" + + " ImageReader.readAll(Iter)"); + } else { + error("FAIL: Some of the thumbnails are not read " + + "from the input source when calling" + + " ImageReader.readAll(Iter)"); + } + } else { + error("FAIL: ImageReader.readAll(Iter) fails to read the image" + + " & thumbnails from the input source"); + } + + } catch (Exception e) { + error(" FAIL: The following exception is thrown by " + + "ImageReader.readAll() method when input source contains " + + "some thumbnails. Exception: " + e.toString()); + } + + } + + public final void error(String mesg) { + throw new RuntimeException(mesg); + } + + public static void main(String args[]) { + ReadAllThumbnailsTest test = new ReadAllThumbnailsTest(); + } +} diff --git a/jdk/test/javax/imageio/plugins/jpeg/thumbimg.jpg b/jdk/test/javax/imageio/plugins/jpeg/thumbimg.jpg new file mode 100644 index 00000000000..8370755d24f Binary files /dev/null and b/jdk/test/javax/imageio/plugins/jpeg/thumbimg.jpg differ diff --git a/jdk/test/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java b/jdk/test/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java index 4a5757824fd..14a5741cbf8 100644 --- a/jdk/test/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java +++ b/jdk/test/javax/imageio/plugins/tiff/MultiPageImageTIFFFieldTest.java @@ -23,7 +23,6 @@ /** * @test - * @ignore 8148454 * @bug 8152183 8148454 * @author a.stepanov * @summary check that TIFFields are derived properly for multi-page tiff diff --git a/jdk/test/javax/print/attribute/TestOrientationSupportForStreamPrnSrv.java b/jdk/test/javax/print/attribute/TestOrientationSupportForStreamPrnSrv.java new file mode 100644 index 00000000000..1817804c369 --- /dev/null +++ b/jdk/test/javax/print/attribute/TestOrientationSupportForStreamPrnSrv.java @@ -0,0 +1,80 @@ +/* + * Copyright (c) 2016, 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 4882305 + * @summary Verifies if StreamPrintServ.getSupportedAttributeValues returns + * valid Orientation attribute and not null for image/jpeg DocFlavor. + * @run main TestOrientationSupportForStreamPrnSrv + */ +import java.io.File; +import java.io.FileOutputStream; +import javax.print.DocFlavor; +import javax.print.PrintService; +import javax.print.PrintServiceLookup; +import javax.print.StreamPrintServiceFactory; +import javax.print.attribute.standard.OrientationRequested; + +public class TestOrientationSupportForStreamPrnSrv { + + public static void main(java.lang.String[] args) throws Exception { + PrintService service = null; + PrintService defService = PrintServiceLookup.lookupDefaultPrintService(); + File f = null; + FileOutputStream fos = null; + String mType = "application/postscript"; + DocFlavor flavors[] = null; + + f = new File("streamexample1.ps"); + fos = new FileOutputStream(f); + StreamPrintServiceFactory[] factories = StreamPrintServiceFactory. + lookupStreamPrintServiceFactories(DocFlavor.INPUT_STREAM.JPEG, + mType); + if (factories.length > 0) { + System.out.println("output format "+factories[0].getOutputFormat()); + service = factories[0].getPrintService(fos); + flavors = factories[0].getSupportedDocFlavors(); + } + System.out.println("Stream Print Service "+service); + + if (service == null) { + throw new RuntimeException("No Stream Print Service found"); + } + System.out.println("is OrientationRequested supported? "+ + service.isAttributeCategorySupported(OrientationRequested.class)); + + for (int k = 0; k < flavors.length; k ++) { + Object obj = service.getSupportedAttributeValues(OrientationRequested.class, + flavors[k], null); + if (flavors[k].equals(DocFlavor.INPUT_STREAM.JPEG)) { + if (obj == null) { + throw new RuntimeException("" + + "StreamPrintServ.getSupportedAttributeValues " + + "returns null for image/jpeg DocFlavor for " + + "supported Orientation category"); + } + } + } + } +} + diff --git a/jdk/test/javax/swing/AbstractButton/6711682/bug6711682.java b/jdk/test/javax/swing/AbstractButton/6711682/bug6711682.java index 3e1553799a8..72808d46296 100644 --- a/jdk/test/javax/swing/AbstractButton/6711682/bug6711682.java +++ b/jdk/test/javax/swing/AbstractButton/6711682/bug6711682.java @@ -21,12 +21,14 @@ * questions. */ -/* @test - @bug 6711682 - @summary JCheckBox in JTable: checkbox doesn't alaways respond to the first mouse click - @author Alexander Potochkin - @run main bug6711682 -*/ +/* + * @test + * @key headful + * @bug 6711682 + * @summary JCheckBox in JTable: checkbox doesn't alaways respond to the first mouse click + * @author Alexander Potochkin + * @run main bug6711682 + */ import javax.swing.*; import javax.swing.event.CellEditorListener; diff --git a/jdk/test/javax/swing/Action/8133039/bug8133039.java b/jdk/test/javax/swing/Action/8133039/bug8133039.java index 3bfbe2d6e08..cec80f21fad 100644 --- a/jdk/test/javax/swing/Action/8133039/bug8133039.java +++ b/jdk/test/javax/swing/Action/8133039/bug8133039.java @@ -35,6 +35,7 @@ import sun.swing.UIAction; /** * @test + * @key headful * @bug 8133039 * @summary Provide public API to sun.swing.UIAction#isEnabled(Object) * @modules java.desktop/sun.swing diff --git a/jdk/test/javax/swing/AncestorNotifier/7193219/bug7193219.java b/jdk/test/javax/swing/AncestorNotifier/7193219/bug7193219.java index 9fc6a7df619..1b773435d33 100644 --- a/jdk/test/javax/swing/AncestorNotifier/7193219/bug7193219.java +++ b/jdk/test/javax/swing/AncestorNotifier/7193219/bug7193219.java @@ -21,11 +21,13 @@ * questions. */ -/* @test - @bug 7193219 - @summary JComboBox serialization fails in JDK 1.7 - @author Anton Litvinov -*/ +/* + * @test + * @key headful + * @bug 7193219 + * @summary JComboBox serialization fails in JDK 1.7 + * @author Anton Litvinov + */ import java.io.*; diff --git a/jdk/test/javax/swing/GroupLayout/8013566/bug8013566.java b/jdk/test/javax/swing/GroupLayout/8013566/bug8013566.java index 886da012d8a..6fc0da82269 100644 --- a/jdk/test/javax/swing/GroupLayout/8013566/bug8013566.java +++ b/jdk/test/javax/swing/GroupLayout/8013566/bug8013566.java @@ -21,12 +21,14 @@ * questions. */ -/* @test - @bug 8013566 - @summary Failure of GroupLayout in combination of addPreferredGap and addGroup's - last row - @author Semyon Sadetsky -*/ +/* + * @test + * @key headful + * @bug 8013566 + * @summary Failure of GroupLayout in combination of addPreferredGap and addGroup's + * last row + * @author Semyon Sadetsky + */ import javax.swing.*; diff --git a/jdk/test/javax/swing/GroupLayout/8079640/bug8079640.java b/jdk/test/javax/swing/GroupLayout/8079640/bug8079640.java index c61949fdeef..2956377c7ad 100644 --- a/jdk/test/javax/swing/GroupLayout/8079640/bug8079640.java +++ b/jdk/test/javax/swing/GroupLayout/8079640/bug8079640.java @@ -21,11 +21,13 @@ * questions. */ -/* @test - @bug 8079640 - @summary GroupLayout incorrect layout with large JTextArea - @author Semyon Sadetsky - */ +/* + * @test + * @key headful + * @bug 8079640 + * @summary GroupLayout incorrect layout with large JTextArea + * @author Semyon Sadetsky + */ import javax.swing.*; diff --git a/jdk/test/javax/swing/InputVerifier/VerifyTarget/VerifyTargetTest.java b/jdk/test/javax/swing/InputVerifier/VerifyTarget/VerifyTargetTest.java index 86bd6dddddb..2cb1c636bbf 100644 --- a/jdk/test/javax/swing/InputVerifier/VerifyTarget/VerifyTargetTest.java +++ b/jdk/test/javax/swing/InputVerifier/VerifyTarget/VerifyTargetTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 8154431 @summary Allow source and target based validation for the focus transfer between two JComponents. @@ -90,4 +91,4 @@ public class VerifyTargetTest extends InputVerifier implements FocusListener { public void focusLost(FocusEvent e) { success = false; } -} \ No newline at end of file +} diff --git a/jdk/test/javax/swing/JButton/4368790/bug4368790.java b/jdk/test/javax/swing/JButton/4368790/bug4368790.java index 9a90fb7ab05..a071fb521fb 100644 --- a/jdk/test/javax/swing/JButton/4368790/bug4368790.java +++ b/jdk/test/javax/swing/JButton/4368790/bug4368790.java @@ -21,12 +21,14 @@ * questions. */ -/* @test - @bug 4368790 - @summary JButton stays pressed when focus stolen - @author Alexander Potochkin - @run main bug4368790 -*/ +/* + * @test + * @key headful + * @bug 4368790 + * @summary JButton stays pressed when focus stolen + * @author Alexander Potochkin + * @run main bug4368790 + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java b/jdk/test/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java index e0182a5fc03..9f016626312 100644 --- a/jdk/test/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java +++ b/jdk/test/javax/swing/JButton/JButtonPaintNPE/JButtonPaintNPE.java @@ -33,6 +33,7 @@ import javax.swing.SwingUtilities; /** * @test + * @key headful * @bug 8009919 * @author Sergey Bylokhov * @library ../../../../lib/testlibrary/ diff --git a/jdk/test/javax/swing/JButton/PressedButtonRightClickTest.java b/jdk/test/javax/swing/JButton/PressedButtonRightClickTest.java index c4cddc71f18..160465ab58b 100644 --- a/jdk/test/javax/swing/JButton/PressedButtonRightClickTest.java +++ b/jdk/test/javax/swing/JButton/PressedButtonRightClickTest.java @@ -33,6 +33,7 @@ import javax.swing.SwingUtilities; /* * @test + * @key headful * @bug 8049069 * @summary Tests whether right mouse click releases a pressed JButton */ diff --git a/jdk/test/javax/swing/JButton/TimeChangeButtonClickTest.java b/jdk/test/javax/swing/JButton/TimeChangeButtonClickTest.java new file mode 100644 index 00000000000..ac8e07dbd85 --- /dev/null +++ b/jdk/test/javax/swing/JButton/TimeChangeButtonClickTest.java @@ -0,0 +1,220 @@ +/* + * Copyright (c) 2016, 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 7096375 + * @summary Test that Swing does not ignore first click on a JButton after + * decreasing system's time + * @run main/manual TimeChangeButtonClickTest + */ +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.util.concurrent.CountDownLatch; +import javax.swing.BorderFactory; +import javax.swing.JPanel; +import javax.swing.JTextArea; +import javax.swing.SwingUtilities; +import javax.swing.JButton; +import javax.swing.JFrame; +import java.awt.event.ActionEvent; +import java.awt.event.ActionListener; +import java.util.concurrent.TimeUnit; +import javax.swing.Box; +import javax.swing.JLabel; + +public class TimeChangeButtonClickTest { + + public static void main(String args[]) throws Exception { + final CountDownLatch latch = new CountDownLatch(1); + TestUI test = new TestUI(latch); + + SwingUtilities.invokeLater(new Runnable() { + @Override + public void run() { + try { + test.createUI(); + } catch (Exception ex) { + throw new RuntimeException("Exception while creating test UI"); + } + } + }); + + boolean status = latch.await(5, TimeUnit.MINUTES); + + if (!status) { + System.out.println("Test timed out."); + } + + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + try { + test.disposeUI(); + } catch (Exception ex) { + throw new RuntimeException("Exception while disposing test UI"); + } + } + }); + + if (test.testResult == false) { + throw new RuntimeException("Test Failed."); + } + } +} + +class TestUI { + + private static JFrame mainFrame; + private static JPanel mainControlPanel; + + private static JTextArea instructionTextArea; + + private static JPanel resultButtonPanel; + private static JButton passButton; + private static JButton failButton; + + private static JPanel testPanel; + private static JButton testButton; + private static JLabel buttonPressCountLabel; + + private static GridBagLayout layout; + private final CountDownLatch latch; + public boolean testResult = false; + private int buttonPressCount = 0; + + public TestUI(CountDownLatch latch) throws Exception { + this.latch = latch; + } + + public final void createUI() throws Exception { + + mainFrame = new JFrame("TimeChangeButtonClickTest"); + + layout = new GridBagLayout(); + mainControlPanel = new JPanel(layout); + resultButtonPanel = new JPanel(layout); + testPanel = new JPanel(layout); + + GridBagConstraints gbc = new GridBagConstraints(); + + // Create Test instructions + String instructions + = "Test 1 : --------------------\n" + + "1. Click 'Test Button' with left mouse button\n" + + "Observe : Button Press count change to 1\n" + + "Test 2 : --------------------\n" + + "1. Change the system time to one hour less than current time\n" + + "2. Click 'Test Button' with left mouse button\n" + + "Observe : Button Press count change to 2\n" + + "Test 3 : --------------------\n" + + "1. Change the system time by adding two hours\n" + + "2. Click 'Test Button' with left mouse button\n" + + "Observe : Button Press count change to 3\n" + + "--------------------\n" + + "Restore the system time.\n" + + "--------------------\n" + + "Press 'Pass' if Button Press count is 3, 'Fail' otherwise"; + + instructionTextArea = new JTextArea(); + instructionTextArea.setText(instructions); + instructionTextArea.setEditable(false); + instructionTextArea.setBorder(BorderFactory. + createTitledBorder("Test Instructions")); + + gbc.gridx = 0; + gbc.gridy = 0; + gbc.fill = GridBagConstraints.HORIZONTAL; + mainControlPanel.add(instructionTextArea, gbc); + + // Create Test Button and label + testButton = new JButton("Test Button"); + testButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + buttonPressCount++; + buttonPressCountLabel.setText( + "Button Press Count : " + buttonPressCount); + } + }); + + gbc.gridx = 0; + gbc.gridy = 0; + testPanel.add(testButton, gbc); + + gbc.gridx = 0; + gbc.gridy = 1; + testPanel.add(Box.createVerticalStrut(50)); + + gbc.gridx = 0; + gbc.gridy = 2; + buttonPressCountLabel = new JLabel( + "Button Press Count : " + buttonPressCount); + testPanel.add(buttonPressCountLabel, gbc); + + mainControlPanel.add(testPanel); + + // Create resultButtonPanel with Pass, Fail buttons + passButton = new JButton("Pass"); + passButton.setActionCommand("Pass"); + passButton.addActionListener((ActionEvent e) -> { + System.out.println("Pass Button pressed!"); + testResult = true; + latch.countDown(); + + }); + + failButton = new JButton("Fail"); + failButton.setActionCommand("Fail"); + failButton.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + System.out.println("Fail Button pressed!"); + testResult = false; + latch.countDown(); + } + }); + + gbc.gridx = 0; + gbc.gridy = 0; + resultButtonPanel.add(passButton, gbc); + gbc.gridx = 1; + gbc.gridy = 0; + resultButtonPanel.add(failButton, gbc); + + gbc.gridx = 0; + gbc.gridy = 1; + mainControlPanel.add(resultButtonPanel, gbc); + + mainFrame.add(mainControlPanel); + + mainFrame.pack(); + mainFrame.setVisible(true); + } + + public void disposeUI() { + mainFrame.setVisible(false); + mainFrame.dispose(); + } +} + diff --git a/jdk/test/javax/swing/JColorChooser/Test6541987.java b/jdk/test/javax/swing/JColorChooser/Test6541987.java index 7a946e1b25d..84053cd1b8f 100644 --- a/jdk/test/javax/swing/JColorChooser/Test6541987.java +++ b/jdk/test/javax/swing/JColorChooser/Test6541987.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6541987 * @summary Tests closing by ESC * @author Sergey Malenkov diff --git a/jdk/test/javax/swing/JColorChooser/Test6559154.java b/jdk/test/javax/swing/JColorChooser/Test6559154.java index ab2a8ba130c..1ebc4d94dd0 100644 --- a/jdk/test/javax/swing/JColorChooser/Test6559154.java +++ b/jdk/test/javax/swing/JColorChooser/Test6559154.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6559154 * @summary Tests EDT hanging * @author Sergey Malenkov diff --git a/jdk/test/javax/swing/JColorChooser/Test6827032.java b/jdk/test/javax/swing/JColorChooser/Test6827032.java index 4d8998793e9..fff9834d687 100644 --- a/jdk/test/javax/swing/JColorChooser/Test6827032.java +++ b/jdk/test/javax/swing/JColorChooser/Test6827032.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6827032 * @summary Color chooser with drag enabled shouldn't throw NPE * @author Peter Zhelezniakov diff --git a/jdk/test/javax/swing/JColorChooser/Test7194184.java b/jdk/test/javax/swing/JColorChooser/Test7194184.java index 70201764032..460aefaf3b5 100644 --- a/jdk/test/javax/swing/JColorChooser/Test7194184.java +++ b/jdk/test/javax/swing/JColorChooser/Test7194184.java @@ -27,6 +27,7 @@ /* * @test + * @key headful * @bug 7194184 * @summary Tests JColorChooser Swatch keyboard accessibility. * @author Sean Chou diff --git a/jdk/test/javax/swing/JColorChooser/Test8051548.java b/jdk/test/javax/swing/JColorChooser/Test8051548.java index fe9a6eb666a..287601fdf3c 100644 --- a/jdk/test/javax/swing/JColorChooser/Test8051548.java +++ b/jdk/test/javax/swing/JColorChooser/Test8051548.java @@ -37,6 +37,7 @@ import javax.swing.colorchooser.AbstractColorChooserPanel; /* * @test + * @key headful * @bug 8051548 * @summary JColorChooser should have a way to disable transparency controls * @author Alexandr Scherbatiy diff --git a/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java b/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java index 6293a3edb42..e96e2cd45a8 100644 --- a/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java +++ b/jdk/test/javax/swing/JComboBox/4199622/bug4199622.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + @test + @key headful @bug 4199622 @summary RFE: JComboBox shouldn't send ActionEvents for keyboard navigation @author Vladislav Karnaukhov @@ -29,7 +31,7 @@ @modules java.desktop/com.sun.java.swing.plaf.windows @build jdk.testlibrary.OSInfo @run main bug4199622 -*/ + */ import com.sun.java.swing.plaf.windows.WindowsLookAndFeel; import jdk.testlibrary.OSInfo; diff --git a/jdk/test/javax/swing/JComboBox/4515752/DefaultButtonTest.java b/jdk/test/javax/swing/JComboBox/4515752/DefaultButtonTest.java index 88abb7b574b..eeb87ce5d8c 100644 --- a/jdk/test/javax/swing/JComboBox/4515752/DefaultButtonTest.java +++ b/jdk/test/javax/swing/JComboBox/4515752/DefaultButtonTest.java @@ -27,6 +27,7 @@ import javax.swing.*; /** * @test + * @key headful * @bug 4515752 4337071 * @author Mark Davidson * @summary Tests the invocation of the default button within the JComboBox. diff --git a/jdk/test/javax/swing/JComboBox/4523758/bug4523758.java b/jdk/test/javax/swing/JComboBox/4523758/bug4523758.java index 423f89d8bff..25e5ee6755f 100644 --- a/jdk/test/javax/swing/JComboBox/4523758/bug4523758.java +++ b/jdk/test/javax/swing/JComboBox/4523758/bug4523758.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 4523758 * @summary Directly check that torn-off combo works * @library ../../../../lib/testlibrary diff --git a/jdk/test/javax/swing/JComboBox/4743225/bug4743225.java b/jdk/test/javax/swing/JComboBox/4743225/bug4743225.java index 76c2f1cea27..76ace04857a 100644 --- a/jdk/test/javax/swing/JComboBox/4743225/bug4743225.java +++ b/jdk/test/javax/swing/JComboBox/4743225/bug4743225.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 4743225 * @summary Size of JComboBox list is wrong when list is populated via PopupMenuListener * @author Alexander Potochkin diff --git a/jdk/test/javax/swing/JComboBox/6236162/bug6236162.java b/jdk/test/javax/swing/JComboBox/6236162/bug6236162.java index 66d6cb73282..56b85ff1b1a 100644 --- a/jdk/test/javax/swing/JComboBox/6236162/bug6236162.java +++ b/jdk/test/javax/swing/JComboBox/6236162/bug6236162.java @@ -20,16 +20,19 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test - @bug 6236162 - @summary Checks that there is no an inconsistence in combo box - behavior when user points an item in combo popup - by mouse and then uses UP/DOWN keys. - @library ../../regtesthelpers - @build Util - @author Mikhail Lapshin - @run main bug6236162 -*/ + +/* + * @test + * @key headful + * @bug 6236162 + * @summary Checks that there is no an inconsistence in combo box + * behavior when user points an item in combo popup + * by mouse and then uses UP/DOWN keys. + * @library ../../regtesthelpers + * @build Util + * @author Mikhail Lapshin + * @run main bug6236162 + */ import javax.swing.*; import javax.swing.plaf.basic.*; diff --git a/jdk/test/javax/swing/JComboBox/6406264/bug6406264.java b/jdk/test/javax/swing/JComboBox/6406264/bug6406264.java index 91356c3d476..75de8c97e2e 100644 --- a/jdk/test/javax/swing/JComboBox/6406264/bug6406264.java +++ b/jdk/test/javax/swing/JComboBox/6406264/bug6406264.java @@ -23,11 +23,13 @@ * questions. */ -/* @test - @bug 6406264 - @summary Tests that JComboBox's focusable popup can be shown. - @author Mikhail Lapshin - @run main bug6406264 +/* + * @test + * @key headful + * @bug 6406264 + * @summary Tests that JComboBox's focusable popup can be shown. + * @author Mikhail Lapshin + * @run main bug6406264 */ import javax.swing.JComboBox; diff --git a/jdk/test/javax/swing/JComboBox/6559152/bug6559152.java b/jdk/test/javax/swing/JComboBox/6559152/bug6559152.java index d04e6004a8f..a857f968073 100644 --- a/jdk/test/javax/swing/JComboBox/6559152/bug6559152.java +++ b/jdk/test/javax/swing/JComboBox/6559152/bug6559152.java @@ -20,15 +20,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test - @bug 6559152 - @summary Checks that you can select an item in JComboBox with keyboard - when it is a JTable cell editor. - @author Mikhail Lapshin - @library ../../../../lib/testlibrary - @build ExtendedRobot - @run main bug6559152 -*/ + +/* + * @test + * @key headful + * @bug 6559152 + * @summary Checks that you can select an item in JComboBox with keyboard + * when it is a JTable cell editor. + * @author Mikhail Lapshin + * @library ../../../../lib/testlibrary + * @build ExtendedRobot + * @run main bug6559152 + */ import javax.swing.*; import javax.swing.table.DefaultTableModel; diff --git a/jdk/test/javax/swing/JComboBox/6607130/bug6607130.java b/jdk/test/javax/swing/JComboBox/6607130/bug6607130.java index 86850f308b7..f80da53692a 100644 --- a/jdk/test/javax/swing/JComboBox/6607130/bug6607130.java +++ b/jdk/test/javax/swing/JComboBox/6607130/bug6607130.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 6607130 * @summary Checks that JComboBox cell editor is hidden if the same * item is selected with keyboard. diff --git a/jdk/test/javax/swing/JComboBox/7195179/Test7195179.java b/jdk/test/javax/swing/JComboBox/7195179/Test7195179.java index f22084a87bc..7680bea4535 100644 --- a/jdk/test/javax/swing/JComboBox/7195179/Test7195179.java +++ b/jdk/test/javax/swing/JComboBox/7195179/Test7195179.java @@ -35,6 +35,7 @@ import static javax.swing.SwingUtilities.invokeAndWait; /* * @test + * @key headful * @bug 7195179 * @summary Tests that combobox works with generified renderers * @author Sergey Malenkov diff --git a/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java b/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java index 48b3a40d6b2..747418bf7b1 100644 --- a/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java +++ b/jdk/test/javax/swing/JComboBox/8015300/Test8015300.java @@ -37,8 +37,9 @@ import static javax.swing.WindowConstants.DISPOSE_ON_CLOSE; /* * @test + * @key headful * @bug 8015300 - * @summary Tests that editable combobox select all text + * @summary Tests that editable combobox selects all text. * @author Sergey Malenkov * @library ../../../../lib/testlibrary/ * @modules java.desktop/com.sun.java.swing.plaf.windows diff --git a/jdk/test/javax/swing/JComboBox/8032878/bug8032878.java b/jdk/test/javax/swing/JComboBox/8032878/bug8032878.java index c20e4862e41..195bb4d4afb 100644 --- a/jdk/test/javax/swing/JComboBox/8032878/bug8032878.java +++ b/jdk/test/javax/swing/JComboBox/8032878/bug8032878.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8032878 8078855 * @summary Checks that JComboBox as JTable cell editor processes key events * even where setSurrendersFocusOnKeystroke flag in JTable is false and diff --git a/jdk/test/javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java b/jdk/test/javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java index 9850aa2ba5c..c07ad3a91cb 100644 --- a/jdk/test/javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java +++ b/jdk/test/javax/swing/JComboBox/8033069/bug8033069NoScrollBar.java @@ -35,7 +35,9 @@ import javax.swing.UIManager; import javax.swing.UIManager.LookAndFeelInfo; import javax.swing.UnsupportedLookAndFeelException; -/* @test +/* + * @test + * @key headful * @bug 8033069 * @summary Checks that JComboBox popup does not close when mouse wheel is * rotated over combo box and over its popup. The case where popup diff --git a/jdk/test/javax/swing/JComboBox/8033069/bug8033069ScrollBar.java b/jdk/test/javax/swing/JComboBox/8033069/bug8033069ScrollBar.java index fed71e654b1..bb1d5beb7df 100644 --- a/jdk/test/javax/swing/JComboBox/8033069/bug8033069ScrollBar.java +++ b/jdk/test/javax/swing/JComboBox/8033069/bug8033069ScrollBar.java @@ -23,7 +23,9 @@ import java.awt.AWTException; -/* @test +/* + * @test + * @key headful * @bug 8033069 * @summary Checks that JComboBox popup does not close when mouse wheel is * rotated over combo box and over its popup. The case where diff --git a/jdk/test/javax/swing/JComboBox/8057893/bug8057893.java b/jdk/test/javax/swing/JComboBox/8057893/bug8057893.java index 76944ed902c..de8efce5b88 100644 --- a/jdk/test/javax/swing/JComboBox/8057893/bug8057893.java +++ b/jdk/test/javax/swing/JComboBox/8057893/bug8057893.java @@ -33,6 +33,7 @@ import javax.swing.WindowConstants; /** * @test + * @key headful * @bug 8057893 * @author Alexander Scherbatiy * @summary JComboBox actionListener never receives "comboBoxEdited" diff --git a/jdk/test/javax/swing/JComboBox/8072767/bug8072767.java b/jdk/test/javax/swing/JComboBox/8072767/bug8072767.java index 826e4631dab..9cfddd46cec 100644 --- a/jdk/test/javax/swing/JComboBox/8072767/bug8072767.java +++ b/jdk/test/javax/swing/JComboBox/8072767/bug8072767.java @@ -37,6 +37,7 @@ import javax.swing.SwingUtilities; /** * @test + * @key headful * @bug 8072767 * @author Alexander Scherbatiy * @summary DefaultCellEditor for comboBox creates ActionEvent with wrong source diff --git a/jdk/test/javax/swing/JComboBox/8136998/bug8136998.java b/jdk/test/javax/swing/JComboBox/8136998/bug8136998.java index e7d9e0ac465..8da5d361edf 100644 --- a/jdk/test/javax/swing/JComboBox/8136998/bug8136998.java +++ b/jdk/test/javax/swing/JComboBox/8136998/bug8136998.java @@ -38,7 +38,9 @@ import javax.swing.UIManager.LookAndFeelInfo; import javax.swing.UnsupportedLookAndFeelException; import javax.swing.WindowConstants; -/* @test +/* + * @test + * @key headful * @bug 8136998 * @summary Checks that JComboBox does not prevent mouse-wheel scrolling JScrollPane. * @library ../../regtesthelpers diff --git a/jdk/test/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java b/jdk/test/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java index 12128cdea77..0169a757449 100644 --- a/jdk/test/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java +++ b/jdk/test/javax/swing/JComboBox/ConsumedKeyTest/ConsumedKeyTest.java @@ -27,6 +27,7 @@ import java.awt.event.KeyEvent; /* @test + @key headful @bug 8031485 8058193 @summary Combo box consuming escape and enter key events @author Petr Pchelko diff --git a/jdk/test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java b/jdk/test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java index 52b9e71ea29..df2ac320ddc 100644 --- a/jdk/test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java +++ b/jdk/test/javax/swing/JComboBox/ShowPopupAfterHidePopupTest/ShowPopupAfterHidePopupTest.java @@ -21,12 +21,14 @@ * questions. */ -/* @test - @bug 8006417 - @summary JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X - @author Anton Litvinov - @run main ShowPopupAfterHidePopupTest -*/ +/* + * @test + * @key headful + * @bug 8006417 + * @summary JComboBox.showPopup(), hidePopup() fails in JRE 1.7 on OS X + * @author Anton Litvinov + * @run main ShowPopupAfterHidePopupTest + */ import java.awt.*; diff --git a/jdk/test/javax/swing/JComponent/6989617/bug6989617.java b/jdk/test/javax/swing/JComponent/6989617/bug6989617.java index a13201df761..ff6bd7f10b5 100644 --- a/jdk/test/javax/swing/JComponent/6989617/bug6989617.java +++ b/jdk/test/javax/swing/JComponent/6989617/bug6989617.java @@ -21,12 +21,14 @@ * questions. */ -/* @test - @bug 6989617 - @summary Enable JComponent to control repaintings of its children - @author Alexander Potochkin - @run main bug6989617 -*/ +/* + * @test + * @key headful + * @bug 6989617 + * @summary Enable JComponent to control repaintings of its children + * @author Alexander Potochkin + * @run main bug6989617 + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/JComponent/7154030/bug7154030.java b/jdk/test/javax/swing/JComponent/7154030/bug7154030.java index dab2d3c9ba9..b671a1fee8d 100644 --- a/jdk/test/javax/swing/JComponent/7154030/bug7154030.java +++ b/jdk/test/javax/swing/JComponent/7154030/bug7154030.java @@ -40,7 +40,9 @@ import java.awt.Robot; import java.awt.Toolkit; import java.awt.image.BufferedImage; -/* @test 1.1 2012/04/12 +/* + * @test + * @key headful * @bug 7154030 * @summary Swing components fail to hide after calling hide() * @author Jonathan Lu diff --git a/jdk/test/javax/swing/JDialog/Transparency/TransparencyTest.java b/jdk/test/javax/swing/JDialog/Transparency/TransparencyTest.java index cb2ba23041d..5c6080c336f 100644 --- a/jdk/test/javax/swing/JDialog/Transparency/TransparencyTest.java +++ b/jdk/test/javax/swing/JDialog/Transparency/TransparencyTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 8062946 @summary Verify Transparency upon iconify/deiconify sequence @run main TransparencyTest diff --git a/jdk/test/javax/swing/JDialog/WrongBackgroundColor/WrongBackgroundColor.java b/jdk/test/javax/swing/JDialog/WrongBackgroundColor/WrongBackgroundColor.java index 63b6e71cbf5..a910e0df877 100644 --- a/jdk/test/javax/swing/JDialog/WrongBackgroundColor/WrongBackgroundColor.java +++ b/jdk/test/javax/swing/JDialog/WrongBackgroundColor/WrongBackgroundColor.java @@ -33,6 +33,7 @@ import javax.swing.plaf.ColorUIResource; /** * @test + * @key headful * @bug 8033786 * @summary JDialog should update background color of the native peer. * @author Sergey Bylokhov diff --git a/jdk/test/javax/swing/JEditorPane/4492274/bug4492274.java b/jdk/test/javax/swing/JEditorPane/4492274/bug4492274.java index 369f05f17a7..179450d963a 100644 --- a/jdk/test/javax/swing/JEditorPane/4492274/bug4492274.java +++ b/jdk/test/javax/swing/JEditorPane/4492274/bug4492274.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 4492274 * @summary Tests if JEditorPane.getPage() correctly returns anchor reference. * @author Denis Sharypov diff --git a/jdk/test/javax/swing/JEditorPane/6917744/bug6917744.java b/jdk/test/javax/swing/JEditorPane/6917744/bug6917744.java index 75af9834b91..8eaa5256f63 100644 --- a/jdk/test/javax/swing/JEditorPane/6917744/bug6917744.java +++ b/jdk/test/javax/swing/JEditorPane/6917744/bug6917744.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 6917744 * @summary JScrollPane Page Up/Down keys do not handle correctly html tables with different cells contents * @author Pavel Porvatov diff --git a/jdk/test/javax/swing/JEditorPane/8146319/JEditorPaneTest.java b/jdk/test/javax/swing/JEditorPane/8146319/JEditorPaneTest.java index 86a51739c5c..1f0eded1765 100644 --- a/jdk/test/javax/swing/JEditorPane/8146319/JEditorPaneTest.java +++ b/jdk/test/javax/swing/JEditorPane/8146319/JEditorPaneTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8146319 * @summary JEditorPane function setPage leaves a file lock * @run main JEditorPaneTest diff --git a/jdk/test/javax/swing/JFileChooser/4524490/bug4524490.java b/jdk/test/javax/swing/JFileChooser/4524490/bug4524490.java index 81a5259e420..5fdb1642f3e 100644 --- a/jdk/test/javax/swing/JFileChooser/4524490/bug4524490.java +++ b/jdk/test/javax/swing/JFileChooser/4524490/bug4524490.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 4524490 * @summary Tests if in JFileChooser, ALT+L does not bring focus to 'Files' selection list in Motif LAF * @author Konstantin Eremin diff --git a/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java b/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java index 977c85e030a..afc2fc41bc4 100644 --- a/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java +++ b/jdk/test/javax/swing/JFileChooser/6396844/TwentyThousandTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6396844 * @summary Tests memory leak for 20000 files * @author Sergey Malenkov diff --git a/jdk/test/javax/swing/JFileChooser/7199708/bug7199708.java b/jdk/test/javax/swing/JFileChooser/7199708/bug7199708.java index f8265c846f4..588c62e79c2 100644 --- a/jdk/test/javax/swing/JFileChooser/7199708/bug7199708.java +++ b/jdk/test/javax/swing/JFileChooser/7199708/bug7199708.java @@ -40,6 +40,7 @@ import javax.swing.UIManager; /** * @test + * @key headful * @bug 7199708 8159587 * @author Alexander Scherbatiy * @summary FileChooser crashs when opening large folder diff --git a/jdk/test/javax/swing/JFileChooser/8002077/bug8002077.java b/jdk/test/javax/swing/JFileChooser/8002077/bug8002077.java index 4a76b7dd228..d9fcdcf4781 100644 --- a/jdk/test/javax/swing/JFileChooser/8002077/bug8002077.java +++ b/jdk/test/javax/swing/JFileChooser/8002077/bug8002077.java @@ -30,6 +30,7 @@ import javax.swing.UIManager.LookAndFeelInfo; /** * @test + * @key headful * @bug 8002077 * @author Alexander Scherbatiy * @summary Possible mnemonic issue on JFileChooser Save button on nimbus L&F diff --git a/jdk/test/javax/swing/JFileChooser/8016665/JFileChooserOrientation.java b/jdk/test/javax/swing/JFileChooser/8016665/JFileChooserOrientation.java index 4296d48fd2d..99b53a034ef 100644 --- a/jdk/test/javax/swing/JFileChooser/8016665/JFileChooserOrientation.java +++ b/jdk/test/javax/swing/JFileChooser/8016665/JFileChooserOrientation.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8016665 * @summary verifies different behaviour of JFileChooser changing orientation * @run main JFileChooserOrientation diff --git a/jdk/test/javax/swing/JFileChooser/8021253/bug8021253.java b/jdk/test/javax/swing/JFileChooser/8021253/bug8021253.java index 3839c5abf9e..831711b260f 100644 --- a/jdk/test/javax/swing/JFileChooser/8021253/bug8021253.java +++ b/jdk/test/javax/swing/JFileChooser/8021253/bug8021253.java @@ -35,6 +35,7 @@ import javax.swing.SwingUtilities; /** * @test + * @key headful * @bug 8021253 * @author Alexander Scherbatiy * @summary JFileChooser does not react on pressing enter since java 7 diff --git a/jdk/test/javax/swing/JFileChooser/8041694/bug8041694.java b/jdk/test/javax/swing/JFileChooser/8041694/bug8041694.java index d24016b4a82..e572e3263e3 100644 --- a/jdk/test/javax/swing/JFileChooser/8041694/bug8041694.java +++ b/jdk/test/javax/swing/JFileChooser/8041694/bug8041694.java @@ -21,13 +21,15 @@ * questions. */ -/* @test - @bug 8041694 - @summary JFileChooser removes trailing spaces in the selected directory name - @author Anton Litvinov - @library ../../../../lib/testlibrary - @build jdk.testlibrary.OSInfo - @run main bug8041694 +/* + * @test + * @key headful + * @bug 8041694 + * @summary JFileChooser removes trailing spaces in the selected directory name + * @author Anton Litvinov + * @library ../../../../lib/testlibrary + * @build jdk.testlibrary.OSInfo + * @run main bug8041694 */ import java.awt.AWTException; diff --git a/jdk/test/javax/swing/JFileChooser/DeserializedJFileChooser/DeserializedJFileChooserTest.java b/jdk/test/javax/swing/JFileChooser/DeserializedJFileChooser/DeserializedJFileChooserTest.java index 122b819255c..01e51c6edf5 100644 --- a/jdk/test/javax/swing/JFileChooser/DeserializedJFileChooser/DeserializedJFileChooserTest.java +++ b/jdk/test/javax/swing/JFileChooser/DeserializedJFileChooser/DeserializedJFileChooserTest.java @@ -23,6 +23,7 @@ /** * @test + * @key headful * @bug 8146301 * @summary Enter key does not work in a deserialized JFileChooser. * @run main DeserializedJFileChooserTest diff --git a/jdk/test/javax/swing/JFrame/HangNonVolatileBuffer/HangNonVolatileBuffer.java b/jdk/test/javax/swing/JFrame/HangNonVolatileBuffer/HangNonVolatileBuffer.java index c61be1cb0fc..db8d0de2500 100644 --- a/jdk/test/javax/swing/JFrame/HangNonVolatileBuffer/HangNonVolatileBuffer.java +++ b/jdk/test/javax/swing/JFrame/HangNonVolatileBuffer/HangNonVolatileBuffer.java @@ -28,6 +28,7 @@ import javax.swing.SwingUtilities; /** * @test + * @key headful * @bug 8029455 * @summary Swing should not hang if non-volatile image is used as a backbuffer. * @run main/othervm -Dswing.volatileImageBufferEnabled=false HangNonVolatileBuffer diff --git a/jdk/test/javax/swing/JInternalFrame/4769772/TestJInternalFrameIconify.java b/jdk/test/javax/swing/JInternalFrame/4769772/TestJInternalFrameIconify.java index 12bd49d1b49..cbef0ffd4c9 100644 --- a/jdk/test/javax/swing/JInternalFrame/4769772/TestJInternalFrameIconify.java +++ b/jdk/test/javax/swing/JInternalFrame/4769772/TestJInternalFrameIconify.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 4769772 * @summary JInternalFrame.setIcon(true) before JDesktopPane.add(JIF) causes wrong state * @run main TestJInternalFrameIconify diff --git a/jdk/test/javax/swing/JInternalFrame/5066752/bug5066752.java b/jdk/test/javax/swing/JInternalFrame/5066752/bug5066752.java index 3ed42fc59ec..4182cca6278 100644 --- a/jdk/test/javax/swing/JInternalFrame/5066752/bug5066752.java +++ b/jdk/test/javax/swing/JInternalFrame/5066752/bug5066752.java @@ -22,6 +22,7 @@ */ /* @test + @key headful @bug 5066752 @summary Transparent JDesktopPane impossible because isOpaque() returns true @author mb50250: area=JDesktopPane diff --git a/jdk/test/javax/swing/JInternalFrame/6647340/bug6647340.java b/jdk/test/javax/swing/JInternalFrame/6647340/bug6647340.java index 8bb1ffc92e1..283e40fc39b 100644 --- a/jdk/test/javax/swing/JInternalFrame/6647340/bug6647340.java +++ b/jdk/test/javax/swing/JInternalFrame/6647340/bug6647340.java @@ -22,6 +22,7 @@ */ /* @test + * @key headful * @bug 6647340 * @summary Checks that iconified internal frame follows * the main frame borders properly. diff --git a/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java b/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java index b121e1d8a5d..c56eaddc69d 100644 --- a/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java +++ b/jdk/test/javax/swing/JInternalFrame/6725409/bug6725409.java @@ -22,6 +22,7 @@ */ /* @test + * @key headful * @bug 6725409 * @summary Checks that JInternalFrame's system menu * can be localized during run-time diff --git a/jdk/test/javax/swing/JInternalFrame/8020708/bug8020708.java b/jdk/test/javax/swing/JInternalFrame/8020708/bug8020708.java index 3a3f82b0fe8..449362426ce 100644 --- a/jdk/test/javax/swing/JInternalFrame/8020708/bug8020708.java +++ b/jdk/test/javax/swing/JInternalFrame/8020708/bug8020708.java @@ -35,6 +35,7 @@ import javax.swing.UIManager; /** * @test + * @key headful * @bug 8020708 8032568 * @author Alexander Scherbatiy * @summary NLS: mnemonics missing in SwingSet2/JInternalFrame demo diff --git a/jdk/test/javax/swing/JInternalFrame/8069348/bug8069348.java b/jdk/test/javax/swing/JInternalFrame/8069348/bug8069348.java index d9deeefb99b..62d49234722 100644 --- a/jdk/test/javax/swing/JInternalFrame/8069348/bug8069348.java +++ b/jdk/test/javax/swing/JInternalFrame/8069348/bug8069348.java @@ -36,6 +36,7 @@ import static sun.awt.OSInfo.*; /** * @test + * @key headful * @bug 8069348 * @summary SunGraphics2D.copyArea() does not properly work for scaled graphics * @author Alexandr Scherbatiy diff --git a/jdk/test/javax/swing/JInternalFrame/8145896/TestJInternalFrameMaximize.java b/jdk/test/javax/swing/JInternalFrame/8145896/TestJInternalFrameMaximize.java index e48a2daa796..5c176defaf1 100644 --- a/jdk/test/javax/swing/JInternalFrame/8145896/TestJInternalFrameMaximize.java +++ b/jdk/test/javax/swing/JInternalFrame/8145896/TestJInternalFrameMaximize.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8145896 * @summary JInternalFrame setMaximum before adding to desktop throws null pointer exception * @library ../../regtesthelpers diff --git a/jdk/test/javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java b/jdk/test/javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java index fb3480d3785..4db711c9dc7 100644 --- a/jdk/test/javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java +++ b/jdk/test/javax/swing/JInternalFrame/8146321/JInternalFrameIconTest.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8146321 8151282 * @summary verifies JInternalFrame Icon and ImageIcon * @library ../../regtesthelpers diff --git a/jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java b/jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java index a00812602fd..df332e2a044 100644 --- a/jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java +++ b/jdk/test/javax/swing/JInternalFrame/InternalFrameIsNotCollectedTest.java @@ -21,11 +21,13 @@ * questions. */ - /* @test - @bug 8012004 - @summary JINTERNALFRAME NOT BEING FINALIZED AFTER CLOSING - @author mcherkas - @run main InternalFrameIsNotCollectedTest +/* + * @test + * @key headful + * @bug 8012004 + * @summary JINTERNALFRAME NOT BEING FINALIZED AFTER CLOSING + * @author mcherkas + * @run main InternalFrameIsNotCollectedTest */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/JInternalFrame/NormalBoundsTest.java b/jdk/test/javax/swing/JInternalFrame/NormalBoundsTest.java index 2a6d7f998a9..dcd9067284e 100644 --- a/jdk/test/javax/swing/JInternalFrame/NormalBoundsTest.java +++ b/jdk/test/javax/swing/JInternalFrame/NormalBoundsTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 7126823 @summary Verify NormalBounds upon iconify/deiconify sequence @run main NormalBoundsTest diff --git a/jdk/test/javax/swing/JInternalFrame/Test6505027.java b/jdk/test/javax/swing/JInternalFrame/Test6505027.java index 36c3db3b2d7..23971408184 100644 --- a/jdk/test/javax/swing/JInternalFrame/Test6505027.java +++ b/jdk/test/javax/swing/JInternalFrame/Test6505027.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6505027 * @summary Tests focus problem inside internal frame * @author Sergey Malenkov diff --git a/jdk/test/javax/swing/JInternalFrame/Test6802868.java b/jdk/test/javax/swing/JInternalFrame/Test6802868.java index 61e17174e7b..1222e8780f9 100644 --- a/jdk/test/javax/swing/JInternalFrame/Test6802868.java +++ b/jdk/test/javax/swing/JInternalFrame/Test6802868.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6802868 * @summary JInternalFrame is not maximized when maximized parent frame * @author Alexander Potochkin diff --git a/jdk/test/javax/swing/JLabel/6596966/bug6596966.java b/jdk/test/javax/swing/JLabel/6596966/bug6596966.java index d28551be0b1..e804b29529e 100644 --- a/jdk/test/javax/swing/JLabel/6596966/bug6596966.java +++ b/jdk/test/javax/swing/JLabel/6596966/bug6596966.java @@ -21,15 +21,17 @@ * questions. */ -/* @test - @bug 6596966 - @summary Some JFileChooser mnemonics do not work with sticky keys - @library ../../regtesthelpers - @library ../../../../lib/testlibrary - @build Util jdk.testlibrary.OSInfo - @run main bug6596966 - @author Pavel Porvatov -*/ +/* + * @test + * @key headful + * @bug 6596966 + * @summary Some JFileChooser mnemonics do not work with sticky keys + * @library ../../regtesthelpers + * @library ../../../../lib/testlibrary + * @build Util jdk.testlibrary.OSInfo + * @run main bug6596966 + * @author Pavel Porvatov + */ import java.awt.*; import java.awt.event.KeyEvent; diff --git a/jdk/test/javax/swing/JLabel/7004134/bug7004134.java b/jdk/test/javax/swing/JLabel/7004134/bug7004134.java index 12fcf81471f..9440d142ef6 100644 --- a/jdk/test/javax/swing/JLabel/7004134/bug7004134.java +++ b/jdk/test/javax/swing/JLabel/7004134/bug7004134.java @@ -21,12 +21,14 @@ * questions. */ -/* @test - @bug 7004134 - @summary JLabel containing a ToolTipText does no longer show ToolTip after browser refresh - @author Pavel Porvatov - @modules java.desktop/sun.awt -*/ +/* + * @test + * @key headful + * @bug 7004134 + * @summary JLabel containing a ToolTipText does no longer show ToolTip after browser refresh + * @author Pavel Porvatov + * @modules java.desktop/sun.awt + */ import sun.awt.SunToolkit; diff --git a/jdk/test/javax/swing/JLayer/6824395/bug6824395.java b/jdk/test/javax/swing/JLayer/6824395/bug6824395.java index fd35608d478..e8ad1e2f348 100644 --- a/jdk/test/javax/swing/JLayer/6824395/bug6824395.java +++ b/jdk/test/javax/swing/JLayer/6824395/bug6824395.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @summary Checks that JLayer inside JViewport works is correctly laid out * @author Alexander Potochkin * @library ../../../../lib/testlibrary/ diff --git a/jdk/test/javax/swing/JLayer/6872503/bug6872503.java b/jdk/test/javax/swing/JLayer/6872503/bug6872503.java index c48f014d0b5..82744b1637b 100644 --- a/jdk/test/javax/swing/JLayer/6872503/bug6872503.java +++ b/jdk/test/javax/swing/JLayer/6872503/bug6872503.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 6872503 * @summary Checks that JLayer correctly works with its AWTEventListener * @author Alexander Potochkin diff --git a/jdk/test/javax/swing/JList/6462008/bug6462008.java b/jdk/test/javax/swing/JList/6462008/bug6462008.java index 9ecd674b0ce..77febbc283f 100644 --- a/jdk/test/javax/swing/JList/6462008/bug6462008.java +++ b/jdk/test/javax/swing/JList/6462008/bug6462008.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6462008 * @summary Tests that mouse/keyboard work properly on JList with lead < 0 or > list.getModel().getSize() * @author Shannon Hickey diff --git a/jdk/test/javax/swing/JList/6510999/bug6510999.java b/jdk/test/javax/swing/JList/6510999/bug6510999.java index 76c871b158d..1269de28a5e 100644 --- a/jdk/test/javax/swing/JList/6510999/bug6510999.java +++ b/jdk/test/javax/swing/JList/6510999/bug6510999.java @@ -20,12 +20,14 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test - @bug 6510999 - @summary Selection in a JList with both scrollbars visible jumps on arrowkey-down - @author Alexander Potochkin - @run main bug6510999 -*/ +/* + * @test + * @key headful + * @bug 6510999 + * @summary Selection in a JList with both scrollbars visible jumps on arrowkey-down + * @author Alexander Potochkin + * @run main bug6510999 + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/JMenu/4213634/bug4213634.java b/jdk/test/javax/swing/JMenu/4213634/bug4213634.java index efd6633ca86..dd699b7e5bc 100644 --- a/jdk/test/javax/swing/JMenu/4213634/bug4213634.java +++ b/jdk/test/javax/swing/JMenu/4213634/bug4213634.java @@ -35,7 +35,9 @@ import javax.swing.JMenuItem; import javax.swing.JTextArea; import javax.swing.SwingUtilities; -/* @test +/* + * @test + * @key headful * @bug 4213634 8017187 * @author Scott Violet * @library ../../regtesthelpers diff --git a/jdk/test/javax/swing/JMenu/4417601/bug4417601.java b/jdk/test/javax/swing/JMenu/4417601/bug4417601.java index 44c10f80ab0..dc647023416 100644 --- a/jdk/test/javax/swing/JMenu/4417601/bug4417601.java +++ b/jdk/test/javax/swing/JMenu/4417601/bug4417601.java @@ -20,14 +20,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test - @bug 4417601 - @summary JMenus with no items paint a tiny menu. - @author Alexander Potochkin - @library ../../../../lib/testlibrary - @build ExtendedRobot - @run main bug4417601 -*/ + +/* + * @test + * @key headful + * @bug 4417601 + * @summary JMenus with no items paint a tiny menu. + * @author Alexander Potochkin + * @library ../../../../lib/testlibrary + * @build ExtendedRobot + * @run main bug4417601 + */ import javax.swing.*; import java.awt.event.*; diff --git a/jdk/test/javax/swing/JMenu/4515762/bug4515762.java b/jdk/test/javax/swing/JMenu/4515762/bug4515762.java index 8b0cae273a4..67387c8fc4b 100644 --- a/jdk/test/javax/swing/JMenu/4515762/bug4515762.java +++ b/jdk/test/javax/swing/JMenu/4515762/bug4515762.java @@ -27,6 +27,7 @@ import javax.swing.*; /** * @test + * @key headful * @bug 4515762 * @author Mark Davidson * @summary Tests the ability to support duplicate mnemonics diff --git a/jdk/test/javax/swing/JMenu/4692443/bug4692443.java b/jdk/test/javax/swing/JMenu/4692443/bug4692443.java index ac61b72899b..9d522158618 100644 --- a/jdk/test/javax/swing/JMenu/4692443/bug4692443.java +++ b/jdk/test/javax/swing/JMenu/4692443/bug4692443.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @library ../../regtesthelpers * @build Util * @bug 4692443 7105030 diff --git a/jdk/test/javax/swing/JMenu/6359669/bug6359669.java b/jdk/test/javax/swing/JMenu/6359669/bug6359669.java index 1dc562eb706..941fced5088 100644 --- a/jdk/test/javax/swing/JMenu/6359669/bug6359669.java +++ b/jdk/test/javax/swing/JMenu/6359669/bug6359669.java @@ -20,14 +20,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test - @bug 6359669 - @summary REGRESSION: Submenu does not work if populated in PopupMenuListener.popupMenuWillBecomeVisible - @author Alexander Potochkin - @library ../../../../lib/testlibrary - @build ExtendedRobot - @run main bug6359669 -*/ +/* + * @test + * @key headful + * @bug 6359669 + * @summary REGRESSION: Submenu does not work if populated in PopupMenuListener.popupMenuWillBecomeVisible + * @author Alexander Potochkin + * @library ../../../../lib/testlibrary + * @build ExtendedRobot + * @run main bug6359669 + */ import javax.swing.*; import javax.swing.event.PopupMenuListener; diff --git a/jdk/test/javax/swing/JMenu/6470128/bug6470128.java b/jdk/test/javax/swing/JMenu/6470128/bug6470128.java index 20a298dbed2..0c323e2e33e 100644 --- a/jdk/test/javax/swing/JMenu/6470128/bug6470128.java +++ b/jdk/test/javax/swing/JMenu/6470128/bug6470128.java @@ -20,14 +20,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test - @bug 6470128 - @summary Escape Key causes JMenu Selection to Disappear - @author Alexander Potochkin - @library ../../../../lib/testlibrary - @build jdk.testlibrary.OSInfo - @run main bug6470128 -*/ + +/* + * @test + * @key headful + * @bug 6470128 + * @summary Escape Key causes JMenu Selection to Disappear + * @author Alexander Potochkin + * @library ../../../../lib/testlibrary + * @build jdk.testlibrary.OSInfo + * @run main bug6470128 + */ + import javax.swing.*; import java.awt.*; import java.awt.event.KeyEvent; diff --git a/jdk/test/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java b/jdk/test/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java index 9f293b3939a..d59b49f5217 100644 --- a/jdk/test/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java +++ b/jdk/test/javax/swing/JMenu/8072900/WrongSelectionOnMouseOver.java @@ -22,12 +22,13 @@ */ /* -@test -@bug 8072900 -@summary Mouse events are captured by the wrong menu in OS X -@author Anton Nashatyrev -@run main WrongSelectionOnMouseOver -*/ + * @test + * @key headful + * @bug 8072900 + * @summary Mouse events are captured by the wrong menu in OS X + * @author Anton Nashatyrev + * @run main WrongSelectionOnMouseOver + */ import javax.swing.*; import javax.swing.event.MenuEvent; diff --git a/jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java b/jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java index 7e249d3737d..d2d7019e6d8 100644 --- a/jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java +++ b/jdk/test/javax/swing/JMenuBar/4750590/bug4750590.java @@ -21,13 +21,15 @@ * questions. */ -/* @test - @library ../../regtesthelpers - @build Util - @bug 4750590 8015597 - @summary SwingSet: Cannot change Themes using menu accelerators - @author Alexander Zuev - @run main bug4750590 +/* + * @test + * @key headful + * @library ../../regtesthelpers + * @build Util + * @bug 4750590 8015597 + * @summary SwingSet: Cannot change Themes using menu accelerators + * @author Alexander Zuev + * @run main bug4750590 */ import javax.swing.*; diff --git a/jdk/test/javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java b/jdk/test/javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java index 2bba72667ea..9972fe5c64f 100644 --- a/jdk/test/javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java +++ b/jdk/test/javax/swing/JMenuBar/MisplacedBorder/MisplacedBorder.java @@ -40,6 +40,7 @@ import static javax.swing.UIManager.getInstalledLookAndFeels; /** * @test + * @key headful * @bug 8073795 * @summary JMenuBar has incorrect border when the window is on retina display. * @author Sergey Bylokhov diff --git a/jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java b/jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java index 29d1736b783..43914ca77ee 100644 --- a/jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java +++ b/jdk/test/javax/swing/JMenuItem/4171437/bug4171437.java @@ -20,13 +20,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test - @bug 4171437 - @library ../../regtesthelpers - @build Util - @author Georges Saab - @run main bug4171437 -*/ + +/* + * @test + * @key headful + * @bug 4171437 + * @library ../../regtesthelpers + * @build Util + * @author Georges Saab + * @run main bug4171437 + */ + import java.awt.*; import java.awt.event.*; import java.util.ArrayList; diff --git a/jdk/test/javax/swing/JMenuItem/4654927/bug4654927.java b/jdk/test/javax/swing/JMenuItem/4654927/bug4654927.java index 34abf3ffd40..8a4384e4b54 100644 --- a/jdk/test/javax/swing/JMenuItem/4654927/bug4654927.java +++ b/jdk/test/javax/swing/JMenuItem/4654927/bug4654927.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 4654927 * @summary Clicking on Greyed Menuitems closes the Menubar Dropdown * @author Alexander Potochkin diff --git a/jdk/test/javax/swing/JMenuItem/6209975/bug6209975.java b/jdk/test/javax/swing/JMenuItem/6209975/bug6209975.java index a2f13ab6433..00d0e8865d7 100644 --- a/jdk/test/javax/swing/JMenuItem/6209975/bug6209975.java +++ b/jdk/test/javax/swing/JMenuItem/6209975/bug6209975.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6209975 * @summary regression: JMenuItem icons overimposed on JMenuItem labels under Metal LAF * @author Alexander Zuev diff --git a/jdk/test/javax/swing/JMenuItem/6249972/bug6249972.java b/jdk/test/javax/swing/JMenuItem/6249972/bug6249972.java index 5139e26c600..7a02490efa9 100644 --- a/jdk/test/javax/swing/JMenuItem/6249972/bug6249972.java +++ b/jdk/test/javax/swing/JMenuItem/6249972/bug6249972.java @@ -20,13 +20,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test - @bug 6249972 - @summary Tests that JMenuItem(String,int) handles lower-case mnemonics properly. - @library ../../../../lib/testlibrary - @build ExtendedRobot - @author Mikhail Lapshin - @run main bug6249972 + +/* + * @test + * @key headful + * @bug 6249972 + * @summary Tests that JMenuItem(String,int) handles lower-case mnemonics properly. + * @library ../../../../lib/testlibrary + * @build ExtendedRobot + * @author Mikhail Lapshin + * @run main bug6249972 */ import javax.swing.*; diff --git a/jdk/test/javax/swing/JOptionPane/6428694/bug6428694.java b/jdk/test/javax/swing/JOptionPane/6428694/bug6428694.java index fa065af15e7..749118986d0 100644 --- a/jdk/test/javax/swing/JOptionPane/6428694/bug6428694.java +++ b/jdk/test/javax/swing/JOptionPane/6428694/bug6428694.java @@ -21,13 +21,14 @@ * questions. */ /* -@test -@bug 6428694 -@summary Checks that double click closes JOptionPane's input dialog. -@library ../../../../lib/testlibrary -@build ExtendedRobot -@author Mikhail Lapshin -@run main bug6428694 + * @test + * @key headful + * @bug 6428694 + * @summary Checks that double click closes JOptionPane's input dialog. + * @library ../../../../lib/testlibrary + * @build ExtendedRobot + * @author Mikhail Lapshin + * @run main bug6428694 */ import javax.swing.JFrame; diff --git a/jdk/test/javax/swing/JOptionPane/6464022/bug6464022.java b/jdk/test/javax/swing/JOptionPane/6464022/bug6464022.java index 9554ae9828e..8b3a8a07531 100644 --- a/jdk/test/javax/swing/JOptionPane/6464022/bug6464022.java +++ b/jdk/test/javax/swing/JOptionPane/6464022/bug6464022.java @@ -23,12 +23,13 @@ /* * @test + * @key headful * @bug 6464022 * @summary Memory leak in JOptionPane.createDialog * @author Pavel Porvatov * @library ../../regtesthelpers * @build Util - * @run main bug6464022 + * @run main/othervm -mx128m bug6464022 */ import javax.swing.*; diff --git a/jdk/test/javax/swing/JOptionPane/7138665/bug7138665.java b/jdk/test/javax/swing/JOptionPane/7138665/bug7138665.java index 16b4228cdfe..11a38c8a4ac 100644 --- a/jdk/test/javax/swing/JOptionPane/7138665/bug7138665.java +++ b/jdk/test/javax/swing/JOptionPane/7138665/bug7138665.java @@ -21,11 +21,13 @@ * questions. */ -/* @test - @bug 7138665 - @summary JOptionPane.getValue() unexpected change between JRE 1.6 and JRE 1.7 - @author Pavel Porvatov -*/ +/* + * @test + * @key headful + * @bug 7138665 + * @summary JOptionPane.getValue() unexpected change between JRE 1.6 and JRE 1.7 + * @author Pavel Porvatov + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/JOptionPane/8139213/OptionPaneTest.java b/jdk/test/javax/swing/JOptionPane/8139213/OptionPaneTest.java index 0230ce1b022..84819a0c3ef 100644 --- a/jdk/test/javax/swing/JOptionPane/8139213/OptionPaneTest.java +++ b/jdk/test/javax/swing/JOptionPane/8139213/OptionPaneTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8139213 * @summary Mac OS Aqua X LAF: JOptionPane truncates the first button * @run main OptionPaneTest diff --git a/jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java b/jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java index 3dc95fcfa4b..d4f21b5036e 100644 --- a/jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java +++ b/jdk/test/javax/swing/JPopupMenu/4458079/bug4458079.java @@ -20,14 +20,18 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test - @bug 4458079 - @library ../../regtesthelpers - @build Util - @summary Tests calling removeAll() from PopupMenuListener - @author Peter Zhelezniakov - @run main bug4458079 -*/ + +/* + * @test + * @key headful + * @bug 4458079 + * @library ../../regtesthelpers + * @build Util + * @summary Tests calling removeAll() from PopupMenuListener + * @author Peter Zhelezniakov + * @run main bug4458079 + */ + import java.awt.Robot; import java.awt.Toolkit; import java.awt.event.*; diff --git a/jdk/test/javax/swing/JPopupMenu/4966112/bug4966112.java b/jdk/test/javax/swing/JPopupMenu/4966112/bug4966112.java index 3d1727400a2..a569d654e23 100644 --- a/jdk/test/javax/swing/JPopupMenu/4966112/bug4966112.java +++ b/jdk/test/javax/swing/JPopupMenu/4966112/bug4966112.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 4966112 * @summary Some Composite components does not show the Context Popup. * @library ../../regtesthelpers diff --git a/jdk/test/javax/swing/JPopupMenu/6415145/bug6415145.java b/jdk/test/javax/swing/JPopupMenu/6415145/bug6415145.java index c288300e94d..4714bbf92ad 100644 --- a/jdk/test/javax/swing/JPopupMenu/6415145/bug6415145.java +++ b/jdk/test/javax/swing/JPopupMenu/6415145/bug6415145.java @@ -21,14 +21,15 @@ * questions. */ /* -@test -@bug 6415145 -@summary REGRESSION: Selected item is not being updated while dragging above popup menu -@library ../../../../lib/testlibrary -@build ExtendedRobot -@author Mikhail Lapshin -@run main bug6415145 -*/ + * @test + * @key headful + * @bug 6415145 + * @summary REGRESSION: Selected item is not being updated while dragging above popup menu + * @library ../../../../lib/testlibrary + * @build ExtendedRobot + * @author Mikhail Lapshin + * @run main bug6415145 + */ import javax.swing.*; import java.awt.event.*; diff --git a/jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java b/jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java index ff68cf62844..b15194aef4d 100644 --- a/jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java +++ b/jdk/test/javax/swing/JPopupMenu/6495920/bug6495920.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6495920 * @summary Tests that if the JPopupMenu.setVisible method throws an exception, interaction with GNOME is not crippled diff --git a/jdk/test/javax/swing/JPopupMenu/6515446/bug6515446.java b/jdk/test/javax/swing/JPopupMenu/6515446/bug6515446.java index b26aa0395a4..74a49f51266 100644 --- a/jdk/test/javax/swing/JPopupMenu/6515446/bug6515446.java +++ b/jdk/test/javax/swing/JPopupMenu/6515446/bug6515446.java @@ -21,14 +21,15 @@ * questions. */ /* -@test -@bug 6515446 -@summary JMenuItems in JPopupMenus not receiving ActionEvents - incompat with 1.5 -@author Alexander Potochkin -@library ../../../../lib/testlibrary -@build ExtendedRobot -@run main bug6515446 -*/ + * @test + * @key headful + * @bug 6515446 + * @summary JMenuItems in JPopupMenus not receiving ActionEvents - incompat with 1.5 + * @author Alexander Potochkin + * @library ../../../../lib/testlibrary + * @build ExtendedRobot + * @run main bug6515446 + */ import javax.swing.*; import java.awt.event.*; diff --git a/jdk/test/javax/swing/JPopupMenu/6544309/bug6544309.java b/jdk/test/javax/swing/JPopupMenu/6544309/bug6544309.java index f0c76a48712..08248567d13 100644 --- a/jdk/test/javax/swing/JPopupMenu/6544309/bug6544309.java +++ b/jdk/test/javax/swing/JPopupMenu/6544309/bug6544309.java @@ -20,7 +20,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test +/* + @test + @key headful @bug 6544309 @summary Checks that 'Select Input Method' popup menu allows to select items with keyboard. diff --git a/jdk/test/javax/swing/JPopupMenu/6580930/bug6580930.java b/jdk/test/javax/swing/JPopupMenu/6580930/bug6580930.java index cbc805c01c9..1f9772920c6 100644 --- a/jdk/test/javax/swing/JPopupMenu/6580930/bug6580930.java +++ b/jdk/test/javax/swing/JPopupMenu/6580930/bug6580930.java @@ -21,14 +21,15 @@ * questions. */ /* -@test -@bug 6580930 7184956 -@summary Swing Popups should overlap taskbar -@author Alexander Potochkin -@library ../../../../lib/testlibrary -@build ExtendedRobot -@run main bug6580930 -*/ + * @test + * @key headful + * @bug 6580930 7184956 + * @summary Swing Popups should overlap taskbar + * @author Alexander Potochkin + * @library ../../../../lib/testlibrary + * @build ExtendedRobot + * @run main bug6580930 + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/JPopupMenu/6583251/bug6583251.java b/jdk/test/javax/swing/JPopupMenu/6583251/bug6583251.java index d44c221093d..b91313391e3 100644 --- a/jdk/test/javax/swing/JPopupMenu/6583251/bug6583251.java +++ b/jdk/test/javax/swing/JPopupMenu/6583251/bug6583251.java @@ -24,12 +24,13 @@ */ /* -@test -@bug 6583251 -@summary One more ClassCastException in Swing with TrayIcon -@author Alexander Potochkin -@run main bug6583251 -*/ + * @test + * @key headful + * @bug 6583251 + * @summary One more ClassCastException in Swing with TrayIcon + * @author Alexander Potochkin + * @run main bug6583251 + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/JPopupMenu/6691503/bug6691503.java b/jdk/test/javax/swing/JPopupMenu/6691503/bug6691503.java index f07ebd19a35..f6f3d9746ac 100644 --- a/jdk/test/javax/swing/JPopupMenu/6691503/bug6691503.java +++ b/jdk/test/javax/swing/JPopupMenu/6691503/bug6691503.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6691503 * @summary Checks that there is no opportunity for a malicious applet * to show a popup menu which has whole screen size. diff --git a/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java b/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java index 3e6c4be0c69..94daa457873 100644 --- a/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java +++ b/jdk/test/javax/swing/JPopupMenu/6694823/bug6694823.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6694823 * @summary Checks that popup menu cannot be partially hidden * by the task bar in applets. diff --git a/jdk/test/javax/swing/JPopupMenu/6800513/bug6800513.java b/jdk/test/javax/swing/JPopupMenu/6800513/bug6800513.java index 097e28ddd9a..098defe2eb7 100644 --- a/jdk/test/javax/swing/JPopupMenu/6800513/bug6800513.java +++ b/jdk/test/javax/swing/JPopupMenu/6800513/bug6800513.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 6800513 * @summary GTK-LaF renders menus incompletely * @author Mario Torre diff --git a/jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java b/jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java index ed8ec4782be..c377a7b55c3 100644 --- a/jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java +++ b/jdk/test/javax/swing/JPopupMenu/6827786/bug6827786.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6827786 * @summary Tests duplicate mnemonics * @author Peter Zhelezniakov diff --git a/jdk/test/javax/swing/JPopupMenu/6987844/bug6987844.java b/jdk/test/javax/swing/JPopupMenu/6987844/bug6987844.java index 2fd16e214db..97790cac652 100644 --- a/jdk/test/javax/swing/JPopupMenu/6987844/bug6987844.java +++ b/jdk/test/javax/swing/JPopupMenu/6987844/bug6987844.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6987844 * @summary Incorrect width of JComboBox drop down * @author Alexander Potochkin diff --git a/jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java b/jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java index d6d818dd0f3..8851eabd5f5 100644 --- a/jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java +++ b/jdk/test/javax/swing/JPopupMenu/7156657/bug7156657.java @@ -29,7 +29,9 @@ import java.awt.*; import java.awt.image.BufferedImage; import java.util.concurrent.Callable; -/* @test +/* + @test + @key headful @bug 7156657 @summary Version 7 doesn't support translucent popup menus against a translucent window @library ../../regtesthelpers diff --git a/jdk/test/javax/swing/JPopupMenu/8147521/PopupMenuTest.java b/jdk/test/javax/swing/JPopupMenu/8147521/PopupMenuTest.java index b00abfcc72a..51f12c83855 100644 --- a/jdk/test/javax/swing/JPopupMenu/8147521/PopupMenuTest.java +++ b/jdk/test/javax/swing/JPopupMenu/8147521/PopupMenuTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8147521 8158358 * @summary [macosx] Internal API Usage: setPopupType used to force creation of * heavyweight popup diff --git a/jdk/test/javax/swing/JProgressBar/8015748/JProgressBarOrientationRobotTest.java b/jdk/test/javax/swing/JProgressBar/8015748/JProgressBarOrientationRobotTest.java index bc2a6855f87..4bb62523da8 100644 --- a/jdk/test/javax/swing/JProgressBar/8015748/JProgressBarOrientationRobotTest.java +++ b/jdk/test/javax/swing/JProgressBar/8015748/JProgressBarOrientationRobotTest.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8015748 * @summary verifies ProgressBar RightToLeft orientations for all Look and Feels * @library ../../regtesthelpers diff --git a/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java b/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java index 212b442b9ab..681bb925290 100644 --- a/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java +++ b/jdk/test/javax/swing/JRadioButton/8033699/bug8033699.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @library ../../regtesthelpers * @build Util * @bug 8033699 diff --git a/jdk/test/javax/swing/JRadioButton/8041561/bug8041561.java b/jdk/test/javax/swing/JRadioButton/8041561/bug8041561.java index 9a7e3bd2d0b..12efa8b5cac 100644 --- a/jdk/test/javax/swing/JRadioButton/8041561/bug8041561.java +++ b/jdk/test/javax/swing/JRadioButton/8041561/bug8041561.java @@ -36,6 +36,7 @@ import javax.swing.plaf.metal.MetalLookAndFeel; /** * @test + * @key headful * @bug 8041561 * @author Alexander Scherbatiy * @summary Inconsistent opacity behaviour between JCheckBox and JRadioButton diff --git a/jdk/test/javax/swing/JRadioButton/8075609/bug8075609.java b/jdk/test/javax/swing/JRadioButton/8075609/bug8075609.java index 6cd17215be4..664f5b4b2c1 100644 --- a/jdk/test/javax/swing/JRadioButton/8075609/bug8075609.java +++ b/jdk/test/javax/swing/JRadioButton/8075609/bug8075609.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @library ../../regtesthelpers * @build Util * @bug 8075609 diff --git a/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java b/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java index 34a7cfe0206..f7146318ad0 100644 --- a/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java +++ b/jdk/test/javax/swing/JRadioButton/FocusTraversal/FocusTraversal.java @@ -22,9 +22,10 @@ */ /* @test - @bug 8129940 8132770 - @summary JRadioButton should run custom FocusTraversalKeys for all LaFs - @run main FocusTraversal + * @key headful + * @bug 8129940 8132770 8161470 + * @summary JRadioButton should run custom FocusTraversalKeys for all LaFs + * @run main FocusTraversal */ import java.awt.BorderLayout; import java.awt.Component; @@ -60,7 +61,7 @@ public class FocusTraversal { public static void main(String[] args) throws Exception { robot = new Robot(); - robot.delay(2000); + robot.waitForIdle(); UIManager.LookAndFeelInfo[] lookAndFeelArray = UIManager.getInstalledLookAndFeels(); for (UIManager.LookAndFeelInfo lookAndFeelItem : lookAndFeelArray) { @@ -72,11 +73,11 @@ public class FocusTraversal { throws Exception { if (tryLookAndFeel(lookAndFeelString)) { createUI(lookAndFeelString); - robot.delay(2000); + robot.waitForIdle(); runTestCase(); - robot.delay(2000); + robot.waitForIdle(); cleanUp(); - robot.delay(2000); + robot.waitForIdle(); } } diff --git a/jdk/test/javax/swing/JRootPane/4670486/bug4670486.java b/jdk/test/javax/swing/JRootPane/4670486/bug4670486.java index d967d4527df..150396e978f 100644 --- a/jdk/test/javax/swing/JRootPane/4670486/bug4670486.java +++ b/jdk/test/javax/swing/JRootPane/4670486/bug4670486.java @@ -27,6 +27,7 @@ import javax.swing.*; /** * @test + * @key headful * @bug 4670486 * @author Mark Davidson * @summary Regression: Popup menu bindings doesn't work when a default button has been defined. diff --git a/jdk/test/javax/swing/JRootPane/SilenceOfDeprecatedMenuBar/SilenceOfDeprecatedMenuBar.java b/jdk/test/javax/swing/JRootPane/SilenceOfDeprecatedMenuBar/SilenceOfDeprecatedMenuBar.java index a59ac067f30..14fc03856d2 100644 --- a/jdk/test/javax/swing/JRootPane/SilenceOfDeprecatedMenuBar/SilenceOfDeprecatedMenuBar.java +++ b/jdk/test/javax/swing/JRootPane/SilenceOfDeprecatedMenuBar/SilenceOfDeprecatedMenuBar.java @@ -32,6 +32,7 @@ import static javax.swing.UIManager.getInstalledLookAndFeels; /** * @test + * @key headful * @bug 6368321 * @author Sergey Bylokhov */ diff --git a/jdk/test/javax/swing/JScrollBar/4708809/bug4708809.java b/jdk/test/javax/swing/JScrollBar/4708809/bug4708809.java index 144b22881ee..829df8dc93f 100644 --- a/jdk/test/javax/swing/JScrollBar/4708809/bug4708809.java +++ b/jdk/test/javax/swing/JScrollBar/4708809/bug4708809.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 4708809 * @summary JScrollBar functionality slightly different from native scrollbar * @author Andrey Pikalev diff --git a/jdk/test/javax/swing/JScrollBar/4865918/bug4865918.java b/jdk/test/javax/swing/JScrollBar/4865918/bug4865918.java index 2bf5be45b2d..d624923f02e 100644 --- a/jdk/test/javax/swing/JScrollBar/4865918/bug4865918.java +++ b/jdk/test/javax/swing/JScrollBar/4865918/bug4865918.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 4865918 * @summary REGRESSION:JCK1.4a-runtime api/javax_swing/interactive/JScrollBarTests.html#JScrollBar * @author Andrey Pikalev diff --git a/jdk/test/javax/swing/JScrollBar/6542335/bug6542335.java b/jdk/test/javax/swing/JScrollBar/6542335/bug6542335.java index 2f0346390d9..8b443232199 100644 --- a/jdk/test/javax/swing/JScrollBar/6542335/bug6542335.java +++ b/jdk/test/javax/swing/JScrollBar/6542335/bug6542335.java @@ -21,12 +21,14 @@ * questions. */ -/* @test - @bug 6542335 - @summary different behavior on knob of scroll bar between 1.4.2 and 5.0 - @author Alexander Potochkin - @run main bug6542335 -*/ +/* + * @test + * @key headful + * @bug 6542335 + * @summary different behavior on knob of scroll bar between 1.4.2 and 5.0 + * @author Alexander Potochkin + * @run main bug6542335 + */ import javax.swing.*; import javax.swing.plaf.basic.BasicScrollBarUI; diff --git a/jdk/test/javax/swing/JScrollBar/7163696/Test7163696.java b/jdk/test/javax/swing/JScrollBar/7163696/Test7163696.java index 2ca34b52136..0d65a701620 100644 --- a/jdk/test/javax/swing/JScrollBar/7163696/Test7163696.java +++ b/jdk/test/javax/swing/JScrollBar/7163696/Test7163696.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 7163696 * @summary Tests that JScrollBar scrolls to the left * @author Sergey Malenkov diff --git a/jdk/test/javax/swing/JScrollBar/bug4202954/bug4202954.java b/jdk/test/javax/swing/JScrollBar/bug4202954/bug4202954.java index 915a8023124..995e5732cb9 100644 --- a/jdk/test/javax/swing/JScrollBar/bug4202954/bug4202954.java +++ b/jdk/test/javax/swing/JScrollBar/bug4202954/bug4202954.java @@ -20,14 +20,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test +/* + @test + @key headful @bug 4202954 @library ../../../../lib/testlibrary @library ../../regtesthelpers @build Util jdk.testlibrary.OSInfo @author Michael C. Albers @run main bug4202954 -*/ + */ import java.awt.*; import java.awt.event.InputEvent; diff --git a/jdk/test/javax/swing/JScrollPane/6274267/bug6274267.java b/jdk/test/javax/swing/JScrollPane/6274267/bug6274267.java index 1783c0f81b1..a141c43ac2a 100644 --- a/jdk/test/javax/swing/JScrollPane/6274267/bug6274267.java +++ b/jdk/test/javax/swing/JScrollPane/6274267/bug6274267.java @@ -23,13 +23,15 @@ * questions. */ -/* @test - @bug 6274267 - @summary Checks that ScrollPaneLayout properly calculates preferred - layout size. - @author Mikhail Lapshin - @run main bug6274267 -*/ +/* + * @test + * @key headful + * @bug 6274267 + * @summary Checks that ScrollPaneLayout properly calculates preferred + * layout size. + * @author Mikhail Lapshin + * @run main bug6274267 + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/JScrollPane/HorizontalMouseWheelOnShiftPressed/HorizontalMouseWheelOnShiftPressed.java b/jdk/test/javax/swing/JScrollPane/HorizontalMouseWheelOnShiftPressed/HorizontalMouseWheelOnShiftPressed.java index b8120b9e910..5f10c11203b 100644 --- a/jdk/test/javax/swing/JScrollPane/HorizontalMouseWheelOnShiftPressed/HorizontalMouseWheelOnShiftPressed.java +++ b/jdk/test/javax/swing/JScrollPane/HorizontalMouseWheelOnShiftPressed/HorizontalMouseWheelOnShiftPressed.java @@ -35,6 +35,7 @@ import jdk.testlibrary.OSInfo; /** * @test + * @key headful * @bug 8033000 8147994 * @author Alexander Scherbatiy * @summary No Horizontal Mouse Wheel Support In BasicScrollPaneUI diff --git a/jdk/test/javax/swing/JScrollPane/Test6526631.java b/jdk/test/javax/swing/JScrollPane/Test6526631.java index f7f1633f4a5..df7512ef5c6 100644 --- a/jdk/test/javax/swing/JScrollPane/Test6526631.java +++ b/jdk/test/javax/swing/JScrollPane/Test6526631.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6526631 * @summary Resizes right-oriented scroll pane * @author Sergey Malenkov diff --git a/jdk/test/javax/swing/JScrollPane/bug8044371.java b/jdk/test/javax/swing/JScrollPane/bug8044371.java index 2e83385fb8d..7dc606dff74 100644 --- a/jdk/test/javax/swing/JScrollPane/bug8044371.java +++ b/jdk/test/javax/swing/JScrollPane/bug8044371.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8044371 * @summary setOneTouchExpandable functionality of JSplitPane will reduce vertical Scrollbar * @author Anton Nashatyrev diff --git a/jdk/test/javax/swing/JSlider/6348946/bug6348946.java b/jdk/test/javax/swing/JSlider/6348946/bug6348946.java index 588097a1a87..1bc0cb1142f 100644 --- a/jdk/test/javax/swing/JSlider/6348946/bug6348946.java +++ b/jdk/test/javax/swing/JSlider/6348946/bug6348946.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6348946 * @summary Tests that JSlider's thumb moves in the right direction * when it is used as a JTable cell editor. diff --git a/jdk/test/javax/swing/JSlider/6401380/bug6401380.java b/jdk/test/javax/swing/JSlider/6401380/bug6401380.java index 8cb70db5f93..1a11dc4758d 100644 --- a/jdk/test/javax/swing/JSlider/6401380/bug6401380.java +++ b/jdk/test/javax/swing/JSlider/6401380/bug6401380.java @@ -20,14 +20,17 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test - @bug 6401380 - @summary JSlider - mouse click ont the left side of the knob is ignored. - @library ../../../../lib/testlibrary - @build ExtendedRobot - @author Alexander Potochkin - @run main bug6401380 -*/ + +/* + * @test + * @key headful + * @bug 6401380 + * @summary JSlider - mouse click ont the left side of the knob is ignored. + * @library ../../../../lib/testlibrary + * @build ExtendedRobot + * @author Alexander Potochkin + * @run main bug6401380 + */ import javax.swing.*; import javax.swing.plaf.basic.BasicSliderUI; diff --git a/jdk/test/javax/swing/JSlider/6794831/bug6794831.java b/jdk/test/javax/swing/JSlider/6794831/bug6794831.java index 27aa09ffb04..c9f19ef3b26 100644 --- a/jdk/test/javax/swing/JSlider/6794831/bug6794831.java +++ b/jdk/test/javax/swing/JSlider/6794831/bug6794831.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 6794831 * @summary Infinite loop while painting ticks on Slider with maximum=MAX_INT * @author Pavel Porvatov diff --git a/jdk/test/javax/swing/JSlider/6848475/bug6848475.java b/jdk/test/javax/swing/JSlider/6848475/bug6848475.java index a27f02499fa..e4f5bfccc69 100644 --- a/jdk/test/javax/swing/JSlider/6848475/bug6848475.java +++ b/jdk/test/javax/swing/JSlider/6848475/bug6848475.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 6848475 * @summary JSlider does not display the correct value of its BoundedRangeModel * @author Pavel Porvatov diff --git a/jdk/test/javax/swing/JSlider/6918861/bug6918861.java b/jdk/test/javax/swing/JSlider/6918861/bug6918861.java index d1b49448dc3..b965e823acc 100644 --- a/jdk/test/javax/swing/JSlider/6918861/bug6918861.java +++ b/jdk/test/javax/swing/JSlider/6918861/bug6918861.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 6918861 * @summary SynthSliderUI.uninstallDefaults() is not called when UI is uninstalled * @author Pavel Porvatov diff --git a/jdk/test/javax/swing/JSlider/6923305/bug6923305.java b/jdk/test/javax/swing/JSlider/6923305/bug6923305.java index 6079d7e127c..20a32986e0b 100644 --- a/jdk/test/javax/swing/JSlider/6923305/bug6923305.java +++ b/jdk/test/javax/swing/JSlider/6923305/bug6923305.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 6923305 * @summary SynthSliderUI paints the slider track when the slider's "paintTrack" property is set to false * @author Pavel Porvatov diff --git a/jdk/test/javax/swing/JSpinner/4973721/bug4973721.java b/jdk/test/javax/swing/JSpinner/4973721/bug4973721.java index 9bbc381d568..9c18583c6ba 100644 --- a/jdk/test/javax/swing/JSpinner/4973721/bug4973721.java +++ b/jdk/test/javax/swing/JSpinner/4973721/bug4973721.java @@ -20,14 +20,16 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test +/* + @test + @key headful @bug 4973721 @summary Up and Down Arrow key buttons are not working for the JSpinner in Synth LAF @library ../../regtesthelpers @build Util @author Oleg Mokhovikov @run main bug4973721 -*/ + */ import java.awt.Robot; import javax.swing.event.ChangeListener; diff --git a/jdk/test/javax/swing/JSpinner/6421058/bug6421058.java b/jdk/test/javax/swing/JSpinner/6421058/bug6421058.java index d67762b21d7..a9f1044a3ef 100644 --- a/jdk/test/javax/swing/JSpinner/6421058/bug6421058.java +++ b/jdk/test/javax/swing/JSpinner/6421058/bug6421058.java @@ -21,13 +21,14 @@ * questions. */ - /* - * @test - * @bug 6421058 - * @summary Verify font of the text field is changed to the font of - * JSpinner if the font of text field was NOT set by the user - * @run main bug6421058 - */ +/* + * @test + * @key headful + * @bug 6421058 + * @summary Verify font of the text field is changed to the font of + * JSpinner if the font of text field was NOT set by the user + * @run main bug6421058 + */ import java.awt.Font; import javax.swing.JFrame; diff --git a/jdk/test/javax/swing/JSpinner/6532833/bug6532833.java b/jdk/test/javax/swing/JSpinner/6532833/bug6532833.java index 80013da7a81..5e27e71fd15 100644 --- a/jdk/test/javax/swing/JSpinner/6532833/bug6532833.java +++ b/jdk/test/javax/swing/JSpinner/6532833/bug6532833.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 6532833 7077259 * @summary PIT: Metal LAF - The right side border is not shown for the Spinner after the removing the buttons * @author Pavel Porvatov diff --git a/jdk/test/javax/swing/JSpinner/8008657/bug8008657.java b/jdk/test/javax/swing/JSpinner/8008657/bug8008657.java index 1acb45da597..cbeb0c185bb 100644 --- a/jdk/test/javax/swing/JSpinner/8008657/bug8008657.java +++ b/jdk/test/javax/swing/JSpinner/8008657/bug8008657.java @@ -37,6 +37,7 @@ import javax.swing.UnsupportedLookAndFeelException; /** * @test + * @key headful * @bug 8008657 * @author Alexander Scherbatiy * @summary JSpinner setComponentOrientation doesn't affect on text orientation diff --git a/jdk/test/javax/swing/JSpinner/WrongEditorTextFieldFont/WrongEditorTextFieldFont.java b/jdk/test/javax/swing/JSpinner/WrongEditorTextFieldFont/WrongEditorTextFieldFont.java index 0236298c1e6..6ab395d8e6a 100644 --- a/jdk/test/javax/swing/JSpinner/WrongEditorTextFieldFont/WrongEditorTextFieldFont.java +++ b/jdk/test/javax/swing/JSpinner/WrongEditorTextFieldFont/WrongEditorTextFieldFont.java @@ -36,6 +36,7 @@ import static javax.swing.UIManager.getInstalledLookAndFeels; /** * @test + * @key headful * @bug 5036022 * @author Sergey Bylokhov */ diff --git a/jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java b/jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java index 11296836916..1e9c3fe6d65 100644 --- a/jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java +++ b/jdk/test/javax/swing/JSplitPane/4816114/bug4816114.java @@ -20,12 +20,15 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test - @bug 4816114 - @summary REGRESSION: Regression in divider location behavior when JSplitPane is resized - @author Andrey Pikalev - @run main bug4816114 -*/ + +/* + * @test + * @key headful + * @bug 4816114 + * @summary REGRESSION: Regression in divider location behavior when JSplitPane is resized + * @author Andrey Pikalev + * @run main bug4816114 + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/JSplitPane/4885629/bug4885629.java b/jdk/test/javax/swing/JSplitPane/4885629/bug4885629.java index 97fc5c7beb5..59db07057a9 100644 --- a/jdk/test/javax/swing/JSplitPane/4885629/bug4885629.java +++ b/jdk/test/javax/swing/JSplitPane/4885629/bug4885629.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 4885629 * @summary With JSplitPane in VERTICAL_SPLIT, SplitPaneBorder draws bottom edge of divider * @author Andrey Pikalev diff --git a/jdk/test/javax/swing/JTabbedPane/4361477/bug4361477.java b/jdk/test/javax/swing/JTabbedPane/4361477/bug4361477.java index a617ccccd11..20ca62e410f 100644 --- a/jdk/test/javax/swing/JTabbedPane/4361477/bug4361477.java +++ b/jdk/test/javax/swing/JTabbedPane/4361477/bug4361477.java @@ -28,6 +28,7 @@ import javax.swing.event.*; /* * @test + * @key headful * @bug 4361477 * @summary JTabbedPane throws ArrayOutOfBoundsException * @author Oleg Mokhovikov diff --git a/jdk/test/javax/swing/JTabbedPane/4624207/bug4624207.java b/jdk/test/javax/swing/JTabbedPane/4624207/bug4624207.java index 9476df05902..6b7aa04270f 100644 --- a/jdk/test/javax/swing/JTabbedPane/4624207/bug4624207.java +++ b/jdk/test/javax/swing/JTabbedPane/4624207/bug4624207.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 4624207 * @summary JTabbedPane mnemonics don't work from outside the tabbed pane * @author Oleg Mokhovikov diff --git a/jdk/test/javax/swing/JTabbedPane/6495408/bug6495408.java b/jdk/test/javax/swing/JTabbedPane/6495408/bug6495408.java index 8f7f6678827..25da3f8487a 100644 --- a/jdk/test/javax/swing/JTabbedPane/6495408/bug6495408.java +++ b/jdk/test/javax/swing/JTabbedPane/6495408/bug6495408.java @@ -25,6 +25,7 @@ import javax.swing.*; import java.awt.*; /* * @test + * @key headful * @bug 6495408 * @summary REGRESSION: JTabbedPane throws ArrayIndexOutOfBoundsException * @author Alexander Potochkin diff --git a/jdk/test/javax/swing/JTabbedPane/7024235/Test7024235.java b/jdk/test/javax/swing/JTabbedPane/7024235/Test7024235.java index e18f4aac8c4..7e1c3aab28a 100644 --- a/jdk/test/javax/swing/JTabbedPane/7024235/Test7024235.java +++ b/jdk/test/javax/swing/JTabbedPane/7024235/Test7024235.java @@ -38,6 +38,7 @@ import javax.swing.UIManager.LookAndFeelInfo; /* * @test + * @key headful * @bug 7024235 * @summary Tests JFrame.pack() with the JTabbedPane * @library ../../../../lib/testlibrary/ diff --git a/jdk/test/javax/swing/JTabbedPane/7161568/bug7161568.java b/jdk/test/javax/swing/JTabbedPane/7161568/bug7161568.java index 46571abd93a..1904a3f1726 100644 --- a/jdk/test/javax/swing/JTabbedPane/7161568/bug7161568.java +++ b/jdk/test/javax/swing/JTabbedPane/7161568/bug7161568.java @@ -26,6 +26,7 @@ import java.awt.event.*; /** * @test + * @key headful * @bug 7161568 * @author Alexander Scherbatiy * @summary Tests that navigating tabs in the JTAbbedPane does not throw NPE diff --git a/jdk/test/javax/swing/JTabbedPane/8007563/Test8007563.java b/jdk/test/javax/swing/JTabbedPane/8007563/Test8007563.java index 5fd35ac36d7..25d3ad41eca 100644 --- a/jdk/test/javax/swing/JTabbedPane/8007563/Test8007563.java +++ b/jdk/test/javax/swing/JTabbedPane/8007563/Test8007563.java @@ -33,6 +33,7 @@ import static javax.swing.SwingUtilities.*; /* * @test + * @key headful * @bug 8007563 * @summary Tests JTabbedPane background * @author Sergey Malenkov diff --git a/jdk/test/javax/swing/JTabbedPane/8017284/bug8017284.java b/jdk/test/javax/swing/JTabbedPane/8017284/bug8017284.java index 5a71726e631..1cddb78f57b 100644 --- a/jdk/test/javax/swing/JTabbedPane/8017284/bug8017284.java +++ b/jdk/test/javax/swing/JTabbedPane/8017284/bug8017284.java @@ -31,6 +31,7 @@ import javax.swing.plaf.metal.MetalLookAndFeel; /** * @test + * @key headful * @bug 8017284 * @author Alexander Scherbatiy * @summary Aqua LaF: memory leak when HTML is used for JTabbedPane tab titles diff --git a/jdk/test/javax/swing/JTabbedPane/8134116/Bug8134116.java b/jdk/test/javax/swing/JTabbedPane/8134116/Bug8134116.java index ed408d969d9..188166601a7 100644 --- a/jdk/test/javax/swing/JTabbedPane/8134116/Bug8134116.java +++ b/jdk/test/javax/swing/JTabbedPane/8134116/Bug8134116.java @@ -12,6 +12,7 @@ import javax.swing.plaf.nimbus.NimbusLookAndFeel; /* * @test + * @key headful * @bug 8134116 * @summary JTabbedPane$Page.getBounds throws IndexOutOfBoundsException * @run main Bug8134116 diff --git a/jdk/test/javax/swing/JTabbedPane/8137169/ScrollableTabbedPaneTest.java b/jdk/test/javax/swing/JTabbedPane/8137169/ScrollableTabbedPaneTest.java index 834da2ef522..4a37f732a14 100644 --- a/jdk/test/javax/swing/JTabbedPane/8137169/ScrollableTabbedPaneTest.java +++ b/jdk/test/javax/swing/JTabbedPane/8137169/ScrollableTabbedPaneTest.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8137169 * @summary verifies TabbedScrollPane minimum height for all Look and Feels * @library ../../regtesthelpers diff --git a/jdk/test/javax/swing/JTable/4220171/bug4220171.java b/jdk/test/javax/swing/JTable/4220171/bug4220171.java index 2b4ecb5baa6..0dc904b26e3 100644 --- a/jdk/test/javax/swing/JTable/4220171/bug4220171.java +++ b/jdk/test/javax/swing/JTable/4220171/bug4220171.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 4220171 * @author Konstantin Eremin * @summary Tests diff --git a/jdk/test/javax/swing/JTable/6263446/bug6263446.java b/jdk/test/javax/swing/JTable/6263446/bug6263446.java index 9089e3f1c5e..917fa33cdde 100644 --- a/jdk/test/javax/swing/JTable/6263446/bug6263446.java +++ b/jdk/test/javax/swing/JTable/6263446/bug6263446.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6263446 * @summary Tests that double-clicking to edit a cell doesn't select the content. * @author Shannon Hickey diff --git a/jdk/test/javax/swing/JTable/6777378/bug6777378.java b/jdk/test/javax/swing/JTable/6777378/bug6777378.java index 973da5af995..b353249df36 100644 --- a/jdk/test/javax/swing/JTable/6777378/bug6777378.java +++ b/jdk/test/javax/swing/JTable/6777378/bug6777378.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + @test + @key headful @bug 6777378 @summary NullPointerException in XPDefaultRenderer.paint() @author Alexander Potochkin diff --git a/jdk/test/javax/swing/JTable/6894632/bug6894632.java b/jdk/test/javax/swing/JTable/6894632/bug6894632.java index 07cf5960605..9e8e3955bff 100644 --- a/jdk/test/javax/swing/JTable/6894632/bug6894632.java +++ b/jdk/test/javax/swing/JTable/6894632/bug6894632.java @@ -21,12 +21,14 @@ * questions. */ -/* @test - @bug 6894632 - @summary Removing rows from a DefaultTableModel with a RowSorter deselectes - last row - @author Semyon Sadetsky -*/ +/* + * @test + * @key headful + * @bug 6894632 + * @summary Removing rows from a DefaultTableModel with a RowSorter deselectes + * last row + * @author Semyon Sadetsky + */ import javax.swing.*; import javax.swing.table.DefaultTableModel; diff --git a/jdk/test/javax/swing/JTable/6913768/bug6913768.java b/jdk/test/javax/swing/JTable/6913768/bug6913768.java index 331ff70ccfb..6f49d7948fe 100644 --- a/jdk/test/javax/swing/JTable/6913768/bug6913768.java +++ b/jdk/test/javax/swing/JTable/6913768/bug6913768.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 6913768 * @summary With default SynthLookAndFeel instance installed new JTable creation leads to throwing NPE * @author Pavel Porvatov diff --git a/jdk/test/javax/swing/JTable/7055065/bug7055065.java b/jdk/test/javax/swing/JTable/7055065/bug7055065.java index 4b589715bdf..f88a6ec473b 100644 --- a/jdk/test/javax/swing/JTable/7055065/bug7055065.java +++ b/jdk/test/javax/swing/JTable/7055065/bug7055065.java @@ -25,7 +25,9 @@ * Portions Copyright (c) 2012 IBM Corporation */ -/* @test 1.1 2012/04/19 +/* + * @test + * @key headful * @bug 7055065 * @summary NullPointerException when sorting JTable with empty cell * @author Jonathan Lu diff --git a/jdk/test/javax/swing/JTable/7068740/bug7068740.java b/jdk/test/javax/swing/JTable/7068740/bug7068740.java index d0c8fbd814f..b03768400fc 100644 --- a/jdk/test/javax/swing/JTable/7068740/bug7068740.java +++ b/jdk/test/javax/swing/JTable/7068740/bug7068740.java @@ -21,12 +21,14 @@ * questions. */ -/* @test - @bug 7068740 - @summary JTable wrapped in JLayer can't use PGUP/PGDOWN keys - @author Vladislav Karnaukhov - @run main bug7068740 -*/ +/* + * @test + * @key headful + * @bug 7068740 + * @summary JTable wrapped in JLayer can't use PGUP/PGDOWN keys + * @author Vladislav Karnaukhov + * @run main bug7068740 + */ import javax.swing.*; import javax.swing.plaf.LayerUI; diff --git a/jdk/test/javax/swing/JTable/7124218/SelectEditTableCell.java b/jdk/test/javax/swing/JTable/7124218/SelectEditTableCell.java index 6191ddf04f8..67793b2dc36 100644 --- a/jdk/test/javax/swing/JTable/7124218/SelectEditTableCell.java +++ b/jdk/test/javax/swing/JTable/7124218/SelectEditTableCell.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 7124218 * @summary verifies different behaviour of SPACE and ENTER in JTable * @library ../../regtesthelpers diff --git a/jdk/test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java b/jdk/test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java index da9262f9582..a1a3b641170 100644 --- a/jdk/test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java +++ b/jdk/test/javax/swing/JTable/7188612/JTableAccessibleGetLocationOnScreen.java @@ -25,7 +25,9 @@ * Portions Copyright (c) 2012 IBM Corporation */ -/* @test +/* + * @test + * @key headful * @bug 7188612 * @summary AccessibleTableHeader and AccessibleJTableCell should stick to * AccessibleComponent.getLocationOnScreen api. diff --git a/jdk/test/javax/swing/JTable/8032874/bug8032874.java b/jdk/test/javax/swing/JTable/8032874/bug8032874.java index 1116aebe267..7b7ca4a44e3 100644 --- a/jdk/test/javax/swing/JTable/8032874/bug8032874.java +++ b/jdk/test/javax/swing/JTable/8032874/bug8032874.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8032874 * @summary Test whether ArrayIndexOutOfBoundsException is thrown or not, * once selected row is removed from JTable with Sorter and Filter diff --git a/jdk/test/javax/swing/JTableHeader/4473075/bug4473075.java b/jdk/test/javax/swing/JTableHeader/4473075/bug4473075.java index a45cd16a56a..8abd6f54d3b 100644 --- a/jdk/test/javax/swing/JTableHeader/4473075/bug4473075.java +++ b/jdk/test/javax/swing/JTableHeader/4473075/bug4473075.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + @test + @key headful @bug 4473075 @summary JTable header rendering problem (after setting preferred size) @author Semyon Sadetsky diff --git a/jdk/test/javax/swing/JTableHeader/6884066/bug6884066.java b/jdk/test/javax/swing/JTableHeader/6884066/bug6884066.java index cf5e291d0ef..58926f64211 100644 --- a/jdk/test/javax/swing/JTableHeader/6884066/bug6884066.java +++ b/jdk/test/javax/swing/JTableHeader/6884066/bug6884066.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + @test + @key headful @bug 6884066 @summary JTableHeader listens mouse in disabled state and doesn't work when not attached to a table @author Alexander Potochkin diff --git a/jdk/test/javax/swing/JTableHeader/6889007/bug6889007.java b/jdk/test/javax/swing/JTableHeader/6889007/bug6889007.java index c416d634472..d24072b2321 100644 --- a/jdk/test/javax/swing/JTableHeader/6889007/bug6889007.java +++ b/jdk/test/javax/swing/JTableHeader/6889007/bug6889007.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + @test + @key headful @bug 6889007 @summary No resize cursor during hovering mouse over JTable @author Alexander Potochkin diff --git a/jdk/test/javax/swing/JTextArea/4697612/bug4697612.java b/jdk/test/javax/swing/JTextArea/4697612/bug4697612.java index 715da745071..5f4f3e7bf06 100644 --- a/jdk/test/javax/swing/JTextArea/4697612/bug4697612.java +++ b/jdk/test/javax/swing/JTextArea/4697612/bug4697612.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 4697612 6244705 * @author Peter Zhelezniakov * @library ../../regtesthelpers diff --git a/jdk/test/javax/swing/JTextArea/7049024/bug7049024.java b/jdk/test/javax/swing/JTextArea/7049024/bug7049024.java index 36d328fe1e8..74a76098048 100644 --- a/jdk/test/javax/swing/JTextArea/7049024/bug7049024.java +++ b/jdk/test/javax/swing/JTextArea/7049024/bug7049024.java @@ -25,7 +25,9 @@ * Portions Copyright (c) 2011 IBM Corporation */ -/* @test +/* + * @test + * @key headful * @bug 7049024 * @summary DnD fails with JTextArea and JTextField * @author Sean Chou diff --git a/jdk/test/javax/swing/JTextArea/8149849/DNDTextToScaledArea.java b/jdk/test/javax/swing/JTextArea/8149849/DNDTextToScaledArea.java index 501fa199620..a68a11c5303 100644 --- a/jdk/test/javax/swing/JTextArea/8149849/DNDTextToScaledArea.java +++ b/jdk/test/javax/swing/JTextArea/8149849/DNDTextToScaledArea.java @@ -34,6 +34,7 @@ import javax.swing.SwingUtilities; /** * @test + * @key headful * @bug 8149849 * @summary [hidpi] DnD issues (cannot DnD from JFileChooser to JEditorPane or * other text component) when scale > 1 diff --git a/jdk/test/javax/swing/JTextArea/ScrollbarFlicker/ScrollFlickerTest.java b/jdk/test/javax/swing/JTextArea/ScrollbarFlicker/ScrollFlickerTest.java new file mode 100644 index 00000000000..73a25e68ed4 --- /dev/null +++ b/jdk/test/javax/swing/JTextArea/ScrollbarFlicker/ScrollFlickerTest.java @@ -0,0 +1,74 @@ +/* + * Copyright (c) 2016, 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 8160246 + * @summary Regression: 4410243 reproducible with GTK LaF + * @run main ScrollFlickerTest + */ + +import javax.swing.*; +import java.awt.*; +import java.awt.event.ComponentAdapter; +import java.awt.event.ComponentEvent; + +public class ScrollFlickerTest { + + private static JFrame frame; + private static JScrollPane scroll; + private static int cnt = 0; + + public static void main(String[] args) throws Exception { + SwingUtilities.invokeAndWait(() -> { + frame = new JFrame(); + frame.setSize(300, 200); + frame.getContentPane().setLayout(null); + JTextArea text = new JTextArea("Test test test test"); + text.setLineWrap(true); + scroll = new JScrollPane(text); + frame.getContentPane().add(scroll); + scroll.setBounds(1, 1, 100, 50); + frame.setVisible(true); + }); + + Robot robot = new Robot(); + robot.waitForIdle(); + robot.delay(200); + + SwingUtilities.invokeAndWait(() -> { + scroll.getViewport().addChangeListener((e) -> cnt++); + Insets insets = scroll.getInsets(); + scroll.setSize(insets.left + insets.right + + scroll.getVerticalScrollBar().getPreferredSize().width, 50); + scroll.revalidate(); + }); + + robot.delay(1000); + + SwingUtilities.invokeLater(frame::dispose); + + if (cnt > 2) { + throw new RuntimeException("Scroll bar flickers"); + } + } +} diff --git a/jdk/test/javax/swing/JTextArea/Test6593649.java b/jdk/test/javax/swing/JTextArea/Test6593649.java index f27057c4b08..854e500df1b 100644 --- a/jdk/test/javax/swing/JTextArea/Test6593649.java +++ b/jdk/test/javax/swing/JTextArea/Test6593649.java @@ -21,12 +21,14 @@ * questions. */ -/* @test - @bug 6593649 - @summary Word wrap does not work in JTextArea: long lines are not wrapped - @author Lillian Angel - @run main Test6593649 -*/ +/* + * @test + * @key headful + * @bug 6593649 + * @summary Word wrap does not work in JTextArea: long lines are not wrapped + * @author Lillian Angel + * @run main Test6593649 + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/JTextArea/TextViewOOM/TextViewOOM.java b/jdk/test/javax/swing/JTextArea/TextViewOOM/TextViewOOM.java index e75c7053d08..6c31f281d68 100644 --- a/jdk/test/javax/swing/JTextArea/TextViewOOM/TextViewOOM.java +++ b/jdk/test/javax/swing/JTextArea/TextViewOOM/TextViewOOM.java @@ -29,6 +29,7 @@ import javax.swing.JTextArea; /** * @test + * @key headful * @bug 8072775 * @run main/othervm -Xmx80m TextViewOOM */ diff --git a/jdk/test/javax/swing/JTextField/8036819/bug8036819.java b/jdk/test/javax/swing/JTextField/8036819/bug8036819.java index 214f13cd19b..052b383a10d 100644 --- a/jdk/test/javax/swing/JTextField/8036819/bug8036819.java +++ b/jdk/test/javax/swing/JTextField/8036819/bug8036819.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @library ../../regtesthelpers * @build Util * @bug 8036819 diff --git a/jdk/test/javax/swing/JTextPane/JTextPaneDocumentAlignment.java b/jdk/test/javax/swing/JTextPane/JTextPaneDocumentAlignment.java index f75d1c08a28..af19383ab03 100644 --- a/jdk/test/javax/swing/JTextPane/JTextPaneDocumentAlignment.java +++ b/jdk/test/javax/swing/JTextPane/JTextPaneDocumentAlignment.java @@ -21,11 +21,13 @@ * questions. */ -/* @test - @bug 8132136 - @summary [PIT] RTL orientation in JEditorPane is broken - @author Semyon Sadetsky - */ +/* + * @test + * @key headful + * @bug 8132136 + * @summary [PIT] RTL orientation in JEditorPane is broken + * @author Semyon Sadetsky + */ import javax.swing.*; import javax.swing.text.BadLocationException; diff --git a/jdk/test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java b/jdk/test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java index ba7aee423ed..0f6a70a253a 100644 --- a/jdk/test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java +++ b/jdk/test/javax/swing/JTextPane/JTextPaneDocumentWrapping.java @@ -21,11 +21,13 @@ * questions. */ -/* @test - @bug 8133108 - @summary [PIT] Container size is wrong in JEditorPane - @author Semyon Sadetsky - */ +/* + * @test + * @key headful + * @bug 8133108 + * @summary [PIT] Container size is wrong in JEditorPane + * @author Semyon Sadetsky + */ import javax.swing.*; import javax.swing.text.BadLocationException; diff --git a/jdk/test/javax/swing/JTextPane/bug8025082.java b/jdk/test/javax/swing/JTextPane/bug8025082.java index 1c92f763837..aeedbb43146 100644 --- a/jdk/test/javax/swing/JTextPane/bug8025082.java +++ b/jdk/test/javax/swing/JTextPane/bug8025082.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8025082 * @summary The behaviour of the highlight will be lost after clicking the set * button. diff --git a/jdk/test/javax/swing/JToolBar/4247996/bug4247996.java b/jdk/test/javax/swing/JToolBar/4247996/bug4247996.java index 63eaccbac99..9670e862fc8 100644 --- a/jdk/test/javax/swing/JToolBar/4247996/bug4247996.java +++ b/jdk/test/javax/swing/JToolBar/4247996/bug4247996.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 4247996 4260485 * @summary Test that rollover toolbar doesn't corrupt buttons * @author Peter Zhelezniakov diff --git a/jdk/test/javax/swing/JToolBar/4529206/bug4529206.java b/jdk/test/javax/swing/JToolBar/4529206/bug4529206.java index 61e96b728b0..0b05ded2f3f 100644 --- a/jdk/test/javax/swing/JToolBar/4529206/bug4529206.java +++ b/jdk/test/javax/swing/JToolBar/4529206/bug4529206.java @@ -23,12 +23,14 @@ * questions. */ -/* @test - @bug 4529206 - @summary JToolBar - setFloating does not work correctly - @author Konstantin Eremin - @run main bug4529206 -*/ +/* + * @test + * @key headful + * @bug 4529206 + * @summary JToolBar - setFloating does not work correctly + * @author Konstantin Eremin + * @run main bug4529206 + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/JToolTip/4846413/bug4846413.java b/jdk/test/javax/swing/JToolTip/4846413/bug4846413.java index a18b2bee37b..4fac3c59991 100644 --- a/jdk/test/javax/swing/JToolTip/4846413/bug4846413.java +++ b/jdk/test/javax/swing/JToolTip/4846413/bug4846413.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 4846413 * @summary Checks if No tooltip modification when no KeyStroke modifier * @library ../../regtesthelpers diff --git a/jdk/test/javax/swing/JToolTip/6219960/bug6219960.java b/jdk/test/javax/swing/JToolTip/6219960/bug6219960.java index c23fa2c8472..2df5d8db19a 100644 --- a/jdk/test/javax/swing/JToolTip/6219960/bug6219960.java +++ b/jdk/test/javax/swing/JToolTip/6219960/bug6219960.java @@ -44,6 +44,7 @@ import javax.swing.table.DefaultTableModel; /** * @test + * @key headful * @bug 6219960 * @summary null reference in ToolTipManager * @run main bug6219960 diff --git a/jdk/test/javax/swing/JTree/4330357/bug4330357.java b/jdk/test/javax/swing/JTree/4330357/bug4330357.java index 810c88666fb..2f6a76a8fab 100644 --- a/jdk/test/javax/swing/JTree/4330357/bug4330357.java +++ b/jdk/test/javax/swing/JTree/4330357/bug4330357.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 4330357 * @summary Tests that real editor in JTree cleans up after editing was stopped * @library ../../regtesthelpers diff --git a/jdk/test/javax/swing/JTree/4908142/bug4908142.java b/jdk/test/javax/swing/JTree/4908142/bug4908142.java index 2b6fbd7a8b3..1556d671d6d 100644 --- a/jdk/test/javax/swing/JTree/4908142/bug4908142.java +++ b/jdk/test/javax/swing/JTree/4908142/bug4908142.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 4908142 * @summary JList doesn't handle search function appropriately * @author Andrey Pikalev diff --git a/jdk/test/javax/swing/JTree/4927934/bug4927934.java b/jdk/test/javax/swing/JTree/4927934/bug4927934.java index c4f739e6bdd..d4dee0c41b1 100644 --- a/jdk/test/javax/swing/JTree/4927934/bug4927934.java +++ b/jdk/test/javax/swing/JTree/4927934/bug4927934.java @@ -20,7 +20,9 @@ * or visit www.oracle.com if you need additional information or have any * questions. */ -/* @test +/* + @test + @key headful @bug 4927934 @summary JTree traversal is unlike Native windows tree traversal @author Andrey Pikalev diff --git a/jdk/test/javax/swing/JTree/6263446/bug6263446.java b/jdk/test/javax/swing/JTree/6263446/bug6263446.java index 2e13599b540..698255a44e4 100644 --- a/jdk/test/javax/swing/JTree/6263446/bug6263446.java +++ b/jdk/test/javax/swing/JTree/6263446/bug6263446.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6263446 * @summary Tests that double-clicking to edit a cell doesn't select the content. * @author Shannon Hickey diff --git a/jdk/test/javax/swing/JTree/6505523/bug6505523.java b/jdk/test/javax/swing/JTree/6505523/bug6505523.java index 21a1043257f..7e501bc28b0 100644 --- a/jdk/test/javax/swing/JTree/6505523/bug6505523.java +++ b/jdk/test/javax/swing/JTree/6505523/bug6505523.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6505523 * @summary NullPointerException in BasicTreeUI when a node is removed by expansion listener * @author Alexandr Scherbatiy diff --git a/jdk/test/javax/swing/JTree/6578666/bug6578666.java b/jdk/test/javax/swing/JTree/6578666/bug6578666.java index 708ce548ebb..89664fe1245 100644 --- a/jdk/test/javax/swing/JTree/6578666/bug6578666.java +++ b/jdk/test/javax/swing/JTree/6578666/bug6578666.java @@ -22,6 +22,7 @@ */ /* * @test + * @key headful * @bug 6578666 * @summary REGRESSION: Exception occurs when updateUI for JTree is triggered by KeyEvent * @run main bug6578666 diff --git a/jdk/test/javax/swing/JTree/8003400/Test8003400.java b/jdk/test/javax/swing/JTree/8003400/Test8003400.java index 7f09751b4d3..a4b91145b38 100644 --- a/jdk/test/javax/swing/JTree/8003400/Test8003400.java +++ b/jdk/test/javax/swing/JTree/8003400/Test8003400.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8003400 * @summary Tests that JTree shows the last row * @author Sergey Malenkov diff --git a/jdk/test/javax/swing/JTree/8004298/bug8004298.java b/jdk/test/javax/swing/JTree/8004298/bug8004298.java index 12b618bd64d..440dbe4e23b 100644 --- a/jdk/test/javax/swing/JTree/8004298/bug8004298.java +++ b/jdk/test/javax/swing/JTree/8004298/bug8004298.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8004298 * @summary NPE in WindowsTreeUI.ensureRowsAreVisible * @author Alexander Scherbatiy diff --git a/jdk/test/javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java b/jdk/test/javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java index 1308f26fdba..9cc5922fe57 100644 --- a/jdk/test/javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java +++ b/jdk/test/javax/swing/JTree/DnD/LastNodeLowerHalfDrop.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8129830 8132771 * @summary JTree drag/drop on lower half of last child of container incorrect * @run main LastNodeLowerHalfDrop diff --git a/jdk/test/javax/swing/JViewport/7107099/bug7107099.java b/jdk/test/javax/swing/JViewport/7107099/bug7107099.java index a6bdce4b445..f91a74db97c 100644 --- a/jdk/test/javax/swing/JViewport/7107099/bug7107099.java +++ b/jdk/test/javax/swing/JViewport/7107099/bug7107099.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + @test + @key headful @bug 7107099 @summary JScrollBar does not show up even if there are enough lebgth of textstring in textField @author Pavel Porvatov diff --git a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java b/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java index fed42ceb012..7d70f550f58 100644 --- a/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java +++ b/jdk/test/javax/swing/JWindow/ShapedAndTranslucentWindows/PerPixelTranslucentCanvas.java @@ -27,6 +27,7 @@ import java.awt.image.BufferedImage; /* * @test + * @key headful * @summary Check if a per-pixel translucent window shows up with correct translucency * @author mrkam * @library ../../../../lib/testlibrary diff --git a/jdk/test/javax/swing/KeyboardManager/8013370/Test8013370.java b/jdk/test/javax/swing/KeyboardManager/8013370/Test8013370.java index 33f48a26ae2..97f2909e40c 100644 --- a/jdk/test/javax/swing/KeyboardManager/8013370/Test8013370.java +++ b/jdk/test/javax/swing/KeyboardManager/8013370/Test8013370.java @@ -40,6 +40,7 @@ import static javax.swing.SwingUtilities.invokeAndWait; /* * @test + * @key headful * @bug 8013370 * @summary Ensure that key stroke is not null * @author Sergey Malenkov diff --git a/jdk/test/javax/swing/LookAndFeel/6897701/JMenuItemsTest.java b/jdk/test/javax/swing/LookAndFeel/6897701/JMenuItemsTest.java index c8e2492de2f..3a4a911619d 100644 --- a/jdk/test/javax/swing/LookAndFeel/6897701/JMenuItemsTest.java +++ b/jdk/test/javax/swing/LookAndFeel/6897701/JMenuItemsTest.java @@ -21,12 +21,14 @@ * questions. */ - /* +/* * @test + * @key headful * @bug 6897701 * @summary Verify JMenu and JMenuItem Disabled state for Nimbus LAF * @run main JMenuItemsTest */ + import java.awt.Color; import java.awt.Rectangle; import java.awt.image.BufferedImage; diff --git a/jdk/test/javax/swing/LookAndFeel/8146276/NimbusGlueTest.java b/jdk/test/javax/swing/LookAndFeel/8146276/NimbusGlueTest.java index cd64ee723ab..156bb4c708d 100644 --- a/jdk/test/javax/swing/LookAndFeel/8146276/NimbusGlueTest.java +++ b/jdk/test/javax/swing/LookAndFeel/8146276/NimbusGlueTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8146276 * @summary Right aligned toolbar component does not appear * @run main NimbusGlueTest diff --git a/jdk/test/javax/swing/Popup/6514582/bug6514582.java b/jdk/test/javax/swing/Popup/6514582/bug6514582.java index 94fee3f4f82..b2d5d57984f 100644 --- a/jdk/test/javax/swing/Popup/6514582/bug6514582.java +++ b/jdk/test/javax/swing/Popup/6514582/bug6514582.java @@ -23,12 +23,14 @@ * questions. */ -/* @test - @bug 6514582 - @summary SubMenu of a JMenu with no items paints a single pixel tiny menu. - @author Alexander Potochkin - @run main bug6514582 -*/ +/* + * @test + * @key headful + * @bug 6514582 + * @summary SubMenu of a JMenu with no items paints a single pixel tiny menu. + * @author Alexander Potochkin + * @run main bug6514582 + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/Popup/TaskbarPositionTest.java b/jdk/test/javax/swing/Popup/TaskbarPositionTest.java index 0f30c2ae745..c72a15b8ed6 100644 --- a/jdk/test/javax/swing/Popup/TaskbarPositionTest.java +++ b/jdk/test/javax/swing/Popup/TaskbarPositionTest.java @@ -28,6 +28,7 @@ import javax.swing.event.*; /** * @test @bug 4245587 4474813 4425878 4767478 8015599 + * @key headful * @author Mark Davidson * @summary Tests the location of the heavy weight popup portion of JComboBox, * JMenu and JPopupMenu. diff --git a/jdk/test/javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java b/jdk/test/javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java index 256ad4ef818..245eecf6058 100644 --- a/jdk/test/javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java +++ b/jdk/test/javax/swing/PopupFactory/6276087/NonOpaquePopupMenuTest.java @@ -23,6 +23,7 @@ /** * @test + * @key headful * @bug 6276087 * @author Romain Guy * @summary Tests opacity of a popup menu. diff --git a/jdk/test/javax/swing/PopupFactory/8048506/bug8048506.java b/jdk/test/javax/swing/PopupFactory/8048506/bug8048506.java index 66167ec08dc..0c5a0c396f1 100644 --- a/jdk/test/javax/swing/PopupFactory/8048506/bug8048506.java +++ b/jdk/test/javax/swing/PopupFactory/8048506/bug8048506.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8048506 * @summary Tests that popup with null-owner does not throw NPE * @author Dmitry Markov diff --git a/jdk/test/javax/swing/RepaintManager/IconifyTest/IconifyTest.java b/jdk/test/javax/swing/RepaintManager/IconifyTest/IconifyTest.java index 5d4198cc669..7c540c31b11 100644 --- a/jdk/test/javax/swing/RepaintManager/IconifyTest/IconifyTest.java +++ b/jdk/test/javax/swing/RepaintManager/IconifyTest/IconifyTest.java @@ -22,6 +22,7 @@ */ /* * @test + * @key headful * @bug 4665214 * @summary Makes sure that RepaintManager doesn't attempt to repaint * a frame when it is iconified. diff --git a/jdk/test/javax/swing/Security/6657138/ComponentTest.java b/jdk/test/javax/swing/Security/6657138/ComponentTest.java index 2ee7b84bbfa..307791b86c3 100644 --- a/jdk/test/javax/swing/Security/6657138/ComponentTest.java +++ b/jdk/test/javax/swing/Security/6657138/ComponentTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6657138 * @summary Verifies that buttons and labels work well after the fix for 6657138 * @author Alexander Potochkin diff --git a/jdk/test/javax/swing/SwingUtilities/4917669/bug4917669.java b/jdk/test/javax/swing/SwingUtilities/4917669/bug4917669.java index ed438928be4..7eaba0cb142 100644 --- a/jdk/test/javax/swing/SwingUtilities/4917669/bug4917669.java +++ b/jdk/test/javax/swing/SwingUtilities/4917669/bug4917669.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 4917669 * @summary 1.4 REGRESSION: MenuItem accelerator doesn't work if parent menu is in JDialog * @author Alexander Zuev diff --git a/jdk/test/javax/swing/SwingUtilities/7088744/bug7088744.java b/jdk/test/javax/swing/SwingUtilities/7088744/bug7088744.java index b4ed0351546..10d97ca3854 100644 --- a/jdk/test/javax/swing/SwingUtilities/7088744/bug7088744.java +++ b/jdk/test/javax/swing/SwingUtilities/7088744/bug7088744.java @@ -21,11 +21,13 @@ * questions. */ -/* @test - @bug 7088744 - @summary SwingUtilities.isMiddleMouseButton does not work with ALT/Meta keys - @author Pavel Porvatov -*/ +/* + * @test + * @key headful + * @bug 7088744 + * @summary SwingUtilities.isMiddleMouseButton does not work with ALT/Meta keys + * @author Pavel Porvatov + */ import java.awt.Component; import java.awt.Event; diff --git a/jdk/test/javax/swing/SwingUtilities/7146377/bug7146377.java b/jdk/test/javax/swing/SwingUtilities/7146377/bug7146377.java index 5114b77e079..20045efbd04 100644 --- a/jdk/test/javax/swing/SwingUtilities/7146377/bug7146377.java +++ b/jdk/test/javax/swing/SwingUtilities/7146377/bug7146377.java @@ -21,11 +21,13 @@ * questions. */ -/* @test - @bug 7146377 - @summary closed/javax/swing/DataTransfer/4876520/bug4876520.java failed since b08 in jdk 8 - @author Pavel Porvatov -*/ +/* + * @test + * @key headful + * @bug 7146377 + * @summary closed/javax/swing/DataTransfer/4876520/bug4876520.java failed since b08 in jdk 8 + * @author Pavel Porvatov + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java b/jdk/test/javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java index a4d1e0fb781..5284ce86759 100644 --- a/jdk/test/javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java +++ b/jdk/test/javax/swing/SwingUtilities/TestBadBreak/TestBadBreak.java @@ -36,6 +36,7 @@ import static java.awt.image.BufferedImage.TYPE_INT_ARGB; /** * @test + * @key headful * @bug 8015085 8079253 * @summary Shortening via " ... " is broken for Strings containing a combining * diaeresis. diff --git a/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java b/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java index f7bae5b269d..65795494733 100644 --- a/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java +++ b/jdk/test/javax/swing/ToolTipManager/7123767/bug7123767.java @@ -21,13 +21,15 @@ * questions. */ -/* @test - @bug 7123767 - @summary Wrong tooltip location in Multi-Monitor configurations - @author Vladislav Karnaukhov - @modules java.desktop/sun.awt - @run main bug7123767 -*/ +/* + * @test + * @key headful + * @bug 7123767 + * @summary Wrong tooltip location in Multi-Monitor configurations + * @author Vladislav Karnaukhov + * @modules java.desktop/sun.awt + * @run main bug7123767 + */ import javax.swing.*; import javax.swing.plaf.metal.MetalLookAndFeel; diff --git a/jdk/test/javax/swing/ToolTipManager/Test6256140.java b/jdk/test/javax/swing/ToolTipManager/Test6256140.java index ca90d815a79..3456c0ecec8 100644 --- a/jdk/test/javax/swing/ToolTipManager/Test6256140.java +++ b/jdk/test/javax/swing/ToolTipManager/Test6256140.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6256140 * @summary Esc key doesn't restore old value in JFormattedtextField when ToolTip is set * @author Alexander Potochkin diff --git a/jdk/test/javax/swing/UIDefaults/6795356/bug6795356.java b/jdk/test/javax/swing/UIDefaults/6795356/bug6795356.java index f22e5883250..7be773a2c63 100644 --- a/jdk/test/javax/swing/UIDefaults/6795356/bug6795356.java +++ b/jdk/test/javax/swing/UIDefaults/6795356/bug6795356.java @@ -28,7 +28,7 @@ * @author Alexander Potochkin * @library ../../regtesthelpers * @build Util - * @run main bug6795356 + * @run main/othervm -mx128m bug6795356 */ import java.lang.ref.WeakReference; diff --git a/jdk/test/javax/swing/dnd/7171812/bug7171812.java b/jdk/test/javax/swing/dnd/7171812/bug7171812.java index 8de55bd701f..ff985b1a426 100644 --- a/jdk/test/javax/swing/dnd/7171812/bug7171812.java +++ b/jdk/test/javax/swing/dnd/7171812/bug7171812.java @@ -21,11 +21,13 @@ * questions. */ -/* @test - @bug 7171812 - @summary [macosx] Views keep scrolling back to the drag position after DnD - @author Alexander Zuev - @run main bug7171812 +/* + * @test + * @key headful + * @bug 7171812 + * @summary [macosx] Views keep scrolling back to the drag position after DnD + * @author Alexander Zuev + * @run main bug7171812 */ import java.awt.*; diff --git a/jdk/test/javax/swing/plaf/basic/BasicComboPopup/7072653/bug7072653.java b/jdk/test/javax/swing/plaf/basic/BasicComboPopup/7072653/bug7072653.java index d983cd565a0..fbaabf035cd 100644 --- a/jdk/test/javax/swing/plaf/basic/BasicComboPopup/7072653/bug7072653.java +++ b/jdk/test/javax/swing/plaf/basic/BasicComboPopup/7072653/bug7072653.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 7072653 8144161 * @summary JComboBox popup mispositioned if its height exceeds the screen height * @run main bug7072653 diff --git a/jdk/test/javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java b/jdk/test/javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java index 8aa96aea0ff..04244a925a2 100644 --- a/jdk/test/javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java +++ b/jdk/test/javax/swing/plaf/basic/BasicHTML/4251579/bug4251579.java @@ -24,6 +24,7 @@ /* * @test + * @key headful * @bug 4251579 * @summary Tests if style sheets are working in JLabel * @author Denis Sharypov diff --git a/jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java b/jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java index 666f0be73b2..1ccb5e6a01c 100644 --- a/jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java +++ b/jdk/test/javax/swing/plaf/basic/BasicMenuUI/4983388/bug4983388.java @@ -21,14 +21,16 @@ * questions. */ -/* @test - @bug 4983388 8015600 - @summary shortcuts on menus do not work on JDS - @author Oleg Mokhovikov - @library ../../../../regtesthelpers - @build Util - @run main bug4983388 -*/ +/* + * @test + * @key headful + * @bug 4983388 8015600 + * @summary shortcuts on menus do not work on JDS + * @author Oleg Mokhovikov + * @library ../../../../regtesthelpers + * @build Util + * @run main bug4983388 + */ import java.awt.*; import javax.swing.*; diff --git a/jdk/test/javax/swing/plaf/basic/BasicRootPaneUI/HiddenDefaultButtonTest.java b/jdk/test/javax/swing/plaf/basic/BasicRootPaneUI/HiddenDefaultButtonTest.java index 040126c373a..29c480ce627 100644 --- a/jdk/test/javax/swing/plaf/basic/BasicRootPaneUI/HiddenDefaultButtonTest.java +++ b/jdk/test/javax/swing/plaf/basic/BasicRootPaneUI/HiddenDefaultButtonTest.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 6827800 * @summary Test to check hidden default button does not respond to 'Enter' key * @run main HiddenDefaultButtonTest diff --git a/jdk/test/javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java b/jdk/test/javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java index a63a769a9cb..20d9e322026 100644 --- a/jdk/test/javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java +++ b/jdk/test/javax/swing/plaf/basic/BasicTextUI/8001470/bug8001470.java @@ -21,11 +21,13 @@ * questions. */ -/* @test - @bug 8001470 - @summary JTextField's size is computed incorrectly when it contains Indic or Thai characters - @author Semyon Sadetsky - */ +/* + * @test + * @key headful + * @bug 8001470 + * @summary JTextField's size is computed incorrectly when it contains Indic or Thai characters + * @author Semyon Sadetsky + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java b/jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java index 1095aced9f9..aff399b3aa7 100644 --- a/jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java +++ b/jdk/test/javax/swing/plaf/basic/BasicTreeUI/8023474/bug8023474.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8023474 * @summary Tests that the first mouse press starts editing in JTree * @author Dmitry Markov diff --git a/jdk/test/javax/swing/plaf/gtk/crash/RenderBadPictureCrash.java b/jdk/test/javax/swing/plaf/gtk/crash/RenderBadPictureCrash.java index 71a2e6f4b58..a7bae7f58f9 100644 --- a/jdk/test/javax/swing/plaf/gtk/crash/RenderBadPictureCrash.java +++ b/jdk/test/javax/swing/plaf/gtk/crash/RenderBadPictureCrash.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 8056151 8131751 @summary Switching to GTK L&F on-the-fly leads to X Window System error RenderBadPicture @run main/othervm -Dswing.defaultlaf=javax.swing.plaf.metal.MetalLookAndFeel -Dsun.java2d.xrender=T RenderBadPictureCrash diff --git a/jdk/test/javax/swing/plaf/nimbus/8041642/bug8041642.java b/jdk/test/javax/swing/plaf/nimbus/8041642/bug8041642.java index c829e0cfe0c..73f4202178c 100644 --- a/jdk/test/javax/swing/plaf/nimbus/8041642/bug8041642.java +++ b/jdk/test/javax/swing/plaf/nimbus/8041642/bug8041642.java @@ -21,11 +21,13 @@ * questions. */ -/* @test - @bug 8041642 8079450 - @summary Incorrect paint of JProgressBar in Nimbus LF - @author Semyon Sadetsky -*/ +/* + * @test + * @key headful + * @bug 8041642 8079450 + * @summary Incorrect paint of JProgressBar in Nimbus LF + * @author Semyon Sadetsky + */ import javax.swing.*; import java.awt.*; diff --git a/jdk/test/javax/swing/plaf/nimbus/8041725/bug8041725.java b/jdk/test/javax/swing/plaf/nimbus/8041725/bug8041725.java index d668a3411de..5556f5bdb7b 100644 --- a/jdk/test/javax/swing/plaf/nimbus/8041725/bug8041725.java +++ b/jdk/test/javax/swing/plaf/nimbus/8041725/bug8041725.java @@ -21,11 +21,13 @@ * questions. */ -/* @test - @bug 8041725 - @summary JList selection colors are not UIResource instances in Nimbus L&F - @author Anton Litvinov -*/ +/* + * @test + * @key headful + * @bug 8041725 + * @summary JList selection colors are not UIResource instances in Nimbus L&F + * @author Anton Litvinov + */ import java.awt.*; import javax.swing.*; diff --git a/jdk/test/javax/swing/plaf/nimbus/8057791/bug8057791.java b/jdk/test/javax/swing/plaf/nimbus/8057791/bug8057791.java index cc31544abc6..d8146b61b09 100644 --- a/jdk/test/javax/swing/plaf/nimbus/8057791/bug8057791.java +++ b/jdk/test/javax/swing/plaf/nimbus/8057791/bug8057791.java @@ -21,20 +21,20 @@ * questions. */ -/* @test - @bug 8057791 + /* @test + @bug 8057791 8160438 @summary Selection in JList is drawn with wrong colors in Nimbus L&F - @author Anton Litvinov @run main bug8057791 */ - import java.awt.Color; +import java.awt.Font; import java.awt.Graphics; +import java.awt.Point; import java.awt.Rectangle; +import java.awt.Robot; import java.awt.image.BufferedImage; -import java.lang.reflect.InvocationTargetException; -import java.util.HashSet; import javax.swing.DefaultListModel; +import javax.swing.JFrame; import javax.swing.JList; import javax.swing.SwingUtilities; import javax.swing.UIManager; @@ -42,59 +42,148 @@ import javax.swing.UnsupportedLookAndFeelException; import javax.swing.plaf.nimbus.NimbusLookAndFeel; public class bug8057791 { - public static void main(String[] args) { - try { - UIManager.setLookAndFeel(new NimbusLookAndFeel()); - SwingUtilities.invokeAndWait(new Runnable() { - @Override - public void run() { - final int listWidth = 50; - final int listHeight = 50; - final int selCellIndex = 0; + private static JFrame frame; + private static JList list; + private static DefaultListModel model; + private static Robot robot; + private static final int SELECTED_INDEX = 0; + private static volatile String errorString = ""; - JList list = new JList(); - list.setSize(listWidth, listHeight); - DefaultListModel listModel = new DefaultListModel(); - listModel.add(selCellIndex, "E"); - list.setModel(listModel); - list.setSelectedIndex(selCellIndex); - - BufferedImage img = new BufferedImage(listWidth, listHeight, - BufferedImage.TYPE_INT_ARGB); - Graphics g = img.getGraphics(); - list.paint(g); - g.dispose(); - - Rectangle cellRect = list.getCellBounds(selCellIndex, selCellIndex); - HashSet cellColors = new HashSet(); - int uniqueColorIndex = 0; - for (int x = cellRect.x; x < (cellRect.x + cellRect.width); x++) { - for (int y = cellRect.y; y < (cellRect.y + cellRect.height); y++) { - Color cellColor = new Color(img.getRGB(x, y), true); - if (cellColors.add(cellColor)) { - System.err.println(String.format("Cell color #%d: %s", - uniqueColorIndex++, cellColor)); - } - } - } - - Color selForegroundColor = list.getSelectionForeground(); - Color selBackgroundColor = list.getSelectionBackground(); - if (!cellColors.contains(new Color(selForegroundColor.getRGB(), true))) { - throw new RuntimeException(String.format( - "Selected cell is drawn without selection foreground color '%s'.", - selForegroundColor)); - } - if (!cellColors.contains(new Color(selBackgroundColor.getRGB(), true))) { - throw new RuntimeException(String.format( - "Selected cell is drawn without selection background color '%s'.", - selBackgroundColor)); - } - } - }); - } catch (UnsupportedLookAndFeelException | InterruptedException | InvocationTargetException e) { - throw new RuntimeException(e); + public static void main(String[] args) throws Exception { + robot = new Robot(); + robot.waitForIdle(); + runSteps(); + if (!errorString.isEmpty()) { + throw new RuntimeException("Error Log:\n" + errorString); } } + + private static void runSteps() throws Exception { + if (tryNimbusLookAndFeel()) { + createUI(); + robot.waitForIdle(); + runColorTestCase(); + robot.waitForIdle(); + cleanUp(); + } + + } + + private static boolean tryNimbusLookAndFeel() + throws Exception { + try { + UIManager.setLookAndFeel(new NimbusLookAndFeel()); + } catch (UnsupportedLookAndFeelException e) { + errorString += e.getMessage(); + return false; + } + return true; + } + + private static void createUI() + throws Exception { + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + frame = new JFrame(); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + list = new JList<>(); + model = new DefaultListModel<>(); + model.add(0, "@@"); + Font font = list.getFont(); + list.setFont( + new Font(font.getFontName(), + Font.BOLD, + (int) (font.getSize2D() * 2))); + list.setModel(model); + list.setSelectedIndex(SELECTED_INDEX); + frame.add(list); + frame.pack(); + frame.setLocationRelativeTo(null); + frame.setVisible(true); + } + }); + } + + private static void runColorTestCase() throws Exception { + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + Rectangle cellBounds = list.getCellBounds(SELECTED_INDEX, SELECTED_INDEX); + cellBounds.x += list.getLocationOnScreen().x; + cellBounds.y += list.getLocationOnScreen().y; + //positive test cases + Color foregroundColor = list.getSelectionForeground(); + Color backgroundColor = list.getSelectionBackground(); + checkColor(foregroundColor, cellBounds); + checkColor(backgroundColor, cellBounds); + //negative test cases + Color changedForegroundColor = foregroundColor.darker(); + Color changedBackgroundColor = backgroundColor.brighter(); + checkNotColor(changedForegroundColor, cellBounds); + checkNotColor(changedBackgroundColor, cellBounds); + } + }); + } + + private static void checkColor(Color colorCheck, Rectangle bounds) { + if (!findColor(colorCheck, bounds)) { + String error = "[ERROR][" + colorCheck.toString() + + "] Not found in selected cell"; + errorString += error; + } + } + + private static void checkNotColor(Color colorCheck, Rectangle bounds) { + if (findColor(colorCheck, bounds)) { + String error = "[ERROR][" + colorCheck.toString() + + "] is found in selected cell. " + + "Not supposed to be found in negative test case"; + errorString += error; + } + } + + private static boolean findColor(Color colorCheck, Rectangle bounds) { + BufferedImage img = new BufferedImage(bounds.width, + bounds.height, + BufferedImage.TYPE_INT_ARGB); + Graphics g = img.getGraphics(); + list.paint(g); + g.dispose(); + checkLoops: + for (int x = 0; x < bounds.width; x++) { + for (int y = 0; y < bounds.height; y++) { + Point relativePointCheck = new Point(bounds.x + x, bounds.y + y); + robot.mouseMove(relativePointCheck.x, relativePointCheck.y); + Color detectedColor = robot.getPixelColor(relativePointCheck.x, + relativePointCheck.y); + if (detectedColor.equals(colorCheck)) { + return true; + } + if (isMac()) { + //One more chance for Mac due to non-Generic display setting + detectedColor = new Color(img.getRGB(x, y), true); + if (detectedColor.equals(colorCheck)) { + return true; + } + } + } + } + return false; + } + + private static boolean isMac() { + String osName = System.getProperty("os.name"); + return osName.contains("Mac"); + } + + private static void cleanUp() throws Exception { + SwingUtilities.invokeAndWait(new Runnable() { + @Override + public void run() { + frame.dispose(); + } + }); + } } diff --git a/jdk/test/javax/swing/plaf/nimbus/Test6919629.java b/jdk/test/javax/swing/plaf/nimbus/Test6919629.java index 6fe98facf28..a7b3365b5a4 100644 --- a/jdk/test/javax/swing/plaf/nimbus/Test6919629.java +++ b/jdk/test/javax/swing/plaf/nimbus/Test6919629.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + @test + @key headful @bug 6919629 @summary Tests that components with Nimbus.Overrides are GC'ed properly @author Peter Zhelezniakov diff --git a/jdk/test/javax/swing/plaf/synth/7158712/bug7158712.java b/jdk/test/javax/swing/plaf/synth/7158712/bug7158712.java index 06653628905..2ef8899bf40 100644 --- a/jdk/test/javax/swing/plaf/synth/7158712/bug7158712.java +++ b/jdk/test/javax/swing/plaf/synth/7158712/bug7158712.java @@ -21,12 +21,14 @@ * questions. */ -/* @test - @bug 7158712 - @summary Synth Property "ComboBox.popupInsets" is ignored - @library ../../../regtesthelpers - @author Pavel Porvatov -*/ +/* + * @test + * @key headful + * @bug 7158712 + * @summary Synth Property "ComboBox.popupInsets" is ignored + * @library ../../../regtesthelpers + * @author Pavel Porvatov + */ import javax.swing.*; import javax.swing.plaf.basic.BasicComboPopup; diff --git a/jdk/test/javax/swing/plaf/synth/8040328/bug8040328.java b/jdk/test/javax/swing/plaf/synth/8040328/bug8040328.java index 72a0e46885f..3df80da2245 100644 --- a/jdk/test/javax/swing/plaf/synth/8040328/bug8040328.java +++ b/jdk/test/javax/swing/plaf/synth/8040328/bug8040328.java @@ -21,11 +21,13 @@ * questions. */ -/* @test +/* + @test + @key headful @bug 8040328 @summary JSlider has wrong preferred size with Synth LAF @author Semyon Sadetsky -*/ + */ import javax.swing.*; import javax.swing.plaf.synth.SynthLookAndFeel; diff --git a/jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java b/jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java index 1031e5ef4fa..a4171fe955d 100644 --- a/jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java +++ b/jdk/test/javax/swing/plaf/synth/SynthButtonUI/6276188/bug6276188.java @@ -22,6 +22,7 @@ */ /** * @test 1.4 08/08/05 + * @key headful * @bug 6276188 * @library ../../../../regtesthelpers * @build Util diff --git a/jdk/test/javax/swing/plaf/synth/SynthScrollbarThumbPainter/SynthScrollbarThumbPainterTest.java b/jdk/test/javax/swing/plaf/synth/SynthScrollbarThumbPainter/SynthScrollbarThumbPainterTest.java index 39601d12b21..6d1aefc353e 100644 --- a/jdk/test/javax/swing/plaf/synth/SynthScrollbarThumbPainter/SynthScrollbarThumbPainterTest.java +++ b/jdk/test/javax/swing/plaf/synth/SynthScrollbarThumbPainter/SynthScrollbarThumbPainterTest.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 7172750 * @summary Test to check Synth ScrollBar:ScrollBarThumb[].backgroundPainter is invoked * @run main SynthScrollbarThumbPainterTest diff --git a/jdk/test/javax/swing/plaf/synth/Test8015926.java b/jdk/test/javax/swing/plaf/synth/Test8015926.java index 01751fee499..2d17b4031be 100644 --- a/jdk/test/javax/swing/plaf/synth/Test8015926.java +++ b/jdk/test/javax/swing/plaf/synth/Test8015926.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8015926 * @summary Tests that there are no NPE during painting * @author Sergey Malenkov diff --git a/jdk/test/javax/swing/regtesthelpers/JRobot.java b/jdk/test/javax/swing/regtesthelpers/JRobot.java new file mode 100644 index 00000000000..aba18c3535b --- /dev/null +++ b/jdk/test/javax/swing/regtesthelpers/JRobot.java @@ -0,0 +1,294 @@ +/* + * Copyright (c) 2007, 2016, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +/** + * JRobot is a wrapper around java.awt.Robot that provides some convenience + * methods. + *

When using jtreg you would include this class via something like: + * 

+ * @library ../../../regtesthelpers
+ * @build JRobot
+ *
+ * + */ +import java.awt.AWTException; +import java.awt.Component; +import java.awt.Dimension; +import java.awt.EventQueue; +import java.awt.Point; +import java.awt.Rectangle; +import java.awt.event.InputEvent; +import java.awt.event.KeyEvent; +import javax.swing.SwingUtilities; + +public class JRobot extends java.awt.Robot { + private static int DEFAULT_DELAY = 550; + private static int INTERNAL_DELAY = 250; + + private int delay; + private boolean delaysEnabled; + + protected JRobot(boolean enableDelays) throws AWTException { + super(); + delaysEnabled = enableDelays; + setAutoWaitForIdle(enableDelays); + if (enableDelays) { + setAutoDelay(INTERNAL_DELAY); + setDelay(DEFAULT_DELAY); + } + } + + /** + * Return a JRobot. Delays are enabled by default. + * @return a JRobot + */ + public static JRobot getRobot() { + return getRobot(true); + } + + /** + * Create a JRobot. The parameter controls whether delays are enabled. + * @param enableDelays controls whether delays are enabled. + * @return a JRobot + */ + public static JRobot getRobot(boolean enableDelays) { + JRobot robot = null; + try { + robot = new JRobot(enableDelays); + } catch (AWTException e) { + System.err.println("Coudn't create Robot, details below"); + throw new Error(e); + } + return robot; + } + + /** + * Press and release a key. + * @param keycode which key to press. For example, KeyEvent.VK_DOWN + */ + public void hitKey(int keycode) { + keyPress(keycode); + keyRelease(keycode); + delay(); + } + + /** + * Press and release a key with modifiers. + * @param keys keys to press. Keys are pressed in order they are passed as + * parameters to this method. All keys except the last one are considered + * modifiers. For example, to press Ctrl+Shift+T, call: + * hitKey(KeyEvent.VK_CONTROL, KeyEvent.VK_SHIFT, KeyEvent.VK_T); + */ + public void hitKey(int... keys) { + for (int i = 0; i < keys.length; i++) { + keyPress(keys[i]); + } + + for (int i = keys.length - 1; i >= 0; i--) { + keyRelease(keys[i]); + } + delay(); + } + + /** + * Move mouse cursor to the center of the Component. + * @param c Component the mouse is placed over + */ + public void moveMouseTo(Component c) { + Point p = c.getLocationOnScreen(); + Dimension size = c.getSize(); + p.x += size.width / 2; + p.y += size.height / 2; + mouseMove(p.x, p.y); + delay(); + } + + /** + * Move mouse smoothly from (x0, y0) to (x1, y1). + */ + public void glide(int x0, int y0, int x1, int y1) { + float dmax = (float)Math.max(Math.abs(x1 - x0), Math.abs(y1 - y0)); + float dx = (x1 - x0) / dmax; + float dy = (y1 - y0) / dmax; + + mouseMove(x0, y0); + for (int i=1; i<=dmax; i++) { + mouseMove((int)(x0 + dx*i), (int)(y0 + dy*i)); + } + delay(); + } + + /** + * Perform a mouse click, i.e. press and release mouse button(s). + * @param buttons mouse button(s). + * For example, MouseEvent.BUTTON1_MASK + */ + public void clickMouse(int buttons) { + mousePress(buttons); + mouseRelease(buttons); + delay(); + } + + /** + * Perform a click with the first mouse button. + */ + public void clickMouse() { + clickMouse(InputEvent.BUTTON1_MASK); + } + + /** + * Click in the center of the given Component + * @param c the Component to click on + * @param buttons mouse button(s). + */ + public void clickMouseOn(Component c, int buttons) { + moveMouseTo(c); + clickMouse(buttons); + } + + /** + * Click the first mouse button in the center of the given Component + * @param c the Component to click on + */ + public void clickMouseOn(Component c) { + clickMouseOn(c, InputEvent.BUTTON1_MASK); + } + + /** + * Return whether delays are enabled + * @return whether delays are enabled + */ + public boolean getDelaysEnabled() { + return delaysEnabled; + } + + /** + * Delay execution by delay milliseconds + */ + public void delay() { + delay(delay); + } + + /** + * Return the delay amount, in milliseconds + */ + public int getDelay() { + return delay; + } + + /** + * Set the delay amount, in milliseconds + */ + public void setDelay(int delay) { + this.delay = delay; + } + + /** + * Waits until all events currently on the event queue have been processed. + * Does nothing if called on EDT + */ + public synchronized void waitForIdle() { + if (!EventQueue.isDispatchThread()) { + super.waitForIdle(); + } + } + + /** + * Calculate the center of the Rectangle passed, and return them + * in a Point object. + * @param r a non-null Rectangle + * @return a new Point object containing coordinates of r's center + */ + public Point centerOf(Rectangle r) { + return new Point(r.x + r.width / 2, r.y + r.height / 2); + } + + /** + * Calculate the center of the Rectangle passed, and store it in p. + * @param r a non-null Rectangle + * @param p a non-null Point that receives coordinates of r's center + * @return p + */ + public Point centerOf(Rectangle r, Point p) { + p.x = r.x + r.width / 2; + p.y = r.y + r.height / 2; + return p; + } + + /** + * Convert a rectangle from coordinate system of Component c to + * screen coordinate system. + * @param r a non-null Rectangle + * @param c a Component whose coordinate system is used for conversion + */ + public void convertRectToScreen(Rectangle r, Component c) { + Point p = new Point(r.x, r.y); + SwingUtilities.convertPointToScreen(p, c); + r.x = p.x; + r.y = p.y; + } + + /** + * Compares two rectangles pixel-by-pixel. + * @param r0 the first area + * @param r1 the second area + * return true if all pixels in the two areas are identical + */ + public boolean compareRects(Rectangle r0, Rectangle r1) { + int xShift = r1.x - r0.x; + int yShift = r1.y - r0.y; + + for (int y = r0.y; y < r0.y + r0.height; y++) { + for (int x = r0.x; x < r0.x + r0.width; x++) { + if (!comparePixels(x, y, x + xShift, y + yShift)) { + return false; + } + } + } + return true; + } + + /** + * Compares colors of two points on the screen. + * @param p0 the first point + * @param p1 the second point + * return true if the two points have the same color + */ + public boolean comparePixels(Point p0, Point p1) { + return comparePixels(p0.x, p0.y, p1.x, p1.y); + } + + /** + * Compares colors of two points on the screen. + * @param x0 the x coordinate of the first point + * @param y0 the y coordinate of the first point + * @param x1 the x coordinate of the second point + * @param y1 the y coordinate of the second point + * return true if the two points have the same color + */ + public boolean comparePixels(int x0, int y0, int x1, int y1) { + return (getPixelColor(x0, y0).equals(getPixelColor(x1, y1))); + } +} diff --git a/jdk/test/javax/swing/regtesthelpers/SwingTestHelper.java b/jdk/test/javax/swing/regtesthelpers/SwingTestHelper.java new file mode 100644 index 00000000000..5b6d35fa49a --- /dev/null +++ b/jdk/test/javax/swing/regtesthelpers/SwingTestHelper.java @@ -0,0 +1,862 @@ +/* + * Copyright (c) 2007, 2016, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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.awt.*; +import java.awt.event.*; +import java.beans.*; +import java.lang.reflect.*; +import java.util.*; + +import javax.swing.*; + +/** + * SwingTestHelper is a utility class for writing AWT/Swing regression + * tests that require interacting with the UI. Typically such tests + * consist of executing a chunk of code, waiting on an event, executing + * more code ... This is painful in that you typically have to use various + * invokeLaters and threading to handle that interaction. SwingTestHelper + * strealines this process. + *

+ * SwingTestHelper uses reflection to invoke all methods starting with + * the name onEDT on the EDT and all methods starting with + * onBackgroundThread on a background thread. Between each method + * invocation all pending events on the EDT are processed. The methods + * are first sorted based on an integer after the method names and invoked + * in that order. For example, the following subclass: + * 

+ * class Test extends SwingTestHelper {
+ *   private void onEDT10();
+ *   private void onBackgroundThread20();
+ *   private void onBackgroundThread30();
+ *   private void onEDT40();
+ *   private void onBackgroundThread50();
+ * }
+ *
+ * Will have the methods invoked in the order onEDT10, + * onBackgroundThread20, onBackgroundThread30, + * onEDT40, onBackgroundThread50. + *

+ * If you're not happy with method mangling you can also use annotations. + * The following gives the same result as the previous example: + * 

+ * class Test extends SwingTestHelper {
+ *   @Test(10)
+ *   private void foo(); // Was onEDT10
+ *
+ *   @Test(value=20, onEDT=false)
+ *   private void bar(); // Was onBackgroundThread20
+ *
+ *   @Test(value=30, onEDT=false)
+ *   private void baz(); // Was onBackgroundThread30
+ *
+ *   @Test(40)
+ *   private void zed(); // Was onEDT40
+ *
+ *   @Test(value=50, onEDT=false)
+ *   private void onBackgroundThread50(); // Was onBackgroundThread50
+ * }
+ *
+ *

+ * It is recommended that you increment the value in increments of + * 10. This makes it easier to add methods at a later date without + * having to change all method names/annotations after the newly added + * method. + *

+ * Between each of the methods, all pending events (native and Java) + * are processed. + *

+ * Failure of the test is signaled by any method throwing + * an exception, directly invoking fail or one of the + * assert variants. If no methods throw an exception the test is + * assumed to have passed. + *

+ * Often times it is necessary to block until focus has been gained on a + * particular widget. This can be handled by the + * requestAndWaitForFocus method. It will invoke + * requestFocus and block the test (not the EDT) until focus + * has been granted to the widget. + *

+ * Care must be taken when using Robot directly. For + * example, it's tempting to flood Robot with events and + * assume they will be received after some delay. Depending upon the + * machine you may need to increase the delay. Instead it's + * preferrable to block test execution until the event has been + * received and processed. This can be done using the method + * waitForEvent. For example, to block until a key typed + * event has been processed do the following: + * 

+ *   private void onEDT() {
+ *     robot.moveMouseTo(myComponent);
+ *     robot.mousePress(xxx);
+ *     robot.mouseRelease(xxx);
+ *     waitForEvent(myComponent, MouseEvent.MOUSE_RELEASED);
+ *   }
+ *
+ *

+ * Waiting for focus and events are specific examples of a more + * general problem. Often times you need the EDT to continue processing + * events, but want to block test execution until something happens. + * In the case of focus you want to block test execution until focus + * is gained. The method waitForCondition can be used to + * block test execution until the supplied Runnable returns. The + * Runnable is invoked on the background thread. + *

+ * To use this class you will need to do the following: + *

    + *
  1. Override the method createContentPane. All of your logic + * for setting up the test environment should go here. This method is + * invoked on the EDT. + *
  2. Implement the necessary onEDTXX and + * onBackgroundThreadXXX methods to do the actual testing. + *
  3. Make your main method look like: + * new MySwingTestHelper().run(args). This will block + * until the test fails or succeeds. + *
  4. To use this with jtreg you'll need to have something like: + * 
    + *     @library ../../../regtesthelpers
+ *     @build Test JRobot Assert SwingTestHelper
+ *     @run main MySwingTestHelper
+ *     *
    + *
+ *

+ * Here's a complete example: + * 

+ * public class bug4852305 extends SwingTestHelper {
+ *     private JTable table;
+ *
+ *     public static void main(String[] args) throws Throwable {
+ *         new bug4852305().run(args);
+ *     }
+ *
+ *     protected Component createContentPane() {
+ *         DefaultTableModel model = new DefaultTableModel(1, 2);
+ *         model.setValueAt("x", 0, 0);
+ *         model.setValueAt("z", 0, 1);
+ *         table = new JTable(model);
+ *         table.setDefaultEditor(Object.class, new DefaultCellEditor(new JTextField()) {
+ *             public boolean isCellEditable(EventObject anEvent) {
+ *                 if ((anEvent instanceof KeyEvent) ||
+ *                         (anEvent instanceof ActionEvent)) {
+ *                     return false;
+ *                 }
+ *                 return true;
+ *             }
+ *         });
+ *         return new JScrollPane(table);
+ *     }
+ *
+ *     private void onEDT10() {
+ *         requestAndWaitForFocus(table);
+ *     }
+ *
+ *     private void onEDT20() {
+ *         robot.keyPress(KeyEvent.VK_A);
+ *         robot.keyRelease(KeyEvent.VK_A);
+ *         waitForEvent(table, KeyEvent.KEY_RELEASED);
+ *     }
+ *
+ *     private void onEDT30() {
+ *         if (table.isEditing()) {
+ *             fail("Should not be editing");
+ *         }
+ *     }
+ * }
+ *
+ * + * + * @author Scott Violet + */ +public abstract class SwingTestHelper { + private static final String ON_EDT_METHOD_NAME = "onEDT"; + private static final String IN_BACKGROUND_METHOD_NAME = "onBackgroundThread"; + + // Whether or not we've installed a PropertyChangeListener on the + // KeyboardFocusManager + private boolean installedFocusListener; + // Component currently blocking on until focus has been received. + private Component componentWaitingForFocus; + + // Set to true when done. + private boolean done; + // If failed, this gives the exception. Only the first exception is + // kept. + private Throwable error; + + // List of methods to invoke + private java.util.List methods; + + // The conditions the background thread is blocked on. + private java.util.List conditions; + + // Whether or not we've installed the AWTEventListener + private boolean installedEventListener; + + /** + * Instance of Robot returned from createRobot. + */ + protected JRobot robot; + + /** + * Window returned from createWindow. + */ + protected Window window; + + // Listens for the first paint event + private AWTEventListener paintListener; + // Whether or not we've received a paint event. + private boolean receivedFirstPaint; + + // used if the user wants to slow down method processing + private PauseCondition delay = null; + + private boolean showProgress; + private JProgressBar progBar; + + + public SwingTestHelper() { + paintListener = new AWTEventListener() { + public void eventDispatched(AWTEvent ev) { + if ((ev.getID() & PaintEvent.PAINT) != 0 && + ev.getSource() == window) { + synchronized(SwingTestHelper.this) { + if (receivedFirstPaint) { + return; + } + receivedFirstPaint = true; + } + Toolkit.getDefaultToolkit().removeAWTEventListener( + paintListener); + startControlLoop(); + } + } + }; + Toolkit.getDefaultToolkit().addAWTEventListener( + paintListener, AWTEvent.PAINT_EVENT_MASK); + } + + /** + * Sets whether SwingTestHelper should use {@code SunToolkit.realSync} + * to wait for events to finish, or {@code Robot.waitForIdle}. The default + * is to use realSync. + * Nov 2014: no realSync any more, just robot.waitForIdle which actually + * _is_ realSync on all platforms but OS X (and thus cannot be used on EDT). + */ + public void setUseRealSync(boolean useRealSync) { + //NOOP + } + + /** + * Set the amount of time to delay between invoking methods in + * the control loop. Useful to slow down testing. + */ + protected void setDelay(int delay) { + if (delay <= 0) { + this.delay = null; + } else { + this.delay = new PauseCondition(delay); + } + } + + /** + * Sets whether or not progress through the list of methods is + * shown by a progress bar at the bottom of the window created + * by {@code createWindow}. + */ + protected void setShowProgress(boolean showProgress) { + this.showProgress = showProgress; + } + + /** + * Creates and returns the Window for the test. This + * implementation returns a JFrame with a default close operation + * of EXIT_ON_CLOSE. The Component + * returned from createContentPane is added the + * JFrame and the the frame is packed. + *

+ * Typically you only need override createContentPane. + */ + protected Window createWindow() { + JFrame frame = new JFrame("Test: " + getClass().getName()); + frame.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); + frame.add(createContentPane()); + if (showProgress) { + progBar = new JProgressBar(); + progBar.setString(""); + progBar.setStringPainted(true); + frame.add(progBar, BorderLayout.SOUTH); + } + frame.pack(); + return frame; + } + + /** + * Returns the Component to place in the frame. + * Override this or the createWindow method. + */ + protected Component createContentPane() { + return null; + } + + /** + * Invokes requestFocus on the passed in component (assuming + * it doesn't already have focus). Test execution is blocked until focus + * has been gained on the component. This method must be invoked + * on the EDT, if you do not invoke it from the edt the test will fail. + * + * @param c the Component to wait for focus on + */ + protected void requestAndWaitForFocus(Component c) { + requestAndWaitForFocus(c, true); + } + + /** + * Blocks test execution until focus is gained on the component. + * This method must be invoked + * on the EDT, if you do not invoke it from the edt the test will fail. + */ + protected void waitForFocusGained(Component c) { + requestAndWaitForFocus(c, false); + } + + private void requestAndWaitForFocus(Component c, boolean requestFocus) { + if (!EventQueue.isDispatchThread()) { + System.out.println( + "requestAndWaitForFocus should be invoked on EDT"); + throw new RuntimeException(); + } + if (componentWaitingForFocus != null) { + System.out.println("Already waiting for focus"); + throw new RuntimeException(); + } + if (!installedFocusListener) { + installedFocusListener = true; + KeyboardFocusManager.getCurrentKeyboardFocusManager(). + addPropertyChangeListener(new FocusListener()); + } + synchronized(this) { + if (c.hasFocus()) { + return; + } + componentWaitingForFocus = c; + } + if (requestFocus) { + c.requestFocus(); + } + waitForCondition(new FocusCondition()); + } + + /** + * Blocks test execution until the specified event has been received. + * This method immediately returns and the EDT will continue to + * process events, but test execution is blocked until + * the event is received. + * + * @param event the event type to wait for + */ + protected void waitForEvent(int event) { + waitForEvent(null, event); + } + + /** + * Blocks test execution until the specified event has been received. + * This method immediately returns and the EDT will continue to + * process events, but test execution is blocked until + * the event is received. + * + * @param target the Component to wait for the event on; + * null indicates it does not matter which + * component the event is received on + * @param event the event type to wait for + */ + protected void waitForEvent(Component target, int event) { + waitForCondition(new EventCondition(target, event)); + if (!installedEventListener) { + installedEventListener = true; + Toolkit.getDefaultToolkit().addAWTEventListener( + new EventListener(), 0xFFFFFFFFFFFFFFFFl); + } + } + + /** + * Paused test execution for the specified amount of time. The caller + * immediately returns and the EDT can process events. + * + * @param time the amount of time, in milliseconds, to pause for + */ + protected void pause(int time) { + waitForCondition(new PauseCondition(time)); + } + + /** + * Schedules a Runnable that will be processed in the + * background thread. This method immediately returns, and the + * EDT is free to continue processing events. Test execution is + * blocked until the Runnable completes. + */ + protected void waitForCondition(Runnable runnable) { + synchronized(this) { + if (conditions == null) { + conditions = new LinkedList(); + } + conditions.add(runnable); + } + } + + /** + * Runs the test. This method blocks the caller until the test + * fails or succeeds. Recognized arguments are: + *

+ * "-exit": Causes main to exit when the test is done. + * "-showProg": Indicate the progress of the test with a + * progress bar in the main window. Only works + * if the test hasn't overridden {@code createWindow}. + * "-delay int": Sets the delay between executing methods. + * Useful when you want to slow a test to watch it. + * + * @param args the arguments from main, it's ok to pass in null + */ + protected final void run(String[] args) throws Throwable { + boolean exit = false; + if (args != null) { + for (int i = 0; i < args.length; i++) { + if (args[i].equals("-exit")) { + exit = true; + } else if (args[i].equals("-delay")) { + try { + setDelay(Integer.parseInt(args[++i])); + } catch (NumberFormatException ne) { + throw new RuntimeException("-delay requires an integer value"); + } catch (ArrayIndexOutOfBoundsException ae) { + throw new RuntimeException("-delay requires an integer value"); + } + } else if (args[i].equals("-showProg")) { + setShowProgress(true); + } else { + throw new RuntimeException("Invalid argument \"" + args[i] + "\""); + } + } + } + + createWindow0(); + synchronized(this) { + while(!done) { + wait(); + } + } + if (exit) { + // Not in harness + if (error != null) { + System.out.println("FAILED: " + error); + error.printStackTrace(); + } + System.exit(0); + } + if (error != null) { + throw error; + } + } + + /** + * Creates the window, on the EDT. + */ + private void createWindow0() { + EventQueue.invokeLater(new Runnable() { + public void run() { + window = createWindow(); + window.show(); + } + }); + } + + /** + * Initializes the progress bar if necessary. + */ + private void initProgressBar(final int size) { + EventQueue.invokeLater(new Runnable() { + public void run() { + if (progBar != null) { + progBar.setMaximum(size); + } + } + }); + } + + /** + * Starst the control loop. + */ + private void startControlLoop() { + robot = createRobot(); + if (robot != null) { + calculateMethods(); + initProgressBar(methods.size()); + new Thread(new Runnable() { + public void run() { + controlLoop(); + } + }).start(); + } + } + + /** + * Increment the progress bar. + */ + private void nextProgress(final String name) { + EventQueue.invokeLater(new Runnable() { + public void run() { + if (progBar != null) { + progBar.setString(name); + progBar.setValue(progBar.getValue() + 1); + } + } + }); + } + + private synchronized Runnable currentCondition() { + if (conditions != null && conditions.size() > 0) { + return conditions.get(0); + } + return null; + } + + private synchronized Runnable nextCondition() { + return conditions.remove(0); + } + + private void controlLoop() { + int methodIndex = 0; + while (methodIndex < methods.size()) { + // Wait for any pending conditions + Runnable condition; + while ((condition = currentCondition()) != null) { + try { + condition.run(); + } catch (Exception e) { + fail(e); + return; + } + waitForEDTToFinish(); + synchronized(this) { + if (done) { + return; + } + } + // Advance to next condition + nextCondition(); + } + + // Let all events on the EDT finish + waitForEDTToFinish(); + + if (delay != null) { + delay.run(); + } + + // Invoke the next method + Method method = methods.get(methodIndex++); + Test test = method.getAnnotation(Test.class); + boolean onEDT = true; + if (test != null) { + onEDT = test.onEDT(); + } + else if (!method.getName().startsWith(ON_EDT_METHOD_NAME)) { + onEDT = false; + } + if (onEDT) { + invokeOnEDT(method); + } + else { + invoke(method); + } + + // Let all events on the EDT finish + waitForEDTToFinish(); + + nextProgress(method.getName()); + + // If done, stop. + synchronized(this) { + if (done) { + return; + } + } + } + + // No more methods, if we get and done isn't true, set it true + // so that the main thread wakes up. + synchronized(this) { + if (!done) { + done = true; + notifyAll(); + } + } + } + + private void waitForEDTToFinish() { + robot.waitForIdle(); + } + + private void invokeOnEDT(final Method method) { + try { + EventQueue.invokeAndWait(new Runnable() { + public void run() { + invoke(method); + } + }); + } catch (InvocationTargetException ite) { + fail(ite); + } catch (InterruptedException ie) { + fail(ie); + } + } + + private void invoke(Method method) { + System.out.println("invoking: " + method.getName()); + try { + if (Modifier.isPrivate(method.getModifiers())) { + method.setAccessible(true); + } + method.invoke(this); + } catch (Exception e) { + fail(e); + } + } + + // Determines the methods to execute. + private void calculateMethods() { + // Using a Set avoids duplicating methods returned by both + // getMethods() and getDeclaredMethods(). + HashSet allMethods = new HashSet(); + allMethods.addAll(Arrays.asList(getClass().getMethods())); + allMethods.addAll(Arrays.asList(getClass().getDeclaredMethods())); + + methods = new ArrayList(); + for (Method method : allMethods) { + Test test = method.getAnnotation(Test.class); + if (test != null) { + methods.add(method); + } + else if (method.getName().startsWith(ON_EDT_METHOD_NAME)) { + methods.add(method); + } + else if (method.getName().startsWith(IN_BACKGROUND_METHOD_NAME)) { + methods.add(method); + } + } + Comparator comparator = new Comparator() { + public int compare(Method m1, Method m2) { + int index1 = getIndex(m1); + int index2 = getIndex(m2); + return index1 - index2; + } + private int getIndex(Method m) { + String name = m.getName(); + String indexAsString; + Test test = m.getAnnotation(Test.class); + if (test != null) { + return test.value(); + } + if (name.startsWith(ON_EDT_METHOD_NAME)) { + indexAsString = name.substring( + ON_EDT_METHOD_NAME.length()); + } + else { + indexAsString = name.substring( + IN_BACKGROUND_METHOD_NAME.length()); + } + if (indexAsString.length() == 0) { + System.out.println( + "onEDT and onBackgroundThread must be " + + "followed by an integer specifying " + + "order."); + System.exit(0); + } + return Integer.parseInt(indexAsString); + } + }; + Collections.sort(methods, comparator); + } + + /** + * Invoke if the test should be considered to have failed. This will + * stop test execution. + */ + public void fail(String reason) { + fail(new RuntimeException(reason)); + } + + /** + * Invoke if the test should be considered to have failed. This will + * stop test execution. + */ + public void fail(Throwable error) { + synchronized(this) { + if (this.error == null) { + if (error instanceof InvocationTargetException) { + this.error = ((InvocationTargetException)error). + getCause(); + } + else { + this.error = error; + } + this.done = true; + notifyAll(); + } + } + } + + /** + * Invoke to prematurely stop test execution while there are remaining + * methods. You typically don't invoke this, instead if all methods have + * been executed and fail hasn't been invoked, the test is considered to + * have passed. + */ + public void succeeded() { + synchronized(this) { + this.done = true; + notifyAll(); + } + } + + /** + * Creates and returns the Robot that will be used. You generally don't + * need to override this. + */ + protected JRobot createRobot() { + JRobot robot = JRobot.getRobot(false); + return robot; + } + + + private class FocusListener implements PropertyChangeListener { + public void propertyChange(PropertyChangeEvent e) { + if (componentWaitingForFocus != null && + "focusOwner".equals(e.getPropertyName()) && + componentWaitingForFocus == e.getNewValue()) { + synchronized(SwingTestHelper.this) { + componentWaitingForFocus = null; + SwingTestHelper.this.notifyAll(); + } + } + } + } + + + private class EventCondition implements Runnable { + private Component component; + private int eventID; + private boolean received; + + EventCondition(Component component, int eventID) { + this.component = component; + this.eventID = eventID; + } + + public int getEventID() { + return eventID; + } + + public Component getComponent() { + return component; + } + + public void received() { + synchronized(SwingTestHelper.this) { + this.received = true; + SwingTestHelper.this.notifyAll(); + } + } + + public boolean isWaiting() { + return !received; + } + + public void run() { + synchronized(SwingTestHelper.this) { + while (!received) { + try { + SwingTestHelper.this.wait(); + } catch (InterruptedException ie) { + fail(ie); + } + } + } + } + } + + + private class FocusCondition implements Runnable { + public void run() { + synchronized(SwingTestHelper.this) { + while (componentWaitingForFocus != null) { + try { + SwingTestHelper.this.wait(); + } catch (InterruptedException ie) { + fail(ie); + } + } + } + } + } + + + private class PauseCondition implements Runnable { + private int time; + PauseCondition(int time) { + this.time = time; + } + public void run() { + try { + Thread.sleep(time); + } catch (InterruptedException ie) { + fail(ie); + } + } + } + + + private class EventListener implements AWTEventListener { + public void eventDispatched(AWTEvent ev) { + int eventID = ev.getID(); + synchronized (SwingTestHelper.this) { + for (Runnable condition : conditions) { + if (condition instanceof EventCondition) { + EventCondition ec = (EventCondition)condition; + if (ec.isWaiting()) { + if (eventID == ec.getEventID() && + (ec.getComponent() == null || + ev.getSource() == ec.getComponent())) { + ec.received(); + } + return; + } + } + else { + return; + } + } + } + } + } +} diff --git a/jdk/test/javax/swing/regtesthelpers/Test.java b/jdk/test/javax/swing/regtesthelpers/Test.java new file mode 100644 index 00000000000..2ce928737f0 --- /dev/null +++ b/jdk/test/javax/swing/regtesthelpers/Test.java @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2007, 2016, 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.ElementType; +import java.lang.annotation.Retention; +import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; + +@Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.METHOD) +public @interface Test { + int value(); + boolean onEDT() default true; +} \ No newline at end of file diff --git a/jdk/test/javax/swing/regtesthelpers/Util.java b/jdk/test/javax/swing/regtesthelpers/Util.java index 534d99796ed..4724fa200d6 100644 --- a/jdk/test/javax/swing/regtesthelpers/Util.java +++ b/jdk/test/javax/swing/regtesthelpers/Util.java @@ -81,7 +81,8 @@ public class Util { /** * Fills the heap until OutOfMemoryError occurs. This method is useful for - * WeakReferences removing. + * WeakReferences removing. To minimize the amount of filled memory the + * test should provide reasonable heap size via -mx option. */ public static void generateOOME() { List bigLeak = new LinkedList(); diff --git a/jdk/test/javax/swing/reliability/TaskUndJFrameProperties.java b/jdk/test/javax/swing/reliability/TaskUndJFrameProperties.java index 4cea8f995f7..cec296fd3f0 100644 --- a/jdk/test/javax/swing/reliability/TaskUndJFrameProperties.java +++ b/jdk/test/javax/swing/reliability/TaskUndJFrameProperties.java @@ -26,6 +26,7 @@ import java.awt.*; /* * @test + * @key headful * @summary Construct a Undecorated JFrame, try to change the properties * using setVisible() method. * @author Aruna Samji diff --git a/jdk/test/javax/swing/reliability/TaskZoomJFrameChangeState.java b/jdk/test/javax/swing/reliability/TaskZoomJFrameChangeState.java index d8a3374f4cf..1ab5df63913 100644 --- a/jdk/test/javax/swing/reliability/TaskZoomJFrameChangeState.java +++ b/jdk/test/javax/swing/reliability/TaskZoomJFrameChangeState.java @@ -26,6 +26,7 @@ import java.awt.*; /* * @test + * @key headful * @summary Construct a JFrame, zoom it from the normal state and back forth * using Frame.ZOOMED and Frame.NORMAL. Iconofy from the zoomed * state and back forth using Frame.ICONIFIED and Frame.NORMAL and diff --git a/jdk/test/javax/swing/reliability/TaskZoomJFrameRepaint.java b/jdk/test/javax/swing/reliability/TaskZoomJFrameRepaint.java index 54e434bf272..0099210c73b 100644 --- a/jdk/test/javax/swing/reliability/TaskZoomJFrameRepaint.java +++ b/jdk/test/javax/swing/reliability/TaskZoomJFrameRepaint.java @@ -26,6 +26,7 @@ import java.awt.*; /* * @test + * @key headful * @summary Construct a jframe with some components and zoom the frame and bring it back to normal state. * @author Aruna Samji * @library ../../../lib/testlibrary diff --git a/jdk/test/javax/swing/text/AbstractDocument/6968363/Test6968363.java b/jdk/test/javax/swing/text/AbstractDocument/6968363/Test6968363.java index 333bfeddb94..5d1eb6cbc52 100644 --- a/jdk/test/javax/swing/text/AbstractDocument/6968363/Test6968363.java +++ b/jdk/test/javax/swing/text/AbstractDocument/6968363/Test6968363.java @@ -42,6 +42,7 @@ import static javax.swing.SwingUtilities.invokeAndWait; /* * @test + * @key headful * @bug 6968363 * @summary Ensures that a custom document may not extend AbstractDocument * @author Sergey Malenkov diff --git a/jdk/test/javax/swing/text/CSSBorder/6796710/bug6796710.java b/jdk/test/javax/swing/text/CSSBorder/6796710/bug6796710.java index 46cfd90980f..1cd3c7143e2 100644 --- a/jdk/test/javax/swing/text/CSSBorder/6796710/bug6796710.java +++ b/jdk/test/javax/swing/text/CSSBorder/6796710/bug6796710.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6796710 7124242 * @summary Html content in JEditorPane is overlapping on swing components while resizing the application. * @library ../../../regtesthelpers diff --git a/jdk/test/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java b/jdk/test/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java index 07b79d641b9..65cf42c5da0 100644 --- a/jdk/test/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java +++ b/jdk/test/javax/swing/text/DefaultEditorKit/4278839/bug4278839.java @@ -21,7 +21,9 @@ * questions. */ -/* @test Jan 16, 2003 +/* + * @test + * @key headful * @bug 4278839 * @summary Incorrect cursor movement between words at the end of line * @author Anton Nashatyrev diff --git a/jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java b/jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java index 9f38cd11828..9d146050868 100644 --- a/jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java +++ b/jdk/test/javax/swing/text/DefaultStyledDocument/6636983/bug6636983.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6636983 * @summary test that composed text at the line starts is handled correctly * @author Sergey Groznyh diff --git a/jdk/test/javax/swing/text/FlowView/LayoutTest.java b/jdk/test/javax/swing/text/FlowView/LayoutTest.java new file mode 100644 index 00000000000..1cb9effba98 --- /dev/null +++ b/jdk/test/javax/swing/text/FlowView/LayoutTest.java @@ -0,0 +1,90 @@ +/* + * Copyright (c) 2007, 2016, 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 6452106 6606443 8161195 + @author Peter Zhelezniakov + @library ../../regtesthelpers + @build Test JRobot SwingTestHelper + @run main/timeout=300 LayoutTest +*/ + +import javax.swing.text.*; +import javax.swing.*; +import java.awt.event.*; +import java.awt.*; + +public class LayoutTest extends SwingTestHelper { + JTextPane text; + + public static void main(String[] args) throws Throwable { + new LayoutTest().run(args); + } + + protected Component createContentPane() { + return text = new JTextPane(); + } + + @Test(value=10, onEDT=true) + private void onEDT10() { + requestAndWaitForFocus(text); + } + + + @Test(value=100, onEDT=true) + private void prepare6452106() { + text.setText("This is easily generated on my\nmachine"); + Document doc = text.getDocument(); + + // wrap the long paragraph + Dimension d = text.getPreferredSize(); + Dimension size = new Dimension(d.width * 2 / 3, d.height * 5); + window.setSize(size); + + // place caret at the end of 2nd line + Element p1 = doc.getDefaultRootElement().getElement(0); + int pos = p1.getEndOffset(); + text.setCaretPosition(pos - 1); + } + + @Test(value=110, onEDT=false) + private void test6452106() { + robot.setDelay(300); + robot.hitKey(KeyEvent.VK_DELETE); + robot.hitKey(KeyEvent.VK_SPACE); + robot.hitKey(KeyEvent.VK_SPACE); + } + + + @Test(value=200, onEDT=true) + private void prepare6606443() { + text.setText("This is easily\ngenerated\non my machine"); + text.setSelectionStart(15); + text.setSelectionEnd(24); + } + + @Test(value=210, onEDT=false) + private void test6606443() { + robot.hitKey(KeyEvent.VK_ENTER); + } +} diff --git a/jdk/test/javax/swing/text/JTextComponent/5074573/bug5074573.java b/jdk/test/javax/swing/text/JTextComponent/5074573/bug5074573.java index a2067bbacf9..bdadb11170e 100644 --- a/jdk/test/javax/swing/text/JTextComponent/5074573/bug5074573.java +++ b/jdk/test/javax/swing/text/JTextComponent/5074573/bug5074573.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 5074573 * @summary tests delte-next-word and delete-prev-word actions for all text compnents and all look&feels * @author Igor Kushnirskiy diff --git a/jdk/test/javax/swing/text/NavigationFilter/6735293/bug6735293.java b/jdk/test/javax/swing/text/NavigationFilter/6735293/bug6735293.java index 08658b4f35d..431baac2f07 100644 --- a/jdk/test/javax/swing/text/NavigationFilter/6735293/bug6735293.java +++ b/jdk/test/javax/swing/text/NavigationFilter/6735293/bug6735293.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 6735293 * @summary javax.swing.text.NavigationFilter.getNextVisualPositionFrom() not always throws BadLocationException * @author Pavel Porvatov diff --git a/jdk/test/javax/swing/text/NavigationFilter/8058305/bug8058305.java b/jdk/test/javax/swing/text/NavigationFilter/8058305/bug8058305.java index 9ef696891ba..6f17816b9f2 100644 --- a/jdk/test/javax/swing/text/NavigationFilter/8058305/bug8058305.java +++ b/jdk/test/javax/swing/text/NavigationFilter/8058305/bug8058305.java @@ -30,6 +30,7 @@ import javax.swing.text.Position; /* * @test + * @key headful * @bug 8058305 * @summary BadLocationException is not thrown by * javax.swing.text.View.getNextVisualPositionFrom() for invalid positions diff --git a/jdk/test/javax/swing/text/TableView/I18nLayoutTest.java b/jdk/test/javax/swing/text/TableView/I18nLayoutTest.java index 49f7a4d64cf..61bf8a03d84 100644 --- a/jdk/test/javax/swing/text/TableView/I18nLayoutTest.java +++ b/jdk/test/javax/swing/text/TableView/I18nLayoutTest.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8133864 * @summary Wrong display, when the document I18n properties is true. * @author Semyon Sadetsky @@ -345,4 +346,4 @@ class CodeBugDocument extends DefaultStyledDocument { Specs.add(cellEnd); } } -} \ No newline at end of file +} diff --git a/jdk/test/javax/swing/text/Utilities/bug7045593.java b/jdk/test/javax/swing/text/Utilities/bug7045593.java index 1de7cc142c2..3f882a6872a 100644 --- a/jdk/test/javax/swing/text/Utilities/bug7045593.java +++ b/jdk/test/javax/swing/text/Utilities/bug7045593.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 7045593 * @summary Possible Regression : JTextfield cursor placement behavior algorithm has changed * @author Pavel Porvatov diff --git a/jdk/test/javax/swing/text/View/8014863/bug8014863.java b/jdk/test/javax/swing/text/View/8014863/bug8014863.java index 892d5aaec5d..9205349895e 100644 --- a/jdk/test/javax/swing/text/View/8014863/bug8014863.java +++ b/jdk/test/javax/swing/text/View/8014863/bug8014863.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 8014863 * @bug 8024395 * @summary Tests the calculation of the line breaks when a text is inserted diff --git a/jdk/test/javax/swing/text/View/8048110/bug8048110.java b/jdk/test/javax/swing/text/View/8048110/bug8048110.java index 85ae35708e5..17d18cb565e 100644 --- a/jdk/test/javax/swing/text/View/8048110/bug8048110.java +++ b/jdk/test/javax/swing/text/View/8048110/bug8048110.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8048110 * @summary Using tables in JTextPane leads to infinite loop in FlowLayout.layoutRow * @author Dmitry Markov diff --git a/jdk/test/javax/swing/text/html/7189299/bug7189299.java b/jdk/test/javax/swing/text/html/7189299/bug7189299.java index 609635c4fc5..46ec4e503a3 100644 --- a/jdk/test/javax/swing/text/html/7189299/bug7189299.java +++ b/jdk/test/javax/swing/text/html/7189299/bug7189299.java @@ -39,6 +39,7 @@ import javax.swing.text.html.HTMLEditorKit; /* * @test + * @key headful * @bug 8008289 * @summary Shared ButtonModel instance should deregister previous listeners. * @author Frank Ding diff --git a/jdk/test/javax/swing/text/html/8031109/bug8031109.java b/jdk/test/javax/swing/text/html/8031109/bug8031109.java index 2288d596230..d6e21465964 100644 --- a/jdk/test/javax/swing/text/html/8031109/bug8031109.java +++ b/jdk/test/javax/swing/text/html/8031109/bug8031109.java @@ -31,6 +31,7 @@ import javax.swing.SwingUtilities; import javax.swing.text.EditorKit; /* * @test + * @key headful * @bug 8031109 * @author Victor Dyakov * @summary Rendering HTML code in JEditorPane throws NumberFormatException diff --git a/jdk/test/javax/swing/text/html/8034955/bug8034955.java b/jdk/test/javax/swing/text/html/8034955/bug8034955.java index 3e7bba2130e..2d78e41a7a2 100644 --- a/jdk/test/javax/swing/text/html/8034955/bug8034955.java +++ b/jdk/test/javax/swing/text/html/8034955/bug8034955.java @@ -27,6 +27,7 @@ import javax.swing.SwingUtilities; /** * @test + * @key headful * @bug 8034955 * @author Alexander Scherbatiy * @summary JLabel/JToolTip throw ClassCastException for "a" diff --git a/jdk/test/javax/swing/text/html/CSS/4530474/bug4530474.java b/jdk/test/javax/swing/text/html/CSS/4530474/bug4530474.java index 4f23b2848f2..7803f9309eb 100644 --- a/jdk/test/javax/swing/text/html/CSS/4530474/bug4530474.java +++ b/jdk/test/javax/swing/text/html/CSS/4530474/bug4530474.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 4530474 * @summary Tests if background-color CSS attribute in HTML font tag in class attribute * @author Denis Sharypov diff --git a/jdk/test/javax/swing/text/html/HTMLDocument/8058120/bug8058120.java b/jdk/test/javax/swing/text/html/HTMLDocument/8058120/bug8058120.java index 7b5e9a94bc0..0d06d6ae00d 100644 --- a/jdk/test/javax/swing/text/html/HTMLDocument/8058120/bug8058120.java +++ b/jdk/test/javax/swing/text/html/HTMLDocument/8058120/bug8058120.java @@ -22,6 +22,7 @@ */ /* @test + * @key headful * @bug 8058120 * @summary Rendering / caret errors with HTMLDocument * @author Dmitry Markov diff --git a/jdk/test/javax/swing/text/html/HTMLEditorKit/4242228/bug4242228.java b/jdk/test/javax/swing/text/html/HTMLEditorKit/4242228/bug4242228.java index 835990fa142..b3145e787a3 100644 --- a/jdk/test/javax/swing/text/html/HTMLEditorKit/4242228/bug4242228.java +++ b/jdk/test/javax/swing/text/html/HTMLEditorKit/4242228/bug4242228.java @@ -21,11 +21,13 @@ * questions. */ -/* @test - @bug 4242228 - @summary Tests that HTMLEditorKit.setText() doesn't throw exceptions - @author Peter Zhelezniakov -*/ +/* + * @test + * @key headful + * @bug 4242228 + * @summary Tests that HTMLEditorKit.setText() doesn't throw exceptions + * @author Peter Zhelezniakov + */ import javax.swing.*; import javax.swing.event.ChangeEvent; diff --git a/jdk/test/javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java b/jdk/test/javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java index de4019cdf32..8184b6a9562 100644 --- a/jdk/test/javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java +++ b/jdk/test/javax/swing/text/html/HTMLEditorKit/5043626/bug5043626.java @@ -23,6 +23,7 @@ /* * @test + * @key headful * @bug 5043626 * @summary Tests pressing Home or Ctrl+Home set cursor to invisible element <head> * @author Alexander Potochkin diff --git a/jdk/test/javax/swing/text/rtf/RTFWriteParagraphAlignTest.java b/jdk/test/javax/swing/text/rtf/RTFWriteParagraphAlignTest.java index 31b605334a6..efbd78122db 100644 --- a/jdk/test/javax/swing/text/rtf/RTFWriteParagraphAlignTest.java +++ b/jdk/test/javax/swing/text/rtf/RTFWriteParagraphAlignTest.java @@ -21,11 +21,13 @@ * questions. */ -/* @test - @bug 8139215 - @summary RTFEditorKit does not save alignment - @author Semyon Sadetsky - */ +/* + * @test + * @key headful + * @bug 8139215 + * @summary RTFEditorKit does not save alignment + * @author Semyon Sadetsky + */ import javax.swing.*; import javax.swing.text.*; diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java b/jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java index 523e6e6a074..635f37f0b82 100644 --- a/jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java +++ b/jdk/test/lib/testlibrary/jdk/testlibrary/Platform.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -58,10 +58,6 @@ public class Platform { return vmName.endsWith(" Minimal VM"); } - public static boolean isEmbedded() { - return vmName.contains("Embedded"); - } - public static boolean isTieredSupported() { return compiler.contains("Tiered Compilers"); } diff --git a/jdk/test/sun/awt/dnd/8024061/bug8024061.java b/jdk/test/sun/awt/dnd/8024061/bug8024061.java index 98f29ac1862..e220880ac0b 100644 --- a/jdk/test/sun/awt/dnd/8024061/bug8024061.java +++ b/jdk/test/sun/awt/dnd/8024061/bug8024061.java @@ -21,7 +21,9 @@ * questions. */ -/* @test +/* + * @test + * @key headful * @bug 8024061 * @summary Checks that no exception is thrown if dragGestureRecognized * takes a while to complete. diff --git a/jdk/test/sun/awt/image/OffScreenImageSource/ImageConsumerUnregisterTest.java b/jdk/test/sun/awt/image/OffScreenImageSource/ImageConsumerUnregisterTest.java index 888f1384d90..51bb420e865 100644 --- a/jdk/test/sun/awt/image/OffScreenImageSource/ImageConsumerUnregisterTest.java +++ b/jdk/test/sun/awt/image/OffScreenImageSource/ImageConsumerUnregisterTest.java @@ -22,7 +22,7 @@ */ /* @test - * @bug 8160421 + * @bug 8160421 8161902 * @summary Test to check OffScreenImageSource handles case where * imageComplete(ImageConsumer.SINGLEFRAMEDONE) unregisters. * @run main/othervm ImageConsumerUnregisterTest @@ -35,7 +35,7 @@ public class ImageConsumerUnregisterTest extends javax.swing.JFrame { public static void main(String[] args) throws Exception { - final java.awt.Component component = new TestBug8160421(); + final java.awt.Component component = new ImageConsumerUnregisterTest(); // Redirect the System.err stream and verify there is no // stacktrace printed @@ -59,7 +59,8 @@ public class ImageConsumerUnregisterTest extends javax.swing.JFrame { System.setErr(obj); if (!str.isEmpty()) { - throw new RuntimeException("Invalid imageComplete(STATICIMAGEDONE) call"); + throw new RuntimeException("Invalid" + + " imageComplete(STATICIMAGEDONE) call"); } } } diff --git a/jdk/test/sun/java2d/ClassCastExceptionForInvalidSurface.java b/jdk/test/sun/java2d/ClassCastExceptionForInvalidSurface.java index 956815e6e35..5018ed9d046 100644 --- a/jdk/test/sun/java2d/ClassCastExceptionForInvalidSurface.java +++ b/jdk/test/sun/java2d/ClassCastExceptionForInvalidSurface.java @@ -40,6 +40,7 @@ import static java.awt.image.BufferedImage.TYPE_INT_ARGB; /** * @test + * @key headful * @bug 8158072 7172749 */ public final class ClassCastExceptionForInvalidSurface { diff --git a/jdk/test/sun/java2d/Disposer/TestDisposerLeak.java b/jdk/test/sun/java2d/Disposer/TestDisposerLeak.java index 4eb957502c1..0fcf8cdda08 100644 --- a/jdk/test/sun/java2d/Disposer/TestDisposerLeak.java +++ b/jdk/test/sun/java2d/Disposer/TestDisposerLeak.java @@ -31,7 +31,7 @@ import sun.java2d.DisposerRecord; * @test * @bug 8129457 * @summary Check Disposer disposes all objects without any memory leaks - * @run main/othervm TestDisposerLeak + * @run main/othervm -mx128m TestDisposerLeak * @modules java.desktop/sun.java2d */ public final class TestDisposerLeak { diff --git a/jdk/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java b/jdk/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java index 6dcfe8a2ead..25f1950dfd6 100644 --- a/jdk/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java +++ b/jdk/test/sun/java2d/SunGraphics2D/SourceClippingBlitTest/SourceClippingBlitTest.java @@ -23,6 +23,7 @@ /* @test + @key headful @bug 6244574 @bug 6258142 @bug 6395165 diff --git a/jdk/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh b/jdk/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh index 103b702b429..f383db7bbe0 100644 --- a/jdk/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh +++ b/jdk/test/sun/java2d/X11SurfaceData/SharedMemoryPixmapsTest/SharedMemoryPixmapsTest.sh @@ -23,6 +23,7 @@ # # @test +# @key headful # @bug 6363434 6588884 # @summary Verify that shared memory pixmaps are not broken # by filling a VolatileImage with red color and copying it diff --git a/jdk/test/sun/misc/Safe.java b/jdk/test/sun/misc/GetSunMiscUnsafe.java similarity index 90% rename from jdk/test/sun/misc/Safe.java rename to jdk/test/sun/misc/GetSunMiscUnsafe.java index c499a0a2c90..44ac2f70ffb 100644 --- a/jdk/test/sun/misc/Safe.java +++ b/jdk/test/sun/misc/GetSunMiscUnsafe.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2001, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2001, 2016, 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 @@ -29,12 +29,12 @@ */ -public class Safe { +public class GetSunMiscUnsafe { public static void main(String[] args) throws Exception { try { sun.misc.Unsafe.getUnsafe(); - } catch (Exception x) { + } catch (SecurityException x) { System.err.println("Thrown as expected: " + x); return; } diff --git a/jdk/test/sun/net/www/protocol/http/HttpInputStream.java b/jdk/test/sun/net/www/protocol/http/HttpInputStream.java index 413f55af54a..d9478caebed 100644 --- a/jdk/test/sun/net/www/protocol/http/HttpInputStream.java +++ b/jdk/test/sun/net/www/protocol/http/HttpInputStream.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 2016, 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 @@ -23,77 +23,95 @@ /* @test * @bug 4937598 - * @summary http://www.clipstream.com vedio does not play; read() problem + * @summary http://www.clipstream.com video does not play; read() problem */ -import java.util.*; -import java.io.*; -import java.net.*; -import java.text.*; - -public class HttpInputStream implements Runnable { - - ServerSocket serverSock; - - public void run() { - try { - Socket s = serverSock.accept(); - InputStream in = s.getInputStream(); - byte b[] = new byte[4096]; - - // assume we read the entire http request - // (bad assumption but okay for test case) - int nread = in.read(b); - - OutputStream o = s.getOutputStream(); - - o.write( "HTTP/1.1 200 OK".getBytes() ); - o.write( "Content-Length: 20".getBytes() ); - o.write( (byte)'\r' ); - o.write( (byte)'\n' ); - o.write( (byte)'\r' ); - o.write( (byte)'\n' ); - - for (int i = 0; i < 20; i++) { - o.write((byte)0xff); - } - - o.flush(); - o.close(); - - } catch (Exception e) { } - } - public HttpInputStream() throws Exception { +import java.io.IOException; +import java.io.InputStream; +import java.io.OutputStream; +import java.net.ServerSocket; +import java.net.Socket; +import java.net.URL; - serverSock = new ServerSocket(0); - int port = serverSock.getLocalPort(); +public class HttpInputStream { - Thread thr = new Thread(this); - thr.start(); + private static final int CONTENT_LENGTH = 20; - Date date = new Date(new Date().getTime()-1440000); // this time yesterday - URL url; - HttpURLConnection con; + static class Server implements AutoCloseable, Runnable { - url = new URL("http://localhost:" + String.valueOf(port) + - "/anything"); - con = (HttpURLConnection)url.openConnection(); + final ServerSocket serverSocket; + static final byte[] requestEnd = new byte[]{'\r', '\n', '\r', '\n'}; + static final int TIMEOUT = 10 * 1000; - int ret = con.getResponseCode(); - byte[] b = new byte[20]; - InputStream is = con.getInputStream(); - int i = 0, count = 0; - while ((i = is.read()) != -1) { - System.out.println("i = "+i); - count++; - } - if (count != 20) { - throw new RuntimeException("HttpInputStream.read() failed with 0xff"); - } - } + Server() throws IOException { + serverSocket = new ServerSocket(0); + } - public static void main(String args[]) throws Exception { - new HttpInputStream(); - } + void readOneRequest(InputStream is) throws IOException { + int requestEndCount = 0, r; + while ((r = is.read()) != -1) { + if (r == requestEnd[requestEndCount]) { + requestEndCount++; + if (requestEndCount == 4) { + break; + } + } else { + requestEndCount = 0; + } + } + } + + @Override + public void run() { + try (Socket s = serverSocket.accept()) { + s.setSoTimeout(TIMEOUT); + readOneRequest(s.getInputStream()); + try (OutputStream os = + s.getOutputStream()) { + os.write("HTTP/1.1 200 OK".getBytes()); + os.write(("Content-Length: " + CONTENT_LENGTH).getBytes()); + os.write("\r\n\r\n".getBytes()); + for (int i = 0; i < CONTENT_LENGTH; i++) { + os.write(0xff); + } + os.flush(); + } + } catch (IOException e) { + e.printStackTrace(); + } + } + + @Override + public void close() throws IOException { + if (!serverSocket.isClosed()) { + serverSocket.close(); + } + } + + public int getPort() { + return serverSocket.getLocalPort(); + } + } + + + private static int read(InputStream is) throws IOException { + int len = 0; + while (is.read() != -1) { + len++; + } + return len; + } + + public static void main(String args[]) throws IOException { + try (Server server = new Server()) { + (new Thread(server)).start(); + URL url = new URL("http://localhost:" + server.getPort() + "/anything"); + try (InputStream is = url.openConnection().getInputStream()) { + if (read(is) != CONTENT_LENGTH) { + throw new RuntimeException("HttpInputStream.read() failed with 0xff"); + } + } + } + } } diff --git a/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java b/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java index 8be07505c31..dd60d406fa6 100644 --- a/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java +++ b/jdk/test/sun/security/pkcs11/rsa/TestKeyPairGenerator.java @@ -32,7 +32,7 @@ * @run main/othervm -Djava.security.debug=sunpkcs11 TestKeyPairGenerator * @run main/othervm -Djava.security.debug=sunpkcs11 TestKeyPairGenerator * sm TestKeyPairGenerator.policy - * @key intermittent randomness + * @key randomness */ import java.math.BigInteger; diff --git a/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java b/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java index 04701afbbd9..4125dbfb4d4 100644 --- a/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java +++ b/jdk/test/sun/tools/jhsdb/BasicLauncherTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -182,6 +182,7 @@ public class BasicLauncherTest { launchCLHSDB(); + launch("compiler detected", "jmap", "--clstats"); launchNotOSX("No deadlocks found", "jstack"); launch("compiler detected", "jmap"); launch("Java System Properties", "jinfo"); diff --git a/jdk/test/tools/jlink/IntegrationTest.java b/jdk/test/tools/jlink/IntegrationTest.java index 48d44571c27..ad0a01bd541 100644 --- a/jdk/test/tools/jlink/IntegrationTest.java +++ b/jdk/test/tools/jlink/IntegrationTest.java @@ -22,6 +22,7 @@ */ import java.io.File; +import java.io.FileReader; import java.io.IOException; import java.io.UncheckedIOException; import java.nio.file.Files; @@ -33,6 +34,7 @@ import java.util.HashMap; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.Properties; import java.util.Set; import java.util.function.Function; import jdk.tools.jlink.Jlink; @@ -203,6 +205,27 @@ public class IntegrationTest { throw new AssertionError("release not generated"); } + Properties props = new Properties(); + try (FileReader reader = new FileReader(release)) { + props.load(reader); + } + + if (props.getProperty("JAVA_VERSION") == null) { + throw new AssertionError("release file does not contain JAVA_VERSION"); + } + + if (props.getProperty("OS_NAME") == null) { + throw new AssertionError("release file does not contain OS_NAME"); + } + + if (props.getProperty("OS_ARCH") == null) { + throw new AssertionError("release file does not contain OS_ARCH"); + } + + if (props.getProperty("OS_VERSION") == null) { + throw new AssertionError("release file does not contain OS_VERSION"); + } + if (!Files.exists(output.resolve("toto.txt"))) { throw new AssertionError("Post processing not called"); } diff --git a/jdk/test/tools/jlink/JLinkTest.java b/jdk/test/tools/jlink/JLinkTest.java index bf1a31d95a8..189be842854 100644 --- a/jdk/test/tools/jlink/JLinkTest.java +++ b/jdk/test/tools/jlink/JLinkTest.java @@ -130,6 +130,25 @@ public class JLinkTest { helper.checkImage(image, moduleName, new String[] {"/" + moduleName + "/" + className}, null); } + { + String moduleName = "m"; // 8163382 + Path jmod = helper.generateDefaultJModule(moduleName).assertSuccess(); + JImageGenerator.getJLinkTask() + .modulePath(helper.defaultModulePath()) + .output(helper.createNewImageDir(moduleName)) + .addMods("m") + .option("") + .call().assertSuccess(); + moduleName = "mod"; + jmod = helper.generateDefaultJModule(moduleName).assertSuccess(); + JImageGenerator.getJLinkTask() + .modulePath(helper.defaultModulePath()) + .output(helper.createNewImageDir(moduleName)) + .addMods("m") + .option("") + .call().assertSuccess(); + } + { // Help StringWriter writer = new StringWriter(); diff --git a/jdk/test/tools/jlink/plugins/ExcludeVMPluginTest.java b/jdk/test/tools/jlink/plugins/ExcludeVMPluginTest.java index 77febda6a24..48947c1f50e 100644 --- a/jdk/test/tools/jlink/plugins/ExcludeVMPluginTest.java +++ b/jdk/test/tools/jlink/plugins/ExcludeVMPluginTest.java @@ -30,6 +30,9 @@ * @run main ExcludeVMPluginTest */ import java.io.ByteArrayInputStream; +import java.net.URI; +import java.nio.file.Path; +import java.nio.file.Paths; import java.util.HashMap; import java.util.Map; import jdk.tools.jlink.internal.ResourcePoolManager; @@ -167,6 +170,13 @@ public class ExcludeVMPluginTest { poolMgr.add( ResourcePoolEntry.create("/java.base/native/jvm.cfg", ResourcePoolEntry.Type.NATIVE_LIB, jvmcfgContent)); + + // java.base/module-info.class is used by exclude vm plugin + // to get current osName(). We read it from jrt-fs and add a + // ResourcePoolEntry + poolMgr.add( + ResourcePoolEntry.create("/java.base/module-info.class", + ResourcePoolEntry.Type.CLASS_OR_RESOURCE, getJavaBaseModuleInfo())); for (String in : input) { poolMgr.add(ResourcePoolEntry.create(in, ResourcePoolEntry.Type.NATIVE_LIB, new byte[0])); @@ -187,15 +197,19 @@ public class ExcludeVMPluginTest { throw new Exception("Got content " + newContent + " expected " + expectdJvmCfg); } - if (out.entryCount() != (expectedOutput.length + 1)) { + // Apart from native resources, we should find jvm.cfg and + // java.base/module-info.class. So, we add 2 here to the + // expected count! + if (out.entryCount() != (expectedOutput.length + 2)) { out.entries().forEach(m -> { System.err.println(m.path()); }); - throw new Exception("Invalid output size " + out.entryCount() + " expected " + (expectedOutput.length + 1)); + throw new Exception("Invalid output size " + out.entryCount() + " expected " + (expectedOutput.length + 2)); } out.entries().forEach(md -> { - if (md.path().equals("/java.base/native/jvm.cfg")) { + if (md.path().equals("/java.base/native/jvm.cfg") || + md.path().equals("/java.base/module-info.class")) { return; } boolean contained = false; @@ -209,7 +223,11 @@ public class ExcludeVMPluginTest { throw new RuntimeException(md.path() + " not expected"); } }); + } + // read java.base/module-info.class from jrt-fs + private static Path getJavaBaseModuleInfo() { + return Paths.get(URI.create("jrt:/modules/java.base/module-info.class")); } private static boolean isWindows() { diff --git a/jdk/test/tools/jlink/plugins/FileCopierPluginTest.java b/jdk/test/tools/jlink/plugins/FileCopierPluginTest.java index 4f064fb9f03..712f9878c47 100644 --- a/jdk/test/tools/jlink/plugins/FileCopierPluginTest.java +++ b/jdk/test/tools/jlink/plugins/FileCopierPluginTest.java @@ -32,8 +32,10 @@ */ import java.io.File; +import java.net.URI; import java.nio.file.Files; import java.nio.file.Path; +import java.nio.file.Paths; import java.util.Collections; import java.util.HashMap; import java.util.Map; @@ -41,6 +43,7 @@ import jdk.tools.jlink.internal.ResourcePoolManager; import jdk.tools.jlink.builder.DefaultImageBuilder; import jdk.tools.jlink.internal.plugins.FileCopierPlugin; +import jdk.tools.jlink.plugin.PluginException; import jdk.tools.jlink.plugin.ResourcePoolEntry; import jdk.tools.jlink.plugin.ResourcePool; @@ -86,6 +89,12 @@ public class FileCopierPluginTest { conf.put(FileCopierPlugin.NAME, builder.toString()); plug.configure(conf); ResourcePoolManager poolMgr = new ResourcePoolManager(); + // java.base/module-info.class is used to add "release" file + // We read it from jrt-fs and add a ResourcePoolEntry + poolMgr.add( + ResourcePoolEntry.create("/java.base/module-info.class", + ResourcePoolEntry.Type.CLASS_OR_RESOURCE, getJavaBaseModuleInfo())); + expected++; ResourcePool pool = plug.transform( new ResourcePoolManager().resourcePool(), poolMgr.resourcePoolBuilder()); @@ -93,7 +102,8 @@ public class FileCopierPluginTest { throw new AssertionError("Wrong number of added files"); } pool.entries().forEach(f -> { - if (!f.type().equals(ResourcePoolEntry.Type.OTHER)) { + if (!f.type().equals(ResourcePoolEntry.Type.OTHER) && + !f.type().equals(ResourcePoolEntry.Type.CLASS_OR_RESOURCE)) { throw new AssertionError("Invalid type " + f.type() + " for file " + f.path()); } @@ -145,4 +155,9 @@ public class FileCopierPluginTest { throw new AssertionError("Invalid Content in src2 dir"); } } + + // read java.base/module-info.class from jrt-fs + private static Path getJavaBaseModuleInfo() { + return Paths.get(URI.create("jrt:/modules/java.base/module-info.class")); + } } diff --git a/jdk/test/tools/launcher/VersionCheck.java b/jdk/test/tools/launcher/VersionCheck.java index ebad0a5db31..10fce9781f9 100644 --- a/jdk/test/tools/launcher/VersionCheck.java +++ b/jdk/test/tools/launcher/VersionCheck.java @@ -93,7 +93,6 @@ public class VersionCheck extends TestHelper { "jps", "jrunscript", "jjs", - "jsadebugd", "jstack", "jstat", "jstatd", diff --git a/langtools/.hgtags b/langtools/.hgtags index 620edb54018..c950141141e 100644 --- a/langtools/.hgtags +++ b/langtools/.hgtags @@ -372,3 +372,4 @@ ea4eea2997b9e2f26cd7965839921710ff4065c8 jdk-9+126 a42768b48cb0c5af9063e12093975baeeca3b5fa jdk-9+127 2764986661b6d339ba73af52d69d3506ce12e648 jdk-9+128 e181909291981038b041ed4d22714c4760e049cd jdk-9+129 +3665ebc22a42c8f33777ee025ba0e300e6086a8c jdk-9+130 diff --git a/langtools/make/gensrc/GensrcCommon.gmk b/langtools/make/gensrc/GensrcCommon.gmk index 3b72d56e75c..09879df0a0d 100644 --- a/langtools/make/gensrc/GensrcCommon.gmk +++ b/langtools/make/gensrc/GensrcCommon.gmk @@ -117,7 +117,7 @@ define SetupParseProperties $$(addprefix _SPACE_, $$(PARSEPROPALLDIRS)))) # Now setup the rule for the generation of the resource bundles. - $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_parsed_props: $(PARSEPROPSOURCES) + $(SUPPORT_OUTPUTDIR)/gensrc/$(MODULE)/_the_parsed_props: $$(PARSEPROPSOURCES) $(MKDIR) -p $$(@D) $$(PARSEPROPDIRS) $(FIND) $$(@D) -name "*Properties.java" $(FIND_DELETE) $(ECHO) Parsing $$(words $$(PARSEPROPSOURCES)) properties into enum-like class for $(MODULE) diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java index ed412ece259..fba01f1be5a 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/api/JavacTool.java @@ -97,7 +97,7 @@ public final class JavacTool implements JavaCompiler { PrintWriter pw = (charset == null) ? new PrintWriter(System.err, true) : new PrintWriter(new OutputStreamWriter(System.err, charset), true); - context.put(Log.outKey, pw); + context.put(Log.errKey, pw); CacheFSInfo.preRegister(context); return new JavacFileManager(context, true, charset); } @@ -161,9 +161,9 @@ public final class JavacTool implements JavaCompiler { context.put(DiagnosticListener.class, ccw.wrap(diagnosticListener)); if (out == null) - context.put(Log.outKey, new PrintWriter(System.err, true)); + context.put(Log.errKey, new PrintWriter(System.err, true)); else - context.put(Log.outKey, new PrintWriter(out, true)); + context.put(Log.errKey, new PrintWriter(out, true)); if (fileManager == null) { fileManager = getStandardFileManager(diagnosticListener, null, null); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java index 87ef700c929..fbdb07ef248 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/code/Scope.java @@ -296,6 +296,8 @@ public abstract class Scope { */ int nelems = 0; + int removeCount = 0; + /** Use as a "not-found" result for lookup. * Also used to mark deleted entries in the table. */ @@ -474,6 +476,8 @@ public abstract class Scope { te = te.sibling; } + removeCount++; + //notify listeners listeners.symbolRemoved(sym, this); } @@ -569,15 +573,29 @@ public abstract class Scope { return new Iterator<Symbol>() { private ScopeImpl currScope = ScopeImpl.this; private Scope.Entry currEntry = elems; + private int seenRemoveCount = currScope.removeCount; { update(); } public boolean hasNext() { + if (seenRemoveCount != currScope.removeCount && + currEntry != null && + !currEntry.scope.includes(currEntry.sym)) { + doNext(); //skip entry that is no longer in the Scope + seenRemoveCount = currScope.removeCount; + } return currEntry != null; } public Symbol next() { + if (!hasNext()) { + throw new NoSuchElementException(); + } + + return doNext(); + } + private Symbol doNext() { Symbol sym = (currEntry == null ? null : currEntry.sym); if (currEntry != null) { currEntry = currEntry.sibling; @@ -596,6 +614,7 @@ public abstract class Scope { while (currEntry == null && currScope.next != null) { currScope = currScope.next; currEntry = currScope.elems; + seenRemoveCount = currScope.removeCount; skipToNextMatchingEntry(); } } @@ -618,13 +637,26 @@ public abstract class Scope { public Iterator<Symbol> iterator() { return new Iterator<Symbol>() { Scope.Entry currentEntry = lookup(name, sf); + int seenRemoveCount = currentEntry.scope != null ? + currentEntry.scope.removeCount : -1; public boolean hasNext() { + if (currentEntry.scope != null && + seenRemoveCount != currentEntry.scope.removeCount && + !currentEntry.scope.includes(currentEntry.sym)) { + doNext(); //skip entry that is no longer in the Scope + } return currentEntry.scope != null && (lookupKind == RECURSIVE || currentEntry.scope == ScopeImpl.this); } public Symbol next() { + if (!hasNext()) { + throw new NoSuchElementException(); + } + return doNext(); + } + private Symbol doNext() { Scope.Entry prevEntry = currentEntry; currentEntry = currentEntry.next(sf); return prevEntry.sym; @@ -686,9 +718,9 @@ public abstract class Scope { /** The entry's scope. * scope == null iff this == sentinel */ - public Scope scope; + public ScopeImpl scope; - public Entry(Symbol sym, Entry shadowed, Entry sibling, Scope scope) { + public Entry(Symbol sym, Entry shadowed, Entry sibling, ScopeImpl scope) { this.sym = sym; this.shadowed = shadowed; this.sibling = sibling; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java index f3dae95c4e4..f06a238b2b9 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Lower.java @@ -52,6 +52,7 @@ import static com.sun.tools.javac.code.TypeTag.*; import static com.sun.tools.javac.code.Kinds.Kind.*; import static com.sun.tools.javac.code.Symbol.OperatorSymbol.AccessCode.DEREF; import static com.sun.tools.javac.jvm.ByteCodes.*; +import static com.sun.tools.javac.tree.JCTree.JCOperatorExpression.OperandPos.LEFT; import static com.sun.tools.javac.tree.JCTree.Tag.*; /** This pass translates away some syntactic sugar: inner classes, @@ -850,12 +851,9 @@ public class Lower extends TreeTranslator { else if (enclOp.hasTag(ASSIGN) && tree == TreeInfo.skipParens(((JCAssign) enclOp).lhs)) return AccessCode.ASSIGN.code; - else if (enclOp.getTag().isIncOrDecUnaryOp() && - tree == TreeInfo.skipParens(((JCUnary) enclOp).arg)) - return (((JCUnary) enclOp).operator).getAccessCode(enclOp.getTag()); - else if (enclOp.getTag().isAssignop() && - tree == TreeInfo.skipParens(((JCAssignOp) enclOp).lhs)) - return (((JCAssignOp) enclOp).operator).getAccessCode(enclOp.getTag()); + else if ((enclOp.getTag().isIncOrDecUnaryOp() || enclOp.getTag().isAssignop()) && + tree == TreeInfo.skipParens(((JCOperatorExpression) enclOp).getOperand(LEFT))) + return (((JCOperatorExpression) enclOp).operator).getAccessCode(enclOp.getTag()); else return AccessCode.DEREF.code; } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java index e65b4367c00..b4bd0260e36 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Main.java @@ -62,9 +62,13 @@ public class Main { */ String ownName; + /** The writer to use for normal output. + */ + PrintWriter stdOut; + /** The writer to use for diagnostic output. */ - PrintWriter out; + PrintWriter stdErr; /** The log to use for diagnostic output. */ @@ -102,7 +106,7 @@ public class Main { * @param name the name of this tool */ public Main(String name) { - this(name, new PrintWriter(System.err, true)); + this.ownName = name; } /** @@ -112,7 +116,7 @@ public class Main { */ public Main(String name, PrintWriter out) { this.ownName = name; - this.out = out; + this.stdOut = this.stdErr = out; } /** Report a usage error. @@ -161,7 +165,14 @@ public class Main { * @return the result of the compilation */ public Result compile(String[] argv, Context context) { - context.put(Log.outKey, out); + if (stdOut != null) { + context.put(Log.outKey, stdOut); + } + + if (stdErr != null) { + context.put(Log.errKey, stdErr); + } + log = Log.instance(context); if (argv.length == 0) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java index 155097ae9a7..2ac078f3dda 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/main/Option.java @@ -96,23 +96,23 @@ public enum Option { if (this.kind != kind) return; - log.printRawLines(WriterKind.NOTICE, + log.printRawLines(WriterKind.STDOUT, String.format(HELP_LINE_FORMAT, log.localize(PrefixKind.JAVAC, "opt.Xlint.subopts"), log.localize(PrefixKind.JAVAC, "opt.Xlint.suboptlist"))); - log.printRawLines(WriterKind.NOTICE, + log.printRawLines(WriterKind.STDOUT, String.format(LINT_KEY_FORMAT, "all", log.localize(PrefixKind.JAVAC, "opt.Xlint.all"))); for (LintCategory lc : LintCategory.values()) { if (lc.hidden) continue; - log.printRawLines(WriterKind.NOTICE, + log.printRawLines(WriterKind.STDOUT, String.format(LINT_KEY_FORMAT, lc.option, log.localize(PrefixKind.JAVAC, "opt.Xlint.desc." + lc.option))); } - log.printRawLines(WriterKind.NOTICE, + log.printRawLines(WriterKind.STDOUT, String.format(LINT_KEY_FORMAT, "none", log.localize(PrefixKind.JAVAC, "opt.Xlint.none"))); @@ -307,7 +307,7 @@ public enum Option { delim = ", "; } - log.printRawLines(WriterKind.NOTICE, + log.printRawLines(WriterKind.STDOUT, String.format(HELP_LINE_FORMAT, super.helpSynopsis(log), log.localize(PrefixKind.JAVAC, descrKey, targets.toString()))); @@ -331,7 +331,7 @@ public enum Option { public boolean process(OptionHelper helper, String option) { Log log = helper.getLog(); String ownName = helper.getOwnName(); - log.printLines(PrefixKind.JAVAC, "version", ownName, JavaCompiler.version()); + log.printLines(WriterKind.STDOUT, PrefixKind.JAVAC, "version", ownName, JavaCompiler.version()); return super.process(helper, option); } }, @@ -341,7 +341,7 @@ public enum Option { public boolean process(OptionHelper helper, String option) { Log log = helper.getLog(); String ownName = helper.getOwnName(); - log.printLines(PrefixKind.JAVAC, "fullVersion", ownName, JavaCompiler.fullVersion()); + log.printLines(WriterKind.STDOUT, PrefixKind.JAVAC, "fullVersion", ownName, JavaCompiler.fullVersion()); return super.process(helper, option); } }, @@ -351,11 +351,11 @@ public enum Option { public boolean process(OptionHelper helper, String option) { Log log = helper.getLog(); String ownName = helper.getOwnName(); - log.printLines(PrefixKind.JAVAC, "msg.usage.header", ownName); + log.printLines(WriterKind.STDOUT, PrefixKind.JAVAC, "msg.usage.header", ownName); for (Option o: getJavaCompilerOptions()) { o.help(log, OptionKind.STANDARD); } - log.printNewline(); + log.printNewline(WriterKind.STDOUT); return super.process(helper, option); } }, @@ -396,8 +396,8 @@ public enum Option { for (Option o: getJavaCompilerOptions()) { o.help(log, OptionKind.EXTENDED); } - log.printNewline(); - log.printLines(PrefixKind.JAVAC, "msg.usage.nonstandard.footer"); + log.printNewline(WriterKind.STDOUT); + log.printLines(WriterKind.STDOUT, PrefixKind.JAVAC, "msg.usage.nonstandard.footer"); return super.process(helper, option); } }, @@ -840,7 +840,7 @@ public enum Option { if (this.kind != kind) return; - log.printRawLines(WriterKind.NOTICE, + log.printRawLines(WriterKind.STDOUT, String.format(HELP_LINE_FORMAT, helpSynopsis(log), log.localize(PrefixKind.JAVAC, descrKey))); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java index 8749bc59c32..6d38668c014 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacFiler.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2005, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2005, 2016, 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 @@ -604,7 +604,7 @@ public class JavacFiler implements Filer, Closeable { * Debugging function to display internal state. */ public void displayState() { - PrintWriter xout = context.get(Log.outKey); + PrintWriter xout = context.get(Log.logKey).getWriter(Log.WriterKind.STDERR); xout.println("File Object History : " + fileObjectHistory); xout.println("Open Type Names : " + openTypeNames); xout.println("Gen. Src Names : " + generatedSourceNames); diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java index e8ba1d87663..f8107a58fb0 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/processing/JavacProcessingEnvironment.java @@ -26,12 +26,10 @@ package com.sun.tools.javac.processing; import java.io.Closeable; -import java.io.File; import java.io.IOException; import java.io.PrintWriter; import java.io.StringWriter; import java.lang.reflect.Method; -import java.lang.reflect.Constructor; import java.net.MalformedURLException; import java.net.URL; import java.nio.file.Path; diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java index d8cccd82cbc..58f62960322 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/JCTree.java @@ -1869,14 +1869,33 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { } } + public static abstract class JCOperatorExpression extends JCExpression { + public enum OperandPos { + LEFT, + RIGHT + } + + protected Tag opcode; + public OperatorSymbol operator; + + public OperatorSymbol getOperator() { + return operator; + } + + @Override + public Tag getTag() { + return opcode; + } + + public abstract JCExpression getOperand(OperandPos pos); + } + /** * An assignment with "+=", "|=" ... */ - public static class JCAssignOp extends JCExpression implements CompoundAssignmentTree { - private Tag opcode; + public static class JCAssignOp extends JCOperatorExpression implements CompoundAssignmentTree { public JCExpression lhs; public JCExpression rhs; - public OperatorSymbol operator; protected JCAssignOp(Tag opcode, JCTree lhs, JCTree rhs, OperatorSymbol operator) { this.opcode = opcode; this.lhs = (JCExpression)lhs; @@ -1892,26 +1911,21 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { public JCExpression getVariable() { return lhs; } @DefinedBy(Api.COMPILER_TREE) public JCExpression getExpression() { return rhs; } - public OperatorSymbol getOperator() { - return operator; - } @Override @DefinedBy(Api.COMPILER_TREE) public <R,D> R accept(TreeVisitor<R,D> v, D d) { return v.visitCompoundAssignment(this, d); } @Override - public Tag getTag() { - return opcode; + public JCExpression getOperand(OperandPos pos) { + return pos == OperandPos.LEFT ? lhs : rhs; } } /** * A unary operation. */ - public static class JCUnary extends JCExpression implements UnaryTree { - private Tag opcode; + public static class JCUnary extends JCOperatorExpression implements UnaryTree { public JCExpression arg; - public OperatorSymbol operator; protected JCUnary(Tag opcode, JCExpression arg) { this.opcode = opcode; this.arg = arg; @@ -1923,31 +1937,25 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { public Kind getKind() { return TreeInfo.tagToKind(getTag()); } @DefinedBy(Api.COMPILER_TREE) public JCExpression getExpression() { return arg; } - public OperatorSymbol getOperator() { - return operator; - } @Override @DefinedBy(Api.COMPILER_TREE) public <R,D> R accept(TreeVisitor<R,D> v, D d) { return v.visitUnary(this, d); } - @Override - public Tag getTag() { - return opcode; - } - public void setTag(Tag tag) { opcode = tag; } + @Override + public JCExpression getOperand(OperandPos pos) { + return arg; + } } /** * A binary operation. */ - public static class JCBinary extends JCExpression implements BinaryTree { - private Tag opcode; + public static class JCBinary extends JCOperatorExpression implements BinaryTree { public JCExpression lhs; public JCExpression rhs; - public OperatorSymbol operator; protected JCBinary(Tag opcode, JCExpression lhs, JCExpression rhs, @@ -1966,16 +1974,13 @@ public abstract class JCTree implements Tree, Cloneable, DiagnosticPosition { public JCExpression getLeftOperand() { return lhs; } @DefinedBy(Api.COMPILER_TREE) public JCExpression getRightOperand() { return rhs; } - public OperatorSymbol getOperator() { - return operator; - } @Override @DefinedBy(Api.COMPILER_TREE) public <R,D> R accept(TreeVisitor<R,D> v, D d) { return v.visitBinary(this, d); } @Override - public Tag getTag() { - return opcode; + public JCExpression getOperand(OperandPos pos) { + return pos == OperandPos.LEFT ? lhs : rhs; } } diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java index 6d94218987a..5210067035c 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/tree/TreeInfo.java @@ -36,14 +36,19 @@ import com.sun.tools.javac.tree.JCTree.*; import com.sun.tools.javac.tree.JCTree.JCPolyExpression.*; import com.sun.tools.javac.util.*; import com.sun.tools.javac.util.JCDiagnostic.DiagnosticPosition; + import static com.sun.tools.javac.code.Flags.*; import static com.sun.tools.javac.code.Kinds.Kind.*; import static com.sun.tools.javac.code.TypeTag.BOT; import static com.sun.tools.javac.tree.JCTree.Tag.*; import static com.sun.tools.javac.tree.JCTree.Tag.BLOCK; import static com.sun.tools.javac.tree.JCTree.Tag.SYNCHRONIZED; + import javax.tools.JavaFileObject; +import static com.sun.tools.javac.tree.JCTree.JCOperatorExpression.OperandPos.LEFT; +import static com.sun.tools.javac.tree.JCTree.JCOperatorExpression.OperandPos.RIGHT; + /** Utility class containing inspector methods for trees. * * <p><b>This is NOT part of any supported API. @@ -386,7 +391,6 @@ public class TreeInfo { case SL_ASG: case SR_ASG: case USR_ASG: case PLUS_ASG: case MINUS_ASG: case MUL_ASG: case DIV_ASG: case MOD_ASG: - return getStartPos(((JCAssignOp) tree).lhs); case OR: case AND: case BITOR: case BITXOR: case BITAND: case EQ: case NE: case LT: case GT: @@ -394,7 +398,9 @@ public class TreeInfo { case SR: case USR: case PLUS: case MINUS: case MUL: case DIV: case MOD: - return getStartPos(((JCBinary) tree).lhs); + case POSTINC: + case POSTDEC: + return getStartPos(((JCOperatorExpression) tree).getOperand(LEFT)); case CLASSDEF: { JCClassDecl node = (JCClassDecl)tree; if (node.mods.pos != Position.NOPOS) @@ -423,9 +429,6 @@ public class TreeInfo { return getStartPos(((JCArrayTypeTree) tree).elemtype); case TYPETEST: return getStartPos(((JCInstanceOf) tree).expr); - case POSTINC: - case POSTDEC: - return getStartPos(((JCUnary) tree).arg); case ANNOTATED_TYPE: { JCAnnotatedType node = (JCAnnotatedType) tree; if (node.annotations.nonEmpty()) { @@ -486,7 +489,6 @@ public class TreeInfo { case SL_ASG: case SR_ASG: case USR_ASG: case PLUS_ASG: case MINUS_ASG: case MUL_ASG: case DIV_ASG: case MOD_ASG: - return getEndPos(((JCAssignOp) tree).rhs, endPosTable); case OR: case AND: case BITOR: case BITXOR: case BITAND: case EQ: case NE: case LT: case GT: @@ -494,7 +496,13 @@ public class TreeInfo { case SR: case USR: case PLUS: case MINUS: case MUL: case DIV: case MOD: - return getEndPos(((JCBinary) tree).rhs, endPosTable); + case POS: + case NEG: + case NOT: + case COMPL: + case PREINC: + case PREDEC: + return getEndPos(((JCOperatorExpression) tree).getOperand(RIGHT), endPosTable); case CASE: return getEndPos(((JCCase) tree).stats.last(), endPosTable); case CATCH: @@ -537,13 +545,6 @@ public class TreeInfo { return getEndPos(((JCTypeCast) tree).expr, endPosTable); case TYPETEST: return getEndPos(((JCInstanceOf) tree).clazz, endPosTable); - case POS: - case NEG: - case NOT: - case COMPL: - case PREINC: - case PREDEC: - return getEndPos(((JCUnary) tree).arg, endPosTable); case WHILELOOP: return getEndPos(((JCWhileLoop) tree).body, endPosTable); case ANNOTATED_TYPE: diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java index f84f4276048..63febd6d565 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javac/util/Log.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1999, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1999, 2016, 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 @@ -27,10 +27,13 @@ package com.sun.tools.javac.util; import java.io.*; import java.util.Arrays; +import java.util.EnumMap; import java.util.EnumSet; import java.util.HashSet; +import java.util.Map; import java.util.Queue; import java.util.Set; + import javax.tools.DiagnosticListener; import javax.tools.JavaFileObject; @@ -56,9 +59,12 @@ public class Log extends AbstractLog { /** The context key for the log. */ public static final Context.Key<Log> logKey = new Context.Key<>(); - /** The context key for the output PrintWriter. */ + /** The context key for the standard output PrintWriter. */ public static final Context.Key<PrintWriter> outKey = new Context.Key<>(); + /** The context key for the diagnostic PrintWriter. */ + public static final Context.Key<PrintWriter> errKey = new Context.Key<>(); + /* TODO: Should unify this with prefix handling in JCDiagnostic.Factory. */ public enum PrefixKind { JAVAC("javac."), @@ -111,6 +117,7 @@ public class Log extends AbstractLog { install(log); } + @Override public void report(JCDiagnostic diag) { } } @@ -134,6 +141,7 @@ public class Log extends AbstractLog { install(log); } + @Override public void report(JCDiagnostic diag) { if (!diag.isFlagSet(JCDiagnostic.DiagnosticFlag.NON_DEFERRABLE) && (filter == null || filter.accepts(diag))) { @@ -163,13 +171,9 @@ public class Log extends AbstractLog { } } - public enum WriterKind { NOTICE, WARNING, ERROR } + public enum WriterKind { NOTICE, WARNING, ERROR, STDOUT, STDERR } - protected PrintWriter errWriter; - - protected PrintWriter warnWriter; - - protected PrintWriter noticeWriter; + private final Map<WriterKind, PrintWriter> writers; /** The maximum number of errors/warnings that are reported. */ @@ -223,14 +227,130 @@ public class Log extends AbstractLog { */ private DiagnosticHandler diagnosticHandler; - /** Construct a log with given I/O redirections. + /** Get the Log instance for this context. */ + public static Log instance(Context context) { + Log instance = context.get(logKey); + if (instance == null) + instance = new Log(context); + return instance; + } + + /** + * Register a Context.Factory to create a Log. */ + public static void preRegister(Context context, PrintWriter w) { + context.put(Log.class, (Context.Factory<Log>) (c -> new Log(c, w))); + } + + /** + * Construct a log with default settings. + * If no streams are set in the context, the log will be initialized to use + * System.out for normal output, and System.err for all diagnostic output. + * If one stream is set in the context, with either Log.outKey or Log.errKey, + * it will be used for all output. + * Otherwise, the log will be initialized to use both streams found in the context. + */ + protected Log(Context context) { + this(context, initWriters(context)); + } + + /** + * Initialize a map of writers based on values found in the context + * @param context the context in which to find writers to use + * @return a map of writers + */ + private static Map<WriterKind, PrintWriter> initWriters(Context context) { + PrintWriter out = context.get(outKey); + PrintWriter err = context.get(errKey); + if (out == null && err == null) { + out = new PrintWriter(System.out, true); + err = new PrintWriter(System.err, true); + return initWriters(out, err); + } else if (out == null || err == null) { + PrintWriter pw = (out != null) ? out : err; + return initWriters(pw, pw); + } else { + return initWriters(out, err); + } + } + + /** + * Construct a log with all output sent to a single output stream. + */ + protected Log(Context context, PrintWriter writer) { + this(context, initWriters(writer, writer)); + } + + /** + * Construct a log. + * The log will be initialized to use stdOut for normal output, and stdErr + * for all diagnostic output. + */ + protected Log(Context context, PrintWriter out, PrintWriter err) { + this(context, initWriters(out, err)); + } + + /** + * Initialize a writer map for a stream for normal output, and a stream for diagnostics. + * @param out a stream to be used for normal output + * @param err a stream to be used for diagnostic messages, such as errors, warnings, etc + * @return a map of writers + */ + private static Map<WriterKind, PrintWriter> initWriters(PrintWriter out, PrintWriter err) { + Map<WriterKind, PrintWriter> writers = new EnumMap<>(WriterKind.class); + writers.put(WriterKind.ERROR, err); + writers.put(WriterKind.WARNING, err); + writers.put(WriterKind.NOTICE, err); + + writers.put(WriterKind.STDOUT, out); + writers.put(WriterKind.STDERR, err); + + return writers; + } + + /** + * Construct a log with given I/O redirections. + * @deprecated + * This constructor is provided to support the supported but now-deprecated javadoc entry point + * com.sun.tools.javadoc.Main.execute(String programName, + * PrintWriter errWriter, PrintWriter warnWriter, PrintWriter noticeWriter, + * String defaultDocletClassName, String... args) + */ + @Deprecated protected Log(Context context, PrintWriter errWriter, PrintWriter warnWriter, PrintWriter noticeWriter) { + this(context, initWriters(errWriter, warnWriter, noticeWriter)); + } + + /** + * Initialize a writer map with different streams for different types of diagnostics. + * @param errWriter a stream for writing error messages + * @param warnWriter a stream for writing warning messages + * @param noticeWriter a stream for writing notice messages + * @return a map of writers + * @deprecated This method exists to support a supported but now deprecated javadoc entry point. + */ + @Deprecated + private static Map<WriterKind, PrintWriter> initWriters(PrintWriter errWriter, PrintWriter warnWriter, PrintWriter noticeWriter) { + Map<WriterKind, PrintWriter> writers = new EnumMap<>(WriterKind.class); + writers.put(WriterKind.ERROR, errWriter); + writers.put(WriterKind.WARNING, warnWriter); + writers.put(WriterKind.NOTICE, noticeWriter); + + writers.put(WriterKind.STDOUT, noticeWriter); + writers.put(WriterKind.STDERR, errWriter); + + return writers; + } + + /** + * Creates a log. + * @param context the context in which the log should be registered + * @param writers a map of writers that can be accessed by the kind of writer required + */ + private Log(Context context, Map<WriterKind, PrintWriter> writers) { super(JCDiagnostic.Factory.instance(context)); context.put(logKey, this); - this.errWriter = errWriter; - this.warnWriter = warnWriter; - this.noticeWriter = noticeWriter; + this.writers = writers; @SuppressWarnings("unchecked") // FIXME DiagnosticListener<? super JavaFileObject> dl = @@ -245,6 +365,7 @@ public class Log extends AbstractLog { final Options options = Options.instance(context); initOptions(options); options.addListener(new Runnable() { + @Override public void run() { initOptions(options); } @@ -293,42 +414,6 @@ public class Log extends AbstractLog { return 100; } - /** The default writer for diagnostics - */ - static PrintWriter defaultWriter(Context context) { - PrintWriter result = context.get(outKey); - if (result == null) - context.put(outKey, result = new PrintWriter(System.err)); - return result; - } - - /** Construct a log with default settings. - */ - protected Log(Context context) { - this(context, defaultWriter(context)); - } - - /** Construct a log with all output redirected. - */ - protected Log(Context context, PrintWriter defaultWriter) { - this(context, defaultWriter, defaultWriter, defaultWriter); - } - - /** Get the Log instance for this context. */ - public static Log instance(Context context) { - Log instance = context.get(logKey); - if (instance == null) - instance = new Log(context); - return instance; - } - - /** - * Register a Context.Factory to create a Log. - */ - public static void preRegister(Context context, PrintWriter w) { - context.put(Log.class, (Context.Factory<Log>) (c -> new Log(c, w))); - } - /** The number of errors encountered so far. */ public int nerrors = 0; @@ -371,26 +456,18 @@ public class Log extends AbstractLog { } public PrintWriter getWriter(WriterKind kind) { - switch (kind) { - case NOTICE: return noticeWriter; - case WARNING: return warnWriter; - case ERROR: return errWriter; - default: throw new IllegalArgumentException(); - } + return writers.get(kind); } public void setWriter(WriterKind kind, PrintWriter pw) { Assert.checkNonNull(pw); - switch (kind) { - case NOTICE: noticeWriter = pw; break; - case WARNING: warnWriter = pw; break; - case ERROR: errWriter = pw; break; - default: throw new IllegalArgumentException(); - } + writers.put(kind, pw); } public void setWriters(PrintWriter pw) { - noticeWriter = warnWriter = errWriter = Assert.checkNonNull(pw); + Assert.checkNonNull(pw); + for (WriterKind k: WriterKind.values()) + writers.put(k, pw); } /** @@ -407,9 +484,9 @@ public class Log extends AbstractLog { /** Flush the logs */ public void flush() { - errWriter.flush(); - warnWriter.flush(); - noticeWriter.flush(); + for (PrintWriter pw: writers.values()) { + pw.flush(); + } } public void flush(WriterKind kind) { @@ -470,6 +547,7 @@ public class Log extends AbstractLog { } public void printNewline() { + PrintWriter noticeWriter = writers.get(WriterKind.NOTICE); noticeWriter.println(); } @@ -478,10 +556,12 @@ public class Log extends AbstractLog { } public void printLines(String key, Object... args) { + PrintWriter noticeWriter = writers.get(WriterKind.NOTICE); printRawLines(noticeWriter, localize(key, args)); } public void printLines(PrefixKind pk, String key, Object... args) { + PrintWriter noticeWriter = writers.get(WriterKind.NOTICE); printRawLines(noticeWriter, localize(pk, key, args)); } @@ -497,6 +577,7 @@ public class Log extends AbstractLog { * for the platform. */ public void printRawLines(String msg) { + PrintWriter noticeWriter = writers.get(WriterKind.NOTICE); printRawLines(noticeWriter, msg); } @@ -524,10 +605,13 @@ public class Log extends AbstractLog { * noticeWriter stream. */ public void printVerbose(String key, Object... args) { + PrintWriter noticeWriter = writers.get(WriterKind.NOTICE); printRawLines(noticeWriter, localize("verbose." + key, args)); } + @Override protected void directError(String key, Object... args) { + PrintWriter errWriter = writers.get(WriterKind.ERROR); printRawLines(errWriter, localize(key, args)); errWriter.flush(); } @@ -546,6 +630,7 @@ public class Log extends AbstractLog { * Primary method to report a diagnostic. * @param diagnostic */ + @Override public void report(JCDiagnostic diagnostic) { diagnosticHandler.report(diagnostic); } @@ -556,6 +641,7 @@ public class Log extends AbstractLog { * reported so far, the diagnostic may be handed off to writeDiagnostic. */ private class DefaultDiagnosticHandler extends DiagnosticHandler { + @Override public void report(JCDiagnostic diagnostic) { if (expectDiagKeys != null) expectDiagKeys.remove(diagnostic.getCode()); @@ -631,13 +717,13 @@ public class Log extends AbstractLog { throw new IllegalArgumentException(); case NOTE: - return noticeWriter; + return writers.get(WriterKind.NOTICE); case WARNING: - return warnWriter; + return writers.get(WriterKind.WARNING); case ERROR: - return errWriter; + return writers.get(WriterKind.ERROR); default: throw new Error(); @@ -683,26 +769,27 @@ public class Log extends AbstractLog { /** print an error or warning message: */ - private void printRawError(int pos, String msg) { + private void printRawDiag(PrintWriter pw, String prefix, int pos, String msg) { if (source == null || pos == Position.NOPOS) { - printRawLines(errWriter, "error: " + msg); + printRawLines(pw, prefix + msg); } else { int line = source.getLineNumber(pos); JavaFileObject file = source.getFile(); if (file != null) - printRawLines(errWriter, + printRawLines(pw, file.getName() + ":" + line + ": " + msg); - printErrLine(pos, errWriter); + printErrLine(pos, pw); } - errWriter.flush(); + pw.flush(); } /** report an error: */ public void rawError(int pos, String msg) { + PrintWriter errWriter = writers.get(WriterKind.ERROR); if (nerrors < MaxErrors && shouldReport(currentSourceFile(), pos)) { - printRawError(pos, msg); + printRawDiag(errWriter, "error: ", pos, msg); prompt(); nerrors++; } @@ -712,12 +799,13 @@ public class Log extends AbstractLog { /** report a warning: */ public void rawWarning(int pos, String msg) { + PrintWriter warnWriter = writers.get(WriterKind.ERROR); if (nwarnings < MaxWarnings && emitWarnings) { - printRawError(pos, "warning: " + msg); + printRawDiag(warnWriter, "warning: ", pos, msg); } prompt(); nwarnings++; - errWriter.flush(); + warnWriter.flush(); } public static String format(String fmt, Object... args) { diff --git a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahFileManager.java b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahFileManager.java index e27eff2fdc9..03771d919f2 100644 --- a/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahFileManager.java +++ b/langtools/src/jdk.compiler/share/classes/com/sun/tools/javah/JavahFileManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2016, 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 @@ -52,7 +52,7 @@ class JavahFileManager extends JavacFileManager { if (dl != null) javac_context.put(DiagnosticListener.class, dl); - javac_context.put(com.sun.tools.javac.util.Log.outKey, log); + javac_context.put(com.sun.tools.javac.util.Log.errKey, log); return new JavahFileManager(javac_context, null); } diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java index 416df5a1aa1..f996c3d6e32 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Messager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1997, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1997, 2016, 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 @@ -174,6 +174,7 @@ public class Messager extends Log implements DocErrorReporter { if (nerrors < MaxErrors) { String prefix = (pos == null) ? programName : pos.toString(); + PrintWriter errWriter = getWriter(WriterKind.ERROR); errWriter.println(prefix + ": " + getText("javadoc.error") + " - " + msg); errWriter.flush(); prompt(); @@ -206,6 +207,7 @@ public class Messager extends Log implements DocErrorReporter { if (nwarnings < MaxWarnings) { String prefix = (pos == null) ? programName : pos.toString(); + PrintWriter warnWriter = getWriter(WriterKind.WARNING); warnWriter.println(prefix + ": " + getText("javadoc.warning") +" - " + msg); warnWriter.flush(); nwarnings++; @@ -235,6 +237,7 @@ public class Messager extends Log implements DocErrorReporter { return; } + PrintWriter noticeWriter = getWriter(WriterKind.NOTICE); if (pos == null) noticeWriter.println(msg); else diff --git a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java index cd07780c6ae..5b5b5881682 100644 --- a/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java +++ b/langtools/src/jdk.javadoc/share/classes/com/sun/tools/javadoc/main/Start.java @@ -158,7 +158,7 @@ public class Start extends ToolOption.Helper { if (log instanceof Messager) messager = (Messager) log; else { - PrintWriter out = context.get(Log.outKey); + PrintWriter out = context.get(Log.errKey); messager = (out == null) ? new Messager(context, javadocName) : new Messager(context, javadocName, out, out, out); } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTool.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTool.java index 8b91c15df2e..f85a52bfaeb 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTool.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/api/JavadocTool.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2012, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2012, 2016, 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 @@ -107,11 +107,11 @@ public class JavadocTool implements DocumentationTool { context.put(DiagnosticListener.class, ccw.wrap(diagnosticListener)); if (out == null) - context.put(Log.outKey, new PrintWriter(System.err, true)); + context.put(Log.errKey, new PrintWriter(System.err, true)); else if (out instanceof PrintWriter) - context.put(Log.outKey, ((PrintWriter) out)); + context.put(Log.errKey, ((PrintWriter) out)); else - context.put(Log.outKey, new PrintWriter(out, true)); + context.put(Log.errKey, new PrintWriter(out, true)); if (fileManager == null) { fileManager = getStandardFileManager(diagnosticListener, null, null); @@ -141,7 +141,7 @@ public class JavadocTool implements DocumentationTool { PrintWriter pw = (charset == null) ? new PrintWriter(System.err, true) : new PrintWriter(new OutputStreamWriter(System.err, charset), true); - context.put(Log.outKey, pw); + context.put(Log.errKey, pw); return new JavacFileManager(context, true, charset); } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java index 4c289cccdde..f2251e30afc 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/HtmlDoclet.java @@ -275,6 +275,7 @@ public class HtmlDoclet extends AbstractDoclet { int i = 0; for (ModuleElement mdle : mdles) { ModulePackageIndexFrameWriter.generate(configuration, mdle); + ModuleFrameWriter.generate(configuration, mdle); nextModule = (i + 1 < mdles.size()) ? mdles.get(i + 1) : null; AbstractBuilder moduleSummaryBuilder = configuration.getBuilderFactory().getModuleSummaryBuilder( diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java new file mode 100644 index 00000000000..3f25c5d334d --- /dev/null +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleFrameWriter.java @@ -0,0 +1,204 @@ +/* + * Copyright (c) 2016, 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. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * 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. + */ + +package jdk.javadoc.internal.doclets.formats.html; + +import java.io.*; +import java.util.*; + +import javax.lang.model.element.ModuleElement; +import javax.lang.model.element.PackageElement; +import javax.lang.model.element.TypeElement; +import javax.lang.model.util.ElementFilter; + +import jdk.javadoc.internal.doclets.formats.html.markup.HtmlConstants; +import jdk.javadoc.internal.doclets.formats.html.markup.HtmlStyle; +import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTag; +import jdk.javadoc.internal.doclets.formats.html.markup.HtmlTree; +import jdk.javadoc.internal.doclets.formats.html.markup.StringContent; +import jdk.javadoc.internal.doclets.toolkit.Content; +import jdk.javadoc.internal.doclets.toolkit.util.DocPaths; +import jdk.javadoc.internal.doclets.toolkit.util.DocletAbortException; + + +/** + * Class to generate file for each module contents in the left-hand bottom + * frame. This will list all the Class Kinds in the module. A click on any + * class-kind will update the right-hand frame with the clicked class-kind page. + * + * <p><b>This is NOT part of any supported API. + * If you write code that depends on this, you do so at your own risk. + * This code and its internal interfaces are subject to change or + * deletion without notice.</b> + * + * @author Bhavesh Patel + */ +public class ModuleFrameWriter extends HtmlDocletWriter { + + /** + * The module being documented. + */ + private ModuleElement mdle; + + /** + * The classes to be documented. Use this to filter out classes + * that will not be documented. + */ + private SortedSet<TypeElement> documentedClasses; + + /** + * Constructor to construct ModuleFrameWriter object and to generate + * "module_name-type-frame.html" file. For example for module "java.base" this will generate file + * "java.base-type-frame.html" file. + * + * @param configuration the configuration of the doclet. + * @param moduleElement moduleElement under consideration. + */ + public ModuleFrameWriter(ConfigurationImpl configuration, ModuleElement moduleElement) + throws IOException { + super(configuration, DocPaths.moduleTypeFrame(moduleElement)); + this.mdle = moduleElement; + if (utils.getSpecifiedPackages().isEmpty()) { + documentedClasses = new TreeSet<>(utils.makeGeneralPurposeComparator()); + documentedClasses.addAll(configuration.docEnv.getIncludedClasses()); + } + } + + /** + * Generate a module type summary page for the left-hand bottom frame. + * + * @param configuration the current configuration of the doclet. + * @param moduleElement The package for which "module_name-type-frame.html" is to be generated. + */ + public static void generate(ConfigurationImpl configuration, ModuleElement moduleElement) { + ModuleFrameWriter mdlgen; + try { + mdlgen = new ModuleFrameWriter(configuration, moduleElement); + String mdlName = moduleElement.getQualifiedName().toString(); + Content mdlLabel = new StringContent(mdlName); + HtmlTree body = mdlgen.getBody(false, mdlgen.getWindowTitle(mdlName)); + HtmlTree htmlTree = (configuration.allowTag(HtmlTag.MAIN)) + ? HtmlTree.MAIN() + : body; + Content heading = HtmlTree.HEADING(HtmlConstants.TITLE_HEADING, HtmlStyle.bar, + mdlgen.getHyperLink(DocPaths.moduleSummary(moduleElement), mdlLabel, "", "classFrame")); + htmlTree.addContent(heading); + HtmlTree div = new HtmlTree(HtmlTag.DIV); + div.addStyle(HtmlStyle.indexContainer); + mdlgen.addClassListing(div); + htmlTree.addContent(div); + if (configuration.allowTag(HtmlTag.MAIN)) { + body.addContent(htmlTree); + } + mdlgen.printHtmlDocument( + configuration.metakeywords.getMetaKeywordsForModule(moduleElement), false, body); + mdlgen.close(); + } catch (IOException exc) { + configuration.standardmessage.error( + "doclet.exception_encountered", + exc.toString(), DocPaths.moduleTypeFrame(moduleElement).getPath()); + throw new DocletAbortException(exc); + } + } + + /** + * Add class listing for all the classes in this module. Divide class + * listing as per the class kind and generate separate listing for + * Classes, Interfaces, Exceptions and Errors. + * + * @param contentTree the content tree to which the listing will be added + */ + protected void addClassListing(HtmlTree contentTree) { + List<PackageElement> packagesIn = ElementFilter.packagesIn(mdle.getEnclosedElements()); + SortedSet<TypeElement> interfaces = new TreeSet<>(utils.makeGeneralPurposeComparator()); + SortedSet<TypeElement> classes = new TreeSet<>(utils.makeGeneralPurposeComparator()); + SortedSet<TypeElement> enums = new TreeSet<>(utils.makeGeneralPurposeComparator()); + SortedSet<TypeElement> exceptions = new TreeSet<>(utils.makeGeneralPurposeComparator()); + SortedSet<TypeElement> errors = new TreeSet<>(utils.makeGeneralPurposeComparator()); + SortedSet<TypeElement> annotationTypes = new TreeSet<>(utils.makeGeneralPurposeComparator()); + for (PackageElement pkg : packagesIn) { + if (utils.isIncluded(pkg)) { + interfaces.addAll(utils.getInterfaces(pkg)); + classes.addAll(utils.getOrdinaryClasses(pkg)); + enums.addAll(utils.getEnums(pkg)); + exceptions.addAll(utils.getExceptions(pkg)); + errors.addAll(utils.getErrors(pkg)); + annotationTypes.addAll(utils.getAnnotationTypes(pkg)); + } + } + addClassKindListing(interfaces, getResource("doclet.Interfaces"), contentTree); + addClassKindListing(classes, getResource("doclet.Classes"), contentTree); + addClassKindListing(enums, getResource("doclet.Enums"), contentTree); + addClassKindListing(exceptions, getResource("doclet.Exceptions"), contentTree); + addClassKindListing(errors, getResource("doclet.Errors"), contentTree); + addClassKindListing(annotationTypes, getResource("doclet.AnnotationTypes"), contentTree); + } + + /** + * Add specific class kind listing. Also add label to the listing. + * + * @param list Iterable list of TypeElements + * @param labelContent content tree of the label to be added + * @param contentTree the content tree to which the class kind listing will be added + */ + protected void addClassKindListing(Iterable<TypeElement> list, Content labelContent, + HtmlTree contentTree) { + SortedSet<TypeElement> tset = utils.filterOutPrivateClasses(list, configuration.javafx); + if (!tset.isEmpty()) { + boolean printedHeader = false; + HtmlTree htmlTree = (configuration.allowTag(HtmlTag.SECTION)) + ? HtmlTree.SECTION() + : contentTree; + HtmlTree ul = new HtmlTree(HtmlTag.UL); + ul.setTitle(labelContent); + for (TypeElement typeElement : tset) { + if (documentedClasses != null && !documentedClasses.contains(typeElement)) { + continue; + } + if (!utils.isCoreClass(typeElement) || !configuration.isGeneratedDoc(typeElement)) { + continue; + } + if (!printedHeader) { + Content heading = HtmlTree.HEADING(HtmlConstants.CONTENT_HEADING, + true, labelContent); + htmlTree.addContent(heading); + printedHeader = true; + } + Content arr_i_name = new StringContent(utils.getSimpleName(typeElement)); + if (utils.isInterface(typeElement)) { + arr_i_name = HtmlTree.SPAN(HtmlStyle.interfaceName, arr_i_name); + } + Content link = getLink(new LinkInfoImpl(configuration, + LinkInfoImpl.Kind.ALL_CLASSES_FRAME, typeElement).label(arr_i_name).target("classFrame")); + Content li = HtmlTree.LI(link); + ul.addContent(li); + } + htmlTree.addContent(ul); + if (configuration.allowTag(HtmlTag.SECTION)) { + contentTree.addContent(htmlTree); + } + } + } +} diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java index 38bd8ccfb81..ce18032a117 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/ModuleIndexFrameWriter.java @@ -110,15 +110,13 @@ public class ModuleIndexFrameWriter extends AbstractModuleIndexWriter { /** * Returns each module name as a separate link. * - * @param moduleName the module being documented + * @param mdle the module being documented * @return content for the module link */ protected Content getModuleLink(ModuleElement mdle) { Content moduleLinkContent; - Content moduleLabel; - moduleLabel = new StringContent(mdle.getQualifiedName().toString()); - moduleLinkContent = getHyperLink(DocPaths.moduleFrame(mdle), - moduleLabel, "", "packageListFrame"); + Content mdlLabel = new StringContent(mdle.getQualifiedName()); + moduleLinkContent = getModuleFramesHyperLink(mdle, mdlLabel, "packageListFrame"); Content li = HtmlTree.LI(moduleLinkContent); return li; } diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java index 69ae2aa5c0e..35b8eedccc7 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlAttr.java @@ -49,6 +49,7 @@ public enum HtmlAttr { ID, LANG, NAME, + ONCLICK, ONLOAD, REL, ROLE, diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java index d7aec841525..080041e1b6a 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/markup/HtmlDocWriter.java @@ -28,6 +28,7 @@ package jdk.javadoc.internal.doclets.formats.html.markup; import java.io.*; import java.util.*; +import javax.lang.model.element.ModuleElement; import javax.lang.model.element.PackageElement; import javax.lang.model.element.TypeElement; @@ -282,6 +283,21 @@ public abstract class HtmlDocWriter extends HtmlWriter { return anchor; } + public Content getModuleFramesHyperLink(ModuleElement mdle, Content label, String target) { + DocLink mdlLink = new DocLink(DocPaths.moduleFrame(mdle)); + DocLink mtFrameLink = new DocLink(DocPaths.moduleTypeFrame(mdle)); + DocLink cFrameLink = new DocLink(DocPaths.moduleSummary(mdle)); + HtmlTree anchor = HtmlTree.A(mdlLink.toString(), label); + StringBuilder onclickStr = new StringBuilder("updateModuleFrame('") + .append(mtFrameLink.toString()) + .append("','") + .append(cFrameLink.toString()) + .append("');"); + anchor.addAttr(HtmlAttr.TARGET, target); + anchor.addAttr(HtmlAttr.ONCLICK, onclickStr.toString()); + return anchor; + } + /** * Get the enclosed name of the package * diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js index 98a31fe8544..a12a61e3120 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/resources/script.js @@ -107,3 +107,9 @@ function updateTabs(type) } } } + +function updateModuleFrame(pFrame, cFrame) +{ + top.packageFrame.location = pFrame; + top.classFrame.location = cFrame; +} diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java index 57956f9e3af..f679e87d0a9 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/DocPaths.java @@ -155,6 +155,11 @@ public class DocPaths { return DocPath.create(mdle.getQualifiedName() + "-summary.html"); } + /** The name of the file for the module frame. */ + public static DocPath moduleTypeFrame(ModuleElement mdle) { + return DocPath.create(mdle.getQualifiedName() + "-type-frame.html"); + } + /** The name of the file for the module overview frame. */ public static final DocPath MODULE_OVERVIEW_FRAME = DocPath.create("module-overview-frame.html"); diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Messager.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Messager.java index d251569532c..0da657f3d1c 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Messager.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Messager.java @@ -165,8 +165,8 @@ public class Messager extends Log implements Reporter { /** * Constructor * @param programName Name of the program (for error messages). - * @param outWriter Stream for notices etc. - * @param errWriter Stream for errors and warnings + * @param stdOut Stream for notices etc. + * @param stdErr Stream for errors and warnings */ @SuppressWarnings("deprecation") public Messager(Context context, String programName, PrintWriter outWriter, PrintWriter errWriter) { @@ -254,6 +254,7 @@ public class Messager extends Log implements Reporter { private void incrementErrorCount(String prefix, String msg) { if (nerrors < MaxErrors) { + PrintWriter errWriter = getWriter(WriterKind.ERROR); errWriter.println(prefix + ": " + getText("javadoc.error") + " - " + msg); errWriter.flush(); prompt(); @@ -291,6 +292,7 @@ public class Messager extends Log implements Reporter { private void incrementWarningCount(String prefix, String msg) { if (nwarnings < MaxWarnings) { + PrintWriter warnWriter = getWriter(WriterKind.WARNING); warnWriter.println(prefix + ": " + getText("javadoc.warning") + " - " + msg); warnWriter.flush(); nwarnings++; @@ -314,6 +316,7 @@ public class Messager extends Log implements Reporter { return; } + PrintWriter noticeWriter = getWriter(WriterKind.NOTICE); if (path == null) { noticeWriter.println(msg); } else { @@ -329,6 +332,7 @@ public class Messager extends Log implements Reporter { return; } + PrintWriter noticeWriter = getWriter(WriterKind.NOTICE); if (e == null) { noticeWriter.println(msg); } else { diff --git a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java index ca96d6cb87b..30fdb0ba645 100644 --- a/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java +++ b/langtools/src/jdk.javadoc/share/classes/jdk/javadoc/internal/tool/Start.java @@ -155,7 +155,7 @@ public class Start extends ToolOption.Helper { if (log instanceof Messager) { messager = (Messager) log; } else { - PrintWriter out = context.get(Log.outKey); + PrintWriter out = context.get(Log.errKey); messager = (out == null) ? new Messager(context, ProgramName) : new Messager(context, ProgramName, out, out); diff --git a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapFileManager.java b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapFileManager.java index cf491bf83fa..65976b2c27a 100644 --- a/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapFileManager.java +++ b/langtools/src/jdk.jdeps/share/classes/com/sun/tools/javap/JavapFileManager.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2007, 2012, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2007, 2016, 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 @@ -52,7 +52,7 @@ public class JavapFileManager extends JavacFileManager { if (dl != null) javac_context.put(DiagnosticListener.class, dl); - javac_context.put(com.sun.tools.javac.util.Log.outKey, log); + javac_context.put(com.sun.tools.javac.util.Log.errKey, log); return new JavapFileManager(javac_context, null); } diff --git a/langtools/src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java b/langtools/src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java index 2ae696a026f..10a00697231 100644 --- a/langtools/src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java +++ b/langtools/src/jdk.jshell/share/classes/jdk/jshell/CompletenessAnalyzer.java @@ -110,14 +110,13 @@ class CompletenessAnalyzer { private static CaLog createLog(Context context) { PrintWriter pw = new PrintWriter(new StringWriter()); - CaLog log = new CaLog(context, pw, pw, pw); - context.put(outKey, pw); + CaLog log = new CaLog(context, pw); context.put(logKey, log); return log; } - private CaLog(Context context, PrintWriter errWriter, PrintWriter warnWriter, PrintWriter noticeWriter) { - super(context, errWriter, warnWriter, noticeWriter); + private CaLog(Context context, PrintWriter pw) { + super(context, pw); } @Override diff --git a/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java b/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java index b9648811d6b..3d9234a34d2 100644 --- a/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java +++ b/langtools/test/jdk/javadoc/doclet/testModules/TestModules.java @@ -23,7 +23,7 @@ /* * @test - * @bug 8154119 8154262 8156077 8157987 8154261 + * @bug 8154119 8154262 8156077 8157987 8154261 8154817 * @summary Test modules support in javadoc. * @author bpatel * @library ../lib @@ -50,6 +50,8 @@ public class TestModules extends JavadocTester { testNoDescription(false); testOverviewSummaryModules(); testModuleLink(); + testModuleClickThroughLinks(); + testModuleClickThrough(true); } @Test @@ -63,6 +65,8 @@ public class TestModules extends JavadocTester { testHtml5NoDescription(false); testHtml5OverviewSummaryModules(); testModuleLink(); + testModuleClickThroughLinks(); + testModuleClickThrough(true); } @Test @@ -96,6 +100,7 @@ public class TestModules extends JavadocTester { "testpkgnomodule", "testpkgnomodule1"); checkExit(Exit.OK); testOverviewSummaryPackages(); + testModuleClickThrough(false); } @Test @@ -442,4 +447,27 @@ public class TestModules extends JavadocTester { + "<!-- -->\n" + "</a>"); } + + void testModuleClickThroughLinks() { + checkOutput("module-overview-frame.html", true, + "<li><a href=\"module1-frame.html\" target=\"packageListFrame\" " + + "onclick=\"updateModuleFrame('module1-type-frame.html','module1-summary.html');" + + "\">module1</a></li>"); + checkOutput("module-overview-frame.html", true, + "<li><a href=\"module2-frame.html\" target=\"packageListFrame\" " + + "onclick=\"updateModuleFrame('module2-type-frame.html','module2-summary.html');" + + "\">module2</a></li>"); + checkOutput("script.js", true, + "function updateModuleFrame(pFrame, cFrame)\n" + + "{\n" + + " top.packageFrame.location = pFrame;\n" + + " top.classFrame.location = cFrame;\n" + + "}"); +} + + void testModuleClickThrough(boolean found) { + checkFiles(found, + "module1-type-frame.html", + "module2-type-frame.html"); + } } diff --git a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/ReflectionTest.java b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/ReflectionTest.java index bfebfbae9bb..cd57377acdf 100644 --- a/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/ReflectionTest.java +++ b/langtools/test/tools/javac/annotations/repeatingAnnotations/combo/ReflectionTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /** * @test - * @bug 8001457 8027477 + * @bug 8001457 8027477 8163113 * @author sogoel * @summary Reflection api tests * @modules jdk.compiler @@ -483,17 +483,17 @@ public class ReflectionTest { BasicContainer_Legacy( "@ExpectedBase(value = Foo.class, " + "getAnnotationVal = \"NULL\"," - + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnoVal = \"NULL\", " + "getAnnosArgs = {}, " + "getDeclAnnosArgs = {} )", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " - + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnoVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"} )") { + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnoVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"} )") { @Override public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, @@ -583,21 +583,21 @@ public class ReflectionTest { "@ExpectedBase(value = Foo.class, " + "getAnnotationVal = \"@Foo(value=0)\"," + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnoVal = \"@Foo(value=0)\", " + "getAnnosArgs = {\"@Foo(value=0)\"}, " + "getDeclAnnosArgs = {\"@Foo(value=0)\"} )", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnoVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"} )") { + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnoVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"} )") { @Override public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, @@ -691,17 +691,17 @@ public class ReflectionTest { BasicContainer_Inherited_Legacy( "@ExpectedBase(value = Foo.class, " + "getAnnotationVal = \"NULL\"," - + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\"}, " + "getDeclAnnoVal = \"NULL\", " + "getAnnosArgs = {}, " + "getDeclAnnosArgs = {} )", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " - + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\"}, " + "getDeclAnnoVal = \"NULL\", " - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosArgs = {} )") { @Override @@ -765,18 +765,18 @@ public class ReflectionTest { "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"@Foo(value=0)\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", \"@Foo(value=0)\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", \"@Foo(value=0)\"}, " + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\"}," + "getDeclAnnoVal = \"@Foo(value=0)\"," + "getAnnosArgs = {\"@Foo(value=0)\"}," + "getDeclAnnosArgs = {\"@Foo(value=0)\"})", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", \"@Foo(value=0)\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", \"@Foo(value=0)\"}, " + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\"}," + "getDeclAnnoVal = \"NULL\"," - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + "getDeclAnnosArgs = {})") { @Override @@ -844,18 +844,18 @@ public class ReflectionTest { "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"@Foo(value=0)\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", \"@Foo(value=0)\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", \"@Foo(value=0)\"}, " + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\"}," + "getDeclAnnoVal = \"@Foo(value=0)\"," + "getAnnosArgs = {\"@Foo(value=0)\"}," + "getDeclAnnosArgs = {\"@Foo(value=0)\"})", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", \"@Foo(value=0)\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", \"@Foo(value=0)\"}, " + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\"}," + "getDeclAnnoVal = \"NULL\"," - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + "getDeclAnnosArgs = {})") { @Override @@ -923,19 +923,19 @@ public class ReflectionTest { "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"@Foo(value=0)\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + "getDeclAnnoVal = \"NULL\"," + "getAnnosArgs = {\"@Foo(value=0)\"}," + "getDeclAnnosArgs = {})", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," - + "getDeclAnnoVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"," - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," - + "getDeclAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"})") { + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + + "getDeclAnnoVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"," + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + + "getDeclAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"})") { @Override public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, @@ -1000,21 +1000,21 @@ public class ReflectionTest { "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"@Foo(value=3)\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", \"@Foo(value=3)\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", \"@Foo(value=3)\"}, " + "getDeclAnnosVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", \"@Foo(value=3)\"}," + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", \"@Foo(value=3)\"}," + "getDeclAnnoVal = \"@Foo(value=3)\"," + "getAnnosArgs = {\"@Foo(value=3)\"}," + "getDeclAnnosArgs = {\"@Foo(value=3)\"})", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", \"@Foo(value=3)\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", \"@Foo(value=3)\"}, " + "getDeclAnnosVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", \"@Foo(value=3)\"}," - + "getDeclAnnoVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"," - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," - + "getDeclAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"})") { + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", \"@Foo(value=3)\"}," + + "getDeclAnnoVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"," + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + + "getDeclAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"})") { @Override public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, @@ -1077,18 +1077,18 @@ public class ReflectionTest { BasicRepeatable( "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"NULL\", " - + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\" }, " - + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\" }, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + "getDeclAnnoVal = \"NULL\"," + "getAnnosArgs = {\"@Foo(value=1)\", \"@Foo(value=2)\"}," + "getDeclAnnosArgs = {\"@Foo(value=1)\", \"@Foo(value=2)\"})", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"," - + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," - + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnoVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"," - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," - + "getDeclAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"} )") { + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"," + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnoVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"," + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + + "getDeclAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"} )") { @Override public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, @@ -1179,21 +1179,21 @@ public class ReflectionTest { "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"NULL\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + "getDeclAnnoVal = \"NULL\"," + "getAnnosArgs = {\"@Foo(value=1)\", \"@Foo(value=2)\"}," + "getDeclAnnosArgs = {\"@Foo(value=1)\", \"@Foo(value=2)\"})", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"," + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"," + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + "getDeclAnnosVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnoVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"," - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," - + "getDeclAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"} )") { + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnoVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"," + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + + "getDeclAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"} )") { @Override public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, @@ -1283,17 +1283,17 @@ public class ReflectionTest { BasicContainerRepeatable_Inherited( "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"NULL\", " - + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\"}, " + "getDeclAnnoVal = \"NULL\", " + "getAnnosArgs = {\"@Foo(value=1)\", \"@Foo(value=2)\"}, " + "getDeclAnnosArgs = {})", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " - + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosVals = { \"ExpectedBase\", \"ExpectedContainer\"}, " + "getDeclAnnoVal = \"NULL\", " - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosArgs = {})") { @Override @@ -1356,7 +1356,7 @@ public class ReflectionTest { RepeatableAnnoInherited( "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"NULL\", " - + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\"}, " + // ignores inherited annotations "getDeclAnnoVal = \"NULL\", " @@ -1364,13 +1364,13 @@ public class ReflectionTest { "getAnnosArgs = {\"@Foo(value=1)\", \"@Foo(value=2)\"}, " + "getDeclAnnosArgs = {})", // ignores inherited "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " - + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + + "getAnnotationsVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosVals = { \"ExpectedBase\", \"ExpectedContainer\"}, " + // ignores inherited annotations "getDeclAnnoVal = \"NULL\", " + // ignores inherited - "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosArgs = {})") { // ignores inherited @Override @@ -1436,21 +1436,21 @@ public class ReflectionTest { "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"@Foo(value=0)\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + "getDeclAnnosVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + "getDeclAnnoVal = \"@Foo(value=0)\"," + "getAnnosArgs = {\"@Foo(value=0)\", \"@Foo(value=1)\", \"@Foo(value=2)\"}," + "getDeclAnnosArgs = {\"@Foo(value=0)\", \"@Foo(value=1)\",\"@Foo(value=2)\"})", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + "getDeclAnnosVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnoVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"," - + "getDeclAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"})") { + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnoVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"," + + "getDeclAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"})") { @Override public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, @@ -1624,7 +1624,7 @@ public class ReflectionTest { "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"@Foo(value=3)\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=3)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=3)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + //override every annotation on superClass "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=3)\"}, " + // ignores inherited annotations @@ -1632,13 +1632,13 @@ public class ReflectionTest { + "getAnnosArgs = {\"@Foo(value=3)\"}, " + "getDeclAnnosArgs = { \"@Foo(value=3)\" })", // ignores inherited "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=3)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=3)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=3)\"}, " + // ignores inherited annotations "getDeclAnnoVal = \"NULL\", " - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosArgs = {}) // ignores inherited ") { @Override @@ -1704,22 +1704,22 @@ public class ReflectionTest { "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"@Foo(value=0)\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + //override every annotation on superClass - "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + // ignores inherited annotations "getDeclAnnoVal = \"NULL\","// ignores inherited + "getAnnosArgs = {\"@Foo(value=1)\", \"@Foo(value=2)\"}, " + "getDeclAnnosArgs = { \"@Foo(value=1)\", \"@Foo(value=2)\"})", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + // ignores inherited annotations - "getDeclAnnoVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", "// ignores inherited - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"})") { + "getDeclAnnoVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", "// ignores inherited + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"})") { @Override public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, @@ -1785,18 +1785,18 @@ public class ReflectionTest { "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"@Foo(value=0)\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\"}," + "getDeclAnnoVal = \"@Foo(value=0)\"," + "getAnnosArgs = {\"@Foo(value=0)\"}," + "getDeclAnnosArgs = {\"@Foo(value=0)\"})", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\"}," + "getDeclAnnoVal = \"NULL\"," - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + "getDeclAnnosArgs = {})") { @Override @@ -1863,19 +1863,19 @@ public class ReflectionTest { "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"@Foo(value=0)\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + "getDeclAnnoVal = \"NULL\"," + "getAnnosArgs = {\"@Foo(value=1)\", \"@Foo(value=2)\"}," + "getDeclAnnosArgs = {\"@Foo(value=1)\", \"@Foo(value=2)\"})", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " - + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," - + "getDeclAnnoVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"," - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," - + "getDeclAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"})") { + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + + "getDeclAnnoVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"," + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + + "getDeclAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"})") { @Override public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, @@ -1941,21 +1941,21 @@ public class ReflectionTest { "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"@Foo(value=3)\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", \"@Foo(value=3)\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", \"@Foo(value=3)\"}, " + "getDeclAnnosVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", \"@Foo(value=3)\"}," + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", \"@Foo(value=3)\"}," + "getDeclAnnoVal = \"@Foo(value=3)\"," + "getAnnosArgs = {\"@Foo(value=1)\", \"@Foo(value=2)\", \"@Foo(value=3)\"}," + "getDeclAnnosArgs = {\"@Foo(value=1)\", \"@Foo(value=2)\", \"@Foo(value=3)\"})", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", \"@Foo(value=3)\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", \"@Foo(value=3)\"}, " + "getDeclAnnosVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", \"@Foo(value=3)\"}," - + "getDeclAnnoVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"," - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," - + "getDeclAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"})") { + + "\"ExpectedBase\", \"ExpectedContainer\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", \"@Foo(value=3)\"}," + + "getDeclAnnoVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"," + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + + "getDeclAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"})") { @Override public Iterable<? extends JavaFileObject> getTestFiles(SrcType srcType, @@ -2021,18 +2021,18 @@ public class ReflectionTest { "@ExpectedBase(value=Foo.class, " + "getAnnotationVal = \"@Foo(value=0)\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\"}," + "getDeclAnnoVal = \"@Foo(value=0)\"," + "getAnnosArgs = {\"@Foo(value=0)\"}," + "getDeclAnnosArgs = {\"@Foo(value=0)\"})", "@ExpectedContainer(value=FooContainer.class, " - + "getAnnotationVal = \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\", " + + "getAnnotationVal = \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\", " + "getAnnotationsVals = {" - + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}, " + + "\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\", \"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}, " + "getDeclAnnosVals = {\"ExpectedBase\", \"ExpectedContainer\", \"@Foo(value=0)\"}," + "getDeclAnnoVal = \"NULL\"," - + "getAnnosArgs = {\"@FooContainer(value=[@Foo(value=1), @Foo(value=2)])\"}," + + "getAnnosArgs = {\"@FooContainer(value={@Foo(value=1), @Foo(value=2)})\"}," + "getDeclAnnosArgs = {})") { @Override diff --git a/langtools/test/tools/javac/lib/DPrinter.java b/langtools/test/tools/javac/lib/DPrinter.java index 49320b1152e..2aaa848fe93 100644 --- a/langtools/test/tools/javac/lib/DPrinter.java +++ b/langtools/test/tools/javac/lib/DPrinter.java @@ -138,7 +138,7 @@ public class DPrinter { protected DPrinter(Context context) { context.put(DPrinter.class, this); - out = context.get(Log.outKey); + out = context.get(Log.logKey).getWriter(Log.WriterKind.STDERR); trees = JavacTrees.instance(context); } diff --git a/langtools/test/tools/javac/lib/combo/ReusableContext.java b/langtools/test/tools/javac/lib/combo/ReusableContext.java index 2d24145e8c5..7550c760265 100644 --- a/langtools/test/tools/javac/lib/combo/ReusableContext.java +++ b/langtools/test/tools/javac/lib/combo/ReusableContext.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2015, 2016, 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 @@ -83,6 +83,7 @@ class ReusableContext extends Context implements TaskListener { drop(Arguments.argsKey); drop(DiagnosticListener.class); drop(Log.outKey); + drop(Log.errKey); drop(JavaFileManager.class); drop(JavacTask.class); diff --git a/langtools/test/tools/javac/main/StreamsTest.java b/langtools/test/tools/javac/main/StreamsTest.java new file mode 100644 index 00000000000..a47e98fa295 --- /dev/null +++ b/langtools/test/tools/javac/main/StreamsTest.java @@ -0,0 +1,155 @@ +/* + * Copyright (c) 2016, 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 8162359 + * @summary extra space in javac -help for -J and @ options + * @modules jdk.compiler + * @library /tools/lib + * @build toolbox.TestRunner toolbox.ToolBox + * @run main StreamsTest + */ + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.PrintStream; +import java.nio.file.Path; +import java.nio.file.Paths; +import java.util.List; + +import static java.util.Arrays.asList; + +import toolbox.TestRunner; +import toolbox.ToolBox; + +public class StreamsTest extends TestRunner { + public static void main(String... args) throws Exception { + new StreamsTest().runTests(m -> new Object[] { Paths.get(m.getName()) }); + } + + StreamsTest() { + super(System.err); + } + + ToolBox tb = new ToolBox(); + static final String LINESEP = System.getProperty("line.separator"); + + @Test // errors should be written to stderr + public void testError(Path base) throws Exception { + Path src = base.resolve("src"); + Path classes = base.resolve("classes"); + tb.writeJavaFiles(src, + "import java.util.*; class C { # }"); + test(asList("-d", classes.toString(), src.resolve("C.java").toString()), + null, "illegal character: '#'"); + } + + @Test // warnings should be written to stderr + public void testWarning(Path base) throws Exception { + Path src = base.resolve("src"); + Path classes = base.resolve("classes"); + tb.writeJavaFiles(src, + "import java.util.*; class C { List list = new ArrayList(); }"); + test(asList("-d", classes.toString(), "-Xlint", src.resolve("C.java").toString()), + null, "warning: [rawtypes]"); + } + + @Test // notes should be written to stderr + public void testNote(Path base) throws Exception { + Path src = base.resolve("src"); + Path classes = base.resolve("classes"); + tb.writeJavaFiles(src, + "import java.util.*; class C { List<String> list = (List<String>) new ArrayList(); }"); + test(asList("-d", classes.toString(), src.resolve("C.java").toString()), + null, "uses unchecked or unsafe operations."); + } + + @Test // help output should be written to stdout + public void testHelp(Path base) throws Exception { + test(asList("-help"), "Usage: javac <options> <source files>", null); + } + + @Test // version output should be written to stdout + public void testVersion(Path base) throws Exception { + test(asList("-version"), "javac", null); + } + + @Test // version output should be written to stdout + public void testFullVersion(Path base) throws Exception { + test(asList("-fullversion"), "javac full version", null); + } + + /** + * Run javac as though run from the command line (but avoiding the entry point that + * calls System.exit()), and that that expected output appears on appropriate output streams. + * @param options the command-line options for javac + * @param expectOut a string that should be contained in the output generated on stdout, + * or null, if no output should be generated to stdout + * @param expectErra string that should be contained in the output generated on stderr, + * or null, if no output should be generated to stderr + * @throws IOException if a problem occurs while setting up the streams + */ + void test(List<String> options, String expectOut, String expectErr) throws IOException { + out.println("test " + options); + ByteArrayOutputStream bsOut = new ByteArrayOutputStream(); + ByteArrayOutputStream bsErr = new ByteArrayOutputStream(); + try (PrintStream psOut = new PrintStream(bsOut); PrintStream psErr = new PrintStream(bsErr)) { + int rc; + PrintStream saveOut = System.out; + PrintStream saveErr = System.err; + try { + System.setOut(psOut); + System.setErr(psErr); + rc = com.sun.tools.javac.Main.compile(options.toArray(new String[0])); + } finally { + System.setErr(saveErr); + System.setOut(saveOut); + } + System.err.println("javac exit code: " + rc); + } + check("stdout", bsOut.toString(), expectOut); + check("stderr", bsErr.toString(), expectErr); + } + + /** + * Check that output is as expected. + * @param name the name of the stream on which the output was found + * @param actual the contents written to the stream + * @param expect string that should be contained in the output, or null, if the output should be empty + */ + void check(String name, String actual, String expect) { + out.println("Check " + name); + out.println("Expected: " + (expect == null ? "(nothing)" : expect)); + out.println("Actual:"); + out.println(actual.replace("\n", LINESEP)); + if (expect == null) { + if (!actual.isEmpty()) { + error(name + ": unexpected output"); + } + } else if (!actual.contains(expect)) { + error(name + ": expected output not found"); + } + } +} + diff --git a/langtools/test/tools/javac/modules/ModuleTestBase.java b/langtools/test/tools/javac/modules/ModuleTestBase.java index d1dcfa9fb6a..8da371c70e6 100644 --- a/langtools/test/tools/javac/modules/ModuleTestBase.java +++ b/langtools/test/tools/javac/modules/ModuleTestBase.java @@ -71,10 +71,4 @@ public class ModuleTestBase extends TestRunner { Path[] findJavaFiles(Path... paths) throws IOException { return tb.findJavaFiles(paths); } - - void error(String message) { - out.println("Error: " + message); - errors++; - } - } diff --git a/langtools/test/tools/javac/newlines/NewLineTest.java b/langtools/test/tools/javac/newlines/NewLineTest.java index 280e157b348..b1567d363b0 100644 --- a/langtools/test/tools/javac/newlines/NewLineTest.java +++ b/langtools/test/tools/javac/newlines/NewLineTest.java @@ -42,17 +42,23 @@ import toolbox.Task; import toolbox.ToolBox; //original test: test/tools/javac/newlines/Newlines.sh +/* + * Checks that the usage message, contained in the properties in the + * resource file javac.properties, is correctly rendered, including + * embedded newlines in the resource strings. For more context, + * see JDK-4110560. + */ public class NewLineTest { public static void main(String args[]) throws Exception { ToolBox tb = new ToolBox(); - File javacErrOutput = new File("output.txt"); + File javacOutput = new File("output.txt"); new JavacTask(tb, Task.Mode.EXEC) - .redirect(Task.OutputKind.STDERR, javacErrOutput.getPath()) + .redirect(Task.OutputKind.STDOUT, javacOutput.getPath()) .options("-J-Dline.separator='@'") .run(Task.Expect.FAIL); - List<String> lines = Files.readAllLines(javacErrOutput.toPath(), + List<String> lines = Files.readAllLines(javacOutput.toPath(), Charset.defaultCharset()); if (lines.size() != 1) { throw new AssertionError("The compiler output should have one line only"); diff --git a/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java b/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java index c22dfcb047e..c6014ae3c2d 100644 --- a/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java +++ b/langtools/test/tools/javac/processing/model/element/TestMissingElement/TestMissingElement.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2011, 2016, 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 @@ -49,7 +49,7 @@ public class TestMissingElement extends JavacTestingAbstractProcessor { @Override public void init(ProcessingEnvironment env) { super.init(env); - out = ((JavacProcessingEnvironment) env).getContext().get(Log.outKey); + out = ((JavacProcessingEnvironment) env).getContext().get(Log.logKey).getWriter(Log.WriterKind.STDERR); } @Override diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerBasicTest.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerBasicTest.java index d1f2a3c03d9..10dc03aed05 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerBasicTest.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerBasicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -57,8 +57,8 @@ }) @ExpectedContainer( value = BarContainer.class, - getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", - getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + getAnnotation = "@BarContainer(value={@Bar(value=1), @Bar(value=2)})", + getAnnotationsByType = {"@BarContainer(value={@Bar(value=1), @Bar(value=2)})"}) @Bar(value = 0) @BarContainer(value = {@Bar(value = 1), @Bar(value = 2)}) class MixRepeatableAndOfficialContainerBasicTest { @@ -85,8 +85,8 @@ class MixRepeatableAndOfficialContainerBasicTest { }) @ExpectedContainer( value = BarContainer.class, - getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", - getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + getAnnotation = "@BarContainer(value={@Bar(value=1), @Bar(value=2)})", + getAnnotationsByType = {"@BarContainer(value={@Bar(value=1), @Bar(value=2)})"}) @Bar(value = 0) @BarContainer(value = {@Bar(value = 1), @Bar(value = 2)}) int testField = 0; @@ -113,8 +113,8 @@ class MixRepeatableAndOfficialContainerBasicTest { }) @ExpectedContainer( value = BarContainer.class, - getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", - getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + getAnnotation = "@BarContainer(value={@Bar(value=1), @Bar(value=2)})", + getAnnotationsByType = {"@BarContainer(value={@Bar(value=1), @Bar(value=2)})"}) @Bar(value = 0) @BarContainer(value = {@Bar(value = 1), @Bar(value = 2)}) void testMethod() {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java index 5abbdc7f665..541aff09e32 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA1Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 8007961 + * @bug 8004822 8007961 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -59,8 +59,8 @@ class E {} @ExpectedContainer( value = BarInheritedContainer.class, getAnnotation = "@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + + "value={@BarInherited(value=1), @BarInherited(value=2)})", getAnnotationsByType = {"@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) + + "value={@BarInherited(value=1), @BarInherited(value=2)})"}) @BarInheritedContainer(value = {@BarInherited(value = 1), @BarInherited(value = 2)}) class MixRepeatableAndOfficialContainerInheritedA1Test extends E {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA2Test.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA2Test.java index 639a056655e..93306619010 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA2Test.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedA2Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -61,9 +61,9 @@ class N {} @ExpectedContainer( value = BarInheritedContainer.class, getAnnotation = "@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + + "value={@BarInherited(value=1), @BarInherited(value=2)})", getAnnotationsByType = {"@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) + + "value={@BarInherited(value=1), @BarInherited(value=2)})"}) @BarInheritedContainer(value = {@BarInherited(value = 1), @BarInherited(value = 2)}) @BarInherited(value = 3) class MixRepeatableAndOfficialContainerInheritedA2Test extends N {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java index 8cfdde70d51..13339a478ba 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB1Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 8007961 + * @bug 8004822 8007961 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -56,8 +56,8 @@ class M {} @ExpectedContainer( value = BarInheritedContainer.class, getAnnotation = "@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + + "value={@BarInherited(value=1), @BarInherited(value=2)})", getAnnotationsByType = {"@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) + + "value={@BarInherited(value=1), @BarInherited(value=2)})"}) @BarInherited(value = 0) class MixRepeatableAndOfficialContainerInheritedB1Test extends M {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java index 44c373d0f1b..ba0991fdcc0 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixRepeatableAndOfficialContainerInheritedB2Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 8007961 + * @bug 8004822 8007961 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -57,8 +57,8 @@ class H {} @ExpectedContainer( value = BarInheritedContainer.class, getAnnotation = "@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + + "value={@BarInherited(value=1), @BarInherited(value=2)})", getAnnotationsByType = {"@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) + + "value={@BarInherited(value=1), @BarInherited(value=2)})"}) @BarInherited(value = 0) class MixRepeatableAndOfficialContainerInheritedB2Test extends H {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerBasicTest.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerBasicTest.java index b391fad9d0c..fdb4b81104f 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerBasicTest.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerBasicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -53,9 +53,9 @@ @ExpectedContainer( value = UnofficialContainer.class, getAnnotation = "@UnofficialContainer(" - + "value=[@Foo(value=1), @Foo(value=2)])", + + "value={@Foo(value=1), @Foo(value=2)})", getAnnotationsByType = {"@UnofficialContainer(" - + "value=[@Foo(value=1), @Foo(value=2)])"}) + + "value={@Foo(value=1), @Foo(value=2)})"}) @Foo(value = 0) @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)}) class MixSingularAndUnofficialContainerBasicTest { @@ -79,9 +79,9 @@ class MixSingularAndUnofficialContainerBasicTest { @ExpectedContainer( value = UnofficialContainer.class, getAnnotation = "@UnofficialContainer(" - + "value=[@Foo(value=1), @Foo(value=2)])", + + "value={@Foo(value=1), @Foo(value=2)})", getAnnotationsByType = {"@UnofficialContainer(" - + "value=[@Foo(value=1), @Foo(value=2)])"}) + + "value={@Foo(value=1), @Foo(value=2)})"}) @Foo(value = 0) @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)}) int testField = 0; @@ -105,9 +105,9 @@ class MixSingularAndUnofficialContainerBasicTest { @ExpectedContainer( value = UnofficialContainer.class, getAnnotation = "@UnofficialContainer(" - + "value=[@Foo(value=1), @Foo(value=2)])", + + "value={@Foo(value=1), @Foo(value=2)})", getAnnotationsByType = {"@UnofficialContainer(" - + "value=[@Foo(value=1), @Foo(value=2)])"}) + + "value={@Foo(value=1), @Foo(value=2)})"}) @Foo(value = 0) @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)}) void testMethod() {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA1Test.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA1Test.java index 30376e3b52d..ff4c4b2d9b7 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA1Test.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA1Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -56,8 +56,8 @@ class L {} @ExpectedContainer( value = UnofficialInheritedContainer.class, getAnnotation = "@UnofficialInheritedContainer(" - + "value=[@FooInherited(value=1), @FooInherited(value=2)])", + + "value={@FooInherited(value=1), @FooInherited(value=2)})", getAnnotationsByType = {"@UnofficialInheritedContainer(" - + "value=[@FooInherited(value=1), @FooInherited(value=2)])"}) + + "value={@FooInherited(value=1), @FooInherited(value=2)})"}) @UnofficialInheritedContainer(value = {@FooInherited(value = 1), @FooInherited(value = 2)}) class MixSingularAndUnofficialContainerInheritedA1Test extends L {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA2Test.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA2Test.java index 5ee7402f456..cf90a638951 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA2Test.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedA2Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -57,9 +57,9 @@ class K {} @ExpectedContainer( value = UnofficialInheritedContainer.class, getAnnotation = "@UnofficialInheritedContainer(" - + "value=[@FooInherited(value=1), @FooInherited(value=2)])", + + "value={@FooInherited(value=1), @FooInherited(value=2)})", getAnnotationsByType = {"@UnofficialInheritedContainer(" - + "value=[@FooInherited(value=1), @FooInherited(value=2)])"}) + + "value={@FooInherited(value=1), @FooInherited(value=2)})"}) @UnofficialInheritedContainer(value = {@FooInherited(value = 1), @FooInherited(value = 2)}) @FooInherited(value = 3) class MixSingularAndUnofficialContainerInheritedA2Test extends K {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB1Test.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB1Test.java index f0de204eb62..1c47d692eb3 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB1Test.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB1Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -56,8 +56,8 @@ class J {} @ExpectedContainer( value = UnofficialInheritedContainer.class, getAnnotation = "@UnofficialInheritedContainer(" - + "value=[@FooInherited(value=1), @FooInherited(value=2)])", + + "value={@FooInherited(value=1), @FooInherited(value=2)})", getAnnotationsByType = {"@UnofficialInheritedContainer(" - + "value=[@FooInherited(value=1), @FooInherited(value=2)])"}) + + "value={@FooInherited(value=1), @FooInherited(value=2)})"}) @FooInherited(value = 0) class MixSingularAndUnofficialContainerInheritedB1Test extends J {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB2Test.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB2Test.java index 30c3cf73942..c08524a0b96 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB2Test.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/MixSingularAndUnofficialContainerInheritedB2Test.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -57,8 +57,8 @@ class G {} @ExpectedContainer( value = UnofficialInheritedContainer.class, getAnnotation = "@UnofficialInheritedContainer(" - + "value=[@FooInherited(value=1), @FooInherited(value=2)])", + + "value={@FooInherited(value=1), @FooInherited(value=2)})", getAnnotationsByType = {"@UnofficialInheritedContainer(" - + "value=[@FooInherited(value=1), @FooInherited(value=2)])"}) + + "value={@FooInherited(value=1), @FooInherited(value=2)})"}) @FooInherited(value = 0) class MixSingularAndUnofficialContainerInheritedB2Test extends G{} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerBasicTest.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerBasicTest.java index ee1d5631b6b..7cbaa7c9ce6 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerBasicTest.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerBasicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -53,8 +53,8 @@ }) @ExpectedContainer( value = BarContainer.class, - getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", - getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + getAnnotation = "@BarContainer(value={@Bar(value=1), @Bar(value=2)})", + getAnnotationsByType = {"@BarContainer(value={@Bar(value=1), @Bar(value=2)})"}) @BarContainer(value = {@Bar(value = 1), @Bar(value = 2)}) class OfficialContainerBasicTest { @@ -77,8 +77,8 @@ class OfficialContainerBasicTest { }) @ExpectedContainer( value = BarContainer.class, - getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", - getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + getAnnotation = "@BarContainer(value={@Bar(value=1), @Bar(value=2)})", + getAnnotationsByType = {"@BarContainer(value={@Bar(value=1), @Bar(value=2)})"}) @BarContainer(value = {@Bar(value = 1), @Bar(value = 2)}) int testField = 0; @@ -101,8 +101,8 @@ class OfficialContainerBasicTest { }) @ExpectedContainer( value = BarContainer.class, - getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", - getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + getAnnotation = "@BarContainer(value={@Bar(value=1), @Bar(value=2)})", + getAnnotationsByType = {"@BarContainer(value={@Bar(value=1), @Bar(value=2)})"}) @BarContainer(value = {@Bar(value = 1), @Bar(value = 2)}) void testMethod() {} } diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerInheritedTest.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerInheritedTest.java index f2f3f699e54..2e9047e0e7f 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerInheritedTest.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/OfficialContainerInheritedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -56,7 +56,7 @@ class D {} @ExpectedContainer( value = BarInheritedContainer.class, getAnnotation = "@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + + "value={@BarInherited(value=1), @BarInherited(value=2)})", getAnnotationsByType = {"@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) + + "value={@BarInherited(value=1), @BarInherited(value=2)})"}) class OfficialContainerInheritedTest extends D {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableBasicTest.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableBasicTest.java index f05eedb97cf..c50306d8718 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableBasicTest.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableBasicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -53,8 +53,8 @@ }) @ExpectedContainer( value = BarContainer.class, - getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", - getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + getAnnotation = "@BarContainer(value={@Bar(value=1), @Bar(value=2)})", + getAnnotationsByType = {"@BarContainer(value={@Bar(value=1), @Bar(value=2)})"}) @Bar(value = 1) @Bar(value = 2) class RepeatableBasicTest { @@ -78,8 +78,8 @@ class RepeatableBasicTest { }) @ExpectedContainer( value = BarContainer.class, - getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", - getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + getAnnotation = "@BarContainer(value={@Bar(value=1), @Bar(value=2)})", + getAnnotationsByType = {"@BarContainer(value={@Bar(value=1), @Bar(value=2)})"}) @Bar(value = 1) @Bar(value = 2) int testField = 0; @@ -103,8 +103,8 @@ class RepeatableBasicTest { }) @ExpectedContainer( value = BarContainer.class, - getAnnotation = "@BarContainer(value=[@Bar(value=1), @Bar(value=2)])", - getAnnotationsByType = {"@BarContainer(value=[@Bar(value=1), @Bar(value=2)])"}) + getAnnotation = "@BarContainer(value={@Bar(value=1), @Bar(value=2)})", + getAnnotationsByType = {"@BarContainer(value={@Bar(value=1), @Bar(value=2)})"}) @Bar(value = 1) @Bar(value = 2) void testMethod() {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableInheritedTest.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableInheritedTest.java index b9075cfee1e..59b5d95dd3e 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableInheritedTest.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableInheritedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -57,7 +57,7 @@ class I {} @ExpectedContainer( value = BarInheritedContainer.class, getAnnotation = "@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + + "value={@BarInherited(value=1), @BarInherited(value=2)})", getAnnotationsByType = {"@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) + + "value={@BarInherited(value=1), @BarInherited(value=2)})"}) class RepeatableInheritedTest extends I {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerBasicTest.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerBasicTest.java index e512891928a..39f856a14e0 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerBasicTest.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerBasicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -52,8 +52,8 @@ value = BarContainer.class, getAnnotation = "null", getAnnotationsByType = { - "@BarContainer(value=[@Bar(value=1)])", - "@BarContainer(value=[@Bar(value=2)])"}) + "@BarContainer(value={@Bar(value=1)})", + "@BarContainer(value={@Bar(value=2)})"}) @BarContainer(value = {@Bar(value = 1)}) @BarContainer(value = {@Bar(value = 2)}) class RepeatableOfficialContainerBasicTest { @@ -76,8 +76,8 @@ class RepeatableOfficialContainerBasicTest { value = BarContainer.class, getAnnotation = "null", getAnnotationsByType = { - "@BarContainer(value=[@Bar(value=1)])", - "@BarContainer(value=[@Bar(value=2)])"}) + "@BarContainer(value={@Bar(value=1)})", + "@BarContainer(value={@Bar(value=2)})"}) @BarContainer(value = {@Bar(value = 1)}) @BarContainer(value = {@Bar(value = 2)}) int testField = 0; @@ -100,8 +100,8 @@ class RepeatableOfficialContainerBasicTest { value = BarContainer.class, getAnnotation = "null", getAnnotationsByType = { - "@BarContainer(value=[@Bar(value=1)])", - "@BarContainer(value=[@Bar(value=2)])"}) + "@BarContainer(value={@Bar(value=1)})", + "@BarContainer(value={@Bar(value=2)})"}) @BarContainer(value = {@Bar(value = 1)}) @BarContainer(value = {@Bar(value = 2)}) void testMethod() {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerInheritedTest.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerInheritedTest.java index 579cf068998..f3029fa1cac 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerInheritedTest.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOfficialContainerInheritedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -43,8 +43,8 @@ class O {} value = BarInheritedContainer.class, getAnnotation = "null", getAnnotationsByType = { - "@BarInheritedContainer(value=[@BarInherited(value=1)])", - "@BarInheritedContainer(value=[@BarInherited(value=2)])" + "@BarInheritedContainer(value={@BarInherited(value=1)})", + "@BarInheritedContainer(value={@BarInherited(value=2)})" }, getAllAnnotationMirrors = { "@BarInheritedContainerContainer(" @@ -60,9 +60,9 @@ class O {} @ExpectedContainer( value = BarInheritedContainerContainer.class, getAnnotation = "@BarInheritedContainerContainer(" - + "value=[@BarInheritedContainer(value=[@BarInherited(value=1)])," - + " @BarInheritedContainer(value=[@BarInherited(value=2)])])", + + "value={@BarInheritedContainer(value={@BarInherited(value=1)})," + + " @BarInheritedContainer(value={@BarInherited(value=2)})})", getAnnotationsByType = {"@BarInheritedContainerContainer(" - + "value=[@BarInheritedContainer(value=[@BarInherited(value=1)])," - + " @BarInheritedContainer(value=[@BarInherited(value=2)])])"}) + + "value={@BarInheritedContainer(value={@BarInherited(value=1)})," + + " @BarInheritedContainer(value={@BarInherited(value=2)})})"}) class RepeatableOfficialContainerInheritedTest extends O {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java index 2596648dba4..6e4a2c22b8f 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideATest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 8007961 + * @bug 8004822 8007961 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -56,8 +56,8 @@ class B {} @ExpectedContainer( value = BarInheritedContainer.class, getAnnotation = "@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + + "value={@BarInherited(value=1), @BarInherited(value=2)})", getAnnotationsByType = {"@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) + + "value={@BarInherited(value=1), @BarInherited(value=2)})"}) @BarInherited(value = 3) class RepeatableOverrideATest extends B {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java index f047d17f355..73cd25c4588 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/RepeatableOverrideBTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 8007961 + * @bug 8004822 8007961 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -58,9 +58,9 @@ class C {} @ExpectedContainer( value = BarInheritedContainer.class, getAnnotation = "@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])", + + "value={@BarInherited(value=1), @BarInherited(value=2)})", getAnnotationsByType = {"@BarInheritedContainer(" - + "value=[@BarInherited(value=1), @BarInherited(value=2)])"}) + + "value={@BarInherited(value=1), @BarInherited(value=2)})"}) @BarInherited(value = 1) @BarInherited(value = 2) class RepeatableOverrideBTest extends C {} diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerBasicTest.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerBasicTest.java index de793d49d99..0150b1cbe00 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerBasicTest.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerBasicTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -50,8 +50,8 @@ }) @ExpectedContainer( value = UnofficialContainer.class, - getAnnotation = "@UnofficialContainer(value=[@Foo(value=1), @Foo(value=2)])", - getAnnotationsByType = {"@UnofficialContainer(value=[@Foo(value=1), @Foo(value=2)])"}) + getAnnotation = "@UnofficialContainer(value={@Foo(value=1), @Foo(value=2)})", + getAnnotationsByType = {"@UnofficialContainer(value={@Foo(value=1), @Foo(value=2)})"}) @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)}) class UnofficialContainerBasicTest { @@ -71,8 +71,8 @@ class UnofficialContainerBasicTest { }) @ExpectedContainer( value = UnofficialContainer.class, - getAnnotation = "@UnofficialContainer(value=[@Foo(value=1), @Foo(value=2)])", - getAnnotationsByType = {"@UnofficialContainer(value=[@Foo(value=1), @Foo(value=2)])"}) + getAnnotation = "@UnofficialContainer(value={@Foo(value=1), @Foo(value=2)})", + getAnnotationsByType = {"@UnofficialContainer(value={@Foo(value=1), @Foo(value=2)})"}) @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)}) int testField = 0; @@ -92,8 +92,8 @@ class UnofficialContainerBasicTest { }) @ExpectedContainer( value = UnofficialContainer.class, - getAnnotation = "@UnofficialContainer(value=[@Foo(value=1), @Foo(value=2)])", - getAnnotationsByType = {"@UnofficialContainer(value=[@Foo(value=1), @Foo(value=2)])"}) + getAnnotation = "@UnofficialContainer(value={@Foo(value=1), @Foo(value=2)})", + getAnnotationsByType = {"@UnofficialContainer(value={@Foo(value=1), @Foo(value=2)})"}) @UnofficialContainer(value = {@Foo(value = 1), @Foo(value = 2)}) void testMethod() {} } diff --git a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerInheritedTest.java b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerInheritedTest.java index dde7d04b6a6..a25145e9387 100644 --- a/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerInheritedTest.java +++ b/langtools/test/tools/javac/processing/model/element/repeatingAnnotations/UnofficialContainerInheritedTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2015, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 2016, 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 @@ -23,7 +23,7 @@ /* * @test - * @bug 8004822 + * @bug 8004822 8163113 * @author mnunez * @summary Language model api test basics for repeating annotations * @library /tools/javac/lib @@ -54,7 +54,7 @@ class F {} @ExpectedContainer( value = UnofficialInheritedContainer.class, getAnnotation = "@UnofficialInheritedContainer(" - + "value=[@FooInherited(value=1), @FooInherited(value=2)])", + + "value={@FooInherited(value=1), @FooInherited(value=2)})", getAnnotationsByType = {"@UnofficialInheritedContainer(" - + "value=[@FooInherited(value=1), @FooInherited(value=2)])"}) + + "value={@FooInherited(value=1), @FooInherited(value=2)})"}) class UnofficialContainerInheritedTest extends F {} diff --git a/langtools/test/tools/javac/scope/IterateAndRemove.java b/langtools/test/tools/javac/scope/IterateAndRemove.java new file mode 100644 index 00000000000..fab5ea52d97 --- /dev/null +++ b/langtools/test/tools/javac/scope/IterateAndRemove.java @@ -0,0 +1,106 @@ +/* + * Copyright (c) 2016, 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 8144733 + * @summary Verify that Scope.remove removes the Symbol also from already running iterations. + * @modules jdk.compiler/com.sun.tools.javac.code + * jdk.compiler/com.sun.tools.javac.util + */ + +import java.util.ArrayList; +import java.util.Arrays; +import java.util.Collections; +import java.util.Iterator; +import java.util.List; +import java.util.function.Function; + +import com.sun.tools.javac.code.Scope; +import com.sun.tools.javac.code.Scope.WriteableScope; +import com.sun.tools.javac.code.Symbol; +import com.sun.tools.javac.code.Symbol.PackageSymbol; +import com.sun.tools.javac.util.Context; +import com.sun.tools.javac.util.Name; +import com.sun.tools.javac.util.Names; + +public class IterateAndRemove { + public static void main(String... args) { + new IterateAndRemove().run(); + } + + void run() { + Context ctx = new Context(); + Names names = Names.instance(ctx); + Symbol root = new PackageSymbol(names.empty, null); + Name one = names.fromString("1"); + PackageSymbol sym1 = new PackageSymbol(one, new PackageSymbol(names.fromString("a"), root)); + PackageSymbol sym2 = new PackageSymbol(one, new PackageSymbol(names.fromString("b"), root)); + PackageSymbol sym3 = new PackageSymbol(one, new PackageSymbol(names.fromString("c"), root)); + List<Symbol> symbols = Arrays.asList(sym1, sym2, sym3); + + List<Function<Scope, Iterable<Symbol>>> getters = Arrays.asList( + scope -> scope.getSymbols(), + scope -> scope.getSymbolsByName(one) + ); + for (Function<Scope, Iterable<Symbol>> scope2Content : getters) { + for (int removeAt : new int[] {0, 1, 2, 3}) { + for (Symbol removeWhat : new Symbol[] {sym1, sym2, sym3}) { + WriteableScope s = WriteableScope.create(root); + + symbols.forEach(s :: enter); + + Iterator<Symbol> it = scope2Content.apply(s).iterator(); + List<PackageSymbol> actual = new ArrayList<>(); + int count = 0; + + while (true) { + if (count++ == removeAt) + s.remove(removeWhat); + if (!it.hasNext()) + break; + actual.add((PackageSymbol) it.next()); + } + + List<Symbol> copy = new ArrayList<>(symbols); + + Collections.reverse(copy); + + count = 0; + + while (true) { + if (count == removeAt && copy.indexOf(removeWhat) >= count) + copy.remove(removeWhat); + count++; + if (count >= copy.size()) + break; + } + + if (!copy.equals(actual)) { + throw new AssertionError("differs: actual: " + actual + "; expected: " + copy); + } + } + } + } + } +} \ No newline at end of file diff --git a/langtools/test/tools/lib/toolbox/TestRunner.java b/langtools/test/tools/lib/toolbox/TestRunner.java index f0a921ef127..05839fdd321 100644 --- a/langtools/test/tools/lib/toolbox/TestRunner.java +++ b/langtools/test/tools/lib/toolbox/TestRunner.java @@ -116,4 +116,9 @@ public abstract class TestRunner { throw new Exception(errorCount + " errors found"); } } + + public void error(String message) { + out.println("Error: " + message); + errorCount++; + } } diff --git a/make/Bundles.gmk b/make/Bundles.gmk index 84b7afc2b76..111d7cea4fa 100644 --- a/make/Bundles.gmk +++ b/make/Bundles.gmk @@ -187,7 +187,11 @@ ifneq ($(filter product-bundles, $(MAKECMDGOALS)), ) $(JDK_SYMBOLS_EXCLUDE_PATTERN) \ $(SYMBOLS_EXCLUDE_PATTERN) \ , \ - $(ALL_JDK_FILES) \ + $(filter-out \ + $(JDK_IMAGE_HOMEDIR)/demo/% $(JDK_IMAGE_HOMEDIR)/sample/% \ + , \ + $(ALL_JDK_FILES) \ + ) \ ) \ $(call CacheFind, $(SYMBOLS_IMAGE_DIR)) diff --git a/make/CreateJmods.gmk b/make/CreateJmods.gmk index bc8e464d74e..42ef85536da 100644 --- a/make/CreateJmods.gmk +++ b/make/CreateJmods.gmk @@ -1,5 +1,5 @@ -# Copyright (c) 2014, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2016, 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 @@ -82,8 +82,10 @@ ifeq ($(MODULE), java.base) endif endif -# Changes to the jmod tool itself should also trigger a rebuild of all jmods -DEPS += $(JMOD_CMD) +# Changes to the jmod tool itself should also trigger a rebuild of all jmods. +# The variable JMOD_CMD could contain an environment variable assignment before +# the actual command. Filter that out using wildcard before adding to DEPS. +DEPS += $(wildcard $(JMOD_CMD)) ifeq ($(EXTERNAL_BUILDJDK), false) DEPS += $(call CacheFind, $(JDK_OUTPUTDIR)/modules/jdk.jlink/jdk/tools/jmod) endif @@ -100,7 +102,7 @@ $(JMODS_DIR)/$(MODULE).jmod: $(DEPS) --os-name $(REQUIRED_OS_NAME) \ --os-arch $(OPENJDK_TARGET_CPU_LEGACY) \ --os-version $(REQUIRED_OS_VERSION) \ - --modulepath $(JMODS_DIR) \ + --modulepath $(JMODS_DIR) \ --exclude '**{_the.*,*.diz,*.debuginfo,*.dSYM/**,*.pdb,*.map}' \ $(JMOD_FLAGS) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $(MV) $(SUPPORT_OUTPUTDIR)/jmods/$(notdir $@) $@ diff --git a/make/Images.gmk b/make/Images.gmk index 7ba95286f91..a1b0a70b243 100644 --- a/make/Images.gmk +++ b/make/Images.gmk @@ -1,5 +1,5 @@ # -# Copyright (c) 2014, 2015, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 2014, 2016, 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 @@ -225,7 +225,6 @@ ifneq ($(OPENJDK_TARGET_OS), windows) jmap.1 \ jps.1 \ jrunscript.1 \ - jsadebugd.1 \ jstack.1 \ jstat.1 \ jstatd.1 \ diff --git a/make/Javadoc.gmk b/make/Javadoc.gmk index d1607b24bab..866e3d711e3 100644 --- a/make/Javadoc.gmk +++ b/make/Javadoc.gmk @@ -82,7 +82,7 @@ JNLP_FIRST_COPYRIGHT_YEAR = 1998 PLUGIN2_FIRST_COPYRIGHT_YEAR = 2007 JDKNET_FIRST_COPYRIGHT_YEAR = 2014 JACCESSAPI_FIRST_COPYRIGHT_YEAR = 2002 - +JSOBJECT_FIRST_COPYRIGHT_YEAR = 1993 # Oracle name FULL_COMPANY_NAME = Oracle and/or its affiliates @@ -576,14 +576,14 @@ $(OLD_DOCLETAPI_PACKAGES_FILE): $(call PackageDependencies,$(OLD_DOCLETAPI_PKGS) ALL_OTHER_TARGETS += tagletapidocs TAGLETAPI_DOCDIR := $(OLD_DOCLET_DIR)/taglet TAGLETAPI2COREAPI := ../../../$(JDKJRE2COREAPI) +TAGLETAPI_DOCTITLE := Taglet API +TAGLETAPI_WINDOWTITLE := Taglet API +TAGLETAPI_HEADER := <strong>Taglet API</strong> TAGLETAPI_BOTTOM := $(call CommonTrademarkBottom,$(TAGLETAPI_FIRST_COPYRIGHT_YEAR)) # TAGLETAPI_FILE is located in NON_CORE_PKGS.gmk -# Temporary directory (special generation rules) -TAGLETAPI_TEMPDIR = $(DOCSTMPDIR)/taglets_temp - # The index.html, options, and packages files -TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/com/sun/tools/doclets/Taglet.html +TAGLETAPI_INDEX_FILE = $(TAGLETAPI_DOCDIR)/index.html TAGLETAPI_OPTIONS_FILE = $(DOCSTMPDIR)/tagletapi.options TAGLETAPI_PACKAGES_FILE = $(DOCSTMPDIR)/tagletapi.packages @@ -592,20 +592,12 @@ TAGLETAPI_MODULES = jdk.javadoc tagletapidocs: $(TAGLETAPI_INDEX_FILE) -# Set relative location to core api document root -$(TAGLETAPI_INDEX_FILE): GET2DOCSDIR=$(TAGLETAPI2COREAPI)/.. - # Run javadoc if the index file is out of date or missing $(TAGLETAPI_INDEX_FILE): $(TAGLETAPI_OPTIONS_FILE) $(TAGLETAPI_PACKAGES_FILE) $(COREAPI_INDEX_FILE) $(prep-javadoc) - $(RM) -r $(TAGLETAPI_TEMPDIR) - $(MKDIR) -p $(TAGLETAPI_TEMPDIR) $(call JavadocSummary,$(TAGLETAPI_OPTIONS_FILE),$(TAGLETAPI_PACKAGES_FILE)) - $(JAVADOC_CMD_SMALL) -d $(TAGLETAPI_TEMPDIR) \ + $(JAVADOC_CMD_SMALL) -d $(@D) \ @$(TAGLETAPI_OPTIONS_FILE) @$(TAGLETAPI_PACKAGES_FILE) - cp -r $(TAGLETAPI_TEMPDIR)/com $(TAGLETAPI_DOCDIR) - cp $(TAGLETAPI_TEMPDIR)/stylesheet.css $(TAGLETAPI_DOCDIR) - $(RM) -r $(TAGLETAPI_TEMPDIR) # Create file with javadoc options in it $(TAGLETAPI_OPTIONS_FILE): @@ -617,6 +609,10 @@ $(TAGLETAPI_OPTIONS_FILE): $(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \ $(call OptionPair,-addmods,$(TAGLETAPI_MODULES)) ; \ $(call OptionPair,-encoding,ascii) ; \ + $(call OptionOnly,-breakiterator) ; \ + $(call OptionPair,-doctitle,$(TAGLETAPI_DOCTITLE)) ; \ + $(call OptionPair,-windowtitle,$(TAGLETAPI_WINDOWTITLE) $(DRAFT_WINTITLE)); \ + $(call OptionPair,-header,$(TAGLETAPI_HEADER)$(DRAFT_HEADER)) ; \ $(call OptionOnly,-nonavbar) ; \ $(call OptionOnly,-noindex) ; \ $(call OptionPair,-bottom,$(TAGLETAPI_BOTTOM)$(DRAFT_BOTTOM)) ; \ @@ -1025,6 +1021,64 @@ $(HTTPSERVER_PACKAGES_FILE): $(call PackageDependencies,$(HTTPSERVER_PKGS)) $(prep-target) $(call PackageFilter,$(HTTPSERVER_PKGS)) +############################################################# +# +# jsobjectdocs +# + +ALL_OTHER_TARGETS += jsobjectdocs + +JSOBJECT_DOCDIR := $(JRE_API_DOCSDIR)/plugin/jsobject +JSOBJECT2COREAPI := ../../$(JDKJRE2COREAPI) +JSOBJECT_DOCTITLE := Java$(TRADEMARK) JSObject Doc +JSOBJECT_WINDOWTITLE := Java JSObject Doc +JSOBJECT_HEADER := <strong>Java JSObject Doc</strong> +JSOBJECT_BOTTOM := $(call CommonBottom,$(JSOBJECT_FIRST_COPYRIGHT_YEAR)) +# JSOBJECT_PKGS is located in NON_CORE_PKGS.gmk + +JSOBJECT_INDEX_HTML = $(JSOBJECT_DOCDIR)/index.html +JSOBJECT_OPTIONS_FILE = $(DOCSTMPDIR)/jsobject.options +JSOBJECT_PACKAGES_FILE = $(DOCSTMPDIR)/jsobject.packages + +# The modules required to be documented +JSOBJECT_MODULES = jdk.jsobject + +jsobjectdocs: $(JSOBJECT_INDEX_HTML) + +# Set relative location to core api document root +$(JSOBJECT_INDEX_HTML): GET2DOCSDIR=$(JSOBJECT2COREAPI)/.. + +# Run javadoc if the index file is out of date or missing +$(JSOBJECT_INDEX_HTML): $(JSOBJECT_OPTIONS_FILE) $(JSOBJECT_PACKAGES_FILE) $(COREAPI_INDEX_FILE) + $(prep-javadoc) + $(call JavadocSummary,$(JSOBJECT_OPTIONS_FILE),$(JSOBJECT_PACKAGES_FILE)) + $(JAVADOC_CMD_SMALL) -d $(@D) \ + @$(JSOBJECT_OPTIONS_FILE) @$(JSOBJECT_PACKAGES_FILE) + +# Create file with javadoc options in it +$(JSOBJECT_OPTIONS_FILE): + $(prep-target) + @($(call COMMON_JAVADOCFLAGS) ; \ + $(call COMMON_JAVADOCTAGS) ; \ + $(call OptionOnly,-Xdoclint:none) ; \ + $(call OptionPair,-system,none) ; \ + $(call OptionPair,-modulesourcepath,$(RELEASEDOCS_MODULESOURCEPATH)) ; \ + $(call OptionPair,-addmods,$(JSOBJECT_MODULES)) ; \ + $(call OptionPair,-encoding,ascii) ; \ + $(call OptionOnly,-nodeprecatedlist) ; \ + $(call OptionPair,-doctitle,$(JSOBJECT_DOCTITLE)) ; \ + $(call OptionPair,-windowtitle,$(JSOBJECT_WINDOWTITLE) $(DRAFT_WINTITLE)); \ + $(call OptionPair,-header,$(JSOBJECT_HEADER)$(DRAFT_HEADER)); \ + $(call OptionPair,-bottom,$(JSOBJECT_BOTTOM)$(DRAFT_BOTTOM)); \ + $(call OptionTrip,-linkoffline,$(JSOBJECT2COREAPI),$(COREAPI_DOCSDIR)/); \ + ) >> $@ + +# Create a file with the package names in it +$(JSOBJECT_PACKAGES_FILE): $(call PackageDependencies,$(JSOBJECT_PKGS)) + $(prep-target) + $(call PackageFilter,$(JSOBJECT_PKGS)) + + ############################################################# # # mgmtdocs @@ -1610,7 +1664,7 @@ $(JDKNET_PACKAGES_FILE): $(call PackageDependencies,$(JDKNET_PKGS)) # # TODO: Need to decide when the plugin API is ready to publish as experimental API. # This target is temporarily added for internal use for now. -# +# ALL_OTHER_TARGETS += jlinkdocs diff --git a/make/Main.gmk b/make/Main.gmk index d2c74611d4f..f1267291368 100644 --- a/make/Main.gmk +++ b/make/Main.gmk @@ -704,7 +704,7 @@ else test-image-failure-handler: build-test-failure-handler - build-test-hotspot-jtreg-native: buildtools-jdk + build-test-hotspot-jtreg-native: buildtools-jdk import-hotspot build-test-jdk-jtreg-native: buildtools-jdk diff --git a/make/common/NON_CORE_PKGS.gmk b/make/common/NON_CORE_PKGS.gmk index ad546a4456d..e17ff1402ea 100644 --- a/make/common/NON_CORE_PKGS.gmk +++ b/make/common/NON_CORE_PKGS.gmk @@ -114,8 +114,11 @@ JDK_PKGS = jdk \ JACCESSAPI_PKGS = com.sun.java.accessibility.util +JSOBJECT_PKGS = netscape.javascript + # non-core packages in rt.jar NON_CORE_PKGS = $(DOMAPI_PKGS) \ + $(JSOBJECT_PKGS) \ $(MGMT_PKGS) \ $(JAAS_PKGS) \ $(JGSS_PKGS) \ diff --git a/nashorn/.hgtags b/nashorn/.hgtags index 8e090a1d4c4..5d335c3db6d 100644 --- a/nashorn/.hgtags +++ b/nashorn/.hgtags @@ -363,3 +363,4 @@ ee90c69a18409533df8f7b602044bf966a28381a jdk-9+126 ff07be6106fa56b72c163244f45a3ecb4c995564 jdk-9+127 5a189c5b396c353786343b590f6c19a5d929f01d jdk-9+128 68020a486500422e2c8b94b0f35cafe54c9e219a jdk-9+129 +0de67a63e2c73781ecf5979a2f3aa9619a445c37 jdk-9+130 diff --git a/nashorn/docs/DEVELOPER_README b/nashorn/docs/DEVELOPER_README index deb525d5ff4..2c116bfac02 100644 --- a/nashorn/docs/DEVELOPER_README +++ b/nashorn/docs/DEVELOPER_README @@ -302,6 +302,16 @@ Nashorn provides a fixed sized runtime event queue for debugging purposes. See -Dnashorn.debug for methods to access the event queue. The default value is 1024. +SYSTEM PROPERTY: -Dnashorn.anonymous.classes.threshold=<value> + +Nashorn can use anonymous classes for loading compiled scripts, depending +on the --anonymous-classes=[auto|true|false] option. Anonymous classes load +faster, but the loaded classes get less optimization applied to them and +therefore usually run slower. In the default "auto" setting, scripts are +loaded as anonymous classes if the script size does not exceed 512 bytes. +The above system property allows to set this threshold to a user defined +value. + =============== 2. The loggers. =============== diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java index 6f1fdeb9cc5..ac05a5f77ca 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/codegen/OptimisticTypesCalculator.java @@ -99,7 +99,9 @@ final class OptimisticTypesCalculator extends SimpleNodeVisitor { tagNeverOptimistic(binaryNode.rhs()); } } - } else if(binaryNode.isTokenType(TokenType.INSTANCEOF)) { + } else if(binaryNode.isTokenType(TokenType.INSTANCEOF) + || binaryNode.isTokenType(TokenType.EQ_STRICT) + || binaryNode.isTokenType(TokenType.NE_STRICT)) { tagNeverOptimistic(binaryNode.lhs()); tagNeverOptimistic(binaryNode.rhs()); } diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java index 21155f9c05e..17ff028b383 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/Context.java @@ -1502,7 +1502,7 @@ public final class Context { final URL url = source.getURL(); final CodeSource cs = new CodeSource(url, (CodeSigner[])null); final CodeInstaller installer; - if (!env.useAnonymousClasses(isEval) || env._persistent_cache || !env._lazy_compilation) { + if (!env.useAnonymousClasses(source.getLength()) || env._persistent_cache || !env._lazy_compilation) { // Persistent code cache and eager compilation preclude use of VM anonymous classes final ScriptLoader loader = env._loader_per_compile ? createNewLoader() : scriptLoader; installer = new NamedContextCodeInstaller(this, cs, loader); diff --git a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java index 3e358cc51dd..5b62cf901d6 100644 --- a/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java +++ b/nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/runtime/ScriptEnvironment.java @@ -222,7 +222,7 @@ public final class ScriptEnvironment { /** Timing */ public final Timing _timing; - /** Whether to use anonymous classes. See {@link #useAnonymousClasses(boolean)}. */ + /** Whether to use anonymous classes. See {@link #useAnonymousClasses(int)}. */ private final AnonymousClasses _anonymousClasses; private enum AnonymousClasses { AUTO, @@ -230,6 +230,12 @@ public final class ScriptEnvironment { ON } + /** Size threshold up to which we use anonymous classes in {@link AnonymousClasses#AUTO} setting */ + private final int _anonymous_classes_threshold; + + /** Default value for anonymous class threshold */ + private final static int DEFAULT_ANON_CLASS_THRESHOLD = 512; + /** * Constructor * @@ -327,6 +333,8 @@ public final class ScriptEnvironment { throw new RuntimeException("Unsupported value for anonymous classes: " + anonClasses); } + this._anonymous_classes_threshold = Options.getIntProperty( + "nashorn.anonymous.classes.threshold", DEFAULT_ANON_CLASS_THRESHOLD); final String language = options.getString("language"); if (language == null || language.equals("es5")) { @@ -462,11 +470,12 @@ public final class ScriptEnvironment { /** * Returns true if compilation should use anonymous classes. - * @param isEval true if compilation is an eval call. + * @param sourceLength length of source being compiled. * @return true if anonymous classes should be used */ - public boolean useAnonymousClasses(final boolean isEval) { - return _anonymousClasses == AnonymousClasses.ON || (_anonymousClasses == AnonymousClasses.AUTO && isEval); + public boolean useAnonymousClasses(final int sourceLength) { + return _anonymousClasses == AnonymousClasses.ON + || (_anonymousClasses == AnonymousClasses.AUTO && sourceLength <= _anonymous_classes_threshold); } } diff --git a/nashorn/test/script/basic/JDK-8160034.js b/nashorn/test/script/basic/JDK-8160034.js index 4d019d360a4..9f6a130b503 100644 --- a/nashorn/test/script/basic/JDK-8160034.js +++ b/nashorn/test/script/basic/JDK-8160034.js @@ -22,7 +22,7 @@ */ /** - * JDK-8160034.js: The `this` value in the `with` is broken by the repetition of a function call + * JDK-8160034: The `this` value in the `with` is broken by the repetition of a function call * * @test * @option --unstable-relink-threshold=4 diff --git a/nashorn/test/script/basic/JDK-8162771.js b/nashorn/test/script/basic/JDK-8162771.js new file mode 100644 index 00000000000..8298b4c3fa5 --- /dev/null +++ b/nashorn/test/script/basic/JDK-8162771.js @@ -0,0 +1,54 @@ +/* + * Copyright (c) 2016, 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. + */ + +/** + * JDK-8162771: Strict equality operators should not be optimistic + * + * @test + * @run + */ + +var l = new java.lang.Long(1); + +Assert.assertTrue(typeof l === "object"); +Assert.assertTrue(typeof l.longValue() === "object"); + +Assert.assertTrue(1 == l); +Assert.assertTrue(1 == l.longValue()); +Assert.assertTrue(l == 1); +Assert.assertTrue(l.longValue() == 1); + +Assert.assertFalse(1 != l); +Assert.assertFalse(1 != l.longValue()); +Assert.assertFalse(l != 1); +Assert.assertFalse(l.longValue() != 1); + +Assert.assertFalse(1 === l); +Assert.assertFalse(1 === l.longValue()); +Assert.assertFalse(l === 1); +Assert.assertFalse(l.longValue() === 1); + +Assert.assertTrue(1 !== l); +Assert.assertTrue(1 !== l.longValue()); +Assert.assertTrue(l !== 1); +Assert.assertTrue(l.longValue() !== 1); diff --git a/test/jtreg-ext/requires/VMProps.java b/test/jtreg-ext/requires/VMProps.java index 945d754199e..644c8cd366c 100644 --- a/test/jtreg-ext/requires/VMProps.java +++ b/test/jtreg-ext/requires/VMProps.java @@ -23,8 +23,6 @@ package requires; import java.io.IOException; -import java.lang.management.ManagementFactory; -import java.lang.management.RuntimeMXBean; import java.nio.file.Files; import java.nio.file.Paths; import java.util.ArrayList; @@ -35,14 +33,18 @@ import java.util.concurrent.Callable; import java.util.regex.Matcher; import java.util.regex.Pattern; import sun.hotspot.gc.GC; +import sun.hotspot.WhiteBox; /** * The Class to be invoked by jtreg prior Test Suite execution to * collect information about VM. + * Do not use any API's that may not be available in all target VMs. * Properties set by this Class will be available in the @requires expressions. */ public class VMProps implements Callable<Map<String, String>> { + private static final WhiteBox WB = WhiteBox.getWhiteBox(); + /** * Collects information about VM properties. * This method will be invoked by jtreg. @@ -131,17 +133,14 @@ public class VMProps implements Callable<Map<String, String>> { * @return "true" if Flight Recorder is enabled, "false" if is disabled. */ protected String vmFlightRecorder() { - RuntimeMXBean runtimeMxBean = ManagementFactory.getRuntimeMXBean(); - List<String> arguments = runtimeMxBean.getInputArguments(); - if (arguments.contains("-XX:+UnlockCommercialFeatures")) { - if (arguments.contains("-XX:+FlightRecorder")) { + Boolean isUnlockedCommercialFatures = WB.getBooleanVMFlag("UnlockCommercialFeatures"); + Boolean isFlightRecorder = WB.getBooleanVMFlag("FlightRecorder"); + String startFROptions = WB.getStringVMFlag("StartFlightRecording"); + if (isUnlockedCommercialFatures != null && isUnlockedCommercialFatures) { + if (isFlightRecorder != null && isFlightRecorder) { return "true"; } - if (arguments.contains("-XX:-FlightRecorder")) { - return "false"; - } - if (arguments.stream() - .anyMatch(option -> option.startsWith("-XX:StartFlightRecording"))) { + if (startFROptions != null && !startFROptions.isEmpty()) { return "true"; } } diff --git a/test/lib/share/classes/jdk/test/lib/Platform.java b/test/lib/share/classes/jdk/test/lib/Platform.java index 966f70d6333..8c55f091467 100644 --- a/test/lib/share/classes/jdk/test/lib/Platform.java +++ b/test/lib/share/classes/jdk/test/lib/Platform.java @@ -26,15 +26,15 @@ package jdk.test.lib; import java.util.regex.Pattern; public class Platform { + public static final String vmName = System.getProperty("java.vm.name"); + public static final String vmInfo = System.getProperty("java.vm.info"); private static final String osName = System.getProperty("os.name"); private static final String dataModel = System.getProperty("sun.arch.data.model"); private static final String vmVersion = System.getProperty("java.vm.version"); private static final String javaVersion = System.getProperty("java.version"); private static final String osArch = System.getProperty("os.arch"); - private static final String vmName = System.getProperty("java.vm.name"); private static final String userName = System.getProperty("user.name"); private static final String compiler = System.getProperty("sun.management.compiler"); - private static final String vmInfo = System.getProperty("java.vm.info"); public static boolean isClient() { return vmName.endsWith(" Client VM"); diff --git a/test/lib/sun/hotspot/WhiteBox.java b/test/lib/sun/hotspot/WhiteBox.java index e34b27a159f..1db761d6f9d 100644 --- a/test/lib/sun/hotspot/WhiteBox.java +++ b/test/lib/sun/hotspot/WhiteBox.java @@ -84,6 +84,7 @@ public class WhiteBox { public native long getVMAllocationGranularity(); public native long getVMLargePageSize(); public native long getHeapSpaceAlignment(); + public native long getHeapAlignment(); private native boolean isObjectInOldGen0(Object o); public boolean isObjectInOldGen(Object o) {