diff --git a/jdk/test/com/sun/corba/transport/KeepAliveSockets.java b/jdk/test/com/sun/corba/transport/KeepAliveSockets.java index 4d9b9d97855..e062c596264 100644 --- a/jdk/test/com/sun/corba/transport/KeepAliveSockets.java +++ b/jdk/test/com/sun/corba/transport/KeepAliveSockets.java @@ -26,6 +26,7 @@ * @bug 8017195 * @summary Introduce option to setKeepAlive parameter on CORBA sockets * + * @modules java.corba/com.sun.corba.se.impl.orb java.corba/com.sun.corba.se.impl.transport * @run main/othervm KeepAliveSockets * @run main/othervm -Dcom.sun.CORBA.transport.enableTcpKeepAlive KeepAliveSockets * @run main/othervm -Dcom.sun.CORBA.transport.enableTcpKeepAlive=true KeepAliveSockets diff --git a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java index 8dec9f136a4..d29a0aa0904 100644 --- a/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java +++ b/jdk/test/com/sun/crypto/provider/Cipher/AES/TestAESCiphers/TestAESWithProviderChange.java @@ -27,6 +27,7 @@ import java.security.Security; * @bug 8044193 * @summary Test AES ciphers with different modes and padding schemes after * remove then add provider. + * @modules java.base/com.sun.crypto.provider * @run main/othervm/policy=testAES.policy TestAESWithProviderChange */ diff --git a/jdk/test/com/sun/crypto/provider/Cipher/KeyWrap/XMLEncKAT.java b/jdk/test/com/sun/crypto/provider/Cipher/KeyWrap/XMLEncKAT.java index 3a4a25cc06b..93f9991ee1e 100644 --- a/jdk/test/com/sun/crypto/provider/Cipher/KeyWrap/XMLEncKAT.java +++ b/jdk/test/com/sun/crypto/provider/Cipher/KeyWrap/XMLEncKAT.java @@ -24,9 +24,10 @@ /* * @test * @bug 5008159 5008156 - * @run main XMLEncKAT * @summary Verify that the two key wrap ciphers, i.e. "DESedeWrap" * and "AESWrap", work as expected. + * @modules java.base/sun.misc + * @run main XMLEncKAT * @author Valerie Peng */ import java.security.Key; diff --git a/jdk/test/com/sun/crypto/provider/TLS/TestKeyMaterial.java b/jdk/test/com/sun/crypto/provider/TLS/TestKeyMaterial.java index 8874070f484..d07c9ee3e52 100644 --- a/jdk/test/com/sun/crypto/provider/TLS/TestKeyMaterial.java +++ b/jdk/test/com/sun/crypto/provider/TLS/TestKeyMaterial.java @@ -26,6 +26,7 @@ * @bug 6313661 * @summary Known-answer-test for TlsKeyMaterial generator * @author Andreas Sterbenz + * @modules java.base/sun.security.internal.spec */ import java.io.*; diff --git a/jdk/test/com/sun/crypto/provider/TLS/TestMasterSecret.java b/jdk/test/com/sun/crypto/provider/TLS/TestMasterSecret.java index 3025ef5f2d1..10f6ddc4019 100644 --- a/jdk/test/com/sun/crypto/provider/TLS/TestMasterSecret.java +++ b/jdk/test/com/sun/crypto/provider/TLS/TestMasterSecret.java @@ -26,6 +26,8 @@ * @bug 6313661 * @summary Known-answer-test for TlsMasterSecret generator * @author Andreas Sterbenz + * @modules java.base/sun.security.internal.interfaces + * java.base/sun.security.internal.spec */ import java.io.*; diff --git a/jdk/test/com/sun/crypto/provider/TLS/TestPRF.java b/jdk/test/com/sun/crypto/provider/TLS/TestPRF.java index 9c6f9ecf80a..577927ea883 100644 --- a/jdk/test/com/sun/crypto/provider/TLS/TestPRF.java +++ b/jdk/test/com/sun/crypto/provider/TLS/TestPRF.java @@ -26,6 +26,7 @@ * @bug 6313661 * @summary Basic known-answer-test for TlsPrf * @author Andreas Sterbenz + * @modules java.base/sun.security.internal.spec */ import java.io.*; diff --git a/jdk/test/com/sun/crypto/provider/TLS/TestPRF12.java b/jdk/test/com/sun/crypto/provider/TLS/TestPRF12.java index d9384bffa78..dffda070e47 100644 --- a/jdk/test/com/sun/crypto/provider/TLS/TestPRF12.java +++ b/jdk/test/com/sun/crypto/provider/TLS/TestPRF12.java @@ -24,6 +24,7 @@ /** * @test * @bug 6313661 + * @modules java.base/sun.security.internal.spec * @summary Basic known-answer-test for TlsPrf 12 * * Vector obtained from the IETF TLS working group mailing list: diff --git a/jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java b/jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java index f19e7546ddd..b95b0855dd0 100644 --- a/jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java +++ b/jdk/test/com/sun/crypto/provider/TLS/TestPremaster.java @@ -26,6 +26,7 @@ * @bug 6313661 * @summary Basic tests for TlsRsaPremasterSecret generator * @author Andreas Sterbenz + * @modules java.base/sun.security.internal.spec */ import java.security.Security; diff --git a/jdk/test/com/sun/jndi/cosnaming/CNNameParser.java b/jdk/test/com/sun/jndi/cosnaming/CNNameParser.java index f4d8baccc5b..1c429b29100 100644 --- a/jdk/test/com/sun/jndi/cosnaming/CNNameParser.java +++ b/jdk/test/com/sun/jndi/cosnaming/CNNameParser.java @@ -25,6 +25,7 @@ * @bug 4238914 * @summary Tests that JNDI/COS naming parser supports the syntax * defined in the new INS standard. + * @modules java.corba/com.sun.jndi.cosnaming */ import javax.naming.*; diff --git a/jdk/test/com/sun/jndi/cosnaming/IiopUrlIPv6.java b/jdk/test/com/sun/jndi/cosnaming/IiopUrlIPv6.java index 478bd5a9883..ebaf6d8761c 100644 --- a/jdk/test/com/sun/jndi/cosnaming/IiopUrlIPv6.java +++ b/jdk/test/com/sun/jndi/cosnaming/IiopUrlIPv6.java @@ -24,6 +24,7 @@ /* @test * @bug 5042453 * @summary Ipv6 address throws Non-numeric port number error + * @modules java.corba/com.sun.jndi.cosnaming */ import com.sun.jndi.cosnaming.*; diff --git a/jdk/test/com/sun/jndi/dns/Parser.java b/jdk/test/com/sun/jndi/dns/Parser.java index 3e5bf5aa71d..4532ede3957 100644 --- a/jdk/test/com/sun/jndi/dns/Parser.java +++ b/jdk/test/com/sun/jndi/dns/Parser.java @@ -25,6 +25,7 @@ * @test * @bug 8035105 * @summary DNS resource record parsing + * @modules jdk.naming.dns/com.sun.jndi.dns */ import com.sun.jndi.dns.ResourceRecord; diff --git a/jdk/test/com/sun/jndi/ldap/Base64Test.java b/jdk/test/com/sun/jndi/ldap/Base64Test.java index a5547af8ca5..24f46afeb8d 100644 --- a/jdk/test/com/sun/jndi/ldap/Base64Test.java +++ b/jdk/test/com/sun/jndi/ldap/Base64Test.java @@ -25,6 +25,7 @@ * @test * @bug 8035807 * @summary Confirm that old and new Base64 encodings are compatible. + * @modules java.base/sun.misc */ import java.io.*; diff --git a/jdk/test/com/sun/jndi/ldap/LdapName/Case.java b/jdk/test/com/sun/jndi/ldap/LdapName/Case.java index e37b8d9ff86..078464d104e 100644 --- a/jdk/test/com/sun/jndi/ldap/LdapName/Case.java +++ b/jdk/test/com/sun/jndi/ldap/LdapName/Case.java @@ -26,6 +26,7 @@ * @bug 4278094 * @summary Ensure that setValuesCaseSensitive() does not leave name * in an invalid state. + * @modules java.naming/com.sun.jndi.ldap */ import com.sun.jndi.ldap.LdapName; diff --git a/jdk/test/com/sun/jndi/ldap/LdapName/UnescapeTest.java b/jdk/test/com/sun/jndi/ldap/LdapName/UnescapeTest.java index 75ded9c80cb..fc2b54bd554 100644 --- a/jdk/test/com/sun/jndi/ldap/LdapName/UnescapeTest.java +++ b/jdk/test/com/sun/jndi/ldap/LdapName/UnescapeTest.java @@ -26,6 +26,7 @@ * @bug 4892070 * @summary java gets hung in * com.sun.jndi.ldap.LdapName$TypeAndValue.unescapeValue() + * @modules java.naming/com.sun.jndi.ldap */ import com.sun.jndi.ldap.LdapName; diff --git a/jdk/test/com/sun/jndi/ldap/LdapURLOptionalFields.java b/jdk/test/com/sun/jndi/ldap/LdapURLOptionalFields.java index 86b5c1a442b..7f5da15f54b 100644 --- a/jdk/test/com/sun/jndi/ldap/LdapURLOptionalFields.java +++ b/jdk/test/com/sun/jndi/ldap/LdapURLOptionalFields.java @@ -25,6 +25,7 @@ * @test * @bug 8074761 * @summary RFC-2255 allows attribute, scope and filter to be empty. + * @modules java.naming/com.sun.jndi.ldap */ import com.sun.jndi.ldap.LdapURL; diff --git a/jdk/test/com/sun/jndi/ldap/LdapUnicodeURL.java b/jdk/test/com/sun/jndi/ldap/LdapUnicodeURL.java index 60f9759d482..b751122fa4f 100644 --- a/jdk/test/com/sun/jndi/ldap/LdapUnicodeURL.java +++ b/jdk/test/com/sun/jndi/ldap/LdapUnicodeURL.java @@ -25,6 +25,7 @@ * @test * @bug 6961765 * @summary Double byte characters corrupted in DN for LDAP referrals + * @modules java.naming/com.sun.jndi.ldap */ import com.sun.jndi.ldap.LdapURL; diff --git a/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java b/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java index edd15ae2338..b980bb644c9 100644 --- a/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java +++ b/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java @@ -25,6 +25,8 @@ * @test * @bug 6676075 * @summary RegistryContext (com.sun.jndi.url.rmi.rmiURLContext) coding problem + * @modules jdk.naming.rmi/com.sun.jndi.rmi.registry java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server java.rmi/sun.rmi.transport java.rmi/sun.rmi.transport.tcp * @library ../../../../../../java/rmi/testlibrary * @build TestLibrary * @run main ContextWithNullProperties diff --git a/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java b/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java index 692c7fd5cab..5709c2b5ca8 100644 --- a/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java +++ b/jdk/test/com/sun/jndi/rmi/registry/RegistryContext/UnbindIdempotent.java @@ -25,7 +25,9 @@ * @test * @bug 4278121 * @summary Ensure that calling unbind() on an unbound name returns - * successfully. + * successfully. + * @modules java.rmi/sun.rmi.registry java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport java.rmi/sun.rmi.transport.tcp * @library ../../../../../../java/rmi/testlibrary * @build TestLibrary * @run main UnbindIdempotent diff --git a/jdk/test/com/sun/management/VMOptionOpenDataTest.java b/jdk/test/com/sun/management/VMOptionOpenDataTest.java index 7f90fd5c705..3436c67fa20 100644 --- a/jdk/test/com/sun/management/VMOptionOpenDataTest.java +++ b/jdk/test/com/sun/management/VMOptionOpenDataTest.java @@ -31,6 +31,8 @@ import sun.management.MappedMXBeanType; * @test * @bug 8042901 * @summary Check that MappedMXBeanType.toOpenTypeData supports VMOption + * @modules java.management/sun.management + * jdk.management/com.sun.management * @author Shanliang Jiang */ public class VMOptionOpenDataTest { diff --git a/jdk/test/com/sun/net/ssl/SSLSecurity/ProviderTest.java b/jdk/test/com/sun/net/ssl/SSLSecurity/ProviderTest.java index 4fceaf26adb..43589cab6d9 100644 --- a/jdk/test/com/sun/net/ssl/SSLSecurity/ProviderTest.java +++ b/jdk/test/com/sun/net/ssl/SSLSecurity/ProviderTest.java @@ -24,6 +24,7 @@ /* * @test * @bug 4667976 + * @modules java.base/com.sun.net.ssl * @compile JavaxSSLContextImpl.java ComSSLContextImpl.java * JavaxTrustManagerFactoryImpl.java ComTrustManagerFactoryImpl.java * JavaxKeyManagerFactoryImpl.java ComKeyManagerFactoryImpl.java diff --git a/jdk/test/com/sun/net/ssl/SSLSecurity/TruncateArray.java b/jdk/test/com/sun/net/ssl/SSLSecurity/TruncateArray.java index b17b8f6b657..cc25449b5a3 100644 --- a/jdk/test/com/sun/net/ssl/SSLSecurity/TruncateArray.java +++ b/jdk/test/com/sun/net/ssl/SSLSecurity/TruncateArray.java @@ -25,6 +25,7 @@ * @test * @bug 4665824 * @summary JSSE - ClassCastException with 1.4 + * @modules java.base/com.sun.net.ssl */ import com.sun.net.ssl.*; diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java b/jdk/test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java index dd477ddfce0..3eb3ef2fa70 100644 --- a/jdk/test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java +++ b/jdk/test/com/sun/org/apache/xml/internal/security/TruncateHMAC.java @@ -26,6 +26,10 @@ * @bug 6824440 6858484 * @summary Check that Apache XMLSec APIs will not accept HMAC truncation * lengths less than minimum bound + * @modules java.xml.crypto/com.sun.org.apache.xml.internal.security + * java.xml.crypto/com.sun.org.apache.xml.internal.security.c14n + * java.xml.crypto/com.sun.org.apache.xml.internal.security.signature + * java.xml.crypto/com.sun.org.apache.xml.internal.security.utils * @compile -XDignore.symbol.file TruncateHMAC.java * @run main TruncateHMAC */ diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/exceptions/LocaleTest.java b/jdk/test/com/sun/org/apache/xml/internal/security/exceptions/LocaleTest.java index 491a941084d..aaffed4ec5e 100644 --- a/jdk/test/com/sun/org/apache/xml/internal/security/exceptions/LocaleTest.java +++ b/jdk/test/com/sun/org/apache/xml/internal/security/exceptions/LocaleTest.java @@ -26,6 +26,7 @@ * @bug 6454215 * @summary Make sure there are no runtime errors when throwing Apache XML * Security exceptions in a non-US default locale. + * @modules java.xml.crypto/com.sun.org.apache.xml.internal.security.exceptions * @compile -XDignore.symbol.file LocaleTest.java * @run main LocaleTest */ diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java b/jdk/test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java index 010cdd1004c..3a330a8bf9d 100644 --- a/jdk/test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java +++ b/jdk/test/com/sun/org/apache/xml/internal/security/transforms/ClassLoaderTest.java @@ -25,6 +25,8 @@ * @test * @author Sean Mullan * @bug 6461674 8009217 7147060 + * @modules java.xml.crypto/com.sun.org.apache.xml.internal.security.exceptions + * java.xml.crypto/com.sun.org.apache.xml.internal.security.transforms * @compile -XDignore.symbol.file ClassLoaderTest.java MyTransform.java * @run main/othervm ClassLoaderTest * @summary Ensure Transform.register works with transform implementations diff --git a/jdk/test/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream/BufferOverflowTest.java b/jdk/test/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream/BufferOverflowTest.java index ffb3c9e963d..d4559a2b539 100644 --- a/jdk/test/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream/BufferOverflowTest.java +++ b/jdk/test/com/sun/org/apache/xml/internal/security/utils/UnsyncByteArrayOutputStream/BufferOverflowTest.java @@ -26,6 +26,7 @@ * @bug 6954275 * @summary Check that UnsyncByteArrayOutputStream does not * throw ArrayIndexOutOfBoundsException + * @modules java.xml.crypto/com.sun.org.apache.xml.internal.security.utils * @compile -XDignore.symbol.file BufferOverflowTest.java * @run main BufferOverflowTest */ diff --git a/jdk/test/com/sun/security/sasl/ntlm/NTLMTest.java b/jdk/test/com/sun/security/sasl/ntlm/NTLMTest.java index 46d2f041383..8f0362d5157 100644 --- a/jdk/test/com/sun/security/sasl/ntlm/NTLMTest.java +++ b/jdk/test/com/sun/security/sasl/ntlm/NTLMTest.java @@ -25,6 +25,8 @@ * @test * @bug 6911951 7150092 * @summary NTLM should be a supported Java SASL mechanism + * @modules java.base/sun.misc + * java.security.sasl */ import java.io.IOException; import javax.security.sasl.*; diff --git a/jdk/test/com/sun/tools/attach/BasicTests.java b/jdk/test/com/sun/tools/attach/BasicTests.java index 896e6275930..7d6f7aa43f2 100644 --- a/jdk/test/com/sun/tools/attach/BasicTests.java +++ b/jdk/test/com/sun/tools/attach/BasicTests.java @@ -37,6 +37,7 @@ import jdk.testlibrary.ProcessThread; * @test * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757 * @summary Basic unit tests for the VM attach mechanism. + * @modules jdk.jartool/sun.tools.jar * @library /lib/testlibrary * @modules java.instrument * java.management diff --git a/jdk/test/com/sun/tools/attach/PermissionTest.java b/jdk/test/com/sun/tools/attach/PermissionTest.java index 530ce6bf806..3254431a9a1 100644 --- a/jdk/test/com/sun/tools/attach/PermissionTest.java +++ b/jdk/test/com/sun/tools/attach/PermissionTest.java @@ -32,6 +32,7 @@ import jdk.testlibrary.ProcessThread; * @test * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757 * @summary Basic unit tests for the VM attach mechanism. + * @modules jdk.jartool/sun.tools.jar * @library /lib/testlibrary * @modules java.management * jdk.attach diff --git a/jdk/test/com/sun/tools/attach/ProviderTest.java b/jdk/test/com/sun/tools/attach/ProviderTest.java index c948e3b23b0..685cc47f7ac 100644 --- a/jdk/test/com/sun/tools/attach/ProviderTest.java +++ b/jdk/test/com/sun/tools/attach/ProviderTest.java @@ -32,6 +32,7 @@ import com.sun.tools.attach.spi.AttachProvider; * @test * @bug 6173612 6273707 6277253 6335921 6348630 6342019 6381757 * @summary Basic unit tests for the VM attach mechanism. + * @modules jdk.jartool/sun.tools.jar * @library /lib/testlibrary * @modules java.management * jdk.attach diff --git a/jdk/test/com/sun/tools/attach/StartManagementAgent.java b/jdk/test/com/sun/tools/attach/StartManagementAgent.java index fd4ecef6def..7d3f13d1b55 100644 --- a/jdk/test/com/sun/tools/attach/StartManagementAgent.java +++ b/jdk/test/com/sun/tools/attach/StartManagementAgent.java @@ -39,6 +39,7 @@ import jdk.testlibrary.Utils; /* * @test * @summary Test for VirtualMachine.startManagementAgent and VirtualMachine.startLocalManagementAgent + * @modules jdk.jartool/sun.tools.jar * @library /lib/testlibrary * @modules java.management * jdk.attach diff --git a/jdk/test/com/sun/tools/attach/TempDirTest.java b/jdk/test/com/sun/tools/attach/TempDirTest.java index d4efc77919c..ae388c860b8 100644 --- a/jdk/test/com/sun/tools/attach/TempDirTest.java +++ b/jdk/test/com/sun/tools/attach/TempDirTest.java @@ -37,6 +37,7 @@ import jdk.testlibrary.ProcessThread; * @test * @bug 8033104 * @summary Test to make sure attach and jvmstat works correctly when java.io.tmpdir is set + * @modules jdk.jartool/sun.tools.jar * @library /lib/testlibrary * @modules java.management * jdk.jartool/sun.tools.jar diff --git a/jdk/test/java/lang/Class/getSimpleName/GetSimpleNameTest.java b/jdk/test/java/lang/Class/getSimpleName/GetSimpleNameTest.java index 69382710191..0dc966caf12 100644 --- a/jdk/test/java/lang/Class/getSimpleName/GetSimpleNameTest.java +++ b/jdk/test/java/lang/Class/getSimpleName/GetSimpleNameTest.java @@ -24,6 +24,7 @@ /* @test * @bug 8057919 * @summary Class.getSimpleName() should work for non-JLS compliant class names + * @modules java.base/jdk.internal.org.objectweb.asm */ import jdk.internal.org.objectweb.asm.*; import static jdk.internal.org.objectweb.asm.Opcodes.*; diff --git a/jdk/test/java/lang/ProcessBuilder/Basic.java b/jdk/test/java/lang/ProcessBuilder/Basic.java index 93855f19bcb..7977c7ff9d2 100644 --- a/jdk/test/java/lang/ProcessBuilder/Basic.java +++ b/jdk/test/java/lang/ProcessBuilder/Basic.java @@ -29,6 +29,7 @@ * 4947220 7018606 7034570 4244896 5049299 8003488 8054494 8058464 * 8067796 * @summary Basic tests for Process and Environment Variable code + * @modules java.base/sun.misc * @run main/othervm/timeout=300 Basic * @run main/othervm/timeout=300 -Djdk.lang.Process.launchMechanism=fork Basic * @author Martin Buchholz diff --git a/jdk/test/java/lang/ProcessBuilder/RedirectWithLongFilename.java b/jdk/test/java/lang/ProcessBuilder/RedirectWithLongFilename.java index c13dda33f8a..ed5551af5b9 100644 --- a/jdk/test/java/lang/ProcessBuilder/RedirectWithLongFilename.java +++ b/jdk/test/java/lang/ProcessBuilder/RedirectWithLongFilename.java @@ -25,6 +25,7 @@ * @test * @bug 8072611 * @summary ProcessBuilder Redirect to file appending on Windows should work with long file names + * @modules java.base/sun.misc * @author Thomas Stuefe */ diff --git a/jdk/test/java/lang/annotation/AnnotationsInheritanceOrderRedefinitionTest.java b/jdk/test/java/lang/annotation/AnnotationsInheritanceOrderRedefinitionTest.java index 909154a7c1e..982852c8dfb 100644 --- a/jdk/test/java/lang/annotation/AnnotationsInheritanceOrderRedefinitionTest.java +++ b/jdk/test/java/lang/annotation/AnnotationsInheritanceOrderRedefinitionTest.java @@ -27,6 +27,7 @@ * @summary Test inheritance, order and class redefinition behaviour of RUNTIME * class annotations * @author plevart + * @modules java.base/sun.reflect.annotation */ import sun.reflect.annotation.AnnotationParser; diff --git a/jdk/test/java/lang/invoke/8022701/MHIllegalAccess.java b/jdk/test/java/lang/invoke/8022701/MHIllegalAccess.java index 44aa9c98253..badc1a817f3 100644 --- a/jdk/test/java/lang/invoke/8022701/MHIllegalAccess.java +++ b/jdk/test/java/lang/invoke/8022701/MHIllegalAccess.java @@ -26,7 +26,7 @@ * @test * @bug 8022701 * @summary Illegal access exceptions via methodhandle invocations threw wrong error. - * + * @modules java.base/jdk.internal.org.objectweb.asm * @compile -XDignore.symbol.file BogoLoader.java InvokeSeveralWays.java MHIllegalAccess.java MethodSupplier.java * @run main/othervm MHIllegalAccess */ diff --git a/jdk/test/java/lang/invoke/RevealDirectTest.java b/jdk/test/java/lang/invoke/RevealDirectTest.java index 2b5ac7c9a02..55cd0b62aa7 100644 --- a/jdk/test/java/lang/invoke/RevealDirectTest.java +++ b/jdk/test/java/lang/invoke/RevealDirectTest.java @@ -24,6 +24,7 @@ /* * @test * @summary verify Lookup.revealDirect on a variety of input handles + * @modules java.base/sun.reflect * @compile -XDignore.symbol.file RevealDirectTest.java * @run junit/othervm -ea -esa test.java.lang.invoke.RevealDirectTest * diff --git a/jdk/test/java/lang/invoke/VMAnonymousClass.java b/jdk/test/java/lang/invoke/VMAnonymousClass.java index f67cba8dc7e..5a2eebfffa8 100644 --- a/jdk/test/java/lang/invoke/VMAnonymousClass.java +++ b/jdk/test/java/lang/invoke/VMAnonymousClass.java @@ -24,6 +24,7 @@ /* @test * @bug 8046903 * @summary VM anonymous class members can't be statically invocable + * @modules java.base/sun.misc java.base/jdk.internal.org.objectweb.asm * @run junit test.java.lang.invoke.VMAnonymousClass */ package test.java.lang.invoke; diff --git a/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java b/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java index 3907ceb1849..b83496f692f 100644 --- a/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java +++ b/jdk/test/java/lang/invoke/accessProtectedSuper/Test.java @@ -26,7 +26,7 @@ * @test * @bug 8022718 * @summary Runtime accessibility checking: protected class, if extended, should be accessible from another package - * + * @modules java.base/jdk.internal.org.objectweb.asm * @compile -XDignore.symbol.file BogoLoader.java MethodInvoker.java Test.java anotherpkg/MethodSupplierOuter.java * @run main/othervm Test */ diff --git a/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java b/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java index 4761967e83d..4defa470c9a 100644 --- a/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java +++ b/jdk/test/java/lang/invoke/lambda/LambdaAccessControlDoPrivilegedTest.java @@ -76,7 +76,7 @@ public class LambdaAccessControlDoPrivilegedTest extends LUtils { doprivJava.delete(); doprivClass.delete(); tr = doExec(JAVA_CMD.getAbsolutePath(), - "-Xbootclasspath/p:foo.jar", + "-Xbootclasspath/a:foo.jar", "-cp", ".", "Bar"); tr.assertZero("testDoPrivileged fails"); barJava.delete(); diff --git a/jdk/test/java/lang/invoke/lambda/LambdaAsm.java b/jdk/test/java/lang/invoke/lambda/LambdaAsm.java index 0f80d17461f..d19ed75e03a 100644 --- a/jdk/test/java/lang/invoke/lambda/LambdaAsm.java +++ b/jdk/test/java/lang/invoke/lambda/LambdaAsm.java @@ -26,6 +26,8 @@ * @bug 8027232 * @summary ensures that j.l.i.InvokerByteCodeGenerator and ASM visitMethodInsn * generate bytecodes with correct constant pool references + * @modules java.base/jdk.internal.org.objectweb.asm + * jdk.compiler/com.sun.tools.classfile * @compile -XDignore.symbol.file LambdaAsm.java LUtils.java * @run main/othervm LambdaAsm */ @@ -133,7 +135,7 @@ public class LambdaAsm { int mcount = 0; try (DirectoryStream ds = newDirectoryStream(new File(".").toPath(), // filter in lambda proxy classes - "A$I$$Lambda$?.class")) { + "A$I$$Lambda$*.class")) { for (Path p : ds) { System.out.println(p.toFile()); ClassFile cf = ClassFile.read(p.toFile()); diff --git a/jdk/test/java/lang/invoke/lambda/LambdaStackTrace.java b/jdk/test/java/lang/invoke/lambda/LambdaStackTrace.java index e2cdb7946a0..cf433d4c4dc 100644 --- a/jdk/test/java/lang/invoke/lambda/LambdaStackTrace.java +++ b/jdk/test/java/lang/invoke/lambda/LambdaStackTrace.java @@ -25,6 +25,7 @@ * @test * @bug 8025636 * @summary Synthetic frames should be hidden in exceptions + * @modules java.base/jdk.internal.org.objectweb.asm * @compile -XDignore.symbol.file LUtils.java LambdaStackTrace.java * @run main LambdaStackTrace */ diff --git a/jdk/test/java/lang/invoke/lookup/SpecialStatic.java b/jdk/test/java/lang/invoke/lookup/SpecialStatic.java index 57f55570752..ea587059c28 100644 --- a/jdk/test/java/lang/invoke/lookup/SpecialStatic.java +++ b/jdk/test/java/lang/invoke/lookup/SpecialStatic.java @@ -24,6 +24,7 @@ /* @test * @bug 8032400 * @summary JSR292: invokeSpecial: InternalError attempting to lookup a method + * @modules java.base/jdk.internal.org.objectweb.asm * @compile -XDignore.symbol.file SpecialStatic.java * @run junit test.java.lang.invoke.lookup.SpecialStatic */ diff --git a/jdk/test/java/lang/reflect/Generics/TestBadSignatures.java b/jdk/test/java/lang/reflect/Generics/TestBadSignatures.java index 6d380244ed2..699c8cb8544 100644 --- a/jdk/test/java/lang/reflect/Generics/TestBadSignatures.java +++ b/jdk/test/java/lang/reflect/Generics/TestBadSignatures.java @@ -26,6 +26,7 @@ * @bug 6832374 7052898 * @summary Test bad signatures get a GenericSignatureFormatError thrown. * @author Joseph D. Darcy + * @modules java.base/sun.reflect.generics.parser */ import java.lang.reflect.*; diff --git a/jdk/test/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java b/jdk/test/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java index 83ead89fe69..e386d463049 100644 --- a/jdk/test/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java +++ b/jdk/test/java/lang/reflect/Method/invoke/TestPrivateInterfaceMethodReflect.java @@ -26,6 +26,7 @@ * @bug 8026213 * @summary Reflection support for private methods in interfaces * @author Robert Field + * @modules java.base/jdk.internal.org.objectweb.asm * @run main TestPrivateInterfaceMethodReflect */ diff --git a/jdk/test/java/net/Authenticator/B4678055.java b/jdk/test/java/net/Authenticator/B4678055.java index dc5befb6d22..f390d9a07be 100644 --- a/jdk/test/java/net/Authenticator/B4678055.java +++ b/jdk/test/java/net/Authenticator/B4678055.java @@ -24,6 +24,7 @@ /** * @test * @bug 4678055 + * @modules java.base/sun.net.www * @library ../../../sun/net/www/httptest/ * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction * @run main B4678055 diff --git a/jdk/test/java/net/Authenticator/B4722333.java b/jdk/test/java/net/Authenticator/B4722333.java index 441e1107887..efc016f91a6 100644 --- a/jdk/test/java/net/Authenticator/B4722333.java +++ b/jdk/test/java/net/Authenticator/B4722333.java @@ -24,6 +24,7 @@ /** * @test * @bug 4722333 + * @modules java.base/sun.net.www * @library ../../../sun/net/www/httptest/ * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction * @run main B4722333 diff --git a/jdk/test/java/net/Authenticator/B4759514.java b/jdk/test/java/net/Authenticator/B4759514.java index d81dd62e3ff..33ecd2e81bd 100644 --- a/jdk/test/java/net/Authenticator/B4759514.java +++ b/jdk/test/java/net/Authenticator/B4759514.java @@ -24,6 +24,7 @@ /** * @test * @bug 4759514 + * @modules java.base/sun.net.www * @library ../../../sun/net/www/httptest/ * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction * @run main B4759514 diff --git a/jdk/test/java/net/Authenticator/B4921848.java b/jdk/test/java/net/Authenticator/B4921848.java index 98a6e594802..37872b7892e 100644 --- a/jdk/test/java/net/Authenticator/B4921848.java +++ b/jdk/test/java/net/Authenticator/B4921848.java @@ -24,6 +24,7 @@ /** * @test * @bug 4921848 + * @modules java.base/sun.net.www * @library ../../../sun/net/www/httptest/ * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction * @run main/othervm -Dhttp.auth.preference=basic B4921848 diff --git a/jdk/test/java/net/Authenticator/B4962064.java b/jdk/test/java/net/Authenticator/B4962064.java index b7eae976275..b2bba7a57ce 100644 --- a/jdk/test/java/net/Authenticator/B4962064.java +++ b/jdk/test/java/net/Authenticator/B4962064.java @@ -24,6 +24,7 @@ /** * @test * @bug 4962064 + * @modules java.base/sun.net.www * @library ../../../sun/net/www/httptest/ * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction * @run main/othervm B4962064 diff --git a/jdk/test/java/net/Authenticator/B6870935.java b/jdk/test/java/net/Authenticator/B6870935.java index 55c634baab4..4985e7df752 100644 --- a/jdk/test/java/net/Authenticator/B6870935.java +++ b/jdk/test/java/net/Authenticator/B6870935.java @@ -24,6 +24,7 @@ /** * @test * @bug 6870935 + * @modules java.base/sun.net.www * @run main/othervm -Dhttp.nonProxyHosts="" -Dhttp.auth.digest.validateProxy=true B6870935 */ diff --git a/jdk/test/java/net/Inet4Address/textToNumericFormat.java b/jdk/test/java/net/Inet4Address/textToNumericFormat.java index be5d8ab3ec8..aff278bc97d 100644 --- a/jdk/test/java/net/Inet4Address/textToNumericFormat.java +++ b/jdk/test/java/net/Inet4Address/textToNumericFormat.java @@ -25,6 +25,7 @@ * @test * @bug 4749938 * @summary Bug in the parsing IPv4 literal addresses + * @modules java.base/sun.net.spi.nameservice * @compile -XDignore.symbol.file=true DummyNameService.java DummyNameServiceDescriptor.java * @run main/othervm -Dsun.net.spi.nameservice.provider.1=dummy,oracle textToNumericFormat */ diff --git a/jdk/test/java/net/ProxySelector/LoopbackAddresses.java b/jdk/test/java/net/ProxySelector/LoopbackAddresses.java index a8c0078f672..16c1315e820 100644 --- a/jdk/test/java/net/ProxySelector/LoopbackAddresses.java +++ b/jdk/test/java/net/ProxySelector/LoopbackAddresses.java @@ -24,6 +24,7 @@ /* @test * @bug 4924226 * @summary PIT: Can no launch jnlp application via 127.0.0.1 address on the web server + * @modules java.base/sun.net.www * @library ../../../sun/net/www/httptest/ * @build ClosedChannelList TestHttpServer HttpTransaction HttpCallback * @compile LoopbackAddresses.java diff --git a/jdk/test/java/net/ProxySelector/ProxyTest.java b/jdk/test/java/net/ProxySelector/ProxyTest.java index 9a7b3e9bbcb..c1b6c2ba41a 100644 --- a/jdk/test/java/net/ProxySelector/ProxyTest.java +++ b/jdk/test/java/net/ProxySelector/ProxyTest.java @@ -25,6 +25,7 @@ * @test * @bug 4696512 * @summary HTTP client: Improve proxy server configuration and selection + * @modules java.base/sun.net.www * @library ../../../sun/net/www/httptest/ * @build ClosedChannelList TestHttpServer HttpTransaction HttpCallback * @compile ProxyTest.java diff --git a/jdk/test/java/net/Socket/HttpProxy.java b/jdk/test/java/net/Socket/HttpProxy.java index 92f14d2d32a..e6de4712615 100644 --- a/jdk/test/java/net/Socket/HttpProxy.java +++ b/jdk/test/java/net/Socket/HttpProxy.java @@ -25,6 +25,7 @@ * @test * @bug 6370908 * @summary Add support for HTTP_CONNECT proxy in Socket class + * @modules java.base/sun.net.www */ import java.io.IOException; diff --git a/jdk/test/java/net/URL/PerConnectionProxy.java b/jdk/test/java/net/URL/PerConnectionProxy.java index 71b39d406a2..4203445cab3 100644 --- a/jdk/test/java/net/URL/PerConnectionProxy.java +++ b/jdk/test/java/net/URL/PerConnectionProxy.java @@ -24,6 +24,7 @@ /* @test * @bug 4920526 * @summary Needs per connection proxy support for URLs + * @modules java.base/sun.net.www * @library ../../../sun/net/www/httptest/ * @build ClosedChannelList TestHttpServer HttpTransaction HttpCallback * @compile PerConnectionProxy.java diff --git a/jdk/test/java/net/URL/SpecifyHandler.java b/jdk/test/java/net/URL/SpecifyHandler.java index 4f7b8dbd35f..c5e45c67c5c 100644 --- a/jdk/test/java/net/URL/SpecifyHandler.java +++ b/jdk/test/java/net/URL/SpecifyHandler.java @@ -26,6 +26,7 @@ * @bug 4135031 * @summary Test new URL contructors that allow specification of a * URLStreamHandler protocol handler. + * @modules java.base/sun.net.www.protocol.file */ import java.net.*; diff --git a/jdk/test/java/net/URLConnection/B5052093.java b/jdk/test/java/net/URLConnection/B5052093.java index be1f23ff312..878a6427724 100644 --- a/jdk/test/java/net/URLConnection/B5052093.java +++ b/jdk/test/java/net/URLConnection/B5052093.java @@ -24,6 +24,7 @@ /* * @test * @bug 5052093 + * @modules java.base/sun.net.www java.base/sun.net.www.protocol.file * @library ../../../sun/net/www/httptest/ * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction * @run main B5052093 diff --git a/jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java b/jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java index 87d1f831ec6..fd1430bf00d 100644 --- a/jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java +++ b/jdk/test/java/net/URLConnection/HandleContentTypeWithAttrs.java @@ -26,6 +26,7 @@ * @bug 4160200 * @summary Make sure URLConnection.getContnentHandler * can handle MIME types with attributes + * @modules java.base/sun.net.www java.base/sun.net.www.content.text */ import java.net.*; import java.io.*; diff --git a/jdk/test/java/nio/file/Files/InterruptCopy.java b/jdk/test/java/nio/file/Files/InterruptCopy.java index c83479c9e46..34ffa0585e8 100644 --- a/jdk/test/java/nio/file/Files/InterruptCopy.java +++ b/jdk/test/java/nio/file/Files/InterruptCopy.java @@ -24,6 +24,7 @@ /* @test * @bug 4313887 6993267 * @summary Unit test for Sun-specific ExtendedCopyOption.INTERRUPTIBLE option + * @modules java.base/com.sun.nio.file * @library .. */ diff --git a/jdk/test/java/nio/file/Files/SBC.java b/jdk/test/java/nio/file/Files/SBC.java index d26428d5f60..584a370f658 100644 --- a/jdk/test/java/nio/file/Files/SBC.java +++ b/jdk/test/java/nio/file/Files/SBC.java @@ -25,6 +25,7 @@ * @bug 4313887 * @summary Unit test for java.nio.file.Files.newByteChannel * @library .. + * @modules java.base/com.sun.nio.file */ import java.nio.ByteBuffer; diff --git a/jdk/test/java/nio/file/WatchService/FileTreeModifier.java b/jdk/test/java/nio/file/WatchService/FileTreeModifier.java index d2bed2bd567..ff26a5f5f1e 100644 --- a/jdk/test/java/nio/file/WatchService/FileTreeModifier.java +++ b/jdk/test/java/nio/file/WatchService/FileTreeModifier.java @@ -25,6 +25,7 @@ * @bug 4313887 6838333 * @summary Sanity test for Sun-specific FILE_TREE watch event modifier * @library .. + * @modules java.base/com.sun.nio.file */ import java.nio.file.*; diff --git a/jdk/test/java/nio/file/WatchService/SensitivityModifier.java b/jdk/test/java/nio/file/WatchService/SensitivityModifier.java index 823539d1a23..6a9f30e8629 100644 --- a/jdk/test/java/nio/file/WatchService/SensitivityModifier.java +++ b/jdk/test/java/nio/file/WatchService/SensitivityModifier.java @@ -24,6 +24,7 @@ /* @test * @bug 4313887 * @summary Sanity test for Sun-specific sensitivity level watch event modifier + * @modules java.base/com.sun.nio.file * @library .. * @run main/timeout=240 SensitivityModifier * @key randomness diff --git a/jdk/test/java/nio/file/WatchService/WithSecurityManager.java b/jdk/test/java/nio/file/WatchService/WithSecurityManager.java index c2cd9c316f5..997144d49a3 100644 --- a/jdk/test/java/nio/file/WatchService/WithSecurityManager.java +++ b/jdk/test/java/nio/file/WatchService/WithSecurityManager.java @@ -24,6 +24,7 @@ /* @test * @bug 4313887 * @summary Unit test for Watchable#register's permission checks + * @modules java.base/com.sun.nio.file * @build WithSecurityManager * @run main/othervm WithSecurityManager denyAll.policy - fail * @run main/othervm WithSecurityManager denyAll.policy tree fail diff --git a/jdk/test/java/rmi/Naming/DefaultRegistryPort.java b/jdk/test/java/rmi/Naming/DefaultRegistryPort.java index 26e6ca31c0c..a1f2b7adfc6 100644 --- a/jdk/test/java/rmi/Naming/DefaultRegistryPort.java +++ b/jdk/test/java/rmi/Naming/DefaultRegistryPort.java @@ -27,6 +27,10 @@ * @summary change in default URL port causes regression in java.rmi.Naming * @author Dana Burns * @library ../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm DefaultRegistryPort */ diff --git a/jdk/test/java/rmi/Naming/LookupIPv6.java b/jdk/test/java/rmi/Naming/LookupIPv6.java index 7dc948b8505..ea8d7d451e1 100644 --- a/jdk/test/java/rmi/Naming/LookupIPv6.java +++ b/jdk/test/java/rmi/Naming/LookupIPv6.java @@ -26,6 +26,10 @@ * IPv6 addresses. * @bug 4402708 * @library ../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm -Djava.net.preferIPv6Addresses=true LookupIPv6 */ diff --git a/jdk/test/java/rmi/Naming/LookupNameWithColon.java b/jdk/test/java/rmi/Naming/LookupNameWithColon.java index 4250b6b37c9..a0d1e9389a0 100644 --- a/jdk/test/java/rmi/Naming/LookupNameWithColon.java +++ b/jdk/test/java/rmi/Naming/LookupNameWithColon.java @@ -27,6 +27,10 @@ * containing embedded ':' characters. * * @library ../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm LookupNameWithColon */ diff --git a/jdk/test/java/rmi/Naming/RmiIsNoScheme.java b/jdk/test/java/rmi/Naming/RmiIsNoScheme.java index fe6d1ab4031..a044ff10207 100644 --- a/jdk/test/java/rmi/Naming/RmiIsNoScheme.java +++ b/jdk/test/java/rmi/Naming/RmiIsNoScheme.java @@ -29,6 +29,10 @@ * @author Ann Wollrath * * @library ../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm RmiIsNoScheme */ diff --git a/jdk/test/java/rmi/Naming/UnderscoreHost.java b/jdk/test/java/rmi/Naming/UnderscoreHost.java index b88ca628e9a..c253ec20441 100644 --- a/jdk/test/java/rmi/Naming/UnderscoreHost.java +++ b/jdk/test/java/rmi/Naming/UnderscoreHost.java @@ -29,6 +29,10 @@ * @author Vinod Johnson * * @library ../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary UnderscoreHost_Stub * @run main/othervm UnderscoreHost */ diff --git a/jdk/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java b/jdk/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java index 418c3726c2d..7016e00f43c 100644 --- a/jdk/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java +++ b/jdk/test/java/rmi/Naming/legalRegistryNames/LegalRegistryNames.java @@ -27,6 +27,10 @@ * @summary Naming assumes '/' is present in relative URL; change in URL causes regression * @author Dana Burns * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary Legal LegalRegistryNames_Stub * @run main/othervm LegalRegistryNames */ diff --git a/jdk/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java b/jdk/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java index 58f1f253517..32e07a4b796 100644 --- a/jdk/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java +++ b/jdk/test/java/rmi/activation/Activatable/checkActivateRef/CheckActivateRef.java @@ -36,6 +36,10 @@ * functionality is in place * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivateMe CheckActivateRef_Stub * @run main/othervm/policy=security.policy/timeout=240 -Djava.rmi.server.ignoreStubClasses=true CheckActivateRef * @run main/othervm/policy=security.policy/timeout=240 -Djava.rmi.server.ignoreStubClasses=false CheckActivateRef diff --git a/jdk/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java b/jdk/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java index 126fae1e521..e99f62faba9 100644 --- a/jdk/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java +++ b/jdk/test/java/rmi/activation/Activatable/checkAnnotations/CheckAnnotations.java @@ -28,6 +28,10 @@ * @author Laird Dornin; code borrowed from Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID MyRMI CheckAnnotations_Stub * @run main/othervm/policy=security.policy/timeout=480 CheckAnnotations */ diff --git a/jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java b/jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java index dc54f82459b..46cadd1fd45 100644 --- a/jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java +++ b/jdk/test/java/rmi/activation/Activatable/checkImplClassLoader/CheckImplClassLoader.java @@ -27,6 +27,10 @@ * @author Laird Dornin; code borrowed from Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID * MyRMI ActivatableImpl ActivatableImpl ActivatableImpl_Stub * @run main/othervm/policy=security.policy/timeout=150 CheckImplClassLoader diff --git a/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java b/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java index 0d03562346c..8939f6764e8 100644 --- a/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java +++ b/jdk/test/java/rmi/activation/Activatable/checkRegisterInLog/CheckRegisterInLog.java @@ -27,6 +27,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary * ActivateMe CheckRegisterInLog_Stub * @run main/othervm/policy=security.policy/timeout=240 CheckRegisterInLog diff --git a/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java b/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java index 414527dfa4b..8ac5c1ecaa6 100644 --- a/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java +++ b/jdk/test/java/rmi/activation/Activatable/createPrivateActivable/CreatePrivateActivatable.java @@ -27,6 +27,10 @@ * @author Laird Dornin * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivateMe * @run main/othervm/policy=security.policy/timeout=240 CreatePrivateActivatable */ diff --git a/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java b/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java index 9f236978a4a..7e63afba1ae 100644 --- a/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java +++ b/jdk/test/java/rmi/activation/Activatable/downloadParameterClass/DownloadParameterClass.java @@ -31,6 +31,10 @@ * @author Peter Jones (much code taken from Ann Wollrath's activation tests) * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary * Foo FooReceiverImpl FooReceiverImpl_Stub Bar * @run main/othervm/policy=security.policy/timeout=240 DownloadParameterClass diff --git a/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java b/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java index 0e0efb52cd5..ff741b0bd0e 100644 --- a/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java +++ b/jdk/test/java/rmi/activation/Activatable/elucidateNoSuchMethod/ElucidateNoSuchMethod.java @@ -27,6 +27,10 @@ * @author Laird Dornin * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivateMe ElucidateNoSuchMethod_Stub * @run main/othervm/policy=security.policy/timeout=240 ElucidateNoSuchMethod */ diff --git a/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java b/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java index 55ff0cfd14e..53710ceb971 100644 --- a/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java +++ b/jdk/test/java/rmi/activation/Activatable/forceLogSnapshot/ForceLogSnapshot.java @@ -27,6 +27,10 @@ * @author Laird Dornin * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary * ActivateMe ForceLogSnapshot_Stub * @run main/othervm/policy=security.policy/timeout=640 ForceLogSnapshot diff --git a/jdk/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java b/jdk/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java index 145e6109df8..fdce05cbc39 100644 --- a/jdk/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java +++ b/jdk/test/java/rmi/activation/Activatable/inactiveGroup/InactiveGroup.java @@ -29,6 +29,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary ActivateMe InactiveGroup_Stub * @run main/othervm/policy=security.policy/timeout=240 InactiveGroup */ diff --git a/jdk/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java b/jdk/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java index df778dc8e91..4770f298919 100644 --- a/jdk/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java +++ b/jdk/test/java/rmi/activation/Activatable/lookupActivationSystem/LookupActivationSystem.java @@ -29,6 +29,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary * @run main/othervm/timeout=240 LookupActivationSystem */ diff --git a/jdk/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java b/jdk/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java index 507912e90b5..a1ddf4d9ed4 100644 --- a/jdk/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java +++ b/jdk/test/java/rmi/activation/Activatable/nestedActivate/NestedActivate.java @@ -27,6 +27,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary ActivateMe NestedActivate_Stub * @run main/othervm/policy=security.policy/timeout=240 NestedActivate */ diff --git a/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java b/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java index df8ddbef82c..1e422e3697a 100644 --- a/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java +++ b/jdk/test/java/rmi/activation/Activatable/nonExistentActivatable/NonExistentActivatable.java @@ -28,6 +28,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary * ActivateMe NonExistentActivatable_Stub * @run main/othervm/policy=security.policy/timeout=240 NonExistentActivatable diff --git a/jdk/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java b/jdk/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java index c3026b02c93..0e8e7003cff 100644 --- a/jdk/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java +++ b/jdk/test/java/rmi/activation/Activatable/restartCrashedService/RestartCrashedService.java @@ -28,6 +28,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivateMe RestartCrashedService_Stub * @run main/othervm/policy=security.policy/timeout=240 RestartCrashedService */ diff --git a/jdk/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java b/jdk/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java index 3bbe8a60c44..1ce28b26d6c 100644 --- a/jdk/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java +++ b/jdk/test/java/rmi/activation/Activatable/restartLatecomer/RestartLatecomer.java @@ -27,6 +27,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary * RestartLatecomer RestartLatecomer_Stub * @run main/othervm/policy=security.policy/timeout=240 RestartLatecomer diff --git a/jdk/test/java/rmi/activation/Activatable/restartService/RestartService.java b/jdk/test/java/rmi/activation/Activatable/restartService/RestartService.java index 468f5b239f1..221ae5b3401 100644 --- a/jdk/test/java/rmi/activation/Activatable/restartService/RestartService.java +++ b/jdk/test/java/rmi/activation/Activatable/restartService/RestartService.java @@ -27,6 +27,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary ActivateMe RestartService_Stub * @run main/othervm/policy=security.policy/timeout=240 RestartService */ diff --git a/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java b/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java index f5c04829291..d2c6a454995 100644 --- a/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java +++ b/jdk/test/java/rmi/activation/Activatable/shutdownGracefully/ShutdownGracefully.java @@ -28,6 +28,10 @@ * @author Laird Dornin; code borrowed from Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID * TestSecurityManager RegisteringActivatable ShutdownGracefully_Stub * @run main/othervm/policy=security.policy/timeout=700 ShutdownGracefully diff --git a/jdk/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java b/jdk/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java index 085120b159d..08f717f78d1 100644 --- a/jdk/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java +++ b/jdk/test/java/rmi/activation/Activatable/unregisterInactive/UnregisterInactive.java @@ -28,6 +28,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary ActivateMe UnregisterInactive_Stub * @run main/othervm/policy=security.policy/timeout=240 UnregisterInactive */ diff --git a/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java b/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java index 6d9ccceb141..efd6c3095ab 100644 --- a/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java +++ b/jdk/test/java/rmi/activation/ActivateFailedException/activateFails/ActivateFails.java @@ -31,6 +31,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary * ActivateMe ActivateFails_Stub ShutdownThread * @run main/othervm/java.security.policy=security.policy/timeout=240 ActivateFails diff --git a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java b/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java index 2f025cf25b8..2752d729344 100644 --- a/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java +++ b/jdk/test/java/rmi/activation/ActivationGroup/downloadActivationGroup/DownloadActivationGroup.java @@ -32,6 +32,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary * DownloadActivationGroup MyActivationGroupImpl DownloadActivationGroup_Stub * @run main/othervm/policy=security.policy/timeout=240 DownloadActivationGroup diff --git a/jdk/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java b/jdk/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java index 38c668bf799..b329ea2e14b 100644 --- a/jdk/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java +++ b/jdk/test/java/rmi/activation/ActivationGroupDesc/checkDefaultGroupName/CheckDefaultGroupName.java @@ -30,6 +30,10 @@ * @author Laird Dornin * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main CheckDefaultGroupName */ diff --git a/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java b/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java index 058d3c7e2d9..521598de8f0 100644 --- a/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java +++ b/jdk/test/java/rmi/activation/ActivationSystem/activeGroup/IdempotentActiveGroup.java @@ -29,6 +29,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary * @run main/othervm/policy=security.policy/timeout=480 IdempotentActiveGroup */ diff --git a/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java b/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java index 53ff030e393..1675a7275c8 100644 --- a/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java +++ b/jdk/test/java/rmi/activation/ActivationSystem/modifyDescriptor/ModifyDescriptor.java @@ -29,6 +29,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary * ActivateMe ModifyDescriptor_Stub * @run main/othervm/policy=security.policy/timeout=240 ModifyDescriptor diff --git a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java b/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java index f4970da26ad..9de4500c542 100644 --- a/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java +++ b/jdk/test/java/rmi/activation/ActivationSystem/stubClassesPermitted/StubClassesPermitted.java @@ -27,6 +27,11 @@ * @author Laird Dornin * * @library ../../../testlibrary + * @modules java.base/sun.security.provider + * java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary * CanCreateStubs StubClassesPermitted_Stub * @run main/othervm/java.security.policy=security.policy/secure=java.lang.SecurityManager/timeout=240 StubClassesPermitted diff --git a/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java b/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java index 94976dc0c6f..7f4e1d22dee 100644 --- a/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java +++ b/jdk/test/java/rmi/activation/ActivationSystem/unregisterGroup/UnregisterGroup.java @@ -28,6 +28,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary ActivateMe * @run main/othervm/policy=security.policy UnregisterGroup */ diff --git a/jdk/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java b/jdk/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java index 69274a0a797..0e132413c6b 100644 --- a/jdk/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java +++ b/jdk/test/java/rmi/activation/CommandEnvironment/SetChildEnv.java @@ -35,6 +35,10 @@ * @author Adrian Colley * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary * Eliza Retireable Doctor Doctor_Stub * @run main/othervm/timeout=240/policy=security.policy diff --git a/jdk/test/java/rmi/activation/log/LogTest.java b/jdk/test/java/rmi/activation/log/LogTest.java index 7d64a3dde6e..91d4726754b 100644 --- a/jdk/test/java/rmi/activation/log/LogTest.java +++ b/jdk/test/java/rmi/activation/log/LogTest.java @@ -29,6 +29,7 @@ * boundaries * @author Ann Wollrath * + * @modules java.rmi/sun.rmi.log * @run main/othervm/timeout=240 LogTest */ diff --git a/jdk/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java b/jdk/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java index d375fc84611..837c5979da4 100644 --- a/jdk/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java +++ b/jdk/test/java/rmi/activation/rmidViaInheritedChannel/InheritedChannelNotServerSocket.java @@ -29,6 +29,11 @@ * @author Peter Jones * * @library ../../testlibrary + * @modules java.base/sun.nio.ch + * java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary * @run main/othervm/timeout=240 InheritedChannelNotServerSocket */ diff --git a/jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java b/jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java index 1f3cd6603d5..115454e256f 100644 --- a/jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java +++ b/jdk/test/java/rmi/activation/rmidViaInheritedChannel/RmidViaInheritedChannel.java @@ -27,6 +27,11 @@ * @author Ann Wollrath * * @library ../../testlibrary + * @modules java.base/sun.nio.ch + * java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID ActivationLibrary * @run main/othervm/timeout=240 RmidViaInheritedChannel */ diff --git a/jdk/test/java/rmi/dgc/VMID/CheckVMID.java b/jdk/test/java/rmi/dgc/VMID/CheckVMID.java index 05859f5ebf1..692969cc5af 100644 --- a/jdk/test/java/rmi/dgc/VMID/CheckVMID.java +++ b/jdk/test/java/rmi/dgc/VMID/CheckVMID.java @@ -30,6 +30,10 @@ * @author Ann Wollrath * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm/policy=security.policy CheckVMID */ diff --git a/jdk/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java b/jdk/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java index d6691104c38..c4a15b28bb1 100644 --- a/jdk/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java +++ b/jdk/test/java/rmi/dgc/dgcImplInsulation/DGCImplInsulation.java @@ -31,6 +31,10 @@ * @author Peter Jones * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary DGCImplInsulation_Stub * @run main/othervm/policy=security.policy DGCImplInsulation */ diff --git a/jdk/test/java/rmi/invalidName/InvalidName.java b/jdk/test/java/rmi/invalidName/InvalidName.java index 93218ec5308..ca1f247390c 100644 --- a/jdk/test/java/rmi/invalidName/InvalidName.java +++ b/jdk/test/java/rmi/invalidName/InvalidName.java @@ -32,6 +32,10 @@ * @author Laird Dornin * * @library ../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm InvalidName */ diff --git a/jdk/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java b/jdk/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java index ebad01300ae..7f36832e98a 100644 --- a/jdk/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java +++ b/jdk/test/java/rmi/registry/altSecurityManager/AltSecurityManager.java @@ -27,6 +27,10 @@ * @author Laird Dornin * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary JavaVM RMID TestSecurityManager * @run main/othervm AltSecurityManager */ diff --git a/jdk/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java b/jdk/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java index 3447366a2e1..d83340bb8b0 100644 --- a/jdk/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java +++ b/jdk/test/java/rmi/registry/classPathCodebase/ClassPathCodebase.java @@ -30,6 +30,10 @@ * @author Peter Jones * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary Dummy * @run main/othervm/policy=security.policy * -Djava.rmi.server.useCodebaseOnly=false ClassPathCodebase diff --git a/jdk/test/java/rmi/registry/emptyName/EmptyName.java b/jdk/test/java/rmi/registry/emptyName/EmptyName.java index d572b8f8a35..e3f271ae589 100644 --- a/jdk/test/java/rmi/registry/emptyName/EmptyName.java +++ b/jdk/test/java/rmi/registry/emptyName/EmptyName.java @@ -25,6 +25,10 @@ * @bug 4399304 * @summary check that registry allows empty names * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm EmptyName */ diff --git a/jdk/test/java/rmi/registry/interfaceHash/InterfaceHash.java b/jdk/test/java/rmi/registry/interfaceHash/InterfaceHash.java index 88188639322..b324666e650 100644 --- a/jdk/test/java/rmi/registry/interfaceHash/InterfaceHash.java +++ b/jdk/test/java/rmi/registry/interfaceHash/InterfaceHash.java @@ -36,6 +36,10 @@ * * @author Peter Jones * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary ReferenceRegistryStub * @run main/othervm InterfaceHash * @key intermittent diff --git a/jdk/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java b/jdk/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java index 1945ebe8db3..5ec8265bf65 100644 --- a/jdk/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java +++ b/jdk/test/java/rmi/registry/multipleRegistries/MultipleRegistries.java @@ -27,6 +27,10 @@ * @author Ann Wollrath * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm/timeout=240 MultipleRegistries */ diff --git a/jdk/test/java/rmi/registry/reexport/Reexport.java b/jdk/test/java/rmi/registry/reexport/Reexport.java index 3841178533e..a0c9707a74a 100644 --- a/jdk/test/java/rmi/registry/reexport/Reexport.java +++ b/jdk/test/java/rmi/registry/reexport/Reexport.java @@ -25,6 +25,10 @@ * @bug 4120329 * @summary RMI registry creation is impossible if first attempt fails. * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary JavaVM RegistryRunner RegistryRunner_Stub * @run main/othervm Reexport */ diff --git a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/Main.java b/jdk/test/java/rmi/reliability/benchmark/bench/rmi/Main.java index efc4d5eac71..34cd478995e 100644 --- a/jdk/test/java/rmi/reliability/benchmark/bench/rmi/Main.java +++ b/jdk/test/java/rmi/reliability/benchmark/bench/rmi/Main.java @@ -26,6 +26,11 @@ * @summary The RMI benchmark test. This java class is used to run the test * under JTREG. * @library ../../../../testlibrary ../../ + * @modules java.desktop + * java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary bench.BenchInfo bench.HtmlReporter bench.Util * bench.Benchmark bench.Reporter bench.XmlReporter bench.ConfigFormatException * bench.Harness bench.TextReporter bench.rmi.BenchServer diff --git a/jdk/test/java/rmi/reliability/juicer/AppleUserImpl.java b/jdk/test/java/rmi/reliability/juicer/AppleUserImpl.java index 70b187e25bc..8aeba6dd6aa 100644 --- a/jdk/test/java/rmi/reliability/juicer/AppleUserImpl.java +++ b/jdk/test/java/rmi/reliability/juicer/AppleUserImpl.java @@ -55,6 +55,10 @@ * has been reached. * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * Apple AppleEvent AppleImpl * Orange OrangeEcho OrangeEchoImpl OrangeImpl diff --git a/jdk/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java b/jdk/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java index 4e724d24f67..fa438cfeb62 100644 --- a/jdk/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java +++ b/jdk/test/java/rmi/server/RMIClassLoader/delegateBeforePermissionCheck/DelegateBeforePermissionCheck.java @@ -33,6 +33,10 @@ * @author Peter Jones * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary Foo * @run main/othervm DelegateBeforePermissionCheck */ diff --git a/jdk/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java b/jdk/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java index 9ffde81d7f7..ec8ef6b9eb7 100644 --- a/jdk/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java +++ b/jdk/test/java/rmi/server/RMIClassLoader/delegateToContextLoader/DelegateToContextLoader.java @@ -29,6 +29,10 @@ * @author Peter Jones * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary Dummy * @run main/othervm/policy=security.policy/timeout=120 DelegateToContextLoader */ diff --git a/jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java b/jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java index 6067f0854d7..8cba35ba527 100644 --- a/jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java +++ b/jdk/test/java/rmi/server/RMIClassLoader/downloadArrayClass/DownloadArrayClass.java @@ -31,6 +31,10 @@ * @author Peter Jones * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary Receiver DownloadArrayClass_Stub Foo * @run main/othervm/policy=security.policy DownloadArrayClass */ diff --git a/jdk/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java b/jdk/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java index 557a846ef98..d181068c656 100644 --- a/jdk/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java +++ b/jdk/test/java/rmi/server/RMIClassLoader/getClassAnnotation/NullClass.java @@ -28,6 +28,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm NullClass */ diff --git a/jdk/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java b/jdk/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java index bed73540eff..c1deb15da5e 100644 --- a/jdk/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java +++ b/jdk/test/java/rmi/server/RMIClassLoader/getClassLoader/GetClassLoader.java @@ -29,6 +29,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary Foo * @run main/othervm/policy=security.policy GetClassLoader */ diff --git a/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java b/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java index cf858535e45..9b8ed213160 100644 --- a/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java +++ b/jdk/test/java/rmi/server/RMIClassLoader/loadProxyClasses/LoadProxyClasses.java @@ -30,6 +30,10 @@ * @author Laird Dornin * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary FnnClass FnnUnmarshal NonpublicInterface * NonpublicInterface1 PublicInterface PublicInterface1 * @run main/othervm/policy=security.policy diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java b/jdk/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java index 9f114d5dc47..fb0af3233c2 100644 --- a/jdk/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java +++ b/jdk/test/java/rmi/server/RMIClassLoader/spi/ContextInsulation.java @@ -30,6 +30,10 @@ * @author Peter Jones * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary ServiceConfiguration TestProvider TestProvider2 * @run main/othervm/policy=security.policy ContextInsulation */ diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java b/jdk/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java index 15ce7cc4f79..59f89510620 100644 --- a/jdk/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java +++ b/jdk/test/java/rmi/server/RMIClassLoader/spi/DefaultProperty.java @@ -29,6 +29,10 @@ * @author Peter Jones * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary ServiceConfiguration Foo * @run main/othervm/policy=security.policy DefaultProperty */ diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/Installed.java b/jdk/test/java/rmi/server/RMIClassLoader/spi/Installed.java index 7e236d62316..194dd01268c 100644 --- a/jdk/test/java/rmi/server/RMIClassLoader/spi/Installed.java +++ b/jdk/test/java/rmi/server/RMIClassLoader/spi/Installed.java @@ -29,6 +29,10 @@ * @author Peter Jones * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary ServiceConfiguration TestProvider TestProvider2 * @run main/othervm/policy=security.policy Installed */ diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java b/jdk/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java index dbc5a10bf5c..bdf73067c08 100644 --- a/jdk/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java +++ b/jdk/test/java/rmi/server/RMIClassLoader/spi/InvalidProperty.java @@ -29,6 +29,10 @@ * @author Peter Jones * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary ServiceConfiguration * @run main/othervm/policy=security.policy InvalidProperty */ diff --git a/jdk/test/java/rmi/server/RMIClassLoader/spi/Property.java b/jdk/test/java/rmi/server/RMIClassLoader/spi/Property.java index 1d9f6947b7e..b13322773a8 100644 --- a/jdk/test/java/rmi/server/RMIClassLoader/spi/Property.java +++ b/jdk/test/java/rmi/server/RMIClassLoader/spi/Property.java @@ -29,6 +29,10 @@ * @author Peter Jones * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary ServiceConfiguration TestProvider * @run main/othervm/policy=security.policy Property */ diff --git a/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java b/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java index 77f6cbaae15..7f921994b84 100644 --- a/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java +++ b/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnly/UseCodebaseOnly.java @@ -31,6 +31,10 @@ * @author Peter Jones * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary Receiver UseCodebaseOnly_Stub Foo Bar * @run main/othervm/policy=security.policy UseCodebaseOnly */ diff --git a/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnlyDefault/UseCodebaseOnlyDefault.java b/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnlyDefault/UseCodebaseOnlyDefault.java index 80dfd7d704a..6520d26bec1 100644 --- a/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnlyDefault/UseCodebaseOnlyDefault.java +++ b/jdk/test/java/rmi/server/RMIClassLoader/useCodebaseOnlyDefault/UseCodebaseOnlyDefault.java @@ -27,6 +27,7 @@ * @summary Tests proper parsing and defaulting of the * "java.rmi.server.useCodebaseOnly" property. * + * @modules java.rmi/sun.rmi.server * @run main/othervm UseCodebaseOnlyDefault true * @run main/othervm -Djava.rmi.server.useCodebaseOnly=xyzzy UseCodebaseOnlyDefault true * @run main/othervm -Djava.rmi.server.useCodebaseOnly UseCodebaseOnlyDefault true diff --git a/jdk/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java b/jdk/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java index c39b33036ba..486e44f5ee0 100644 --- a/jdk/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java +++ b/jdk/test/java/rmi/server/RMIClassLoader/useGetURLs/UseGetURLs.java @@ -30,6 +30,10 @@ * @author Peter Jones * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary Dummy * @run main/othervm/policy=security.policy/timeout=120 UseGetURLs */ diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java index 5157f789c75..a9cb118ebea 100644 --- a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java +++ b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/activatable/UseCustomSocketFactory.java @@ -28,6 +28,10 @@ * @author Ann Wollrath * * @library ../../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary Echo EchoImpl EchoImpl_Stub * @run main/othervm/policy=security.policy/timeout=360 UseCustomSocketFactory */ diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java index 774e823e857..1a39bc79b64 100644 --- a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java +++ b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/registry/UseCustomSocketFactory.java @@ -29,6 +29,10 @@ * @author Laird Dornin; code borrowed from Ann Wollrath * * @library ../../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary Compress Hello HelloImpl HelloImpl_Stub * @run main/othervm/policy=security.policy/timeout=240 UseCustomSocketFactory */ diff --git a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java index 8995aa3f213..21ff49ce8ec 100644 --- a/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java +++ b/jdk/test/java/rmi/server/RMISocketFactory/useSocketFactory/unicast/UseCustomSocketFactory.java @@ -29,6 +29,10 @@ * @author Ann Wollrath * * @library ../../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary RMID JavaVM Echo EchoImpl EchoImpl_Stub * @run main/othervm/policy=security.policy/timeout=120 UseCustomSocketFactory */ diff --git a/jdk/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java b/jdk/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java index 58621132e6b..2000502f6b3 100644 --- a/jdk/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java +++ b/jdk/test/java/rmi/server/RemoteObject/verifyRemoteEquals/VerifyRemoteEquals.java @@ -29,6 +29,10 @@ * @author Laird Dornin * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm/timeout=40 VerifyRemoteEquals */ diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java b/jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java index 780e7e5c7f1..27530b99bae 100644 --- a/jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java +++ b/jdk/test/java/rmi/server/UnicastRemoteObject/keepAliveDuringCall/KeepAliveDuringCall.java @@ -32,6 +32,10 @@ * @author Peter Jones * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary JavaVM KeepAliveDuringCall_Stub * ShutdownMonitor Shutdown ShutdownImpl ShutdownImpl_Stub * @run main/othervm KeepAliveDuringCall diff --git a/jdk/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java b/jdk/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java index 62804feb6e0..f529f64ce0f 100644 --- a/jdk/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java +++ b/jdk/test/java/rmi/server/UnicastRemoteObject/unexportObject/UnexportLeak.java @@ -29,6 +29,10 @@ * @author Ann Wollrath * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary UnexportLeak_Stub Ping * @run main/othervm UnexportLeak */ diff --git a/jdk/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java b/jdk/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java index a268aab9509..63d744c8779 100644 --- a/jdk/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java +++ b/jdk/test/java/rmi/server/Unmarshal/checkUnmarshalOnStopThread/CheckUnmarshalOnStopThread.java @@ -31,6 +31,10 @@ * @author Laird Dornin * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary CheckUnmarshal CheckUnmarshalOnStopThread_Stub * PoisonPill RuntimeExceptionParameter * @run main/othervm/timeout=480 CheckUnmarshalOnStopThread diff --git a/jdk/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java b/jdk/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java index f15883ca806..0694209dffe 100644 --- a/jdk/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java +++ b/jdk/test/java/rmi/server/Unreferenced/finiteGCLatency/FiniteGCLatency.java @@ -35,6 +35,10 @@ * @author Peter Jones * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary FiniteGCLatency_Stub * @run main/othervm/timeout=120 FiniteGCLatency */ diff --git a/jdk/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java b/jdk/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java index b488e762f9a..61121578c1e 100644 --- a/jdk/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java +++ b/jdk/test/java/rmi/server/Unreferenced/leaseCheckInterval/LeaseCheckInterval.java @@ -37,6 +37,10 @@ * @author Peter Jones * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary JavaVM LeaseCheckInterval_Stub SelfTerminator * @run main/othervm LeaseCheckInterval */ diff --git a/jdk/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java b/jdk/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java index 05be7aed087..f468779c9a7 100644 --- a/jdk/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java +++ b/jdk/test/java/rmi/server/Unreferenced/unreferencedContext/UnreferencedContext.java @@ -39,6 +39,10 @@ * @author Laird Dornin * * @library ../../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary UnreferencedContext_Stub * @run main/othervm/timeout=120 UnreferencedContext */ diff --git a/jdk/test/java/rmi/server/clientStackTrace/ClientStackTrace.java b/jdk/test/java/rmi/server/clientStackTrace/ClientStackTrace.java index 9ef39f1529e..a4db112ab7b 100644 --- a/jdk/test/java/rmi/server/clientStackTrace/ClientStackTrace.java +++ b/jdk/test/java/rmi/server/clientStackTrace/ClientStackTrace.java @@ -28,6 +28,10 @@ * @author Laird Dornin * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary ClientStackTrace MyRemoteObject_Stub * @run main/othervm/policy=security.policy/timeout=120 ClientStackTrace */ diff --git a/jdk/test/java/rmi/server/getRemoteClass/GetRemoteClass.java b/jdk/test/java/rmi/server/getRemoteClass/GetRemoteClass.java index 8757bd1696f..ee2df053706 100644 --- a/jdk/test/java/rmi/server/getRemoteClass/GetRemoteClass.java +++ b/jdk/test/java/rmi/server/getRemoteClass/GetRemoteClass.java @@ -28,6 +28,10 @@ * @author Laird Dornin * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm GetRemoteClass */ diff --git a/jdk/test/java/rmi/server/useCustomRef/UseCustomRef.java b/jdk/test/java/rmi/server/useCustomRef/UseCustomRef.java index 23d784706ca..bbb271c8b6b 100644 --- a/jdk/test/java/rmi/server/useCustomRef/UseCustomRef.java +++ b/jdk/test/java/rmi/server/useCustomRef/UseCustomRef.java @@ -31,6 +31,10 @@ * 4180392 * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary Ping UseCustomRef_Stub UseCustomRef_Skel * @run main/othervm/policy=security.policy/secure=java.rmi.RMISecurityManager/timeout=120 UseCustomRef * diff --git a/jdk/test/java/rmi/transport/checkFQDN/CheckFQDN.java b/jdk/test/java/rmi/transport/checkFQDN/CheckFQDN.java index deceb2795f9..b9c8f9861d1 100644 --- a/jdk/test/java/rmi/transport/checkFQDN/CheckFQDN.java +++ b/jdk/test/java/rmi/transport/checkFQDN/CheckFQDN.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 1998, 2013, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 1998, 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 @@ -33,6 +33,10 @@ * @author Laird Dornin * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary CheckFQDNClient CheckFQDN_Stub TellServerName * @run main/othervm/timeout=120 CheckFQDN */ diff --git a/jdk/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java b/jdk/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java index b32a8a51b0a..b54cbfb3d2c 100644 --- a/jdk/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java +++ b/jdk/test/java/rmi/transport/checkLeaseInfoLeak/CheckLeaseLeak.java @@ -28,6 +28,10 @@ * @author Laird Dornin * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary CheckLeaseLeak_Stub LeaseLeakClient LeaseLeak * @run main/othervm/timeout=240 CheckLeaseLeak * diff --git a/jdk/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java b/jdk/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java index 756924af39f..4209bdccc57 100644 --- a/jdk/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java +++ b/jdk/test/java/rmi/transport/closeServerSocket/CloseServerSocket.java @@ -31,6 +31,10 @@ * @author Peter Jones * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm CloseServerSocket */ diff --git a/jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java b/jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java index bcd58a0a6a5..7cddcd7d436 100644 --- a/jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java +++ b/jdk/test/java/rmi/transport/dgcDeadLock/DGCDeadLock.java @@ -28,6 +28,10 @@ * @author Laird Dornin * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary Test TestImpl TestImpl_Stub * @run main/othervm/policy=security.policy/timeout=360 DGCDeadLock */ diff --git a/jdk/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java b/jdk/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java index ed1ba8e0715..fc7341f7be3 100644 --- a/jdk/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java +++ b/jdk/test/java/rmi/transport/handshakeFailure/HandshakeFailure.java @@ -31,6 +31,10 @@ * @author Peter Jones * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm HandshakeFailure */ diff --git a/jdk/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java b/jdk/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java index ba492f4194d..7a20f20234c 100644 --- a/jdk/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java +++ b/jdk/test/java/rmi/transport/handshakeTimeout/HandshakeTimeout.java @@ -34,6 +34,10 @@ * @author Peter Jones * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm HandshakeTimeout */ diff --git a/jdk/test/java/rmi/transport/httpSocket/HttpSocketTest.java b/jdk/test/java/rmi/transport/httpSocket/HttpSocketTest.java index 032c4cdc532..8999c3d7310 100644 --- a/jdk/test/java/rmi/transport/httpSocket/HttpSocketTest.java +++ b/jdk/test/java/rmi/transport/httpSocket/HttpSocketTest.java @@ -27,6 +27,11 @@ * @author Dana Burns * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.proxy + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary HttpSocketTest HttpSocketTest_Stub * @run main/othervm/policy=security.policy HttpSocketTest */ diff --git a/jdk/test/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java b/jdk/test/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java index 51dc4c849b4..2113178bc44 100644 --- a/jdk/test/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java +++ b/jdk/test/java/rmi/transport/pinClientSocketFactory/PinClientSocketFactory.java @@ -32,6 +32,10 @@ * @author Peter Jones * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm -Dsun.rmi.transport.connectionTimeout=2000 * PinClientSocketFactory diff --git a/jdk/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java b/jdk/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java index 4080bfa7e74..38c2e2a0042 100644 --- a/jdk/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java +++ b/jdk/test/java/rmi/transport/rapidExportUnexport/RapidExportUnexport.java @@ -32,6 +32,10 @@ * @author Peter Jones * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm RapidExportUnexport */ diff --git a/jdk/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java b/jdk/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java index e5e7d80b49f..6fce16108f1 100644 --- a/jdk/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java +++ b/jdk/test/java/rmi/transport/reuseDefaultPort/ReuseDefaultPort.java @@ -34,6 +34,10 @@ * @author Peter Jones * * @library ../../testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm ReuseDefaultPort */ diff --git a/jdk/test/java/security/BasicPermission/Wildcard.java b/jdk/test/java/security/BasicPermission/Wildcard.java index 3b6d1c58eea..9a7441defb2 100644 --- a/jdk/test/java/security/BasicPermission/Wildcard.java +++ b/jdk/test/java/security/BasicPermission/Wildcard.java @@ -33,6 +33,8 @@ import javax.net.ssl.SSLPermission; * @summary Check that BasicPermission subclasses don't throw exception if name * contains wildcard character ("*") but does not signify a * wildcard match + * @modules java.base/com.sun.net.ssl + * java.sql */ public class Wildcard { diff --git a/jdk/test/java/security/KeyPairGenerator/SolarisShortDSA.java b/jdk/test/java/security/KeyPairGenerator/SolarisShortDSA.java index 69ed492ed54..53195962e17 100644 --- a/jdk/test/java/security/KeyPairGenerator/SolarisShortDSA.java +++ b/jdk/test/java/security/KeyPairGenerator/SolarisShortDSA.java @@ -25,6 +25,7 @@ * @test * @bug 7081411 * @summary DSA keypair generation affected by Solaris bug + * @modules java.base/sun.security.provider */ import java.security.KeyPair; diff --git a/jdk/test/java/security/PermissionCollection/Concurrent.java b/jdk/test/java/security/PermissionCollection/Concurrent.java index 3c61c046486..81915141d0c 100644 --- a/jdk/test/java/security/PermissionCollection/Concurrent.java +++ b/jdk/test/java/security/PermissionCollection/Concurrent.java @@ -25,6 +25,7 @@ * @test * @bug 4671598 * @summary PermissionCollection is not properly synchronized + * @modules java.rmi/com.sun.rmi.rmid */ import java.security.*; // AllPermission, BasicPermission, Permissions diff --git a/jdk/test/java/security/Policy/GetInstance/GetInstance.java b/jdk/test/java/security/Policy/GetInstance/GetInstance.java index 858ae081495..d399db20f71 100644 --- a/jdk/test/java/security/Policy/GetInstance/GetInstance.java +++ b/jdk/test/java/security/Policy/GetInstance/GetInstance.java @@ -26,6 +26,7 @@ * @bug 5100561 * @bug 6273812 * @summary Can not explicitly create a java.security.Policy object from a file + * @modules java.base/sun.security.provider * @build GetInstancePolicySpi GetInstanceProvider * @run main/othervm/policy=GetInstance.policy GetInstance */ @@ -34,7 +35,6 @@ import java.security.*; import java.io.File; import java.net.URI; -import sun.net.www.ParseUtil; public class GetInstance { diff --git a/jdk/test/java/security/Policy/PolicyProvider/UseSystemClassLoader.java b/jdk/test/java/security/Policy/PolicyProvider/UseSystemClassLoader.java index 69bd318e76b..7c33b1085d2 100644 --- a/jdk/test/java/security/Policy/PolicyProvider/UseSystemClassLoader.java +++ b/jdk/test/java/security/Policy/PolicyProvider/UseSystemClassLoader.java @@ -30,6 +30,7 @@ import java.security.Security; * @test * @bug 8075706 * @summary Check that a custom policy provider can be loaded from the classpath + * @modules java.base/sun.security.provider * @run main/othervm UseSystemClassLoader CUSTOM * @run main/othervm UseSystemClassLoader DEFAULT * @run main/othervm UseSystemClassLoader NOT_AVAIL diff --git a/jdk/test/java/security/ProtectionDomain/PreserveCombinerTest.java b/jdk/test/java/security/ProtectionDomain/PreserveCombinerTest.java index 596d2c162f2..9609948438d 100644 --- a/jdk/test/java/security/ProtectionDomain/PreserveCombinerTest.java +++ b/jdk/test/java/security/ProtectionDomain/PreserveCombinerTest.java @@ -34,6 +34,7 @@ import sun.misc.SharedSecrets; * @summary Make sure that JavaSecurityAccess.doIntersectionPrivilege() * is not dropping the information about the domain combiner of * the stack ACC + * @modules java.base/sun.misc */ public class PreserveCombinerTest { diff --git a/jdk/test/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java b/jdk/test/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java index 9ce3ef46ac1..b72550e4c5d 100644 --- a/jdk/test/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java +++ b/jdk/test/java/security/cert/CertPathBuilder/selfIssued/DisableRevocation.java @@ -32,6 +32,7 @@ * @bug 6852744 * @summary PIT b61: PKI test suite fails because self signed certificates * are being rejected + * @modules java.base/sun.security.util * @run main/othervm DisableRevocation subca * @run main/othervm DisableRevocation subci * @run main/othervm DisableRevocation alice diff --git a/jdk/test/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java b/jdk/test/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java index 75bf2ec5a02..87d8524f652 100644 --- a/jdk/test/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java +++ b/jdk/test/java/security/cert/CertPathBuilder/selfIssued/KeyUsageMatters.java @@ -32,6 +32,7 @@ * @bug 6852744 * @summary PIT b61: PKI test suite fails because self signed certificates * are being rejected + * @modules java.base/sun.security.util * @run main/othervm KeyUsageMatters subca * @run main/othervm KeyUsageMatters subci * @run main/othervm KeyUsageMatters alice diff --git a/jdk/test/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java b/jdk/test/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java index 6d0b24bef32..65242394162 100644 --- a/jdk/test/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java +++ b/jdk/test/java/security/cert/CertPathBuilder/selfIssued/StatusLoopDependency.java @@ -32,6 +32,7 @@ * @bug 6852744 * @summary PIT b61: PKI test suite fails because self signed certificates * are being rejected + * @modules java.base/sun.security.util * @run main/othervm StatusLoopDependency subca * @run main/othervm StatusLoopDependency subci * @run main/othervm StatusLoopDependency alice diff --git a/jdk/test/java/security/cert/CertPathValidator/trustAnchor/ValidateNC.java b/jdk/test/java/security/cert/CertPathValidator/trustAnchor/ValidateNC.java index 6851ef6d05b..482c930734a 100644 --- a/jdk/test/java/security/cert/CertPathValidator/trustAnchor/ValidateNC.java +++ b/jdk/test/java/security/cert/CertPathValidator/trustAnchor/ValidateNC.java @@ -28,6 +28,7 @@ * CertPathValidator.validate() and CertPathBuilder.build() throw an * InvalidAlgorithmParameterException if any of the TrustAnchors specified * contain nameConstraints + * @modules java.base/sun.security.util */ import java.io.File; import java.io.FileInputStream; diff --git a/jdk/test/java/security/cert/CertificateRevokedException/Basic.java b/jdk/test/java/security/cert/CertificateRevokedException/Basic.java index 3485aec80d7..2ca62248e31 100644 --- a/jdk/test/java/security/cert/CertificateRevokedException/Basic.java +++ b/jdk/test/java/security/cert/CertificateRevokedException/Basic.java @@ -25,6 +25,7 @@ * @test * @bug 4946388 * @summary Unit test for CertificateRevokedException + * @modules java.base/sun.security.x509 */ import java.io.ByteArrayInputStream; diff --git a/jdk/test/java/text/Bidi/Bug6850113.java b/jdk/test/java/text/Bidi/Bug6850113.java index 0082c6f5184..063c347c685 100644 --- a/jdk/test/java/text/Bidi/Bug6850113.java +++ b/jdk/test/java/text/Bidi/Bug6850113.java @@ -24,6 +24,7 @@ * @test * @bug 6850113 * @summary Verify the return value of digit() for some digits. + * @modules java.base/sun.text.normalizer * @compile -XDignore.symbol.file=true Bug6850113.java * @run main Bug6850113 */ diff --git a/jdk/test/java/util/Calendar/Bug8007038.java b/jdk/test/java/util/Calendar/Bug8007038.java index e197e1266d7..b8ef498d904 100644 --- a/jdk/test/java/util/Calendar/Bug8007038.java +++ b/jdk/test/java/util/Calendar/Bug8007038.java @@ -26,6 +26,7 @@ * @bug 8007038 * @summary Verify ArrayIndexOutOfBoundsException is not thrown on * on calling localizedDateTime().print() with JapaneseChrono + * @modules java.base/sun.util.locale.provider * @compile -XDignore.symbol.file Bug8007038.java * @run main Bug8007038 */ diff --git a/jdk/test/java/util/Calendar/CldrFormatNamesTest.java b/jdk/test/java/util/Calendar/CldrFormatNamesTest.java index d5e39514efc..7454780eac0 100644 --- a/jdk/test/java/util/Calendar/CldrFormatNamesTest.java +++ b/jdk/test/java/util/Calendar/CldrFormatNamesTest.java @@ -24,9 +24,10 @@ /* * @test * @bug 8004489 8006509 + * @summary Unit test for CLDR FormatData resources + * @modules java.base/sun.util.locale.provider * @compile -XDignore.symbol.file CldrFormatNamesTest.java * @run main/othervm -Djava.locale.providers=CLDR CldrFormatNamesTest - * @summary Unit test for CLDR FormatData resources */ import java.util.*; diff --git a/jdk/test/java/util/Formatter/Basic.java b/jdk/test/java/util/Formatter/Basic.java index 31fce5dd4e2..4287f1bc2d8 100644 --- a/jdk/test/java/util/Formatter/Basic.java +++ b/jdk/test/java/util/Formatter/Basic.java @@ -28,6 +28,7 @@ * 6344623 6369500 6534606 6282094 6286592 6476425 5063507 6469160 6476168 * 8059175 * + * @modules java.base/sun.misc * @run shell/timeout=240 Basic.sh */ diff --git a/jdk/test/java/util/Locale/Bug6989440.java b/jdk/test/java/util/Locale/Bug6989440.java index b675d495775..42b77d58c29 100644 --- a/jdk/test/java/util/Locale/Bug6989440.java +++ b/jdk/test/java/util/Locale/Bug6989440.java @@ -26,6 +26,7 @@ * @bug 6989440 * @summary Verify ConcurrentModificationException is not thrown with multiple * thread accesses. + * @modules java.base/sun.util.locale.provider * @compile -XDignore.symbol.file=true Bug6989440.java * @run main Bug6989440 */ diff --git a/jdk/test/java/util/Locale/Bug8004240.java b/jdk/test/java/util/Locale/Bug8004240.java index 84f291b93ba..6725c792cb7 100644 --- a/jdk/test/java/util/Locale/Bug8004240.java +++ b/jdk/test/java/util/Locale/Bug8004240.java @@ -25,6 +25,7 @@ * @test * @bug 8004240 * @summary Verify that getAdapterPreference returns an unmodifiable list. + * @modules java.base/sun.util.locale.provider * @compile -XDignore.symbol.file Bug8004240.java * @run main Bug8004240 */ diff --git a/jdk/test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java b/jdk/test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java index 6a062c6c2ab..45865ec0b8f 100644 --- a/jdk/test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java +++ b/jdk/test/java/util/jar/JarInputStream/ExtraFileInMetaInf.java @@ -23,8 +23,10 @@ /* * @test - * @bug 8021788 - * @summary JarInputStream doesn't provide certificates for some file under META-INF + * @bug 8021788 + * @summary JarInputStream doesn't provide certificates for some file under META-INF + * @modules java.base/sun.security.tools.keytool + * jdk.jartool/sun.security.tools.jarsigner */ import java.util.jar.*; diff --git a/jdk/test/java/util/jar/Manifest/CreateManifest.java b/jdk/test/java/util/jar/Manifest/CreateManifest.java index 87a2b03b9a0..6655089b56d 100644 --- a/jdk/test/java/util/jar/Manifest/CreateManifest.java +++ b/jdk/test/java/util/jar/Manifest/CreateManifest.java @@ -25,6 +25,7 @@ * @test * @bug 7148584 * @summary Jar tools fails to generate manifest correctly when boundary condition hit + * @modules jdk.jartool/sun.tools.jar * @compile -XDignore.symbol.file=true CreateManifest.java * @run main CreateManifest */ diff --git a/jdk/test/java/util/logging/CustomLogManagerTest.java b/jdk/test/java/util/logging/CustomLogManagerTest.java index b8f0bfa7f3c..8cf5d0115ee 100644 --- a/jdk/test/java/util/logging/CustomLogManagerTest.java +++ b/jdk/test/java/util/logging/CustomLogManagerTest.java @@ -32,6 +32,7 @@ import sun.util.logging.PlatformLogger; * @bug 8005615 8006104 * @summary Add loggers to custom log manager * + * @modules java.base/sun.util.logging * @compile -XDignore.symbol.file CustomLogManagerTest.java CustomLogManager.java * @run main/othervm -Djava.util.logging.manager=CustomLogManager CustomLogManagerTest */ diff --git a/jdk/test/java/util/logging/LogManager/RootLogger/setLevel/TestRootLoggerLevel.java b/jdk/test/java/util/logging/LogManager/RootLogger/setLevel/TestRootLoggerLevel.java index 58e812ce058..1d34511c84d 100644 --- a/jdk/test/java/util/logging/LogManager/RootLogger/setLevel/TestRootLoggerLevel.java +++ b/jdk/test/java/util/logging/LogManager/RootLogger/setLevel/TestRootLoggerLevel.java @@ -35,6 +35,7 @@ import java.util.logging.LoggingPermission; * @test * @bug 8026499 * @summary checks that Logger.getLogger("").setLevel() is working correctly. + * @modules java.base/sun.util.logging * @build TestRootLoggerLevel * @run main/othervm -Dtest.security=on TestRootLoggerLevel * @run main/othervm -Dtest.security=off TestRootLoggerLevel diff --git a/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java b/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java index 3e4918e5fee..4b7c7a41bfe 100644 --- a/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java +++ b/jdk/test/java/util/logging/LogManagerAppContextDeadlock.java @@ -41,6 +41,7 @@ import java.util.logging.Logger; * @bug 8065991 * @summary check that when LogManager is initialized, a deadlock similar * to that described in 8065709 will not occur. + * @modules java.base/sun.misc * @run main/othervm LogManagerAppContextDeadlock UNSECURE * @run main/othervm LogManagerAppContextDeadlock SECURE * diff --git a/jdk/test/java/util/logging/LoggingDeadlock4.java b/jdk/test/java/util/logging/LoggingDeadlock4.java index 63c51bf4b59..1fa50d356a2 100644 --- a/jdk/test/java/util/logging/LoggingDeadlock4.java +++ b/jdk/test/java/util/logging/LoggingDeadlock4.java @@ -26,6 +26,7 @@ * @bug 6977677 8004928 * @summary Deadlock between LogManager. and Logger.getLogger() * @author Daniel D. Daugherty + * @modules java.base/sun.util.logging * @compile -XDignore.symbol.file LoggingDeadlock4.java * @run main/othervm/timeout=15 LoggingDeadlock4 */ diff --git a/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java b/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java index f7ca5ce6d55..0a78f8d6911 100644 --- a/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java +++ b/jdk/test/java/util/logging/RootLogger/RootLevelInConfigFile.java @@ -42,6 +42,7 @@ import sun.misc.SharedSecrets; * @bug 8030850 * @summary Tests that setting .level=FINEST for the root logger in logging * configuration file does work. + * @modules java.base/sun.misc * @run main/othervm RootLevelInConfigFile * * @author danielfuchs diff --git a/jdk/test/java/util/logging/SimpleLogManager.java b/jdk/test/java/util/logging/SimpleLogManager.java index 1e1da7919a5..c6e0b48e237 100644 --- a/jdk/test/java/util/logging/SimpleLogManager.java +++ b/jdk/test/java/util/logging/SimpleLogManager.java @@ -31,6 +31,7 @@ import sun.util.logging.PlatformLogger; * @summary A LogManager subclass overrides its own implementation of named * logger (see the subclassing information in the Logger class specification) * + * @modules java.base/sun.util.logging * @compile -XDignore.symbol.file CustomLogManager.java SimpleLogManager.java * @run main/othervm -Djava.util.logging.manager=SimpleLogManager SimpleLogManager */ diff --git a/jdk/test/java/util/logging/TestAppletLoggerContext.java b/jdk/test/java/util/logging/TestAppletLoggerContext.java index f6cd0e2ce3e..f534d370745 100644 --- a/jdk/test/java/util/logging/TestAppletLoggerContext.java +++ b/jdk/test/java/util/logging/TestAppletLoggerContext.java @@ -42,6 +42,7 @@ import sun.misc.SharedSecrets; * @summary NPE when using Logger.getAnonymousLogger or * LogManager.getLogManager().getLogger * + * @modules java.base/sun.misc * @run main/othervm -Dtest.security=off TestAppletLoggerContext LoadingApplet * @run main/othervm -Dtest.security=on TestAppletLoggerContext LoadingApplet * @run main/othervm -Dtest.security=off TestAppletLoggerContext LoadingMain diff --git a/jdk/test/java/util/logging/TestGetLoggerNPE.java b/jdk/test/java/util/logging/TestGetLoggerNPE.java index 55ed6e0a70f..6bc2a6c95a5 100644 --- a/jdk/test/java/util/logging/TestGetLoggerNPE.java +++ b/jdk/test/java/util/logging/TestGetLoggerNPE.java @@ -35,6 +35,7 @@ import sun.misc.SharedSecrets; * * @summary NPE with logging while launching webstart * + * @modules java.base/sun.misc * @build TestGetLoggerNPE * @run main/othervm TestGetLoggerNPE getLogger * @run main/othervm TestGetLoggerNPE getLogManager diff --git a/jdk/test/java/util/logging/TestLoggerWeakRefLeak.java b/jdk/test/java/util/logging/TestLoggerWeakRefLeak.java index 3f6d403cba7..06c048d991f 100644 --- a/jdk/test/java/util/logging/TestLoggerWeakRefLeak.java +++ b/jdk/test/java/util/logging/TestLoggerWeakRefLeak.java @@ -38,7 +38,8 @@ import sun.tools.attach.HotSpotVirtualMachine; * @bug 6942989 * @summary Check for WeakReference leak in Logger and anonymous Logger objects * @library /lib/testlibrary - * @build jdk.testlibrary.* + * @modules jdk.attach/sun.tools.attach + * @build jdk.testlibrary.ProcessTools * @run main/othervm TestLoggerWeakRefLeak Logger * @run main/othervm TestLoggerWeakRefLeak AnonymousLogger */ diff --git a/jdk/test/java/util/logging/TestMainAppContext.java b/jdk/test/java/util/logging/TestMainAppContext.java index 28c3fc1428d..622600c76cb 100644 --- a/jdk/test/java/util/logging/TestMainAppContext.java +++ b/jdk/test/java/util/logging/TestMainAppContext.java @@ -30,6 +30,7 @@ import sun.awt.SunToolkit; * @bug 8026404 * @summary checks that calling getLogger() from a Thread whose ThreadGroup is * a child of the main root group doesn't throw an exception. + * @modules java.desktop/sun.awt * @build TestMainAppContext * @run main/othervm TestMainAppContext * @author danielfuchs diff --git a/jdk/test/javax/net/ssl/FixingJavadocs/ComURLNulls.java b/jdk/test/javax/net/ssl/FixingJavadocs/ComURLNulls.java index e0dc82a2dc1..9ede06d1f49 100644 --- a/jdk/test/javax/net/ssl/FixingJavadocs/ComURLNulls.java +++ b/jdk/test/javax/net/ssl/FixingJavadocs/ComURLNulls.java @@ -27,6 +27,8 @@ * @summary Need to revisit the javadocs for JSSE, especially the * promoted classes, and HttpsURLConnection.getCipherSuite throws * NullPointerException + * @modules java.base/com.sun.net.ssl + * java.base/com.sun.net.ssl.internal.www.protocol.https * @run main/othervm ComURLNulls * * SunJSSE does not support dynamic system properties, no way to re-use diff --git a/jdk/test/javax/net/ssl/GetInstance.java b/jdk/test/javax/net/ssl/GetInstance.java index 2ffdad9ac02..6aec679c127 100644 --- a/jdk/test/javax/net/ssl/GetInstance.java +++ b/jdk/test/javax/net/ssl/GetInstance.java @@ -27,6 +27,7 @@ * @summary verify getInstance() works using Provider.getService() * Export "PKIX" as the standard algorithm name of KeyManagerFactory * @author Andreas Sterbenz + * @modules java.base/com.sun.net.ssl */ import java.security.*; diff --git a/jdk/test/javax/net/ssl/SSLSession/CheckMyTrustedKeystore.java b/jdk/test/javax/net/ssl/SSLSession/CheckMyTrustedKeystore.java index 422d88debd1..9d7b8172a1e 100644 --- a/jdk/test/javax/net/ssl/SSLSession/CheckMyTrustedKeystore.java +++ b/jdk/test/javax/net/ssl/SSLSession/CheckMyTrustedKeystore.java @@ -29,6 +29,7 @@ * @bug 4329114 * @summary Need better way of reflecting the reason when a chain is * rejected as untrusted. + * @modules java.base/com.sun.net.ssl * @ignore JSSE supports algorithm constraints with CR 6916074, * need to update this test case in JDK 7 soon * @run main/othervm CheckMyTrustedKeystore diff --git a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorer.java b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorer.java index 439f3f2fd90..3ef485b6982 100644 --- a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorer.java +++ b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorer.java @@ -31,6 +31,7 @@ * @bug 7068321 * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server * @library ../SSLEngine ../templates + * @modules java.base/sun.misc * @build SSLEngineService SSLCapabilities SSLExplorer * @run main/othervm SSLEngineExplorer SSLv2Hello,SSLv3 * @run main/othervm SSLEngineExplorer SSLv3 diff --git a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java index b9854dd3e94..ccfdbac0c64 100644 --- a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java +++ b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerMatchedSNI.java @@ -31,6 +31,7 @@ * @bug 7068321 * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server * @library ../SSLEngine ../templates + * @modules java.base/sun.misc * @build SSLEngineService SSLCapabilities SSLExplorer * @run main/othervm SSLEngineExplorerMatchedSNI www.example.com * www\.example\.com diff --git a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java index ff8678ba6a8..8ae4b68e3fe 100644 --- a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java +++ b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerUnmatchedSNI.java @@ -31,6 +31,7 @@ * @bug 7068321 * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server * @library ../SSLEngine ../templates + * @modules java.base/sun.misc * @build SSLEngineService SSLCapabilities SSLExplorer * @run main/othervm SSLEngineExplorerUnmatchedSNI www.example.com * www\.example\.org diff --git a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java index f9888839929..7c8e6a275c9 100644 --- a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java +++ b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithCli.java @@ -31,6 +31,7 @@ * @bug 7068321 * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server * @library ../SSLEngine ../templates + * @modules java.base/sun.misc * @build SSLEngineService SSLCapabilities SSLExplorer * @run main/othervm SSLEngineExplorerWithCli */ diff --git a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java index 0517a7750aa..f0baeefbf53 100644 --- a/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java +++ b/jdk/test/javax/net/ssl/ServerName/SSLEngineExplorerWithSrv.java @@ -31,6 +31,7 @@ * @bug 7068321 * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server * @library ../SSLEngine ../templates + * @modules java.base/sun.misc * @build SSLEngineService SSLCapabilities SSLExplorer * @run main/othervm SSLEngineExplorerWithSrv */ diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorer.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorer.java index 887b624fda4..f91c6c2365b 100644 --- a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorer.java +++ b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorer.java @@ -31,6 +31,7 @@ * @bug 7068321 * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server * @library ../templates + * @modules java.base/sun.misc * @build SSLCapabilities SSLExplorer * @run main/othervm SSLSocketExplorer SSLv2Hello,SSLv3 * @run main/othervm SSLSocketExplorer SSLv3 diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java index aaf8d299486..9e12e9b4b2f 100644 --- a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java +++ b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerFailure.java @@ -31,6 +31,7 @@ * @bug 7068321 * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server * @library ../templates + * @modules java.base/sun.misc * @build SSLCapabilities SSLExplorer * @run main/othervm SSLSocketExplorerFailure SSLv2Hello,SSLv3 * @run main/othervm SSLSocketExplorerFailure SSLv3 diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java index 724a37e1a80..bde4f6cc0d9 100644 --- a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java +++ b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerMatchedSNI.java @@ -31,6 +31,7 @@ * @bug 7068321 * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server * @library ../templates + * @modules java.base/sun.misc * @build SSLCapabilities SSLExplorer * @run main/othervm SSLSocketExplorerMatchedSNI www.example.com * www\.example\.com diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java index 732e0cf3097..a266f5f4beb 100644 --- a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java +++ b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerUnmatchedSNI.java @@ -31,6 +31,7 @@ * @bug 7068321 * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server * @library ../templates + * @modules java.base/sun.misc * @build SSLCapabilities SSLExplorer * @run main/othervm SSLSocketExplorerUnmatchedSNI www.example.com * www\.example\.org diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java index 8f2b7816864..183a23fa260 100644 --- a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java +++ b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithCliSNI.java @@ -31,6 +31,7 @@ * @bug 7068321 * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server * @library ../templates + * @modules java.base/sun.misc * @build SSLCapabilities SSLExplorer * @run main/othervm SSLSocketExplorerWithCliSNI */ diff --git a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java index f026f32e781..20b8a6991c7 100644 --- a/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java +++ b/jdk/test/javax/net/ssl/ServerName/SSLSocketExplorerWithSrvSNI.java @@ -31,6 +31,7 @@ * @bug 7068321 * @summary Support TLS Server Name Indication (SNI) Extension in JSSE Server * @library ../templates + * @modules java.base/sun.misc * @build SSLCapabilities SSLExplorer * @run main/othervm SSLSocketExplorerWithSrvSNI */ diff --git a/jdk/test/javax/net/ssl/TLS/TestJSSE.java b/jdk/test/javax/net/ssl/TLS/TestJSSE.java index 756a5226f96..4bc99e6a547 100644 --- a/jdk/test/javax/net/ssl/TLS/TestJSSE.java +++ b/jdk/test/javax/net/ssl/TLS/TestJSSE.java @@ -28,6 +28,8 @@ import java.security.Security; * @test * @bug 8049429 * @library ../../../../lib/testlibrary/ + * @modules java.management + * jdk.crypto.ec/sun.security.ec * @build jdk.testlibrary.Utils * @compile CipherTestUtils.java JSSEClient.java JSSEServer.java * @summary Test that all cipher suites work in all versions and all client diff --git a/jdk/test/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java b/jdk/test/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java index 2d2b94b6504..6c02652f7d9 100644 --- a/jdk/test/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java +++ b/jdk/test/javax/net/ssl/TLSv12/ShortRSAKeyGCM.java @@ -32,6 +32,7 @@ * @test * @bug 7030966 * @summary Support AEAD CipherSuites + * @modules java.base/sun.misc * @run main/othervm ShortRSAKeyGCM PKIX TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 * @run main/othervm ShortRSAKeyGCM PKIX TLS_RSA_WITH_AES_128_GCM_SHA256 * @run main/othervm ShortRSAKeyGCM PKIX TLS_DHE_RSA_WITH_AES_128_GCM_SHA256 diff --git a/jdk/test/javax/script/VersionTest.java b/jdk/test/javax/script/VersionTest.java index 40f5c83037a..485f6aaea1a 100644 --- a/jdk/test/javax/script/VersionTest.java +++ b/jdk/test/javax/script/VersionTest.java @@ -25,6 +25,8 @@ * @test * @bug 6346729 6705893 * @summary Create JavaScript engine and check language and engine version + * @modules java.scripting + * jdk.scripting.nashorn/jdk.nashorn.internal.runtime */ import javax.script.*; diff --git a/jdk/test/javax/security/auth/Subject/SubjectNullTests.java b/jdk/test/javax/security/auth/Subject/SubjectNullTests.java index c473ea8f30b..29b1a667734 100644 --- a/jdk/test/javax/security/auth/Subject/SubjectNullTests.java +++ b/jdk/test/javax/security/auth/Subject/SubjectNullTests.java @@ -24,6 +24,9 @@ /* * @test * @bug 8015081 + * @modules java.base/sun.misc + * java.management + * java.security.jgss * @compile Subject.java * @compile SubjectNullTests.java * @build SubjectNullTests diff --git a/jdk/test/javax/security/auth/kerberos/StandardNames.java b/jdk/test/javax/security/auth/kerberos/StandardNames.java index 40590f6d080..42467041836 100644 --- a/jdk/test/javax/security/auth/kerberos/StandardNames.java +++ b/jdk/test/javax/security/auth/kerberos/StandardNames.java @@ -25,6 +25,7 @@ * @test * @bug 8035986 * @summary KerberosKey algorithm names are not specified + * @modules java.security.jgss/sun.security.krb5 */ import sun.security.krb5.EncryptedData; diff --git a/jdk/test/javax/security/auth/login/Configuration/GetInstanceSecurity.java b/jdk/test/javax/security/auth/login/Configuration/GetInstanceSecurity.java index a2ab311dc18..ebd58059e52 100644 --- a/jdk/test/javax/security/auth/login/Configuration/GetInstanceSecurity.java +++ b/jdk/test/javax/security/auth/login/Configuration/GetInstanceSecurity.java @@ -34,8 +34,6 @@ import java.net.URI; import java.security.*; import javax.security.auth.login.*; -import sun.net.www.ParseUtil; - public class GetInstanceSecurity { private static final String JAVA_CONFIG = "JavaLoginConfig"; diff --git a/jdk/test/javax/security/auth/x500/X500Principal/NameFormat.java b/jdk/test/javax/security/auth/x500/X500Principal/NameFormat.java index 6d08a8fd0cf..2503b36f30c 100644 --- a/jdk/test/javax/security/auth/x500/X500Principal/NameFormat.java +++ b/jdk/test/javax/security/auth/x500/X500Principal/NameFormat.java @@ -25,6 +25,7 @@ * @test * @bug 4505980 5109882 7049963 7090565 * @summary X500Principal input name parsing issues and wrong exception thrown + * @modules java.base/sun.security.x509 * @run main/othervm -Djava.security.debug=x509,ava NameFormat * * The debug=ava above must be set in order to check for escaped hex chars. diff --git a/jdk/test/javax/sql/testng/TEST.properties b/jdk/test/javax/sql/testng/TEST.properties index 97bfe7c5e31..cb97c160507 100644 --- a/jdk/test/javax/sql/testng/TEST.properties +++ b/jdk/test/javax/sql/testng/TEST.properties @@ -2,3 +2,6 @@ TestNG.dirs= . othervm.dirs= . lib.dirs = /java/sql/testng +modules = java.sql.rowset/com.sun.rowset \ + java.sql.rowset/com.sun.rowset.internal \ + java.sql.rowset/com.sun.rowset.providers diff --git a/jdk/test/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java b/jdk/test/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java index ae626504651..76f7b89deca 100644 --- a/jdk/test/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java +++ b/jdk/test/javax/xml/bind/xjc/8029837/PreParseGrammarTest.java @@ -26,6 +26,10 @@ * @bug 8029837 * @summary Test simulates the partial call to xjc ant task that fails with * NullPointer exception + * @modules java.xml/com.sun.org.apache.xerces.internal.parsers + * @modules java.xml/com.sun.org.apache.xerces.internal.xni + * @modules java.xml/com.sun.org.apache.xerces.internal.xni.grammars + * @modules java.xml/com.sun.org.apache.xerces.internal.xni.parser * @run main/othervm PreParseGrammarTest */ diff --git a/jdk/test/javax/xml/crypto/dsig/GenerationTests.java b/jdk/test/javax/xml/crypto/dsig/GenerationTests.java index 945b1cdb802..a8627615e9a 100644 --- a/jdk/test/javax/xml/crypto/dsig/GenerationTests.java +++ b/jdk/test/javax/xml/crypto/dsig/GenerationTests.java @@ -26,6 +26,9 @@ * @bug 4635230 6283345 6303830 6824440 6867348 7094155 8038184 8038349 8046949 * 8046724 8079693 * @summary Basic unit tests for generating XML Signatures with JSR 105 + * @modules java.base/sun.security.util + * java.base/sun.security.x509 + * java.xml.crypto/org.jcp.xml.dsig.internal.dom * @compile -XDignore.symbol.file KeySelectors.java SignatureValidator.java * X509KeySelector.java GenerationTests.java * @run main/othervm GenerationTests diff --git a/jdk/test/javax/xml/crypto/dsig/ValidationTests.java b/jdk/test/javax/xml/crypto/dsig/ValidationTests.java index 5413d28d215..5695ea90860 100644 --- a/jdk/test/javax/xml/crypto/dsig/ValidationTests.java +++ b/jdk/test/javax/xml/crypto/dsig/ValidationTests.java @@ -25,6 +25,9 @@ * @test * @bug 4635230 6365103 6366054 6824440 7131084 8046724 8079693 * @summary Basic unit tests for validating XML Signatures with JSR 105 + * @modules java.base/sun.security.util + * java.base/sun.security.x509 + * java.xml.crypto/org.jcp.xml.dsig.internal.dom * @compile -XDignore.symbol.file KeySelectors.java SignatureValidator.java * X509KeySelector.java ValidationTests.java * @run main/othervm ValidationTests diff --git a/jdk/test/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java b/jdk/test/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java index a296a8cb14b..f03cbf3ac99 100644 --- a/jdk/test/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java +++ b/jdk/test/javax/xml/crypto/dsig/keyinfo/KeyInfo/Marshal.java @@ -25,6 +25,7 @@ * @test * @bug 6372500 * @summary Test that KeyInfo.marshal works correctly + * @modules java.xml.crypto/org.jcp.xml.dsig.internal.dom * @compile -XDignore.symbol.file Marshal.java * @run main Marshal * @author Sean Mullan diff --git a/jdk/test/javax/xml/jaxp/Encodings/CheckEncodingPropertiesFile.java b/jdk/test/javax/xml/jaxp/Encodings/CheckEncodingPropertiesFile.java index 88e9648f066..8d74fd27b7b 100644 --- a/jdk/test/javax/xml/jaxp/Encodings/CheckEncodingPropertiesFile.java +++ b/jdk/test/javax/xml/jaxp/Encodings/CheckEncodingPropertiesFile.java @@ -30,6 +30,7 @@ * correctly maps them to their preferred mime names. * Also checks that the Encodings.properties resource file * is consistent. + * @modules java.xml/com.sun.org.apache.xml.internal.serializer * @compile -XDignore.symbol.file CheckEncodingPropertiesFile.java * @run main CheckEncodingPropertiesFile * @author Daniel Fuchs diff --git a/jdk/test/javax/xml/jaxp/XPath/8035577/Regex.java b/jdk/test/javax/xml/jaxp/XPath/8035577/Regex.java index 69c78846456..bf7c47e341d 100644 --- a/jdk/test/javax/xml/jaxp/XPath/8035577/Regex.java +++ b/jdk/test/javax/xml/jaxp/XPath/8035577/Regex.java @@ -25,6 +25,7 @@ * @test * @bug 8035577 * @summary Tests for xpath regular expression methods. + * @modules java.xml/com.sun.org.apache.xerces.internal.impl.xpath.regex * @run main Regex * @author david.x.li@oracle.com */ diff --git a/jdk/test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java b/jdk/test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java index 15915d04912..ca039f7bba8 100644 --- a/jdk/test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java +++ b/jdk/test/javax/xml/jaxp/parsers/8022548/XOMParserTest.java @@ -25,6 +25,10 @@ * @test * @bug 8022548 * @summary test that a parser can use DTDConfiguration + * @modules java.xml/com.sun.org.apache.xerces.internal.impl + * java.xml/com.sun.org.apache.xerces.internal.parsers + * java.xml/com.sun.org.apache.xerces.internal.util + * java.xml/com.sun.org.apache.xerces.internal.xni.parser * @run main XOMParserTest */ import com.sun.org.apache.xerces.internal.impl.Constants; diff --git a/jdk/test/javax/xml/jaxp/testng/TEST.properties b/jdk/test/javax/xml/jaxp/testng/TEST.properties index 4d7d0f90d06..32d744b64a9 100644 --- a/jdk/test/javax/xml/jaxp/testng/TEST.properties +++ b/jdk/test/javax/xml/jaxp/testng/TEST.properties @@ -1,3 +1,11 @@ # This file identifies root(s) of the test-ng hierarchy. TestNG.dirs = . + +modules = java.xml/com.sun.org.apache.xerces.internal.dom \ + java.xml/com.sun.org.apache.xerces.internal.impl \ + java.xml/com.sun.org.apache.xerces.internal.impl.xs \ + java.xml/com.sun.org.apache.xerces.internal.parsers \ + java.xml/com.sun.org.apache.xerces.internal.util \ + java.xml/com.sun.org.apache.xerces.internal.xni.parser \ + java.xml/com.sun.org.apache.xerces.internal.xs diff --git a/jdk/test/jdk/internal/jimage/VerifyJimage.java b/jdk/test/jdk/internal/jimage/VerifyJimage.java index aea1df404f2..fbb9fd665c8 100644 --- a/jdk/test/jdk/internal/jimage/VerifyJimage.java +++ b/jdk/test/jdk/internal/jimage/VerifyJimage.java @@ -48,6 +48,7 @@ import jdk.internal.jimage.ImageLocation; /* * @test * @summary Verify jimage + * @modules java.base/jdk.internal.jimage * @run main/othervm VerifyJimage */ diff --git a/jdk/test/lib/security/CheckBlacklistedCerts.java b/jdk/test/lib/security/CheckBlacklistedCerts.java index 10c2915b602..7489febe348 100644 --- a/jdk/test/lib/security/CheckBlacklistedCerts.java +++ b/jdk/test/lib/security/CheckBlacklistedCerts.java @@ -25,6 +25,7 @@ * @test * @bug 8011402 * @summary Move blacklisting certificate logic from hard code to data + * @modules java.base/sun.security.util */ import sun.security.util.UntrustedCertificates; diff --git a/jdk/test/lib/testlibrary/OutputAnalyzerReportingTest.java b/jdk/test/lib/testlibrary/OutputAnalyzerReportingTest.java index f05229c9504..d0bbdcd0c93 100644 --- a/jdk/test/lib/testlibrary/OutputAnalyzerReportingTest.java +++ b/jdk/test/lib/testlibrary/OutputAnalyzerReportingTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 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 @@ -29,6 +29,7 @@ package jdk.testlibrary; * such as printing additional diagnostic info * (exit code, stdout, stderr, command line, etc.) * @library /testlibrary + * @modules java.management * @build jdk.testlibrary.* * @run main jdk.testlibrary.OutputAnalyzerReportingTest */ diff --git a/jdk/test/lib/testlibrary/OutputAnalyzerTest.java b/jdk/test/lib/testlibrary/OutputAnalyzerTest.java index cb251b37964..f9bfc1c117c 100644 --- a/jdk/test/lib/testlibrary/OutputAnalyzerTest.java +++ b/jdk/test/lib/testlibrary/OutputAnalyzerTest.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2013, 2014, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2013, 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 @@ -26,6 +26,7 @@ package jdk.testlibrary; * @test * @summary Test the OutputAnalyzer utility class * @library /testlibrary + * @modules java.management * @build jdk.testlibrary.* * @run main jdk.testlibrary.OutputAnalyzerTest */ diff --git a/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java b/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java index 98239775661..a9697025318 100644 --- a/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java +++ b/jdk/test/lib/testlibrary/jdk/testlibrary/ProcessTools.java @@ -44,8 +44,6 @@ import java.util.function.Predicate; import java.util.function.Consumer; import java.util.stream.Collectors; -import sun.management.VMManagement; - public final class ProcessTools { private static final class LineForwarder extends StreamPumper.LinePump { private final PrintStream ps; diff --git a/jdk/test/sun/invoke/util/ValueConversionsTest.java b/jdk/test/sun/invoke/util/ValueConversionsTest.java index 483afb7625c..9a936cc97ff 100644 --- a/jdk/test/sun/invoke/util/ValueConversionsTest.java +++ b/jdk/test/sun/invoke/util/ValueConversionsTest.java @@ -35,6 +35,7 @@ import static org.junit.Assert.*; /* @test * @summary unit tests for value-type conversion utilities + * @modules java.base/sun.invoke.util * @compile -XDignore.symbol.file ValueConversionsTest.java * @run junit/othervm test.sun.invoke.util.ValueConversionsTest */ diff --git a/jdk/test/sun/management/PlatformMBeanProviderConstructorCheck.java b/jdk/test/sun/management/PlatformMBeanProviderConstructorCheck.java index 3c806864419..0892e8a5a7f 100644 --- a/jdk/test/sun/management/PlatformMBeanProviderConstructorCheck.java +++ b/jdk/test/sun/management/PlatformMBeanProviderConstructorCheck.java @@ -31,6 +31,7 @@ import java.util.List; * @test * @bug 8042901 * @summary Check permission for PlatformMBeanProvider Constructor + * @modules java.management/sun.management.spi * @author Shanliang Jiang */ public class PlatformMBeanProviderConstructorCheck { diff --git a/jdk/test/sun/management/jmxremote/startstop/JMXStatusTest.java b/jdk/test/sun/management/jmxremote/startstop/JMXStatusTest.java index 808b5a3c339..0f516b6b504 100644 --- a/jdk/test/sun/management/jmxremote/startstop/JMXStatusTest.java +++ b/jdk/test/sun/management/jmxremote/startstop/JMXStatusTest.java @@ -36,6 +36,7 @@ import jdk.testlibrary.ProcessTools; * Management agent may be disable, started (only local connections) and started. * The test asserts that the expected text is being printed. * @library /lib/testlibrary + * @modules java.management/sun.management * @build jdk.testlibrary.* PortAllocator TestApp ManagementAgentJcmd * @run testng/othervm -XX:+UsePerfData JMXStatusTest */ diff --git a/jdk/test/sun/misc/CopyMemory.java b/jdk/test/sun/misc/CopyMemory.java index 89266ed052d..6e11c6362c4 100644 --- a/jdk/test/sun/misc/CopyMemory.java +++ b/jdk/test/sun/misc/CopyMemory.java @@ -24,6 +24,7 @@ /* @test * @bug 6565543 * @summary Minimal test for unsafe.copyMemory() and unsafe.setMemory() + * @modules java.base/sun.nio.ch java.base/sun.misc * @key randomness */ diff --git a/jdk/test/sun/misc/Encode/DecodeBuffer.java b/jdk/test/sun/misc/Encode/DecodeBuffer.java index 899fffccb26..9c4e51a223c 100644 --- a/jdk/test/sun/misc/Encode/DecodeBuffer.java +++ b/jdk/test/sun/misc/Encode/DecodeBuffer.java @@ -25,7 +25,7 @@ * @test * @bug 4159554 * @summary Problem with UUDecoder - * + * @modules java.base/sun.misc */ import sun.misc.*; diff --git a/jdk/test/sun/misc/Encode/Encode.java b/jdk/test/sun/misc/Encode/Encode.java index 8d56a4f9066..53d9b31c096 100644 --- a/jdk/test/sun/misc/Encode/Encode.java +++ b/jdk/test/sun/misc/Encode/Encode.java @@ -25,7 +25,7 @@ * @test * @bug 4041231 * @summary Test UUEncoder.java for proper masking in encodeAtom - * + * @modules java.base/sun.misc */ import sun.misc.*; diff --git a/jdk/test/sun/misc/Encode/GetBytes.java b/jdk/test/sun/misc/Encode/GetBytes.java index 55fc137476f..f2a3e4c6dde 100644 --- a/jdk/test/sun/misc/Encode/GetBytes.java +++ b/jdk/test/sun/misc/Encode/GetBytes.java @@ -26,6 +26,7 @@ * @bug 5031097 * @summary sun.misc.CharacterEncoder(ByteBuffer) is dumping too * much information + * @modules java.base/sun.misc * @author Brad Wetmore */ diff --git a/jdk/test/sun/misc/FloatingDecimal/TestFDBigInteger.java b/jdk/test/sun/misc/FloatingDecimal/TestFDBigInteger.java index cfdb7b84982..983f5d78cee 100644 --- a/jdk/test/sun/misc/FloatingDecimal/TestFDBigInteger.java +++ b/jdk/test/sun/misc/FloatingDecimal/TestFDBigInteger.java @@ -29,6 +29,7 @@ import sun.misc.FDBigInteger; * @test * @bug 7032154 * @summary unit testys of sun.misc.FDBigInteger + * @modules java.base/sun.misc * @author Dmitry Nadezhin */ public class TestFDBigInteger { diff --git a/jdk/test/sun/misc/FloatingDecimal/TestFloatingDecimal.java b/jdk/test/sun/misc/FloatingDecimal/TestFloatingDecimal.java index 23e97d7421c..96806a9b708 100644 --- a/jdk/test/sun/misc/FloatingDecimal/TestFloatingDecimal.java +++ b/jdk/test/sun/misc/FloatingDecimal/TestFloatingDecimal.java @@ -58,6 +58,7 @@ public class sun.misc.FloatingDecimal { * @test * @bug 7032154 * @summary unit tests of sun.misc.FloatingDecimal + * @modules java.base/sun.misc * @library ../../../java/lang/Math * @build DoubleConsts FloatConsts * @run main TestFloatingDecimal diff --git a/jdk/test/sun/misc/JarIndex/JarIndexMergeTest.java b/jdk/test/sun/misc/JarIndex/JarIndexMergeTest.java index 46225bef1c9..1a81782f641 100644 --- a/jdk/test/sun/misc/JarIndex/JarIndexMergeTest.java +++ b/jdk/test/sun/misc/JarIndex/JarIndexMergeTest.java @@ -24,9 +24,10 @@ /* * @test * @bug 6901992 + * @summary InvalidJarIndexException due to bug in sun.misc.JarIndex.merge() + * @modules java.base/sun.misc * @compile -XDignore.symbol.file JarIndexMergeTest.java * @run main JarIndexMergeTest - * @summary InvalidJarIndexException due to bug in sun.misc.JarIndex.merge() * @author Diego Belfer */ diff --git a/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java b/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java index 8b0e3ec9a62..6d69f07849f 100644 --- a/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java +++ b/jdk/test/sun/misc/JarIndex/metaInfFilenames/Basic.java @@ -25,6 +25,7 @@ * @test * @bug 6887710 * @summary Verify the impact of sun.misc.JarIndex.metaInfFilenames on ServiceLoader + * @modules jdk.jartool/sun.tools.jar * @run main/othervm Basic */ diff --git a/jdk/test/sun/misc/JavaLangAccess/FormatUnsigned.java b/jdk/test/sun/misc/JavaLangAccess/FormatUnsigned.java index ff3411af244..c734f817c8c 100644 --- a/jdk/test/sun/misc/JavaLangAccess/FormatUnsigned.java +++ b/jdk/test/sun/misc/JavaLangAccess/FormatUnsigned.java @@ -26,8 +26,9 @@ import sun.misc.SharedSecrets; /* * @test - * @summary Test JavaLangAccess.formatUnsignedInt/-Long * @bug 8050114 + * @summary Test JavaLangAccess.formatUnsignedInt/-Long + * @modules java.base/sun.misc */ public class FormatUnsigned { diff --git a/jdk/test/sun/misc/JavaLangAccess/NewUnsafeString.java b/jdk/test/sun/misc/JavaLangAccess/NewUnsafeString.java index cfaaa4ca463..64d11c4fac5 100644 --- a/jdk/test/sun/misc/JavaLangAccess/NewUnsafeString.java +++ b/jdk/test/sun/misc/JavaLangAccess/NewUnsafeString.java @@ -28,8 +28,9 @@ import sun.misc.SharedSecrets; /* * @test - * @summary Test JavaLangAccess.newUnsafeString * @bug 8013528 + * @summary Test JavaLangAccess.newUnsafeString + * @modules java.base/sun.misc * @compile -XDignore.symbol.file NewUnsafeString.java */ public class NewUnsafeString { diff --git a/jdk/test/sun/misc/Safe.java b/jdk/test/sun/misc/Safe.java index d29967b774a..c2e938c0fa9 100644 --- a/jdk/test/sun/misc/Safe.java +++ b/jdk/test/sun/misc/Safe.java @@ -25,6 +25,7 @@ * @bug 4495577 * @summary Ensure that sun.misc.Unsafe cannot (easily) * be accessed from user code + * @modules java.base/sun.misc */ diff --git a/jdk/test/sun/misc/URLClassPath/ClassnameCharTest.java b/jdk/test/sun/misc/URLClassPath/ClassnameCharTest.java index 330ec329e34..aba760aded1 100644 --- a/jdk/test/sun/misc/URLClassPath/ClassnameCharTest.java +++ b/jdk/test/sun/misc/URLClassPath/ClassnameCharTest.java @@ -23,10 +23,11 @@ /* @test * @bug 4957669 5017871 - * @compile -XDignore.symbol.file=true ClassnameCharTest.java - * @run main ClassnameCharTest * @summary cannot load class names containing some JSR 202 characters; * plugin does not escape unicode character in http request + * @modules java.desktop/sun.applet + * @compile -XDignore.symbol.file=true ClassnameCharTest.java + * @run main ClassnameCharTest */ import java.io.*; diff --git a/jdk/test/sun/misc/VM/GetNanoTimeAdjustment.java b/jdk/test/sun/misc/VM/GetNanoTimeAdjustment.java index bfeb8c0c7f3..d92cba9eaca 100644 --- a/jdk/test/sun/misc/VM/GetNanoTimeAdjustment.java +++ b/jdk/test/sun/misc/VM/GetNanoTimeAdjustment.java @@ -27,6 +27,7 @@ import sun.misc.VM; * @test * @bug 8068730 * @summary tests that VM.getgetNanoTimeAdjustment() works as expected. + * @modules java.base/sun.misc * @run main GetNanoTimeAdjustment * @author danielfuchs */ diff --git a/jdk/test/sun/misc/Version/Version.java b/jdk/test/sun/misc/Version/Version.java index 85c8ce2a071..5846938c9d8 100644 --- a/jdk/test/sun/misc/Version/Version.java +++ b/jdk/test/sun/misc/Version/Version.java @@ -25,6 +25,7 @@ * @bug 6994413 * @summary Check the JDK and JVM version returned by sun.misc.Version * matches the versions defined in the system properties + * @modules java.base/sun.misc * @compile -XDignore.symbol.file Version.java * @run main Version */ diff --git a/jdk/test/sun/net/InetAddress/nameservice/chaining/Providers.java b/jdk/test/sun/net/InetAddress/nameservice/chaining/Providers.java index 351a1bef19f..5213b5f4a57 100644 --- a/jdk/test/sun/net/InetAddress/nameservice/chaining/Providers.java +++ b/jdk/test/sun/net/InetAddress/nameservice/chaining/Providers.java @@ -25,6 +25,7 @@ * @test * @bug 4762344 * @summary 2nd nameservice provider is non functional + * @modules java.base/sun.net.spi.nameservice * @compile -XDignore.symbol.file=true SimpleNameService.java * Simple1NameServiceDescriptor.java * Simple2NameServiceDescriptor.java diff --git a/jdk/test/sun/net/InetAddress/nameservice/deadlock/Hang.java b/jdk/test/sun/net/InetAddress/nameservice/deadlock/Hang.java index 79246ea8d89..2ea0b0dcc69 100644 --- a/jdk/test/sun/net/InetAddress/nameservice/deadlock/Hang.java +++ b/jdk/test/sun/net/InetAddress/nameservice/deadlock/Hang.java @@ -24,6 +24,7 @@ /** * @test * @bug 7012768 + * @modules java.base/sun.net.spi.nameservice * @compile -XDignore.symbol.file=true ThrowingNameService.java * ThrowingNameServiceDescriptor.java * @run main/othervm/timeout=30 -Dsun.net.spi.nameservice.provider.1=throwing,sun Hang diff --git a/jdk/test/sun/net/InetAddress/nameservice/simple/CacheTest.java b/jdk/test/sun/net/InetAddress/nameservice/simple/CacheTest.java index 48745ced557..387a08f947a 100644 --- a/jdk/test/sun/net/InetAddress/nameservice/simple/CacheTest.java +++ b/jdk/test/sun/net/InetAddress/nameservice/simple/CacheTest.java @@ -26,6 +26,7 @@ * @summary Check that InetAddress doesn't continue to throw UHE * after the name service has recovered and the negative ttl * on the initial lookup has expired. + * @modules java.base/sun.net.spi.nameservice * @compile -XDignore.symbol.file=true SimpleNameService.java * SimpleNameServiceDescriptor.java * @run main/othervm/timeout=200 -Dsun.net.spi.nameservice.provider.1=simple,sun CacheTest diff --git a/jdk/test/sun/net/InetAddress/nameservice/simple/DefaultCaching.java b/jdk/test/sun/net/InetAddress/nameservice/simple/DefaultCaching.java index 4b42af174eb..6f9e60c7be4 100644 --- a/jdk/test/sun/net/InetAddress/nameservice/simple/DefaultCaching.java +++ b/jdk/test/sun/net/InetAddress/nameservice/simple/DefaultCaching.java @@ -25,6 +25,7 @@ * @bug 6442088 * @summary Change default DNS caching behavior for code not running under * security manager. + * @modules java.base/sun.net.spi.nameservice * @compile -XDignore.symbol.file=true SimpleNameService.java * SimpleNameServiceDescriptor.java * @run main/othervm/timeout=200 -Dsun.net.inetaddr.ttl=20 -Dsun.net.spi.nameservice.provider.1=simple,sun DefaultCaching diff --git a/jdk/test/sun/net/TelnetTest.java b/jdk/test/sun/net/TelnetTest.java index 186345111e8..d8650c021aa 100644 --- a/jdk/test/sun/net/TelnetTest.java +++ b/jdk/test/sun/net/TelnetTest.java @@ -28,6 +28,7 @@ import sun.net.*; * @test * @bug 4145748 * @summary test stickyCRLF in TelnetOutputStream + * @modules java.base/sun.net */ public class TelnetTest { diff --git a/jdk/test/sun/net/ftp/B6427768.java b/jdk/test/sun/net/ftp/B6427768.java index d3845b890d0..cdadb16fc68 100644 --- a/jdk/test/sun/net/ftp/B6427768.java +++ b/jdk/test/sun/net/ftp/B6427768.java @@ -25,6 +25,7 @@ * @test * @bug 6427768 * @summary FtpURLConnection doesn't close FTP connection when login fails + * @modules java.base/sun.net.ftp * @library ../www/ftptest/ * @build FtpServer FtpCommandHandler FtpAuthHandler FtpFileSystemHandler * @run main/othervm/timeout=500 B6427768 diff --git a/jdk/test/sun/net/idn/PunycodeTest.java b/jdk/test/sun/net/idn/PunycodeTest.java index 8ee3b3e9f49..7fe0bc6adbc 100644 --- a/jdk/test/sun/net/idn/PunycodeTest.java +++ b/jdk/test/sun/net/idn/PunycodeTest.java @@ -25,6 +25,7 @@ * @test * @summary Unit test for sun.net.idn.Punycode * @bug 4737170 + * @modules java.base/sun.net.idn * @compile -XDignore.symbol.file PunycodeTest.java * @run main/othervm -ea PunycodeTest * @author Edward Wang diff --git a/jdk/test/sun/net/idn/TestStringPrep.java b/jdk/test/sun/net/idn/TestStringPrep.java index e06c09a230d..20b4f5d3659 100644 --- a/jdk/test/sun/net/idn/TestStringPrep.java +++ b/jdk/test/sun/net/idn/TestStringPrep.java @@ -25,6 +25,7 @@ * @test * @summary Unit test for sun.net.idn.Punycode * @bug 4737170 + * @modules java.base/sun.net.idn java.base/sun.text.normalizer * @library . * @compile -XDignore.symbol.file TestStringPrep.java NFS4StringPrep.java * TestData.java diff --git a/jdk/test/sun/net/www/AuthHeaderTest.java b/jdk/test/sun/net/www/AuthHeaderTest.java index 63aae18ec80..62cd443baf8 100644 --- a/jdk/test/sun/net/www/AuthHeaderTest.java +++ b/jdk/test/sun/net/www/AuthHeaderTest.java @@ -24,6 +24,7 @@ /** * @test * @bug 4804309 + * @modules java.base/sun.net.www * @library ../../../sun/net/www/httptest/ * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction * @run main AuthHeaderTest diff --git a/jdk/test/sun/net/www/EmbeddedEquals.java b/jdk/test/sun/net/www/EmbeddedEquals.java index 693eae7c12b..6098d6bb269 100644 --- a/jdk/test/sun/net/www/EmbeddedEquals.java +++ b/jdk/test/sun/net/www/EmbeddedEquals.java @@ -24,6 +24,7 @@ /** * @test * @bug 4456995 + * @modules java.base/sun.net.www * @summary HeaderParser misinterprets a '=' character embedded in value */ diff --git a/jdk/test/sun/net/www/HeaderTests.java b/jdk/test/sun/net/www/HeaderTests.java index f344e887344..a163b757df5 100644 --- a/jdk/test/sun/net/www/HeaderTests.java +++ b/jdk/test/sun/net/www/HeaderTests.java @@ -23,6 +23,7 @@ /** * @test + * @modules java.base/sun.net.www * @summary Tests for HeaderParser and MessageHeader * * Test of HeaderParser, MessageHeader changes @@ -31,7 +32,6 @@ import sun.net.www.HeaderParser; import sun.net.www.MessageHeader; -import sun.net.www.protocol.http.AuthenticationHeader; import java.io.*; import java.util.Iterator; diff --git a/jdk/test/sun/net/www/MessageHeaderTest.java b/jdk/test/sun/net/www/MessageHeaderTest.java index aceb635cfae..eeb6efc4708 100644 --- a/jdk/test/sun/net/www/MessageHeaderTest.java +++ b/jdk/test/sun/net/www/MessageHeaderTest.java @@ -24,6 +24,7 @@ /** * @test * @bug 8003948 + * @modules java.base/sun.net.www * @run main MessageHeaderTest */ import java.io.*; diff --git a/jdk/test/sun/net/www/ParseUtil_4922813.java b/jdk/test/sun/net/www/ParseUtil_4922813.java index 3dd5503af08..e985514f102 100644 --- a/jdk/test/sun/net/www/ParseUtil_4922813.java +++ b/jdk/test/sun/net/www/ParseUtil_4922813.java @@ -22,8 +22,9 @@ */ /* @test - @bug 4922813 - @summary Check the new impl of encodePath will not cause regression + * @bug 4922813 + * @summary Check the new impl of encodePath will not cause regression + * @modules java.base/sun.net.www @key randomness */ diff --git a/jdk/test/sun/net/www/ParseUtil_6274990.java b/jdk/test/sun/net/www/ParseUtil_6274990.java index f60efdd3a58..343845f2e02 100644 --- a/jdk/test/sun/net/www/ParseUtil_6274990.java +++ b/jdk/test/sun/net/www/ParseUtil_6274990.java @@ -24,6 +24,7 @@ /* @test * @summary REGRESSION: URLConnection.connect() throws Exception with non UTF-8 char * @bug 6274990 + * @modules java.base/sun.net.www */ import sun.net.www.*; diff --git a/jdk/test/sun/net/www/ParseUtil_6306697.java b/jdk/test/sun/net/www/ParseUtil_6306697.java index 78004906c1c..468d27d2358 100644 --- a/jdk/test/sun/net/www/ParseUtil_6306697.java +++ b/jdk/test/sun/net/www/ParseUtil_6306697.java @@ -24,6 +24,7 @@ /* @test * @summary PIT: CookieManager/TestCookieManager/TestCookieManager3 failed in Mustang PIT b47 * @bug 6306697 + * @modules java.base/sun.net.www */ import sun.net.www.ParseUtil; diff --git a/jdk/test/sun/net/www/ParseUtil_6380332.java b/jdk/test/sun/net/www/ParseUtil_6380332.java index 46f0601a975..a517742f2c4 100644 --- a/jdk/test/sun/net/www/ParseUtil_6380332.java +++ b/jdk/test/sun/net/www/ParseUtil_6380332.java @@ -24,6 +24,7 @@ /* @test * @summary SunTea applet fails to load under Mustang * @bug 6380332 + * @modules java.base/sun.net.www */ import sun.net.www.ParseUtil; diff --git a/jdk/test/sun/net/www/ParseUtil_6478588.java b/jdk/test/sun/net/www/ParseUtil_6478588.java index 14b7fbad533..cba7bde0449 100644 --- a/jdk/test/sun/net/www/ParseUtil_6478588.java +++ b/jdk/test/sun/net/www/ParseUtil_6478588.java @@ -24,6 +24,7 @@ /* @test * @summary StringIndexOutOfBoundsException in HttpURLConnection.getResponseCode * @bug 6478588 + * @modules java.base/sun.net.www */ import sun.net.www.ParseUtil; diff --git a/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java b/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java index e5c26afc92e..35b76396930 100644 --- a/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java +++ b/jdk/test/sun/net/www/http/ChunkedInputStream/ChunkedEncodingWithProgressMonitorTest.java @@ -24,8 +24,9 @@ /** * @test * @bug 4333920 4994372 - * @run main ChunkedEncodingWithProgressMonitorTest * @summary ChunkedEncoding unit test; MeteredStream/ProgressData problem + * @modules java.base/sun.net + * @run main ChunkedEncodingWithProgressMonitorTest */ import java.net.*; diff --git a/jdk/test/sun/net/www/http/HttpClient/GetProxyPort.java b/jdk/test/sun/net/www/http/HttpClient/GetProxyPort.java index 9c3370c4bfc..ae2f9a65a9d 100644 --- a/jdk/test/sun/net/www/http/HttpClient/GetProxyPort.java +++ b/jdk/test/sun/net/www/http/HttpClient/GetProxyPort.java @@ -25,7 +25,8 @@ * @test * @bug 5025019 * @summary REGRESSION: Sun implementation for HttpURLConnection could throw NPE - * + * @modules java.base/sun.net + * java.base/sun.net.www.http */ import java.net.ServerSocket; import java.net.URL; diff --git a/jdk/test/sun/net/www/http/HttpClient/ImplicitFileName.java b/jdk/test/sun/net/www/http/HttpClient/ImplicitFileName.java index cc67ae61c79..8391bf8291a 100644 --- a/jdk/test/sun/net/www/http/HttpClient/ImplicitFileName.java +++ b/jdk/test/sun/net/www/http/HttpClient/ImplicitFileName.java @@ -24,9 +24,10 @@ /* * @test * @bug 4251209 - * @summary Make sure that implicit filenames will be returned as - * "/" -*/ + * @summary Make sure that implicit filenames will be returned as "/" + * @modules java.base/sun.net + * java.base/sun.net.www.http + */ import java.net.URL; import java.net.ServerSocket; diff --git a/jdk/test/sun/net/www/http/HttpClient/IsAvailable.java b/jdk/test/sun/net/www/http/HttpClient/IsAvailable.java index d6012a40b3b..8a509cb82ba 100644 --- a/jdk/test/sun/net/www/http/HttpClient/IsAvailable.java +++ b/jdk/test/sun/net/www/http/HttpClient/IsAvailable.java @@ -26,6 +26,8 @@ * @bug 8009650 * @summary HttpClient available() check throws SocketException when connection * has been closed + * @modules java.base/sun.net + * java.base/sun.net.www.http */ import java.net.URL; diff --git a/jdk/test/sun/net/www/http/HttpClient/IsKeepingAlive.java b/jdk/test/sun/net/www/http/HttpClient/IsKeepingAlive.java index bfe9a890eb4..7fae59c6909 100644 --- a/jdk/test/sun/net/www/http/HttpClient/IsKeepingAlive.java +++ b/jdk/test/sun/net/www/http/HttpClient/IsKeepingAlive.java @@ -26,6 +26,8 @@ * @bug 4277155 * @summary Make sure HttpClient.getHttpKeepAliveSet() has * doPrivileged() call at appropriate places. + * @modules java.base/sun.net + * java.base/sun.net.www.http * @run main/othervm/policy=IsKeepingAlive.policy IsKeepingAlive */ diff --git a/jdk/test/sun/net/www/http/HttpClient/OpenServer.java b/jdk/test/sun/net/www/http/HttpClient/OpenServer.java index 938fa2e235a..d9ca9e8e508 100644 --- a/jdk/test/sun/net/www/http/HttpClient/OpenServer.java +++ b/jdk/test/sun/net/www/http/HttpClient/OpenServer.java @@ -26,6 +26,7 @@ * @bug 4154481 * @summary Make sure HttpClient has * doPrivileged() calls at appropriate places. + * @modules java.base/sun.net.www.http * @run main/othervm/policy=OpenServer.policy OpenServer */ diff --git a/jdk/test/sun/net/www/http/HttpClient/ProxyFromCache.java b/jdk/test/sun/net/www/http/HttpClient/ProxyFromCache.java index 9f063598b40..920e5b0e254 100644 --- a/jdk/test/sun/net/www/http/HttpClient/ProxyFromCache.java +++ b/jdk/test/sun/net/www/http/HttpClient/ProxyFromCache.java @@ -24,8 +24,9 @@ /* * @test * @bug 6498566 - * @run main/othervm ProxyFromCache * @summary URL.openConnection(Proxy.NO_PROXY) may connect through a proxy. + * @modules java.base/sun.net.www + * @run main/othervm ProxyFromCache */ import java.net.*; diff --git a/jdk/test/sun/net/www/http/HttpClient/RequestURI.java b/jdk/test/sun/net/www/http/HttpClient/RequestURI.java index 3e74043d469..667a0778abf 100644 --- a/jdk/test/sun/net/www/http/HttpClient/RequestURI.java +++ b/jdk/test/sun/net/www/http/HttpClient/RequestURI.java @@ -24,8 +24,9 @@ /* * @test * @bug 6469663 - * @run main/othervm RequestURI * @summary HTTP Request-URI contains fragment when connecting through proxy + * @modules java.base/sun.net.www + * @run main/othervm RequestURI */ import java.net.*; diff --git a/jdk/test/sun/net/www/http/KeepAliveCache/B5045306.java b/jdk/test/sun/net/www/http/KeepAliveCache/B5045306.java index 7e1abfd4f0e..022e140cd3d 100644 --- a/jdk/test/sun/net/www/http/KeepAliveCache/B5045306.java +++ b/jdk/test/sun/net/www/http/KeepAliveCache/B5045306.java @@ -24,6 +24,7 @@ /* * @test * @bug 5045306 6356004 6993490 + * @modules java.base/sun.net.www * @library ../../httptest/ * @build HttpCallback TestHttpServer HttpTransaction * @run main/othervm B5045306 diff --git a/jdk/test/sun/net/www/protocol/ftp/UserAndPasswordTest.java b/jdk/test/sun/net/www/protocol/ftp/UserAndPasswordTest.java index 637ceb98fe8..e64d03fdd50 100644 --- a/jdk/test/sun/net/www/protocol/ftp/UserAndPasswordTest.java +++ b/jdk/test/sun/net/www/protocol/ftp/UserAndPasswordTest.java @@ -39,7 +39,6 @@ import java.net.*; import java.util.*; import java.util.jar.*; import java.util.zip.*; -import sun.net.ftp.FtpLoginException; public class UserAndPasswordTest { diff --git a/jdk/test/sun/net/www/protocol/http/B6296310.java b/jdk/test/sun/net/www/protocol/http/B6296310.java index 6d0ce343a4e..1b276c25647 100644 --- a/jdk/test/sun/net/www/protocol/http/B6296310.java +++ b/jdk/test/sun/net/www/protocol/http/B6296310.java @@ -24,6 +24,7 @@ /* * @test * @bug 6296310 + * @modules java.base/sun.net.www * @library ../../httptest/ * @build HttpCallback TestHttpServer HttpTransaction * @run main/othervm B6296310 diff --git a/jdk/test/sun/net/www/protocol/http/CloseOptionHeader.java b/jdk/test/sun/net/www/protocol/http/CloseOptionHeader.java index e630aa52c4e..e72471a144f 100644 --- a/jdk/test/sun/net/www/protocol/http/CloseOptionHeader.java +++ b/jdk/test/sun/net/www/protocol/http/CloseOptionHeader.java @@ -24,6 +24,7 @@ /** * @test * @bug 6189206 + * @modules java.base/sun.net.www * @run main/othervm -Dhttp.keepAlive=false CloseOptionHeader * @summary HTTP client should set "Connection: close" header in request when keepalive is disabled */ diff --git a/jdk/test/sun/net/www/protocol/http/DigestTest.java b/jdk/test/sun/net/www/protocol/http/DigestTest.java index 24c8ed88b83..9ceafbf8faa 100644 --- a/jdk/test/sun/net/www/protocol/http/DigestTest.java +++ b/jdk/test/sun/net/www/protocol/http/DigestTest.java @@ -24,6 +24,7 @@ /** * @test * @bug 4432213 + * @modules java.base/sun.net.www * @run main/othervm -Dhttp.auth.digest.validateServer=true DigestTest * @summary Need to support Digest Authentication for Proxies */ diff --git a/jdk/test/sun/net/www/protocol/http/NTLMTest.java b/jdk/test/sun/net/www/protocol/http/NTLMTest.java index 21b1d4bdb6b..d9db4fdacfb 100644 --- a/jdk/test/sun/net/www/protocol/http/NTLMTest.java +++ b/jdk/test/sun/net/www/protocol/http/NTLMTest.java @@ -24,6 +24,7 @@ /* * @test * @bug 6520665 6357133 + * @modules java.base/sun.net.www * @run main/othervm NTLMTest * @summary 6520665 & 6357133: NTLM authentication issues. */ diff --git a/jdk/test/sun/net/www/protocol/http/NoNTLM.java b/jdk/test/sun/net/www/protocol/http/NoNTLM.java index d6f9f740833..788bb3d3de8 100644 --- a/jdk/test/sun/net/www/protocol/http/NoNTLM.java +++ b/jdk/test/sun/net/www/protocol/http/NoNTLM.java @@ -25,6 +25,7 @@ * @bug 8004502 * @summary Sanity check that NTLM will not be selected by the http protocol * handler when running on a profile that does not support NTLM + * @modules java.base/sun.net.www * @run main/othervm NoNTLM */ diff --git a/jdk/test/sun/net/www/protocol/http/RelativeRedirect.java b/jdk/test/sun/net/www/protocol/http/RelativeRedirect.java index eb4b2a69e42..85915ddcb3b 100644 --- a/jdk/test/sun/net/www/protocol/http/RelativeRedirect.java +++ b/jdk/test/sun/net/www/protocol/http/RelativeRedirect.java @@ -24,6 +24,7 @@ /** * @test * @bug 4726087 + * @modules java.base/sun.net.www * @library ../../httptest/ * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction * @run main RelativeRedirect diff --git a/jdk/test/sun/net/www/protocol/http/ResponseCacheStream.java b/jdk/test/sun/net/www/protocol/http/ResponseCacheStream.java index bff2a765d6c..5f74522364b 100644 --- a/jdk/test/sun/net/www/protocol/http/ResponseCacheStream.java +++ b/jdk/test/sun/net/www/protocol/http/ResponseCacheStream.java @@ -24,6 +24,7 @@ /* * @test * @bug 6262486 + * @modules java.base/sun.net.www * @library ../../httptest/ * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction * @run main/othervm -Dhttp.keepAlive=false ResponseCacheStream diff --git a/jdk/test/sun/net/www/protocol/http/RetryUponTimeout.java b/jdk/test/sun/net/www/protocol/http/RetryUponTimeout.java index bd9df907d01..0a8e552e669 100644 --- a/jdk/test/sun/net/www/protocol/http/RetryUponTimeout.java +++ b/jdk/test/sun/net/www/protocol/http/RetryUponTimeout.java @@ -25,6 +25,7 @@ * @test * @bug 4772077 * @summary using defaultReadTimeout appear to retry request upon timeout + * @modules java.base/sun.net.www */ import java.net.*; diff --git a/jdk/test/sun/net/www/protocol/http/SetChunkedStreamingMode.java b/jdk/test/sun/net/www/protocol/http/SetChunkedStreamingMode.java index 6ed5a9a6035..292bc6ed251 100644 --- a/jdk/test/sun/net/www/protocol/http/SetChunkedStreamingMode.java +++ b/jdk/test/sun/net/www/protocol/http/SetChunkedStreamingMode.java @@ -24,8 +24,9 @@ /** * @test * @bug 5049976 + * @modules java.base/sun.net.www * @library ../../httptest/ - @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction + * @build HttpCallback TestHttpServer ClosedChannelList HttpTransaction * @run main SetChunkedStreamingMode * @summary Unspecified NPE is thrown when streaming output mode is enabled */ diff --git a/jdk/test/sun/net/www/protocol/http/TunnelThroughProxy.java b/jdk/test/sun/net/www/protocol/http/TunnelThroughProxy.java index 10009698705..ba729f84fe5 100644 --- a/jdk/test/sun/net/www/protocol/http/TunnelThroughProxy.java +++ b/jdk/test/sun/net/www/protocol/http/TunnelThroughProxy.java @@ -24,6 +24,7 @@ /** * @test * @bug 4620362 + * @modules java.base/sun.net.www * @run main/othervm TunnelThroughProxy * @summary JSSE not returning proper exception on unknown host */ diff --git a/jdk/test/sun/net/www/protocol/http/UserAgent.java b/jdk/test/sun/net/www/protocol/http/UserAgent.java index 01c8cf5d085..a8ab0028fa2 100644 --- a/jdk/test/sun/net/www/protocol/http/UserAgent.java +++ b/jdk/test/sun/net/www/protocol/http/UserAgent.java @@ -24,6 +24,7 @@ /** * @test * @bug 4512200 + * @modules java.base/sun.net.www * @run main/othervm -Dhttp.agent=foo UserAgent * @summary HTTP header "User-Agent" format incorrect */ diff --git a/jdk/test/sun/net/www/protocol/http/ZoneId.java b/jdk/test/sun/net/www/protocol/http/ZoneId.java index 5e08961f4b4..125c97d486d 100644 --- a/jdk/test/sun/net/www/protocol/http/ZoneId.java +++ b/jdk/test/sun/net/www/protocol/http/ZoneId.java @@ -24,6 +24,7 @@ /* * @test * @bug 8027308 + * @modules java.base/sun.net.www.protocol.http * @summary verifies that HttpURLConnection does not send the zone id in the * 'Host' field of the header: * Host: [fe80::a00:27ff:aaaa:aaaa] instead of diff --git a/jdk/test/sun/net/www/protocol/https/ChunkedOutputStream.java b/jdk/test/sun/net/www/protocol/https/ChunkedOutputStream.java index cce270642ce..fa5a390b7a6 100644 --- a/jdk/test/sun/net/www/protocol/https/ChunkedOutputStream.java +++ b/jdk/test/sun/net/www/protocol/https/ChunkedOutputStream.java @@ -24,6 +24,7 @@ /** * @test * @bug 5026745 + * @modules java.base/sun.net.www * @library ../../httpstest/ * @build TestHttpsServer HttpCallback * @run main/othervm ChunkedOutputStream diff --git a/jdk/test/sun/net/www/protocol/https/HttpsClient/ProxyAuthTest.java b/jdk/test/sun/net/www/protocol/https/HttpsClient/ProxyAuthTest.java index 8fa75aa81c2..2eef7f42e8b 100644 --- a/jdk/test/sun/net/www/protocol/https/HttpsClient/ProxyAuthTest.java +++ b/jdk/test/sun/net/www/protocol/https/HttpsClient/ProxyAuthTest.java @@ -26,6 +26,7 @@ * @bug 4323990 4413069 * @summary HttpsURLConnection doesn't send Proxy-Authorization on CONNECT * Incorrect checking of proxy server response + * @modules java.base/sun.net.www * @run main/othervm ProxyAuthTest * * No way to reserve and restore java.lang.Authenticator, need to run this diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java index a5992579025..33af848f466 100644 --- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java +++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6216082.java @@ -24,11 +24,12 @@ /* * @test * @bug 6216082 - * @library .. - * @build HttpCallback TestHttpsServer ClosedChannelList HttpTransaction TunnelProxy * @summary Redirect problem with HttpsURLConnection using a proxy * SunJSSE does not support dynamic system properties, no way to re-use * system properties in samevm/agentvm mode. + * @modules java.base/sun.net.www + * @library .. + * @build HttpCallback TestHttpsServer ClosedChannelList HttpTransaction TunnelProxy * @run main/othervm B6216082 */ diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java index 3f80e8e68dd..c04ad1d1560 100644 --- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java +++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/B6226610.java @@ -24,8 +24,9 @@ /* * @test * @bug 6226610 6973030 - * @run main/othervm B6226610 * @summary HTTP tunnel connections send user headers to proxy + * @modules java.base/sun.net.www + * @run main/othervm B6226610 */ /* This class includes a proxy server that processes the HTTP CONNECT request, diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java index b8fcf977461..9ca30a19855 100644 --- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java +++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/CheckMethods.java @@ -26,6 +26,7 @@ * @bug 4423074 * @summary Need to rebase all the duplicated classes from Merlin. * This test will check out http POST + * @modules java.base/sun.net.www.protocol.https java.base/com.sun.net.ssl.internal.www.protocol.https */ import java.net.*; import java.util.*; diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java index b5295f31cf5..44c60a2318a 100644 --- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java +++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/DNSIdentities.java @@ -46,8 +46,6 @@ import java.security.spec.*; import java.security.interfaces.*; import java.math.BigInteger; -import sun.security.ssl.SSLSocketImpl; - /* * Certificates and key used in the test. * diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java index 88a261f81ee..7cf6282ecb4 100644 --- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java +++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressDNSIdentities.java @@ -43,8 +43,6 @@ import java.security.spec.*; import java.security.interfaces.*; import java.math.BigInteger; -import sun.security.ssl.SSLSocketImpl; - /* * Certificates and key used in the test. * diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java index bbf6892c43b..6743d1c66d1 100644 --- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java +++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPAddressIPIdentities.java @@ -46,8 +46,6 @@ import java.security.spec.*; import java.security.interfaces.*; import java.math.BigInteger; -import sun.security.ssl.SSLSocketImpl; - /* * Certificates and key used in the test. * diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java index c0d897b5fac..cf548d48355 100644 --- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java +++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/IPIdentities.java @@ -46,8 +46,6 @@ import java.security.spec.*; import java.security.interfaces.*; import java.math.BigInteger; -import sun.security.ssl.SSLSocketImpl; - /* * Certificates and key used in the test. * diff --git a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/Identities.java b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/Identities.java index 55dfb1c04dc..4f3343fa61e 100644 --- a/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/Identities.java +++ b/jdk/test/sun/net/www/protocol/https/HttpsURLConnection/Identities.java @@ -46,8 +46,6 @@ import java.security.spec.*; import java.security.interfaces.*; import java.math.BigInteger; -import sun.security.ssl.SSLSocketImpl; - /* * Certificates and key used in the test. * diff --git a/jdk/test/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java b/jdk/test/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java index 24e2572f78f..7b301270c6d 100644 --- a/jdk/test/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java +++ b/jdk/test/sun/net/www/protocol/https/NewImpl/ComHTTPSConnection.java @@ -25,6 +25,8 @@ * @test * @bug 4474255 * @summary Can no longer obtain a com.sun.net.ssl.HttpsURLConnection + * @modules java.base/com.sun.net.ssl + * java.base/com.sun.net.ssl.internal.www.protocol.https * @run main/othervm ComHTTPSConnection * * SunJSSE does not support dynamic system properties, no way to re-use diff --git a/jdk/test/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java b/jdk/test/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java index ba065f7c3e4..6e9972444e5 100644 --- a/jdk/test/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java +++ b/jdk/test/sun/net/www/protocol/https/NewImpl/ComHostnameVerifier.java @@ -28,6 +28,8 @@ * @bug 4484246 * @summary When an application enables anonymous SSL cipher suite, * Hostname verification is not required + * @modules java.base/com.sun.net.ssl + * java.base/com.sun.net.ssl.internal.www.protocol.https * @run main/othervm ComHostnameVerifier * * SunJSSE does not support dynamic system properties, no way to re-use diff --git a/jdk/test/sun/nio/cs/OLD/TestIBMDB.java b/jdk/test/sun/nio/cs/OLD/TestIBMDB.java index 404eb5b3aa0..f2e3cbcee79 100644 --- a/jdk/test/sun/nio/cs/OLD/TestIBMDB.java +++ b/jdk/test/sun/nio/cs/OLD/TestIBMDB.java @@ -26,6 +26,7 @@ * @bug 6843578 * @summary Test old and new implementation of db charsets * @build IBM930_OLD IBM933_OLD IBM935_OLD IBM937_OLD IBM939_OLD IBM942_OLD IBM943_OLD IBM948_OLD IBM949_OLD IBM950_OLD IBM970_OLD IBM942C_OLD IBM943C_OLD IBM949C_OLD IBM1381_OLD IBM1383_OLD EUC_CN_OLD EUC_KR_OLD GBK_OLD Johab_OLD MS932_OLD MS936_OLD MS949_OLD MS950_OLD SJIS_OLD PCK_OLD EUC_JP_OLD EUC_JP_LINUX_OLD EUC_JP_Open_OLD + * @modules java.base/sun.nio.cs jdk.charsets/sun.nio.cs.ext * @run main TestIBMDB */ diff --git a/jdk/test/sun/nio/cs/TestEUC_TW.java b/jdk/test/sun/nio/cs/TestEUC_TW.java index 97c8e1f05a4..4453a2cbead 100644 --- a/jdk/test/sun/nio/cs/TestEUC_TW.java +++ b/jdk/test/sun/nio/cs/TestEUC_TW.java @@ -25,6 +25,7 @@ * @test * @bug 6831794 6229811 * @summary Test EUC_TW charset + * @modules java.base/sun.nio.cs */ import java.nio.charset.*; diff --git a/jdk/test/sun/nio/cs/TestStringCoding.java b/jdk/test/sun/nio/cs/TestStringCoding.java index 95d273dd5cb..f9f7021dca3 100644 --- a/jdk/test/sun/nio/cs/TestStringCoding.java +++ b/jdk/test/sun/nio/cs/TestStringCoding.java @@ -22,8 +22,9 @@ */ /* @test - @bug 6636323 6636319 7040220 7096080 7183053 8080248 - @summary Test if StringCoding and NIO result have the same de/encoding result + * @bug 6636323 6636319 7040220 7096080 7183053 8080248 + * @summary Test if StringCoding and NIO result have the same de/encoding result + * @modules java.base/sun.nio.cs * @run main/othervm/timeout=2000 TestStringCoding * @key randomness */ diff --git a/jdk/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java b/jdk/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java index 063746b175a..e8d8ae7e4e3 100644 --- a/jdk/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java +++ b/jdk/test/sun/reflect/AnonymousNewInstance/ManyNewInstanceAnonTest.java @@ -25,8 +25,10 @@ * @test * @bug 7194897 * @summary JSR 292: Cannot create more than 16 instances of an anonymous class - * @author Robert Field + * @modules java.base/sun.misc + * @modules java.management * @library /lib/testlibrary + * @author Robert Field * @compile -XDignore.symbol.file ManyNewInstanceAnonTest.java * @build jdk.testlibrary.* * @run main ClassFileInstaller ManyNewInstanceAnonTest diff --git a/jdk/test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java b/jdk/test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java index b1af24f2f83..9986415aeb1 100644 --- a/jdk/test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java +++ b/jdk/test/sun/reflect/CallerSensitive/CallerSensitiveFinder.java @@ -48,6 +48,7 @@ import java.util.stream.Stream; * @bug 8010117 * @summary Verify if CallerSensitive methods are annotated with * sun.reflect.CallerSensitive annotation + * @modules jdk.compiler/com.sun.tools.classfile jdk.jdeps/com.sun.tools.jdeps * @build CallerSensitiveFinder * @run main/othervm/timeout=900 CallerSensitiveFinder */ diff --git a/jdk/test/sun/reflect/CallerSensitive/MissingCallerSensitive.java b/jdk/test/sun/reflect/CallerSensitive/MissingCallerSensitive.java index 66c4398114f..86b12a6748d 100644 --- a/jdk/test/sun/reflect/CallerSensitive/MissingCallerSensitive.java +++ b/jdk/test/sun/reflect/CallerSensitive/MissingCallerSensitive.java @@ -26,6 +26,10 @@ * @test * @bug 8010117 * @summary Test CallerSensitiveFinder to find missing annotation + * @modules java.base/sun.reflect + * jdk.jdeps/com.sun.tools.classfile + * jdk.jdeps/com.sun.tools.jdeps + * @modules java.base/sun.reflect * @compile -XDignore.symbol.file MissingCallerSensitive.java * @build CallerSensitiveFinder * @run main MissingCallerSensitive diff --git a/jdk/test/sun/reflect/Reflection/GetCallerClassWithDepth.java b/jdk/test/sun/reflect/Reflection/GetCallerClassWithDepth.java index 33eefd54875..8e7c9cc9d13 100644 --- a/jdk/test/sun/reflect/Reflection/GetCallerClassWithDepth.java +++ b/jdk/test/sun/reflect/Reflection/GetCallerClassWithDepth.java @@ -25,6 +25,7 @@ * @test * @bug 8025799 * @summary sun.reflect.Reflection.getCallerClass(int) + * @modules java.base/sun.reflect * @run main GetCallerClassWithDepth */ diff --git a/jdk/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java b/jdk/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java index a7c7f5aa15a..18f44250e53 100644 --- a/jdk/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java +++ b/jdk/test/sun/rmi/log/ReliableLog/LogAlignmentTest.java @@ -25,6 +25,7 @@ * @bug 4094889 * @summary rmid can have a corrupted log * + * @modules java.rmi/sun.rmi.log * @run main/othervm LogAlignmentTest */ diff --git a/jdk/test/sun/rmi/log/ReliableLog/SnapshotSize.java b/jdk/test/sun/rmi/log/ReliableLog/SnapshotSize.java index c8ea22cd0ed..4809b2ab04c 100644 --- a/jdk/test/sun/rmi/log/ReliableLog/SnapshotSize.java +++ b/jdk/test/sun/rmi/log/ReliableLog/SnapshotSize.java @@ -26,6 +26,7 @@ * @summary Verify that ReliableLog.snapshotSize() returns correct snapshot * file size even if LogHandler doesn't flush. * + * @modules java.rmi/sun.rmi.log * @run main/othervm SnapshotSize */ diff --git a/jdk/test/sun/rmi/rmic/classpath/RMICClassPathTest.java b/jdk/test/sun/rmi/rmic/classpath/RMICClassPathTest.java index 7abfe8adce5..77956897756 100644 --- a/jdk/test/sun/rmi/rmic/classpath/RMICClassPathTest.java +++ b/jdk/test/sun/rmi/rmic/classpath/RMICClassPathTest.java @@ -30,6 +30,8 @@ * @summary New constructor in sun.tools.java.ClassPath builds a path using * File.separator instead of File.pathSeparator. This test does * not affect VM global state, so othervm is not required. + * @modules jdk.rmic/sun.rmi.rmic + * jdk.rmic/sun.tools.java * @run main RMICClassPathTest */ diff --git a/jdk/test/sun/rmi/rmic/iiopCompilation/IIOPCompilation.java b/jdk/test/sun/rmi/rmic/iiopCompilation/IIOPCompilation.java index 14702b2f471..eb591a5443d 100644 --- a/jdk/test/sun/rmi/rmic/iiopCompilation/IIOPCompilation.java +++ b/jdk/test/sun/rmi/rmic/iiopCompilation/IIOPCompilation.java @@ -24,6 +24,11 @@ /* @test * @bug 8065957 * @library ../../../../java/rmi/testlibrary + * @modules java.corba + * java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @summary Compiles a PortableRemoteObject with rmic -iiop and ensures that stub and tie classes are generated. * @run main IIOPCompilation diff --git a/jdk/test/sun/rmi/runtime/Log/4504153/Test4504153.java b/jdk/test/sun/rmi/runtime/Log/4504153/Test4504153.java index 946e9a9c0ac..05f1ec5ec36 100644 --- a/jdk/test/sun/rmi/runtime/Log/4504153/Test4504153.java +++ b/jdk/test/sun/rmi/runtime/Log/4504153/Test4504153.java @@ -28,6 +28,10 @@ * @author Peter Jones * * @library ../../../../../java/rmi/testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build JavaVM * @run main/othervm Test4504153 */ diff --git a/jdk/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java b/jdk/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java index 70505fab6f2..eab963b1d8d 100644 --- a/jdk/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java +++ b/jdk/test/sun/rmi/runtime/Log/6409194/NoConsoleOutput.java @@ -31,6 +31,10 @@ * @author Peter Jones * * @library ../../../../../java/rmi/testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary JavaVM * @run main/othervm NoConsoleOutput */ diff --git a/jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java b/jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java index 9f40e331ebd..e8bd9c0a545 100644 --- a/jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java +++ b/jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogStreams.java @@ -28,6 +28,10 @@ * @author Laird Dornin * * @library ../../../../../java/rmi/testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary CheckLogging * @run main/othervm -Dsun.rmi.log.useOld=true CheckLogStreams */ diff --git a/jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java b/jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java index d0caf531e3b..dc23b4894eb 100644 --- a/jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java +++ b/jdk/test/sun/rmi/runtime/Log/checkLogging/CheckLogging.java @@ -28,6 +28,10 @@ * @author Laird Dornin * * @library ../../../../../java/rmi/testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm CheckLogging */ diff --git a/jdk/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java b/jdk/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java index 7db3dfed249..a6425c2260d 100644 --- a/jdk/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java +++ b/jdk/test/sun/rmi/server/MarshalOutputStream/marshalForeignStub/MarshalForeignStub.java @@ -31,6 +31,10 @@ * @author Ann Wollrath * * @library ../../../../../java/rmi/testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary Receiver MarshalForeignStub_Stub * @run main/othervm/policy=security.policy MarshalForeignStub */ diff --git a/jdk/test/sun/rmi/transport/proxy/DisableHttpDefaultValue.java b/jdk/test/sun/rmi/transport/proxy/DisableHttpDefaultValue.java index 59c39fce737..5449c3b8759 100644 --- a/jdk/test/sun/rmi/transport/proxy/DisableHttpDefaultValue.java +++ b/jdk/test/sun/rmi/transport/proxy/DisableHttpDefaultValue.java @@ -25,6 +25,7 @@ * @bug 8023862 * @summary Verify that the default value of the java.rmi.server.disableHttp * has been changed from false to true. + * @modules java.rmi/sun.rmi.transport.proxy * @compile -XDignore.symbol.file DisableHttpDefaultValue.java * * @run main/othervm DisableHttpDefaultValue true diff --git a/jdk/test/sun/rmi/transport/proxy/EagerHttpFallback.java b/jdk/test/sun/rmi/transport/proxy/EagerHttpFallback.java index 3879c665d14..5b5691701c7 100644 --- a/jdk/test/sun/rmi/transport/proxy/EagerHttpFallback.java +++ b/jdk/test/sun/rmi/transport/proxy/EagerHttpFallback.java @@ -27,6 +27,10 @@ * sun.rmi.transport.proxy.eagerHttpFallback system property is set. * * @library ../../../../java/rmi/testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary * @run main/othervm EagerHttpFallback */ diff --git a/jdk/test/sun/rmi/transport/tcp/DeadCachedConnection.java b/jdk/test/sun/rmi/transport/tcp/DeadCachedConnection.java index ebc92f61ef1..0ad0dc5202e 100644 --- a/jdk/test/sun/rmi/transport/tcp/DeadCachedConnection.java +++ b/jdk/test/sun/rmi/transport/tcp/DeadCachedConnection.java @@ -25,6 +25,10 @@ * @bug 4094891 * @summary unable to retry call if cached connection to server is used * @library ../../../../java/rmi/testlibrary + * @modules java.rmi/sun.rmi.registry + * java.rmi/sun.rmi.server + * java.rmi/sun.rmi.transport + * java.rmi/sun.rmi.transport.tcp * @build TestLibrary JavaVM * @run main/othervm DeadCachedConnection */ diff --git a/jdk/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java b/jdk/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java index 2f5002d323e..7de92ee2c47 100644 --- a/jdk/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java +++ b/jdk/test/sun/rmi/transport/tcp/blockAccept/BlockAcceptTest.java @@ -28,6 +28,7 @@ * @author Adrian Colley * * @library ../../../../../java/rmi/testlibrary + * @modules java.rmi/sun.rmi.transport.proxy * @build TestIface TestImpl TestImpl_Stub * @run main/othervm/policy=security.policy/timeout=60 BlockAcceptTest */ diff --git a/jdk/test/sun/security/action/Generify.java b/jdk/test/sun/security/action/Generify.java index 66e5afebe5c..55b0e7735db 100644 --- a/jdk/test/sun/security/action/Generify.java +++ b/jdk/test/sun/security/action/Generify.java @@ -25,6 +25,7 @@ * @test * @bug 5057136 * @summary Generify sun.security.action.GetPropertyAction and friends + * @modules java.base/sun.security.action */ import java.io.*; diff --git a/jdk/test/sun/security/action/GetLongAction/ReturnNullIfNoDefault.java b/jdk/test/sun/security/action/GetLongAction/ReturnNullIfNoDefault.java index c738a7e584f..be465575019 100644 --- a/jdk/test/sun/security/action/GetLongAction/ReturnNullIfNoDefault.java +++ b/jdk/test/sun/security/action/GetLongAction/ReturnNullIfNoDefault.java @@ -26,6 +26,7 @@ * @bug 4173993 * @summary Make sure "null" is returned if property does not exist (or has * wrong numeric format) and no default has been specified. + * @modules java.base/sun.security.action */ import sun.security.action.*; diff --git a/jdk/test/sun/security/ec/TestEC.java b/jdk/test/sun/security/ec/TestEC.java index a9368474849..62ffc076020 100644 --- a/jdk/test/sun/security/ec/TestEC.java +++ b/jdk/test/sun/security/ec/TestEC.java @@ -34,6 +34,7 @@ * @library ../pkcs11/ec * @library ../pkcs11/sslecc * @library ../../../java/security/testlibrary + * @modules jdk.crypto.pkcs11/sun.security.pkcs11.wrapper * @compile -XDignore.symbol.file TestEC.java * @run main/othervm TestEC */ diff --git a/jdk/test/sun/security/jgss/DefaultGssConfig.java b/jdk/test/sun/security/jgss/DefaultGssConfig.java index 3517b75076a..e80a2aaf365 100644 --- a/jdk/test/sun/security/jgss/DefaultGssConfig.java +++ b/jdk/test/sun/security/jgss/DefaultGssConfig.java @@ -25,6 +25,7 @@ * @test * @bug 6483218 * @summary Provide a default login configuration + * @modules java.security.jgss/sun.security.jgss */ import java.io.FileNotFoundException; diff --git a/jdk/test/sun/security/jgss/GssNPE.java b/jdk/test/sun/security/jgss/GssNPE.java index d2723ba625c..8eef7fd52a0 100644 --- a/jdk/test/sun/security/jgss/GssNPE.java +++ b/jdk/test/sun/security/jgss/GssNPE.java @@ -24,6 +24,7 @@ /* * @test * @bug 6345338 + * @modules java.security.jgss/sun.security.jgss * @run main/othervm GssNPE * @summary GSS throws NPE when the JAAS config file does not exist */ diff --git a/jdk/test/sun/security/jgss/spnego/NegTokenTargFields.java b/jdk/test/sun/security/jgss/spnego/NegTokenTargFields.java index b6efa276318..aa0bcf12408 100644 --- a/jdk/test/sun/security/jgss/spnego/NegTokenTargFields.java +++ b/jdk/test/sun/security/jgss/spnego/NegTokenTargFields.java @@ -25,6 +25,7 @@ * @test * @bug 7040151 * @summary SPNEGO GSS code does not parse tokens in accordance to RFC 2478 + * @modules java.security.jgss/sun.security.jgss.spnego * @compile -XDignore.symbol.file NegTokenTargFields.java * @run main NegTokenTargFields nomech * @run main/fail NegTokenTargFields badorder diff --git a/jdk/test/sun/security/jgss/spnego/NoSpnegoAsDefMech.java b/jdk/test/sun/security/jgss/spnego/NoSpnegoAsDefMech.java index 2dcedc482f9..4565622db5f 100644 --- a/jdk/test/sun/security/jgss/spnego/NoSpnegoAsDefMech.java +++ b/jdk/test/sun/security/jgss/spnego/NoSpnegoAsDefMech.java @@ -24,6 +24,7 @@ /* * @test * @bug 6770883 + * @modules java.security.jgss/sun.security.jgss * @run main/othervm NoSpnegoAsDefMech * @summary Infinite loop if SPNEGO specified as sun.security.jgss.mechanism */ diff --git a/jdk/test/sun/security/jgss/spnego/NotPreferredMech.java b/jdk/test/sun/security/jgss/spnego/NotPreferredMech.java index 5eb8150d265..bbe5024e501 100644 --- a/jdk/test/sun/security/jgss/spnego/NotPreferredMech.java +++ b/jdk/test/sun/security/jgss/spnego/NotPreferredMech.java @@ -24,6 +24,9 @@ /* * @test * @bug 8048194 + * @modules java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.jgss.spnego * @run main/othervm NotPreferredMech * @summary GSSContext.acceptSecContext fails when a supported mech is not initiator preferred */ diff --git a/jdk/test/sun/security/krb5/KrbCredSubKey.java b/jdk/test/sun/security/krb5/KrbCredSubKey.java index e6c96430f76..0b68fceeb53 100644 --- a/jdk/test/sun/security/krb5/KrbCredSubKey.java +++ b/jdk/test/sun/security/krb5/KrbCredSubKey.java @@ -24,6 +24,8 @@ /** * @test * @bug 7030180 + * @modules java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 * @run main/othervm KrbCredSubKey * @summary AES 128/256 decrypt exception */ diff --git a/jdk/test/sun/security/krb5/MicroTime.java b/jdk/test/sun/security/krb5/MicroTime.java index 5ac63ca9050..8b6b9232415 100644 --- a/jdk/test/sun/security/krb5/MicroTime.java +++ b/jdk/test/sun/security/krb5/MicroTime.java @@ -24,6 +24,7 @@ * @test * @bug 6882687 8011124 * @summary KerberosTime too imprecise + * @modules java.security.jgss/sun.security.krb5.internal */ import sun.security.krb5.internal.KerberosTime; diff --git a/jdk/test/sun/security/krb5/NegativeNonce.java b/jdk/test/sun/security/krb5/NegativeNonce.java index 5ea861b990f..0b9ed633fbb 100644 --- a/jdk/test/sun/security/krb5/NegativeNonce.java +++ b/jdk/test/sun/security/krb5/NegativeNonce.java @@ -24,6 +24,7 @@ * @test * @bug 6517944 * @summary Nonce should be UInt32 + * @modules java.security.jgss/sun.security.krb5.internal.crypto */ import sun.security.krb5.internal.crypto.Nonce; diff --git a/jdk/test/sun/security/krb5/OptionPADataInKDCReq.java b/jdk/test/sun/security/krb5/OptionPADataInKDCReq.java index fbab3c8d563..7d9b3bc6716 100644 --- a/jdk/test/sun/security/krb5/OptionPADataInKDCReq.java +++ b/jdk/test/sun/security/krb5/OptionPADataInKDCReq.java @@ -24,6 +24,8 @@ * @test * @bug 6648972 * @summary KDCReq.init always read padata + * @modules java.base/sun.security.util + * java.security.jgss/sun.security.krb5.internal */ import sun.security.krb5.internal.ETypeInfo2; import sun.security.krb5.internal.KDCReq; diff --git a/jdk/test/sun/security/krb5/RFC396xTest.java b/jdk/test/sun/security/krb5/RFC396xTest.java index 76016c38817..186a624803b 100644 --- a/jdk/test/sun/security/krb5/RFC396xTest.java +++ b/jdk/test/sun/security/krb5/RFC396xTest.java @@ -23,6 +23,9 @@ /* * @test * @bug 6862679 + * @modules java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.crypto.dk * @run main/othervm RFC396xTest * @summary ESC: AD Authentication with user with umlauts fails */ diff --git a/jdk/test/sun/security/krb5/ServiceCredsCombination.java b/jdk/test/sun/security/krb5/ServiceCredsCombination.java index d44c4c6b6a1..3876743e516 100644 --- a/jdk/test/sun/security/krb5/ServiceCredsCombination.java +++ b/jdk/test/sun/security/krb5/ServiceCredsCombination.java @@ -23,6 +23,7 @@ /* * @test * @bug 8005447 + * @modules java.security.jgss/sun.security.jgss * @compile -XDignore.symbol.file ServiceCredsCombination.java * @run main ServiceCredsCombination * @summary default principal can act as anyone diff --git a/jdk/test/sun/security/krb5/TestPAData.java b/jdk/test/sun/security/krb5/TestPAData.java index 86a4c836739..09a451a5eba 100644 --- a/jdk/test/sun/security/krb5/TestPAData.java +++ b/jdk/test/sun/security/krb5/TestPAData.java @@ -24,6 +24,8 @@ * @test * @bug 6570062 * @summary Kerberos authentication regression + * @modules java.base/sun.security.util + * java.security.jgss/sun.security.krb5.internal */ import sun.security.krb5.internal.KRBError; diff --git a/jdk/test/sun/security/krb5/UnknownCCEntry.java b/jdk/test/sun/security/krb5/UnknownCCEntry.java index 17af51e2847..c91f9732c8f 100644 --- a/jdk/test/sun/security/krb5/UnknownCCEntry.java +++ b/jdk/test/sun/security/krb5/UnknownCCEntry.java @@ -24,6 +24,8 @@ * @test * @bug 6979329 * @summary CCacheInputStream fails to read ticket cache files from Kerberos 1.8.1 + * @modules java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal.ccache */ import java.io.ByteArrayInputStream; diff --git a/jdk/test/sun/security/krb5/auto/AcceptPermissions.java b/jdk/test/sun/security/krb5/auto/AcceptPermissions.java index d26f9688a6b..e63a06cba0e 100644 --- a/jdk/test/sun/security/krb5/auto/AcceptPermissions.java +++ b/jdk/test/sun/security/krb5/auto/AcceptPermissions.java @@ -25,6 +25,14 @@ * @test * @bug 9999999 * @summary default principal can act as anyone + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file AcceptPermissions.java * @run main/othervm AcceptPermissions two * @run main/othervm AcceptPermissions unbound diff --git a/jdk/test/sun/security/krb5/auto/AcceptorSubKey.java b/jdk/test/sun/security/krb5/auto/AcceptorSubKey.java index f5e122d030e..cbff85de802 100644 --- a/jdk/test/sun/security/krb5/auto/AcceptorSubKey.java +++ b/jdk/test/sun/security/krb5/auto/AcceptorSubKey.java @@ -25,6 +25,14 @@ * @test * @bug 7077646 * @summary gssapi wrap for CFX per-message tokens always set FLAG_ACCEPTOR_SUBKEY + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file AcceptorSubKey.java * @run main/othervm AcceptorSubKey 0 * @run main/othervm AcceptorSubKey 4 diff --git a/jdk/test/sun/security/krb5/auto/AddressesAndNameType.java b/jdk/test/sun/security/krb5/auto/AddressesAndNameType.java index de0dc89491c..0d3985be028 100644 --- a/jdk/test/sun/security/krb5/auto/AddressesAndNameType.java +++ b/jdk/test/sun/security/krb5/auto/AddressesAndNameType.java @@ -24,6 +24,13 @@ /* * @test * @bug 4501327 4868379 8039132 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm AddressesAndNameType 1 * @run main/othervm AddressesAndNameType 2 * @run main/othervm AddressesAndNameType 3 diff --git a/jdk/test/sun/security/krb5/auto/BadKdc1.java b/jdk/test/sun/security/krb5/auto/BadKdc1.java index dd608939a92..8108535d284 100644 --- a/jdk/test/sun/security/krb5/auto/BadKdc1.java +++ b/jdk/test/sun/security/krb5/auto/BadKdc1.java @@ -24,6 +24,13 @@ /* * @test * @bug 6843127 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm/timeout=300 BadKdc1 * @summary krb5 should not try to access unavailable kdc too often */ diff --git a/jdk/test/sun/security/krb5/auto/BadKdc2.java b/jdk/test/sun/security/krb5/auto/BadKdc2.java index 4291d5c14c0..403a9111c11 100644 --- a/jdk/test/sun/security/krb5/auto/BadKdc2.java +++ b/jdk/test/sun/security/krb5/auto/BadKdc2.java @@ -24,6 +24,13 @@ /* * @test * @bug 6843127 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm/timeout=300 BadKdc2 * @summary krb5 should not try to access unavailable kdc too often */ diff --git a/jdk/test/sun/security/krb5/auto/BadKdc3.java b/jdk/test/sun/security/krb5/auto/BadKdc3.java index 4bafd9a2ffe..f739ce0078f 100644 --- a/jdk/test/sun/security/krb5/auto/BadKdc3.java +++ b/jdk/test/sun/security/krb5/auto/BadKdc3.java @@ -24,6 +24,13 @@ /* * @test * @bug 6843127 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm/timeout=300 BadKdc3 * @summary krb5 should not try to access unavailable kdc too often */ diff --git a/jdk/test/sun/security/krb5/auto/BadKdc4.java b/jdk/test/sun/security/krb5/auto/BadKdc4.java index 877e5400df9..a45d9f15624 100644 --- a/jdk/test/sun/security/krb5/auto/BadKdc4.java +++ b/jdk/test/sun/security/krb5/auto/BadKdc4.java @@ -24,6 +24,13 @@ /* * @test * @bug 6843127 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm/timeout=300 BadKdc4 * @summary krb5 should not try to access unavailable kdc too often */ diff --git a/jdk/test/sun/security/krb5/auto/Basic.java b/jdk/test/sun/security/krb5/auto/Basic.java index ef7f11db509..c16d0373131 100644 --- a/jdk/test/sun/security/krb5/auto/Basic.java +++ b/jdk/test/sun/security/krb5/auto/Basic.java @@ -25,6 +25,14 @@ * @test * @bug 7152176 * @summary More krb5 tests + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file Basic.java * @run main/othervm Basic */ diff --git a/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java b/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java index 3a60cc2fd9a..7fb18b0f9bf 100644 --- a/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java +++ b/jdk/test/sun/security/krb5/auto/BasicKrb5Test.java @@ -25,6 +25,14 @@ * @test * @bug 6706974 * @summary Add krb5 test infrastructure + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file BasicKrb5Test.java * @run main/othervm BasicKrb5Test * @run main/othervm BasicKrb5Test des-cbc-crc diff --git a/jdk/test/sun/security/krb5/auto/BasicProc.java b/jdk/test/sun/security/krb5/auto/BasicProc.java index 54b204fb420..8cfee2b1892 100644 --- a/jdk/test/sun/security/krb5/auto/BasicProc.java +++ b/jdk/test/sun/security/krb5/auto/BasicProc.java @@ -26,6 +26,13 @@ * @bug 8009977 * @summary A test library to launch multiple Java processes * @library ../../../../java/security/testlibrary/ + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file BasicProc.java * @run main/othervm BasicProc */ diff --git a/jdk/test/sun/security/krb5/auto/CleanState.java b/jdk/test/sun/security/krb5/auto/CleanState.java index b63e23deffe..1c76cfd99be 100644 --- a/jdk/test/sun/security/krb5/auto/CleanState.java +++ b/jdk/test/sun/security/krb5/auto/CleanState.java @@ -24,6 +24,13 @@ /* * @test * @bug 6716534 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file CleanState.java * @run main/othervm CleanState * @summary Krb5LoginModule has not cleaned temp info between authentication attempts diff --git a/jdk/test/sun/security/krb5/auto/CrossRealm.java b/jdk/test/sun/security/krb5/auto/CrossRealm.java index 26dc6ae6419..97d29452742 100644 --- a/jdk/test/sun/security/krb5/auto/CrossRealm.java +++ b/jdk/test/sun/security/krb5/auto/CrossRealm.java @@ -24,6 +24,14 @@ /* * @test * @bug 6706974 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file CrossRealm.java * @run main/othervm CrossRealm * @summary Add krb5 test infrastructure diff --git a/jdk/test/sun/security/krb5/auto/DiffNameSameKey.java b/jdk/test/sun/security/krb5/auto/DiffNameSameKey.java index 38bacb861e3..0290d442cff 100644 --- a/jdk/test/sun/security/krb5/auto/DiffNameSameKey.java +++ b/jdk/test/sun/security/krb5/auto/DiffNameSameKey.java @@ -25,6 +25,14 @@ * @test * @bug 8005447 * @summary default principal can act as anyone + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file DiffNameSameKey.java * @run main/othervm/fail DiffNameSameKey a * @run main/othervm DiffNameSameKey b diff --git a/jdk/test/sun/security/krb5/auto/DupEtypes.java b/jdk/test/sun/security/krb5/auto/DupEtypes.java index efc26e825c0..55fd273995a 100644 --- a/jdk/test/sun/security/krb5/auto/DupEtypes.java +++ b/jdk/test/sun/security/krb5/auto/DupEtypes.java @@ -25,6 +25,14 @@ * @test * @bug 7067974 * @summary multiple ETYPE-INFO-ENTRY with same etype and different salt + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file DupEtypes.java * @run main/othervm DupEtypes 1 * @run main/othervm DupEtypes 2 diff --git a/jdk/test/sun/security/krb5/auto/DynamicKeytab.java b/jdk/test/sun/security/krb5/auto/DynamicKeytab.java index dd9e67cac8a..eaaee087f29 100644 --- a/jdk/test/sun/security/krb5/auto/DynamicKeytab.java +++ b/jdk/test/sun/security/krb5/auto/DynamicKeytab.java @@ -24,6 +24,14 @@ /* * @test * @bug 6894072 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file DynamicKeytab.java * @run main/othervm DynamicKeytab * @summary always refresh keytab diff --git a/jdk/test/sun/security/krb5/auto/EmptyPassword.java b/jdk/test/sun/security/krb5/auto/EmptyPassword.java index d66b202ec37..4a631ef68ed 100644 --- a/jdk/test/sun/security/krb5/auto/EmptyPassword.java +++ b/jdk/test/sun/security/krb5/auto/EmptyPassword.java @@ -25,6 +25,13 @@ * @test * @bug 6879540 * @summary enable empty password for kerberos 5 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file EmptyPassword.java * @run main/othervm EmptyPassword */ diff --git a/jdk/test/sun/security/krb5/auto/FileKeyTab.java b/jdk/test/sun/security/krb5/auto/FileKeyTab.java index a8e8377172f..e7333e12c66 100644 --- a/jdk/test/sun/security/krb5/auto/FileKeyTab.java +++ b/jdk/test/sun/security/krb5/auto/FileKeyTab.java @@ -25,13 +25,19 @@ * @test * @bug 7152121 * @summary Krb5LoginModule no longer handles keyTabNames with "file:" prefix + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file FileKeyTab.java * @run main/othervm FileKeyTab */ import java.io.File; import java.io.FileOutputStream; -import sun.security.jgss.GSSUtil; // The basic krb5 test skeleton you can copy from public class FileKeyTab { diff --git a/jdk/test/sun/security/krb5/auto/ForwardableCheck.java b/jdk/test/sun/security/krb5/auto/ForwardableCheck.java index df6e49ec66b..b5ffe5df05b 100644 --- a/jdk/test/sun/security/krb5/auto/ForwardableCheck.java +++ b/jdk/test/sun/security/krb5/auto/ForwardableCheck.java @@ -25,6 +25,14 @@ * @test * @bug 8022582 * @summary Relax response flags checking in sun.security.krb5.KrbKdcRep.check. + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file ForwardableCheck.java * @run main/othervm ForwardableCheck */ diff --git a/jdk/test/sun/security/krb5/auto/GSS.java b/jdk/test/sun/security/krb5/auto/GSS.java index 8e782095884..00d9b69c5ec 100644 --- a/jdk/test/sun/security/krb5/auto/GSS.java +++ b/jdk/test/sun/security/krb5/auto/GSS.java @@ -25,6 +25,14 @@ * @test * @bug 7152176 * @summary More krb5 tests + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file GSS.java * @run main/othervm GSS */ diff --git a/jdk/test/sun/security/krb5/auto/GSSUnbound.java b/jdk/test/sun/security/krb5/auto/GSSUnbound.java index 74f0e9a91ec..973920d8c0f 100644 --- a/jdk/test/sun/security/krb5/auto/GSSUnbound.java +++ b/jdk/test/sun/security/krb5/auto/GSSUnbound.java @@ -25,6 +25,14 @@ * @test * @bug 8001104 * @summary Unbound SASL service: the GSSAPI/krb5 mech + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file GSSUnbound.java * @run main/othervm GSSUnbound */ diff --git a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java index 9d3b44e0057..70c95f72fe3 100644 --- a/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java +++ b/jdk/test/sun/security/krb5/auto/HttpNegotiateServer.java @@ -24,6 +24,15 @@ /* * @test * @bug 6578647 6829283 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.base/sun.util.logging + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm HttpNegotiateServer * @summary Undefined requesting URL in java.net.Authenticator.getPasswordAuthentication() * @summary HTTP/Negotiate: Authenticator triggered again when user cancels the first one diff --git a/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java b/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java index e2641a9a4f9..6f675ddca8b 100644 --- a/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java +++ b/jdk/test/sun/security/krb5/auto/IgnoreChannelBinding.java @@ -24,6 +24,14 @@ /* * @test * @bug 6851973 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm IgnoreChannelBinding * @summary ignore incoming channel binding if acceptor does not set one */ diff --git a/jdk/test/sun/security/krb5/auto/KPEquals.java b/jdk/test/sun/security/krb5/auto/KPEquals.java index 7a7aaa34f24..b9b314805c2 100644 --- a/jdk/test/sun/security/krb5/auto/KPEquals.java +++ b/jdk/test/sun/security/krb5/auto/KPEquals.java @@ -25,6 +25,14 @@ * @test * @bug 8015669 * @summary KerberosPrincipal::equals should ignore name-type + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file KPEquals.java * @run main/othervm KPEquals */ diff --git a/jdk/test/sun/security/krb5/auto/KeyPermissions.java b/jdk/test/sun/security/krb5/auto/KeyPermissions.java index 78f0eafc6c5..4e90d29bcae 100644 --- a/jdk/test/sun/security/krb5/auto/KeyPermissions.java +++ b/jdk/test/sun/security/krb5/auto/KeyPermissions.java @@ -25,6 +25,14 @@ * @test * @bug 8004488 * @summary wrong permissions checked in krb5 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file KeyPermissions.java * @run main/othervm KeyPermissions */ diff --git a/jdk/test/sun/security/krb5/auto/KeyTabCompat.java b/jdk/test/sun/security/krb5/auto/KeyTabCompat.java index 00a7f7cd837..3939b524ff2 100644 --- a/jdk/test/sun/security/krb5/auto/KeyTabCompat.java +++ b/jdk/test/sun/security/krb5/auto/KeyTabCompat.java @@ -25,6 +25,14 @@ * @test * @bug 6894072 * @bug 8004488 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file KeyTabCompat.java * @run main/othervm KeyTabCompat * @summary always refresh keytab diff --git a/jdk/test/sun/security/krb5/auto/KvnoNA.java b/jdk/test/sun/security/krb5/auto/KvnoNA.java index 2c645ecf357..4dd4e9ea8c0 100644 --- a/jdk/test/sun/security/krb5/auto/KvnoNA.java +++ b/jdk/test/sun/security/krb5/auto/KvnoNA.java @@ -24,6 +24,14 @@ /* * @test * @bug 7197159 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file KvnoNA.java * @run main/othervm KvnoNA * @summary accept different kvno if there no match diff --git a/jdk/test/sun/security/krb5/auto/LifeTimeInSeconds.java b/jdk/test/sun/security/krb5/auto/LifeTimeInSeconds.java index 961990bdda7..eb924fd1a38 100644 --- a/jdk/test/sun/security/krb5/auto/LifeTimeInSeconds.java +++ b/jdk/test/sun/security/krb5/auto/LifeTimeInSeconds.java @@ -24,6 +24,13 @@ /* * @test * @bug 6857802 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm LifeTimeInSeconds * @summary GSS getRemainingInitLifetime method returns milliseconds not seconds */ diff --git a/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java b/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java index 2c77451d748..42feacc8241 100644 --- a/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java +++ b/jdk/test/sun/security/krb5/auto/LoginModuleOptions.java @@ -24,6 +24,13 @@ /* * @test * @bug 6765491 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm LoginModuleOptions * @summary Krb5LoginModule a little too restrictive, and the doc is not clear. */ diff --git a/jdk/test/sun/security/krb5/auto/LoginNoPass.java b/jdk/test/sun/security/krb5/auto/LoginNoPass.java index 73de94001ae..019dc102f6f 100644 --- a/jdk/test/sun/security/krb5/auto/LoginNoPass.java +++ b/jdk/test/sun/security/krb5/auto/LoginNoPass.java @@ -25,6 +25,14 @@ * @test * @bug 8028351 * @summary JWS doesn't get authenticated when using kerberos auth proxy + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file LoginNoPass.java * @run main/othervm LoginNoPass */ diff --git a/jdk/test/sun/security/krb5/auto/MSOID2.java b/jdk/test/sun/security/krb5/auto/MSOID2.java index e81be6a8a3d..fd5c6866e56 100644 --- a/jdk/test/sun/security/krb5/auto/MSOID2.java +++ b/jdk/test/sun/security/krb5/auto/MSOID2.java @@ -25,6 +25,15 @@ * @test * @bug 8078439 * @summary SPNEGO auth fails if client proposes MS krb5 OID + * @modules java.base/sun.misc + * java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file MSOID2.java * @run main/othervm MSOID2 */ diff --git a/jdk/test/sun/security/krb5/auto/MaxRetries.java b/jdk/test/sun/security/krb5/auto/MaxRetries.java index 880c0233381..adcbc646cc8 100644 --- a/jdk/test/sun/security/krb5/auto/MaxRetries.java +++ b/jdk/test/sun/security/krb5/auto/MaxRetries.java @@ -24,6 +24,13 @@ /* * @test * @bug 6844193 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file MaxRetries.java * @run main/othervm/timeout=300 MaxRetries * @summary support max_retries in krb5.conf diff --git a/jdk/test/sun/security/krb5/auto/MoreKvno.java b/jdk/test/sun/security/krb5/auto/MoreKvno.java index 8abb1e23ffb..bdb1d9a4381 100644 --- a/jdk/test/sun/security/krb5/auto/MoreKvno.java +++ b/jdk/test/sun/security/krb5/auto/MoreKvno.java @@ -24,6 +24,14 @@ /* * @test * @bug 6893158 6907425 7197159 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm MoreKvno * @summary AP_REQ check should use key version number */ diff --git a/jdk/test/sun/security/krb5/auto/NewInquireTypes.java b/jdk/test/sun/security/krb5/auto/NewInquireTypes.java index bb4d041b413..63d9efa24ac 100644 --- a/jdk/test/sun/security/krb5/auto/NewInquireTypes.java +++ b/jdk/test/sun/security/krb5/auto/NewInquireTypes.java @@ -25,6 +25,14 @@ * @test * @bug 8043071 * @summary Expose session key and KRB_CRED through extended GSS-API + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file NewInquireTypes.java * @run main/othervm NewInquireTypes */ diff --git a/jdk/test/sun/security/krb5/auto/NewSalt.java b/jdk/test/sun/security/krb5/auto/NewSalt.java index 2a0a17fcd9f..ec9fa2ce14f 100644 --- a/jdk/test/sun/security/krb5/auto/NewSalt.java +++ b/jdk/test/sun/security/krb5/auto/NewSalt.java @@ -25,6 +25,14 @@ * @test * @bug 6960894 * @summary Better AS-REQ creation and processing + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm NewSalt * @run main/othervm -Dnopreauth NewSalt * @run main/othervm -Donlyonepreauth NewSalt diff --git a/jdk/test/sun/security/krb5/auto/NoAddresses.java b/jdk/test/sun/security/krb5/auto/NoAddresses.java index 04c5b71e52a..15e7fe198cf 100644 --- a/jdk/test/sun/security/krb5/auto/NoAddresses.java +++ b/jdk/test/sun/security/krb5/auto/NoAddresses.java @@ -24,6 +24,14 @@ /* * @test * @bug 7032354 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm NoAddresses 1 * @run main/othervm NoAddresses 2 * @run main/othervm/fail NoAddresses 3 diff --git a/jdk/test/sun/security/krb5/auto/NoInitNoKeytab.java b/jdk/test/sun/security/krb5/auto/NoInitNoKeytab.java index cde2ec6bbe4..571f54c7c89 100644 --- a/jdk/test/sun/security/krb5/auto/NoInitNoKeytab.java +++ b/jdk/test/sun/security/krb5/auto/NoInitNoKeytab.java @@ -25,6 +25,14 @@ * @test * @bug 7089889 * @summary Krb5LoginModule.login() throws an exception if used without a keytab + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file NoInitNoKeytab.java * @run main/othervm NoInitNoKeytab */ diff --git a/jdk/test/sun/security/krb5/auto/NonMutualSpnego.java b/jdk/test/sun/security/krb5/auto/NonMutualSpnego.java index 304dca1be89..cdd05c241c9 100644 --- a/jdk/test/sun/security/krb5/auto/NonMutualSpnego.java +++ b/jdk/test/sun/security/krb5/auto/NonMutualSpnego.java @@ -24,6 +24,14 @@ /* * @test * @bug 6733095 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm NonMutualSpnego * @summary Failure when SPNEGO request non-Mutual */ diff --git a/jdk/test/sun/security/krb5/auto/NoneReplayCacheTest.java b/jdk/test/sun/security/krb5/auto/NoneReplayCacheTest.java index 2bb59a2990f..555f15ff696 100644 --- a/jdk/test/sun/security/krb5/auto/NoneReplayCacheTest.java +++ b/jdk/test/sun/security/krb5/auto/NoneReplayCacheTest.java @@ -24,6 +24,14 @@ /* * @test * @bug 8001326 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm NoneReplayCacheTest * @summary the replaycache type none cannot stop an authenticator replay, * but it can stop a message replay when s.s.k.acceptor.subkey is true. diff --git a/jdk/test/sun/security/krb5/auto/OkAsDelegate.java b/jdk/test/sun/security/krb5/auto/OkAsDelegate.java index 198de7d78ca..d8bc5b5b1ec 100644 --- a/jdk/test/sun/security/krb5/auto/OkAsDelegate.java +++ b/jdk/test/sun/security/krb5/auto/OkAsDelegate.java @@ -24,6 +24,14 @@ /* * @test * @bug 6853328 7172701 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm OkAsDelegate false true true false false false * FORWARDABLE ticket not allowed, always fail * @run main/othervm OkAsDelegate true false false false false false diff --git a/jdk/test/sun/security/krb5/auto/OkAsDelegateXRealm.java b/jdk/test/sun/security/krb5/auto/OkAsDelegateXRealm.java index ce71314339e..77d7d08a2f9 100644 --- a/jdk/test/sun/security/krb5/auto/OkAsDelegateXRealm.java +++ b/jdk/test/sun/security/krb5/auto/OkAsDelegateXRealm.java @@ -24,6 +24,14 @@ /* * @test * @bug 6853328 7172701 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm OkAsDelegateXRealm false * KDC no OK-AS-DELEGATE, fail * @run main/othervm -Dtest.kdc.policy.ok-as-delegate OkAsDelegateXRealm true diff --git a/jdk/test/sun/security/krb5/auto/OnlyDesLogin.java b/jdk/test/sun/security/krb5/auto/OnlyDesLogin.java index c4b03d166f8..892a153528e 100644 --- a/jdk/test/sun/security/krb5/auto/OnlyDesLogin.java +++ b/jdk/test/sun/security/krb5/auto/OnlyDesLogin.java @@ -25,6 +25,13 @@ * @test * @bug 8014310 * @summary JAAS/Krb5LoginModule using des encytypes failure with NPE after JDK-8012679 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file OnlyDesLogin.java * @run main/othervm OnlyDesLogin */ diff --git a/jdk/test/sun/security/krb5/auto/PrincipalNameEquals.java b/jdk/test/sun/security/krb5/auto/PrincipalNameEquals.java index c4ae6b9aa9d..c911e160f36 100644 --- a/jdk/test/sun/security/krb5/auto/PrincipalNameEquals.java +++ b/jdk/test/sun/security/krb5/auto/PrincipalNameEquals.java @@ -25,6 +25,14 @@ * @test * @bug 7061379 * @summary [Kerberos] Cross-realm authentication fails, due to nameType problem + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file PrincipalNameEquals.java * @run main/othervm PrincipalNameEquals */ diff --git a/jdk/test/sun/security/krb5/auto/RRC.java b/jdk/test/sun/security/krb5/auto/RRC.java index ade12a40abe..7e5c8e0e59f 100644 --- a/jdk/test/sun/security/krb5/auto/RRC.java +++ b/jdk/test/sun/security/krb5/auto/RRC.java @@ -25,6 +25,14 @@ * @test * @bug 7077640 * @summary gss wrap for cfx doesn't handle rrc != 0 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file RRC.java * @run main/othervm RRC */ diff --git a/jdk/test/sun/security/krb5/auto/Renewal.java b/jdk/test/sun/security/krb5/auto/Renewal.java index fc9ab80e0d3..55ec2f9d838 100644 --- a/jdk/test/sun/security/krb5/auto/Renewal.java +++ b/jdk/test/sun/security/krb5/auto/Renewal.java @@ -27,11 +27,17 @@ * @summary Add kinit options and krb5.conf flags that allow users to * obtain renewable tickets and specify ticket lifetimes * @library ../../../../java/security/testlibrary/ + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file Renewal.java * @run main/othervm Renewal */ -import sun.security.jgss.GSSUtil; import sun.security.krb5.Config; import sun.security.krb5.internal.ccache.Credentials; import sun.security.krb5.internal.ccache.FileCredentialsCache; diff --git a/jdk/test/sun/security/krb5/auto/ReplayCacheExpunge.java b/jdk/test/sun/security/krb5/auto/ReplayCacheExpunge.java index da68ec3b7e1..d7aa4b0061c 100644 --- a/jdk/test/sun/security/krb5/auto/ReplayCacheExpunge.java +++ b/jdk/test/sun/security/krb5/auto/ReplayCacheExpunge.java @@ -24,6 +24,8 @@ /* * @test * @bug 8001326 + * @modules java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.rcache * @run main/othervm ReplayCacheExpunge 16 * @run main/othervm/fail ReplayCacheExpunge 15 * @summary when number of expired entries minus number of good entries diff --git a/jdk/test/sun/security/krb5/auto/ReplayCachePrecise.java b/jdk/test/sun/security/krb5/auto/ReplayCachePrecise.java index c23645bc11f..708392295f0 100644 --- a/jdk/test/sun/security/krb5/auto/ReplayCachePrecise.java +++ b/jdk/test/sun/security/krb5/auto/ReplayCachePrecise.java @@ -24,6 +24,9 @@ /* * @test * @bug 8001326 + * @modules java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.rcache * @run main/othervm ReplayCachePrecise * @summary when there are 2 two AuthTime with the same time but different hash, * it's not a replay. diff --git a/jdk/test/sun/security/krb5/auto/ReplayCacheTest.java b/jdk/test/sun/security/krb5/auto/ReplayCacheTest.java index 79a4da79f2d..3a6ef72e42e 100644 --- a/jdk/test/sun/security/krb5/auto/ReplayCacheTest.java +++ b/jdk/test/sun/security/krb5/auto/ReplayCacheTest.java @@ -24,6 +24,14 @@ /* * @test * @bug 7118809 8001326 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm ReplayCacheTest jvm * @run main/othervm ReplayCacheTest dfl * @summary rcache deadlock diff --git a/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java b/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java index 5275b69b594..b30abb3e6fc 100644 --- a/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java +++ b/jdk/test/sun/security/krb5/auto/ReplayCacheTestProc.java @@ -26,6 +26,16 @@ * @bug 7152176 * @summary More krb5 tests * @library ../../../../java/security/testlibrary/ + * @modules java.base/sun.misc + * java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab + * java.security.jgss/sun.security.krb5.internal.rcache * @compile -XDignore.symbol.file ReplayCacheTestProc.java * @run main/othervm/timeout=100 ReplayCacheTestProc */ diff --git a/jdk/test/sun/security/krb5/auto/S4U2proxy.java b/jdk/test/sun/security/krb5/auto/S4U2proxy.java index 10e565279f0..29c85dc7757 100644 --- a/jdk/test/sun/security/krb5/auto/S4U2proxy.java +++ b/jdk/test/sun/security/krb5/auto/S4U2proxy.java @@ -25,6 +25,14 @@ * @test * @bug 6355584 8044215 * @summary Introduce constrained Kerberos delegation + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file S4U2proxy.java * @run main/othervm S4U2proxy krb5 * @run main/othervm S4U2proxy spnego diff --git a/jdk/test/sun/security/krb5/auto/S4U2proxyGSS.java b/jdk/test/sun/security/krb5/auto/S4U2proxyGSS.java index f2f0b305e05..8fb704bcbc8 100644 --- a/jdk/test/sun/security/krb5/auto/S4U2proxyGSS.java +++ b/jdk/test/sun/security/krb5/auto/S4U2proxyGSS.java @@ -25,6 +25,14 @@ * @test * @bug 6355584 * @summary Introduce constrained Kerberos delegation + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file S4U2proxyGSS.java * @run main/othervm -Djavax.security.auth.useSubjectCredsOnly=false S4U2proxyGSS krb5 * @run main/othervm -Djavax.security.auth.useSubjectCredsOnly=false S4U2proxyGSS spnego diff --git a/jdk/test/sun/security/krb5/auto/S4U2self.java b/jdk/test/sun/security/krb5/auto/S4U2self.java index a6c4b21c192..0881e9622b9 100644 --- a/jdk/test/sun/security/krb5/auto/S4U2self.java +++ b/jdk/test/sun/security/krb5/auto/S4U2self.java @@ -25,6 +25,14 @@ * @test * @bug 6355584 * @summary Introduce constrained Kerberos delegation + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file S4U2self.java * @run main/othervm -Dsun.security.krb5.debug=false S4U2self krb5 0 * @run main/othervm/fail -Dsun.security.krb5.debug=false S4U2self krb5 1 diff --git a/jdk/test/sun/security/krb5/auto/S4U2selfAsServer.java b/jdk/test/sun/security/krb5/auto/S4U2selfAsServer.java index 467129c16e3..26390ca2904 100644 --- a/jdk/test/sun/security/krb5/auto/S4U2selfAsServer.java +++ b/jdk/test/sun/security/krb5/auto/S4U2selfAsServer.java @@ -25,6 +25,14 @@ * @test * @bug 6355584 * @summary Introduce constrained Kerberos delegation + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file S4U2selfAsServer.java * @run main/othervm S4U2selfAsServer krb5 * @run main/othervm S4U2selfAsServer spnego diff --git a/jdk/test/sun/security/krb5/auto/S4U2selfAsServerGSS.java b/jdk/test/sun/security/krb5/auto/S4U2selfAsServerGSS.java index 0ff2b7bb53d..7375502f422 100644 --- a/jdk/test/sun/security/krb5/auto/S4U2selfAsServerGSS.java +++ b/jdk/test/sun/security/krb5/auto/S4U2selfAsServerGSS.java @@ -25,6 +25,14 @@ * @test * @bug 6355584 * @summary Introduce constrained Kerberos delegation + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file S4U2selfAsServerGSS.java * @run main/othervm -Djavax.security.auth.useSubjectCredsOnly=false S4U2selfAsServerGSS krb5 * @run main/othervm -Djavax.security.auth.useSubjectCredsOnly=false S4U2selfAsServerGSS spnego diff --git a/jdk/test/sun/security/krb5/auto/S4U2selfGSS.java b/jdk/test/sun/security/krb5/auto/S4U2selfGSS.java index f060c787ffb..48250a94edb 100644 --- a/jdk/test/sun/security/krb5/auto/S4U2selfGSS.java +++ b/jdk/test/sun/security/krb5/auto/S4U2selfGSS.java @@ -25,6 +25,14 @@ * @test * @bug 6355584 * @summary Introduce constrained Kerberos delegation + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file S4U2selfGSS.java * @run main/othervm -Dsun.security.krb5.debug=false S4U2selfGSS krb5 * @run main/othervm -Dsun.security.krb5.debug=false S4U2selfGSS spnego diff --git a/jdk/test/sun/security/krb5/auto/SPNEGO.java b/jdk/test/sun/security/krb5/auto/SPNEGO.java index 250a942f0d4..da9fdab1f89 100644 --- a/jdk/test/sun/security/krb5/auto/SPNEGO.java +++ b/jdk/test/sun/security/krb5/auto/SPNEGO.java @@ -25,6 +25,14 @@ * @test * @bug 7040151 * @summary SPNEGO GSS code does not parse tokens in accordance to RFC 2478 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file SPNEGO.java * @run main/othervm SPNEGO */ diff --git a/jdk/test/sun/security/krb5/auto/SSL.java b/jdk/test/sun/security/krb5/auto/SSL.java index f3d7f134a11..8e80842bb4a 100644 --- a/jdk/test/sun/security/krb5/auto/SSL.java +++ b/jdk/test/sun/security/krb5/auto/SSL.java @@ -26,6 +26,14 @@ * @bug 6894643 6913636 8005523 8025123 * @summary Test JSSE Kerberos ciphersuite + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm SSL TLS_KRB5_WITH_RC4_128_SHA * @run main/othervm SSL TLS_KRB5_WITH_RC4_128_SHA unbound * @run main/othervm SSL TLS_KRB5_WITH_RC4_128_SHA unbound sni diff --git a/jdk/test/sun/security/krb5/auto/SaslBasic.java b/jdk/test/sun/security/krb5/auto/SaslBasic.java index 3fdd3534ed4..f00b3254c68 100644 --- a/jdk/test/sun/security/krb5/auto/SaslBasic.java +++ b/jdk/test/sun/security/krb5/auto/SaslBasic.java @@ -25,6 +25,14 @@ * @test * @bug 7110803 * @summary SASL service for multiple hostnames + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab + * java.security.sasl * @compile -XDignore.symbol.file SaslBasic.java * @run main/othervm SaslBasic bound * @run main/othervm SaslBasic unbound diff --git a/jdk/test/sun/security/krb5/auto/SaslGSS.java b/jdk/test/sun/security/krb5/auto/SaslGSS.java index ec541935308..edc7d3634d4 100644 --- a/jdk/test/sun/security/krb5/auto/SaslGSS.java +++ b/jdk/test/sun/security/krb5/auto/SaslGSS.java @@ -26,6 +26,15 @@ * @bug 8012082 8019267 * @summary SASL: auth-conf negotiated, but unencrypted data is accepted, * reset to unencrypt + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab + * java.security.sasl * @compile -XDignore.symbol.file SaslGSS.java * @run main/othervm SaslGSS */ diff --git a/jdk/test/sun/security/krb5/auto/SaslUnbound.java b/jdk/test/sun/security/krb5/auto/SaslUnbound.java index 797d66b94be..2693c9019b4 100644 --- a/jdk/test/sun/security/krb5/auto/SaslUnbound.java +++ b/jdk/test/sun/security/krb5/auto/SaslUnbound.java @@ -25,6 +25,14 @@ * @test * @bug 8001104 * @summary Unbound SASL service: the GSSAPI/krb5 mech + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab + * java.security.sasl * @compile -XDignore.symbol.file SaslUnbound.java * @run main/othervm SaslUnbound 0 * @run main/othervm/fail SaslUnbound 1 diff --git a/jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java b/jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java index 906cfbee786..3d5a9e46326 100644 --- a/jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java +++ b/jdk/test/sun/security/krb5/auto/SpnegoLifeTime.java @@ -25,6 +25,14 @@ * @test * @bug 8000653 * @summary SPNEGO tests fail at context.getDelegCred().getRemainingInitLifetime(mechOid) + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file SpnegoLifeTime.java * @run main/othervm SpnegoLifeTime */ diff --git a/jdk/test/sun/security/krb5/auto/SpnegoReqFlags.java b/jdk/test/sun/security/krb5/auto/SpnegoReqFlags.java index 62c55048d1f..fe35bfe3691 100644 --- a/jdk/test/sun/security/krb5/auto/SpnegoReqFlags.java +++ b/jdk/test/sun/security/krb5/auto/SpnegoReqFlags.java @@ -24,6 +24,14 @@ /* * @test * @bug 6815182 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm SpnegoReqFlags * @summary GSSAPI/SPNEGO does not work with server using MIT Kerberos library */ diff --git a/jdk/test/sun/security/krb5/auto/TcpTimeout.java b/jdk/test/sun/security/krb5/auto/TcpTimeout.java index 45699fbe5ad..73372e47bae 100644 --- a/jdk/test/sun/security/krb5/auto/TcpTimeout.java +++ b/jdk/test/sun/security/krb5/auto/TcpTimeout.java @@ -24,6 +24,13 @@ /* * @test * @bug 6952519 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file TcpTimeout.java * @run main/othervm TcpTimeout * @summary kdc_timeout is not being honoured when using TCP diff --git a/jdk/test/sun/security/krb5/auto/Test5653.java b/jdk/test/sun/security/krb5/auto/Test5653.java index 4384b87ee0b..a5c935d8215 100644 --- a/jdk/test/sun/security/krb5/auto/Test5653.java +++ b/jdk/test/sun/security/krb5/auto/Test5653.java @@ -24,6 +24,14 @@ /* * @test * @bug 6895424 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm Test5653 * @summary RFC 5653 */ diff --git a/jdk/test/sun/security/krb5/auto/TwoOrThree.java b/jdk/test/sun/security/krb5/auto/TwoOrThree.java index 5af545be4a1..1eb02205af4 100644 --- a/jdk/test/sun/security/krb5/auto/TwoOrThree.java +++ b/jdk/test/sun/security/krb5/auto/TwoOrThree.java @@ -25,6 +25,14 @@ * @test * @bug 8005447 * @summary default principal can act as anyone + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file TwoOrThree.java * @run main/othervm TwoOrThree first first * @run main/othervm/fail TwoOrThree first second diff --git a/jdk/test/sun/security/krb5/auto/TwoPrinces.java b/jdk/test/sun/security/krb5/auto/TwoPrinces.java index 30f16e96a25..0f30e9475ed 100644 --- a/jdk/test/sun/security/krb5/auto/TwoPrinces.java +++ b/jdk/test/sun/security/krb5/auto/TwoPrinces.java @@ -24,6 +24,14 @@ /* * @test * @bug 6894072 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file TwoPrinces.java * @run main/othervm TwoPrinces * @summary always refresh keytab diff --git a/jdk/test/sun/security/krb5/auto/TwoTab.java b/jdk/test/sun/security/krb5/auto/TwoTab.java index dd2cf96a8a4..f3def8b038e 100644 --- a/jdk/test/sun/security/krb5/auto/TwoTab.java +++ b/jdk/test/sun/security/krb5/auto/TwoTab.java @@ -25,6 +25,14 @@ * @test * @bug 7152176 * @summary More krb5 tests + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file TwoTab.java * @run main/othervm TwoTab */ diff --git a/jdk/test/sun/security/krb5/auto/UdpTcp.java b/jdk/test/sun/security/krb5/auto/UdpTcp.java index ae54b793527..66c82438a2e 100644 --- a/jdk/test/sun/security/krb5/auto/UdpTcp.java +++ b/jdk/test/sun/security/krb5/auto/UdpTcp.java @@ -24,6 +24,13 @@ /* * @test * @bug 4966382 8039132 + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm UdpTcp UDP * @run main/othervm UdpTcp TCP * @summary udp or tcp diff --git a/jdk/test/sun/security/krb5/auto/UnboundService.java b/jdk/test/sun/security/krb5/auto/UnboundService.java index 1327f78c995..a0bc937b29e 100644 --- a/jdk/test/sun/security/krb5/auto/UnboundService.java +++ b/jdk/test/sun/security/krb5/auto/UnboundService.java @@ -25,6 +25,14 @@ * @test * @bug 8001104 * @summary Unbound SASL service: the GSSAPI/krb5 mech + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.jgss + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file UnboundService.java * @run main/othervm UnboundService null null * @run main/othervm UnboundService server/host.rabbit.hole null diff --git a/jdk/test/sun/security/krb5/auto/Unreachable.java b/jdk/test/sun/security/krb5/auto/Unreachable.java index 52339786a9f..670d33afc8e 100644 --- a/jdk/test/sun/security/krb5/auto/Unreachable.java +++ b/jdk/test/sun/security/krb5/auto/Unreachable.java @@ -25,6 +25,7 @@ * @test * @bug 7162687 * @summary enhance KDC server availability detection + * @modules java.security.jgss/sun.security.krb5 * @compile -XDignore.symbol.file Unreachable.java * @run main/othervm/timeout=10 Unreachable */ diff --git a/jdk/test/sun/security/krb5/auto/UseCacheAndStoreKey.java b/jdk/test/sun/security/krb5/auto/UseCacheAndStoreKey.java index 3769643e09a..ca1229b90b9 100644 --- a/jdk/test/sun/security/krb5/auto/UseCacheAndStoreKey.java +++ b/jdk/test/sun/security/krb5/auto/UseCacheAndStoreKey.java @@ -26,6 +26,13 @@ * @bug 7201053 * @summary Krb5LoginModule shows NPE when both useTicketCache and storeKey * are set to true + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @compile -XDignore.symbol.file UseCacheAndStoreKey.java * @run main/othervm UseCacheAndStoreKey */ diff --git a/jdk/test/sun/security/krb5/auto/W83.java b/jdk/test/sun/security/krb5/auto/W83.java index dea4e765e40..7de5912b94e 100644 --- a/jdk/test/sun/security/krb5/auto/W83.java +++ b/jdk/test/sun/security/krb5/auto/W83.java @@ -26,6 +26,13 @@ * @bug 6932525 6951366 6959292 * @summary kerberos login failure on win2008 with AD set to win2000 compat mode * and cannot login if session key and preauth does not use the same etype + * @modules java.base/sun.net.spi.nameservice + * java.base/sun.security.util + * java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ccache + * java.security.jgss/sun.security.krb5.internal.crypto + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm -D6932525 W83 * @run main/othervm -D6959292 W83 */ diff --git a/jdk/test/sun/security/krb5/canonicalize/Test.java b/jdk/test/sun/security/krb5/canonicalize/Test.java index 9340163fbb4..53012b3be51 100644 --- a/jdk/test/sun/security/krb5/canonicalize/Test.java +++ b/jdk/test/sun/security/krb5/canonicalize/Test.java @@ -24,6 +24,8 @@ * @test * @bug 6682516 * @summary SPNEGO_HTTP_AUTH/WWW_KRB and SPNEGO_HTTP_AUTH/WWW_SPNEGO failed on all non-windows platforms + * @modules java.base/sun.net.spi.nameservice + * java.security.jgss/sun.security.krb5 * @run main/othervm -Dsun.net.spi.nameservice.provider.1=ns,mock -Djava.security.krb5.conf=krb5.conf Test */ diff --git a/jdk/test/sun/security/krb5/ccache/CorruptedCC.java b/jdk/test/sun/security/krb5/ccache/CorruptedCC.java index 355e2ff6c0e..e37e9f585a7 100644 --- a/jdk/test/sun/security/krb5/ccache/CorruptedCC.java +++ b/jdk/test/sun/security/krb5/ccache/CorruptedCC.java @@ -25,6 +25,8 @@ * @test * @bug 8028780 * @summary JDK KRB5 module throws OutOfMemoryError when CCache is corrupt + * @modules java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal.ccache * @run main/othervm -Xmx8m CorruptedCC */ import java.nio.file.Files; diff --git a/jdk/test/sun/security/krb5/ccache/DefaultFile.java b/jdk/test/sun/security/krb5/ccache/DefaultFile.java index b2348e3507f..a513e956964 100644 --- a/jdk/test/sun/security/krb5/ccache/DefaultFile.java +++ b/jdk/test/sun/security/krb5/ccache/DefaultFile.java @@ -25,6 +25,7 @@ * @test * @bug 8054817 * @summary File ccache only recognizes Linux and Solaris defaults + * @modules java.security.jgss/sun.security.krb5.internal.ccache */ import sun.security.krb5.internal.ccache.FileCredentialsCache; diff --git a/jdk/test/sun/security/krb5/ccache/EmptyCC.java b/jdk/test/sun/security/krb5/ccache/EmptyCC.java index 4114edb0208..28281584f16 100644 --- a/jdk/test/sun/security/krb5/ccache/EmptyCC.java +++ b/jdk/test/sun/security/krb5/ccache/EmptyCC.java @@ -27,6 +27,8 @@ * @bug 8001208 * @summary NPE in sun.security.krb5.Credentials.acquireDefaultCreds() * @library ../../../../java/security/testlibrary/ + * @modules java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal.ccache * @compile -XDignore.symbol.file EmptyCC.java * @run main EmptyCC tmpcc * @run main EmptyCC FILE:tmpcc diff --git a/jdk/test/sun/security/krb5/ccache/EmptyRealmCC.java b/jdk/test/sun/security/krb5/ccache/EmptyRealmCC.java index 315cc06a35e..2796653df3c 100644 --- a/jdk/test/sun/security/krb5/ccache/EmptyRealmCC.java +++ b/jdk/test/sun/security/krb5/ccache/EmptyRealmCC.java @@ -25,6 +25,8 @@ * @test * @bug 8048073 * @summary Cannot read ccache entry with a realm-less service name + * @modules java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal.ccache * @compile -XDignore.symbol.file EmptyRealmCC.java * @run main EmptyRealmCC */ diff --git a/jdk/test/sun/security/krb5/ccache/TimeInCCache.java b/jdk/test/sun/security/krb5/ccache/TimeInCCache.java index e81ff909b98..5a9364fd8e1 100644 --- a/jdk/test/sun/security/krb5/ccache/TimeInCCache.java +++ b/jdk/test/sun/security/krb5/ccache/TimeInCCache.java @@ -23,6 +23,8 @@ /* * @test * @bug 6590930 + * @modules java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal.ccache * @run main/othervm TimeInCCache * @summary read/write does not match for ccache */ diff --git a/jdk/test/sun/security/krb5/config/ConfigWithQuotations.java b/jdk/test/sun/security/krb5/config/ConfigWithQuotations.java index c1286f8cb3a..6dfa2b58947 100644 --- a/jdk/test/sun/security/krb5/config/ConfigWithQuotations.java +++ b/jdk/test/sun/security/krb5/config/ConfigWithQuotations.java @@ -23,6 +23,7 @@ /* * @test * @bug 6714845 + * @modules java.security.jgss/sun.security.krb5 * @run main/othervm ConfigWithQuotations * @summary Quotes in Kerberos configuration file are included in the values */ diff --git a/jdk/test/sun/security/krb5/config/DefUdpLimit.java b/jdk/test/sun/security/krb5/config/DefUdpLimit.java index ae1712d0b1a..58c6c6dacfb 100644 --- a/jdk/test/sun/security/krb5/config/DefUdpLimit.java +++ b/jdk/test/sun/security/krb5/config/DefUdpLimit.java @@ -25,6 +25,7 @@ * @test * @bug 8009875 * @summary Provide a default udp_preference_limit for krb5.conf + * @modules java.security.jgss/sun.security.krb5 * @compile -XDignore.symbol.file DefUdpLimit.java * @run main/othervm DefUdpLimit -1 1465 * @run main/othervm DefUdpLimit 0 0 diff --git a/jdk/test/sun/security/krb5/config/DnsFallback.java b/jdk/test/sun/security/krb5/config/DnsFallback.java index cf5e6bac942..1def972f7d6 100644 --- a/jdk/test/sun/security/krb5/config/DnsFallback.java +++ b/jdk/test/sun/security/krb5/config/DnsFallback.java @@ -23,6 +23,7 @@ /* * @test * @bug 6673164 6552334 8077102 + * @modules java.security.jgss/sun.security.krb5 * @run main/othervm DnsFallback * @summary fix dns_fallback parse error, and use dns by default */ diff --git a/jdk/test/sun/security/krb5/config/Duplicates.java b/jdk/test/sun/security/krb5/config/Duplicates.java index 41d0fa9b99d..6e5603884a5 100644 --- a/jdk/test/sun/security/krb5/config/Duplicates.java +++ b/jdk/test/sun/security/krb5/config/Duplicates.java @@ -23,6 +23,7 @@ /* * @test * @bug 7184246 + * @modules java.security.jgss/sun.security.krb5 * @compile -XDignore.symbol.file Duplicates.java * @run main/othervm Duplicates * @summary Simplify Config.get() of krb5 diff --git a/jdk/test/sun/security/krb5/config/Duration.java b/jdk/test/sun/security/krb5/config/Duration.java index d9c0f3961c7..a4c57cd2d6e 100644 --- a/jdk/test/sun/security/krb5/config/Duration.java +++ b/jdk/test/sun/security/krb5/config/Duration.java @@ -26,6 +26,7 @@ * @bug 8044500 * @summary Add kinit options and krb5.conf flags that allow users to * obtain renewable tickets and specify ticket lifetimes + * @modules java.security.jgss/sun.security.krb5 * @compile -XDignore.symbol.file Duration.java * @run main Duration */ diff --git a/jdk/test/sun/security/krb5/config/ExtraLines.java b/jdk/test/sun/security/krb5/config/ExtraLines.java index babb0c0749d..a4603aa99d1 100644 --- a/jdk/test/sun/security/krb5/config/ExtraLines.java +++ b/jdk/test/sun/security/krb5/config/ExtraLines.java @@ -23,6 +23,7 @@ /* * @test * @bug 8036971 + * @modules java.security.jgss/sun.security.krb5 * @compile -XDignore.symbol.file ExtraLines.java * @run main/othervm ExtraLines * @summary krb5.conf does not accept directive lines before the first section diff --git a/jdk/test/sun/security/krb5/config/Include.java b/jdk/test/sun/security/krb5/config/Include.java index 945f8a0fc96..b253b8132db 100644 --- a/jdk/test/sun/security/krb5/config/Include.java +++ b/jdk/test/sun/security/krb5/config/Include.java @@ -25,6 +25,7 @@ * @test * @bug 8029994 * @summary Support "include" and "includedir" in krb5.conf + * @modules java.security.jgss/sun.security.krb5 * @compile -XDignore.symbol.file Include.java * @run main/othervm Include */ diff --git a/jdk/test/sun/security/krb5/config/KdcDefaultOptions.java b/jdk/test/sun/security/krb5/config/KdcDefaultOptions.java index fb920635e4e..a0b2f37c4c1 100644 --- a/jdk/test/sun/security/krb5/config/KdcDefaultOptions.java +++ b/jdk/test/sun/security/krb5/config/KdcDefaultOptions.java @@ -24,6 +24,8 @@ * @test * @bug 7195426 * @summary kdc_default_options not supported correctly + * @modules java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal * @compile -XDignore.symbol.file KdcDefaultOptions.java * @run main/othervm KdcDefaultOptions */ diff --git a/jdk/test/sun/security/krb5/config/ParseCAPaths.java b/jdk/test/sun/security/krb5/config/ParseCAPaths.java index 18b43470842..19f1f09f235 100644 --- a/jdk/test/sun/security/krb5/config/ParseCAPaths.java +++ b/jdk/test/sun/security/krb5/config/ParseCAPaths.java @@ -23,6 +23,7 @@ /* * @test * @bug 6789935 8012615 + * @modules java.security.jgss/sun.security.krb5 * @run main/othervm ParseCAPaths * @summary cross-realm capath search error */ diff --git a/jdk/test/sun/security/krb5/config/ParseConfig.java b/jdk/test/sun/security/krb5/config/ParseConfig.java index 3a73956ae95..2aa80eafebc 100644 --- a/jdk/test/sun/security/krb5/config/ParseConfig.java +++ b/jdk/test/sun/security/krb5/config/ParseConfig.java @@ -23,6 +23,7 @@ /* * @test * @bug 6319046 8055045 + * @modules java.security.jgss/sun.security.krb5 * @compile -XDignore.symbol.file ParseConfig.java * @run main/othervm ParseConfig * @summary Problem with parsing krb5.conf diff --git a/jdk/test/sun/security/krb5/config/SCDynamicConfigTest.java b/jdk/test/sun/security/krb5/config/SCDynamicConfigTest.java index b749927312b..40ec7d6c386 100644 --- a/jdk/test/sun/security/krb5/config/SCDynamicConfigTest.java +++ b/jdk/test/sun/security/krb5/config/SCDynamicConfigTest.java @@ -25,6 +25,7 @@ * @test * @bug 7184246 * @summary Simplify Config.get() of krb5 + * @modules java.security.jgss/sun.security.krb5 */ import java.lang.reflect.Field; import java.lang.reflect.Method; diff --git a/jdk/test/sun/security/krb5/config/YesNo.java b/jdk/test/sun/security/krb5/config/YesNo.java index c25c8279663..22e5144d7c9 100644 --- a/jdk/test/sun/security/krb5/config/YesNo.java +++ b/jdk/test/sun/security/krb5/config/YesNo.java @@ -25,6 +25,8 @@ * @test * @bug 8029995 * @summary accept yes/no for boolean krb5.conf settings + * @modules java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal.crypto * @compile -XDignore.symbol.file YesNo.java * @run main/othervm YesNo */ diff --git a/jdk/test/sun/security/krb5/etype/ETypeOrder.java b/jdk/test/sun/security/krb5/etype/ETypeOrder.java index 9437b16ed05..dabe65c6717 100644 --- a/jdk/test/sun/security/krb5/etype/ETypeOrder.java +++ b/jdk/test/sun/security/krb5/etype/ETypeOrder.java @@ -23,6 +23,7 @@ /* * @test * @bug 6844907 + * @modules java.security.jgss/sun.security.krb5.internal.crypto * @run main/othervm ETypeOrder * @summary krb5 etype order should be from strong to weak */ diff --git a/jdk/test/sun/security/krb5/etype/WeakCrypto.java b/jdk/test/sun/security/krb5/etype/WeakCrypto.java index e7a109f6f33..fcc59d4a9f9 100644 --- a/jdk/test/sun/security/krb5/etype/WeakCrypto.java +++ b/jdk/test/sun/security/krb5/etype/WeakCrypto.java @@ -23,6 +23,8 @@ /* * @test * @bug 6844909 8012679 + * @modules java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal.crypto * @run main/othervm WeakCrypto * @run main/othervm WeakCrypto true * @run main/othervm WeakCrypto false diff --git a/jdk/test/sun/security/krb5/ktab/FileKeyTab.java b/jdk/test/sun/security/krb5/ktab/FileKeyTab.java index ab6fb64da91..10e92591c9f 100644 --- a/jdk/test/sun/security/krb5/ktab/FileKeyTab.java +++ b/jdk/test/sun/security/krb5/ktab/FileKeyTab.java @@ -24,6 +24,8 @@ * @test * @bug 7144530 * @summary KeyTab.getInstance(String) no longer handles keyTabNames with "file:" prefix + * @modules java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal.ktab */ import java.io.File; import sun.security.krb5.PrincipalName; diff --git a/jdk/test/sun/security/krb5/ktab/HighestKvno.java b/jdk/test/sun/security/krb5/ktab/HighestKvno.java index 92e3aebd630..894d36b89da 100644 --- a/jdk/test/sun/security/krb5/ktab/HighestKvno.java +++ b/jdk/test/sun/security/krb5/ktab/HighestKvno.java @@ -24,6 +24,8 @@ * @test * @bug 6867665 * @bug 6875033 + * @modules java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal.ktab * @run main/othervm HighestKvno * @summary Problem with keytabs with multiple kvno's (key versions) */ diff --git a/jdk/test/sun/security/krb5/ktab/KeyString.java b/jdk/test/sun/security/krb5/ktab/KeyString.java index c3cb7f0224a..b7b2e1da5fe 100644 --- a/jdk/test/sun/security/krb5/ktab/KeyString.java +++ b/jdk/test/sun/security/krb5/ktab/KeyString.java @@ -24,6 +24,9 @@ * @test * @bug 6917791 * @summary KeyTabEntry, when the byte value smaller then 16, the string drop '0' + * @modules java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal + * java.security.jgss/sun.security.krb5.internal.ktab */ import sun.security.krb5.internal.ktab.KeyTabEntry; diff --git a/jdk/test/sun/security/krb5/ktab/KeyTabIndex.java b/jdk/test/sun/security/krb5/ktab/KeyTabIndex.java index 26eb5621939..f65e06a7a5f 100644 --- a/jdk/test/sun/security/krb5/ktab/KeyTabIndex.java +++ b/jdk/test/sun/security/krb5/ktab/KeyTabIndex.java @@ -24,6 +24,8 @@ * @test * @bug 6919610 * @summary KeyTabInputStream uses static field for per-instance value + * @modules java.security.jgss/sun.security.krb5 + * java.security.jgss/sun.security.krb5.internal.ktab */ import sun.security.krb5.PrincipalName; import sun.security.krb5.internal.ktab.KeyTab; diff --git a/jdk/test/sun/security/krb5/name/Constructors.java b/jdk/test/sun/security/krb5/name/Constructors.java index 71243e71c32..c57a731d5ce 100644 --- a/jdk/test/sun/security/krb5/name/Constructors.java +++ b/jdk/test/sun/security/krb5/name/Constructors.java @@ -24,6 +24,7 @@ * @test * @bug 6966259 * @summary Make PrincipalName and Realm immutable + * @modules java.security.jgss/sun.security.krb5 * @run main/othervm Constructors */ diff --git a/jdk/test/sun/security/krb5/name/Immutable.java b/jdk/test/sun/security/krb5/name/Immutable.java index 04bed4b3c7a..d9de2544e3b 100644 --- a/jdk/test/sun/security/krb5/name/Immutable.java +++ b/jdk/test/sun/security/krb5/name/Immutable.java @@ -25,6 +25,7 @@ * @test * @bug 8005460 * @summary [findbugs] Probably returned array should be cloned + * @modules java.security.jgss/sun.security.krb5 */ import sun.security.krb5.PrincipalName; diff --git a/jdk/test/sun/security/krb5/tools/KtabZero.java b/jdk/test/sun/security/krb5/tools/KtabZero.java index 8a4a6a4fcd2..bc1b1d32b8f 100644 --- a/jdk/test/sun/security/krb5/tools/KtabZero.java +++ b/jdk/test/sun/security/krb5/tools/KtabZero.java @@ -33,6 +33,7 @@ import java.nio.file.Paths; * @test * @bug 8014196 * @summary ktab creates a file with zero kt_vno + * @modules java.security.jgss/sun.security.krb5.internal.ktab */ public class KtabZero { diff --git a/jdk/test/sun/security/pkcs/EncryptedPrivateKeyInfo/EncryptedPKInfoEqualsHashCode.java b/jdk/test/sun/security/pkcs/EncryptedPrivateKeyInfo/EncryptedPKInfoEqualsHashCode.java index a38877f3698..c77528958e9 100644 --- a/jdk/test/sun/security/pkcs/EncryptedPrivateKeyInfo/EncryptedPKInfoEqualsHashCode.java +++ b/jdk/test/sun/security/pkcs/EncryptedPrivateKeyInfo/EncryptedPKInfoEqualsHashCode.java @@ -26,6 +26,8 @@ * @author Gary Ellison * @bug 4170635 * @summary Verify equals()/hashCode() contract honored + * @modules java.base/sun.security.pkcs + * java.base/sun.security.x509 */ import java.io.*; diff --git a/jdk/test/sun/security/pkcs/pkcs9/UnknownAttribute.java b/jdk/test/sun/security/pkcs/pkcs9/UnknownAttribute.java index 20cc24e627b..29b0b17eafe 100644 --- a/jdk/test/sun/security/pkcs/pkcs9/UnknownAttribute.java +++ b/jdk/test/sun/security/pkcs/pkcs9/UnknownAttribute.java @@ -25,6 +25,9 @@ * @test * @bug 8011867 * @summary Accept unknown PKCS #9 attributes + * @modules java.base/sun.misc + * java.base/sun.security.pkcs + * java.base/sun.security.util */ import java.io.*; diff --git a/jdk/test/sun/security/pkcs/pkcs9/UnstructuredName.java b/jdk/test/sun/security/pkcs/pkcs9/UnstructuredName.java index e19e4aa597b..caab415c600 100644 --- a/jdk/test/sun/security/pkcs/pkcs9/UnstructuredName.java +++ b/jdk/test/sun/security/pkcs/pkcs9/UnstructuredName.java @@ -25,6 +25,7 @@ * @test * @bug 8016916 * @summary UnstructuredName should support DirectoryString + * @modules java.base/sun.security.pkcs10 */ import java.util.Base64; diff --git a/jdk/test/sun/security/pkcs11/KeyStore/Basic.java b/jdk/test/sun/security/pkcs11/KeyStore/Basic.java index 8519a2f0bc2..09b2f398ce3 100644 --- a/jdk/test/sun/security/pkcs11/KeyStore/Basic.java +++ b/jdk/test/sun/security/pkcs11/KeyStore/Basic.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2006, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -23,7 +23,6 @@ import java.io.*; import java.util.*; -import java.lang.reflect.*; import java.security.KeyStore; import java.security.KeyStoreException; diff --git a/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.java b/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.java index 89f98bc0850..e97e3664dc7 100644 --- a/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.java +++ b/jdk/test/sun/security/pkcs11/Provider/ConfigQuotedString.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2004, 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 @@ -23,7 +23,6 @@ import java.io.*; import java.util.*; -import java.lang.reflect.*; import java.security.*; import javax.security.auth.callback.*; diff --git a/jdk/test/sun/security/pkcs11/Provider/Login.java b/jdk/test/sun/security/pkcs11/Provider/Login.java index 282c19b5367..8b8dbe8f6ab 100644 --- a/jdk/test/sun/security/pkcs11/Provider/Login.java +++ b/jdk/test/sun/security/pkcs11/Provider/Login.java @@ -1,5 +1,5 @@ /* - * Copyright (c) 2003, 2004, Oracle and/or its affiliates. All rights reserved. + * Copyright (c) 2003, 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 @@ -23,7 +23,6 @@ import java.io.*; import java.util.*; -import java.lang.reflect.*; import java.security.*; import javax.security.auth.callback.*; diff --git a/jdk/test/sun/security/pkcs11/ec/TestCurves.java b/jdk/test/sun/security/pkcs11/ec/TestCurves.java index fb9cd836ad6..6451e41514b 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestCurves.java +++ b/jdk/test/sun/security/pkcs11/ec/TestCurves.java @@ -27,6 +27,7 @@ * @summary Basic consistency test for all curves using ECDSA and ECDH * @author Andreas Sterbenz * @library .. + * @modules jdk.crypto.pkcs11/sun.security.pkcs11.wrapper * @compile -XDignore.symbol.file TestCurves.java * @run main TestCurves * @key randomness diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDH2.java b/jdk/test/sun/security/pkcs11/ec/TestECDH2.java index 02ffd38ee0c..d5b03ae32aa 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestECDH2.java +++ b/jdk/test/sun/security/pkcs11/ec/TestECDH2.java @@ -28,6 +28,7 @@ * example data in "Suite B Implementer's Guide to FIPS 186-3". * @library .. * @library ../../../../java/security/testlibrary + * @modules java.base/sun.security.util * @compile -XDignore.symbol.file TestECDH2.java * @run main TestECDH2 */ diff --git a/jdk/test/sun/security/pkcs11/ec/TestECDSA2.java b/jdk/test/sun/security/pkcs11/ec/TestECDSA2.java index 054402590c2..b3f234a5b0f 100644 --- a/jdk/test/sun/security/pkcs11/ec/TestECDSA2.java +++ b/jdk/test/sun/security/pkcs11/ec/TestECDSA2.java @@ -28,6 +28,7 @@ * example data in "Suite B Implementer's Guide to FIPS 186-3". * @library .. * @library ../../../../java/security/testlibrary + * @modules java.base/sun.security.util * @compile -XDignore.symbol.file TestECDSA2.java * @run main TestECDSA2 */ diff --git a/jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java b/jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java index ed5d9aa567e..384711097b5 100644 --- a/jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java +++ b/jdk/test/sun/security/pkcs11/fips/ClientJSSEServerJSSE.java @@ -27,6 +27,7 @@ * @summary Verify that all ciphersuites work in FIPS mode * @library .. * @author Andreas Sterbenz + * @modules java.base/com.sun.net.ssl.internal.ssl * @run main/manual ClientJSSEServerJSSE */ diff --git a/jdk/test/sun/security/pkcs11/fips/TrustManagerTest.java b/jdk/test/sun/security/pkcs11/fips/TrustManagerTest.java index 76c5dadfd64..743b4562b87 100644 --- a/jdk/test/sun/security/pkcs11/fips/TrustManagerTest.java +++ b/jdk/test/sun/security/pkcs11/fips/TrustManagerTest.java @@ -27,6 +27,7 @@ * @summary Verify that the SunJSSE trustmanager works correctly in FIPS mode * @author Andreas Sterbenz * @library .. + * @modules java.base/com.sun.net.ssl.internal.ssl * @run main/othervm TrustManagerTest */ diff --git a/jdk/test/sun/security/pkcs11/tls/TestKeyMaterial.java b/jdk/test/sun/security/pkcs11/tls/TestKeyMaterial.java index e32f6c3c19f..99636d0e2aa 100644 --- a/jdk/test/sun/security/pkcs11/tls/TestKeyMaterial.java +++ b/jdk/test/sun/security/pkcs11/tls/TestKeyMaterial.java @@ -27,6 +27,7 @@ * @summary Known-answer-test for TlsKeyMaterial generator * @author Andreas Sterbenz * @library .. + * @modules java.base/sun.security.internal.spec */ import java.io.*; diff --git a/jdk/test/sun/security/pkcs11/tls/TestMasterSecret.java b/jdk/test/sun/security/pkcs11/tls/TestMasterSecret.java index e1fa4d984ca..fb00bd7fbf0 100644 --- a/jdk/test/sun/security/pkcs11/tls/TestMasterSecret.java +++ b/jdk/test/sun/security/pkcs11/tls/TestMasterSecret.java @@ -27,6 +27,8 @@ * @summary Known-answer-test for TlsMasterSecret generator * @author Andreas Sterbenz * @library .. + * @modules java.base/sun.security.internal.interfaces + * java.base/sun.security.internal.spec */ import java.io.*; diff --git a/jdk/test/sun/security/pkcs11/tls/TestPRF.java b/jdk/test/sun/security/pkcs11/tls/TestPRF.java index 60b12528277..eefffe70820 100644 --- a/jdk/test/sun/security/pkcs11/tls/TestPRF.java +++ b/jdk/test/sun/security/pkcs11/tls/TestPRF.java @@ -27,6 +27,7 @@ * @summary Basic known-answer-test for TlsPrf * @author Andreas Sterbenz * @library .. + * @modules java.base/sun.security.internal.spec */ import java.io.*; diff --git a/jdk/test/sun/security/pkcs11/tls/TestPremaster.java b/jdk/test/sun/security/pkcs11/tls/TestPremaster.java index 05e8efb0f28..15b13ac8507 100644 --- a/jdk/test/sun/security/pkcs11/tls/TestPremaster.java +++ b/jdk/test/sun/security/pkcs11/tls/TestPremaster.java @@ -27,6 +27,7 @@ * @summary Basic tests for TlsRsaPremasterSecret generator * @author Andreas Sterbenz * @library .. + * @modules java.base/sun.security.internal.spec */ import java.security.Security; diff --git a/jdk/test/sun/security/pkcs12/PKCS12SameKeyId.java b/jdk/test/sun/security/pkcs12/PKCS12SameKeyId.java index fd91fefc54f..bbdac6c3fc3 100644 --- a/jdk/test/sun/security/pkcs12/PKCS12SameKeyId.java +++ b/jdk/test/sun/security/pkcs12/PKCS12SameKeyId.java @@ -25,6 +25,10 @@ * @test * @bug 6958026 * @summary Problem with PKCS12 keystore + * @modules java.base/sun.security.pkcs + * java.base/sun.security.tools.keytool + * java.base/sun.security.util + * java.base/sun.security.x509 * @compile -XDignore.symbol.file PKCS12SameKeyId.java * @run main PKCS12SameKeyId */ diff --git a/jdk/test/sun/security/provider/MessageDigest/DigestKAT.java b/jdk/test/sun/security/provider/MessageDigest/DigestKAT.java index c6746de867b..eba1f59c4d7 100644 --- a/jdk/test/sun/security/provider/MessageDigest/DigestKAT.java +++ b/jdk/test/sun/security/provider/MessageDigest/DigestKAT.java @@ -25,6 +25,7 @@ * @test * @bug 4819771 4834179 5008306 4963723 * @summary Basic known-answer-test for all our MessageDigest algorithms + * @modules java.base/sun.security.provider * @author Andreas Sterbenz */ diff --git a/jdk/test/sun/security/provider/PolicyFile/Comparator.java b/jdk/test/sun/security/provider/PolicyFile/Comparator.java index edda52b9e6b..737c176b133 100644 --- a/jdk/test/sun/security/provider/PolicyFile/Comparator.java +++ b/jdk/test/sun/security/provider/PolicyFile/Comparator.java @@ -24,8 +24,9 @@ /* * @test * @bug 5037004 - * @run main/othervm Comparator * @summary Frivolous ClassCastExceptions thrown by SubjectCodeSource.implies + * @modules java.base/sun.security.provider + * @run main/othervm Comparator * * Note: if you want to see the java.security.debug output, * you can not simply set the system property. diff --git a/jdk/test/sun/security/provider/PolicyFile/TokenStore.java b/jdk/test/sun/security/provider/PolicyFile/TokenStore.java index 7376b76060d..ac2d70b5e18 100644 --- a/jdk/test/sun/security/provider/PolicyFile/TokenStore.java +++ b/jdk/test/sun/security/provider/PolicyFile/TokenStore.java @@ -25,8 +25,7 @@ * @test * @bug 4919147 * @summary Support for token-based KeyStores - * - * TokenStore.keystore password is "TokenStore" + * @modules java.base/sun.security.provider */ import java.io.*; diff --git a/jdk/test/sun/security/provider/PolicyParser/BogusGrants.java b/jdk/test/sun/security/provider/PolicyParser/BogusGrants.java index 69855156435..06df206eddc 100644 --- a/jdk/test/sun/security/provider/PolicyParser/BogusGrants.java +++ b/jdk/test/sun/security/provider/PolicyParser/BogusGrants.java @@ -26,6 +26,7 @@ * @author Gary Ellison * @bug 4233900 * @summary Catch anomalies in Policy parsing + * @modules java.base/sun.security.provider * @run main BogusGrants p001.policy p002.policy p003.policy p004.policy */ diff --git a/jdk/test/sun/security/provider/PolicyParser/EncodeURL.java b/jdk/test/sun/security/provider/PolicyParser/EncodeURL.java index 7e9a845a590..f99eb5418e2 100644 --- a/jdk/test/sun/security/provider/PolicyParser/EncodeURL.java +++ b/jdk/test/sun/security/provider/PolicyParser/EncodeURL.java @@ -24,6 +24,7 @@ /* * @test * @bug 4797850 + * @modules java.base/sun.security.provider * @summary Security policy file does not grok hash mark in pathnames */ diff --git a/jdk/test/sun/security/provider/PolicyParser/TokenStore.java b/jdk/test/sun/security/provider/PolicyParser/TokenStore.java index 38cebefd7dd..9e0d74d99de 100644 --- a/jdk/test/sun/security/provider/PolicyParser/TokenStore.java +++ b/jdk/test/sun/security/provider/PolicyParser/TokenStore.java @@ -25,6 +25,7 @@ * @test * @bug 4919147 * @summary Support for token-based KeyStores + * @modules java.base/sun.security.provider */ import java.io.*; diff --git a/jdk/test/sun/security/provider/X509Factory/BadPem.java b/jdk/test/sun/security/provider/X509Factory/BadPem.java index 9147ab8ce93..45a66aba281 100644 --- a/jdk/test/sun/security/provider/X509Factory/BadPem.java +++ b/jdk/test/sun/security/provider/X509Factory/BadPem.java @@ -25,6 +25,7 @@ * @test * @bug 8074935 * @summary jdk8 keytool doesn't validate pem files for RFC 1421 correctness, as jdk7 did + * @modules java.base/sun.security.provider */ import java.io.ByteArrayOutputStream; diff --git a/jdk/test/sun/security/provider/X509Factory/BigCRL.java b/jdk/test/sun/security/provider/X509Factory/BigCRL.java index 72b6b9d3cfd..963069cdc0e 100644 --- a/jdk/test/sun/security/provider/X509Factory/BigCRL.java +++ b/jdk/test/sun/security/provider/X509Factory/BigCRL.java @@ -25,6 +25,7 @@ * @test * @bug 7099399 * @summary cannot deal with CRL file larger than 16MB + * @modules java.base/sun.security.x509 * @run main/othervm -Xshare:off -Xmx1024m BigCRL */ diff --git a/jdk/test/sun/security/provider/certpath/CertId/CheckCertId.java b/jdk/test/sun/security/provider/certpath/CertId/CheckCertId.java index 96254ac6b3b..ed588b75970 100644 --- a/jdk/test/sun/security/provider/certpath/CertId/CheckCertId.java +++ b/jdk/test/sun/security/provider/certpath/CertId/CheckCertId.java @@ -25,6 +25,8 @@ * @test * @bug 6355295 * @summary Certificate validation using OCSP fails for a particular class of certificates + * @modules java.base/sun.security.provider.certpath + * java.base/sun.security.x509 */ import java.io.*; diff --git a/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java b/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java index adbd32b75ad..3edf02d70d7 100644 --- a/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java +++ b/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilder.java @@ -53,7 +53,6 @@ import java.net.SocketException; import java.util.*; import java.security.Security; import java.security.cert.*; -import sun.security.util.DerInputStream; public class CPBuilder { diff --git a/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java b/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java index 0483e7e126c..e6a9765037b 100644 --- a/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java +++ b/jdk/test/sun/security/provider/certpath/DisabledAlgorithms/CPBuilderWithMD5.java @@ -58,7 +58,6 @@ import java.net.SocketException; import java.util.*; import java.security.Security; import java.security.cert.*; -import sun.security.util.DerInputStream; public class CPBuilderWithMD5 { diff --git a/jdk/test/sun/security/provider/certpath/OCSP/OCSPSingleExtensions.java b/jdk/test/sun/security/provider/certpath/OCSP/OCSPSingleExtensions.java index 3e518375800..f9dde0f3e3a 100644 --- a/jdk/test/sun/security/provider/certpath/OCSP/OCSPSingleExtensions.java +++ b/jdk/test/sun/security/provider/certpath/OCSP/OCSPSingleExtensions.java @@ -25,6 +25,7 @@ * @test * @bug 8074064 * @summary OCSPResponse.SingleResponse objects do not parse singleExtensions + * @modules java.base/sun.security.x509 * @run main/othervm sun.security.provider.certpath.OCSPSingleExtensions */ diff --git a/jdk/test/sun/security/provider/certpath/SunCertPathBuilderExceptionTest.java b/jdk/test/sun/security/provider/certpath/SunCertPathBuilderExceptionTest.java index bd50e7f32ad..74cb516c7f6 100644 --- a/jdk/test/sun/security/provider/certpath/SunCertPathBuilderExceptionTest.java +++ b/jdk/test/sun/security/provider/certpath/SunCertPathBuilderExceptionTest.java @@ -26,6 +26,7 @@ * @bug 5032952 * @summary non-transient non-serializable instance field in serializable class + * @modules java.base/sun.security.provider.certpath */ import sun.security.provider.certpath.SunCertPathBuilderException; diff --git a/jdk/test/sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java b/jdk/test/sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java index a244dd639ac..83bf8c9d8ea 100644 --- a/jdk/test/sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java +++ b/jdk/test/sun/security/provider/certpath/X509CertPath/IllegalCertiticates.java @@ -25,6 +25,7 @@ * @test * @bug 6492692 * @summary Some JCK test failed because of the compiler warnings changes + * @modules java.base/sun.security.provider.certpath */ import java.security.cert.CertificateException; diff --git a/jdk/test/sun/security/ssl/ClientHandshaker/LengthCheckTest.java b/jdk/test/sun/security/ssl/ClientHandshaker/LengthCheckTest.java index aaaaddff950..335c44021d0 100644 --- a/jdk/test/sun/security/ssl/ClientHandshaker/LengthCheckTest.java +++ b/jdk/test/sun/security/ssl/ClientHandshaker/LengthCheckTest.java @@ -26,6 +26,7 @@ * @bug 8044860 * @summary Vectors and fixed length fields should be verified * for allowed sizes. + * @modules java.base/sun.security.ssl * @run main/othervm LengthCheckTest * @key randomness */ diff --git a/jdk/test/sun/security/ssl/InputRecord/ClientHelloRead.java b/jdk/test/sun/security/ssl/InputRecord/ClientHelloRead.java index e7a11bd205e..e08230f325d 100644 --- a/jdk/test/sun/security/ssl/InputRecord/ClientHelloRead.java +++ b/jdk/test/sun/security/ssl/InputRecord/ClientHelloRead.java @@ -25,6 +25,7 @@ * @test * @bug 4432868 * @summary A client-hello message may not always be read correctly + * @modules java.base/sun.net.www * @run main/othervm ClientHelloRead * * SunJSSE does not support dynamic system properties, no way to re-use diff --git a/jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHostClient.java b/jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHostClient.java index 3aedfda743e..bd78e9884fd 100644 --- a/jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHostClient.java +++ b/jdk/test/sun/security/ssl/ServerHandshaker/GetPeerHostClient.java @@ -31,7 +31,6 @@ import java.net.*; import java.io.*; import javax.net.ssl.*; -import com.sun.net.ssl.*; class GetPeerHostClient extends Thread { diff --git a/jdk/test/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java b/jdk/test/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java index 31f753fe543..ad00042c01f 100644 --- a/jdk/test/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java +++ b/jdk/test/sun/security/ssl/X509TrustManagerImpl/CheckNullEntity.java @@ -27,6 +27,7 @@ * @summary unspecified exceptions in X509TrustManager.checkClient[Server]Truste d * @author Xuelei Fan + * @modules java.base/com.sun.net.ssl.internal.ssl */ import java.io.*; diff --git a/jdk/test/sun/security/ssl/X509TrustManagerImpl/ClientServer.java b/jdk/test/sun/security/ssl/X509TrustManagerImpl/ClientServer.java index 372269ef72a..54c6c538437 100644 --- a/jdk/test/sun/security/ssl/X509TrustManagerImpl/ClientServer.java +++ b/jdk/test/sun/security/ssl/X509TrustManagerImpl/ClientServer.java @@ -26,6 +26,7 @@ * @bug 4717766 * @author Brad Wetmore * @summary 1.0.3 JsseX509TrustManager erroneously calls isClientTrusted() + * @modules java.base/com.sun.net.ssl * @run main/manual ClientServer */ diff --git a/jdk/test/sun/security/tools/jarsigner/CertChainUnclosed.java b/jdk/test/sun/security/tools/jarsigner/CertChainUnclosed.java index e259207db9c..7ec4d88d73a 100644 --- a/jdk/test/sun/security/tools/jarsigner/CertChainUnclosed.java +++ b/jdk/test/sun/security/tools/jarsigner/CertChainUnclosed.java @@ -25,6 +25,8 @@ * @test * @bug 8027991 * @summary InputStream should be closed in sun.security.tools.jarsigner.Main + * @modules java.base/sun.security.tools.keytool + * jdk.jartool/sun.security.tools.jarsigner * @run main/othervm CertChainUnclosed */ diff --git a/jdk/test/sun/security/tools/jarsigner/DefaultSigalg.java b/jdk/test/sun/security/tools/jarsigner/DefaultSigalg.java index 0fab25eeb84..1d8919934d5 100644 --- a/jdk/test/sun/security/tools/jarsigner/DefaultSigalg.java +++ b/jdk/test/sun/security/tools/jarsigner/DefaultSigalg.java @@ -25,6 +25,12 @@ * @test * @bug 8057810 * @summary New defaults for DSA keys in jarsigner and keytool + * @modules java.base/sun.security.pkcs + * java.base/sun.security.tools.keytool + * java.base/sun.security.util + * java.base/sun.security.x509 + * jdk.jartool/sun.security.tools.jarsigner + * jdk.jartool/sun.tools.jar */ import sun.security.pkcs.PKCS7; diff --git a/jdk/test/sun/security/tools/jarsigner/EntriesOrder.java b/jdk/test/sun/security/tools/jarsigner/EntriesOrder.java index 908f6ef48be..1b804bb9505 100644 --- a/jdk/test/sun/security/tools/jarsigner/EntriesOrder.java +++ b/jdk/test/sun/security/tools/jarsigner/EntriesOrder.java @@ -26,6 +26,9 @@ * @bug 8031572 * @summary jarsigner -verify exits with 0 when a jar file is not properly signed * @library /lib/testlibrary + * @modules java.base/sun.security.tools.keytool + * jdk.jartool/sun.security.tools.jarsigner + * jdk.jartool/sun.tools.jar * @build jdk.testlibrary.IOUtils * @run main EntriesOrder */ diff --git a/jdk/test/sun/security/tools/jarsigner/JarSigningNonAscii.java b/jdk/test/sun/security/tools/jarsigner/JarSigningNonAscii.java index 69bf09ed5bf..ee54b45fe67 100644 --- a/jdk/test/sun/security/tools/jarsigner/JarSigningNonAscii.java +++ b/jdk/test/sun/security/tools/jarsigner/JarSigningNonAscii.java @@ -25,6 +25,7 @@ * @test * @bug 4924188 * @summary sign a JAR file that has entry names with non-ASCII characters. + * @modules jdk.jartool/sun.security.tools.jarsigner */ import sun.security.tools.*; diff --git a/jdk/test/sun/security/tools/jarsigner/LargeJarEntry.java b/jdk/test/sun/security/tools/jarsigner/LargeJarEntry.java index 4d4db3c68a0..c10835066ff 100644 --- a/jdk/test/sun/security/tools/jarsigner/LargeJarEntry.java +++ b/jdk/test/sun/security/tools/jarsigner/LargeJarEntry.java @@ -26,6 +26,7 @@ * @bug 6405538 6474350 * @summary Make sure jar files with large entries (more than max heap size) * can be signed + * @modules jdk.jartool/sun.security.tools.jarsigner * @run main/othervm -Xmx8M LargeJarEntry * @author Sean Mullan */ diff --git a/jdk/test/sun/security/tools/jarsigner/TsacertOptionTest.java b/jdk/test/sun/security/tools/jarsigner/TsacertOptionTest.java index 3664ca922f9..67368ae2f74 100644 --- a/jdk/test/sun/security/tools/jarsigner/TsacertOptionTest.java +++ b/jdk/test/sun/security/tools/jarsigner/TsacertOptionTest.java @@ -30,6 +30,12 @@ import jdk.testlibrary.JarUtils; * @bug 8024302 8026037 * @summary The test signs and verifies a jar file with -tsacert option * @library /lib/testlibrary + * @modules java.base/sun.misc + * java.base/sun.security.pkcs + * java.base/sun.security.timestamp + * java.base/sun.security.util + * java.base/sun.security.x509 + * java.management * @run main TsacertOptionTest */ public class TsacertOptionTest { diff --git a/jdk/test/sun/security/tools/keytool/CloseFile.java b/jdk/test/sun/security/tools/keytool/CloseFile.java index f8040018306..590cce6cb4e 100644 --- a/jdk/test/sun/security/tools/keytool/CloseFile.java +++ b/jdk/test/sun/security/tools/keytool/CloseFile.java @@ -26,6 +26,7 @@ * @bug 6489721 * @summary keytool has not closed several file streams * @author weijun.wang + * @modules java.base/sun.security.tools.keytool * @compile -XDignore.symbol.file CloseFile.java * @run main CloseFile * diff --git a/jdk/test/sun/security/tools/keytool/NewSize7.java b/jdk/test/sun/security/tools/keytool/NewSize7.java index b99581cc860..5a7dcfa57d9 100644 --- a/jdk/test/sun/security/tools/keytool/NewSize7.java +++ b/jdk/test/sun/security/tools/keytool/NewSize7.java @@ -25,6 +25,7 @@ * @test * @bug 6561126 * @summary keytool should use larger default keysize for keypairs + * @modules java.base/sun.security.tools.keytool * @compile -XDignore.symbol.file NewSize7.java * @run main NewSize7 */ diff --git a/jdk/test/sun/security/tools/keytool/StartDateTest.java b/jdk/test/sun/security/tools/keytool/StartDateTest.java index 9a198025fb6..a1180eac4f2 100644 --- a/jdk/test/sun/security/tools/keytool/StartDateTest.java +++ b/jdk/test/sun/security/tools/keytool/StartDateTest.java @@ -25,6 +25,7 @@ * @test * @bug 6468285 * @summary keytool ability to backdate self-signed certificates to compensate for clock skew + * @modules java.base/sun.security.tools.keytool * @compile -XDignore.symbol.file StartDateTest.java * @run main StartDateTest */ diff --git a/jdk/test/sun/security/tools/keytool/UnknownAndUnparseable.java b/jdk/test/sun/security/tools/keytool/UnknownAndUnparseable.java index 6c5d7283f1c..2356b006a6e 100644 --- a/jdk/test/sun/security/tools/keytool/UnknownAndUnparseable.java +++ b/jdk/test/sun/security/tools/keytool/UnknownAndUnparseable.java @@ -25,6 +25,9 @@ * @test * @bug 7192202 * @summary Make sure keytool prints both unknown and unparseable extensions + * @modules java.base/sun.security.tools.keytool + * java.base/sun.security.util + * java.base/sun.security.x509 * @compile -XDignore.symbol.file UnknownAndUnparseable.java * @run main UnknownAndUnparseable */ diff --git a/jdk/test/sun/security/util/BitArray/NamedBitList.java b/jdk/test/sun/security/util/BitArray/NamedBitList.java index ccae5504fbe..9d10b7fc4db 100644 --- a/jdk/test/sun/security/util/BitArray/NamedBitList.java +++ b/jdk/test/sun/security/util/BitArray/NamedBitList.java @@ -26,6 +26,8 @@ * @author Weijun Wang * @bug 4654195 * @summary BIT STRING types with named bits must remove trailing 0 bits + * @modules java.base/sun.security.util + * java.base/sun.security.x509 */ import sun.security.util.BitArray; diff --git a/jdk/test/sun/security/util/Debug/MultiOptions.java b/jdk/test/sun/security/util/Debug/MultiOptions.java index b6254bbc0f6..82987f4348a 100644 --- a/jdk/test/sun/security/util/Debug/MultiOptions.java +++ b/jdk/test/sun/security/util/Debug/MultiOptions.java @@ -27,6 +27,7 @@ * @bug 6466247 * @summary java.security.debug permission= and codebase= * options do not work + * @modules java.base/sun.security.util * @run main/othervm -Djava.security.debug="stacknothing--=-30logincontextacCess:stack-domain,combiner;access:fAilure-jarpermission=sun.dummy.DummyPermission;peRmiSsion=sun.Dummy.DummyPermission2=permission=sun.dummy.DummyPermission3:codEbAse=/dir1/DIR2/Dir3/File.java,codebase=http://www.sun.com/search?q=SunMicro,codEbAse=/dir1/DIR2/Dir3/File.java;coDebase=www.sun.com;codebase=file:///C:/temp/foo%20more/a.txt" MultiOptions */ import sun.security.util.Debug; diff --git a/jdk/test/sun/security/util/DerInputBuffer/BigInteger0.java b/jdk/test/sun/security/util/DerInputBuffer/BigInteger0.java index 351f0bc72e4..6891e7b887e 100644 --- a/jdk/test/sun/security/util/DerInputBuffer/BigInteger0.java +++ b/jdk/test/sun/security/util/DerInputBuffer/BigInteger0.java @@ -25,6 +25,7 @@ * @test * @bug 4492053 * @summary Verify invalid zero length Integer value is rejected + * @modules java.base/sun.security.util */ import java.io.*; diff --git a/jdk/test/sun/security/util/DerInputBuffer/DerInputBufferEqualsHashCode.java b/jdk/test/sun/security/util/DerInputBuffer/DerInputBufferEqualsHashCode.java index 711b9f153df..77cea3ffe3f 100644 --- a/jdk/test/sun/security/util/DerInputBuffer/DerInputBufferEqualsHashCode.java +++ b/jdk/test/sun/security/util/DerInputBuffer/DerInputBufferEqualsHashCode.java @@ -26,6 +26,8 @@ * @author Gary Ellison * @bug 4170635 * @summary Verify equals()/hashCode() contract honored + * @modules java.base/sun.security.util + * java.base/sun.security.x509 * @run main/othervm/policy=Allow.policy DerInputBufferEqualsHashCode */ diff --git a/jdk/test/sun/security/util/DerInputBuffer/PaddedBitString.java b/jdk/test/sun/security/util/DerInputBuffer/PaddedBitString.java index 62080625eb6..2e31159c25e 100644 --- a/jdk/test/sun/security/util/DerInputBuffer/PaddedBitString.java +++ b/jdk/test/sun/security/util/DerInputBuffer/PaddedBitString.java @@ -25,6 +25,7 @@ * @test * @bug 4511556 * @summary Verify BitString value containing padding bits is accepted. + * @modules java.base/sun.security.util */ import java.io.*; diff --git a/jdk/test/sun/security/util/DerInputBuffer/TimeParsing.java b/jdk/test/sun/security/util/DerInputBuffer/TimeParsing.java index a81b4b275fc..f49701a438c 100644 --- a/jdk/test/sun/security/util/DerInputBuffer/TimeParsing.java +++ b/jdk/test/sun/security/util/DerInputBuffer/TimeParsing.java @@ -25,6 +25,7 @@ * @test * @bug 4558835 4915146 * @summary Verify timezone offset and fractional seconds are correctly parsed + * @modules java.base/sun.security.util */ import java.io.*; diff --git a/jdk/test/sun/security/util/DerOutputStream/LocaleInTime.java b/jdk/test/sun/security/util/DerOutputStream/LocaleInTime.java index dd942680d2e..b6e66ceaef5 100644 --- a/jdk/test/sun/security/util/DerOutputStream/LocaleInTime.java +++ b/jdk/test/sun/security/util/DerOutputStream/LocaleInTime.java @@ -25,6 +25,7 @@ * @test * @bug 6670889 * @summary Keystore created under Hindi Locale causing ArrayIndexOutOfBoundsException + * @modules java.base/sun.security.util * @run main/othervm -Duser.language=hi -Duser.region=IN LocaleInTime */ diff --git a/jdk/test/sun/security/util/DerValue/BadValue.java b/jdk/test/sun/security/util/DerValue/BadValue.java index ef3a9ef3817..374a52d7f7b 100644 --- a/jdk/test/sun/security/util/DerValue/BadValue.java +++ b/jdk/test/sun/security/util/DerValue/BadValue.java @@ -25,6 +25,8 @@ * @test * @bug 6864911 * @summary ASN.1/DER input stream parser needs more work + * @modules java.base/sun.misc + * java.base/sun.security.util */ import java.io.*; diff --git a/jdk/test/sun/security/util/DerValue/DerValueEqualsHashCode.java b/jdk/test/sun/security/util/DerValue/DerValueEqualsHashCode.java index 46dd51ca1c1..78e8e7eb11c 100644 --- a/jdk/test/sun/security/util/DerValue/DerValueEqualsHashCode.java +++ b/jdk/test/sun/security/util/DerValue/DerValueEqualsHashCode.java @@ -26,6 +26,8 @@ * @author Gary Ellison * @bug 4170635 * @summary Verify equals()/hashCode() contract honored + * @modules java.base/sun.security.util + * java.base/sun.security.x509 */ import java.io.*; diff --git a/jdk/test/sun/security/util/DerValue/EmptyValue.java b/jdk/test/sun/security/util/DerValue/EmptyValue.java index 8a37e0a2c89..94380485463 100644 --- a/jdk/test/sun/security/util/DerValue/EmptyValue.java +++ b/jdk/test/sun/security/util/DerValue/EmptyValue.java @@ -25,6 +25,7 @@ * @test * @bug 6804045 * @summary DerValue does not accept empty OCTET STRING + * @modules java.base/sun.security.util */ import sun.security.util.DerValue; diff --git a/jdk/test/sun/security/util/DerValue/Indefinite.java b/jdk/test/sun/security/util/DerValue/Indefinite.java index 64c1bf8daf4..c5064315a4f 100644 --- a/jdk/test/sun/security/util/DerValue/Indefinite.java +++ b/jdk/test/sun/security/util/DerValue/Indefinite.java @@ -25,6 +25,7 @@ * @test * @bug 6731685 * @summary CertificateFactory.generateCertificates throws IOException on PKCS7 cert chain + * @modules java.base/sun.security.util */ import java.io.*; diff --git a/jdk/test/sun/security/util/DerValue/NegInt.java b/jdk/test/sun/security/util/DerValue/NegInt.java index 3b2f10e4780..4c82d71862b 100644 --- a/jdk/test/sun/security/util/DerValue/NegInt.java +++ b/jdk/test/sun/security/util/DerValue/NegInt.java @@ -25,6 +25,7 @@ * @test * @bug 6855671 * @summary DerOutputStream encodes negative integer incorrectly + * @modules java.base/sun.security.util */ import sun.security.util.DerOutputStream; diff --git a/jdk/test/sun/security/util/HostnameMatcher/TestHostnameChecker.java b/jdk/test/sun/security/util/HostnameMatcher/TestHostnameChecker.java index d5ef752f000..688b1363731 100644 --- a/jdk/test/sun/security/util/HostnameMatcher/TestHostnameChecker.java +++ b/jdk/test/sun/security/util/HostnameMatcher/TestHostnameChecker.java @@ -25,6 +25,7 @@ * @test * @bug 4514108 * @summary Verify host name matching behaves as defined in RFC2818. + * @modules java.base/sun.security.util */ import java.io.*; diff --git a/jdk/test/sun/security/util/Oid/OidFormat.java b/jdk/test/sun/security/util/Oid/OidFormat.java index 4ec9140052f..d7aab146c82 100644 --- a/jdk/test/sun/security/util/Oid/OidFormat.java +++ b/jdk/test/sun/security/util/Oid/OidFormat.java @@ -28,6 +28,8 @@ * @bug 6418425 * @bug 6418433 * @summary ObjectIdentifier should reject 1.2.3.-4 and throw IOException on all format errors + * @modules java.base/sun.security.util + * java.security.jgss */ import java.io.IOException; diff --git a/jdk/test/sun/security/util/Oid/S11N.java b/jdk/test/sun/security/util/Oid/S11N.java index a5595d10112..b3c02b5af3c 100644 --- a/jdk/test/sun/security/util/Oid/S11N.java +++ b/jdk/test/sun/security/util/Oid/S11N.java @@ -24,6 +24,8 @@ /* * @test * @bug 4811968 6908628 8006564 + * @modules java.base/sun.misc + * java.base/sun.security.util * @run main S11N check * @summary Serialization compatibility with old versions (and fixes) */ diff --git a/jdk/test/sun/security/util/PropertyExpander/ExpandAndEncode.java b/jdk/test/sun/security/util/PropertyExpander/ExpandAndEncode.java index 27b8f421a13..8ece4d03f9d 100644 --- a/jdk/test/sun/security/util/PropertyExpander/ExpandAndEncode.java +++ b/jdk/test/sun/security/util/PropertyExpander/ExpandAndEncode.java @@ -26,6 +26,7 @@ * @author Valerie Peng * @bug 4716213 * @bug 4797850 + * @modules java.base/sun.security.util * @summary Verify that expand(String, boolean) does not encode if * the value is a valid URI with a scheme (it is already encoded), * i.e. avoid double encoding. diff --git a/jdk/test/sun/security/util/Resources/NewNamesFormat.java b/jdk/test/sun/security/util/Resources/NewNamesFormat.java index d984cfa0321..c806c87d637 100644 --- a/jdk/test/sun/security/util/Resources/NewNamesFormat.java +++ b/jdk/test/sun/security/util/Resources/NewNamesFormat.java @@ -24,6 +24,10 @@ /* * @test * @bug 6987827 + * @modules java.base/sun.security.util + * java.base/sun.security.tools.keytool + * jdk.jartool/sun.security.tools.jarsigner + * jdk.policytool/sun.security.tools.policytool * @summary security/util/Resources.java needs improvement */ diff --git a/jdk/test/sun/security/util/asn1StringTypes/StringTypes.java b/jdk/test/sun/security/util/asn1StringTypes/StringTypes.java index 11ce080edbd..be067a89fdb 100644 --- a/jdk/test/sun/security/util/asn1StringTypes/StringTypes.java +++ b/jdk/test/sun/security/util/asn1StringTypes/StringTypes.java @@ -26,6 +26,7 @@ * @bug 4178326 * @summary Make sure reading/writing of different DER encoded string * types works correctly. + * @modules java.base/sun.security.util */ import java.io.*; diff --git a/jdk/test/sun/security/validator/ConstructorTest.java b/jdk/test/sun/security/validator/ConstructorTest.java index e076b618e9e..e7af2621f1b 100644 --- a/jdk/test/sun/security/validator/ConstructorTest.java +++ b/jdk/test/sun/security/validator/ConstructorTest.java @@ -25,6 +25,7 @@ * @test * @bug 6996377 * @summary shrink duplicate code in the constructor of PKIXValidator + * @modules java.base/sun.security.validator */ import java.io.ByteArrayInputStream; diff --git a/jdk/test/sun/security/validator/EndEntityExtensionCheck.java b/jdk/test/sun/security/validator/EndEntityExtensionCheck.java index 122bae237f2..fee67ed55d4 100644 --- a/jdk/test/sun/security/validator/EndEntityExtensionCheck.java +++ b/jdk/test/sun/security/validator/EndEntityExtensionCheck.java @@ -26,6 +26,7 @@ * @bug 8076117 * @summary EndEntityChecker should not process custom extensions * after PKIX validation + * @modules java.base/sun.security.validator */ import java.io.ByteArrayInputStream; diff --git a/jdk/test/sun/security/x509/AVA/AVAEqualsHashCode.java b/jdk/test/sun/security/x509/AVA/AVAEqualsHashCode.java index 640764a5bc2..161cd790403 100644 --- a/jdk/test/sun/security/x509/AVA/AVAEqualsHashCode.java +++ b/jdk/test/sun/security/x509/AVA/AVAEqualsHashCode.java @@ -26,6 +26,8 @@ * @author Gary Ellison * @bug 4170635 * @summary Verify equals()/hashCode() contract honored + * @modules java.base/sun.security.util + * java.base/sun.security.x509 * @run main/othervm/policy=Allow.policy AVAEqualsHashCode */ diff --git a/jdk/test/sun/security/x509/AVA/BadName.java b/jdk/test/sun/security/x509/AVA/BadName.java index 9fc01dc2553..a16f4cdfe5c 100644 --- a/jdk/test/sun/security/x509/AVA/BadName.java +++ b/jdk/test/sun/security/x509/AVA/BadName.java @@ -26,6 +26,7 @@ * @bug 4184274 * @summary Make sure bad distinguished names (without keywords) don't * cause out-of-memory condition + * @modules java.base/sun.security.x509 */ import java.io.IOException; import sun.security.x509.X500Name; diff --git a/jdk/test/sun/security/x509/AVA/DomainComponentEncoding.java b/jdk/test/sun/security/x509/AVA/DomainComponentEncoding.java index d9c61aeca6e..2de36567229 100644 --- a/jdk/test/sun/security/x509/AVA/DomainComponentEncoding.java +++ b/jdk/test/sun/security/x509/AVA/DomainComponentEncoding.java @@ -25,6 +25,8 @@ * @test * @bug 6391482 * @summary incorrect ASN1 DER encoding of DomainComponent AttributeValue + * @modules java.base/sun.security.util + * java.base/sun.security.x509 */ import javax.security.auth.x500.X500Principal; diff --git a/jdk/test/sun/security/x509/AVA/EmailAddressEncoding.java b/jdk/test/sun/security/x509/AVA/EmailAddressEncoding.java index 39499d46159..33d1d9de794 100644 --- a/jdk/test/sun/security/x509/AVA/EmailAddressEncoding.java +++ b/jdk/test/sun/security/x509/AVA/EmailAddressEncoding.java @@ -25,6 +25,8 @@ * @test * @bug 4702543 * @summary incorrect ASN1 DER encoding of EmailAddress Attribute + * @modules java.base/sun.security.pkcs + * java.base/sun.security.util */ import java.io.*; diff --git a/jdk/test/sun/security/x509/AlgorithmId/AlgorithmIdEqualsHashCode.java b/jdk/test/sun/security/x509/AlgorithmId/AlgorithmIdEqualsHashCode.java index 00ac82f962f..f9387f626c7 100644 --- a/jdk/test/sun/security/x509/AlgorithmId/AlgorithmIdEqualsHashCode.java +++ b/jdk/test/sun/security/x509/AlgorithmId/AlgorithmIdEqualsHashCode.java @@ -26,6 +26,7 @@ * @author Gary Ellison * @bug 4170635 * @summary Verify equals()/hashCode() contract honored + * @modules java.base/sun.security.x509 */ import java.io.*; diff --git a/jdk/test/sun/security/x509/AlgorithmId/ExtensibleAlgorithmId.java b/jdk/test/sun/security/x509/AlgorithmId/ExtensibleAlgorithmId.java index 2f85217f483..d6cbbab7553 100644 --- a/jdk/test/sun/security/x509/AlgorithmId/ExtensibleAlgorithmId.java +++ b/jdk/test/sun/security/x509/AlgorithmId/ExtensibleAlgorithmId.java @@ -24,6 +24,7 @@ /* * @test * @bug 4162868 + * @modules java.base/sun.security.x509 * @run main/othervm ExtensibleAlgorithmId * @summary Algorithm Name-to-OID mapping needs to be made extensible. */ diff --git a/jdk/test/sun/security/x509/AlgorithmId/NonStandardNames.java b/jdk/test/sun/security/x509/AlgorithmId/NonStandardNames.java index c6ca55ce385..7823b1eddfa 100644 --- a/jdk/test/sun/security/x509/AlgorithmId/NonStandardNames.java +++ b/jdk/test/sun/security/x509/AlgorithmId/NonStandardNames.java @@ -25,6 +25,10 @@ * @test * @bug 7180907 * @summary Jarsigner -verify fails if rsa file used sha-256 with authenticated attributes + * @modules java.base/sun.security.pkcs + * java.base/sun.security.tools.keytool + * java.base/sun.security.util + * java.base/sun.security.x509 * @compile -XDignore.symbol.file NonStandardNames.java * @run main NonStandardNames */ diff --git a/jdk/test/sun/security/x509/AlgorithmId/SHA256withECDSA.java b/jdk/test/sun/security/x509/AlgorithmId/SHA256withECDSA.java index 28a84d6b315..50835a35a71 100644 --- a/jdk/test/sun/security/x509/AlgorithmId/SHA256withECDSA.java +++ b/jdk/test/sun/security/x509/AlgorithmId/SHA256withECDSA.java @@ -25,6 +25,7 @@ * @test * @bug 6871847 * @summary AlgorithmId.get("SHA256withECDSA") not available + * @modules java.base/sun.security.x509 */ import sun.security.x509.*; diff --git a/jdk/test/sun/security/x509/AlgorithmId/TurkishRegion.java b/jdk/test/sun/security/x509/AlgorithmId/TurkishRegion.java index 5ca91e02677..2fa9e213852 100644 --- a/jdk/test/sun/security/x509/AlgorithmId/TurkishRegion.java +++ b/jdk/test/sun/security/x509/AlgorithmId/TurkishRegion.java @@ -26,6 +26,7 @@ * @bug 6867345 * @summary Turkish regional options cause NPE in * sun.security.x509.AlgorithmId.algOID + * @modules java.base/sun.security.x509 * @run main/othervm -Duser.language=tr -Duser.region=TR TurkishRegion * @author Xuelei Fan */ diff --git a/jdk/test/sun/security/x509/Extensions/BCNull.java b/jdk/test/sun/security/x509/Extensions/BCNull.java index 43bc1a15229..da9a5e8fe69 100644 --- a/jdk/test/sun/security/x509/Extensions/BCNull.java +++ b/jdk/test/sun/security/x509/Extensions/BCNull.java @@ -25,6 +25,7 @@ * @test * @summary BasicConstraintsExtension does not encode when (ca==false && pathLen<0) * @bug 6803376 + * @modules java.base/sun.security.x509 */ import sun.security.x509.BasicConstraintsExtension; diff --git a/jdk/test/sun/security/x509/Extensions/DefaultCriticality.java b/jdk/test/sun/security/x509/Extensions/DefaultCriticality.java index 102109a6021..7c7f6d462cb 100644 --- a/jdk/test/sun/security/x509/Extensions/DefaultCriticality.java +++ b/jdk/test/sun/security/x509/Extensions/DefaultCriticality.java @@ -26,6 +26,7 @@ * @summary Change default criticality of policy mappings and policy constraints certificate extensions * @bug 8059916 + * @modules java.base/sun.security.x509 */ import sun.security.x509.PolicyConstraintsExtension; diff --git a/jdk/test/sun/security/x509/GeneralName/Encode.java b/jdk/test/sun/security/x509/GeneralName/Encode.java index 2080245dcaa..ebff4e14ac6 100644 --- a/jdk/test/sun/security/x509/GeneralName/Encode.java +++ b/jdk/test/sun/security/x509/GeneralName/Encode.java @@ -30,6 +30,8 @@ import sun.security.util.*; * @bug 4716972 * @summary Check that GeneralName.encode() encodes an X500Name with * an explicit tag + * @modules java.base/sun.security.util + * java.base/sun.security.x509 */ public class Encode { diff --git a/jdk/test/sun/security/x509/URIName/Parse.java b/jdk/test/sun/security/x509/URIName/Parse.java index c53450840a6..8edf2ea63b7 100644 --- a/jdk/test/sun/security/x509/URIName/Parse.java +++ b/jdk/test/sun/security/x509/URIName/Parse.java @@ -26,6 +26,8 @@ * @bug 8005389 * @summary CRL Distribution Point URIs with spaces or backslashes should * not be parseable + * @modules java.base/sun.security.util + * java.base/sun.security.x509 */ import java.io.ByteArrayInputStream; import java.io.IOException; diff --git a/jdk/test/sun/security/x509/X500Name/AllAttribs.java b/jdk/test/sun/security/x509/X500Name/AllAttribs.java index a70a3170f26..11f9cdd7ffc 100644 --- a/jdk/test/sun/security/x509/X500Name/AllAttribs.java +++ b/jdk/test/sun/security/x509/X500Name/AllAttribs.java @@ -24,6 +24,7 @@ /* @test * @bug 4244051 * @summary Make sure all PKIX-required X.520 name attribs are supported + * @modules java.base/sun.security.x509 */ import sun.security.x509.*; diff --git a/jdk/test/sun/security/x509/X500Name/DerValueConstructor.java b/jdk/test/sun/security/x509/X500Name/DerValueConstructor.java index 620cf992927..0a9f8351944 100644 --- a/jdk/test/sun/security/x509/X500Name/DerValueConstructor.java +++ b/jdk/test/sun/security/x509/X500Name/DerValueConstructor.java @@ -24,6 +24,8 @@ /* @test * @bug 4228833 * @summary Make sure constructor that takes DerValue argument works + * @modules java.base/sun.security.util + * java.base/sun.security.x509 */ import sun.security.util.*; diff --git a/jdk/test/sun/security/x509/X500Name/EmailKeyword.java b/jdk/test/sun/security/x509/X500Name/EmailKeyword.java index b0ccf3757ed..795cb3ced78 100644 --- a/jdk/test/sun/security/x509/X500Name/EmailKeyword.java +++ b/jdk/test/sun/security/x509/X500Name/EmailKeyword.java @@ -25,6 +25,7 @@ * @bug 4531319 * @summary Make sure AVA with EMAIL or EMAILADDRESS keyword is recognized * in DEFAULT format + * @modules java.base/sun.security.x509 */ import sun.security.x509.X500Name; diff --git a/jdk/test/sun/security/x509/X500Name/NullX500Name.java b/jdk/test/sun/security/x509/X500Name/NullX500Name.java index aedf5341fcf..0e1d471853e 100644 --- a/jdk/test/sun/security/x509/X500Name/NullX500Name.java +++ b/jdk/test/sun/security/x509/X500Name/NullX500Name.java @@ -24,6 +24,9 @@ /* @test * @bug 4118818 * @summary allow null X.500 Names + * @modules java.base/sun.misc + * java.base/sun.security.util + * java.base/sun.security.x509 */ import java.util.Arrays; diff --git a/jdk/test/sun/security/x509/X500Name/RDNwithMultipleAVAs.java b/jdk/test/sun/security/x509/X500Name/RDNwithMultipleAVAs.java index 88293289c54..3f12cdfbbf5 100644 --- a/jdk/test/sun/security/x509/X500Name/RDNwithMultipleAVAs.java +++ b/jdk/test/sun/security/x509/X500Name/RDNwithMultipleAVAs.java @@ -24,6 +24,7 @@ /* @test * @bug 4197911 * @summary Make sure RDN with multiple AVAs can be parsed. + * @modules java.base/sun.security.x509 */ import java.io.*; diff --git a/jdk/test/sun/security/x509/X509CRLImpl/OrderAndDup.java b/jdk/test/sun/security/x509/X509CRLImpl/OrderAndDup.java index 51610e61c7f..bbc38750bec 100644 --- a/jdk/test/sun/security/x509/X509CRLImpl/OrderAndDup.java +++ b/jdk/test/sun/security/x509/X509CRLImpl/OrderAndDup.java @@ -25,6 +25,8 @@ * @test * @bug 7143872 * @summary Improve certificate extension processing + * @modules java.base/sun.security.util + * java.base/sun.security.x509 */ import java.io.ByteArrayInputStream; import java.math.BigInteger; diff --git a/jdk/test/sun/security/x509/equalNames/AltNamesEqualsTest.java b/jdk/test/sun/security/x509/equalNames/AltNamesEqualsTest.java index 75a3da1d026..8ffe02e1cec 100644 --- a/jdk/test/sun/security/x509/equalNames/AltNamesEqualsTest.java +++ b/jdk/test/sun/security/x509/equalNames/AltNamesEqualsTest.java @@ -26,6 +26,8 @@ * @summary Make sure names that are equal are treated as such. * @bug 4273559 * @author Yassir Elley + * @modules java.base/sun.security.util + * java.base/sun.security.x509 */ import sun.security.x509.*; diff --git a/jdk/test/sun/tools/java/CFCTest.java b/jdk/test/sun/tools/java/CFCTest.java index eebf37bb83c..4dea1a57bc8 100644 --- a/jdk/test/sun/tools/java/CFCTest.java +++ b/jdk/test/sun/tools/java/CFCTest.java @@ -24,7 +24,9 @@ /* * @test * @bug 8011805 - * @summary Update sun.tools.java class file reading/writing support to include the new constant pool entries (including invokedynamic) + * @modules jdk.rmic/sun.tools.java jdk.rmic/sun.rmi.rmic + * @summary Update sun.tools.java class file reading/writing support to include + * the new constant pool entries (including invokedynamic) */ import java.io.DataInputStream; diff --git a/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java b/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java index 8bf07f6208b..7283ce3d7b6 100644 --- a/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java +++ b/jdk/test/sun/util/calendar/zi/TestZoneInfo310.java @@ -26,6 +26,7 @@ *@bug 8007572 8008161 *@summary Test whether the TimeZone generated from JSR310 tzdb is the same *as the one from the tz data from javazic + * @modules java.base/sun.util.calendar */ import java.io.File; diff --git a/jdk/test/sun/util/locale/provider/Bug8038436.java b/jdk/test/sun/util/locale/provider/Bug8038436.java index d224190c995..59931d4969c 100644 --- a/jdk/test/sun/util/locale/provider/Bug8038436.java +++ b/jdk/test/sun/util/locale/provider/Bug8038436.java @@ -25,6 +25,8 @@ * @test * @bug 8038436 * @summary Test for changes in 8038436 + * @modules java.base/sun.util.locale.provider + * java.base/sun.util.spi * @compile -XDignore.symbol.file Bug8038436.java * @run main/othervm Bug8038436 -Djava.ext.dirs=foo security * @run main/othervm Bug8038436 -Djava.locale.providers=JRE availlocs diff --git a/jdk/test/sun/util/logging/PlatformLoggerTest.java b/jdk/test/sun/util/logging/PlatformLoggerTest.java index 3fdab49addd..968f35c6d64 100644 --- a/jdk/test/sun/util/logging/PlatformLoggerTest.java +++ b/jdk/test/sun/util/logging/PlatformLoggerTest.java @@ -29,6 +29,7 @@ * operations. othervm mode to make sure java.util.logging * is not initialized. * + * @modules java.base/sun.util.logging * @compile -XDignore.symbol.file PlatformLoggerTest.java * @run main/othervm PlatformLoggerTest */ diff --git a/jdk/test/sun/util/logging/SourceClassName.java b/jdk/test/sun/util/logging/SourceClassName.java index 886460b7dad..0de431a1a20 100644 --- a/jdk/test/sun/util/logging/SourceClassName.java +++ b/jdk/test/sun/util/logging/SourceClassName.java @@ -27,6 +27,7 @@ * @summary Test the source class name and method output by the platform * logger. * + * @modules java.base/sun.util.logging * @compile -XDignore.symbol.file SourceClassName.java * @run main/othervm SourceClassName */ diff --git a/jdk/test/tools/jar/ChangeDir.java b/jdk/test/tools/jar/ChangeDir.java index 0a4f86fcc3d..7d3516bcba7 100644 --- a/jdk/test/tools/jar/ChangeDir.java +++ b/jdk/test/tools/jar/ChangeDir.java @@ -24,6 +24,7 @@ /** * @test * @bug 4806786 8023113 + * @modules jdk.jartool/sun.tools.jar * @summary jar -C doesn't ignore multiple // in path */ diff --git a/jdk/test/tools/jar/JarBackSlash.java b/jdk/test/tools/jar/JarBackSlash.java index 5975e4e5467..565606b8f3f 100644 --- a/jdk/test/tools/jar/JarBackSlash.java +++ b/jdk/test/tools/jar/JarBackSlash.java @@ -28,6 +28,7 @@ /* * @test * @bug 7201156 + * @modules jdk.jartool/sun.tools.jar * @summary jar tool fails to convert file separation characters for list and extract * @author Sean Chou */ diff --git a/jdk/test/tools/jar/JarEntryTime.java b/jdk/test/tools/jar/JarEntryTime.java index 4f29b8e7a63..701779c2828 100644 --- a/jdk/test/tools/jar/JarEntryTime.java +++ b/jdk/test/tools/jar/JarEntryTime.java @@ -24,6 +24,7 @@ /** * @test * @bug 4225317 6969651 + * @modules jdk.jartool/sun.tools.jar * @summary Check extracted files have date as per those in the .jar file */ diff --git a/jdk/test/tools/jar/UpdateJar.java b/jdk/test/tools/jar/UpdateJar.java index a2bc37c4fee..524189bb841 100644 --- a/jdk/test/tools/jar/UpdateJar.java +++ b/jdk/test/tools/jar/UpdateJar.java @@ -24,6 +24,7 @@ /** * @test * @bug 7175845 + * @modules jdk.jartool/sun.tools.jar * @summary jar -uf should not change file permission */ diff --git a/jdk/test/tools/jar/UpdateManifest.java b/jdk/test/tools/jar/UpdateManifest.java index 7a69d96ae53..d07674cab17 100644 --- a/jdk/test/tools/jar/UpdateManifest.java +++ b/jdk/test/tools/jar/UpdateManifest.java @@ -24,6 +24,7 @@ /** * @test * @bug 6434207 6442687 6984046 + * @modules jdk.jartool/sun.tools.jar * @summary Ensure that jar ufm actually updates the * existing jar file's manifest with contents of the * manifest file. diff --git a/jdk/test/tools/jar/index/MetaInf.java b/jdk/test/tools/jar/index/MetaInf.java index 706333be3a5..29108c72d2f 100644 --- a/jdk/test/tools/jar/index/MetaInf.java +++ b/jdk/test/tools/jar/index/MetaInf.java @@ -24,6 +24,7 @@ /* * @test * @bug 4408526 6854795 + * @modules jdk.jartool/sun.tools.jar * @summary Index the non-meta files in META-INF, such as META-INF/services. */