xiongzhu 3 жил өмнө
parent
commit
e7a6229a26
38 өөрчлөгдсөн 212 нэмэгдсэн , 64 устгасан
  1. 12 1
      src/main/java/com/izouma/nineth/config/CacheConfig.java
  2. 3 0
      src/main/java/com/izouma/nineth/repo/CollectionRepo.java
  3. 7 2
      src/test/java/com/izouma/nineth/AES.java
  4. 7 2
      src/test/java/com/izouma/nineth/AntChainTest.java
  5. 1 1
      src/test/java/com/izouma/nineth/ApplicationTests.java
  6. 6 2
      src/test/java/com/izouma/nineth/Bucket4jTest.java
  7. 7 2
      src/test/java/com/izouma/nineth/CDNTest.java
  8. 1 1
      src/test/java/com/izouma/nineth/ContentAuditTest.java
  9. 6 2
      src/test/java/com/izouma/nineth/DebounceTest.java
  10. 1 1
      src/test/java/com/izouma/nineth/GenCodeTest.java
  11. 1 1
      src/test/java/com/izouma/nineth/PayEaseTest.java
  12. 6 2
      src/test/java/com/izouma/nineth/PayOrderTest.java
  13. 6 2
      src/test/java/com/izouma/nineth/RedisTest.java
  14. 6 2
      src/test/java/com/izouma/nineth/TestClassTest.java
  15. 6 2
      src/test/java/com/izouma/nineth/TestRedissonLock.java
  16. 6 2
      src/test/java/com/izouma/nineth/WxTest.java
  17. 6 2
      src/test/java/com/izouma/nineth/repo/AuctionRecordRepoTest.java
  18. 18 2
      src/test/java/com/izouma/nineth/repo/CollectionRepoTest.java
  19. 6 2
      src/test/java/com/izouma/nineth/repo/OrderRepoTest.java
  20. 1 1
      src/test/java/com/izouma/nineth/repo/SmsRecordRepoTest.java
  21. 6 2
      src/test/java/com/izouma/nineth/repo/UserPropertyRepoTest.java
  22. 1 1
      src/test/java/com/izouma/nineth/repo/UserRepoTest.java
  23. 6 2
      src/test/java/com/izouma/nineth/service/AdapayMerchantServiceTest.java
  24. 6 2
      src/test/java/com/izouma/nineth/service/AdapayServiceTest.java
  25. 1 1
      src/test/java/com/izouma/nineth/service/AdapayTest.java
  26. 6 2
      src/test/java/com/izouma/nineth/service/AirDropServiceTest.java
  27. 6 2
      src/test/java/com/izouma/nineth/service/AssetMintServiceTest.java
  28. 6 2
      src/test/java/com/izouma/nineth/service/AuctionActivityServiceTest.java
  29. 6 2
      src/test/java/com/izouma/nineth/service/AuctionOrderServiceTest.java
  30. 6 2
      src/test/java/com/izouma/nineth/service/AuctionRecordServiceTest.java
  31. 6 2
      src/test/java/com/izouma/nineth/service/IdentityAuthServiceTest.java
  32. 8 2
      src/test/java/com/izouma/nineth/service/NFTServiceTest.java
  33. 9 2
      src/test/java/com/izouma/nineth/service/OrderServiceTest.java
  34. 6 2
      src/test/java/com/izouma/nineth/service/ShowroomServiceTest.java
  35. 1 1
      src/test/java/com/izouma/nineth/service/StatisticServiceTest.java
  36. 7 1
      src/test/java/com/izouma/nineth/service/UserServiceTest.java
  37. 6 2
      src/test/java/com/izouma/nineth/service/WithdrawApplyServiceTest.java
  38. 6 2
      src/test/java/com/izouma/nineth/service/sms/SmsServiceTest.java

+ 12 - 1
src/main/java/com/izouma/nineth/config/CacheConfig.java

@@ -10,6 +10,7 @@ import com.fasterxml.jackson.databind.module.SimpleModule;
 import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
 import com.fasterxml.jackson.datatype.hibernate5.Hibernate5Module;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.domain.User;
 import org.springframework.boot.autoconfigure.AutoConfigureAfter;
 import org.springframework.boot.autoconfigure.cache.CacheAutoConfiguration;
