测试用例和主项目分离

liteflow-core/pom.xml

@@ -64,11 +64,6 @@
 			<groupId>dom4j</groupId>
 			<artifactId>dom4j</artifactId>
 		</dependency>
-		<dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-			<scope>test</scope>
-        </dependency>
 		<dependency>
 			<groupId>org.apache.curator</groupId>
 			<artifactId>curator-framework</artifactId>
@@ -91,15 +86,5 @@
 			<groupId>com.alibaba</groupId>
 			<artifactId>transmittable-thread-local</artifactId>
 		</dependency>
-		<dependency>
-			<groupId>org.apache.curator</groupId>
-			<artifactId>curator-test</artifactId>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>com.101tec</groupId>
-			<artifactId>zkclient</artifactId>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
 </project>

liteflow-script-groovy/pom.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>liteflow</artifactId>
+        <groupId>com.yomahub</groupId>
+        <version>2.5.11</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>liteflow-script-groovy</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-script-common</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-core</artifactId>
+            <version>${project.version}</version>
+            <optional>true</optional>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.codehaus.groovy</groupId>
+            <artifactId>groovy-jsr223</artifactId>
+        </dependency>
+    </dependencies>
+</project>

liteflow-spring-boot-starter/pom.xml

@@ -30,34 +30,6 @@
             <version>${springboot.version}</version>
             <optional>true</optional>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-test</artifactId>
-            <version>${springboot.version}</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.aspectj</groupId>
-            <artifactId>aspectjweaver</artifactId>
-            <version>1.8.13</version>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.curator</groupId>
-            <artifactId>curator-test</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.101tec</groupId>
-            <artifactId>zkclient</artifactId>
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>com.yomahub</groupId>
-            <artifactId>liteflow-script-qlexpress</artifactId>
-            <version>${project.version}</version>
-            <scope>test</scope>
-        </dependency>
     </dependencies>
 
     <build>

liteflow-spring-boot-starter/src/test/resources/liteflow单测.md

