Merge remote-tracking branch 'origin/springboot' into springboot

src/test/java/com/stylefeng/guns/base/BaseTest.java → src/test/java/com/stylefeng/guns/base/BaseJunit.java

@@ -22,8 +22,8 @@ import org.springframework.web.context.WebApplicationContext;
 @RunWith(SpringRunner.class)
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = GunsApplication.class)
 @SpringBootTest(classes = GunsApplication.class)
 @WebAppConfiguration
 @WebAppConfiguration
-@Transactional
-public class BaseTest {
+@Transactional //测试之后数据可回滚
+public class BaseJunit {
 
 
     @Autowired
     @Autowired
     WebApplicationContext webApplicationContext;
     WebApplicationContext webApplicationContext;

src/test/java/com/stylefeng/guns/system/BlackBoardTest.java

 package com.stylefeng.guns.system;
 package com.stylefeng.guns.system;
 
 
-import com.stylefeng.guns.base.BaseTest;
+import com.stylefeng.guns.base.BaseJunit;
 import com.stylefeng.guns.modular.system.dao.NoticeDao;
 import com.stylefeng.guns.modular.system.dao.NoticeDao;
 import org.junit.Test;
 import org.junit.Test;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -16,7 +16,7 @@ import static org.junit.Assert.assertTrue;
  * @author fengshuonan
  * @author fengshuonan
  * @date 2017-05-21 15:02
  * @date 2017-05-21 15:02
  */
  */
-public class BlackBoardTest extends BaseTest {
+public class BlackBoardTest extends BaseJunit {
 
 
     @Autowired
     @Autowired
     NoticeDao noticeDao;
     NoticeDao noticeDao;

src/test/java/com/stylefeng/guns/system/DeptTest.java

 package com.stylefeng.guns.system;
 package com.stylefeng.guns.system;
 
 
-import com.stylefeng.guns.base.BaseTest;
+import com.stylefeng.guns.base.BaseJunit;
 import com.stylefeng.guns.common.persistence.dao.DeptMapper;
 import com.stylefeng.guns.common.persistence.dao.DeptMapper;
 import com.stylefeng.guns.common.persistence.model.Dept;
 import com.stylefeng.guns.common.persistence.model.Dept;
 import com.stylefeng.guns.modular.system.dao.DeptDao;
 import com.stylefeng.guns.modular.system.dao.DeptDao;
@@ -19,7 +19,7 @@ import static org.junit.Assert.assertTrue;
  * @author fengshuonan
  * @author fengshuonan
  * @date 2017-04-27 17:05
  * @date 2017-04-27 17:05
  */
  */
-public class DeptTest extends BaseTest {
+public class DeptTest extends BaseJunit {
 
 
     @Resource
     @Resource
     DeptDao deptDao;
     DeptDao deptDao;

src/test/java/com/stylefeng/guns/system/DictTest.java

 package com.stylefeng.guns.system;
 package com.stylefeng.guns.system;
 
 
-import com.stylefeng.guns.base.BaseTest;
+import com.stylefeng.guns.base.BaseJunit;
 import com.stylefeng.guns.modular.system.dao.DictDao;
 import com.stylefeng.guns.modular.system.dao.DictDao;
 import com.stylefeng.guns.modular.system.service.IDictService;
 import com.stylefeng.guns.modular.system.service.IDictService;
 import org.junit.Assert;
 import org.junit.Assert;
@@ -16,7 +16,7 @@ import java.util.Map;
  * @author fengshuonan
  * @author fengshuonan
  * @date 2017-04-27 17:05
  * @date 2017-04-27 17:05
  */
  */
-public class DictTest extends BaseTest {
+public class DictTest extends BaseJunit {
 
 
     @Resource
     @Resource
     IDictService dictService;
     IDictService dictService;