Commit 12d045ea5888e804b5fdeef0135f1cfbfcf9c110
1 parent
a543b8c6
修复部分单元测试报错的问题
Showing
4 changed files
with
22 additions
and
22 deletions
yudao-framework/yudao-spring-boot-starter-biz-sms/src/test/java/cn/iocoder/yudao/framework/sms/core/client/impl/yunpian/YunpianSmsClientTest.java
| @@ -124,7 +124,7 @@ public class YunpianSmsClientTest extends BaseMockitoUnitTest { | @@ -124,7 +124,7 @@ public class YunpianSmsClientTest extends BaseMockitoUnitTest { | ||
| 124 | @SuppressWarnings("unchecked") | 124 | @SuppressWarnings("unchecked") |
| 125 | public void testDoGetSmsTemplate() throws Throwable { | 125 | public void testDoGetSmsTemplate() throws Throwable { |
| 126 | // 准备参数 | 126 | // 准备参数 |
| 127 | - String apiTemplateId = randomString(); | 127 | + String apiTemplateId = String.valueOf(randomLongId()); |
| 128 | // mock tpl 方法 | 128 | // mock tpl 方法 |
| 129 | TplApi tplApi = mock(TplApi.class); | 129 | TplApi tplApi = mock(TplApi.class); |
| 130 | when(client.tpl()).thenReturn(tplApi); | 130 | when(client.tpl()).thenReturn(tplApi); |
yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/coupon/CouponTemplateServiceImplTest.java
| @@ -18,6 +18,7 @@ import javax.annotation.Resource; | @@ -18,6 +18,7 @@ import javax.annotation.Resource; | ||
| 18 | import java.util.Date; | 18 | import java.util.Date; |
| 19 | 19 | ||
| 20 | import static cn.hutool.core.util.RandomUtil.randomEle; | 20 | import static cn.hutool.core.util.RandomUtil.randomEle; |
| 21 | +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildLocalDateTime; | ||
| 21 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; | 22 | import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; |
| 22 | import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; | 23 | import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; |
| 23 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; | 24 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; |
| @@ -118,7 +119,7 @@ public class CouponTemplateServiceImplTest extends BaseDbUnitTest { | @@ -118,7 +119,7 @@ public class CouponTemplateServiceImplTest extends BaseDbUnitTest { | ||
| 118 | o.setName("芋艿"); | 119 | o.setName("芋艿"); |
| 119 | o.setStatus(CommonStatusEnum.ENABLE.getStatus()); | 120 | o.setStatus(CommonStatusEnum.ENABLE.getStatus()); |
| 120 | o.setDiscountType(PromotionDiscountTypeEnum.PERCENT.getType()); | 121 | o.setDiscountType(PromotionDiscountTypeEnum.PERCENT.getType()); |
| 121 | - o.setCreateTime(buildTime(2022, 2, 2)); | 122 | + o.setCreateTime(buildLocalDateTime(2022, 2, 2)); |
| 122 | }); | 123 | }); |
| 123 | couponTemplateMapper.insert(dbCouponTemplate); | 124 | couponTemplateMapper.insert(dbCouponTemplate); |
| 124 | // 测试 name 不匹配 | 125 | // 测试 name 不匹配 |
| @@ -128,7 +129,7 @@ public class CouponTemplateServiceImplTest extends BaseDbUnitTest { | @@ -128,7 +129,7 @@ public class CouponTemplateServiceImplTest extends BaseDbUnitTest { | ||
| 128 | // 测试 type 不匹配 | 129 | // 测试 type 不匹配 |
| 129 | couponTemplateMapper.insert(cloneIgnoreId(dbCouponTemplate, o -> o.setDiscountType(PromotionDiscountTypeEnum.PRICE.getType()))); | 130 | couponTemplateMapper.insert(cloneIgnoreId(dbCouponTemplate, o -> o.setDiscountType(PromotionDiscountTypeEnum.PRICE.getType()))); |
| 130 | // 测试 createTime 不匹配 | 131 | // 测试 createTime 不匹配 |
| 131 | - couponTemplateMapper.insert(cloneIgnoreId(dbCouponTemplate, o -> o.setCreateTime(buildTime(2022, 1, 1)))); | 132 | + couponTemplateMapper.insert(cloneIgnoreId(dbCouponTemplate, o -> o.setCreateTime(buildLocalDateTime(2022, 1, 1)))); |
| 132 | // 准备参数 | 133 | // 准备参数 |
| 133 | CouponTemplatePageReqVO reqVO = new CouponTemplatePageReqVO(); | 134 | CouponTemplatePageReqVO reqVO = new CouponTemplatePageReqVO(); |
| 134 | reqVO.setName("芋艿"); | 135 | reqVO.setName("芋艿"); |
yudao-module-mall/yudao-module-promotion-biz/src/test/java/cn/iocoder/yudao/module/promotion/service/discount/DiscountActivityServiceImplTest.java
| @@ -20,8 +20,7 @@ import java.time.Duration; | @@ -20,8 +20,7 @@ import java.time.Duration; | ||
| 20 | import java.util.Date; | 20 | import java.util.Date; |
| 21 | import java.util.List; | 21 | import java.util.List; |
| 22 | 22 | ||
| 23 | -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.addTime; | ||
| 24 | -import static cn.iocoder.yudao.framework.common.util.date.DateUtils.buildTime; | 23 | +import static cn.iocoder.yudao.framework.common.util.date.DateUtils.*; |
| 25 | import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; | 24 | import static cn.iocoder.yudao.framework.common.util.object.ObjectUtils.cloneIgnoreId; |
| 26 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; | 25 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertPojoEquals; |
| 27 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; | 26 | import static cn.iocoder.yudao.framework.test.core.util.AssertUtils.assertServiceException; |
| @@ -183,7 +182,7 @@ public class DiscountActivityServiceImplTest extends BaseDbUnitTest { | @@ -183,7 +182,7 @@ public class DiscountActivityServiceImplTest extends BaseDbUnitTest { | ||
| 183 | DiscountActivityDO dbDiscountActivity = randomPojo(DiscountActivityDO.class, o -> { // 等会查询到 | 182 | DiscountActivityDO dbDiscountActivity = randomPojo(DiscountActivityDO.class, o -> { // 等会查询到 |
| 184 | o.setName("芋艿"); | 183 | o.setName("芋艿"); |
| 185 | o.setStatus(PromotionActivityStatusEnum.WAIT.getStatus()); | 184 | o.setStatus(PromotionActivityStatusEnum.WAIT.getStatus()); |
| 186 | - o.setCreateTime(buildTime(2021, 1, 15)); | 185 | + o.setCreateTime(buildLocalDateTime(2021, 1, 15)); |
| 187 | }); | 186 | }); |
| 188 | discountActivityMapper.insert(dbDiscountActivity); | 187 | discountActivityMapper.insert(dbDiscountActivity); |
| 189 | // 测试 name 不匹配 | 188 | // 测试 name 不匹配 |
| @@ -191,7 +190,7 @@ public class DiscountActivityServiceImplTest extends BaseDbUnitTest { | @@ -191,7 +190,7 @@ public class DiscountActivityServiceImplTest extends BaseDbUnitTest { | ||
| 191 | // 测试 status 不匹配 | 190 | // 测试 status 不匹配 |
| 192 | discountActivityMapper.insert(cloneIgnoreId(dbDiscountActivity, o -> o.setStatus(PromotionActivityStatusEnum.END.getStatus()))); | 191 | discountActivityMapper.insert(cloneIgnoreId(dbDiscountActivity, o -> o.setStatus(PromotionActivityStatusEnum.END.getStatus()))); |
| 193 | // 测试 createTime 不匹配 | 192 | // 测试 createTime 不匹配 |
| 194 | - discountActivityMapper.insert(cloneIgnoreId(dbDiscountActivity, o -> o.setCreateTime(buildTime(2021, 2, 10)))); | 193 | + discountActivityMapper.insert(cloneIgnoreId(dbDiscountActivity, o -> o.setCreateTime(buildLocalDateTime(2021, 2, 10)))); |
| 195 | // 准备参数 | 194 | // 准备参数 |
| 196 | DiscountActivityPageReqVO reqVO = new DiscountActivityPageReqVO(); | 195 | DiscountActivityPageReqVO reqVO = new DiscountActivityPageReqVO(); |
| 197 | reqVO.setName("芋艿"); | 196 | reqVO.setName("芋艿"); |
yudao-server/pom.xml
| @@ -41,21 +41,21 @@ | @@ -41,21 +41,21 @@ | ||
| 41 | <artifactId>yudao-module-pay-biz</artifactId> | 41 | <artifactId>yudao-module-pay-biz</artifactId> |
| 42 | <version>${revision}</version> | 42 | <version>${revision}</version> |
| 43 | </dependency> | 43 | </dependency> |
| 44 | - <dependency> | ||
| 45 | - <groupId>cn.iocoder.boot</groupId> | ||
| 46 | - <artifactId>yudao-module-promotion-biz</artifactId> | ||
| 47 | - <version>${revision}</version> | ||
| 48 | - </dependency> | ||
| 49 | - <dependency> | ||
| 50 | - <groupId>cn.iocoder.boot</groupId> | ||
| 51 | - <artifactId>yudao-module-product-biz</artifactId> | ||
| 52 | - <version>${revision}</version> | ||
| 53 | - </dependency> | ||
| 54 | - <dependency> | ||
| 55 | - <groupId>cn.iocoder.boot</groupId> | ||
| 56 | - <artifactId>yudao-module-trade-biz</artifactId> | ||
| 57 | - <version>${revision}</version> | ||
| 58 | - </dependency> | 44 | +<!-- <dependency>--> |
| 45 | +<!-- <groupId>cn.iocoder.boot</groupId>--> | ||
| 46 | +<!-- <artifactId>yudao-module-promotion-biz</artifactId>--> | ||
| 47 | +<!-- <version>${revision}</version>--> | ||
| 48 | +<!-- </dependency>--> | ||
| 49 | +<!-- <dependency>--> | ||
| 50 | +<!-- <groupId>cn.iocoder.boot</groupId>--> | ||
| 51 | +<!-- <artifactId>yudao-module-product-biz</artifactId>--> | ||
| 52 | +<!-- <version>${revision}</version>--> | ||
| 53 | +<!-- </dependency>--> | ||
| 54 | +<!-- <dependency>--> | ||
| 55 | +<!-- <groupId>cn.iocoder.boot</groupId>--> | ||
| 56 | +<!-- <artifactId>yudao-module-trade-biz</artifactId>--> | ||
| 57 | +<!-- <version>${revision}</version>--> | ||
| 58 | +<!-- </dependency>--> | ||
| 59 | <!-- 数据报表 --> | 59 | <!-- 数据报表 --> |
| 60 | <!-- <dependency>--> | 60 | <!-- <dependency>--> |
| 61 | <!-- <groupId>cn.iocoder.boot</groupId>--> | 61 | <!-- <groupId>cn.iocoder.boot</groupId>--> |