@@ -1,72 +0,0 @@
-### 先请认真阅读单测用例的说明
-
-> 说明：
->
-> 1.单测无spring环境的用例和spring环境的用例放在`liteflow-core`工程里，springboot环境的单测放在`liteflow-spring-boot-starter`工程里。
->
-> 2.所有单测按照目前已经拥有的单测模式去写，多人协助保持统一性。不能每个人都用自己单独的风格去写。这点望理解。
->
-> 3.关于断言，如果要断言流程执行的顺序，请用slot.printStep返回的结果去断言。如果其他结果数据，组件结果统一放在slot里，最后拿出来进行断言。
->
-> 4.因为liteflow现在有xml，json，yml三种配置方式，每个场景如果都测试3种配置场景，那冗余有点多。目前有专门测试解析器的测试用例，其余的用例都统一基于xml场景。
->
-> 5.liteflow使用上也分3种场景，无spring环境，spring环境，springboot环境。大多数情况下都会对3种场景进行测试，但是因为无spring环境限制比较多，使用场景也比较少。所以有些测试用例也就跳过了这种环境。
->
-> 6.有些测试用例要求只在springboot环境下即可，是因为无论是spring还是springboot，底层执行的代码块都一样。只不过在配置层面有所区别，但是配置层面已经有单独的用例去测了spring和springboot了。所以为了不冗余大量的代码。更好的维护。所以只要求在springboot环境下进行测。而有些和配置相关，就需要spring环境下也提供。
-
-
-
-### 测试用例列表
-
-- [x] aop的测试
-  - [x] springboot下的AspectJ
-  - [ ] spring环境下的aop
-  - [x] springboot下的global AOP
-
-- [x] 异常的测试
-  - [x] Liteflow内部各种CheckedException的测试
-
-- [x] 解析器测试
-  - [x] Xml方式在无spring环境下测试
-  - [x] Xml方式在spring环境下测试
-  - [x] Xml方式在springboot环境下测试
-  - [x] Json方式在无spring环境下测试
-  - [x] Json方式在spring环境下测试
-  - [x] Json方式在springboot环境下测试
-  - [x] Yml方式在无spring环境下测试
-  - [x] Yml方式在spring环境下测试
-  - [] Yml方式在springboot环境下测试
-
-- [x] 参数测试(只测到参数是不是被总的LiteFlowConfig加载到即可)
-  - [x] 非spring环境下的参数测试，必要参数测试，非必须参数的默认值测试。
-  - [x] spring环境下的参数测试，必要参数测试，非必须参数的默认值测试。
-  - [x] springboot环境下的参数测试，必要参数测试，非必须参数的默认值测试。
-- [x] zk配置源的功能测试(zk请自己本地安装提供)
-  - [x] spring环境下的zk配置源功能测试
-  - [x] springboot环境下的zk配置源功能测试
-- [x] 自定义源的功能测试
-  - [x] spring环境下的自定义配置源功能测试
-  - [x] springboot环境下的自定义配置源功能测试
-- [x] 组件功能点测试(基于springboot环境即可)
-  - [x] isAccess方法的功能测试
-  - [x] 组件抛错的功能点测试
-  - [x] isContinueOnError方法的功能点测试
-  - [x] isEnd方法和this.setIsEnd(true)的功能点测试
-- [x] 条件组件功能点测试(基于springboot环境)
-  - [x] 条件组件的功能点测试
-- [x] 显式子流程测试(基于springboot环境)
-  - [x] 子流程功能点测试，是否能进入子流程
-  - [x] 多个子流程是否能串联衔接
-  - [x] 同名节点和同名chain是否节点为优先级最高
-  - [x] 多个子流程配置顺序是否和最终执行结果无关(这个需要结合xml，json，yml来测，分3种配置方式，因为这个和parser有一定的关系)
-- [x] 隐式子流程测试(基于springboot环境)
-  - [x] 隐式子流程的功能点测试
-  - [x] 多个隐式子流程是否能共享同一个上下文
-- [x] when condition下的线程池功能测试(基于springboot环境)
-  - [x] 线程池的基本功能点测试
-  - [x] 线程池满了情况下基于errorResume参数的功能点测试
-- [x] when并行组功能测试(基于springboot环境)
-  - [x] 默认不配参数情况下并行组的功能点测试
-  - [x] 配置相同并行组情况下的功能点测试
-  - [x] 配置不同并行组情况下的功能点测试
-

liteflow-spring-boot-starter/src/test/resources/scriptnode/application.properties

@@ -1 +0,0 @@
-liteflow.rule-source=scriptnode/flow.xml

