diff --git a/dao-support-lib/src/main/java/cn/axzo/foundation/dao/support/converter/PageConverter.java b/dao-support-lib/src/main/java/cn/axzo/foundation/dao/support/converter/PageConverter.java index 11662bb..3ef1200 100644 --- a/dao-support-lib/src/main/java/cn/axzo/foundation/dao/support/converter/PageConverter.java +++ b/dao-support-lib/src/main/java/cn/axzo/foundation/dao/support/converter/PageConverter.java @@ -73,6 +73,18 @@ public class PageConverter { return PageConverter.toResp(iPage); } + public static PageResp toResp(IPage page, Function mapper) { + List collect = page.getRecords().stream().map(mapper).collect(toList()); + + PageResp result = PageResp.builder() + .total(page.getTotal()) + .current(page.getCurrent()) + .size(page.getSize()) + .build(); + result.setData(collect); + return result; + } + /** * 将所有的数据通过page接口写入到list. 并返回 * function中需要参数为新的pageNum, 默认从第一页开始加载. 直到返回的记录行数小于 预期的行数 @@ -104,15 +116,5 @@ public class PageConverter { return totalData; } - public static PageResp convert(IPage page, Function mapper) { - List collect = page.getRecords().stream().map(mapper).collect(toList()); - PageResp result = PageResp.builder() - .total(page.getTotal()) - .current(page.getCurrent()) - .size(page.getSize()) - .build(); - result.setData(collect); - return result; - } } diff --git a/unittest-support-lib/pom.xml b/unittest-support-lib/pom.xml index 5ac7443..3d93077 100644 --- a/unittest-support-lib/pom.xml +++ b/unittest-support-lib/pom.xml @@ -39,9 +39,6 @@ provided - - - org.springframework.boot spring-boot-starter-test @@ -82,6 +79,10 @@ com.google.guava guava + + org.slf4j + slf4j-simple + diff --git a/unittest-support-lib/src/main/java/cn/axzo/foundation/unittest/support/BaseTest.java b/unittest-support-lib/src/main/java/cn/axzo/foundation/unittest/support/BaseUnittest.java similarity index 98% rename from unittest-support-lib/src/main/java/cn/axzo/foundation/unittest/support/BaseTest.java rename to unittest-support-lib/src/main/java/cn/axzo/foundation/unittest/support/BaseUnittest.java index 1371822..d80532b 100644 --- a/unittest-support-lib/src/main/java/cn/axzo/foundation/unittest/support/BaseTest.java +++ b/unittest-support-lib/src/main/java/cn/axzo/foundation/unittest/support/BaseUnittest.java @@ -43,12 +43,11 @@ import java.util.List; @Import(value = {TestConfig.class, MysqlConfig.class, RedisConfig.class, TransactionalConfig.class}) @ContextConfiguration @ExtendWith(SpringExtension.class) -@SpringBootTest @AutoConfigureMockMvc @Transactional @ActiveProfiles("unittest") -@ComponentScan("cn.axzo.**.config") -public abstract class BaseTest { +@ComponentScan("cn.axzo.foundation.unittest.support.config") +public abstract class BaseUnittest { private static final String JSON_FILE_CLASSPATH = "classpath:json/"; /** * 记录对象原始的 field 值. 因为这些值可能被mock替换, 在每次执行单元测试前统一进行一次替换恢复