@@ -94,7 +95,9 @@ public class CacheConfig {
                 .enable(Hibernate5Module.Feature.FORCE_LAZY_LOADING));
         mapper.registerModule(new JavaTimeModule());
         mapper.configure(SerializationFeature.FAIL_ON_EMPTY_BEANS, false);
-        mapper.setConfig(mapper.getSerializationConfig().withView(User.View.Detail.class));
+        mapper.setConfig(mapper.getSerializationConfig()
+                .withView(User.View.Detail.class)
+                .withView(Collection.View.Detail.class));
         SimpleModule simpleModule = new SimpleModule();
         simpleModule.addSerializer(Long.class, ToStringSerializer.instance);
         simpleModule.addSerializer(Long.TYPE, ToStringSerializer.instance);
@@ -107,6 +110,14 @@ public class CacheConfig {
                 .entryTtl(Duration.ofSeconds(10))
                 .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisTemplate.getValueSerializer())));
 
+        cacheNamesConfigurationMap.put("collection", RedisCacheConfiguration.defaultCacheConfig()
+                .entryTtl(Duration.ofDays(1))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(serializer)));
+
+        cacheNamesConfigurationMap.put("collectionInfo", RedisCacheConfiguration.defaultCacheConfig()
+                .entryTtl(Duration.ofDays(1))
+                .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(serializer)));
+
         cacheNamesConfigurationMap.put("myUserInfo", RedisCacheConfiguration.defaultCacheConfig()
                 .entryTtl(Duration.ofHours(1))
                 .serializeValuesWith(RedisSerializationContext.SerializationPair.fromSerializer(redisTemplate.getValueSerializer())));

+ 3 - 0
src/main/java/com/izouma/nineth/repo/CollectionRepo.java

@@ -1,5 +1,6 @@
 package com.izouma.nineth.repo;
 
+import com.fasterxml.jackson.annotation.JsonView;
 import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.dto.CollectionInfoDTO;
 import com.izouma.nineth.dto.CollectionStockAndSale;
@@ -48,12 +49,14 @@ public interface CollectionRepo extends JpaRepository<Collection, Long>, JpaSpec
                 Integer totalQuota, BigDecimal minimumCharge);
 
     @Cacheable("collection")
+    @JsonView(Collection.View.Detail.class)
     Optional<Collection> findById(@Nonnull Long id);
 
     @Query("select c from Collection c where c.del = false and c.id = ?1")
     Optional<Collection> findDetailById(@Nonnull Long id);
 
     @Cacheable("collectionInfo")
+    @JsonView(Collection.View.Detail.class)
     @Query("select new com.izouma.nineth.dto.CollectionInfoDTO(c,cp) from Collection c left join CollectionPrivilege cp " +
             "on c.id = cp.collectionId where c.id = ?1 ")
     Optional<CollectionInfoDTO> findInfoById(@Nonnull Long id);

+ 7 - 2
src/test/java/com/izouma/nineth/AES.java

@@ -4,10 +4,13 @@ import com.izouma.nineth.domain.IdentityAuth;
 import com.izouma.nineth.dto.UserBankCard;
 import com.izouma.nineth.repo.IdentityAuthRepo;
 import com.izouma.nineth.repo.UserBankCardRepo;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+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.domain.PageRequest;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -15,7 +18,9 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
 
