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 c415b9373ab3ceb69fbef0a2bb6adcf9712580c8 Author: tomsun28 <[email protected]> AuthorDate: Sun Oct 26 23:25:20 2025 +0800 fix Signed-off-by: tomsun28 <[email protected]> --- .../java/org/apache/hertzbeat/startup}/dao/CollectorDaoTest.java | 8 ++++---- .../test/java/org/apache/hertzbeat/startup}/dao/LabelDaoTest.java | 8 ++++---- .../org/apache/hertzbeat/startup}/dao/MetricsFavoriteDaoTest.java | 7 ++++--- .../java/org/apache/hertzbeat/startup}/dao/MonitorDaoTest.java | 8 ++++---- .../java/org/apache/hertzbeat/startup}/dao/NoticeRuleDaoTest.java | 7 +++---- .../test/java/org/apache/hertzbeat/startup}/dao/ParamDaoTest.java | 8 ++++---- .../org/apache/hertzbeat/startup}/dao/ParamDefineDaoTest.java | 8 ++++---- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/CollectorDaoTest.java b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/CollectorDaoTest.java similarity index 90% rename from hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/CollectorDaoTest.java rename to hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/CollectorDaoTest.java index 5f8b963c2..9d4ea3403 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/CollectorDaoTest.java +++ b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/CollectorDaoTest.java @@ -15,17 +15,18 @@ * limitations under the License. */ -package org.apache.hertzbeat.manager.dao; +package org.apache.hertzbeat.startup.dao; import static org.junit.jupiter.api.Assertions.assertNotNull; 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.dao.CollectorDao; +import org.apache.hertzbeat.startup.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,8 +35,7 @@ import java.util.List; * Test case for {@link CollectorDao} */ @Transactional -@DataJpaTest -public class CollectorDaoTest { +public class CollectorDaoTest extends AbstractSpringIntegrationTest { @Resource private CollectorDao collectorDao; diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/LabelDaoTest.java b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/LabelDaoTest.java similarity index 92% rename from hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/LabelDaoTest.java rename to hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/LabelDaoTest.java index 6fa565c05..9c57ad3f3 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/LabelDaoTest.java +++ b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/LabelDaoTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.manager.dao; +package org.apache.hertzbeat.startup.dao; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; @@ -27,18 +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.dao.LabelDao; +import org.apache.hertzbeat.startup.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 -@DataJpaTest -class LabelDaoTest { +class LabelDaoTest extends AbstractSpringIntegrationTest { @Resource private LabelDao labelDao; diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/MetricsFavoriteDaoTest.java b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/MetricsFavoriteDaoTest.java similarity index 97% rename from hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/MetricsFavoriteDaoTest.java rename to hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/MetricsFavoriteDaoTest.java index 1f478f3e9..82a3e52dc 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/MetricsFavoriteDaoTest.java +++ b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/MetricsFavoriteDaoTest.java @@ -15,10 +15,12 @@ * limitations under the License. */ -package org.apache.hertzbeat.manager.dao; +package org.apache.hertzbeat.startup.dao; import jakarta.annotation.Resource; import org.apache.hertzbeat.common.entity.manager.MetricsFavorite; +import org.apache.hertzbeat.manager.dao.MetricsFavoriteDao; +import org.apache.hertzbeat.startup.AbstractSpringIntegrationTest; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.springframework.boot.test.autoconfigure.orm.jpa.DataJpaTest; @@ -41,9 +43,8 @@ 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 { +class MetricsFavoriteDaoTest extends AbstractSpringIntegrationTest { @Resource private MetricsFavoriteDao metricsFavoriteDao; diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/MonitorDaoTest.java b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/MonitorDaoTest.java similarity index 94% rename from hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/MonitorDaoTest.java rename to hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/MonitorDaoTest.java index c49bbdba4..ef9612ea6 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/MonitorDaoTest.java +++ b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/MonitorDaoTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.manager.dao; +package org.apache.hertzbeat.startup.dao; import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertEquals; @@ -29,19 +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.dao.MonitorDao; import org.apache.hertzbeat.manager.pojo.dto.AppCount; +import org.apache.hertzbeat.startup.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 MonitorDao} */ @Transactional -@DataJpaTest -class MonitorDaoTest { +class MonitorDaoTest extends AbstractSpringIntegrationTest { @Resource private MonitorDao monitorDao; diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/NoticeRuleDaoTest.java b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/NoticeRuleDaoTest.java similarity index 94% rename from hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/NoticeRuleDaoTest.java rename to hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/NoticeRuleDaoTest.java index e6eff4b7d..a47195868 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/NoticeRuleDaoTest.java +++ b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/NoticeRuleDaoTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.manager.dao; +package org.apache.hertzbeat.startup.dao; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -24,18 +24,17 @@ 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.startup.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 -@DataJpaTest -class NoticeRuleDaoTest { +class NoticeRuleDaoTest extends AbstractSpringIntegrationTest { @Resource private NoticeRuleDao noticeRuleDao; diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDaoTest.java b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/ParamDaoTest.java similarity index 94% rename from hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDaoTest.java rename to hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/ParamDaoTest.java index a266658fd..6580af71f 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDaoTest.java +++ b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/ParamDaoTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.manager.dao; +package org.apache.hertzbeat.startup.dao; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -25,18 +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.dao.ParamDao; +import org.apache.hertzbeat.startup.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 -@DataJpaTest -class ParamDaoTest { +class ParamDaoTest extends AbstractSpringIntegrationTest { @Resource private ParamDao paramDao; diff --git a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDefineDaoTest.java b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/ParamDefineDaoTest.java similarity index 91% rename from hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDefineDaoTest.java rename to hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/ParamDefineDaoTest.java index f2c36afc1..1d836878b 100644 --- a/hertzbeat-manager/src/test/java/org/apache/hertzbeat/manager/dao/ParamDefineDaoTest.java +++ b/hertzbeat-startup/src/test/java/org/apache/hertzbeat/startup/dao/ParamDefineDaoTest.java @@ -15,7 +15,7 @@ * limitations under the License. */ -package org.apache.hertzbeat.manager.dao; +package org.apache.hertzbeat.startup.dao; import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; @@ -24,18 +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.dao.ParamDefineDao; +import org.apache.hertzbeat.startup.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 -@DataJpaTest -class ParamDefineDaoTest { +class ParamDefineDaoTest extends AbstractSpringIntegrationTest { @Resource private ParamDefineDao paramDefineDao; --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
