From dc0ca32697b1e1d7debca491c291e15f9f848fef Mon Sep 17 00:00:00 2001 From: YunaiV Date: Mon, 6 Apr 2026 22:30:24 +0800 Subject: [PATCH] =?UTF-8?q?=E3=80=90=E5=90=8C=E6=AD=A5=E3=80=91BOOT=20?= =?UTF-8?q?=E5=92=8C=20CLOUD=20=E7=9A=84=E5=8A=9F=E8=83=BD=EF=BC=88MES?= =?UTF-8?q?=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../MesProFeedbackServiceImplTest.java | 16 ++++---- .../qc/ipqc/MesQcIpqcServiceImplTest.java | 18 ++++---- .../qc/iqc/MesQcIqcServiceImplTest.java | 21 +++++----- .../qc/oqc/MesQcOqcServiceImplTest.java | 18 ++++---- .../qc/rqc/MesQcRqcServiceImplTest.java | 16 ++++---- .../MesWmArrivalNoticeServiceImplTest.java | 4 +- .../wm/batch/MesWmBatchServiceImplTest.java | 10 ++--- .../MesWmItemConsumeServiceImplTest.java | 20 ++++----- .../MesWmItemReceiptServiceImplTest.java | 19 +++++---- .../MesWmOutsourceReceiptServiceImplTest.java | 14 +++---- .../MesWmProductProduceServiceImplTest.java | 41 ++++++++++--------- .../MesWmProductSalesLineServiceImplTest.java | 10 ++--- .../MesWmReturnIssueLineServiceImplTest.java | 6 +-- .../MesWmReturnSalesLineServiceImplTest.java | 6 +-- .../test/resources/application-unit-test.yaml | 9 ++-- 15 files changed, 115 insertions(+), 113 deletions(-) diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImplTest.java b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImplTest.java index 46627c6eb..89ba3aa05 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImplTest.java +++ b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/pro/feedback/MesProFeedbackServiceImplTest.java @@ -15,8 +15,8 @@ import cn.iocoder.yudao.module.mes.service.wm.itemconsume.MesWmItemConsumeServic import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceLineService; import cn.iocoder.yudao.module.mes.service.wm.productproduce.MesWmProductProduceService; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import javax.annotation.Resource; import java.math.BigDecimal; @@ -41,19 +41,19 @@ public class MesProFeedbackServiceImplTest extends BaseDbUnitTest { @Resource private MesProFeedbackMapper feedbackMapper; - @MockitoBean + @MockBean private MesProWorkOrderService workOrderService; - @MockitoBean + @MockBean private MesProRouteProcessService routeProcessService; - @MockitoBean + @MockBean private MesMdWorkstationService workstationService; - @MockitoBean + @MockBean private MesProTaskService taskService; - @MockitoBean + @MockBean private MesWmItemConsumeService itemConsumeService; - @MockitoBean + @MockBean private MesWmProductProduceService productProduceService; - @MockitoBean + @MockBean private MesWmProductProduceLineService produceLineService; @Test diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImplTest.java b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImplTest.java index c2cdc621d..b71081fef 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImplTest.java +++ b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/ipqc/MesQcIpqcServiceImplTest.java @@ -13,8 +13,8 @@ import cn.iocoder.yudao.module.mes.service.qc.defectrecord.MesQcDefectRecordServ import cn.iocoder.yudao.module.mes.service.qc.template.MesQcTemplateItemService; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import javax.annotation.Resource; import java.math.BigDecimal; @@ -38,21 +38,21 @@ public class MesQcIpqcServiceImplTest extends BaseDbUnitTest { @Resource private MesQcIpqcMapper ipqcMapper; - @MockitoBean + @MockBean private MesQcTemplateItemService templateItemService; - @MockitoBean + @MockBean private MesQcIpqcLineService ipqcLineService; - @MockitoBean + @MockBean private MesProWorkOrderService workOrderService; - @MockitoBean + @MockBean private MesMdWorkstationService workstationService; - @MockitoBean + @MockBean private MesMdItemService itemService; - @MockitoBean + @MockBean private MesQcDefectRecordService defectRecordService; - @MockitoBean + @MockBean private AdminUserApi adminUserApi; - @MockitoBean + @MockBean private MesProFeedbackService feedbackService; @Test diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImplTest.java b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImplTest.java index a3368e2b8..9e2984c39 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImplTest.java +++ b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/iqc/MesQcIqcServiceImplTest.java @@ -13,15 +13,16 @@ import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeSe import cn.iocoder.yudao.module.mes.service.wm.outsourcereceipt.MesWmOutsourceReceiptService; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import javax.annotation.Resource; import java.math.BigDecimal; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.*; /** @@ -38,21 +39,21 @@ public class MesQcIqcServiceImplTest extends BaseDbUnitTest { @Resource private MesQcIqcMapper iqcMapper; - @MockitoBean + @MockBean private MesWmArrivalNoticeService arrivalNoticeService; - @MockitoBean + @MockBean private MesWmOutsourceReceiptService outsourceReceiptService; - @MockitoBean + @MockBean private MesQcIqcLineService iqcLineService; - @MockitoBean + @MockBean private MesQcDefectRecordService defectRecordService; - @MockitoBean + @MockBean private MesMdVendorService vendorService; - @MockitoBean + @MockBean private MesMdItemService itemService; - @MockitoBean + @MockBean private MesQcTemplateItemService templateItemService; - @MockitoBean + @MockBean private AdminUserApi adminUserApi; @Test diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImplTest.java b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImplTest.java index f59bb0296..25e5e850d 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImplTest.java +++ b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/oqc/MesQcOqcServiceImplTest.java @@ -13,8 +13,8 @@ import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesLine import cn.iocoder.yudao.module.mes.service.wm.productsales.MesWmProductSalesService; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import javax.annotation.Resource; @@ -40,21 +40,21 @@ public class MesQcOqcServiceImplTest extends BaseDbUnitTest { @Resource private MesQcOqcMapper oqcMapper; - @MockitoBean + @MockBean private MesWmProductSalesLineService productSalesLineService; - @MockitoBean + @MockBean private MesWmProductSalesService productSalesService; - @MockitoBean + @MockBean private MesQcOqcLineService oqcLineService; - @MockitoBean + @MockBean private MesMdClientService clientService; - @MockitoBean + @MockBean private MesMdItemService itemService; - @MockitoBean + @MockBean private MesQcTemplateItemService templateItemService; - @MockitoBean + @MockBean private MesQcDefectRecordService defectRecordService; - @MockitoBean + @MockBean private AdminUserApi adminUserApi; @Test diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java index 10682b2f9..3e4b8d93e 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java +++ b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/qc/rqc/MesQcRqcServiceImplTest.java @@ -12,8 +12,8 @@ import cn.iocoder.yudao.module.mes.service.wm.returnissue.MesWmReturnIssueLineSe import cn.iocoder.yudao.module.mes.service.wm.returnsales.MesWmReturnSalesLineService; import cn.iocoder.yudao.module.system.api.user.AdminUserApi; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import javax.annotation.Resource; import java.math.BigDecimal; @@ -42,19 +42,19 @@ public class MesQcRqcServiceImplTest extends BaseDbUnitTest { @Resource private MesQcRqcMapper rqcMapper; - @MockitoBean + @MockBean private MesWmReturnIssueLineService returnIssueLineService; - @MockitoBean + @MockBean private MesWmReturnSalesLineService returnSalesLineService; - @MockitoBean + @MockBean private MesQcRqcLineService rqcLineService; - @MockitoBean + @MockBean private MesMdItemService itemService; - @MockitoBean + @MockBean private MesQcTemplateItemService templateItemService; - @MockitoBean + @MockBean private MesQcDefectRecordService defectRecordService; - @MockitoBean + @MockBean private AdminUserApi adminUserApi; @Test diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImplTest.java b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImplTest.java index 4690677dc..d5275a867 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImplTest.java +++ b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/arrivalnotice/MesWmArrivalNoticeServiceImplTest.java @@ -6,8 +6,8 @@ import cn.iocoder.yudao.module.mes.dal.dataobject.wm.arrivalnotice.MesWmArrivalN import cn.iocoder.yudao.module.mes.dal.mysql.wm.arrivalnotice.MesWmArrivalNoticeMapper; import cn.iocoder.yudao.module.mes.enums.wm.MesWmArrivalNoticeStatusEnum; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import javax.annotation.Resource; import java.math.BigDecimal; @@ -35,7 +35,7 @@ public class MesWmArrivalNoticeServiceImplTest extends BaseDbUnitTest { @Resource private MesWmArrivalNoticeMapper arrivalNoticeMapper; - @MockitoBean + @MockBean private MesWmArrivalNoticeLineService arrivalNoticeLineService; @Test diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImplTest.java b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImplTest.java index 2ff1a2956..1b9a30316 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImplTest.java +++ b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/batch/MesWmBatchServiceImplTest.java @@ -20,8 +20,8 @@ import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemBatchConfigService; import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; import cn.iocoder.yudao.module.mes.service.wm.barcode.MesWmBarcodeService; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import javax.annotation.Resource; import java.math.BigDecimal; @@ -58,13 +58,13 @@ public class MesWmBatchServiceImplTest extends BaseDbUnitTest { @Resource private MesWmProductProduceDetailMapper produceDetailMapper; - @MockitoBean + @MockBean private MesMdItemService itemService; - @MockitoBean + @MockBean private MesMdItemBatchConfigService itemBatchConfigService; - @MockitoBean + @MockBean private MesMdAutoCodeRecordService autoCodeRecordService; - @MockitoBean + @MockBean private MesWmBarcodeService barcodeService; // ==================== 向前追溯 ==================== diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImplTest.java b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImplTest.java index 27f8a831d..c27e67746 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImplTest.java +++ b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemconsume/MesWmItemConsumeServiceImplTest.java @@ -30,8 +30,8 @@ import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import javax.annotation.Resource; import java.math.BigDecimal; @@ -62,23 +62,23 @@ public class MesWmItemConsumeServiceImplTest extends BaseDbUnitTest { @Resource private MesWmItemConsumeMapper itemConsumeMapper; - @MockitoBean + @MockBean private MesWmItemConsumeLineService itemConsumeLineService; - @MockitoBean + @MockBean private MesWmItemConsumeDetailService itemConsumeDetailService; - @MockitoBean + @MockBean private MesProRouteProductBomService routeProductBomService; - @MockitoBean + @MockBean private MesProRouteService routeService; - @MockitoBean + @MockBean private MesWmTransactionService wmTransactionService; - @MockitoBean + @MockBean private MesWmWarehouseService warehouseService; - @MockitoBean + @MockBean private MesWmWarehouseLocationService locationService; - @MockitoBean + @MockBean private MesWmWarehouseAreaService areaService; - @MockitoBean + @MockBean private MesWmMaterialStockService materialStockService; // ========== 公共 mock 数据 ========== diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImplTest.java b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImplTest.java index fab8c0480..ae8434d10 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImplTest.java +++ b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/itemreceipt/MesWmItemReceiptServiceImplTest.java @@ -10,8 +10,8 @@ import cn.iocoder.yudao.module.mes.service.qc.iqc.MesQcIqcService; import cn.iocoder.yudao.module.mes.service.wm.arrivalnotice.MesWmArrivalNoticeService; import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import javax.annotation.Resource; import java.math.BigDecimal; @@ -21,8 +21,9 @@ import java.util.Collections; import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; -import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.*; -import static org.junit.jupiter.api.Assertions.*; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_ITEM_RECEIPT_NOT_EXISTS; +import static cn.iocoder.yudao.module.mes.enums.ErrorCodeConstants.WM_ITEM_RECEIPT_STATUS_ERROR; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.anyList; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.*; @@ -41,17 +42,17 @@ public class MesWmItemReceiptServiceImplTest extends BaseDbUnitTest { @Resource private MesWmItemReceiptMapper itemReceiptMapper; - @MockitoBean + @MockBean private MesWmItemReceiptLineService itemReceiptLineService; - @MockitoBean + @MockBean private MesWmItemReceiptDetailService itemReceiptDetailService; - @MockitoBean + @MockBean private MesWmArrivalNoticeService arrivalNoticeService; - @MockitoBean + @MockBean private MesMdVendorService vendorService; - @MockitoBean + @MockBean private MesQcIqcService iqcService; - @MockitoBean + @MockBean private MesWmTransactionService wmTransactionService; // ========== finishItemReceipt ========== diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImplTest.java b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImplTest.java index bba451cac..7dbe92339 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImplTest.java +++ b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/outsourcereceipt/MesWmOutsourceReceiptServiceImplTest.java @@ -11,8 +11,8 @@ import cn.iocoder.yudao.module.mes.service.md.vendor.MesMdVendorService; import cn.iocoder.yudao.module.mes.service.pro.workorder.MesProWorkOrderService; import cn.iocoder.yudao.module.mes.service.wm.transaction.MesWmTransactionService; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import javax.annotation.Resource; import java.math.BigDecimal; @@ -39,17 +39,17 @@ public class MesWmOutsourceReceiptServiceImplTest extends BaseDbUnitTest { @Resource private MesWmOutsourceReceiptMapper outsourceReceiptMapper; - @MockitoBean + @MockBean private MesWmOutsourceReceiptLineService outsourceReceiptLineService; - @MockitoBean + @MockBean private MesWmOutsourceReceiptDetailService outsourceReceiptDetailService; - @MockitoBean + @MockBean private MesWmTransactionService wmTransactionService; - @MockitoBean + @MockBean private MesMdVendorService vendorService; - @MockitoBean + @MockBean private MesMdItemService itemService; - @MockitoBean + @MockBean private MesProWorkOrderService workOrderService; @Test diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImplTest.java b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImplTest.java index 2eb07bcdf..51cd7093b 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImplTest.java +++ b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productproduce/MesWmProductProduceServiceImplTest.java @@ -1,5 +1,6 @@ package cn.iocoder.yudao.module.mes.service.wm.productproduce; +import cn.hutool.core.collection.ListUtil; import cn.iocoder.yudao.framework.test.core.ut.BaseDbUnitTest; import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDO; import cn.iocoder.yudao.module.mes.dal.dataobject.wm.productproduce.MesWmProductProduceDetailDO; @@ -18,16 +19,16 @@ import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseLocationSe import cn.iocoder.yudao.module.mes.service.wm.warehouse.MesWmWarehouseService; import org.junit.jupiter.api.Test; import org.mockito.ArgumentCaptor; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import javax.annotation.Resource; import java.math.BigDecimal; -import java.util.List; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomLongId; import static cn.iocoder.yudao.framework.test.core.util.RandomUtils.randomPojo; -import static org.junit.jupiter.api.Assertions.*; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; import static org.mockito.Mockito.*; /** @@ -44,21 +45,21 @@ public class MesWmProductProduceServiceImplTest extends BaseDbUnitTest { @Resource private MesWmProductProduceMapper productProduceMapper; - @MockitoBean + @MockBean private MesWmProductProduceLineService productProduceLineService; - @MockitoBean + @MockBean private MesWmProductProduceDetailService productProduceDetailService; - @MockitoBean + @MockBean private MesProWorkOrderService workOrderService; - @MockitoBean + @MockBean private MesWmBatchService batchService; - @MockitoBean + @MockBean private MesWmTransactionService wmTransactionService; - @MockitoBean + @MockBean private MesWmWarehouseService warehouseService; - @MockitoBean + @MockBean private MesWmWarehouseLocationService locationService; - @MockitoBean + @MockBean private MesWmWarehouseAreaService areaService; @Test @@ -92,7 +93,7 @@ public class MesWmProductProduceServiceImplTest extends BaseDbUnitTest { .qualityStatus(MesWmQualityStatusEnum.PENDING.getStatus()) .build(); when(productProduceLineService.getProductProduceLineListByProduceId(produce.getId())) - .thenReturn(List.of(pendingLine)); + .thenReturn(ListUtil.of(pendingLine)); // mock: finishProductProduce 内部会再查一次行和明细（用于创建库存事务） // 由于 finishProductProduce 在拆分行后调用，此时行已经变了，但由于 line/detail 是 mock 的， @@ -109,8 +110,8 @@ public class MesWmProductProduceServiceImplTest extends BaseDbUnitTest { .build(); // finishProductProduce 内部第二次调用 getProductProduceLineListByProduceId when(productProduceLineService.getProductProduceLineListByProduceId(produce.getId())) - .thenReturn(List.of(pendingLine)) // 第 1 次：splitPendingAndFinishProduce 查待检行 - .thenReturn(List.of(qualifiedLine, unqualifiedLine)); // 第 2 次：finishProductProduce 查所有行 + .thenReturn(ListUtil.of(pendingLine)) // 第 1 次：splitPendingAndFinishProduce 查待检行 + .thenReturn(ListUtil.of(qualifiedLine, unqualifiedLine)); // 第 2 次：finishProductProduce 查所有行 // mock: finishProductProduce 中按行查明细 MesWmProductProduceDetailDO qualifiedDetail = MesWmProductProduceDetailDO.builder() @@ -118,9 +119,9 @@ public class MesWmProductProduceServiceImplTest extends BaseDbUnitTest { MesWmProductProduceDetailDO unqualifiedDetail = MesWmProductProduceDetailDO.builder() .lineId(101L).quantity(BigDecimal.valueOf(20)).build(); when(productProduceDetailService.getProductProduceDetailListByLineId(100L)) - .thenReturn(List.of(qualifiedDetail)); + .thenReturn(ListUtil.of(qualifiedDetail)); when(productProduceDetailService.getProductProduceDetailListByLineId(101L)) - .thenReturn(List.of(unqualifiedDetail)); + .thenReturn(ListUtil.of(unqualifiedDetail)); // 调用 productProduceService.splitPendingAndFinishProduce(feedbackId, BigDecimal.valueOf(80), BigDecimal.valueOf(20)); @@ -185,14 +186,14 @@ public class MesWmProductProduceServiceImplTest extends BaseDbUnitTest { .qualityStatus(MesWmQualityStatusEnum.PASS.getStatus()) .build(); when(productProduceLineService.getProductProduceLineListByProduceId(produce.getId())) - .thenReturn(List.of(pendingLine)) - .thenReturn(List.of(qualifiedLine)); + .thenReturn(ListUtil.of(pendingLine)) + .thenReturn(ListUtil.of(qualifiedLine)); // mock: finishProductProduce 中按行查明细 MesWmProductProduceDetailDO detail = MesWmProductProduceDetailDO.builder() .lineId(200L).quantity(BigDecimal.valueOf(50)).build(); when(productProduceDetailService.getProductProduceDetailListByLineId(200L)) - .thenReturn(List.of(detail)); + .thenReturn(ListUtil.of(detail)); // 调用：不合格品数量 = 0 productProduceService.splitPendingAndFinishProduce(feedbackId, BigDecimal.valueOf(50), BigDecimal.ZERO); @@ -245,7 +246,7 @@ public class MesWmProductProduceServiceImplTest extends BaseDbUnitTest { .qualityStatus(MesWmQualityStatusEnum.PASS.getStatus()) .build(); when(productProduceLineService.getProductProduceLineListByProduceId(produce.getId())) - .thenReturn(List.of(passLine)); + .thenReturn(ListUtil.of(passLine)); // 调用，应该抛异常（找不到 PENDING 行） assertThrows(Exception.class, () -> diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImplTest.java b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImplTest.java index 3e2bae810..a82af5eb0 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImplTest.java +++ b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/productsales/MesWmProductSalesLineServiceImplTest.java @@ -8,8 +8,8 @@ import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum; import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; import cn.iocoder.yudao.module.mes.service.wm.batch.MesWmBatchService; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import javax.annotation.Resource; @@ -32,15 +32,15 @@ public class MesWmProductSalesLineServiceImplTest extends BaseDbUnitTest { @Resource private MesWmProductSalesLineMapper productSalesLineMapper; - @MockitoBean + @MockBean private MesWmProductSalesService productSalesService; - @MockitoBean + @MockBean private MesWmProductSalesDetailService productSalesDetailService; - @MockitoBean + @MockBean private MesMdItemService itemService; - @MockitoBean + @MockBean private MesWmBatchService batchService; @Test diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImplTest.java b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImplTest.java index e919af410..ec977d60e 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImplTest.java +++ b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnissue/MesWmReturnIssueLineServiceImplTest.java @@ -7,8 +7,8 @@ import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum; import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum; import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import javax.annotation.Resource; import java.math.BigDecimal; @@ -32,10 +32,10 @@ public class MesWmReturnIssueLineServiceImplTest extends BaseDbUnitTest { @Resource private MesWmReturnIssueLineMapper returnIssueLineMapper; - @MockitoBean + @MockBean private MesWmReturnIssueService issueService; - @MockitoBean + @MockBean private MesMdItemService itemService; @Test diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImplTest.java b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImplTest.java index 9b68491b2..fef292404 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImplTest.java +++ b/yudao-module-mes/yudao-module-mes-server/src/test/java/cn/iocoder/yudao/module/mes/service/wm/returnsales/MesWmReturnSalesLineServiceImplTest.java @@ -7,8 +7,8 @@ import cn.iocoder.yudao.module.mes.enums.qc.MesQcCheckResultEnum; import cn.iocoder.yudao.module.mes.enums.wm.MesWmQualityStatusEnum; import cn.iocoder.yudao.module.mes.service.md.item.MesMdItemService; import org.junit.jupiter.api.Test; +import org.springframework.boot.test.mock.mockito.MockBean; import org.springframework.context.annotation.Import; -import org.springframework.test.context.bean.override.mockito.MockitoBean; import javax.annotation.Resource; import java.math.BigDecimal; @@ -32,10 +32,10 @@ public class MesWmReturnSalesLineServiceImplTest extends BaseDbUnitTest { @Resource private MesWmReturnSalesLineMapper returnSalesLineMapper; - @MockitoBean + @MockBean private MesWmReturnSalesService returnSalesService; - @MockitoBean + @MockBean private MesMdItemService itemService; @Test diff --git a/yudao-module-mes/yudao-module-mes-server/src/test/resources/application-unit-test.yaml b/yudao-module-mes/yudao-module-mes-server/src/test/resources/application-unit-test.yaml index 6e02b8056..1df2760c3 100644 --- a/yudao-module-mes/yudao-module-mes-server/src/test/resources/application-unit-test.yaml +++ b/yudao-module-mes/yudao-module-mes-server/src/test/resources/application-unit-test.yaml @@ -22,11 +22,10 @@ spring: schema-locations: classpath:/sql/create_tables.sql # Redis 配置。Redisson 默认的配置足够使用，一般不需要进行调优 - data: - redis: - host: 127.0.0.1 # 地址 - port: 16379 # 端口（单元测试，使用 16379 端口） - database: 0 # 数据库索引 + redis: + host: 127.0.0.1 # 地址 + port: 16379 # 端口（单元测试，使用 16379 端口） + database: 0 # 数据库索引 mybatis: lazy-initialization: true # 单元测试，设置 MyBatis Mapper 延迟加载，加速每个单元测试