Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
jinli gu
Litemall
Commits
4c46da9b
Commit
4c46da9b
authored
Dec 29, 2019
by
Junling Bu
Browse files
chore[litemall-core, litemall-db]: 两个模块的Application类移至测试目录
parent
83b6e4e1
Changes
17
Hide whitespace changes
Inline
Side-by-side
litemall-core/src/test/java/org/linlinjava/litemall/core/AliyunStorageTest.java
View file @
4c46da9b
...
@@ -8,7 +8,7 @@ import org.linlinjava.litemall.core.storage.AliyunStorage;
...
@@ -8,7 +8,7 @@ import org.linlinjava.litemall.core.storage.AliyunStorage;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.core.io.Resource
;
import
org.springframework.core.io.Resource
;
import
org.springframework.test.context.junit4.Spring
JUnit4Class
Runner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
java.io.File
;
import
java.io.File
;
...
@@ -16,7 +16,7 @@ import java.io.FileInputStream;
...
@@ -16,7 +16,7 @@ import java.io.FileInputStream;
import
java.io.IOException
;
import
java.io.IOException
;
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
public
class
AliyunStorageTest
{
public
class
AliyunStorageTest
{
...
...
litemall-core/src/
main
/java/org/linlinjava/litemall/core/Application.java
→
litemall-core/src/
test
/java/org/linlinjava/litemall/core/Application.java
View file @
4c46da9b
File moved
litemall-core/src/test/java/org/linlinjava/litemall/core/AsyncTest.java
View file @
4c46da9b
...
@@ -5,13 +5,14 @@ import org.junit.runner.RunWith;
...
@@ -5,13 +5,14 @@ import org.junit.runner.RunWith;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
/**
/**
* 异步测试
* 异步测试
*/
*/
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
public
class
AsyncTest
{
public
class
AsyncTest
{
...
...
litemall-core/src/test/java/org/linlinjava/litemall/core/CoreConfigTest.java
View file @
4c46da9b
...
@@ -8,10 +8,11 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -8,10 +8,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.core.env.Environment
;
import
org.springframework.core.env.Environment
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
public
class
CoreConfigTest
{
public
class
CoreConfigTest
{
private
final
Log
logger
=
LogFactory
.
getLog
(
CoreConfigTest
.
class
);
private
final
Log
logger
=
LogFactory
.
getLog
(
CoreConfigTest
.
class
);
...
...
litemall-core/src/test/java/org/linlinjava/litemall/core/ExpressTest.java
View file @
4c46da9b
...
@@ -9,10 +9,11 @@ import org.linlinjava.litemall.core.express.dao.ExpressInfo;
...
@@ -9,10 +9,11 @@ import org.linlinjava.litemall.core.express.dao.ExpressInfo;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
(
classes
=
Application
.
class
)
@SpringBootTest
(
classes
=
Application
.
class
)
public
class
ExpressTest
{
public
class
ExpressTest
{
...
...
litemall-core/src/test/java/org/linlinjava/litemall/core/LocalStorageTest.java
View file @
4c46da9b
...
@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.core.io.Resource
;
import
org.springframework.core.io.Resource
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
java.io.File
;
import
java.io.File
;
...
@@ -16,7 +17,7 @@ import java.io.FileInputStream;
...
@@ -16,7 +17,7 @@ import java.io.FileInputStream;
import
java.io.IOException
;
import
java.io.IOException
;
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
public
class
LocalStorageTest
{
public
class
LocalStorageTest
{
...
...
litemall-core/src/test/java/org/linlinjava/litemall/core/MailTest.java
View file @
4c46da9b
...
@@ -11,6 +11,7 @@ import org.springframework.context.annotation.Import;
...
@@ -11,6 +11,7 @@ import org.springframework.context.annotation.Import;
import
org.springframework.context.annotation.Primary
;
import
org.springframework.context.annotation.Primary
;
import
org.springframework.core.task.SyncTaskExecutor
;
import
org.springframework.core.task.SyncTaskExecutor
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
java.util.concurrent.Executor
;
import
java.util.concurrent.Executor
;
...
@@ -26,7 +27,7 @@ import java.util.concurrent.Executor;
...
@@ -26,7 +27,7 @@ import java.util.concurrent.Executor;
* 2. 在相应的邮件服务器设置正确
* 2. 在相应的邮件服务器设置正确
*/
*/
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
public
class
MailTest
{
public
class
MailTest
{
...
...
litemall-core/src/test/java/org/linlinjava/litemall/core/QiniuStorageTest.java
View file @
4c46da9b
...
@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.core.io.Resource
;
import
org.springframework.core.io.Resource
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
java.io.File
;
import
java.io.File
;
...
@@ -16,7 +17,7 @@ import java.io.FileInputStream;
...
@@ -16,7 +17,7 @@ import java.io.FileInputStream;
import
java.io.IOException
;
import
java.io.IOException
;
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
public
class
QiniuStorageTest
{
public
class
QiniuStorageTest
{
...
...
litemall-core/src/test/java/org/linlinjava/litemall/core/SmsTest.java
View file @
4c46da9b
...
@@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import;
...
@@ -12,6 +12,7 @@ import org.springframework.context.annotation.Import;
import
org.springframework.context.annotation.Primary
;
import
org.springframework.context.annotation.Primary
;
import
org.springframework.core.task.SyncTaskExecutor
;
import
org.springframework.core.task.SyncTaskExecutor
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
java.util.concurrent.Executor
;
import
java.util.concurrent.Executor
;
...
@@ -28,7 +29,7 @@ import java.util.concurrent.Executor;
...
@@ -28,7 +29,7 @@ import java.util.concurrent.Executor;
* 3. 在当前测试类设置好正确的手机号码
* 3. 在当前测试类设置好正确的手机号码
*/
*/
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
public
class
SmsTest
{
public
class
SmsTest
{
...
...
litemall-core/src/test/java/org/linlinjava/litemall/core/TaskTest.java
View file @
4c46da9b
...
@@ -16,6 +16,7 @@ import org.springframework.context.annotation.Primary;
...
@@ -16,6 +16,7 @@ import org.springframework.context.annotation.Primary;
import
org.springframework.core.env.Environment
;
import
org.springframework.core.env.Environment
;
import
org.springframework.core.task.SyncTaskExecutor
;
import
org.springframework.core.task.SyncTaskExecutor
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
java.time.LocalDateTime
;
import
java.time.LocalDateTime
;
...
@@ -26,7 +27,7 @@ import java.util.concurrent.Executor;
...
@@ -26,7 +27,7 @@ import java.util.concurrent.Executor;
import
java.util.concurrent.TimeUnit
;
import
java.util.concurrent.TimeUnit
;
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
public
class
TaskTest
{
public
class
TaskTest
{
private
final
Log
logger
=
LogFactory
.
getLog
(
TaskTest
.
class
);
private
final
Log
logger
=
LogFactory
.
getLog
(
TaskTest
.
class
);
...
...
litemall-core/src/test/java/org/linlinjava/litemall/core/TencentStorageTest.java
View file @
4c46da9b
...
@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -9,6 +9,7 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.core.io.Resource
;
import
org.springframework.core.io.Resource
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
java.io.File
;
import
java.io.File
;
...
@@ -16,7 +17,7 @@ import java.io.FileInputStream;
...
@@ -16,7 +17,7 @@ import java.io.FileInputStream;
import
java.io.IOException
;
import
java.io.IOException
;
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
public
class
TencentStorageTest
{
public
class
TencentStorageTest
{
...
...
litemall-db/src/
main
/java/org/linlinjava/litemall/db/Application.java
→
litemall-db/src/
test
/java/org/linlinjava/litemall/db/Application.java
View file @
4c46da9b
File moved
litemall-db/src/test/java/org/linlinjava/litemall/db/DbConfigTest.java
View file @
4c46da9b
...
@@ -6,10 +6,11 @@ import org.springframework.beans.factory.annotation.Autowired;
...
@@ -6,10 +6,11 @@ import org.springframework.beans.factory.annotation.Autowired;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.core.env.Environment
;
import
org.springframework.core.env.Environment
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
public
class
DbConfigTest
{
public
class
DbConfigTest
{
@Autowired
@Autowired
...
...
litemall-db/src/test/java/org/linlinjava/litemall/db/DbTest.java
View file @
4c46da9b
...
@@ -4,10 +4,11 @@ import org.junit.Test;
...
@@ -4,10 +4,11 @@ import org.junit.Test;
import
org.junit.runner.RunWith
;
import
org.junit.runner.RunWith
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
public
class
DbTest
{
public
class
DbTest
{
@Test
@Test
...
...
litemall-db/src/test/java/org/linlinjava/litemall/db/MapperReturnTest.java
View file @
4c46da9b
...
@@ -8,10 +8,11 @@ import org.linlinjava.litemall.db.domain.LitemallSystem;
...
@@ -8,10 +8,11 @@ import org.linlinjava.litemall.db.domain.LitemallSystem;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
public
class
MapperReturnTest
{
public
class
MapperReturnTest
{
...
...
litemall-db/src/test/java/org/linlinjava/litemall/db/StatMapperTest.java
View file @
4c46da9b
...
@@ -6,13 +6,14 @@ import org.linlinjava.litemall.db.dao.StatMapper;
...
@@ -6,13 +6,14 @@ import org.linlinjava.litemall.db.dao.StatMapper;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
java.util.List
;
import
java.util.List
;
import
java.util.Map
;
import
java.util.Map
;
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
public
class
StatMapperTest
{
public
class
StatMapperTest
{
...
...
litemall-db/src/test/java/org/linlinjava/litemall/db/StockTest.java
View file @
4c46da9b
...
@@ -6,10 +6,11 @@ import org.linlinjava.litemall.db.dao.GoodsProductMapper;
...
@@ -6,10 +6,11 @@ import org.linlinjava.litemall.db.dao.GoodsProductMapper;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.boot.test.context.SpringBootTest
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringJUnit4ClassRunner
;
import
org.springframework.test.context.junit4.SpringRunner
;
import
org.springframework.test.context.web.WebAppConfiguration
;
import
org.springframework.test.context.web.WebAppConfiguration
;
@WebAppConfiguration
@WebAppConfiguration
@RunWith
(
Spring
JUnit4Class
Runner
.
class
)
@RunWith
(
SpringRunner
.
class
)
@SpringBootTest
@SpringBootTest
public
class
StockTest
{
public
class
StockTest
{
@Autowired
@Autowired
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment