add test case

star-whale · Sep 9, 2022 · 5e473fa · 5e473fa
1 parent db7a329
commit 5e473fa
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 3 deletions.
diff --git a/server/controller/src/main/java/ai/starwhale/mlops/domain/task/TaskService.java b/server/controller/src/main/java/ai/starwhale/mlops/domain/task/TaskService.java
@@ -25,6 +25,7 @@
 import ai.starwhale.mlops.domain.job.po.JobEntity;
 import ai.starwhale.mlops.domain.system.mapper.ResourcePoolMapper;
 import ai.starwhale.mlops.domain.system.po.ResourcePoolEntity;
+import ai.starwhale.mlops.domain.system.resourcepool.bo.ResourcePool;
 import ai.starwhale.mlops.domain.task.converter.TaskConvertor;
 import ai.starwhale.mlops.domain.task.mapper.TaskMapper;
 import ai.starwhale.mlops.domain.task.po.TaskEntity;
@@ -68,9 +69,15 @@ public PageInfo<TaskVo> listTasks(String jobUrl, PageParams pageParams) {
         PageHelper.startPage(pageParams.getPageNum(), pageParams.getPageSize());
         Long jobId = jobManager.getJobId(jobUrl);
         JobEntity job = jobManager.findJob(Job.builder().id(jobId).build());
-        ResourcePoolEntity resourcePool = resourcePoolMapper.findById(job.getResourcePoolId());
+        Long resourcePoolId = job.getResourcePoolId();
+        String label = ResourcePool.DEFAULT;
+        if (null != resourcePoolId) {
+            ResourcePoolEntity resourcePool = resourcePoolMapper.findById(resourcePoolId);
+            label = resourcePool.getLabel();
+        }
+        final String resourcePool = label;
         List<TaskVo> tasks = taskMapper.listTasks(jobId).stream().map(taskConvertor::convert)
-                .peek(taskVo -> taskVo.setResourcePool(resourcePool.getLabel())).collect(
+                .peek(taskVo -> taskVo.setResourcePool(resourcePool)).collect(
                         Collectors.toList());
         return PageInfo.of(tasks);
 

diff --git a/server/controller/src/test/java/ai/starwhale/mlops/domain/task/TestTaskService.java b/server/controller/src/test/java/ai/starwhale/mlops/domain/task/TestTaskService.java
@@ -32,6 +32,7 @@
 import ai.starwhale.mlops.domain.job.po.JobEntity;
 import ai.starwhale.mlops.domain.system.mapper.ResourcePoolMapper;
 import ai.starwhale.mlops.domain.system.po.ResourcePoolEntity;
+import ai.starwhale.mlops.domain.system.resourcepool.bo.ResourcePool;
 import ai.starwhale.mlops.domain.task.converter.TaskConvertor;
 import ai.starwhale.mlops.domain.task.mapper.TaskMapper;
 import ai.starwhale.mlops.domain.task.po.TaskEntity;
@@ -72,7 +73,7 @@ public void setup() {
     }
 
     @Test
-    public void testListTask() {
+    public void testListTaskWithResourcePool() {
         when(jobManager.getJobId(anyString())).thenReturn(1L);
         when(jobManager.findJob(any())).thenReturn(JobEntity.builder().resourcePoolId(1L).build());
         when(resourcePoolMapper.findById(1L)).thenReturn(ResourcePoolEntity.builder().id(1L).label("LABEL").build());
@@ -98,4 +99,30 @@ public void testListTask() {
 
     }
 
+    @Test
+    public void testListTaskWithoutResourcePool() {
+        when(jobManager.getJobId(anyString())).thenReturn(1L);
+        when(jobManager.findJob(any())).thenReturn(JobEntity.builder().build());
+        LocalDateTime startedTime = LocalDateTime.of(2022, 9, 9, 9, 9);
+        when(taskMapper.listTasks(1L)).thenReturn(
+                List.of(TaskEntity.builder().id(1L).startedTime(startedTime).taskUuid("uuid1")
+                                .taskStatus(
+                                        TaskStatus.RUNNING).build(),
+                        TaskEntity.builder().id(2L).startedTime(startedTime).taskUuid("uuid2")
+                                .taskStatus(
+                                        TaskStatus.SUCCESS).build()));
+        PageInfo<TaskVo> taskVoPageInfo = taskService.listTasks("",
+                PageParams.builder().pageNum(0).pageSize(3).build());
+        Assertions.assertEquals(1, taskVoPageInfo.getPages());
+        Assertions.assertEquals(2, taskVoPageInfo.getSize());
+        Assertions.assertEquals(2, taskVoPageInfo.getList().size());
+        assertThat(taskVoPageInfo.getList(), containsInAnyOrder(
+                TaskVo.builder().id("1").createdTime(localDateTimeConvertor.convert(startedTime)).uuid("uuid1")
+                        .taskStatus(TaskStatus.RUNNING).resourcePool(ResourcePool.DEFAULT).build(),
+                TaskVo.builder().id("2").createdTime(localDateTimeConvertor.convert(startedTime)).uuid("uuid2")
+                        .taskStatus(TaskStatus.SUCCESS).resourcePool(ResourcePool.DEFAULT).build()));
+
+
+    }
+
 }