add more tests

Signed-off-by: Abhishek Kumar <abhishek.mrt22@gmail.com>
apache · shwstppr · Oct 7, 2025 · Oct 10, 2025 · Oct 10, 2025 · Oct 10, 2025
commit 2da3004286255c6951784d10adbd3ca94bd0fa74
diff --git a/...a/org/apache/cloudstack/framework/extensions/manager/ExtensionsFilesystemManagerImpl.java b/...a/org/apache/cloudstack/framework/extensions/manager/ExtensionsFilesystemManagerImpl.java
@@ -402,9 +402,9 @@ public String prepareExternalPayload(String extensionName, Map<String, Object> d
     }
 
     @Override
-    public void deleteExtensionPayload(String extensionName, String payloadFileName) {
-        logger.trace("Deleting payload file: {} for extension: {}", payloadFileName, extensionName);
-        FileUtil.deletePath(payloadFileName);
+    public void deleteExtensionPayload(String extensionName, String payloadFilePath) {
+        logger.trace("Deleting payload file: {} for extension: {}", payloadFilePath, extensionName);
+        FileUtil.deletePath(payloadFilePath);
     }
 
     @Override

diff --git a/...n/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsShareManagerImpl.java b/...n/java/org/apache/cloudstack/framework/extensions/manager/ExtensionsShareManagerImpl.java
@@ -272,7 +272,7 @@ protected boolean packArchiveForSync(Extension extension, Path extensionRootPath
                 Files.copy(p, dest, StandardCopyOption.COPY_ATTRIBUTES);
             }
         }
