✅ 增加 infra logger 模块的单测覆盖率

YunaiV · Dec 4, 2023 · a62399f · a62399f
1 parent da829f7
commit a62399f
Show file tree

Hide file tree

Showing 5 changed files with 71 additions and 19 deletions.
diff --git a/...-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobService.java b/...-module-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobService.java
@@ -7,8 +7,6 @@
 import org.quartz.SchedulerException;
 
 import javax.validation.Valid;
-import java.util.Collection;
-import java.util.List;
 
 /**
  * 定时任务 Service 接口
@@ -62,14 +60,6 @@ public interface JobService {
      */
     JobDO getJob(Long id);
 
-    /**
-     * 获得定时任务列表
-     *
-     * @param ids 编号
-     * @return 定时任务列表
-     */
-    List<JobDO> getJobList(Collection<Long> ids);
-
     /**
      * 获得定时任务分页
      *

diff --git a/...ule-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImpl.java b/...ule-infra-biz/src/main/java/cn/iocoder/yudao/module/infra/service/job/JobServiceImpl.java
@@ -147,11 +147,6 @@ public JobDO getJob(Long id) {
         return jobMapper.selectById(id);
     }
 
-    @Override
-    public List<JobDO> getJobList(Collection<Long> ids) {
-        return jobMapper.selectBatchIds(ids);
-    }
-
     @Override
     public PageResult<JobDO> getJobPage(JobPageReqVO pageReqVO) {
 		return jobMapper.selectPage(pageReqVO);

diff --git a/...ra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobLogServiceImplTest.java b/...ra-biz/src/test/java/cn/iocoder/yudao/module/infra/service/job/JobLogServiceImplTest.java
@@ -10,8 +10,11 @@
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
+import java.time.Duration;
 import java.time.LocalDateTime;
+import java.util.List;
 
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.addTime;
 import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
@@ -92,6 +95,28 @@ public void testUpdateJobLogResultAsync_failure() {
         assertEquals(result, dbLog.getResult());
     }
 
+    @Test
+    public void testCleanJobLog() {
+        // mock 数据
+        JobLogDO log01 = randomPojo(JobLogDO.class, o -> o.setCreateTime(addTime(Duration.ofDays(-3))))
+                .setExecuteIndex(1);
+        jobLogMapper.insert(log01);
+        JobLogDO log02 = randomPojo(JobLogDO.class, o -> o.setCreateTime(addTime(Duration.ofDays(-1))))
+                .setExecuteIndex(1);
+        jobLogMapper.insert(log02);
+        // 准备参数
+        Integer exceedDay = 2;
+        Integer deleteLimit = 1;
+
+        // 调用
+        Integer count = jobLogService.cleanJobLog(exceedDay, deleteLimit);
+        // 断言
+        assertEquals(1, count);
+        List<JobLogDO> logs = jobLogMapper.selectList();
+        assertEquals(1, logs.size());
+        assertEquals(log02, logs.get(0));
+    }
+
     @Test
     public void testGetJobLog() {
         // mock 数据

diff --git a/...c/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java b/...c/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiAccessLogServiceImplTest.java
@@ -12,9 +12,10 @@
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
+import java.time.Duration;
+import java.util.List;
 
-import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
-import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo;
@@ -73,6 +74,26 @@ public void testGetApiAccessLogPage() {
         assertPojoEquals(apiAccessLogDO, pageResult.getList().get(0));
     }
 
+    @Test
+    public void testCleanJobLog() {
+        // mock 数据
+        ApiAccessLogDO log01 = randomPojo(ApiAccessLogDO.class, o -> o.setCreateTime(addTime(Duration.ofDays(-3))));
+        apiAccessLogMapper.insert(log01);
+        ApiAccessLogDO log02 = randomPojo(ApiAccessLogDO.class, o -> o.setCreateTime(addTime(Duration.ofDays(-1))));
+        apiAccessLogMapper.insert(log02);
+        // 准备参数
+        Integer exceedDay = 2;
+        Integer deleteLimit = 1;
+
+        // 调用
+        Integer count = apiAccessLogService.cleanAccessLog(exceedDay, deleteLimit);
+        // 断言
+        assertEquals(1, count);
+        List<ApiAccessLogDO> logs = apiAccessLogMapper.selectList();
+        assertEquals(1, logs.size());
+        assertEquals(log02, logs.get(0));
+    }
+
     @Test
     public void testCreateApiAccessLog() {
         // 准备参数

diff --git a/...rc/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImplTest.java b/...rc/test/java/cn/iocoder/yudao/module/infra/service/logger/ApiErrorLogServiceImplTest.java
@@ -12,10 +12,11 @@
 import org.springframework.context.annotation.Import;
 
 import javax.annotation.Resource;
+import java.time.Duration;
+import java.util.List;
 
 import static cn.hutool.core.util.RandomUtil.randomEle;
-import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildBetweenTime;
-import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.buildTime;
+import static cn.iocoder.yudao.framework.common.util.date.LocalDateTimeUtils.*;
 import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals;
 import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException;
@@ -139,4 +140,24 @@ public void testUpdateApiErrorLogProcess_notFound() {
                 API_ERROR_LOG_NOT_FOUND);
     }
 
+    @Test
+    public void testCleanJobLog() {
+        // mock 数据
+        ApiErrorLogDO log01 = randomPojo(ApiErrorLogDO.class, o -> o.setCreateTime(addTime(Duration.ofDays(-3))));
+        apiErrorLogMapper.insert(log01);
+        ApiErrorLogDO log02 = randomPojo(ApiErrorLogDO.class, o -> o.setCreateTime(addTime(Duration.ofDays(-1))));
+        apiErrorLogMapper.insert(log02);
+        // 准备参数
+        Integer exceedDay = 2;
+        Integer deleteLimit = 1;
+
+        // 调用
+        Integer count = apiErrorLogService.cleanErrorLog(exceedDay, deleteLimit);
+        // 断言
+        assertEquals(1, count);
+        List<ApiErrorLogDO> logs = apiErrorLogMapper.selectList();
+        assertEquals(1, logs.size());
+        assertEquals(log02, logs.get(0));
+    }
+
 }