优化monitorFile的测试用例

liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/MonitorFileELDeclMultiSpringbootTest.java

@@ -1,52 +0,0 @@
-package com.yomahub.liteflow.test.monitorFile;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.resource.ClassPathResource;
-import cn.hutool.core.util.CharsetUtil;
-import com.yomahub.liteflow.core.FlowExecutor;
-import com.yomahub.liteflow.flow.LiteflowResponse;
-import com.yomahub.liteflow.test.BaseTest;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-import java.io.File;
-
-@ExtendWith(SpringExtension.class)
-@TestPropertySource(value = "classpath:/monitorFile/application.properties")
-@SpringBootTest(classes = MonitorFileELDeclMultiSpringbootTest.class)
-@EnableAutoConfiguration
-@ComponentScan({ "com.yomahub.liteflow.test.monitorFile.cmp" })
-public class MonitorFileELDeclMultiSpringbootTest extends BaseTest {
-
-	@Resource
-	private FlowExecutor flowExecutor;
-
-	@Test
-	public void testMonitor() throws Exception {
-		String absolutePath = new ClassPathResource("classpath:/monitorFile/flow.el.xml").getAbsolutePath();
-		FileUtil.writeString("<?xml version=\"1.0\" encoding=\"UTF-8\"?><flow><chain name=\"chain1\">THEN(a, b, c);</chain></flow>", new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-		String content = FileUtil.readUtf8String(absolutePath);
-		String newContent = content.replace("THEN(a, b, c);", "THEN(a, c, b);");
-		FileUtil.writeString(newContent, new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-		Thread.sleep(3000);
-		LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
-		Assertions.assertEquals("a==>c==>b", response.getExecuteStepStr());
-
-	}
-
-	@AfterEach
-	public void afterEach(){
-		String absolutePath = new ClassPathResource("classpath:/monitorFile/flow.el.xml").getAbsolutePath();
-		FileUtil.writeString("<?xml version=\"1.0\" encoding=\"UTF-8\"?><flow><chain name=\"chain1\">THEN(a, b, c);</chain></flow>", new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-	}
-
-}

liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/CmpConfig.java

@@ -1,28 +0,0 @@
-package com.yomahub.liteflow.test.monitorFile.cmp;
-
-import com.yomahub.liteflow.annotation.LiteflowComponent;
-import com.yomahub.liteflow.annotation.LiteflowMethod;
-import com.yomahub.liteflow.core.NodeComponent;
-import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
-
-import java.util.Random;
-
-@LiteflowComponent
-public class CmpConfig {
-
-	@LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "a")
-	public void processA(NodeComponent bindCmp) {
-		System.out.println("ACmp executed!");
-	}
-
-	@LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "b")
-	public void processB(NodeComponent bindCmp) {
-		System.out.println("BCmp executed!");
-	}
-
-	@LiteflowMethod(value = LiteFlowMethodEnum.PROCESS, nodeId = "c")
-	public void process(NodeComponent bindCmp) {
-		System.out.println("BCmp executed!");
-	}
-
-}

liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/monitorFile/application.properties

@@ -1,2 +0,0 @@
-liteflow.rule-source=monitorFile/flow.el.xml
-liteflow.enable-monitor-file=true

liteflow-testcase-el/liteflow-testcase-el-declare-multi-springboot/src/test/resources/monitorFile/flow.el.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flow>
-    <chain name="chain1">
-        THEN(a, b, c);
-    </chain>
-
-</flow>

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/MonitorFileELDeclSpringbootTest.java

@@ -1,51 +0,0 @@
-package com.yomahub.liteflow.test.monitorFile;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.resource.ClassPathResource;
-import cn.hutool.core.util.CharsetUtil;
-import com.yomahub.liteflow.core.FlowExecutor;
-import com.yomahub.liteflow.flow.LiteflowResponse;
-import com.yomahub.liteflow.test.BaseTest;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.springframework.test.context.junit.jupiter.SpringExtension;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
-import org.springframework.boot.test.context.SpringBootTest;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.test.context.TestPropertySource;
-import org.springframework.test.context.junit4.SpringRunner;
-
-import javax.annotation.Resource;
-import java.io.File;
-
-@ExtendWith(SpringExtension.class)
-@TestPropertySource(value = "classpath:/monitorFile/application.properties")
-@SpringBootTest(classes = MonitorFileELDeclSpringbootTest.class)
-@EnableAutoConfiguration
-@ComponentScan({ "com.yomahub.liteflow.test.monitorFile.cmp" })
-public class MonitorFileELDeclSpringbootTest extends BaseTest {
-
-	@Resource
-	private FlowExecutor flowExecutor;
-
-	@Test
-	public void testMonitor() throws Exception {
-		String absolutePath = new ClassPathResource("classpath:/monitorFile/flow.el.xml").getAbsolutePath();
-		FileUtil.writeString("<?xml version=\"1.0\" encoding=\"UTF-8\"?><flow><chain name=\"chain1\">THEN(a, b, c);</chain></flow>", new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-		String content = FileUtil.readUtf8String(absolutePath);
-		String newContent = content.replace("THEN(a, b, c);", "THEN(a, c, b);");
-		FileUtil.writeString(newContent, new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-		Thread.sleep(3000);
-		LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
-		Assertions.assertEquals("a==>c==>b", response.getExecuteStepStr());
-	}
-
-	@AfterEach
-	public void afterEach(){
-		String absolutePath = new ClassPathResource("classpath:/monitorFile/flow.el.xml").getAbsolutePath();
-		FileUtil.writeString("<?xml version=\"1.0\" encoding=\"UTF-8\"?><flow><chain name=\"chain1\">THEN(a, b, c);</chain></flow>", new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-	}
-
-}

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/ACmp.java

@@ -1,25 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.monitorFile.cmp;
-
-import com.yomahub.liteflow.annotation.LiteflowMethod;
-import com.yomahub.liteflow.core.NodeComponent;
-import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
-import org.springframework.stereotype.Component;
-
-import java.util.Random;
-
-@Component("a")
-public class ACmp {
-
-	@LiteflowMethod(LiteFlowMethodEnum.PROCESS)
-	public void process(NodeComponent bindCmp) {
-		System.out.println("ACmp executed!");
-	}
-
-}

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/BCmp.java

@@ -1,25 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.monitorFile.cmp;
-
-import com.yomahub.liteflow.annotation.LiteflowMethod;
-import com.yomahub.liteflow.core.NodeComponent;
-import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
-import org.springframework.stereotype.Component;
-
-import java.util.Random;
-
-@Component("b")
-public class BCmp {
-
-	@LiteflowMethod(LiteFlowMethodEnum.PROCESS)
-	public void process(NodeComponent bindCmp) {
-		System.out.println("BCmp executed!");
-	}
-
-}

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/CCmp.java

@@ -1,25 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.monitorFile.cmp;
-
-import com.yomahub.liteflow.annotation.LiteflowMethod;
-import com.yomahub.liteflow.core.NodeComponent;
-import com.yomahub.liteflow.enums.LiteFlowMethodEnum;
-import org.springframework.stereotype.Component;
-
-import java.util.Random;
-
-@Component("c")
-public class CCmp {
-
-	@LiteflowMethod(LiteFlowMethodEnum.PROCESS)
-	public void process(NodeComponent bindCmp) {
-		System.out.println("CCmp executed!");
-	}
-
-}

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/monitorFile/application.properties

@@ -1,2 +0,0 @@
-liteflow.rule-source=monitorFile/flow.el.xml
-liteflow.enable-monitor-file=true

liteflow-testcase-el/liteflow-testcase-el-declare-springboot/src/test/resources/monitorFile/flow.el.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flow>
-    <chain name="chain1">
-        THEN(a, b, c);
-    </chain>
-
-</flow>

liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/monitorFile/LiteflowMonitorFileTest.java

@@ -1,47 +0,0 @@
-package com.yomahub.liteflow.test.monitorFile;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.resource.ClassPathResource;
-import cn.hutool.core.util.CharsetUtil;
-import com.yomahub.liteflow.core.FlowExecutor;
-import com.yomahub.liteflow.core.FlowExecutorHolder;
-import com.yomahub.liteflow.flow.LiteflowResponse;
-import com.yomahub.liteflow.property.LiteflowConfig;
-import com.yomahub.liteflow.test.BaseTest;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
-
-import java.io.File;
-
-public class LiteflowMonitorFileTest extends BaseTest {
-
-	private static FlowExecutor flowExecutor;
-
-	@BeforeAll
-	public static void init() {
-		LiteflowConfig config = new LiteflowConfig();
-		config.setRuleSource("monitorFile/flow.el.xml");
-		config.setEnableMonitorFile(true);
-		flowExecutor = FlowExecutorHolder.loadInstance(config);
-	}
-
-	@Test
-	public void testMonitor() throws InterruptedException {
-		String absolutePath = new ClassPathResource("classpath:/monitorFile/flow.el.xml").getAbsolutePath();
-		String content = FileUtil.readUtf8String(absolutePath);
-		String newContent = content.replace("THEN(a, b, c);", "THEN(a, c, b);");
-		FileUtil.writeString(newContent, new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-		Thread.sleep(3000);
-		LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
-		Assertions.assertEquals("a==>c==>b", response.getExecuteStepStr());
-	}
-
-	@AfterEach
-	public void afterEach(){
-		String absolutePath = new ClassPathResource("classpath:/monitorFile/flow.el.xml").getAbsolutePath();
-		FileUtil.writeString("<?xml version=\"1.0\" encoding=\"UTF-8\"?><flow><chain name=\"chain1\">THEN(a, b, c);</chain></flow>", new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-	}
-
-}

liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/ACmp.java

@@ -1,19 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.monitorFile.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-
-public class ACmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("ACmp executed!");
-	}
-
-}

liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/BCmp.java

@@ -1,19 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.monitorFile.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-
-public class BCmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("BCmp executed!");
-	}
-
-}

liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/CCmp.java

@@ -1,19 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.monitorFile.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-
-public class CCmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("CCmp executed!");
-	}
-
-}

liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/monitorFile/MonitorFileSpringbootTest.java

@@ -1,44 +0,0 @@
-package com.yomahub.liteflow.test.monitorFile;
-
-import cn.hutool.core.io.FileUtil;
-import cn.hutool.core.io.resource.ClassPathResource;
-import cn.hutool.core.util.CharsetUtil;
-import com.yomahub.liteflow.core.FlowExecutor;
-import com.yomahub.liteflow.flow.LiteflowResponse;
-import com.yomahub.liteflow.test.BaseTest;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.Assertions;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.noear.solon.annotation.Inject;
-import org.noear.solon.test.SolonJUnit5Extension;
-import org.noear.solon.test.annotation.TestPropertySource;
-
-import java.io.File;
-
-@ExtendWith(SolonJUnit5Extension.class)
-@TestPropertySource("classpath:/monitorFile/application.properties")
-public class MonitorFileSpringbootTest extends BaseTest {
-
-	@Inject
-	private FlowExecutor flowExecutor;
-
-	@Test
-	public void testMonitor() throws Exception {
-		String absolutePath = new ClassPathResource("classpath:/monitorFile/flow.xml").getAbsolutePath();
-		FileUtil.writeString("<?xml version=\"1.0\" encoding=\"UTF-8\"?><flow><chain name=\"chain1\">THEN(a, b, c);</chain></flow>", new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-		String content = FileUtil.readUtf8String(absolutePath);
-		String newContent = content.replace("THEN(a, b, c);", "THEN(a, c, b);");
-		FileUtil.writeString(newContent, new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-		Thread.sleep(1000);
-		LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
-		Assertions.assertEquals("a==>c==>b", response.getExecuteStepStr());
-	}
-
-	@AfterEach
-	public void afterEach(){
-		String absolutePath = new ClassPathResource("classpath:/monitorFile/flow.el.xml").getAbsolutePath();
-		FileUtil.writeString("<?xml version=\"1.0\" encoding=\"UTF-8\"?><flow><chain name=\"chain1\">THEN(a, b, c);</chain></flow>", new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-	}
-
-}

liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/ACmp.java

@@ -1,23 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.monitorFile.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-import org.noear.solon.annotation.Component;
-
-import java.util.Random;
-
-@Component("a")
-public class ACmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("ACmp executed!");
-	}
-
-}

liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/BCmp.java

@@ -1,23 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.monitorFile.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-import org.noear.solon.annotation.Component;
-
-import java.util.Random;
-
-@Component("b")
-public class BCmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("BCmp executed!");
-	}
-
-}

