diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/README.md b/liteflow-testcase-el/liteflow-testcase-el-solon/README.md deleted file mode 100644 index 4569b3866..000000000 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/README.md +++ /dev/null @@ -1,3 +0,0 @@ -solon 会有部分的全局变量。 - -在当前测试场景下，不适合一次性跑全部单测。只能一个个目录跑 \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/asyncNode/AsyncNodeELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/asyncNode/AsyncNodeELSpringbootTest.java index d7ba24fb3..fe6994de9 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/asyncNode/AsyncNodeELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/asyncNode/AsyncNodeELSpringbootTest.java @@ -20,7 +20,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author ssss */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/asyncNode/application.properties") +@TestPropertySource("classpath:/asyncNode/application.properties") public class AsyncNodeELSpringbootTest extends BaseTest { @Inject private FlowExecutor flowExecutor; diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/base/BaseELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/base/BaseELSpringbootTest.java index 35d3c9c08..768e27b1f 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/base/BaseELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/base/BaseELSpringbootTest.java @@ -15,7 +15,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author Bryan.Zhang */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/base/application.properties") +@TestPropertySource("classpath:/base/application.properties") public class BaseELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/builder/BuilderELSpringbootTest2.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/builder/BuilderELSpringbootTest2.java index 7a706c858..3a4d7f0d0 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/builder/BuilderELSpringbootTest2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/builder/BuilderELSpringbootTest2.java @@ -7,14 +7,12 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; //基于builder模式的单元测试 //这里测试的是通过spring去扫描，但是通过代码去构建chain的用例 @RunWith(SolonJUnit4ClassRunner.class) -@Import(scanPackages = {"com.yomahub.liteflow.test.builder.cmp2"}) public class BuilderELSpringbootTest2 extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpData/CmpDataELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpData/CmpDataELSpringbootTest.java index e19d6d4f8..312f5ccdc 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpData/CmpDataELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpData/CmpDataELSpringbootTest.java @@ -18,7 +18,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author Bryan.Zhang */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/cmpData/application.properties") +@TestPropertySource("classpath:/cmpData/application.properties") public class CmpDataELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpRetry/LiteflowRetryELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpRetry/LiteflowRetryELSpringbootTest.java index 6a44983a8..c13f43cad 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpRetry/LiteflowRetryELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpRetry/LiteflowRetryELSpringbootTest.java @@ -18,7 +18,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.5.10 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/cmpRetry/application.properties") +@TestPropertySource("classpath:/cmpRetry/application.properties") public class LiteflowRetryELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/complex/ComplexELSpringbootTest1.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/complex/ComplexELSpringbootTest1.java index 37c3ec699..a895e8b16 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/complex/ComplexELSpringbootTest1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/complex/ComplexELSpringbootTest1.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -16,7 +15,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author Bryan.Zhang */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/complex/application1.properties") +@TestPropertySource("classpath:/complex/application1.properties") public class ComplexELSpringbootTest1 extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/complex2/ComplexELSpringbootTest2.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/complex2/ComplexELSpringbootTest2.java index 20120b3a9..4a68c1652 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/complex2/ComplexELSpringbootTest2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/complex2/ComplexELSpringbootTest2.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -16,7 +15,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author Bryan.Zhang */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/complex/application2.properties") +@TestPropertySource("classpath:/complex/application2.properties") public class ComplexELSpringbootTest2 extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/component/FlowExecutorELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/component/FlowExecutorELSpringbootTest.java index 3a5f261bd..1473f22e6 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/component/FlowExecutorELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/component/FlowExecutorELSpringbootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -20,7 +19,7 @@ import org.slf4j.LoggerFactory; * @author donguo.tao */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/component/application.properties") +@TestPropertySource("classpath:/component/application.properties") public class FlowExecutorELSpringbootTest extends BaseTest { private static final Logger LOG = LoggerFactory.getLogger(FlowExecutorELSpringbootTest.class); diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/customNodes/CustomNodesELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/customNodes/CustomNodesELSpringbootTest.java index a9fbb3c1f..cc31f45fa 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/customNodes/CustomNodesELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/customNodes/CustomNodesELSpringbootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -20,8 +19,7 @@ import org.slf4j.LoggerFactory; * @since 2.6.4 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/customNodes/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.customNodes.domain"}) +@TestPropertySource("classpath:/customNodes/application.properties") public class CustomNodesELSpringbootTest extends BaseTest { private final Logger log = LoggerFactory.getLogger(this.getClass()); diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/customWhenThreadPool/CustomWhenThreadPoolELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/customWhenThreadPool/CustomWhenThreadPoolELSpringbootTest.java index 4659f56a1..c990066e5 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/customWhenThreadPool/CustomWhenThreadPoolELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/customWhenThreadPool/CustomWhenThreadPoolELSpringbootTest.java @@ -7,7 +7,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -22,7 +21,6 @@ import org.slf4j.LoggerFactory; */ @RunWith(SolonJUnit4ClassRunner.class) @TestPropertySource("classpath:/customWhenThreadPool/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.customWhenThreadPool.cmp"}) public class CustomWhenThreadPoolELSpringbootTest extends BaseTest { private final Logger log = LoggerFactory.getLogger(this.getClass()); diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/event/EventELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/event/EventELSpringbootTest.java index 1ef31b69e..db9d0f767 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/event/EventELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/event/EventELSpringbootTest.java @@ -7,7 +7,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -18,8 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.7.1 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/event/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.event.cmp"}) +@TestPropertySource("classpath:/event/application.properties") public class EventELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/exception/Exception2ELSpringBootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/exception/Exception2ELSpringBootTest.java index 813be1f6d..c582adaf2 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/exception/Exception2ELSpringBootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/exception/Exception2ELSpringBootTest.java @@ -10,7 +10,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.core.AopContext; import org.noear.solon.test.SolonJUnit4ClassRunner; @@ -24,7 +23,6 @@ import org.noear.solon.test.annotation.TestPropertySource; */ @RunWith(SolonJUnit4ClassRunner.class) @TestPropertySource("classpath:/exception/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.exception.cmp"}) public class Exception2ELSpringBootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/execute2Future/Executor2FutureELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/execute2Future/Executor2FutureELSpringbootTest.java index 36df494c7..09f55a12f 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/execute2Future/Executor2FutureELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/execute2Future/Executor2FutureELSpringbootTest.java @@ -7,7 +7,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -19,8 +18,7 @@ import java.util.concurrent.Future; * @since 2.6.13 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/execute2Future/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.execute2Future.cmp"}) +@TestPropertySource("classpath:/execute2Future/application.properties") public class Executor2FutureELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/getChainName/GetChainNameELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/getChainName/GetChainNameELSpringbootTest.java index f8297a228..0fa638079 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/getChainName/GetChainNameELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/getChainName/GetChainNameELSpringbootTest.java @@ -7,7 +7,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -17,8 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author Bryan.Zhang */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/getChainName/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.getChainName.cmp"}) +@TestPropertySource("classpath:/getChainName/application.properties") public class GetChainNameELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/ifelse/IfELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/ifelse/IfELSpringbootTest.java index e7964b5a1..ebd802971 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/ifelse/IfELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/ifelse/IfELSpringbootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -16,7 +15,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author Bryan.Zhang */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/ifelse/application.properties") +@TestPropertySource("classpath:/ifelse/application.properties") public class IfELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/LiteflowComponentELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/LiteflowComponentELSpringbootTest.java index 6b9023572..c21ecb329 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/LiteflowComponentELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/LiteflowComponentELSpringbootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -18,8 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.5.10 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/lfCmpAnno/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.lfCmpAnno.cmp"}) +@TestPropertySource("classpath:/lfCmpAnno/application.properties") public class LiteflowComponentELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/loop/LoopELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/loop/LoopELSpringbootTest.java index afd42ac7a..5b3c801f6 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/loop/LoopELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/loop/LoopELSpringbootTest.java @@ -7,7 +7,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -17,8 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author Bryan.Zhang */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/loop/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.loop.cmp"}) +@TestPropertySource("classpath:/loop/application.properties") public class LoopELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/monitor/MonitorELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/monitor/MonitorELSpringbootTest.java index b2280db03..c19acb3e8 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/monitor/MonitorELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/monitor/MonitorELSpringbootTest.java @@ -9,7 +9,6 @@ import org.junit.AfterClass; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -20,8 +19,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.6.4 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/monitor/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.monitor.cmp"}) +@TestPropertySource("classpath:/monitor/application.properties") public class MonitorELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/multiContext/MultiContextELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/multiContext/MultiContextELSpringbootTest.java index 5c1d43e9b..74e2c1f87 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/multiContext/MultiContextELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/multiContext/MultiContextELSpringbootTest.java @@ -9,7 +9,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -20,8 +19,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.6.4 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/multiContext/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.multiContext.cmp"}) +@TestPropertySource("classpath:/multiContext/application.properties") public class MultiContextELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/multipleType/LiteflowMultipleTypeELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/multipleType/LiteflowMultipleTypeELSpringbootTest.java index 13a7cff9a..dba4430f9 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/multipleType/LiteflowMultipleTypeELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/multipleType/LiteflowMultipleTypeELSpringbootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -19,7 +18,6 @@ import org.noear.solon.test.annotation.TestPropertySource; */ @RunWith(SolonJUnit4ClassRunner.class) @TestPropertySource("classpath:/multipleType/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.multipleType.cmp"}) public class LiteflowMultipleTypeELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/nullParam/NullParamELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/nullParam/NullParamELSpringbootTest.java index 28c0bc839..0aa6773f7 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/nullParam/NullParamELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/nullParam/NullParamELSpringbootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -18,8 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.6.6 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/nullParam/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.nullParam.cmp"}) +@TestPropertySource("classpath:/nullParam/application.properties") public class NullParamELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserJsonELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserJsonELSpringbootTest.java index c74b0b0a4..f6414ac4b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserJsonELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserJsonELSpringbootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -18,7 +17,6 @@ import org.noear.solon.test.annotation.TestPropertySource; */ @RunWith(SolonJUnit4ClassRunner.class) @TestPropertySource("classpath:/parsecustom/application-custom-json.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.parsecustom.cmp"}) public class CustomParserJsonELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserXmlELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserXmlELSpringbootTest.java index fb89695b2..af629f41c 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserXmlELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserXmlELSpringbootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -19,7 +18,6 @@ import org.noear.solon.test.annotation.TestPropertySource; */ @RunWith(SolonJUnit4ClassRunner.class) @TestPropertySource("classpath:/parsecustom/application-custom-xml.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.parsecustom.cmp","com.yomahub.liteflow.test.parsecustom.bean"}) public class CustomParserXmlELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserYmlELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserYmlELSpringbootTest.java index 2c456dfdf..c3d4c777d 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserYmlELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserYmlELSpringbootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -19,7 +18,6 @@ import org.noear.solon.test.annotation.TestPropertySource; */ @RunWith(SolonJUnit4ClassRunner.class) @TestPropertySource("classpath:/parsecustom/application-custom-yml.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.parsecustom.cmp","com.yomahub.liteflow.test.parsecustom.bean"}) public class CustomParserYmlELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/preAndFinally/PreAndFinallyELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/preAndFinally/PreAndFinallyELSpringbootTest.java index 1e8f5dcf7..758dd45b4 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/preAndFinally/PreAndFinallyELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/preAndFinally/PreAndFinallyELSpringbootTest.java @@ -7,7 +7,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -18,8 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.6.4 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/preAndFinally/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.preAndFinally.cmp"}) +@TestPropertySource("classpath:/preAndFinally/application.properties") public class PreAndFinallyELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/privateDelivery/PrivateDeliveryELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/privateDelivery/PrivateDeliveryELSpringbootTest.java index 154753040..5977cf78b 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/privateDelivery/PrivateDeliveryELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/privateDelivery/PrivateDeliveryELSpringbootTest.java @@ -8,7 +8,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -19,8 +18,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.5.0 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/privateDelivery/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.privateDelivery.cmp"}) +@TestPropertySource("classpath:/privateDelivery/application.properties") public class PrivateDeliveryELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/refreshRule/RefreshRuleELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/refreshRule/RefreshRuleELSpringbootTest.java index 8ce615311..251d7d68e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/refreshRule/RefreshRuleELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/refreshRule/RefreshRuleELSpringbootTest.java @@ -9,7 +9,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -20,8 +19,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.6.4 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/refreshRule/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.refreshRule.cmp"}) +@TestPropertySource("classpath:/refreshRule/application.properties") public class RefreshRuleELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/reload/ReloadELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/reload/ReloadELSpringbootTest.java index eeecbe21a..df36f8d38 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/reload/ReloadELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/reload/ReloadELSpringbootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -17,8 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.5.0 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/reload/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.reload.cmp"}) +@TestPropertySource("classpath:/reload/application.properties") public class ReloadELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/removeChain/RemoveChainELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/removeChain/RemoveChainELSpringbootTest.java index 4e7e0a36a..c0c922651 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/removeChain/RemoveChainELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/removeChain/RemoveChainELSpringbootTest.java @@ -7,7 +7,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -18,8 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.6.4 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/removeChain/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.removeChain.cmp"}) +@TestPropertySource("classpath:/removeChain/application.properties") public class RemoveChainELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/requestId/LiteflowRequestIdELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/requestId/LiteflowRequestIdELSpringbootTest.java index 6470ba066..2cb873660 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/requestId/LiteflowRequestIdELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/requestId/LiteflowRequestIdELSpringbootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -15,7 +14,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author tangkc */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/requestId/application.properties") +@TestPropertySource("classpath:/requestId/application.properties") public class LiteflowRequestIdELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/ImplicitSubFlowELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/ImplicitSubFlowELSpringbootTest.java index f84de8d1c..a7cf22dda 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/ImplicitSubFlowELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/ImplicitSubFlowELSpringbootTest.java @@ -7,7 +7,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -22,7 +21,7 @@ import java.util.Set; * @author justin.xu */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/subflow/application-implicit.properties") +@TestPropertySource("classpath:/subflow/application-implicit.properties") public class ImplicitSubFlowELSpringbootTest extends BaseTest { @Inject private FlowExecutor flowExecutor; diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowInDifferentConfigELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowInDifferentConfigELSpringbootTest.java index b758e1f4b..4d46b5c22 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowInDifferentConfigELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowInDifferentConfigELSpringbootTest.java @@ -8,7 +8,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.core.AopContext; import org.noear.solon.test.SolonJUnit4ClassRunner; diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowXMLELSpringBootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowXMLELSpringBootTest.java index 675d0be27..9a0be3ed1 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowXMLELSpringBootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowXMLELSpringBootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -18,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author justin.xu */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/subflow/application-xml.properties") +@TestPropertySource("classpath:/subflow/application-xml.properties") public class SubflowXMLELSpringBootTest extends BaseTest { @Inject private FlowExecutor flowExecutor; diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowYmlELSpringBootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowYmlELSpringBootTest.java index 12a1c3b29..d3a2aceae 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowYmlELSpringBootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowYmlELSpringBootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -18,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author justin.xu */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/subflow/application-yml.properties") +@TestPropertySource("classpath:/subflow/application-yml.properties") public class SubflowYmlELSpringBootTest extends BaseTest { @Inject private FlowExecutor flowExecutor; diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow2/SubflowJsonELSpringBootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow2/SubflowJsonELSpringBootTest.java index 1702ce0f7..b0b3de17f 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow2/SubflowJsonELSpringBootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow2/SubflowJsonELSpringBootTest.java @@ -17,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author justin.xu */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/subflow/application-json.properties") +@TestPropertySource("classpath:/subflow/application-json.properties") public class SubflowJsonELSpringBootTest extends BaseTest { @Inject private FlowExecutor flowExecutor; diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/SubstituteSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/SubstituteSpringbootTest.java index 9150ceb68..3602f1d4e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/SubstituteSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/substituteNode/SubstituteSpringbootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -16,8 +15,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @author Bryan.Zhang */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/substituteNode/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.substituteNode.cmp"}) +@TestPropertySource("classpath:/substituteNode/application.properties") public class SubstituteSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/switchcase/SwitchELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/switchcase/SwitchELSpringbootTest.java index 7d22b45a1..67b6fc9f4 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/switchcase/SwitchELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/switchcase/SwitchELSpringbootTest.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -17,7 +16,6 @@ import org.noear.solon.test.annotation.TestPropertySource; */ @RunWith(SolonJUnit4ClassRunner.class) @TestPropertySource("classpath:/switchcase/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.switchcase.cmp"}) public class SwitchELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/tag/NodeTagELSpringbootJsonTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/tag/NodeTagELSpringbootJsonTest.java index bc615e3bf..6c9dc3474 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/tag/NodeTagELSpringbootJsonTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/tag/NodeTagELSpringbootJsonTest.java @@ -8,7 +8,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -19,8 +18,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.5.0 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/tag/application-json.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.tag.cmp"}) +@TestPropertySource("classpath:/tag/application-json.properties") public class NodeTagELSpringbootJsonTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/tag/NodeTagELSpringbootXmlTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/tag/NodeTagELSpringbootXmlTest.java index ffa92937a..f5ce76604 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/tag/NodeTagELSpringbootXmlTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/tag/NodeTagELSpringbootXmlTest.java @@ -8,7 +8,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -19,8 +18,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.5.0 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/tag/application-xml.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.tag.cmp"}) +@TestPropertySource("classpath:/tag/application-xml.properties") public class NodeTagELSpringbootXmlTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/useTTLInWhen/UseTTLInWhenELSpringbootTest.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/useTTLInWhen/UseTTLInWhenELSpringbootTest.java index c395a2173..9dd5a7605 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/useTTLInWhen/UseTTLInWhenELSpringbootTest.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/useTTLInWhen/UseTTLInWhenELSpringbootTest.java @@ -7,7 +7,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -18,8 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource; * @since 2.6.3 */ @RunWith(SolonJUnit4ClassRunner.class) -@TestPropertySource(value = "classpath:/useTTLInWhen/application.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.useTTLInWhen.cmp"}) +@TestPropertySource("classpath:/useTTLInWhen/application.properties") public class UseTTLInWhenELSpringbootTest extends BaseTest { @Inject diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutELSpringbootTest1.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutELSpringbootTest1.java index 9a771ae0f..f5d8e521e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutELSpringbootTest1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutELSpringbootTest1.java @@ -7,7 +7,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -21,7 +20,6 @@ import org.slf4j.LoggerFactory; */ @RunWith(SolonJUnit4ClassRunner.class) @TestPropertySource("classpath:/whenTimeOut/application1.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.whenTimeOut.cmp"}) public class WhenTimeOutELSpringbootTest1 extends BaseTest { private final Logger log = LoggerFactory.getLogger(this.getClass()); diff --git a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutELSpringbootTest2.java b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutELSpringbootTest2.java index 05326f62c..621533aef 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutELSpringbootTest2.java +++ b/liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutELSpringbootTest2.java @@ -6,7 +6,6 @@ import com.yomahub.liteflow.test.BaseTest; import org.junit.Assert; import org.junit.Test; import org.junit.runner.RunWith; -import org.noear.solon.annotation.Import; import org.noear.solon.annotation.Inject; import org.noear.solon.test.SolonJUnit4ClassRunner; import org.noear.solon.test.annotation.TestPropertySource; @@ -20,7 +19,6 @@ import org.slf4j.LoggerFactory; */ @RunWith(SolonJUnit4ClassRunner.class) @TestPropertySource("classpath:/whenTimeOut/application2.properties") -@Import(scanPackages = {"com.yomahub.liteflow.test.whenTimeOut.cmp"}) public class WhenTimeOutELSpringbootTest2 extends BaseTest { private final Logger log = LoggerFactory.getLogger(this.getClass());