infernap12/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2026-05-13 06:59:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

8167525: update jdk tests to remove @compile --add-modules workaround

Browse Source 
Reviewed-by: mchung
This commit is contained in:
Amy Lu 2017-03-08 15:29:57 +08:00
parent af9013c96e
commit a2b08aeec9
19 changed files with 20 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jdk/test/ProblemList.txt
View File

@ -186,8 +186,6 @@ java/nio/file/WatchService/Basic.java 7158947 solaris-
java/nio/file/WatchService/MayFlies.java 7158947 solaris-all Solaris 11
java/nio/file/WatchService/LotsOfEvents.java 7158947 solaris-all Solaris 11
sun/nio/cs/OLD/TestIBMDB.java 8167525 generic-all
############################################################################
# jdk_rmi

3
jdk/test/com/sun/jndi/dns/Parser.java
View File

@ -26,9 +26,6 @@
* @bug 8035105
* @summary DNS resource record parsing
* @modules jdk.naming.dns/com.sun.jndi.dns:+open
*
* @compile --add-modules jdk.naming.dns Parser.java
* @run main Parser
*/
import com.sun.jndi.dns.ResourceRecord;

3
jdk/test/com/sun/jndi/dns/Test6991580.java
View File

@ -1,6 +1,6 @@
/*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -37,7 +37,6 @@ import java.awt.event.ActionListener;
* @summary IPv6 Nameservers in resolv.conf throws NumberFormatException
* @modules java.desktop
* jdk.naming.dns/com.sun.jndi.dns
* @compile --add-modules jdk.naming.dns IPv6NameserverPlatformParsingTest.java
* @run main/manual Test6991580
*/

3
jdk/test/com/sun/jndi/rmi/registry/RegistryContext/ContextWithNullProperties.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2010, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2010, 2017, Oracle and/or its affiliates. All rights reserved.
* 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,7 +29,6 @@
* java.rmi/sun.rmi.server java.rmi/sun.rmi.transport java.rmi/sun.rmi.transport.tcp
* @library ../../../../../../java/rmi/testlibrary
* @build TestLibrary
* @compile --add-modules jdk.naming.rmi ContextWithNullProperties.java
* @run main/othervm ContextWithNullProperties
*/