liteflow-testcase-el/liteflow-testcase-el-solon/src/test/java/com/yomahub/liteflow/test/monitorFile/cmp/CCmp.java

@@ -1,23 +0,0 @@
-/**
- * <p>Title: liteflow</p>
- * <p>Description: 轻量级的组件式流程框架</p>
- * @author Bryan.Zhang
- * @email weenyc31@163.com
- * @Date 2020/4/1
- */
-package com.yomahub.liteflow.test.monitorFile.cmp;
-
-import com.yomahub.liteflow.core.NodeComponent;
-import org.noear.solon.annotation.Component;
-
-import java.util.Random;
-
-@Component("c")
-public class CCmp extends NodeComponent {
-
-	@Override
-	public void process() {
-		System.out.println("CCmp executed!");
-	}
-
-}

liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/monitorFile/application.properties

@@ -1,2 +0,0 @@
-liteflow.rule-source=monitorFile/flow.xml
-liteflow.enable-monitor-file=true

liteflow-testcase-el/liteflow-testcase-el-solon/src/test/resources/monitorFile/flow.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<flow>
-    <chain name="chain1">
-        THEN(a, b, c);
-    </chain>
-
-</flow>

liteflow-testcase-el/liteflow-testcase-el-springboot/src/test/java/com/yomahub/liteflow/test/monitorFile/MonitorFileELSpringbootTest.java

