8349501: Relocate supporting classes in security/testlibrary to test/lib/jdk tree

Reviewed-by: rschmelter
Backport-of: b737f7fb3004e4e9c95fba95c6fcda70073ae00e

Author: GoeLin

test/jdk/com/sun/security/auth/callback/TextCallbackHandler/Default.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2001, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2001, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -23,7 +23,7 @@
 
 /*
  * @test
- * @library /test/lib /java/security/testlibrary
+ * @library /test/lib
  * @bug 4470717
  * @summary fix default handling and other misc
  * @run main/othervm Default
@@ -34,6 +34,7 @@
 
 import javax.security.auth.callback.*;
 import java.io.*;
+import jdk.test.lib.security.HumanInputStream;
 
 public class Default {
     public static void main(String args[]) throws Exception {

test/jdk/java/security/KeyFactory/Failover.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,16 +24,16 @@
 /**
  * @test
  * @bug 4894125 7054918 8130181
- * @library ../testlibrary /test/lib
+ * @library /test/lib
  * @summary test that failover for KeyFactory works
  * @author Andreas Sterbenz
  */
 
 import java.util.*;
 
 import java.security.*;
-import java.security.interfaces.*;
 import java.security.spec.*;
+import jdk.test.lib.security.ProvidersSnapshot;
 import jdk.test.lib.security.SecurityUtils;
 
 public class Failover {

test/jdk/java/security/KeyPairGenerator/Failover.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,16 +24,16 @@
 /**
  * @test
  * @bug 4894125 7054918 8130181
- * @library ../testlibrary
+ * @library /test/lib
  * @summary test that failover for KeyPairGenerator works
  * @author Andreas Sterbenz
  */
 
 import java.util.*;
 
 import java.security.*;
-import java.security.interfaces.*;
 import java.security.spec.*;
+import jdk.test.lib.security.ProvidersSnapshot;
 
 public class Failover {
 

test/jdk/java/security/Provider/ChangeProviders.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,14 +24,13 @@
 /*
  * @test
  * @bug 4856968 7054918 8130181
- * @library ../testlibrary
+ * @library /test/lib
  * @summary make sure add/insert/removeProvider() work correctly
  * @author Andreas Sterbenz
  */
 
-import java.util.*;
-
 import java.security.*;
+import jdk.test.lib.security.ProvidersSnapshot;
 
 public class ChangeProviders extends Provider {
 

test/jdk/java/security/Provider/GetInstance.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,7 @@
 /*
  * @test
  * @bug 4856968 7054918 8130181
- * @library ../testlibrary
+ * @library /test/lib
  * @summary make sure getInstance() works correctly, including failover
  *   and delayed provider selection for Signatures
  * @author Andreas Sterbenz
@@ -34,6 +34,7 @@
 
 import java.security.*;
 import java.security.cert.*;
+import jdk.test.lib.security.ProvidersSnapshot;
 
 public class GetInstance {
 

test/jdk/java/security/Provider/GetServiceRace.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2019, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,7 +24,6 @@
 /*
  * @test
  * @bug 8231387
- * @library ../testlibrary
  * @summary make sure getService() avoids a race
  * @author Tianmin Shi
  */

test/jdk/java/security/Provider/RemoveProvider.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1998, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1998, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,13 +24,14 @@
 /*
  * @test
  * @bug 4190873 7054918 8130181
- * @library ../testlibrary
+ * @library /test/lib
  * @summary Make sure provider instance can be removed from list of registered
  * providers, and "entrySet", "keySet", and "values" methods don't loop
  * indefinitely.
  */
 import java.security.*;
 import java.util.*;
+import jdk.test.lib.security.ProvidersSnapshot;
 
 public class RemoveProvider {
 

test/jdk/java/security/Security/NoInstalledProviders.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,12 +24,13 @@
 /*
  * @test
  * @bug 4273454 7054918 7052537
- * @library ../testlibrary
+ * @library /test/lib
  * @summary Make sure getProviders(filter) doesn't throw NPE
  * @run main/othervm NoInstalledProviders
  */
 
 import java.security.*;
+import jdk.test.lib.security.ProvidersSnapshot;
 
 public class NoInstalledProviders {
 

test/jdk/java/security/Security/SynchronizedAccess.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 1999, 2024, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 1999, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,13 +24,14 @@
 /*
  * @test
  * @bug 4162583 7054918 8130181 8028127
- * @library /test/lib ../testlibrary
+ * @library /test/lib
  * @summary Make sure Provider api implementations are synchronized properly
  */
 
 import java.security.*;
 
 import jdk.test.lib.Asserts;
+import jdk.test.lib.security.ProvidersSnapshot;
 
 public class SynchronizedAccess {
 

test/jdk/java/security/Security/removing/RemoveProviders.java

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2003, 2025, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
@@ -24,14 +24,15 @@
 /**
  * @test
  * @bug 4963416 7054918
- * @library ../../testlibrary
+ * @library /test/lib
  * @summary make sure removeProvider() always works correctly
  * @author Andreas Sterbenz
  */
 
 import java.util.*;
 
 import java.security.*;
+import jdk.test.lib.security.ProvidersSnapshot;
 
 public class RemoveProviders {