From 82dea9082547d4455d898cd963d55bbe5935b7d4 Mon Sep 17 00:00:00 2001 From: wynne1005 Date: Thu, 4 Mar 2021 16:35:01 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0test=E9=85=8D=E7=BD=AE?= =?UTF-8?q?=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/resources/application.properties | 2 +- .../java/test/cn/estsh/i3plus/core/apiservice/mq/TestMQ.java | 4 ++-- .../core/apiservice/serviceimpl/busi/TestAutoFillData.java | 1 - .../estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java | 4 +--- .../core/apiservice/serviceimpl/busi/TestExcelPermission.java | 4 ++-- .../core/apiservice/serviceimpl/busi/TestExcelSysConfig.java | 8 ++++---- .../i3plus/core/apiservice/serviceimpl/busi/TestMathOper.java | 5 ++--- .../core/apiservice/serviceimpl/busi/TestSysConfigService.java | 2 +- .../serviceimpl/busi/TestSysLocaleResourceService.java | 1 - .../estsh/i3plus/core/apiservice/serviceimpl/busi/TestUser.java | 2 -- .../test/cn/estsh/i3plus/core/apiservice/util/ResourceUtil.java | 2 +- .../test/cn/estsh/i3plus/core/apiservice/util/TestExcelUtil.java | 9 ++------- .../test/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java | 5 +++-- 13 files changed, 19 insertions(+), 30 deletions(-) diff --git a/modules/i3plus-core-apiservice/src/main/resources/application.properties b/modules/i3plus-core-apiservice/src/main/resources/application.properties index 078ac2c..5c57413 100644 --- a/modules/i3plus-core-apiservice/src/main/resources/application.properties +++ b/modules/i3plus-core-apiservice/src/main/resources/application.properties @@ -1,5 +1,5 @@ #\u4F7F\u7528\u914D\u7F6E -spring.profiles.active=docker +spring.profiles.active=test #\u9879\u76EE\u63CF\u8FF0\u4FE1\u606F\uFF08swagger\u4E2D\u663E\u5F0F\uFF09\uFF0C\u4E2D\u6587\u4F7F\u7528uncode\u8F6C\u7801 desc.application.name=\u6838\u5FC3\u7BA1\u7406\u540E\u53F0 diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/mq/TestMQ.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/mq/TestMQ.java index 429a9ac..c7098e9 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/mq/TestMQ.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/mq/TestMQ.java @@ -1,6 +1,5 @@ -package cn.estsh.i3plus.core.apiservice.mq; +package test.cn.estsh.i3plus.core.apiservice.mq; -import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; import cn.estsh.i3plus.core.apiservice.util.MailUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysMessage; @@ -8,6 +7,7 @@ import com.alibaba.fastjson.JSON; import org.junit.Test; import org.springframework.amqp.rabbit.core.RabbitTemplate; import org.springframework.beans.factory.annotation.Autowired; +import test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; /** * @Description : diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestAutoFillData.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestAutoFillData.java index fa8316a..ed46fa9 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestAutoFillData.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestAutoFillData.java @@ -1,7 +1,6 @@ package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysToolService; -import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; import cn.estsh.i3plus.pojo.platform.bean.SysTool; import cn.estsh.i3plus.pojo.platform.repository.SysToolRepository; import com.alibaba.fastjson.JSON; diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java index 1b106d9..53f266a 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestBase.java @@ -1,9 +1,7 @@ -package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; +package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi; -import cn.estsh.i3plus.core.apiservice.auth.realm.UserAuthRealm; import cn.estsh.i3plus.pojo.base.shirotoken.UserToken; import cn.estsh.i3plus.pojo.platform.bean.SessionUser; -import cn.estsh.impp.framework.boot.auth.AuthUtil; import cn.estsh.impp.framework.boot.util.SpringContextsUtil; import cn.estsh.impp.framework.run.ImppGo; import com.alibaba.fastjson.JSON; diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java index 221660d..37ba2b8 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelPermission.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; +package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.platform.common.tool.EncryptTool; import cn.estsh.i3plus.pojo.platform.bean.*; @@ -18,7 +18,7 @@ import java.util.List; /** * 系统数据初始化 */ -public class TestExcelPermission extends cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase { +public class TestExcelPermission extends TestBase { //public class TestExcelPermission { public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelPermission.class); diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelSysConfig.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelSysConfig.java index 11ccac1..e07e5ea 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelSysConfig.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestExcelSysConfig.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; +package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.pojo.platform.bean.*; import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository; @@ -24,9 +24,9 @@ import java.util.List; * @CreateDate : 2018-11-22 11:01 * @Modify: **/ -public class TestExcelSysConfig extends cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase { +public class TestExcelSysConfig extends TestBase { - public static final Logger LOGGER = LoggerFactory.getLogger(cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestExcelPermission.class); + public static final Logger LOGGER = LoggerFactory.getLogger(TestExcelPermission.class); // 文件路径 public static final String PATH_NAME = "init/sys-config.xlsx"; @@ -194,7 +194,7 @@ public class TestExcelSysConfig extends cn.estsh.i3plus.core.apiservice.servicei public XSSFWorkbook getWorkbook(String pathName){ try { - InputStream in = cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestExcelPermission.class.getClassLoader().getResourceAsStream(pathName); + InputStream in = TestExcelPermission.class.getClassLoader().getResourceAsStream(pathName); XSSFWorkbook workbook = new XSSFWorkbook(in); return workbook; }catch (Exception e){ diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMathOper.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMathOper.java index 9a70876..5259dc9 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMathOper.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestMathOper.java @@ -1,6 +1,5 @@ -package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; +package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi; -import cn.estsh.i3plus.pojo.platform.bean.SysConfig; import cn.estsh.i3plus.pojo.platform.repository.SysConfigRepository; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; @@ -12,7 +11,7 @@ import org.springframework.beans.factory.annotation.Autowired; * @CreateDate : 2018-12-20 17:02 * @Modify: **/ -public class TestMathOper extends cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase { +public class TestMathOper extends TestBase { @Test public void test(){ diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigService.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigService.java index 1ca0c30..bdf9636 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigService.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysConfigService.java @@ -1,4 +1,4 @@ -package cn.estsh.i3plus.core.apiservice.serviceimpl.busi; +package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysConfigService; import cn.estsh.i3plus.pojo.base.bean.ListPager; diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysLocaleResourceService.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysLocaleResourceService.java index 23f9954..64144b6 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysLocaleResourceService.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestSysLocaleResourceService.java @@ -1,7 +1,6 @@ package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService; -import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; import cn.estsh.i3plus.platform.common.tool.ExcelTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; import cn.estsh.i3plus.pojo.platform.bean.SysLocaleResource; diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestUser.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestUser.java index 51cd705..03df6bd 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestUser.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/serviceimpl/busi/TestUser.java @@ -1,8 +1,6 @@ package test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi; import cn.estsh.i3plus.core.api.iservice.busi.ISysToolService; -import cn.estsh.i3plus.core.api.iservice.busi.ISysUserService; -import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; import cn.estsh.i3plus.pojo.platform.bean.SysTool; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/ResourceUtil.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/ResourceUtil.java index 55dff33..c95e9f0 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/ResourceUtil.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/ResourceUtil.java @@ -1,7 +1,6 @@ package test.cn.estsh.i3plus.core.apiservice.util; import cn.estsh.i3plus.core.api.iservice.busi.ISysLocaleResourceService; -import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; import cn.estsh.i3plus.platform.common.convert.ConvertBean; import cn.estsh.i3plus.platform.common.util.PlatformConstWords; import cn.estsh.i3plus.pojo.base.codemaker.SnowflakeIdMaker; @@ -14,6 +13,7 @@ import org.apache.poi.ss.usermodel.Workbook; import org.apache.poi.xssf.usermodel.XSSFWorkbook; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; import java.io.File; import java.util.*; diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestExcelUtil.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestExcelUtil.java index 623ee8b..8337954 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestExcelUtil.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestExcelUtil.java @@ -1,22 +1,17 @@ -package cn.estsh.i3plus.core.apiservice.util; +package test.cn.estsh.i3plus.core.apiservice.util; -import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; import cn.estsh.i3plus.platform.common.tool.ExcelTool; import cn.estsh.i3plus.platform.common.util.CommonConstWords; -import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.SysTool; import cn.estsh.impp.framework.boot.util.ImppRedis; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; +import test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; -import javax.annotation.PostConstruct; import javax.annotation.Resource; import javax.persistence.EntityManager; import java.io.FileInputStream; import java.io.FileNotFoundException; -import java.io.FileOutputStream; -import java.util.ArrayList; import java.util.List; /** diff --git a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java index 8510480..72af6ce 100644 --- a/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java +++ b/modules/i3plus-core-apiservice/src/test/java/test/cn/estsh/i3plus/core/apiservice/util/TestMailUtil.java @@ -1,11 +1,12 @@ -package cn.estsh.i3plus.core.apiservice.util; +package test.cn.estsh.i3plus.core.apiservice.util; -import cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; +import cn.estsh.i3plus.core.apiservice.util.MailUtil; import cn.estsh.i3plus.pojo.base.enumutil.CommonEnumUtil; import cn.estsh.i3plus.pojo.base.enumutil.ImppEnumUtil; import cn.estsh.i3plus.pojo.platform.bean.MailConfig; import org.junit.Test; import org.springframework.beans.factory.annotation.Autowired; +import test.cn.estsh.i3plus.core.apiservice.serviceimpl.busi.TestBase; import javax.mail.MessagingException; import java.io.UnsupportedEncodingException;