From 520da69ad4a1f66429ccb276cef2db23faf99863 Mon Sep 17 00:00:00 2001 From: vishesh92 Date: Thu, 16 Apr 2026 01:07:46 +0530 Subject: [PATCH] fix failing tests --- .../kms/KMSManagerImplKeyLifecycleTest.java | 35 ++++++++++++------- .../kms/KMSManagerImplKeyRotationTest.java | 23 +++++++----- 2 files changed, 37 insertions(+), 21 deletions(-) diff --git a/server/src/test/java/org/apache/cloudstack/kms/KMSManagerImplKeyLifecycleTest.java b/server/src/test/java/org/apache/cloudstack/kms/KMSManagerImplKeyLifecycleTest.java index 67d675bd46b..346f068bdc2 100644 --- a/server/src/test/java/org/apache/cloudstack/kms/KMSManagerImplKeyLifecycleTest.java +++ b/server/src/test/java/org/apache/cloudstack/kms/KMSManagerImplKeyLifecycleTest.java @@ -17,6 +17,7 @@ package org.apache.cloudstack.kms; +import com.cloud.event.ActionEventUtils; import com.cloud.exception.InvalidParameterValueException; import com.cloud.storage.dao.VolumeDao; import org.apache.cloudstack.framework.kms.KMSException; @@ -32,6 +33,8 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.InjectMocks; import org.mockito.Mock; +import org.mockito.Mockito; +import org.mockito.MockedStatic; import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; @@ -330,10 +333,12 @@ public class KMSManagerImplKeyLifecycleTest { when(hsmProfileDao.findById(10L)).thenReturn(profile); doReturn(kmsProvider).when(kmsManager).getKMSProvider("database"); - kmsManager.deleteUserKMSKey(key); + try (MockedStatic actionEventUtils = Mockito.mockStatic(ActionEventUtils.class)) { + kmsManager.deleteUserKMSKey(key); - verify(kmsProvider).deleteKek("kek-label"); - verify(kmsKeyDao).remove(keyId); + verify(kmsProvider).deleteKek("kek-label"); + verify(kmsKeyDao).remove(keyId); + } } @Test @@ -355,9 +360,11 @@ public class KMSManagerImplKeyLifecycleTest { doReturn(kmsProvider).when(kmsManager).getKMSProvider("database"); doThrow(KMSException.kekOperationFailed("provider error")).when(kmsProvider).deleteKek(anyString()); - kmsManager.deleteUserKMSKey(key); + try (MockedStatic actionEventUtils = Mockito.mockStatic(ActionEventUtils.class)) { + kmsManager.deleteUserKMSKey(key); - verify(kmsKeyDao).remove(keyId); + verify(kmsKeyDao).remove(keyId); + } } @Test @@ -391,11 +398,13 @@ public class KMSManagerImplKeyLifecycleTest { when(hsmProfileDao.findById(20L)).thenReturn(profile); doReturn(kmsProvider).when(kmsManager).getKMSProvider("database"); - boolean result = kmsManager.deleteKMSKeysByAccountId(accountId); + try (MockedStatic actionEventUtils = Mockito.mockStatic(ActionEventUtils.class)) { + boolean result = kmsManager.deleteKMSKeysByAccountId(accountId); - assertTrue(result); - verify(kmsProvider).deleteKek("kek-label"); - verify(kmsKeyDao).remove(10L); + assertTrue(result); + verify(kmsProvider).deleteKek("kek-label"); + verify(kmsKeyDao).remove(10L); + } } @Test @@ -418,9 +427,11 @@ public class KMSManagerImplKeyLifecycleTest { doReturn(kmsProvider).when(kmsManager).getKMSProvider("database"); doThrow(new RuntimeException("provider unavailable")).when(kmsProvider).deleteKek(anyString()); - boolean result = kmsManager.deleteKMSKeysByAccountId(accountId); + try (MockedStatic actionEventUtils = Mockito.mockStatic(ActionEventUtils.class)) { + boolean result = kmsManager.deleteKMSKeysByAccountId(accountId); - assertTrue(result); - verify(kmsKeyDao).remove(10L); + assertTrue(result); + verify(kmsKeyDao).remove(10L); + } } } diff --git a/server/src/test/java/org/apache/cloudstack/kms/KMSManagerImplKeyRotationTest.java b/server/src/test/java/org/apache/cloudstack/kms/KMSManagerImplKeyRotationTest.java index bf513c5fd3e..7fda0333771 100644 --- a/server/src/test/java/org/apache/cloudstack/kms/KMSManagerImplKeyRotationTest.java +++ b/server/src/test/java/org/apache/cloudstack/kms/KMSManagerImplKeyRotationTest.java @@ -25,12 +25,15 @@ import org.apache.cloudstack.kms.dao.HSMProfileDao; import org.apache.cloudstack.kms.dao.KMSKekVersionDao; import org.apache.cloudstack.kms.dao.KMSKeyDao; import org.apache.cloudstack.kms.dao.KMSWrappedKeyDao; +import com.cloud.event.ActionEventUtils; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.ArgumentCaptor; import org.mockito.InjectMocks; import org.mockito.Mock; +import org.mockito.MockedStatic; +import org.mockito.Mockito; import org.mockito.Spy; import org.mockito.junit.MockitoJUnitRunner; @@ -225,18 +228,20 @@ public class KMSManagerImplKeyRotationTest { when(kmsProvider.wrapKey(plainDek, KeyPurpose.VOLUME_ENCRYPTION, "new-kek-label", newProfileId)) .thenReturn(newWrappedKey); - kmsManager.rewrapSingleKey(wrappedKeyVO, kmsKey, newVersion, kmsProvider); + try (MockedStatic actionEventUtils = Mockito.mockStatic(ActionEventUtils.class)) { + kmsManager.rewrapSingleKey(wrappedKeyVO, kmsKey, newVersion, kmsProvider); - // Verify unwrap was called - verify(kmsManager).unwrapKey(wrappedKeyId); + // Verify unwrap was called + verify(kmsManager).unwrapKey(wrappedKeyId); - // Verify wrap was called with new profile - verify(kmsProvider).wrapKey(plainDek, KeyPurpose.VOLUME_ENCRYPTION, "new-kek-label", newProfileId); + // Verify wrap was called with new profile + verify(kmsProvider).wrapKey(plainDek, KeyPurpose.VOLUME_ENCRYPTION, "new-kek-label", newProfileId); - // Verify wrapped key was updated - verify(wrappedKeyVO).setKekVersionId(newVersionId); - verify(wrappedKeyVO).setWrappedBlob("new-wrapped-blob".getBytes()); - verify(kmsWrappedKeyDao).update(wrappedKeyId, wrappedKeyVO); + // Verify wrapped key was updated + verify(wrappedKeyVO).setKekVersionId(newVersionId); + verify(wrappedKeyVO).setWrappedBlob("new-wrapped-blob".getBytes()); + verify(kmsWrappedKeyDao).update(wrappedKeyId, wrappedKeyVO); + } } /**