Add ut cases for command job classes in server module.

apache · Feb 20, 2025 · 04079a1 · 04079a1
1 parent 3fc2812
commit 04079a1
Show file tree

Hide file tree

Showing 26 changed files with 3,600 additions and 8 deletions.
diff --git a/...rc/main/java/org/apache/bigtop/manager/server/command/job/cluster/AbstractClusterJob.java b/...rc/main/java/org/apache/bigtop/manager/server/command/job/cluster/AbstractClusterJob.java
@@ -23,6 +23,7 @@
 import org.apache.bigtop.manager.dao.repository.ComponentDao;
 import org.apache.bigtop.manager.server.command.job.AbstractJob;
 import org.apache.bigtop.manager.server.command.job.JobContext;
+import org.apache.bigtop.manager.server.command.stage.Stage;
 import org.apache.bigtop.manager.server.holder.SpringContextHolder;
 
 import java.util.ArrayList;
@@ -62,4 +63,9 @@ protected Map<String, List<String>> getComponentHostsMap() {
 
         return componentHostsMap;
     }
+
+    protected void setJobContextAndStagesForTest(JobContext jobContext, List<Stage> stages) {
+        this.jobContext = jobContext;
+        this.stages = stages;
+    }
 }
diff --git a/...ver/src/main/java/org/apache/bigtop/manager/server/command/job/cluster/ClusterAddJob.java b/...ver/src/main/java/org/apache/bigtop/manager/server/command/job/cluster/ClusterAddJob.java
@@ -21,7 +21,6 @@
 import org.apache.bigtop.manager.dao.po.JobPO;
 import org.apache.bigtop.manager.dao.po.StagePO;
 import org.apache.bigtop.manager.dao.po.TaskPO;
-import org.apache.bigtop.manager.server.command.job.AbstractJob;
 import org.apache.bigtop.manager.server.command.job.JobContext;
 import org.apache.bigtop.manager.server.command.stage.HostCheckStage;
 import org.apache.bigtop.manager.server.command.stage.SetupJdkStage;
@@ -38,7 +37,7 @@
 
 import java.util.List;
 