liteflow-testcase-script-qlexpress/pom.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>liteflow</artifactId>
+        <groupId>com.yomahub</groupId>
+        <version>2.5.11</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>liteflow-testcase-script-qlexpress</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-spring-boot-starter</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${springboot.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>1.8.13</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.101tec</groupId>
+            <artifactId>zkclient</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-script-qlexpress</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${springboot.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/scriptnode/LiteflowScriptSpringbootTest.java → liteflow-testcase-script-qlexpress/src/test/java/com/yomahub/liteflow/test/script/qlexpress/LiteflowScriptQLExpressTest.java

@@ -1,4 +1,4 @@
-package com.yomahub.liteflow.test.scriptnode;
+package com.yomahub.liteflow.test.script.qlexpress;
 
 import com.yomahub.liteflow.core.FlowExecutor;
 import com.yomahub.liteflow.entity.data.DefaultSlot;
@@ -22,11 +22,11 @@ import javax.annotation.Resource;
  * @since 2.5.11
  */
 @RunWith(SpringRunner.class)
-@TestPropertySource(value = "classpath:/scriptnode/application.properties")
-@SpringBootTest(classes = LiteflowScriptSpringbootTest.class)
+@TestPropertySource(value = "classpath:/script/application.properties")
+@SpringBootTest(classes = LiteflowScriptQLExpressTest.class)
 @EnableAutoConfiguration
-@ComponentScan({"com.yomahub.liteflow.test.scriptnode.cmp"})
-public class LiteflowScriptSpringbootTest extends BaseTest {
+@ComponentScan({"com.yomahub.liteflow.test.script.qlexpress.cmp"})
+public class LiteflowScriptQLExpressTest extends BaseTest {
 
     @Resource
     private FlowExecutor flowExecutor;

liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/scriptnode/cmp/ACmp.java → liteflow-testcase-script-qlexpress/src/test/java/com/yomahub/liteflow/test/script/qlexpress/cmp/ACmp.java

@@ -5,7 +5,7 @@
  * @email weenyc31@163.com
  * @Date 2020/4/1
  */
-package com.yomahub.liteflow.test.scriptnode.cmp;
+package com.yomahub.liteflow.test.script.qlexpress.cmp;
 
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeComponent;

liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/scriptnode/cmp/BCmp.java → liteflow-testcase-script-qlexpress/src/test/java/com/yomahub/liteflow/test/script/qlexpress/cmp/BCmp.java

@@ -5,7 +5,7 @@
  * @email weenyc31@163.com
  * @Date 2020/4/1
  */
-package com.yomahub.liteflow.test.scriptnode.cmp;
+package com.yomahub.liteflow.test.script.qlexpress.cmp;
 
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeComponent;

liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/scriptnode/cmp/CCmp.java → liteflow-testcase-script-qlexpress/src/test/java/com/yomahub/liteflow/test/script/qlexpress/cmp/CCmp.java

@@ -5,7 +5,7 @@
  * @email weenyc31@163.com
  * @Date 2020/4/1
  */
-package com.yomahub.liteflow.test.scriptnode.cmp;
+package com.yomahub.liteflow.test.script.qlexpress.cmp;
 
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeComponent;

liteflow-spring-boot-starter/src/test/java/com/yomahub/liteflow/test/scriptnode/cmp/DCmp.java → liteflow-testcase-script-qlexpress/src/test/java/com/yomahub/liteflow/test/script/qlexpress/cmp/DCmp.java

@@ -5,7 +5,7 @@
  * @email weenyc31@163.com
  * @Date 2020/4/1
  */
-package com.yomahub.liteflow.test.scriptnode.cmp;
+package com.yomahub.liteflow.test.script.qlexpress.cmp;
 
 import com.yomahub.liteflow.annotation.LiteflowComponent;
 import com.yomahub.liteflow.core.NodeComponent;

liteflow-testcase-script-qlexpress/src/test/resources/script/application.properties

@@ -0,0 +1 @@
+liteflow.rule-source=script/flow.xml

liteflow-testcase-springboot/pom.xml

@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0"
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <parent>
+        <artifactId>liteflow</artifactId>
+        <groupId>com.yomahub</groupId>
+        <version>2.5.11</version>
+    </parent>
+    <modelVersion>4.0.0</modelVersion>
+
+    <artifactId>liteflow-testcase-springboot</artifactId>
+
+    <dependencies>
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-spring-boot-starter</artifactId>
+            <version>${project.version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-test</artifactId>
+            <version>${springboot.version}</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.aspectj</groupId>
+            <artifactId>aspectjweaver</artifactId>
+            <version>1.8.13</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.curator</groupId>
+            <artifactId>curator-test</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.101tec</groupId>
+            <artifactId>zkclient</artifactId>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.yomahub</groupId>
+            <artifactId>liteflow-script-qlexpress</artifactId>
+            <version>${project.version}</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
+                <version>${springboot.version}</version>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-deploy-plugin</artifactId>
+                <version>2.8.2</version>
+                <configuration>
+                    <skip>true</skip>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>