public/liteFlow
1
0
Fork 0
mirror of https://gitee.com/dromara/liteFlow.git synced 2026-05-14 04:02:09 +08:00
Code Issues Packages Projects Releases Wiki Activity

【更新】solon 版本升为 2.6.5

Browse Source
This commit is contained in:
noear
2024-01-16 22:40:59 +08:00
parent ab32f7f7cb
commit af48be6061
57 changed files with 118 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
liteflow-solon-plugin/src/main/java/com/yomahub/liteflow/solon/config/LiteflowMainAutoConfiguration.java
View File

@@ -5,7 +5,7 @@ import com.yomahub.liteflow.property.LiteflowConfig;
import org.noear.solon.annotation.Configuration;
import org.noear.solon.annotation.Init;
import org.noear.solon.annotation.Inject;
import org.noear.solon.core.AopContext;
import org.noear.solon.core.AppContext;
/**
* 主要的业务装配器 在这个装配器里装配了执行器，执行器初始化类，监控器
@@ -22,7 +22,7 @@ public class LiteflowMainAutoConfiguration {
boolean parseOnStart;
@Inject
AopContext aopContext;
AppContext appContext;
@Inject
LiteflowConfig liteflowConfig;
@@ -39,7 +39,7 @@ public class LiteflowMainAutoConfiguration {
flowExecutor.init(true);
}
aopContext.wrapAndPut(FlowExecutor.class, flowExecutor);
appContext.wrapAndPut(FlowExecutor.class, flowExecutor);
}
}

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainJsonELSpringBootTest.java
View File

@@ -6,12 +6,12 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/abstractChain/application-json.properties")
@Import(profiles="classpath:/abstractChain/application-json.properties")
public class AbstractChainJsonELSpringBootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainXMLELSpringBootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* 测试显示调用子流程(xml) 单元测试
@@ -16,7 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author justin.xu
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/abstractChain/application.properties")
@Import(profiles="classpath:/abstractChain/application.properties")
public class AbstractChainXMLELSpringBootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/abstractChain/AbstractChainYmlELSpringBootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* 测试显示调用子流程(yml) 单元测试
@@ -16,7 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author justin.xu
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/abstractChain/application-yml.properties")
@Import(profiles="classpath:/abstractChain/application-yml.properties")
public class AbstractChainYmlELSpringBootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/asyncNode/AsyncNodeELSpringbootTest.java
View File

@@ -9,9 +9,9 @@ import com.yomahub.liteflow.test.asyncNode.exception.TestException;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* 测试隐式调用子流程 单元测试
@@ -19,7 +19,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author ssss
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/asyncNode/application.properties")
@Import(profiles="classpath:/asyncNode/application.properties")
public class AsyncNodeELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/base/BaseELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境EL常规的例子测试
@@ -16,7 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author Bryan.Zhang
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/base/application.properties")
@Import(profiles="classpath:/base/application.properties")
public class BaseELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpData/CmpDataELSpringbootTest.java
View File

@@ -9,9 +9,9 @@ import com.yomahub.liteflow.test.cmpData.vo.User;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境EL常规的例子测试
@@ -19,7 +19,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author Bryan.Zhang
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/cmpData/application.properties")
@Import(profiles="classpath:/cmpData/application.properties")
public class CmpDataELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpRetry/LiteflowRetryELSpringbootTest.java
View File

@@ -7,9 +7,9 @@ import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.snack.ONode;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* 测试springboot下的节点执行器
@@ -18,7 +18,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.5.10
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/cmpRetry/application.properties")
@Import(profiles="classpath:/cmpRetry/application.properties")
public class LiteflowRetryELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/cmpStep/CmpStepELSpringbootTest.java
View File

@@ -7,9 +7,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
import java.util.*;
@@ -20,7 +20,7 @@ import java.util.*;
* @since 2.7.0
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/cmpStep/application.properties")
@Import(profiles="classpath:/cmpStep/application.properties")
public class CmpStepELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/comments/LiteflowNodeELSpringbootTest.java
View File

@@ -7,12 +7,12 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/comments/application.properties")
@Import(profiles="classpath:/comments/application.properties")
public class LiteflowNodeELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/complex/ComplexELSpringbootTest1.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境EL复杂例子测试1
@@ -16,7 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author Bryan.Zhang
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/complex/application1.properties")
@Import(profiles="classpath:/complex/application1.properties")
public class ComplexELSpringbootTest1 extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/complex2/ComplexELSpringbootTest2.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境EL复杂例子测试1
@@ -16,7 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author Bryan.Zhang
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/complex/application2.properties")
@Import(profiles="classpath:/complex/application2.properties")
public class ComplexELSpringbootTest2 extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/component/FlowExecutorELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -18,7 +18,7 @@ import org.slf4j.LoggerFactory;
* @author donguo.tao
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/component/application.properties")
@Import(profiles="classpath:/component/application.properties")
public class FlowExecutorELSpringbootTest extends BaseTest {
private static final Logger LOG = LoggerFactory.getLogger(FlowExecutorELSpringbootTest.class);

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/customNodes/CustomNodesELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,7 +19,7 @@ import org.slf4j.LoggerFactory;
* @since 2.6.4
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/customNodes/application.properties")
@Import(profiles="classpath:/customNodes/application.properties")
public class CustomNodesELSpringbootTest extends BaseTest {
private final Logger log = LoggerFactory.getLogger(this.getClass());

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/customWhenThreadPool/CustomWhenThreadPoolELSpringbootTest.java
View File

@@ -7,9 +7,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory;
* @since 2.6.4
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/customWhenThreadPool/application.properties")
@Import(profiles="classpath:/customWhenThreadPool/application.properties")
public class CustomWhenThreadPoolELSpringbootTest extends BaseTest {
private final Logger log = LoggerFactory.getLogger(this.getClass());

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/event/EventELSpringbootTest.java
View File

@@ -7,9 +7,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境事件回调测试
@@ -18,7 +18,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.7.1
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/event/application.properties")
@Import(profiles="classpath:/event/application.properties")
public class EventELSpringbootTest extends BaseTest {
@Inject

9
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/exception/Exception2ELSpringBootTest.java
View File

@@ -2,7 +2,6 @@ package com.yomahub.liteflow.test.exception;
import com.yomahub.liteflow.core.FlowExecutor;
import com.yomahub.liteflow.exception.ChainNotFoundException;
import com.yomahub.liteflow.exception.FlowSystemException;
import com.yomahub.liteflow.exception.LiteFlowException;
import com.yomahub.liteflow.exception.NoSwitchTargetNodeException;
import com.yomahub.liteflow.flow.LiteflowResponse;
@@ -10,10 +9,10 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.core.AopContext;
import org.noear.solon.core.AppContext;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* 流程执行异常 单元测试
@@ -21,14 +20,14 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author zendwang
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/exception/application.properties")
@Import(profiles="classpath:/exception/application.properties")
public class Exception2ELSpringBootTest extends BaseTest {
@Inject
private FlowExecutor flowExecutor;
@Inject
private AopContext context;
private AppContext context;
@Test
public void testChainNotFoundException() throws Exception {

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/execute2Future/Executor2FutureELSpringbootTest.java
View File

@@ -7,9 +7,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
import java.util.concurrent.Future;
/**
@@ -19,7 +19,7 @@ import java.util.concurrent.Future;
* @since 2.6.13
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/execute2Future/application.properties")
@Import(profiles="classpath:/execute2Future/application.properties")
public class Executor2FutureELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/fallback/FallbackELSolonTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
import java.util.concurrent.ExecutionException;
import java.util.concurrent.Future;
@@ -20,7 +20,7 @@ import java.util.concurrent.Future;
* @since 2.11.1
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/fallback/application.properties")
@Import(profiles="classpath:/fallback/application.properties")
public class FallbackELSolonTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/getChainName/GetChainNameELSpringbootTest.java
View File

@@ -7,9 +7,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境获取ChainName的测试
@@ -17,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author Bryan.Zhang
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/getChainName/application.properties")
@Import(profiles="classpath:/getChainName/application.properties")
public class GetChainNameELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/ifelse/IfELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境EL常规的例子测试
@@ -16,7 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author Bryan.Zhang
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/ifelse/application.properties")
@Import(profiles="classpath:/ifelse/application.properties")
public class IfELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/lfCmpAnno/LiteflowComponentELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* 测试@LiteflowComponent标注
@@ -17,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.5.10
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/lfCmpAnno/application.properties")
@Import(profiles="classpath:/lfCmpAnno/application.properties")
public class LiteflowComponentELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/loop/LoopELSpringbootTest.java
View File

@@ -7,9 +7,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境EL循环的例子测试
@@ -17,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author Bryan.Zhang
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/loop/application.properties")
@Import(profiles="classpath:/loop/application.properties")
public class LoopELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitMilliseconds/MaxWaitMillisecondsSolonTest.java
View File

@@ -14,9 +14,9 @@ import com.yomahub.liteflow.test.maxWaitSeconds.cmp.CCmp;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
import java.util.concurrent.TimeoutException;
@@ -29,7 +29,7 @@ import static com.yomahub.liteflow.test.maxWaitSeconds.cmp.DCmp.CONTENT_KEY;
* @since 2.11.1
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/maxWaitMilliseconds/application.properties")
@Import(profiles="classpath:/maxWaitMilliseconds/application.properties")
public class MaxWaitMillisecondsSolonTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/maxWaitSeconds/MaxWaitSecondsSolonTest.java
View File

@@ -14,9 +14,9 @@ import com.yomahub.liteflow.test.maxWaitSeconds.cmp.CCmp;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
import java.util.concurrent.TimeoutException;
@@ -29,7 +29,7 @@ import static com.yomahub.liteflow.test.maxWaitSeconds.cmp.DCmp.CONTENT_KEY;
* @since 2.11.0
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/maxWaitSeconds/application.properties")
@Import(profiles="classpath:/maxWaitSeconds/application.properties")
public class MaxWaitSecondsSolonTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/monitor/MonitorELSpringbootTest.java
View File

@@ -9,9 +9,9 @@ import org.junit.jupiter.api.AfterAll;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境最普通的例子测试
@@ -20,7 +20,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.6.4
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/monitor/application.properties")
@Import(profiles="classpath:/monitor/application.properties")
public class MonitorELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/multiContext/MultiContextELSpringbootTest.java
View File

@@ -9,9 +9,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境最普通的例子测试
@@ -20,7 +20,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.6.4
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/multiContext/application.properties")
@Import(profiles="classpath:/multiContext/application.properties")
public class MultiContextELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/multipleType/LiteflowMultipleTypeELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* 测试springboot下混合格式规则的场景
@@ -17,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.5.10
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/multipleType/application.properties")
@Import(profiles="classpath:/multipleType/application.properties")
public class LiteflowMultipleTypeELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/nodeExecutor/LiteflowNodeExecutorELSpringbootTest.java
View File

@@ -7,9 +7,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* 测试springboot下的组件重试
@@ -18,7 +18,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.5.10
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/nodeExecutor/application.properties")
@Import(profiles="classpath:/nodeExecutor/application.properties")
public class LiteflowNodeExecutorELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/nullParam/NullParamELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* 单元测试:传递null param导致NPE的优化代码
@@ -17,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.6.6
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/nullParam/application.properties")
@Import(profiles="classpath:/nullParam/application.properties")
public class NullParamELSpringbootTest extends BaseTest {
@Inject

5
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parallelLoop/ParallelLoopELSpringbootTest.java
View File

@@ -9,11 +9,10 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
//import javax.annotation.Resource;
import java.util.List;
import java.util.regex.Pattern;
@@ -24,7 +23,7 @@ import java.util.regex.Pattern;
* @since 2.11.0
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/parallelLoop/application.properties")
@Import(profiles="classpath:/parallelLoop/application.properties")
public class ParallelLoopELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserJsonELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境的自定义json parser单元测试
@@ -17,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.5.0
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/parsecustom/application-custom-json.properties")
@Import(profiles="classpath:/parsecustom/application-custom-json.properties")
public class CustomParserJsonELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserXmlELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境的自定义xml parser单元测试 主要测试自定义配置源类是否能引入springboot中的其他依赖
@@ -17,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.5.7
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/parsecustom/application-custom-xml.properties")
@Import(profiles="classpath:/parsecustom/application-custom-xml.properties")
public class CustomParserXmlELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parsecustom/CustomParserYmlELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境的自定义yml parser单元测试 主要测试自定义配置源类是否能引入springboot中的其他依赖
@@ -16,7 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author junjun
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/parsecustom/application-custom-yml.properties")
@Import(profiles="classpath:/parsecustom/application-custom-yml.properties")
public class CustomParserYmlELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/JsonParserELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* spring环境的json parser单元测试
@@ -17,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.5.0
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/parser/application-json.properties")
@Import(profiles="classpath:/parser/application-json.properties")
public class JsonParserELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/SpringELSupportELSpringbootTest.java
View File

@@ -6,12 +6,12 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/parser/application-springEL.properties")
@Import(profiles="classpath:/parser/application-springEL.properties")
public class SpringELSupportELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/XmlParserELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境的xml parser单元测试
@@ -17,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.5.0
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/parser/application-xml.properties")
@Import(profiles="classpath:/parser/application-xml.properties")
public class XmlParserELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/parser/YmlParserELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot下的yml parser测试用例
@@ -17,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.5.0
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/parser/application-yml.properties")
@Import(profiles="classpath:/parser/application-yml.properties")
public class YmlParserELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/preAndFinally/PreAndFinallyELSpringbootTest.java
View File

@@ -7,9 +7,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境下pre节点和finally节点的测试
@@ -18,7 +18,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.6.4
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/preAndFinally/application.properties")
@Import(profiles="classpath:/preAndFinally/application.properties")
public class PreAndFinallyELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/privateDelivery/PrivateDeliveryELSpringbootTest.java
View File

@@ -8,9 +8,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境下隐私投递的测试
@@ -19,7 +19,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.5.0
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/privateDelivery/application.properties")
@Import(profiles="classpath:/privateDelivery/application.properties")
public class PrivateDeliveryELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/refreshRule/RefreshRuleELSpringbootTest.java
View File

@@ -9,9 +9,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境下重新加载规则测试
@@ -20,7 +20,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.6.4
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/refreshRule/application.properties")
@Import(profiles="classpath:/refreshRule/application.properties")
public class RefreshRuleELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/reload/ReloadELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境下重新加载规则测试
@@ -17,7 +17,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.5.0
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/reload/application.properties")
@Import(profiles="classpath:/reload/application.properties")
public class ReloadELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/removeChain/RemoveChainELSpringbootTest.java
View File

@@ -7,9 +7,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境最普通的例子测试
@@ -18,7 +18,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.6.4
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/removeChain/application.properties")
@Import(profiles="classpath:/removeChain/application.properties")
public class RemoveChainELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/requestId/LiteflowRequestIdELSpringbootTest.java
View File

@@ -6,15 +6,15 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* @author tangkc
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/requestId/application.properties")
@Import(profiles="classpath:/requestId/application.properties")
public class LiteflowRequestIdELSpringbootTest extends BaseTest {
@Inject

3
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/rollback/RollbackSpringbootTest.java
View File

@@ -7,13 +7,14 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/rollback/application.properties")
@Import(profiles="classpath:/rollback/application.properties")
public class RollbackSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/ImplicitSubFlowELSpringbootTest.java
View File

@@ -7,9 +7,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
import java.util.HashSet;
import java.util.Set;
@@ -20,7 +20,7 @@ import java.util.Set;
* @author justin.xu
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/subflow/application-implicit.properties")
@Import(profiles="classpath:/subflow/application-implicit.properties")
public class ImplicitSubFlowELSpringbootTest extends BaseTest {
@Inject

8
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowInDifferentConfigELSpringbootTest.java
View File

@@ -8,10 +8,10 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.core.AopContext;
import org.noear.solon.core.AppContext;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* 测试主流程与子流程在不同的配置文件的场景
@@ -19,7 +19,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author Bryan.Zhang
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/subflow/application-subInDifferentConfig1.properties")
@Import(profiles = "classpath:/subflow/application-subInDifferentConfig1.properties")
public class SubflowInDifferentConfigELSpringbootTest extends BaseTest {
@Inject
@@ -34,7 +34,7 @@ public class SubflowInDifferentConfigELSpringbootTest extends BaseTest {
}
@Inject
private AopContext context;
private AppContext context;
// 主要测试有不同的配置类型后会不会报出既定的错误
@Test

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowXMLELSpringBootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* 测试显示调用子流程(xml) 单元测试
@@ -16,7 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author justin.xu
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/subflow/application-xml.properties")
@Import(profiles ="classpath:/subflow/application-xml.properties")
public class SubflowXMLELSpringBootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow/SubflowYmlELSpringBootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* 测试显示调用子流程(yml) 单元测试
@@ -16,7 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author justin.xu
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/subflow/application-yml.properties")
@Import(profiles ="classpath:/subflow/application-yml.properties")
public class SubflowYmlELSpringBootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/subflow2/SubflowJsonELSpringBootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* 测试显示调用子流程(json) 单元测试
@@ -16,7 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author justin.xu
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/subflow/application-json.properties")
@Import(profiles ="classpath:/subflow/application-json.properties")
public class SubflowJsonELSpringBootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/switchcase/SwitchELSpringbootTest.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境EL常规的例子测试
@@ -16,7 +16,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @author Bryan.Zhang
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/switchcase/application.properties")
@Import(profiles ="classpath:/switchcase/application.properties")
public class SwitchELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/tag/NodeTagELSpringbootJsonTest.java
View File

@@ -8,9 +8,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境下隐私投递的测试
@@ -19,7 +19,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.5.0
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/tag/application-json.properties")
@Import(profiles ="classpath:/tag/application-json.properties")
public class NodeTagELSpringbootJsonTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/tag/NodeTagELSpringbootXmlTest.java
View File

@@ -8,9 +8,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* springboot环境下隐私投递的测试
@@ -19,7 +19,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.5.0
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/tag/application-xml.properties")
@Import(profiles ="classpath:/tag/application-xml.properties")
public class NodeTagELSpringbootXmlTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/useTTLInWhen/UseTTLInWhenELSpringbootTest.java
View File

@@ -7,9 +7,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
/**
* 在when异步节点的情况下去拿ThreadLocal里的测试场景
@@ -18,7 +18,7 @@ import org.noear.solon.test.annotation.TestPropertySource;
* @since 2.6.3
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/useTTLInWhen/application.properties")
@Import(profiles ="classpath:/useTTLInWhen/application.properties")
public class UseTTLInWhenELSpringbootTest extends BaseTest {
@Inject

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutELSpringbootTest1.java
View File

@@ -7,9 +7,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -20,7 +20,7 @@ import org.slf4j.LoggerFactory;
* @since 2.6.4
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/whenTimeOut/application1.properties")
@Import(profiles ="classpath:/whenTimeOut/application1.properties")
public class WhenTimeOutELSpringbootTest1 extends BaseTest {
private final Logger log = LoggerFactory.getLogger(this.getClass());

4
liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/whenTimeOut/WhenTimeOutELSpringbootTest2.java
View File

@@ -6,9 +6,9 @@ import com.yomahub.liteflow.test.BaseTest;
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith;
import org.noear.solon.annotation.Import;
import org.noear.solon.annotation.Inject;
import org.noear.solon.test.SolonJUnit5Extension;
import org.noear.solon.test.annotation.TestPropertySource;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -19,7 +19,7 @@ import org.slf4j.LoggerFactory;
* @since 2.6.4
*/
@ExtendWith(SolonJUnit5Extension.class)
@TestPropertySource("classpath:/whenTimeOut/application2.properties")
@Import(profiles ="classpath:/whenTimeOut/application2.properties")
public class WhenTimeOutELSpringbootTest2 extends BaseTest {
private final Logger log = LoggerFactory.getLogger(this.getClass());

2
pom.xml
View File

@@ -64,7 +64,7 @@
<bytebuddy.version>1.14.10</bytebuddy.version>
<aspectjweaver.version>1.8.13</aspectjweaver.version>
<logback-classic.version>1.2.3</logback-classic.version>
<solon.version>2.5.3</solon.version>
<solon.version>2.6.5</solon.version>
<netty.version>4.1.84.Final</netty.version>
<httpclient.version>4.5.13</httpclient.version>
<commons-beanutils.version>1.9.4</commons-beanutils.version>