-public class ClusterAddJob extends AbstractJob {
+public class ClusterAddJob extends AbstractClusterJob {
 
     private HostService hostService;
 
@@ -92,7 +91,7 @@ public String getName() {
         return "Add cluster";
     }
 
-    private void saveCluster() {
+    protected void saveCluster() {
         CommandDTO commandDTO = jobContext.getCommandDTO();
         ClusterDTO clusterDTO = ClusterConverter.INSTANCE.fromCommand2DTO(commandDTO.getClusterCommand());
         clusterPO = clusterDao.findByName(clusterDTO.getName());
@@ -104,7 +103,7 @@ private void saveCluster() {
         clusterDao.save(clusterPO);
     }
 
-    private void saveHosts() {
+    protected void saveHosts() {
         CommandDTO commandDTO = jobContext.getCommandDTO();
         List<HostDTO> hostDTOList = commandDTO.getClusterCommand().getHosts();
         for (HostDTO hostDTO : hostDTOList) {
@@ -113,7 +112,7 @@ private void saveHosts() {
         }
     }
 
-    private void linkJobToCluster() {
+    protected void linkJobToCluster() {
         JobPO jobPO = getJobPO();
         jobPO.setClusterId(clusterPO.getId());
         jobDao.partialUpdateById(jobPO);

diff --git a/...ain/java/org/apache/bigtop/manager/server/command/job/component/AbstractComponentJob.java b/...ain/java/org/apache/bigtop/manager/server/command/job/component/AbstractComponentJob.java
@@ -23,6 +23,7 @@
 import org.apache.bigtop.manager.dao.repository.ServiceDao;
 import org.apache.bigtop.manager.server.command.job.AbstractJob;
 import org.apache.bigtop.manager.server.command.job.JobContext;
+import org.apache.bigtop.manager.server.command.stage.Stage;
 import org.apache.bigtop.manager.server.holder.SpringContextHolder;
 
 import java.util.HashMap;
@@ -64,4 +65,9 @@ protected Map<String, List<String>> getComponentHostsMap() {
 
         return componentHostsMap;
     }
+
+    protected void setJobContextAndStagesForTest(JobContext jobContext, List<Stage> stages) {
+        this.jobContext = jobContext;
+        this.stages = stages;
+    }
 }
diff --git a/...src/main/java/org/apache/bigtop/manager/server/command/job/component/ComponentAddJob.java b/...src/main/java/org/apache/bigtop/manager/server/command/job/component/ComponentAddJob.java
@@ -84,7 +84,7 @@ public String getName() {
         return "Add components";
     }
 
-    private void saveComponents(ComponentCommandDTO componentCommand) {
+    protected void saveComponents(ComponentCommandDTO componentCommand) {
         Long clusterId = jobContext.getCommandDTO().getClusterId();
         String componentName = componentCommand.getComponentName();
         ServiceDTO serviceDTO = StackUtils.getServiceDTOByComponentName(componentName);

diff --git a/...rver/src/main/java/org/apache/bigtop/manager/server/command/job/host/AbstractHostJob.java b/...rver/src/main/java/org/apache/bigtop/manager/server/command/job/host/AbstractHostJob.java
@@ -23,6 +23,7 @@
 import org.apache.bigtop.manager.dao.repository.ComponentDao;
 import org.apache.bigtop.manager.server.command.job.AbstractJob;
 import org.apache.bigtop.manager.server.command.job.JobContext;
+import org.apache.bigtop.manager.server.command.stage.Stage;
 import org.apache.bigtop.manager.server.holder.SpringContextHolder;
 
 import java.util.ArrayList;
@@ -71,4 +72,9 @@ private List<String> getHostnames() {
                 .flatMap(hostCommandDTO -> hostCommandDTO.getHostnames().stream())
                 .toList();
     }
+
+    protected void setJobContextAndStagesForTest(JobContext jobContext, List<Stage> stages) {
+        this.jobContext = jobContext;
+        this.stages = stages;
+    }
 }
diff --git a/...er-server/src/main/java/org/apache/bigtop/manager/server/command/job/host/HostAddJob.java b/...er-server/src/main/java/org/apache/bigtop/manager/server/command/job/host/HostAddJob.java
@@ -68,7 +68,7 @@ public String getName() {
         return "Add hosts";
     }
 
-    private void saveHosts() {
+    protected void saveHosts() {
         CommandDTO commandDTO = jobContext.getCommandDTO();
         List<HostDTO> hostDTOList = HostConverter.INSTANCE.fromCommand2DTO(commandDTO.getHostCommands());
         for (HostDTO hostDTO : hostDTOList) {

diff --git a/...rc/main/java/org/apache/bigtop/manager/server/command/job/service/AbstractServiceJob.java b/...rc/main/java/org/apache/bigtop/manager/server/command/job/service/AbstractServiceJob.java
@@ -27,6 +27,7 @@
 import org.apache.bigtop.manager.dao.repository.ServiceDao;
 import org.apache.bigtop.manager.server.command.job.AbstractJob;
 import org.apache.bigtop.manager.server.command.job.JobContext;
+import org.apache.bigtop.manager.server.command.stage.Stage;
 import org.apache.bigtop.manager.server.holder.SpringContextHolder;
 import org.apache.bigtop.manager.server.model.dto.command.ServiceCommandDTO;
 
@@ -84,4 +85,9 @@ private List<String> getServiceNames() {
                 .map(ServiceCommandDTO::getServiceName)
                 .toList();
     }
+
+    protected void setJobContextAndStagesForTest(JobContext jobContext, List<Stage> stages) {
+        this.jobContext = jobContext;
+        this.stages = stages;
+    }
 }
diff --git a/...ver/src/main/java/org/apache/bigtop/manager/server/command/job/service/ServiceAddJob.java b/...ver/src/main/java/org/apache/bigtop/manager/server/command/job/service/ServiceAddJob.java
@@ -135,7 +135,7 @@ public String getName() {
         return "Add services";
     }
 
-    private void saveService(ServiceCommandDTO serviceCommand) {
+    protected void saveService(ServiceCommandDTO serviceCommand) {
         CommandDTO commandDTO = jobContext.getCommandDTO();
         Long clusterId = commandDTO.getClusterId();
         String serviceName = serviceCommand.getServiceName();