From 4c46da9ba1a4bb741498f660c23eeb70ff110fea Mon Sep 17 00:00:00 2001 From: Junling Bu Date: Sun, 29 Dec 2019 18:17:44 +0800 Subject: [PATCH] =?UTF-8?q?chore[litemall-core,=20litemall-db]:=20?= =?UTF-8?q?=E4=B8=A4=E4=B8=AA=E6=A8=A1=E5=9D=97=E7=9A=84Application?= =?UTF-8?q?=E7=B1=BB=E7=A7=BB=E8=87=B3=E6=B5=8B=E8=AF=95=E7=9B=AE=E5=BD=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/linlinjava/litemall/core/AliyunStorageTest.java | 4 ++-- .../java/org/linlinjava/litemall/core/Application.java | 0 .../src/test/java/org/linlinjava/litemall/core/AsyncTest.java | 3 ++- .../java/org/linlinjava/litemall/core/CoreConfigTest.java | 3 ++- .../test/java/org/linlinjava/litemall/core/ExpressTest.java | 3 ++- .../java/org/linlinjava/litemall/core/LocalStorageTest.java | 3 ++- .../src/test/java/org/linlinjava/litemall/core/MailTest.java | 3 ++- .../java/org/linlinjava/litemall/core/QiniuStorageTest.java | 3 ++- .../src/test/java/org/linlinjava/litemall/core/SmsTest.java | 3 ++- .../src/test/java/org/linlinjava/litemall/core/TaskTest.java | 3 ++- .../java/org/linlinjava/litemall/core/TencentStorageTest.java | 3 ++- .../java/org/linlinjava/litemall/db/Application.java | 0 .../test/java/org/linlinjava/litemall/db/DbConfigTest.java | 3 ++- .../src/test/java/org/linlinjava/litemall/db/DbTest.java | 3 ++- .../java/org/linlinjava/litemall/db/MapperReturnTest.java | 3 ++- .../test/java/org/linlinjava/litemall/db/StatMapperTest.java | 3 ++- .../src/test/java/org/linlinjava/litemall/db/StockTest.java | 3 ++- 17 files changed, 30 insertions(+), 16 deletions(-) rename litemall-core/src/{main => test}/java/org/linlinjava/litemall/core/Application.java (100%) rename litemall-db/src/{main => test}/java/org/linlinjava/litemall/db/Application.java (100%) diff --git a/litemall-core/src/test/java/org/linlinjava/litemall/core/AliyunStorageTest.java b/litemall-core/src/test/java/org/linlinjava/litemall/core/AliyunStorageTest.java index 18983c9e..2761bce2 100644 --- a/litemall-core/src/test/java/org/linlinjava/litemall/core/AliyunStorageTest.java +++ b/litemall-core/src/test/java/org/linlinjava/litemall/core/AliyunStorageTest.java @@ -8,7 +8,7 @@ import org.linlinjava.litemall.core.storage.AliyunStorage; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.io.Resource; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; import java.io.File; @@ -16,7 +16,7 @@ import java.io.FileInputStream; import java.io.IOException; @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest public class AliyunStorageTest { diff --git a/litemall-core/src/main/java/org/linlinjava/litemall/core/Application.java b/litemall-core/src/test/java/org/linlinjava/litemall/core/Application.java similarity index 100% rename from litemall-core/src/main/java/org/linlinjava/litemall/core/Application.java rename to litemall-core/src/test/java/org/linlinjava/litemall/core/Application.java diff --git a/litemall-core/src/test/java/org/linlinjava/litemall/core/AsyncTest.java b/litemall-core/src/test/java/org/linlinjava/litemall/core/AsyncTest.java index 5a6ca9c4..5744be71 100644 --- a/litemall-core/src/test/java/org/linlinjava/litemall/core/AsyncTest.java +++ b/litemall-core/src/test/java/org/linlinjava/litemall/core/AsyncTest.java @@ -5,13 +5,14 @@ import org.junit.runner.RunWith; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; /** * 异步测试 */ @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest public class AsyncTest { diff --git a/litemall-core/src/test/java/org/linlinjava/litemall/core/CoreConfigTest.java b/litemall-core/src/test/java/org/linlinjava/litemall/core/CoreConfigTest.java index d494451b..f6b63dc9 100644 --- a/litemall-core/src/test/java/org/linlinjava/litemall/core/CoreConfigTest.java +++ b/litemall-core/src/test/java/org/linlinjava/litemall/core/CoreConfigTest.java @@ -8,10 +8,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.env.Environment; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest public class CoreConfigTest { private final Log logger = LogFactory.getLog(CoreConfigTest.class); diff --git a/litemall-core/src/test/java/org/linlinjava/litemall/core/ExpressTest.java b/litemall-core/src/test/java/org/linlinjava/litemall/core/ExpressTest.java index 85d036ff..346f0486 100644 --- a/litemall-core/src/test/java/org/linlinjava/litemall/core/ExpressTest.java +++ b/litemall-core/src/test/java/org/linlinjava/litemall/core/ExpressTest.java @@ -9,10 +9,11 @@ import org.linlinjava.litemall.core.express.dao.ExpressInfo; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest(classes = Application.class) public class ExpressTest { diff --git a/litemall-core/src/test/java/org/linlinjava/litemall/core/LocalStorageTest.java b/litemall-core/src/test/java/org/linlinjava/litemall/core/LocalStorageTest.java index 79297509..7cb0fe8b 100644 --- a/litemall-core/src/test/java/org/linlinjava/litemall/core/LocalStorageTest.java +++ b/litemall-core/src/test/java/org/linlinjava/litemall/core/LocalStorageTest.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.io.Resource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; import java.io.File; @@ -16,7 +17,7 @@ import java.io.FileInputStream; import java.io.IOException; @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest public class LocalStorageTest { diff --git a/litemall-core/src/test/java/org/linlinjava/litemall/core/MailTest.java b/litemall-core/src/test/java/org/linlinjava/litemall/core/MailTest.java index 160df655..c0cc6c74 100644 --- a/litemall-core/src/test/java/org/linlinjava/litemall/core/MailTest.java +++ b/litemall-core/src/test/java/org/linlinjava/litemall/core/MailTest.java @@ -11,6 +11,7 @@ import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Primary; import org.springframework.core.task.SyncTaskExecutor; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; import java.util.concurrent.Executor; @@ -26,7 +27,7 @@ import java.util.concurrent.Executor; * 2. 在相应的邮件服务器设置正确 */ @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest public class MailTest { diff --git a/litemall-core/src/test/java/org/linlinjava/litemall/core/QiniuStorageTest.java b/litemall-core/src/test/java/org/linlinjava/litemall/core/QiniuStorageTest.java index dab9a6ba..97c6928d 100644 --- a/litemall-core/src/test/java/org/linlinjava/litemall/core/QiniuStorageTest.java +++ b/litemall-core/src/test/java/org/linlinjava/litemall/core/QiniuStorageTest.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.io.Resource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; import java.io.File; @@ -16,7 +17,7 @@ import java.io.FileInputStream; import java.io.IOException; @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest public class QiniuStorageTest { diff --git a/litemall-core/src/test/java/org/linlinjava/litemall/core/SmsTest.java b/litemall-core/src/test/java/org/linlinjava/litemall/core/SmsTest.java index 331dc866..44a2891e 100644 --- a/litemall-core/src/test/java/org/linlinjava/litemall/core/SmsTest.java +++ b/litemall-core/src/test/java/org/linlinjava/litemall/core/SmsTest.java @@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import; import org.springframework.context.annotation.Primary; import org.springframework.core.task.SyncTaskExecutor; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; import java.util.concurrent.Executor; @@ -28,7 +29,7 @@ import java.util.concurrent.Executor; * 3. 在当前测试类设置好正确的手机号码 */ @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest public class SmsTest { diff --git a/litemall-core/src/test/java/org/linlinjava/litemall/core/TaskTest.java b/litemall-core/src/test/java/org/linlinjava/litemall/core/TaskTest.java index 9f821bf8..a76cc442 100644 --- a/litemall-core/src/test/java/org/linlinjava/litemall/core/TaskTest.java +++ b/litemall-core/src/test/java/org/linlinjava/litemall/core/TaskTest.java @@ -16,6 +16,7 @@ import org.springframework.context.annotation.Primary; import org.springframework.core.env.Environment; import org.springframework.core.task.SyncTaskExecutor; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; import java.time.LocalDateTime; @@ -26,7 +27,7 @@ import java.util.concurrent.Executor; import java.util.concurrent.TimeUnit; @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest public class TaskTest { private final Log logger = LogFactory.getLog(TaskTest.class); diff --git a/litemall-core/src/test/java/org/linlinjava/litemall/core/TencentStorageTest.java b/litemall-core/src/test/java/org/linlinjava/litemall/core/TencentStorageTest.java index 459ecec6..44a05660 100644 --- a/litemall-core/src/test/java/org/linlinjava/litemall/core/TencentStorageTest.java +++ b/litemall-core/src/test/java/org/linlinjava/litemall/core/TencentStorageTest.java @@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.io.Resource; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; import java.io.File; @@ -16,7 +17,7 @@ import java.io.FileInputStream; import java.io.IOException; @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest public class TencentStorageTest { diff --git a/litemall-db/src/main/java/org/linlinjava/litemall/db/Application.java b/litemall-db/src/test/java/org/linlinjava/litemall/db/Application.java similarity index 100% rename from litemall-db/src/main/java/org/linlinjava/litemall/db/Application.java rename to litemall-db/src/test/java/org/linlinjava/litemall/db/Application.java diff --git a/litemall-db/src/test/java/org/linlinjava/litemall/db/DbConfigTest.java b/litemall-db/src/test/java/org/linlinjava/litemall/db/DbConfigTest.java index 6355804e..607005b2 100644 --- a/litemall-db/src/test/java/org/linlinjava/litemall/db/DbConfigTest.java +++ b/litemall-db/src/test/java/org/linlinjava/litemall/db/DbConfigTest.java @@ -6,10 +6,11 @@ import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.core.env.Environment; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest public class DbConfigTest { @Autowired diff --git a/litemall-db/src/test/java/org/linlinjava/litemall/db/DbTest.java b/litemall-db/src/test/java/org/linlinjava/litemall/db/DbTest.java index bdf4f2ae..bd010882 100644 --- a/litemall-db/src/test/java/org/linlinjava/litemall/db/DbTest.java +++ b/litemall-db/src/test/java/org/linlinjava/litemall/db/DbTest.java @@ -4,10 +4,11 @@ import org.junit.Test; import org.junit.runner.RunWith; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest public class DbTest { @Test diff --git a/litemall-db/src/test/java/org/linlinjava/litemall/db/MapperReturnTest.java b/litemall-db/src/test/java/org/linlinjava/litemall/db/MapperReturnTest.java index 31fd1420..467e1088 100644 --- a/litemall-db/src/test/java/org/linlinjava/litemall/db/MapperReturnTest.java +++ b/litemall-db/src/test/java/org/linlinjava/litemall/db/MapperReturnTest.java @@ -8,10 +8,11 @@ import org.linlinjava.litemall.db.domain.LitemallSystem; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest public class MapperReturnTest { diff --git a/litemall-db/src/test/java/org/linlinjava/litemall/db/StatMapperTest.java b/litemall-db/src/test/java/org/linlinjava/litemall/db/StatMapperTest.java index d4dfee43..1a853371 100644 --- a/litemall-db/src/test/java/org/linlinjava/litemall/db/StatMapperTest.java +++ b/litemall-db/src/test/java/org/linlinjava/litemall/db/StatMapperTest.java @@ -6,13 +6,14 @@ import org.linlinjava.litemall.db.dao.StatMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; import java.util.List; import java.util.Map; @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest public class StatMapperTest { diff --git a/litemall-db/src/test/java/org/linlinjava/litemall/db/StockTest.java b/litemall-db/src/test/java/org/linlinjava/litemall/db/StockTest.java index 760bbeeb..79bcd6ad 100644 --- a/litemall-db/src/test/java/org/linlinjava/litemall/db/StockTest.java +++ b/litemall-db/src/test/java/org/linlinjava/litemall/db/StockTest.java @@ -6,10 +6,11 @@ import org.linlinjava.litemall.db.dao.GoodsProductMapper; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; +import org.springframework.test.context.junit4.SpringRunner; import org.springframework.test.context.web.WebAppConfiguration; @WebAppConfiguration -@RunWith(SpringJUnit4ClassRunner.class) +@RunWith(SpringRunner.class) @SpringBootTest public class StockTest { @Autowired