-        logger.debug("Packing files for {} from: {} to archive: {}", extension, sourceDir,
+        logger.debug("Packing files for sync for {} from: {} to archive: {}", extension, sourceDir,
                 archivePath.toAbsolutePath());
         boolean result = ArchiveUtil.packPath(ArchiveUtil.ArchiveFormat.TGZ, sourceDir, archivePath, 60);
 
@@ -286,7 +286,7 @@ protected boolean packArchiveForDownload(Extension extension, Path extensionRoot
             throws IOException {
         Files.createDirectories(archivePath.getParent());
         FileUtil.deletePath(archivePath.toAbsolutePath().toString());
-        logger.debug("Packing files for {} from: {} to archive: {}", extension, extensionRootPath,
+        logger.debug("Packing files for download for {} from: {} to archive: {}", extension, extensionRootPath,
                 archivePath.toAbsolutePath());
 
         return ArchiveUtil.packPath(ArchiveUtil.ArchiveFormat.ZIP, extensionRootPath, archivePath, 60);

diff --git a/.../src/test/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmdTest.java b/.../src/test/java/org/apache/cloudstack/framework/extensions/api/AddCustomActionCmdTest.java
@@ -40,9 +40,10 @@
 import org.apache.cloudstack.extension.ExtensionCustomAction;
 import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
 import org.apache.commons.collections.MapUtils;
-import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
@@ -51,15 +52,11 @@
 @RunWith(MockitoJUnitRunner.class)
 public class AddCustomActionCmdTest {
 
-    private AddCustomActionCmd cmd;
+    @Mock
     private ExtensionsManager extensionsManager;
 
-    @Before
-    public void setUp() throws Exception {
-        cmd = new AddCustomActionCmd();
-        extensionsManager = mock(ExtensionsManager.class);
-        cmd.extensionsManager = extensionsManager;
-    }
+    @InjectMocks
+    private AddCustomActionCmd cmd = new AddCustomActionCmd();
 
     private void setField(String fieldName, Object value) {
         ReflectionTestUtils.setField(cmd, fieldName, value);

diff --git a/.../src/test/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmdTest.java b/.../src/test/java/org/apache/cloudstack/framework/extensions/api/CreateExtensionCmdTest.java
@@ -28,8 +28,13 @@
 
 import org.apache.commons.collections.MapUtils;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class CreateExtensionCmdTest {
+    @InjectMocks
     CreateExtensionCmd cmd = new CreateExtensionCmd();
 
     @Test

diff --git a/...c/test/java/org/apache/cloudstack/framework/extensions/api/DeleteCustomActionCmdTest.java b/...c/test/java/org/apache/cloudstack/framework/extensions/api/DeleteCustomActionCmdTest.java
@@ -24,23 +24,23 @@
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
 
+@RunWith(MockitoJUnitRunner.class)
 public class DeleteCustomActionCmdTest {
 
-    private DeleteCustomActionCmd cmd;
+    @Mock
     private ExtensionsManager extensionsManager;
 
-    @Before
-    public void setUp() throws Exception {
-        cmd = Mockito.spy(new DeleteCustomActionCmd());
-        extensionsManager = Mockito.mock(ExtensionsManager.class);
-        java.lang.reflect.Field field = DeleteCustomActionCmd.class.getDeclaredField("extensionsManager");
-        field.setAccessible(true);
-        field.set(cmd, extensionsManager);
-    }
+    @Spy
+    @InjectMocks
+    private DeleteCustomActionCmd cmd;
 
     @Test
     public void getIdReturnsNullWhenUnset() throws Exception {

diff --git a/.../src/test/java/org/apache/cloudstack/framework/extensions/api/DeleteExtensionCmdTest.java b/.../src/test/java/org/apache/cloudstack/framework/extensions/api/DeleteExtensionCmdTest.java
@@ -26,22 +26,24 @@
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
+@RunWith(MockitoJUnitRunner.class)
 public class DeleteExtensionCmdTest {
 
-    private DeleteExtensionCmd cmd;
+    @Mock
     private ExtensionsManager extensionsManager;
 
-    @Before
-    public void setUp() {
-        cmd = Mockito.spy(new DeleteExtensionCmd());
-        extensionsManager = Mockito.mock(ExtensionsManager.class);
-        cmd.extensionsManager = extensionsManager;
-    }
+    @Spy
+    @InjectMocks
+    private DeleteExtensionCmd cmd;
 
     @Test
     public void getIdReturnsNullWhenUnset() {

diff --git a/...rc/test/java/org/apache/cloudstack/framework/extensions/api/DownloadExtensionCmdTest.java b/...rc/test/java/org/apache/cloudstack/framework/extensions/api/DownloadExtensionCmdTest.java
@@ -0,0 +1,103 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+
+package org.apache.cloudstack.framework.extensions.api;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertThrows;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
+import org.apache.cloudstack.api.ApiCommandResourceType;
+import org.apache.cloudstack.api.ApiErrorCode;
+import org.apache.cloudstack.api.ServerApiException;
+import org.apache.cloudstack.framework.extensions.api.response.DownloadExtensionResponse;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
+import org.springframework.test.util.ReflectionTestUtils;
+
+import com.cloud.event.EventTypes;
+import com.cloud.user.Account;
+
+@RunWith(MockitoJUnitRunner.class)
+public class DownloadExtensionCmdTest {
+
+    @Mock
+    private ExtensionsManager extensionsManager;
+
+    @Spy
+    @InjectMocks
+    private DownloadExtensionCmd cmd;
+
+    @Test
+    public void getIdReturnsExpected() {
+        ReflectionTestUtils.setField(cmd, "id", 123L);
+        assertEquals(Long.valueOf(123L), cmd.getId());
+    }
+
+    @Test
+    public void getManagementServerIdReturnsExpected() {
+        ReflectionTestUtils.setField(cmd, "managementServerId", 123L);
+        assertEquals(Long.valueOf(123L), cmd.getManagementServerId());
+    }
+
+    @Test
+    public void executeSetsResponseObjectWhenDownloadSucceeds() {
+        DownloadExtensionResponse response = mock(DownloadExtensionResponse.class);
+        when(extensionsManager.downloadExtension(any(DownloadExtensionCmd.class))).thenReturn(response);
+        cmd.execute();
+        verify(cmd).setResponseObject(response);
+    }
+
+    @Test
+    public void executeThrowsExceptionWhenDownloadFails() {
+        when(extensionsManager.downloadExtension(cmd)).thenReturn(null);
+        ServerApiException exception = assertThrows(ServerApiException.class, cmd::execute);
+        assertEquals(ApiErrorCode.INTERNAL_ERROR, exception.getErrorCode());
+        assertEquals("Failed to download extension", exception.getDescription());
+    }
+
+    @Test
+    public void getEntityOwnerIdReturnsSystemAccount() {
+        assertEquals(Account.ACCOUNT_ID_SYSTEM, cmd.getEntityOwnerId());
+    }
+
+    @Test
+    public void getApiResourceTypeReturnsExtension() {
+        assertEquals(ApiCommandResourceType.Extension, cmd.getApiResourceType());
+    }
+
+    @Test
+    public void getEventTypeReturnsCorrectEventType() {
+        assertEquals(EventTypes.EVENT_EXTENSION_DOWNLOAD, cmd.getEventType());
+    }
+
+    @Test
+    public void getEventDescriptionReturnsCorrectDescription() {
+        Long id = 123L;
+        ReflectionTestUtils.setField(cmd, "id", id);
+        assertEquals("Download extension: 123", cmd.getEventDescription());
+    }
+
+}
diff --git a/...src/test/java/org/apache/cloudstack/framework/extensions/api/ListCustomActionCmdTest.java b/...src/test/java/org/apache/cloudstack/framework/extensions/api/ListCustomActionCmdTest.java
@@ -33,22 +33,24 @@
 import org.apache.cloudstack.api.response.ExtensionCustomActionResponse;
 import org.apache.cloudstack.api.response.ListResponse;
 import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
-import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
 import org.mockito.Mockito;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
+@RunWith(MockitoJUnitRunner.class)
 public class ListCustomActionCmdTest {
 
-    private ListCustomActionCmd cmd;
+    @Mock
     private ExtensionsManager extensionsManager;
 
-    @Before
-    public void setUp() {
-        cmd = new ListCustomActionCmd();
-        extensionsManager = mock(ExtensionsManager.class);
-        ReflectionTestUtils.setField(cmd, "extensionsManager", extensionsManager);
-    }
+    @Spy
+    @InjectMocks
+    private ListCustomActionCmd cmd;
 
     private void setField(String fieldName, Object value) {
         ReflectionTestUtils.setField(cmd, fieldName, value);
@@ -140,14 +142,10 @@ public void isEnabledReturnsFalseWhenSetFalse() {
     @Test
     public void executeSetsListResponse() {
         List<ExtensionCustomActionResponse> responses = Arrays.asList(mock(ExtensionCustomActionResponse.class));
-        when(extensionsManager.listCustomActions(cmd)).thenReturn(responses);
-
-        ListCustomActionCmd spyCmd = Mockito.spy(cmd);
-        doNothing().when(spyCmd).setResponseObject(any());
-
-        spyCmd.execute();
-
-        verify(extensionsManager).listCustomActions(spyCmd);
-        verify(spyCmd).setResponseObject(any(ListResponse.class));
+        when(extensionsManager.listCustomActions(any(ListCustomActionCmd.class))).thenReturn(responses);
+        doNothing().when(cmd).setResponseObject(any());
+        cmd.execute();
+        verify(extensionsManager).listCustomActions(cmd);
+        verify(cmd).setResponseObject(any(ListResponse.class));
     }
 }
diff --git a/...s/src/test/java/org/apache/cloudstack/framework/extensions/api/ListExtensionsCmdTest.java b/...s/src/test/java/org/apache/cloudstack/framework/extensions/api/ListExtensionsCmdTest.java
@@ -19,27 +19,41 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.doNothing;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
 
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.EnumSet;
 import java.util.List;
 
 import org.apache.cloudstack.api.ApiConstants;
-import org.junit.Before;
+import org.apache.cloudstack.api.response.ExtensionResponse;
+import org.apache.cloudstack.api.response.ListResponse;
+import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
 import com.cloud.exception.InvalidParameterValueException;
 
+@RunWith(MockitoJUnitRunner.class)
 public class ListExtensionsCmdTest {
 
-    private ListExtensionsCmd cmd;
 
-    @Before
-    public void setUp() {
-        cmd = new ListExtensionsCmd();
-    }
+    @Mock
+    private ExtensionsManager extensionsManager;
+
+    @Spy
+    @InjectMocks
+    private ListExtensionsCmd cmd;
 
     private void setPrivateField(String fieldName, Object value) {
         ReflectionTestUtils.setField(cmd, fieldName, value);
@@ -89,4 +103,14 @@ public void testGetDetailsWithInvalidValueThrowsException() {
         setPrivateField("details", detailsList);
         cmd.getDetails();
     }
+
+    @Test
+    public void executeSetsListResponse() {
+        List<ExtensionResponse> responses = Arrays.asList(mock(ExtensionResponse.class));
+        when(extensionsManager.listExtensions(any(ListExtensionsCmd.class))).thenReturn(responses);
+        doNothing().when(cmd).setResponseObject(any());
+        cmd.execute();
+        verify(extensionsManager).listExtensions(cmd);
+        verify(cmd).setResponseObject(any(ListResponse.class));
+    }
 }
diff --git a/...rc/test/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmdTest.java b/...rc/test/java/org/apache/cloudstack/framework/extensions/api/RegisterExtensionCmdTest.java
@@ -37,22 +37,23 @@
 import org.apache.cloudstack.api.response.ExtensionResponse;
 import org.apache.cloudstack.extension.Extension;
 import org.apache.cloudstack.framework.extensions.manager.ExtensionsManager;
-import org.junit.Before;
 import org.junit.Test;
-import org.mockito.Mockito;
+import org.junit.runner.RunWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Spy;
+import org.mockito.junit.MockitoJUnitRunner;
 import org.springframework.test.util.ReflectionTestUtils;
 
+@RunWith(MockitoJUnitRunner.class)
 public class RegisterExtensionCmdTest {
 
-    private RegisterExtensionCmd cmd;
+    @Mock
     private ExtensionsManager extensionsManager;
 
-    @Before
-    public void setUp() {
-        cmd = Mockito.spy(new RegisterExtensionCmd());
-        extensionsManager = mock(ExtensionsManager.class);
-        ReflectionTestUtils.setField(cmd, "extensionsManager", extensionsManager);
-    }
+    @Spy
+    @InjectMocks
+    private RegisterExtensionCmd cmd;
 
     @Test
     public void extensionIdReturnsNullWhenUnset() {