4
jdk/test/java/beans/XMLDecoder/8028054/TestConstructorFinder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,7 +39,7 @@ import java.util.List;
* java.corba
* java.xml.bind
* @compile -XDignore.symbol.file TestConstructorFinder.java
* @run main/othervm --add-modules=java.activation,java.transaction,java.corba,java.xml.bind TestConstructorFinder
* @run main TestConstructorFinder
*/
public class TestConstructorFinder {

4
jdk/test/java/beans/XMLDecoder/8028054/TestMethodFinder.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2013, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2013, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,7 +39,7 @@ import java.util.List;
* java.corba
* java.xml.bind
* @compile -XDignore.symbol.file TestMethodFinder.java
* @run main/othervm --add-modules=java.activation,java.transaction,java.corba,java.xml.bind TestMethodFinder
* @run main TestMethodFinder
*/
public class TestMethodFinder {

3
jdk/test/java/lang/ClassLoader/platformClassLoader/DefinePlatformClass.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2016, 2017, Oracle and/or its affiliates. All rights reserved.
* 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,7 +26,6 @@
* @summary Test java.* class defined by the platform class loader
* @modules jdk.zipfs/java.fake
* @build jdk.zipfs/java.fake.Fake
* @compile --add-modules jdk.zipfs DefinePlatformClass.java
* @run main DefinePlatformClass
*/

5
jdk/test/javax/smartcardio/CommandAPDUTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* 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,8 +26,7 @@
* @bug 8049021
* @summary Test different constructors for CommandAPDU and check CLA,INS,NC,NE,
* P1,and P2
* @compile --add-modules=java.smartcardio CommandAPDUTest.java
* @run testng/othervm --add-modules=java.smartcardio CommandAPDUTest
* @run testng CommandAPDUTest
*/
import java.nio.ByteBuffer;
import javax.smartcardio.CommandAPDU;

4
jdk/test/javax/smartcardio/HistoricalBytes.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
* 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,8 +26,6 @@
* @bug 6445367
* @summary Verify that ATR.getHistoricalBytes() works
* @author Andreas Sterbenz
* @compile --add-modules=java.smartcardio HistoricalBytes.java
* @run main/othervm --add-modules=java.smartcardio HistoricalBytes
*/
import java.util.Arrays;

5
jdk/test/javax/smartcardio/ResponseAPDUTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -25,8 +25,7 @@
* @test
* @bug 8049021
* @summary Construct ResponseAPDU from byte array and check NR< SW, SW1 and SW2
* @compile --add-modules=java.smartcardio ResponseAPDUTest.java
* @run testng/othervm --add-modules=java.smartcardio ResponseAPDUTest
* @run testng ResponseAPDUTest
*/
import javax.smartcardio.ResponseAPDU;
import static org.testng.Assert.*;

4
jdk/test/javax/smartcardio/Serialize.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2006, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2006, 2017, Oracle and/or its affiliates. All rights reserved.
* 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,8 +26,6 @@
* @bug 6445367
* @summary make sure serialization works
* @author Andreas Sterbenz
* @compile --add-modules=java.smartcardio Serialize.java
* @run main/othervm --add-modules=java.smartcardio Serialize
*/
import java.io.*;

1
jdk/test/javax/smartcardio/TEST.properties Normal file
View File

@ -0,0 +1 @@
modules = java.smartcardio

5
jdk/test/javax/smartcardio/TerminalFactorySpiTest.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2007, 2014, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2007, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -25,8 +25,7 @@
* @test
* @bug 8049021
* @summary Test if we can write new provider for smart card
* @compile --add-modules=java.smartcardio TerminalFactorySpiTest.java
* @run main/othervm/java.security.policy=policy --add-modules=java.smartcardio TerminalFactorySpiTest
* @run main/othervm/java.security.policy=policy TerminalFactorySpiTest
*/
import java.security.Provider;
import java.security.Security;

4
jdk/test/javax/smartcardio/TestCardPermission.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
* 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,8 +26,6 @@
* @bug 6293767 6469513
* @summary Test for the CardPermission class
* @author Andreas Sterbenz
* @compile --add-modules=java.smartcardio TestCardPermission.java
* @run main/othervm --add-modules=java.smartcardio TestCardPermission
*/
import javax.smartcardio.*;

4
jdk/test/javax/smartcardio/TestCommandAPDU.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -27,8 +27,6 @@
* @summary Test for the CommandAPDU class
* @author Andreas Sterbenz
* @key randomness
* @compile --add-modules=java.smartcardio TestCommandAPDU.java
* @run main/othervm --add-modules=java.smartcardio TestCommandAPDU
*/
import java.util.*;

1
jdk/test/sun/security/ec/TestEC.java
View File

@ -35,7 +35,6 @@
* @library ../pkcs11/sslecc
* @library ../../../java/security/testlibrary
* @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
* @compile --add-modules jdk.crypto.cryptoki TestEC.java
* @run main/othervm -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
* @run main/othervm/java.security.policy=TestEC.policy -Djdk.tls.namedGroups="secp256r1,sect193r1" TestEC
*/

3
jdk/test/sun/security/mscapi/IsSunMSCAPIAvailable.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2005, 2015, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2005, 2017, Oracle and/or its affiliates. All rights reserved.
* 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,7 +26,6 @@
* @bug 6318171 6931562
* @requires os.family == "windows"
* @modules jdk.crypto.mscapi/sun.security.mscapi
* @compile --add-modules jdk.crypto.mscapi IsSunMSCAPIAvailable.java
* @run main/othervm IsSunMSCAPIAvailable
*/

1
jdk/test/sun/security/pkcs11/ec/TestCurves.java
View File

@ -28,7 +28,6 @@
* @author Andreas Sterbenz
* @library ..
* @modules jdk.crypto.cryptoki/sun.security.pkcs11.wrapper
* @compile --add-modules jdk.crypto.cryptoki TestCurves.java
* @run main/othervm TestCurves
* @run main/othervm TestCurves sm
* @key randomness

3
jdk/test/sun/security/provider/PolicyFile/Modules.java
View File

@ -1,5 +1,5 @@
/*
* Copyright (c) 2015, 2016, Oracle and/or its affiliates. All rights reserved.
* Copyright (c) 2015, 2017, Oracle and/or its affiliates. All rights reserved.
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
*
* This code is free software; you can redistribute it and/or modify it
@ -39,7 +39,6 @@
* jdk.net
* jdk.security.auth
* jdk.security.jgss
* @compile --add-modules=java.xml.ws,java.smartcardio Modules.java
* @run main/othervm/java.security.policy==modules.policy Modules
*/