-public class AES extends ApplicationTests {
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class AES {
 
     @Autowired
     private UserBankCardRepo userBankCardRepo;

+ 7 - 2
src/test/java/com/izouma/nineth/AntChainTest.java

@@ -7,10 +7,15 @@ import com.antfinancial.mychain.baas.tool.restclient.model.Method;
 import com.antfinancial.mychain.baas.tool.restclient.model.ReceiptDecoration;
 import com.antfinancial.mychain.baas.tool.restclient.response.BaseResp;
 import com.izouma.nineth.utils.HashUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
-public class AntChainTest extends ApplicationTests {
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class AntChainTest {
     @Autowired
     private RestClient restClient;
 

+ 1 - 1
src/test/java/com/izouma/nineth/ApplicationTests.java

@@ -1,6 +1,6 @@
 package com.izouma.nineth;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringRunner;

+ 6 - 2
src/test/java/com/izouma/nineth/Bucket4jTest.java

@@ -2,12 +2,16 @@ package com.izouma.nineth;
 
 import io.github.bucket4j.*;
 import io.github.bucket4j.distributed.proxy.ProxyManager;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.time.Duration;
 
-public class Bucket4jTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class Bucket4jTest {
     @Autowired
     private ProxyManager<String> buckets;
 

+ 7 - 2
src/test/java/com/izouma/nineth/CDNTest.java

@@ -6,11 +6,16 @@ import com.aliyun.cdn20180510.Client;
 import com.aliyun.cdn20180510.models.RefreshObjectCachesRequest;
 import com.aliyun.cdn20180510.models.RefreshObjectCachesResponse;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+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.junit.jupiter.SpringExtension;
 
 @Slf4j
-public class CDNTest extends ApplicationTests {
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class CDNTest {
     @Autowired
     private Client cdnClient;
 

+ 1 - 1
src/test/java/com/izouma/nineth/ContentAuditTest.java

@@ -12,7 +12,7 @@ import com.aliyuncs.http.FormatType;
 import com.aliyuncs.http.HttpResponse;
 import com.aliyuncs.profile.DefaultProfile;
 import com.aliyuncs.profile.IClientProfile;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.io.UnsupportedEncodingException;
 import java.nio.charset.StandardCharsets;

+ 6 - 2
src/test/java/com/izouma/nineth/DebounceTest.java

@@ -1,10 +1,14 @@
 package com.izouma.nineth;
 
 import com.izouma.nineth.service.DebounceTestService;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public class DebounceTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class DebounceTest {
     @Autowired
     private DebounceTestService debounceTestService;
 

+ 1 - 1
src/test/java/com/izouma/nineth/GenCodeTest.java

@@ -7,7 +7,7 @@ import com.izouma.nineth.utils.FileUtils;
 import freemarker.template.Configuration;
 import freemarker.template.Template;
 import freemarker.template.TemplateException;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

+ 1 - 1
src/test/java/com/izouma/nineth/PayEaseTest.java

@@ -21,7 +21,7 @@ import com.upay.sdk.transferDomestic.executer.TransferDomesticAccountExecuter;
 import com.upay.sdk.transferDomestic.executer.TransferDomesticOrderExecuter;
 import com.upay.sdk.transferDomestic.executer.TransferDomesticSingleOrderExecuter;
 import lombok.extern.slf4j.Slf4j;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.math.RoundingMode;

+ 6 - 2
src/test/java/com/izouma/nineth/PayOrderTest.java

@@ -4,10 +4,14 @@ package com.izouma.nineth;
 import com.izouma.nineth.config.Constants;
 import com.izouma.nineth.dto.PayQuery;
 import com.izouma.nineth.service.OrderPayService;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public class PayOrderTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class PayOrderTest {
     @Autowired
     private OrderPayService orderPayService;
 

+ 6 - 2
src/test/java/com/izouma/nineth/RedisTest.java

@@ -1,12 +1,16 @@
 package com.izouma.nineth;
 
 import com.izouma.nineth.config.RedisKeys;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.redis.core.BoundHashOperations;
 import org.springframework.data.redis.core.RedisTemplate;
 
-public class RedisTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class RedisTest {
     @Autowired
     private RedisTemplate<String, Object> redisTemplate;
 

+ 6 - 2
src/test/java/com/izouma/nineth/TestClassTest.java

@@ -3,10 +3,14 @@ package com.izouma.nineth;
 
 import com.izouma.nineth.domain.TestClass;
 import com.izouma.nineth.repo.TestClassRepo;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public class TestClassTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class TestClassTest {
     @Autowired
     private TestClassRepo testClassRepo;
 

+ 6 - 2
src/test/java/com/izouma/nineth/TestRedissonLock.java

@@ -1,13 +1,17 @@
 package com.izouma.nineth;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.redisson.api.RLock;
 import org.redisson.api.RedissonClient;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.concurrent.TimeUnit;
 
-public class TestRedissonLock extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class TestRedissonLock {
 
     @Autowired
     private RedissonClient redissonClient;

+ 6 - 2
src/test/java/com/izouma/nineth/WxTest.java

@@ -4,10 +4,14 @@ import com.github.binarywang.wxpay.bean.request.WxPayRefundRequest;
 import com.github.binarywang.wxpay.exception.WxPayException;
 import com.github.binarywang.wxpay.service.WxPayService;
 import com.izouma.nineth.utils.SnowflakeIdWorker;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public class WxTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class WxTest {
     @Autowired
     private WxPayService wxPayService;
 

+ 6 - 2
src/test/java/com/izouma/nineth/repo/AuctionRecordRepoTest.java

@@ -3,10 +3,14 @@ package com.izouma.nineth.repo;
 
 import com.izouma.nineth.ApplicationTests;
 import com.izouma.nineth.enums.AuctionType;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public class AuctionRecordRepoTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class AuctionRecordRepoTest {
     @Autowired
     private AuctionRecordRepo auctionRecordRepo;
 

+ 18 - 2
src/test/java/com/izouma/nineth/repo/CollectionRepoTest.java

@@ -5,17 +5,23 @@ import com.izouma.nineth.domain.Collection;
 import com.izouma.nineth.enums.OrderStatus;
 import com.izouma.nineth.exception.BusinessException;
 import com.izouma.nineth.service.AssetService;
+import com.izouma.nineth.service.CacheService;
 import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
+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.jpa.domain.Specification;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
 
 import javax.persistence.criteria.*;
 import java.util.Arrays;
 import java.util.List;
 import java.util.concurrent.atomic.AtomicInteger;
 
-public class CollectionRepoTest extends ApplicationTests {
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class CollectionRepoTest {
     @Autowired
     private CollectionRepo   collectionRepo;
     @Autowired
@@ -26,6 +32,16 @@ public class CollectionRepoTest extends ApplicationTests {
     private UserPropertyRepo userPropertyRepo;
     @Autowired
     private OrderRepo        orderRepo;
+    @Autowired
+    private CacheService     cacheService;
+
+    @Test
+    public void findById() {
+        cacheService.clearCollection(8115657L);
+        int i1 = collectionRepo.findById(8115657L).get().getTags().size();
+        int i2 = collectionRepo.findById(8115657L).get().getTags().size();
+        assert (i1 == i2);
+    }
 
     @Test
     public void updateCDN() {

+ 6 - 2
src/test/java/com/izouma/nineth/repo/OrderRepoTest.java

@@ -2,7 +2,7 @@ package com.izouma.nineth.repo;
 
 import com.alibaba.fastjson.JSONObject;
 import com.izouma.nineth.ApplicationTests;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.time.LocalDate;
@@ -12,7 +12,11 @@ import java.util.List;
 import java.util.Map;
 
 
-public class OrderRepoTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class OrderRepoTest {
 
     @Autowired
     private OrderRepo        orderRepo;

+ 1 - 1
src/test/java/com/izouma/nineth/repo/SmsRecordRepoTest.java

@@ -1,7 +1,7 @@
 package com.izouma.nineth.repo;
 
 import com.izouma.nineth.domain.SmsRecord;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

+ 6 - 2
src/test/java/com/izouma/nineth/repo/UserPropertyRepoTest.java

@@ -13,7 +13,7 @@ import com.izouma.nineth.enums.OrderStatus;
 import com.izouma.nineth.service.CacheService;
 import com.izouma.nineth.utils.excel.UploadDataListener;
 import org.apache.commons.lang3.ObjectUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.File;
@@ -23,7 +23,11 @@ import java.util.concurrent.atomic.AtomicInteger;
 import java.util.stream.Collectors;
 
 
-public class UserPropertyRepoTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class UserPropertyRepoTest {
 
     @Autowired
     private UserPropertyRepo userPropertyRepo;

+ 1 - 1
src/test/java/com/izouma/nineth/repo/UserRepoTest.java

@@ -7,7 +7,7 @@ import com.izouma.nineth.domain.User;
 import com.izouma.nineth.enums.AuthorityName;
 import com.izouma.nineth.security.Authority;
 import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

+ 6 - 2
src/test/java/com/izouma/nineth/service/AdapayMerchantServiceTest.java

@@ -1,12 +1,16 @@
 package com.izouma.nineth.service;
 
 import com.izouma.nineth.ApplicationTests;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import static org.junit.Assert.*;
 
-public class AdapayMerchantServiceTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class AdapayMerchantServiceTest {
     @Autowired
     private AdapayMerchantService adapayMerchantService;
 

+ 6 - 2
src/test/java/com/izouma/nineth/service/AdapayServiceTest.java

@@ -10,7 +10,7 @@ import com.izouma.nineth.domain.AdaTrade;
 import com.izouma.nineth.repo.GiftOrderRepo;
 import com.izouma.nineth.repo.OrderRepo;
 import com.izouma.nineth.utils.SnowflakeIdWorker;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.HashMap;
@@ -20,7 +20,11 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
 
-public class AdapayServiceTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class AdapayServiceTest {
     @Autowired
     private OrderRepo         orderRepo;
     @Autowired

+ 1 - 1
src/test/java/com/izouma/nineth/service/AdapayTest.java

@@ -15,7 +15,7 @@ import com.izouma.nineth.utils.excel.LocalDateTimeConverter;
 import lombok.Data;
 import org.apache.commons.collections.MapUtils;
 import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;

+ 6 - 2
src/test/java/com/izouma/nineth/service/AirDropServiceTest.java

@@ -14,7 +14,7 @@ import com.izouma.nineth.repo.AirDropRepo;
 import com.izouma.nineth.repo.AssetRepo;
 import com.izouma.nineth.repo.TokenHistoryRepo;
 import com.izouma.nineth.utils.excel.UploadDataListener;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.File;
@@ -23,7 +23,11 @@ import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
-public class AirDropServiceTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class AirDropServiceTest {
     @Autowired
     AirDropService    airDropService;
     @Autowired

+ 6 - 2
src/test/java/com/izouma/nineth/service/AssetMintServiceTest.java

@@ -1,12 +1,16 @@
 package com.izouma.nineth.service;
 
 import com.izouma.nineth.ApplicationTests;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import static org.junit.Assert.*;
 
-public class AssetMintServiceTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class AssetMintServiceTest {
     @Autowired
     private AssetMintService assetMintService;
 

+ 6 - 2
src/test/java/com/izouma/nineth/service/AuctionActivityServiceTest.java

@@ -5,14 +5,18 @@ import com.izouma.nineth.domain.AuctionActivity;
 import com.izouma.nineth.dto.auction.AuctionInputDTO;
 import com.izouma.nineth.enums.AuctionStatus;
 import com.izouma.nineth.repo.AuctionActivityRepo;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 
-public class AuctionActivityServiceTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class AuctionActivityServiceTest {
 
     @Autowired
     private AuctionActivityService auctionActivityService;

+ 6 - 2
src/test/java/com/izouma/nineth/service/AuctionOrderServiceTest.java

@@ -2,10 +2,14 @@ package com.izouma.nineth.service;
 
 
 import com.izouma.nineth.ApplicationTests;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public class AuctionOrderServiceTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class AuctionOrderServiceTest {
     @Autowired
     private AuctionOrderService auctionOrderService;
 

+ 6 - 2
src/test/java/com/izouma/nineth/service/AuctionRecordServiceTest.java

@@ -3,10 +3,14 @@ package com.izouma.nineth.service;
 
 import com.izouma.nineth.ApplicationTests;
 import com.izouma.nineth.dto.PageQuery;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public class AuctionRecordServiceTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class AuctionRecordServiceTest {
     @Autowired
     private AuctionRecordService auctionRecordService;
 

+ 6 - 2
src/test/java/com/izouma/nineth/service/IdentityAuthServiceTest.java

@@ -6,12 +6,16 @@ import com.izouma.nineth.domain.User;
 import com.izouma.nineth.enums.AuthStatus;
 import com.izouma.nineth.repo.IdentityAuthRepo;
 import com.izouma.nineth.repo.UserRepo;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.List;
 
-public class IdentityAuthServiceTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class IdentityAuthServiceTest {
     @Autowired
     private IdentityAuthService identityAuthService;
     @Autowired

+ 8 - 2
src/test/java/com/izouma/nineth/service/NFTServiceTest.java

@@ -19,15 +19,21 @@ import com.izouma.nineth.utils.TokenUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.codec.binary.Hex;
 import org.apache.commons.lang3.RandomStringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.boot.test.context.SpringBootTest;
 
 import java.io.File;
 import java.math.BigInteger;
 import java.util.Scanner;
 
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
 @Slf4j
-public class NFTServiceTest extends ApplicationTests {
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class NFTServiceTest {
     @Autowired
     private NFTService           nftService;
     @Autowired

+ 9 - 2
src/test/java/com/izouma/nineth/service/OrderServiceTest.java

@@ -18,7 +18,7 @@ import com.izouma.nineth.utils.SnowflakeIdWorker;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.MapUtils;
 import org.apache.rocketmq.spring.core.RocketMQTemplate;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.IOException;
@@ -30,8 +30,15 @@ import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ForkJoinPool;
 import java.util.stream.Collectors;
 
+
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
 @Slf4j
-public class OrderServiceTest extends ApplicationTests {
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
+public class OrderServiceTest {
     @Autowired
     private OrderService       orderService;
     @Autowired

+ 6 - 2
src/test/java/com/izouma/nineth/service/ShowroomServiceTest.java

@@ -4,7 +4,7 @@ import com.izouma.nineth.ApplicationTests;
 import com.izouma.nineth.domain.ShowCollection;
 import com.izouma.nineth.domain.Showroom;
 import com.izouma.nineth.dto.PageQuery;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
@@ -12,7 +12,11 @@ import java.util.List;
 import java.util.Map;
 
 
-public class ShowroomServiceTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class ShowroomServiceTest {
 
     @Autowired
     private ShowroomService showroomService;

+ 1 - 1
src/test/java/com/izouma/nineth/service/StatisticServiceTest.java

@@ -1,6 +1,6 @@
 package com.izouma.nineth.service;
 
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.junit.runner.RunWith;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;

+ 7 - 1
src/test/java/com/izouma/nineth/service/UserServiceTest.java

@@ -19,7 +19,7 @@ import com.izouma.nineth.service.storage.StorageService;
 import com.izouma.nineth.utils.BankUtils;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.io.IOException;
@@ -27,7 +27,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.regex.Pattern;
 
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+
 @Slf4j
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT)
 public class UserServiceTest extends ApplicationTests {
 
     @Autowired

+ 6 - 2
src/test/java/com/izouma/nineth/service/WithdrawApplyServiceTest.java

@@ -11,7 +11,7 @@ import com.izouma.nineth.repo.UserBankCardRepo;
 import com.izouma.nineth.repo.WithdrawApplyRepo;
 import com.izouma.nineth.utils.SnowflakeIdWorker;
 import lombok.AllArgsConstructor;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.math.BigDecimal;
@@ -21,7 +21,11 @@ import java.util.stream.Collectors;
 
 import static org.junit.jupiter.api.Assertions.*;
 
-public class WithdrawApplyServiceTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class WithdrawApplyServiceTest {
     @Autowired
     private WithdrawApplyRepo    withdrawApplyRepo;
     @Autowired

+ 6 - 2
src/test/java/com/izouma/nineth/service/sms/SmsServiceTest.java

@@ -1,10 +1,14 @@
 package com.izouma.nineth.service.sms;
 
 import com.izouma.nineth.ApplicationTests;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 
-public class SmsServiceTest extends ApplicationTests {
+import org.springframework.boot.test.context.SpringBootTest;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.springframework.test.context.junit.jupiter.SpringExtension;
+@ExtendWith(SpringExtension.class)
+@SpringBootTest(webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class SmsServiceTest {
     @Autowired
     private SmsService smsService;