@@ -31,8 +31,9 @@ public class MonitorFileELSpringbootTest extends BaseTest {
         FileUtil.writeString("<?xml version=\"1.0\" encoding=\"UTF-8\"?><flow><chain name=\"chain1\">THEN(a, b, c);</chain></flow>", new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
 		String content = FileUtil.readUtf8String(absolutePath);
 		String newContent = content.replace("THEN(a, b, c);", "THEN(a, c, b);");
+        Thread.sleep(1000);
 		FileUtil.writeString(newContent, new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
-		Thread.sleep(1000);
+		Thread.sleep(3000);
 		LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg");
 		Assertions.assertEquals("a==>c==>b", response.getExecuteStepStr());
 	}
@@ -44,7 +45,6 @@ public class MonitorFileELSpringbootTest extends BaseTest {
     @Test
     public void testMonitorError() throws Exception {
         String absolutePath = new ClassPathResource("classpath:/monitorFile/flow.el.xml").getAbsolutePath();
-        FileUtil.writeString("<?xml version=\"1.0\" encoding=\"UTF-8\"?><flow><chain name=\"chain1\">THEN(a, b, c);</chain></flow>", new File(absolutePath), CharsetUtil.CHARSET_UTF_8);
         String content = FileUtil.readUtf8String(absolutePath);
 
         // 错误规则配置