update jca test logic (Azure#22376)

Author: zhichengliu12581

sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultCertificates.java

@@ -42,7 +42,7 @@ public class KeyVaultCertificates implements AzureCertificates {
     /**
      * Stores the last force refresh time.
      */
-    private static volatile Date lastForceRefreshTime = new Date();
+    private static volatile Date forceRefreshTime = new Date();
 
     private KeyVaultClient keyVaultClient;
 
@@ -88,7 +88,7 @@ boolean certificatesNeedRefresh() {
         if (keyVaultClient == null) {
             return false;
         }
-        if (lastRefreshTime == null || lastForceRefreshTime.after(lastRefreshTime)) {
+        if (lastRefreshTime == null || forceRefreshTime.after(lastRefreshTime)) {
             return true;
         }
         if (refreshInterval > 0) {
@@ -162,7 +162,7 @@ private void refreshCertificates() {
      * @return certificate' alias if exist.
      */
     String refreshAndGetAliasByCertificate(Certificate certificate) {
-        updateLastForceRefreshTime();
+        updateForceRefreshTime();
         return getCertificates().entrySet()
                                 .stream()
                                 .filter(entry -> certificate.equals(entry.getValue()))
@@ -189,8 +189,8 @@ public void deleteEntry(String alias) {
     /**
      * Overall refresh certificates' info
      */
-    public static void updateLastForceRefreshTime() {
-        lastForceRefreshTime = new Date();
+    public static void updateForceRefreshTime() {
+        forceRefreshTime = new Date();
     }
 
 }

sdk/keyvault/azure-security-keyvault-jca/src/main/java/com/azure/security/keyvault/jca/KeyVaultKeyStore.java

@@ -164,7 +164,7 @@ public Certificate engineGetCertificate(String alias) {
                                                  .orElse(null);
 
         if (refreshCertificatesWhenHaveUnTrustCertificate && certificate == null) {
-            KeyVaultCertificates.updateLastForceRefreshTime();
+            KeyVaultCertificates.updateForceRefreshTime();
             certificate = keyVaultCertificates.getCertificates().get(alias);
         }
         return certificate;

sdk/keyvault/azure-security-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/KeyVaultCertificatesTest.java

@@ -51,11 +51,12 @@ public void testGetCertificate() {
     }
 
     @Test
-    public void testRefreshAndGetAliasByCertificate() throws InterruptedException {
+    public void testRefreshAndGetAliasByCertificate() {
         Assertions.assertEquals(keyVaultCertificates.refreshAndGetAliasByCertificate(certificate), "myalias");
+        Assertions.assertEquals(keyVaultCertificates.getCertificates().get("myalias"), certificate);
         when(keyVaultClient.getAliases()).thenReturn(null);
-        Thread.sleep(10); // TODO: (rujche) update this logic
         Assertions.assertNotEquals(keyVaultCertificates.refreshAndGetAliasByCertificate(certificate), "myalias");
+        Assertions.assertNull(keyVaultCertificates.getCertificates().get("myalias"));
     }
 
     @Test
@@ -71,9 +72,7 @@ public void testCertificatesNeedRefresh() throws InterruptedException {
         Assertions.assertTrue(keyVaultCertificates.certificatesNeedRefresh());
         keyVaultCertificates.getAliases();
         Assertions.assertFalse(keyVaultCertificates.certificatesNeedRefresh());
-        Thread.sleep(10);
-        KeyVaultCertificates.updateLastForceRefreshTime();
-        Assertions.assertTrue(keyVaultCertificates.certificatesNeedRefresh());
+        KeyVaultCertificates.updateForceRefreshTime();
         keyVaultCertificates.getAliases();
         Assertions.assertFalse(keyVaultCertificates.certificatesNeedRefresh());
         Thread.sleep(2000);

sdk/keyvault/azure-security-test-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/test/KeyVaultCertificatesTest.java

@@ -101,7 +101,7 @@ public void testUpdateLastForceRefreshTime() throws Exception {
         keyStore.deleteEntry(certificateName);
         assertNull(keyStore.getCertificate(certificateName));
         Thread.sleep(10);
-        KeyVaultCertificates.updateLastForceRefreshTime();
+        KeyVaultCertificates.updateForceRefreshTime();
         assertNotNull(keyStore.getCertificate(certificateName));
     }
 }

sdk/keyvault/azure-security-test-keyvault-jca/src/test/java/com/azure/security/keyvault/jca/test/PropertyConvertorUtils.java

@@ -31,7 +31,8 @@ public static void putEnvironmentPropertyToSystemPropertyForKeyVaultJca() {
     public static final List<String> KEYVAULT_JCA_SYSTEM_PROPERTIES = Arrays.asList("AZURE_KEYVAULT_ENDPOINT",
         "AZURE_KEYVAULT_TENANT_ID",
         "AZURE_KEYVAULT_CLIENT_ID",
-        "AZURE_KEYVAULT_CLIENT_SECRET");
+        "AZURE_KEYVAULT_CLIENT_SECRET",
+        "AZURE_KEYVAULT_URI");
 
     public static KeyStore getKeyVaultKeyStore() throws CertificateException, NoSuchAlgorithmException, IOException, KeyStoreException {
         KeyStore keyStore = KeyStore.getInstance("AzureKeyVault");

sdk/keyvault/test-resources.json

@@ -459,6 +459,10 @@
       "type": "string",
       "value": "[parameters('certificateName')]"
     },
+    "AZURE_KEYVAULT_URI": {
+      "type": "string",
+      "value": "[reference(variables('kvName')).vaultUri]"
+    },
     "KEYVAULT_SKU": {
       "type": "string",
       "value": "[reference(parameters('baseName')).sku.name]"