From 1f4ec69d70e901ec2d8d862e4b79022574a30c79 Mon Sep 17 00:00:00 2001 From: gaoqr <13665037151@163.com> Date: Tue, 28 Oct 2025 17:11:16 +0800 Subject: [PATCH] =?UTF-8?q?=E5=B9=BF=E5=91=8A=E7=AE=A1=E7=90=86=E5=8D=95?= =?UTF-8?q?=E5=85=83=E6=B5=8B=E8=AF=95=E5=AE=8C=E5=96=84=EF=BC=9Aposition?= =?UTF-8?q?=E9=AD=94=E5=80=BC=E7=94=A8=E6=9E=9A=E4=B8=BE=E6=9B=BF=E6=8D=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../AdvertisementControllerTest.java | 5 ++-- .../AdvertisementServiceImplTest.java | 23 ++++++++++++------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/controller/admin/funds/advertisement/AdvertisementControllerTest.java b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/controller/admin/funds/advertisement/AdvertisementControllerTest.java index 271d45b1b..446240862 100644 --- a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/controller/admin/funds/advertisement/AdvertisementControllerTest.java +++ b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/controller/admin/funds/advertisement/AdvertisementControllerTest.java @@ -5,6 +5,7 @@ import com.cf.imes.module.system.controller.admin.funds.advertisement.vo.Adverti import com.cf.imes.module.system.controller.admin.funds.advertisement.vo.AdvertisementRePublishReqVO; import com.cf.imes.module.system.controller.admin.funds.advertisement.vo.AdvertisementRespVO; import com.cf.imes.module.system.controller.admin.funds.advertisement.vo.AdvertisementSaveReqVO; +import com.cf.imes.module.system.enums.advertisement.AdvertisementPositionEnum; import com.cf.imes.module.system.service.funds.advertisement.AdvertisementService; import com.fasterxml.jackson.databind.ObjectMapper; import org.junit.jupiter.api.Test; @@ -52,7 +53,7 @@ public class AdvertisementControllerTest { void testCreateAdvertisement() throws Exception { AdvertisementSaveReqVO reqVO = new AdvertisementSaveReqVO(); reqVO.setAdName("测试广告"); - reqVO.setAdPosition(List.of(1)); + reqVO.setAdPosition(List.of(AdvertisementPositionEnum.WORKBENCH_CAROUSEL.getStatus())); reqVO.setAdImagePath("test.jpg"); LocalDate now = LocalDate.now(); reqVO.setStartTime(now); @@ -74,7 +75,7 @@ public class AdvertisementControllerTest { AdvertisementSaveReqVO reqVO = new AdvertisementSaveReqVO(); reqVO.setId(1L); reqVO.setAdName("测试更新广告"); - reqVO.setAdPosition(List.of(1)); + reqVO.setAdPosition(List.of(AdvertisementPositionEnum.WORKBENCH_CAROUSEL.getStatus())); reqVO.setAdImagePath("test.jpg"); LocalDate now = LocalDate.now(); reqVO.setStartTime(now); diff --git a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/funds/advertisement/AdvertisementServiceImplTest.java b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/funds/advertisement/AdvertisementServiceImplTest.java index c94f29050..4303b1dba 100644 --- a/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/funds/advertisement/AdvertisementServiceImplTest.java +++ b/cf-module-system/cf-module-system-biz/src/test/java/com/cf/imes/module/system/service/funds/advertisement/AdvertisementServiceImplTest.java @@ -9,6 +9,7 @@ import com.cf.imes.module.system.controller.admin.funds.advertisement.vo.Adverti import com.cf.imes.module.system.controller.admin.funds.advertisement.vo.AdvertisementSaveReqVO; import com.cf.imes.module.system.dal.dataobject.funds.advertisement.AdvertisementDO; import com.cf.imes.module.system.dal.mysql.funds.advertisement.AdvertisementMapper; +import com.cf.imes.module.system.enums.advertisement.AdvertisementPositionEnum; import com.cf.imes.module.system.enums.advertisement.AdvertisementStatusEnum; import jakarta.annotation.Resource; import org.junit.jupiter.api.MethodOrderer; @@ -95,7 +96,9 @@ public class AdvertisementServiceImplTest extends BaseDbAndRedisUnitTest { reqVO.setStartTime(LocalDate.now()); reqVO.setEndTime(LocalDate.now().plusDays(1)); reqVO.setAdName("Ad-CREATE-1"); - reqVO.setAdPosition(List.of(3, 1, 3)); + reqVO.setAdPosition(List.of(AdvertisementPositionEnum.BASECONFIG_FUNDSQUERY_CAROUSEL.getStatus() + , AdvertisementPositionEnum.WORKBENCH_CAROUSEL.getStatus() + , AdvertisementPositionEnum.BASECONFIG_FUNDSQUERY_CAROUSEL.getStatus())); reqVO.setAdImagePath("https://example.com/image.png"); Long id = advertisementService.create(reqVO); @@ -105,7 +108,7 @@ public class AdvertisementServiceImplTest extends BaseDbAndRedisUnitTest { // 验证id assertEquals(insertedOne.getId(), id); // 验证 adPosition 去重排序 - assertEquals(List.of(1, 3), insertedOne.getAdPosition()); + assertEquals(List.of(AdvertisementPositionEnum.WORKBENCH_CAROUSEL.getStatus(), AdvertisementPositionEnum.BASECONFIG_FUNDSQUERY_CAROUSEL.getStatus()), insertedOne.getAdPosition()); // 验证状态 assertEquals(AdvertisementStatusEnum.UNPUBLISHED.getStatus(), insertedOne.getStatus()); // 验证名称 @@ -139,7 +142,9 @@ public class AdvertisementServiceImplTest extends BaseDbAndRedisUnitTest { reqVO.setStartTime(LocalDate.now()); reqVO.setEndTime(LocalDate.now().plusDays(1)); reqVO.setAdName("Ad-CREATE-2"); - reqVO.setAdPosition(List.of(3, 1, 3)); + reqVO.setAdPosition(List.of(AdvertisementPositionEnum.BASECONFIG_FUNDSQUERY_CAROUSEL.getStatus() + , AdvertisementPositionEnum.WORKBENCH_CAROUSEL.getStatus() + , AdvertisementPositionEnum.BASECONFIG_FUNDSQUERY_CAROUSEL.getStatus())); reqVO.setAdImagePath("https://example.com/image.png"); insertTwoId = advertisementService.create(reqVO); @@ -161,14 +166,16 @@ public class AdvertisementServiceImplTest extends BaseDbAndRedisUnitTest { updateReqVO.setStartTime(LocalDate.now()); updateReqVO.setEndTime(LocalDate.now().plusDays(1)); updateReqVO.setAdName("Ad-UPDATE-1"); - updateReqVO.setAdPosition(List.of(1,3)); + updateReqVO.setAdPosition(List.of(AdvertisementPositionEnum.WORKBENCH_CAROUSEL.getStatus() + , AdvertisementPositionEnum.BASECONFIG_FUNDSQUERY_CAROUSEL.getStatus())); updateReqVO.setAdImagePath("https://example.com/image.jpg"); advertisementService.update(updateReqVO); AdvertisementDO db = advertisementMapper.selectById(insertedOne.getId()); assertEquals(db.getAdName(), "Ad-UPDATE-1"); - assertEquals(db.getAdPosition(), List.of(1,3)); + assertEquals(db.getAdPosition(), List.of(AdvertisementPositionEnum.WORKBENCH_CAROUSEL.getStatus() + , AdvertisementPositionEnum.BASECONFIG_FUNDSQUERY_CAROUSEL.getStatus())); assertEquals(db.getAdImagePath(), "https://example.com/image.jpg"); } @@ -192,7 +199,7 @@ public class AdvertisementServiceImplTest extends BaseDbAndRedisUnitTest { updateReqVO.setStartTime(LocalDate.now().minusDays(5)); updateReqVO.setEndTime(LocalDate.now().minusDays(4)); updateReqVO.setAdName("Ad-UPDATE-2"); - updateReqVO.setAdPosition(List.of(2)); + updateReqVO.setAdPosition(List.of(AdvertisementPositionEnum.SYSTEMCONFIG_AMOUNTQUERY_CAROUSEL.getStatus())); assertDoesNotThrow(() -> advertisementService.update(updateReqVO)); } @@ -250,11 +257,11 @@ public class AdvertisementServiceImplTest extends BaseDbAndRedisUnitTest { @Test @Order(17) void testGetByPosition() { - List advertisementRespVOS = advertisementService.getAdvertisementByPosition(1); + List advertisementRespVOS = advertisementService.getAdvertisementByPosition(AdvertisementPositionEnum.WORKBENCH_CAROUSEL.getStatus()); assertEquals(1, advertisementRespVOS.size()); - advertisementRespVOS = advertisementService.getAdvertisementByPosition(2); + advertisementRespVOS = advertisementService.getAdvertisementByPosition(AdvertisementPositionEnum.SYSTEMCONFIG_AMOUNTQUERY_CAROUSEL.getStatus()); assertEquals(0, advertisementRespVOS.size()); }