This is an automated email from the ASF dual-hosted git repository. gongchao pushed a commit to branch new-startup in repository https://gitbox.apache.org/repos/asf/hertzbeat.git
commit e3075bab8a2a36dc0b14a2a05d92385e2af0e3a6 Author: tomsun28 <[email protected]> AuthorDate: Sun Oct 26 00:30:57 2025 +0800 fix Signed-off-by: tomsun28 <[email protected]> --- .../org/apache/hertzbeat/manager/dao/CollectorDaoTest.java | 5 +++-- .../java/org/apache/hertzbeat/manager/dao/LabelDaoTest.java | 5 +++-- .../hertzbeat/manager/dao/MetricsFavoriteDaoTest.java | 7 ++++--- .../org/apache/hertzbeat/manager/dao/MonitorDaoTest.java | 5 +++-- .../org/apache/hertzbeat/manager/dao/NoticeRuleDaoTest.java | 5 +++-- .../java/org/apache/hertzbeat/manager/dao/ParamDaoTest.java | 5 +++-- .../apache/hertzbeat/manager/dao/ParamDefineDaoTest.java | 5 +++-- ...viceIntegrationTest.java => AlertDefineServiceTest.java} | 13 +++++++------ 8 files changed, 29 insertions(+), 21 deletions(-) diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/CollectorDaoTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/CollectorDaoTest.java index 997ebeaa5..5f8b963c2 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/CollectorDaoTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/CollectorDaoTest.java @@ -22,10 +22,10 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import static org.junit.jupiter.api.Assertions.assertFalse; import javax.annotation.Resource; import org.apache.hertzbeat.common.entity.manager.Collector; -import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.transaction.annotation.Transactional; import java.util.List; @@ -34,7 +34,8 @@ import java.util.List; * Test case for {@link CollectorDao} */ @Transactional -public class CollectorDaoTest extends AbstractSpringIntegrationTest { +@DataJpaTest +public class CollectorDaoTest { @Resource private CollectorDao collectorDao; diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/LabelDaoTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/LabelDaoTest.java index ccd312642..6fa565c05 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/LabelDaoTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/LabelDaoTest.java @@ -27,17 +27,18 @@ import java.util.List; import java.util.Set; import java.util.stream.Collectors; import org.apache.hertzbeat.common.entity.manager.Label; -import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.transaction.annotation.Transactional; /** * Test case for {@link LabelDao} */ @Transactional -class LabelDaoTest extends AbstractSpringIntegrationTest { +@DataJpaTest +class LabelDaoTest { @Resource private LabelDao labelDao; diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/MetricsFavoriteDaoTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/MetricsFavoriteDaoTest.java index c9a1b3beb..1f478f3e9 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/MetricsFavoriteDaoTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/MetricsFavoriteDaoTest.java @@ -19,9 +19,9 @@ package org.apache.hertzbeat.manager.dao; import jakarta.annotation.Resource; import org.apache.hertzbeat.common.entity.manager.MetricsFavorite; -import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.test.annotation.DirtiesContext; import org.springframework.transaction.annotation.Transactional; @@ -41,8 +41,9 @@ import static org.junit.jupiter.api.Assertions.assertTrue; * Test case for {@link MetricsFavoriteDao} */ @Transactional +@DataJpaTest @DirtiesContext(classMode = DirtiesContext.ClassMode.AFTER_EACH_TEST_METHOD) -class MetricsFavoriteDaoTest extends AbstractSpringIntegrationTest { +class MetricsFavoriteDaoTest { @Resource private MetricsFavoriteDao metricsFavoriteDao; @@ -206,4 +207,4 @@ class MetricsFavoriteDaoTest extends AbstractSpringIntegrationTest { metricsFavoriteDao.saveAndFlush(duplicate); }); } -} \ No newline at end of file +} diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/MonitorDaoTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/MonitorDaoTest.java index 844d32bf8..c49bbdba4 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/MonitorDaoTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/MonitorDaoTest.java @@ -29,18 +29,19 @@ import java.util.List; import java.util.Optional; import java.util.Set; import org.apache.hertzbeat.common.entity.manager.Monitor; -import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.apache.hertzbeat.manager.pojo.dto.AppCount; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.transaction.annotation.Transactional; /** * Test case for {@link MonitorDao} */ @Transactional -class MonitorDaoTest extends AbstractSpringIntegrationTest { +@DataJpaTest +class MonitorDaoTest { @Resource private MonitorDao monitorDao; diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/NoticeRuleDaoTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/NoticeRuleDaoTest.java index fbda372ab..e6eff4b7d 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/NoticeRuleDaoTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/NoticeRuleDaoTest.java @@ -24,17 +24,18 @@ import java.time.LocalDateTime; import java.util.List; import org.apache.hertzbeat.alert.dao.NoticeRuleDao; import org.apache.hertzbeat.common.entity.alerter.NoticeRule; -import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.transaction.annotation.Transactional; /** * Test case for {@link NoticeRuleDao} */ @Transactional -class NoticeRuleDaoTest extends AbstractSpringIntegrationTest { +@DataJpaTest +class NoticeRuleDaoTest { @Resource private NoticeRuleDao noticeRuleDao; diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDaoTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDaoTest.java index b379b866a..a266658fd 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDaoTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDaoTest.java @@ -25,17 +25,18 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import org.apache.hertzbeat.common.entity.manager.Param; -import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.transaction.annotation.Transactional; /** * Test case for {@link ParamDao} */ @Transactional -class ParamDaoTest extends AbstractSpringIntegrationTest { +@DataJpaTest +class ParamDaoTest { @Resource private ParamDao paramDao; diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDefineDaoTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDefineDaoTest.java index 6fe0eeaaa..f2c36afc1 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDefineDaoTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDefineDaoTest.java @@ -24,17 +24,18 @@ import java.util.Collections; import java.util.HashMap; import java.util.List; import org.apache.hertzbeat.common.entity.manager.ParamDefine; -import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; import org.springframework.transaction.annotation.Transactional; /** * Test case for {@link ParamDefineDao} */ @Transactional -class ParamDefineDaoTest extends AbstractSpringIntegrationTest { +@DataJpaTest +class ParamDefineDaoTest { @Resource private ParamDefineDao paramDefineDao; diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/AlertDefineServiceIntegrationTest.java b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/AlertDefineServiceTest.java similarity index 94% rename from hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/AlertDefineServiceIntegrationTest.java rename to hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/AlertDefineServiceTest.java index cabde6336..2d7810d41 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/AlertDefineServiceIntegrationTest.java +++ b/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/service/AlertDefineServiceTest.java @@ -20,11 +20,11 @@ package org.apache.hertzbeat.manager.service; import org.apache.hertzbeat.alert.dao.AlertDefineDao; import org.apache.hertzbeat.alert.service.AlertDefineService; import org.apache.hertzbeat.common.entity.alerter.AlertDefine; -import org.apache.hertzbeat.manager.AbstractSpringIntegrationTest; import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; -import org.springframework.beans.factory.annotation.Autowired; +import org.mockito.InjectMocks; +import org.mockito.Mock; import java.time.LocalDateTime; import java.util.ArrayList; @@ -39,11 +39,12 @@ import static org.junit.jupiter.api.Assertions.assertTrue; /** * Test case for {@link AlertDefineService} */ -public class AlertDefineServiceIntegrationTest extends AbstractSpringIntegrationTest { +public class AlertDefineServiceTest { - @Autowired + @InjectMocks private AlertDefineService alertDefineService; - @Autowired + + @Mock private AlertDefineDao alertDefineDao; private List<Long> createdIds = new ArrayList<>(); @@ -120,4 +121,4 @@ public class AlertDefineServiceIntegrationTest extends AbstractSpringIntegration assertEquals("integration-test", savedAlertDefine.getCreator()); } -} \ No newline at end of file +} --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
