diff --git a/event/src/test/java/com/zfoo/event/ApplicationTest.java b/event/src/test/java/com/zfoo/event/ApplicationTest.java index 942bb99e..c9ec50ff 100644 --- a/event/src/test/java/com/zfoo/event/ApplicationTest.java +++ b/event/src/test/java/com/zfoo/event/ApplicationTest.java @@ -15,7 +15,6 @@ package com.zfoo.event; import com.zfoo.event.manager.EventBus; import com.zfoo.protocol.util.ThreadUtils; -import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -23,7 +22,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; * @author godotg * @version 3.0 */ -@Ignore public class ApplicationTest { // Event Bus tutorial, the core idea is the observer pattern.(核心思想是设计模式中的观察者模式) @@ -35,7 +33,7 @@ public class ApplicationTest { // see receiver method of MyController1 and MyController2 EventBus.post(MyNoticeEvent.valueOf("我的事件")); - ThreadUtils.sleep(3000); + ThreadUtils.sleep(1000); } } diff --git a/hotswap/src/test/java/com/zfoo/hotswap/ApplicationTest.java b/hotswap/src/test/java/com/zfoo/hotswap/ApplicationTest.java index 4d26d4b2..73537ead 100644 --- a/hotswap/src/test/java/com/zfoo/hotswap/ApplicationTest.java +++ b/hotswap/src/test/java/com/zfoo/hotswap/ApplicationTest.java @@ -3,7 +3,6 @@ package com.zfoo.hotswap; import com.zfoo.hotswap.util.HotSwapUtils; import com.zfoo.protocol.util.ClassUtils; import com.zfoo.protocol.util.IOUtils; -import org.junit.Ignore; import org.junit.Test; import java.io.IOException; @@ -11,7 +10,6 @@ import java.io.IOException; /** * @author godotg */ -@Ignore public class ApplicationTest { // 热更新教程，需要添加JVM参数，-Djdk.attach.allowAttachSelf=true，如果不加这个参数将使用Byte Buddy热更新替代Javassist热更新 diff --git a/monitor/src/test/java/com/zfoo/monitor/ApplicationTest.java b/monitor/src/test/java/com/zfoo/monitor/ApplicationTest.java index 19f5a28b..1f39d7dd 100644 --- a/monitor/src/test/java/com/zfoo/monitor/ApplicationTest.java +++ b/monitor/src/test/java/com/zfoo/monitor/ApplicationTest.java @@ -18,7 +18,6 @@ import com.zfoo.monitor.util.OSUtils; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.protocol.util.ThreadUtils; import org.junit.Assert; -import org.junit.Ignore; import org.junit.Test; import oshi.SystemInfo; @@ -26,7 +25,6 @@ import oshi.SystemInfo; * @author godotg * @version 3.0 */ -@Ignore public class ApplicationTest { /** @@ -76,14 +74,13 @@ public class ApplicationTest { /** * cpu的tick大小测试 */ - @Ignore @Test public void cpuTest() { var systemInfo = new SystemInfo(); var hardware = systemInfo.getHardware(); var os = systemInfo.getOperatingSystem(); - while (true) { + for (int i = 0; i < 5; i++) { var oldTicks = hardware.getProcessor().getSystemCpuLoadTicks(); ThreadUtils.sleep(1000); var usage = hardware.getProcessor().getSystemCpuLoadBetweenTicks(oldTicks); @@ -91,15 +88,6 @@ public class ApplicationTest { } } - /** - * 控制台指令执行测试 - */ - @Ignore - @Test - public void execCommandTest() { - var str = OSUtils.execCommand("cmd /c jps"); - System.out.println(str); - } @Test public void toPercentTest() { diff --git a/net/pom.xml b/net/pom.xml index 1c6ba005..61f8c106 100644 --- a/net/pom.xml +++ b/net/pom.xml @@ -206,6 +206,7 @@ 8 -Dfile.encoding=${file.encoding} + true diff --git a/orm/pom.xml b/orm/pom.xml index 5e0b97d1..36205261 100644 --- a/orm/pom.xml +++ b/orm/pom.xml @@ -161,6 +161,7 @@ 8 -Dfile.encoding=${file.encoding} + true diff --git a/protocol/pom.xml b/protocol/pom.xml index 7289a03e..82f8de32 100644 --- a/protocol/pom.xml +++ b/protocol/pom.xml @@ -197,9 +197,6 @@ 8 -Dfile.encoding=${file.encoding} - - */*Test.java - diff --git a/scheduler/src/test/java/com/zfoo/scheduler/ApplicationTest.java b/scheduler/src/test/java/com/zfoo/scheduler/ApplicationTest.java index bf3386cd..306d9e69 100644 --- a/scheduler/src/test/java/com/zfoo/scheduler/ApplicationTest.java +++ b/scheduler/src/test/java/com/zfoo/scheduler/ApplicationTest.java @@ -14,7 +14,6 @@ package com.zfoo.scheduler; import com.zfoo.protocol.util.ThreadUtils; -import org.junit.Ignore; import org.junit.Test; import org.springframework.context.support.ClassPathXmlApplicationContext; @@ -26,7 +25,6 @@ import org.springframework.context.support.ClassPathXmlApplicationContext; * @version 3.0 */ -@Ignore public class ApplicationTest { @Test @@ -34,7 +32,7 @@ public class ApplicationTest { // 加载配置文件，配置文件中必须引入scheduler var context = new ClassPathXmlApplicationContext("application.xml"); - ThreadUtils.sleep(Long.MAX_VALUE); + ThreadUtils.sleep(10000); } } diff --git a/storage/src/test/java/com/zfoo/storage/ApplicationTest.java b/storage/src/test/java/com/zfoo/storage/ApplicationTest.java index 440e21ec..1f76a630 100644 --- a/storage/src/test/java/com/zfoo/storage/ApplicationTest.java +++ b/storage/src/test/java/com/zfoo/storage/ApplicationTest.java @@ -17,7 +17,6 @@ import com.zfoo.protocol.util.AssertionUtils; import com.zfoo.protocol.util.JsonUtils; import com.zfoo.protocol.util.StringUtils; import com.zfoo.storage.resource.StudentResource; -import org.junit.Ignore; import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -30,7 +29,6 @@ import java.util.Map; * @version 3.0 */ -@Ignore public class ApplicationTest { private static final Logger logger = LoggerFactory.getLogger(ApplicationTest.class); diff --git a/storage/src/test/java/com/zfoo/storage/excel/ExcelTest.java b/storage/src/test/java/com/zfoo/storage/excel/ExcelTesting.java similarity index 99% rename from storage/src/test/java/com/zfoo/storage/excel/ExcelTest.java rename to storage/src/test/java/com/zfoo/storage/excel/ExcelTesting.java index 754a4cb8..a77381e7 100644 --- a/storage/src/test/java/com/zfoo/storage/excel/ExcelTest.java +++ b/storage/src/test/java/com/zfoo/storage/excel/ExcelTesting.java @@ -30,7 +30,7 @@ import java.util.Iterator; * @version 3.0 */ @Ignore -public class ExcelTest { +public class ExcelTesting { @Test public void createExcelTest() throws IOException { diff --git a/storage/src/test/java/com/zfoo/storage/export/ExportBinaryTest.java b/storage/src/test/java/com/zfoo/storage/export/ExportBinaryTesting.java similarity index 99% rename from storage/src/test/java/com/zfoo/storage/export/ExportBinaryTest.java rename to storage/src/test/java/com/zfoo/storage/export/ExportBinaryTesting.java index 1bf46150..e63ab74b 100644 --- a/storage/src/test/java/com/zfoo/storage/export/ExportBinaryTest.java +++ b/storage/src/test/java/com/zfoo/storage/export/ExportBinaryTesting.java @@ -42,7 +42,7 @@ import java.util.Map; @Ignore -public class ExportBinaryTest { +public class ExportBinaryTesting { public static class User { diff --git a/storage/src/test/java/com/zfoo/storage/export/ExportCsvTest.java b/storage/src/test/java/com/zfoo/storage/export/ExportCsvTesting.java similarity index 98% rename from storage/src/test/java/com/zfoo/storage/export/ExportCsvTest.java rename to storage/src/test/java/com/zfoo/storage/export/ExportCsvTesting.java index 0d3649ba..676759ca 100644 --- a/storage/src/test/java/com/zfoo/storage/export/ExportCsvTest.java +++ b/storage/src/test/java/com/zfoo/storage/export/ExportCsvTesting.java @@ -27,7 +27,7 @@ import java.io.IOException; * @version 3.0 */ @Ignore -public class ExportCsvTest { +public class ExportCsvTesting { @Test public void exportTest() throws Exception { diff --git a/storage/src/test/java/com/zfoo/storage/export/ExportJsonTest.java b/storage/src/test/java/com/zfoo/storage/export/ExportJsonTesting.java similarity index 96% rename from storage/src/test/java/com/zfoo/storage/export/ExportJsonTest.java rename to storage/src/test/java/com/zfoo/storage/export/ExportJsonTesting.java index 9ec268e3..baa331f6 100644 --- a/storage/src/test/java/com/zfoo/storage/export/ExportJsonTest.java +++ b/storage/src/test/java/com/zfoo/storage/export/ExportJsonTesting.java @@ -21,7 +21,7 @@ import org.junit.Test; * @version 3.0 */ @Ignore -public class ExportJsonTest { +public class ExportJsonTesting { @Test public void test() throws Exception { diff --git a/storage/src/test/java/com/zfoo/storage/pathmatch/PathMatchTest.java b/storage/src/test/java/com/zfoo/storage/pathmatch/PathMatchTesting.java similarity index 95% rename from storage/src/test/java/com/zfoo/storage/pathmatch/PathMatchTest.java rename to storage/src/test/java/com/zfoo/storage/pathmatch/PathMatchTesting.java index f6d62270..ec9c2f29 100644 --- a/storage/src/test/java/com/zfoo/storage/pathmatch/PathMatchTest.java +++ b/storage/src/test/java/com/zfoo/storage/pathmatch/PathMatchTesting.java @@ -26,12 +26,12 @@ import java.io.IOException; * @version 3.0 */ @Ignore -public class PathMatchTest { +public class PathMatchTesting { @Test public void resourceTest() throws IOException { ResourcePatternResolver resolver = new PathMatchingResourcePatternResolver(); - Resource[] resources = resolver.getResources("classpath*:com/zfoo/**/*.class"); + Resource[] resources = resolver.getResources("classpath*:com/zfoo/storage/**/*.class"); for (Resource res : resources) { System.out.println(res.getDescription()); }