update

taoliult · Oct 31, 2024 · 73605a0 · 73605a0
1 parent b912221
commit 73605a0
Show file tree

Hide file tree

Showing 3 changed files with 87 additions and 89 deletions.
diff --git a/closed/test/jdk/openj9/internal/security/TestProviders.java b/closed/test/jdk/openj9/internal/security/TestProviders.java
@@ -45,30 +45,30 @@ public class TestProviders {
 
     private static Stream<Arguments> patternMatches_expectedExitValue0() {
         return Stream.of(
-                // Test OpenJCEPlusFIPS strict profile provider list
-                Arguments.of("OpenJCEPlusFIPS.FIPS140-3",
+                // Test strict profile provider list
+                Arguments.of("TestBase.Version",
                         System.getProperty("test.src") + "/provider-java.security",
-                        "(?s)(?=.*OpenJCEPlusFIPS)(?=.*\\bSUN\\b)(?=.*SunJSSE)"),
-                // Test OpenJCEPlusFIPS default profile provider list
-                Arguments.of("OpenJCEPlusFIPS",
+                        "(?s)(?=.*Sun)(?=.*\\bSunJCE\\b)(?=.*SunJSSE)"),
+                // Test default profile provider list
+                Arguments.of("TestBase",
                         System.getProperty("test.src") + "/provider-java.security",
-                        "(?s)(?=.*OpenJCEPlusFIPS)(?=.*\\bSUN\\b)(?=.*SunRsaSign)" +
-                                "(?=.*SunEC)(?=.*SunJSSE)(?=.*SunJCE)(?=.*SunJGSS)(?=.*SunSASL)" +
+                        "(?s)(?=.*Sun)(?=.*SunRsaSign)(?=.*SunEC)(?=.*SunJSSE)" +
+                                "(?=.*SunJCE)(?=.*SunJGSS)(?=.*SunSASL)" +
                                 "(?=.*XMLDSig)(?=.*SunPCSC)(?=.*JdkLDAP)(?=.*JdkSASL)"),
-                // Test OpenJCEPlusFIPS weakly enforced profile provider list
-                Arguments.of("OpenJCEPlusFIPS.FIPS140-3-Weakly-Enforced",
+                // Test extended profile provider list
+                Arguments.of("TestBase.Version-Extended",
                         System.getProperty("test.src") + "/provider-java.security",
-                        "(?s)(?=.*OpenJCEPlusFIPS)(?=.*\\bSUN\\b)(?=.*SunRsaSign)" +
-                                "(?=.*SunEC)(?=.*SunJSSE)(?=.*SunJCE)(?=.*SunJGSS)(?=.*SunSASL)" +
+                        "(?s)(?=.*Sun)(?=.*SunRsaSign)(?=.*SunEC)(?=.*SunJSSE)" +
+                                "(?=.*SunJCE)(?=.*SunJGSS)(?=.*SunSASL)" +
                                 "(?=.*XMLDSig)(?=.*SunPCSC)(?=.*JdkLDAP)(?=.*JdkSASL)"),
                 // Test update provider list with value
                 Arguments.of("Test-Profile.Updated_1",
                         System.getProperty("test.src") + "/provider-java.security",
-                        "(?s)(?=.*OpenJCEPlusFIPS)(?=.*\\bSUN\\b)(?=.*SunSASL)"),
+                        "(?s)(?=.*Sun)(?=.*\\bSunJCE\\b)(?=.*SunSASL)"),
                 // Test update provider list with null
                 Arguments.of("Test-Profile.Updated_2",
                         System.getProperty("test.src") + "/provider-java.security",
-                        "(?s)(?=.*OpenJCEPlusFIPS)(?=.*\\bSUN\\b)(?=.*SunJSSE)")
+                        "(?s)(?=.*Sun)(?=.*\\bSunJCE\\b)(?=.*SunJSSE)")
         );
     }