From 2e804782032967f311e8c37cc07b274baad31969 Mon Sep 17 00:00:00 2001 From: paulGao Date: Wed, 1 Sep 2021 19:03:36 +0800 Subject: [PATCH] upgrade spring boot 2.3 to 2.4 --- .../test/java/cn/lili/buyer/test/cart/CartTest.java | 6 +++--- .../test/java/cn/lili/buyer/test/cart/FileTest.java | 6 +++--- .../cn/lili/buyer/test/cart/MemberCouponTest.java | 11 ++++++----- .../test/java/cn/lili/buyer/test/cart/CartTest.java | 6 +++--- .../cn/lili/buyer/test/cart/MemberStatisticsTest.java | 6 +++--- .../test/java/cn/lili/buyer/test/cart/OnlineTest.java | 6 +++--- framework/pom.xml | 11 +++++++++++ .../cache/limit/interceptor/LimitInterceptor.java | 4 ++-- .../src/main/java/cn/lili/cache/script/LuaScript.java | 6 +++--- .../java/cn/lili/common/security/SecurityBean.java | 9 ++++++--- .../elasticsearch/config/ElasticsearchConfig.java | 1 - .../elasticsearch/config/ElasticsearchProperties.java | 2 +- .../java/cn/lili/test/RedisLimiterHelperTest.java | 6 +++--- .../src/test/java/cn/lili/test/script/ScriptTest.java | 6 +++--- .../test/java/cn/lili/test/CacheTest/CacheTest.java | 6 +++--- .../test/java/cn/lili/test/elasticsearch/EsTest.java | 11 ++++++----- .../java/cn/lili/test/order/OrderServiceTest.java | 6 +++--- .../test/java/cn/lili/test/promotion/CouponTest.java | 6 +++--- .../java/cn/lili/test/promotion/FullDiscountTest.java | 6 +++--- .../cn/lili/test/promotion/PromotionPriceTest.java | 6 +++--- .../test/java/cn/lili/test/promotion/SeckillTest.java | 6 +++--- .../cn/lili/test/rocketmq/MsgExtRocketMqTest.java | 6 +++--- pom.xml | 4 ++-- 23 files changed, 79 insertions(+), 64 deletions(-) diff --git a/buyer-api/src/test/java/cn/lili/buyer/test/cart/CartTest.java b/buyer-api/src/test/java/cn/lili/buyer/test/cart/CartTest.java index 59f9a435..67ef35d2 100644 --- a/buyer-api/src/test/java/cn/lili/buyer/test/cart/CartTest.java +++ b/buyer-api/src/test/java/cn/lili/buyer/test/cart/CartTest.java @@ -10,10 +10,10 @@ import cn.lili.modules.order.cart.service.CartService; import cn.lili.modules.payment.service.PaymentService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.List; @@ -21,7 +21,7 @@ import java.util.List; * @author paulG * @since 2020/11/14 **/ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest class CartTest { diff --git a/buyer-api/src/test/java/cn/lili/buyer/test/cart/FileTest.java b/buyer-api/src/test/java/cn/lili/buyer/test/cart/FileTest.java index 4003ad5a..1ccf3cff 100644 --- a/buyer-api/src/test/java/cn/lili/buyer/test/cart/FileTest.java +++ b/buyer-api/src/test/java/cn/lili/buyer/test/cart/FileTest.java @@ -7,10 +7,10 @@ import cn.lili.modules.goods.service.BrandService; import com.xkcoding.http.util.StringUtil; import lombok.extern.slf4j.Slf4j; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.io.*; import java.net.URL; @@ -21,7 +21,7 @@ import java.util.List; * @since 2020/11/14 **/ @Slf4j -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest class FileTest { diff --git a/buyer-api/src/test/java/cn/lili/buyer/test/cart/MemberCouponTest.java b/buyer-api/src/test/java/cn/lili/buyer/test/cart/MemberCouponTest.java index 4aba260e..cd72ff65 100644 --- a/buyer-api/src/test/java/cn/lili/buyer/test/cart/MemberCouponTest.java +++ b/buyer-api/src/test/java/cn/lili/buyer/test/cart/MemberCouponTest.java @@ -1,18 +1,19 @@ package cn.lili.buyer.test.cart; import cn.lili.modules.promotion.service.MemberCouponService; -import org.junit.Assert; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; + +import static org.junit.jupiter.api.Assertions.assertTrue; /** * @author paulG * @since 2020/11/27 **/ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest class MemberCouponTest { @@ -22,7 +23,7 @@ class MemberCouponTest { @Test void receiveCoupon() { memberCouponService.receiveCoupon("1333318596239843328", "1326834797335306240", "1"); - Assert.assertTrue(true); + assertTrue(true); } diff --git a/consumer/src/test/java/cn/lili/buyer/test/cart/CartTest.java b/consumer/src/test/java/cn/lili/buyer/test/cart/CartTest.java index 97631024..22b87b83 100644 --- a/consumer/src/test/java/cn/lili/buyer/test/cart/CartTest.java +++ b/consumer/src/test/java/cn/lili/buyer/test/cart/CartTest.java @@ -5,15 +5,15 @@ import cn.lili.modules.order.order.entity.dto.OrderMessage; import cn.lili.modules.order.order.entity.enums.OrderStatusEnum; import cn.lili.modules.payment.kit.enums.PaymentMethodEnum; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** * 订单库存扣减 */ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest class CartTest { diff --git a/consumer/src/test/java/cn/lili/buyer/test/cart/MemberStatisticsTest.java b/consumer/src/test/java/cn/lili/buyer/test/cart/MemberStatisticsTest.java index de7e3171..bc882363 100644 --- a/consumer/src/test/java/cn/lili/buyer/test/cart/MemberStatisticsTest.java +++ b/consumer/src/test/java/cn/lili/buyer/test/cart/MemberStatisticsTest.java @@ -2,13 +2,13 @@ package cn.lili.buyer.test.cart; import cn.lili.timetask.handler.impl.statistics.MemberStatisticsExecute; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest class MemberStatisticsTest { diff --git a/consumer/src/test/java/cn/lili/buyer/test/cart/OnlineTest.java b/consumer/src/test/java/cn/lili/buyer/test/cart/OnlineTest.java index 741f002a..e67101d2 100644 --- a/consumer/src/test/java/cn/lili/buyer/test/cart/OnlineTest.java +++ b/consumer/src/test/java/cn/lili/buyer/test/cart/OnlineTest.java @@ -3,10 +3,10 @@ package cn.lili.buyer.test.cart; import cn.lili.common.utils.DateUtil; import cn.lili.timetask.handler.impl.statistics.OnlineMemberStatistics; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.Calendar; import java.util.Random; @@ -14,7 +14,7 @@ import java.util.Random; /** * 订单库存扣减 */ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest class OnlineTest { diff --git a/framework/pom.xml b/framework/pom.xml index cc6a99fc..787efb9e 100644 --- a/framework/pom.xml +++ b/framework/pom.xml @@ -15,6 +15,17 @@ jar + + org.junit.vintage + junit-vintage-engine + test + + + org.hamcrest + hamcrest-core + + + org.springframework.boot spring-boot-starter-web diff --git a/framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java b/framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java index 465cfc08..6b840fbb 100644 --- a/framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java +++ b/framework/src/main/java/cn/lili/cache/limit/interceptor/LimitInterceptor.java @@ -30,7 +30,7 @@ import java.io.Serializable; public class LimitInterceptor { private RedisTemplate redisTemplate; - private DefaultRedisScript limitScript; + private DefaultRedisScript limitScript; @Autowired public void setRedisTemplate(RedisTemplate redisTemplate) { @@ -38,7 +38,7 @@ public class LimitInterceptor { } @Autowired - public void setLimitScript(DefaultRedisScript limitScript) { + public void setLimitScript(DefaultRedisScript limitScript) { this.limitScript = limitScript; } diff --git a/framework/src/main/java/cn/lili/cache/script/LuaScript.java b/framework/src/main/java/cn/lili/cache/script/LuaScript.java index 18e2d77b..1df7e524 100644 --- a/framework/src/main/java/cn/lili/cache/script/LuaScript.java +++ b/framework/src/main/java/cn/lili/cache/script/LuaScript.java @@ -33,10 +33,10 @@ public class LuaScript { * @return */ @Bean - public DefaultRedisScript limitScript() { - DefaultRedisScript redisScript = new DefaultRedisScript<>(); + public DefaultRedisScript limitScript() { + DefaultRedisScript redisScript = new DefaultRedisScript<>(); redisScript.setScriptSource(new ResourceScriptSource(new ClassPathResource("script/limit.lua"))); - redisScript.setResultType(Number.class); + redisScript.setResultType(Long.class); return redisScript; } } diff --git a/framework/src/main/java/cn/lili/common/security/SecurityBean.java b/framework/src/main/java/cn/lili/common/security/SecurityBean.java index 5d186160..7f660595 100644 --- a/framework/src/main/java/cn/lili/common/security/SecurityBean.java +++ b/framework/src/main/java/cn/lili/common/security/SecurityBean.java @@ -7,6 +7,9 @@ import org.springframework.web.cors.CorsConfiguration; import org.springframework.web.cors.CorsConfigurationSource; import org.springframework.web.cors.UrlBasedCorsConfigurationSource; +import java.util.Arrays; +import java.util.Collections; + /** * SecurityBean * @@ -19,8 +22,7 @@ public class SecurityBean { @Bean public BCryptPasswordEncoder passwordEncoder() { - BCryptPasswordEncoder bCryptPasswordEncoder = new BCryptPasswordEncoder(); - return bCryptPasswordEncoder; + return new BCryptPasswordEncoder(); } /** @@ -33,7 +35,8 @@ public class SecurityBean { UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource(); CorsConfiguration config = new CorsConfiguration(); config.setAllowCredentials(true); - config.addAllowedOrigin(CorsConfiguration.ALL); +// config.addAllowedOrigin(CorsConfiguration.ALL); + config.setAllowedOriginPatterns(Collections.singletonList(CorsConfiguration.ALL)); config.addAllowedHeader(CorsConfiguration.ALL); config.addAllowedMethod(CorsConfiguration.ALL); source.registerCorsConfiguration("/**", config); diff --git a/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java b/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java index 555f0ae7..f95b749d 100644 --- a/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java +++ b/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchConfig.java @@ -1,7 +1,6 @@ package cn.lili.elasticsearch.config; import cn.hutool.core.convert.Convert; -import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.apache.http.HttpHost; import org.apache.http.auth.AuthScope; diff --git a/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchProperties.java b/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchProperties.java index b4dfc18c..e6fdbda2 100644 --- a/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchProperties.java +++ b/framework/src/main/java/cn/lili/elasticsearch/config/ElasticsearchProperties.java @@ -17,7 +17,7 @@ import java.util.List; **/ @Data @Builder -@Component +@Component("elasticsearchProperties") @NoArgsConstructor @AllArgsConstructor @ConfigurationProperties(prefix = "lili.data.elasticsearch") diff --git a/framework/src/test/java/cn/lili/test/RedisLimiterHelperTest.java b/framework/src/test/java/cn/lili/test/RedisLimiterHelperTest.java index 1ac8a419..b329c27c 100644 --- a/framework/src/test/java/cn/lili/test/RedisLimiterHelperTest.java +++ b/framework/src/test/java/cn/lili/test/RedisLimiterHelperTest.java @@ -4,10 +4,10 @@ import cn.lili.modules.order.order.entity.dos.OrderItem; import cn.lili.modules.order.order.service.OrderItemService; import cn.lili.modules.statistics.serviceimpl.OrderStatisticsDataServiceImpl; import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.ArrayList; import java.util.List; @@ -20,7 +20,7 @@ import java.util.List; * @since 2020-06-13 12:17 */ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest public class RedisLimiterHelperTest { diff --git a/framework/src/test/java/cn/lili/test/script/ScriptTest.java b/framework/src/test/java/cn/lili/test/script/ScriptTest.java index d2312a02..9c27cd7e 100644 --- a/framework/src/test/java/cn/lili/test/script/ScriptTest.java +++ b/framework/src/test/java/cn/lili/test/script/ScriptTest.java @@ -1,7 +1,7 @@ package cn.lili.test.script; import org.junit.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.ComponentScan; @@ -12,7 +12,7 @@ import org.springframework.data.redis.core.script.DefaultRedisScript; import org.springframework.scripting.support.ResourceScriptSource; import org.springframework.test.annotation.Rollback; import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.transaction.annotation.Transactional; import javax.annotation.Resource; @@ -27,7 +27,7 @@ import java.util.List; * @since * 2020-02-22 20:26 */ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest @Transactional(rollbackFor = Exception.class) @Rollback() diff --git a/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java b/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java index 3a4385f5..a048a3be 100644 --- a/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java +++ b/manager-api/src/test/java/cn/lili/test/CacheTest/CacheTest.java @@ -5,11 +5,11 @@ import cn.lili.cache.CachePrefix; import cn.lili.modules.statistics.util.StatisticsSuffix; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.redis.core.DefaultTypedTuple; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.Date; import java.util.Random; @@ -21,7 +21,7 @@ import java.util.Set; * @since v7.0 * 2021/1/15 16:25 */ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest class CacheTest { diff --git a/manager-api/src/test/java/cn/lili/test/elasticsearch/EsTest.java b/manager-api/src/test/java/cn/lili/test/elasticsearch/EsTest.java index e58a180c..e683f2ae 100644 --- a/manager-api/src/test/java/cn/lili/test/elasticsearch/EsTest.java +++ b/manager-api/src/test/java/cn/lili/test/elasticsearch/EsTest.java @@ -17,12 +17,13 @@ import cn.lili.modules.search.service.EsGoodsSearchService; import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.data.domain.Page; +import org.springframework.data.elasticsearch.core.SearchPage; import org.springframework.data.redis.core.StringRedisTemplate; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.ArrayList; import java.util.List; @@ -32,7 +33,7 @@ import java.util.Map; * @author paulG * @since 2020/10/14 **/ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest class EsTest { @@ -59,7 +60,7 @@ class EsTest { void searchGoods() { EsGoodsSearchDTO goodsSearchDTO = new EsGoodsSearchDTO(); // goodsSearchDTO.setKeyword("黄"); - goodsSearchDTO.setProp("IETF_HTTP/3"); +// goodsSearchDTO.setProp("IETF_HTTP/3"); // goodsSearchDTO.setPrice("100_20000"); // goodsSearchDTO.setStoreCatId(1L); // goodsSearchDTO.setBrandId(123L); @@ -70,7 +71,7 @@ class EsTest { pageVo.setPageSize(100); pageVo.setOrder("desc"); pageVo.setNotConvert(true); - Page esGoodsIndices = goodsSearchService.searchGoods(goodsSearchDTO, pageVo); + SearchPage esGoodsIndices = goodsSearchService.searchGoods(goodsSearchDTO, pageVo); Assertions.assertNotNull(esGoodsIndices); esGoodsIndices.getContent().forEach(System.out::println); // esGoodsIndices.getContent().forEach(i -> { diff --git a/manager-api/src/test/java/cn/lili/test/order/OrderServiceTest.java b/manager-api/src/test/java/cn/lili/test/order/OrderServiceTest.java index 70d25747..98521a24 100644 --- a/manager-api/src/test/java/cn/lili/test/order/OrderServiceTest.java +++ b/manager-api/src/test/java/cn/lili/test/order/OrderServiceTest.java @@ -2,16 +2,16 @@ package cn.lili.test.order; import cn.lili.modules.order.order.service.OrderService; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** * @author paulG * @since 2020/12/1 **/ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest class OrderServiceTest { diff --git a/manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java b/manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java index 3964d5b5..5f40fd62 100644 --- a/manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java +++ b/manager-api/src/test/java/cn/lili/test/promotion/CouponTest.java @@ -15,10 +15,10 @@ import com.baomidou.mybatisplus.core.metadata.IPage; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.ArrayList; import java.util.List; @@ -27,7 +27,7 @@ import java.util.List; * @author paulG * @since 2020/10/29 **/ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest class CouponTest { diff --git a/manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java b/manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java index aed2c386..174f0a5b 100644 --- a/manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java +++ b/manager-api/src/test/java/cn/lili/test/promotion/FullDiscountTest.java @@ -15,10 +15,10 @@ import cn.lili.modules.order.cart.entity.vo.FullDiscountVO; import com.baomidou.mybatisplus.core.metadata.IPage; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.ArrayList; import java.util.List; @@ -27,7 +27,7 @@ import java.util.List; * @author paulG * @since 2020/10/22 **/ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest class FullDiscountTest { diff --git a/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java b/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java index b2f01f38..0eda72ad 100644 --- a/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java +++ b/manager-api/src/test/java/cn/lili/test/promotion/PromotionPriceTest.java @@ -12,10 +12,10 @@ import cn.lili.modules.promotion.service.PromotionService; import com.baomidou.mybatisplus.core.metadata.IPage; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.Map; @@ -23,7 +23,7 @@ import java.util.Map; * @author paulG * @since 2020/11/23 **/ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest class PromotionPriceTest { diff --git a/manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java b/manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java index c0c9eac8..1c0fafc6 100644 --- a/manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java +++ b/manager-api/src/test/java/cn/lili/test/promotion/SeckillTest.java @@ -10,10 +10,10 @@ import cn.lili.modules.promotion.service.SeckillApplyService; import cn.lili.modules.promotion.service.SeckillService; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; import java.util.ArrayList; import java.util.List; @@ -22,7 +22,7 @@ import java.util.List; * @author paulG * @since 2020/10/29 **/ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest class SeckillTest { diff --git a/manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java b/manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java index 36c9c20b..6096dd97 100644 --- a/manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java +++ b/manager-api/src/test/java/cn/lili/test/rocketmq/MsgExtRocketMqTest.java @@ -6,18 +6,18 @@ import cn.lili.common.properties.RocketmqCustomProperties; import org.apache.rocketmq.spring.core.RocketMQTemplate; import org.junit.jupiter.api.Assertions; import org.junit.jupiter.api.Test; -import org.junit.runner.RunWith; +import org.junit.jupiter.api.extension.ExtendWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.messaging.Message; import org.springframework.messaging.support.MessageBuilder; -import org.springframework.test.context.junit4.SpringRunner; +import org.springframework.test.context.junit.jupiter.SpringExtension; /** * @author paulG * @since 2021/1/15 **/ -@RunWith(SpringRunner.class) +@ExtendWith(SpringExtension.class) @SpringBootTest class MsgExtRocketMqTest { diff --git a/pom.xml b/pom.xml index 01a762c9..af3b627f 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.springframework.boot spring-boot-starter-parent - 2.3.4.RELEASE + 2.4.10 @@ -29,7 +29,7 @@ 2.0.3.RELEASE 3.0.0 2.9.10 - 1.18.10 + 1.18.20 4.5.18 3.11.1 2.0.1