test/sun/security/pkcs11/rsa/TestCACerts.java

7191662: JCE providers should be located via ServiceLoader

*** 25,34 ****
--- 25,35 ----
   * @test
   * @bug 4856966
   * @summary Test the new RSA provider can verify all the RSA certs in the cacerts file
   * @author Andreas Sterbenz
   * @library ..
+  * @library ../../../../java/security/testlibrary
   */
  
  // this test serves as our known answer test
  
  import java.io.*;
*** 45,55 ****
          main(new TestCACerts());
      }
  
      public void main(Provider p) throws Exception {
          long start = System.currentTimeMillis();
!         Security.addProvider(p);
          try {
              String PROVIDER = p.getName();
              String javaHome = System.getProperty("java.home");
              String caCerts = javaHome + SEP + "lib" + SEP + "security" + SEP + "cacerts";
              InputStream in = new FileInputStream(caCerts);
--- 46,56 ----
          main(new TestCACerts());
      }
  
      public void main(Provider p) throws Exception {
          long start = System.currentTimeMillis();
!         Providers.setAt(p, 1);
          try {
              String PROVIDER = p.getName();
              String javaHome = System.getProperty("java.home");
              String caCerts = javaHome + SEP + "lib" + SEP + "security" + SEP + "cacerts";
              InputStream in = new FileInputStream(caCerts);