From 7e41ee441dc2a5afeacceaa130d79ea7f22af94e Mon Sep 17 00:00:00 2001 From: bryan31 Date: Tue, 8 Mar 2022 01:14:20 +0800 Subject: [PATCH] =?UTF-8?q?=E8=A1=A5=E5=85=85=E6=B5=8B=E8=AF=95=E7=94=A8?= =?UTF-8?q?=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/zookeeper/ZkNodeWithJsonTest.java | 75 +++++++++++++++++++ .../test/zookeeper/ZkNodeWithXmlTest.java | 75 +++++++++++++++++++ .../test/zookeeper/ZkNodeWithYmlTest.java | 75 +++++++++++++++++++ .../liteflow/test/zookeeper/cmp/ACmp.java | 18 +++++ .../liteflow/test/zookeeper/cmp/BCmp.java | 19 +++++ .../liteflow/test/zookeeper/cmp/CCmp.java | 19 +++++ .../src/test/resources/zookeeper/flow.json | 28 +++++++ .../src/test/resources/zookeeper/flow.xml | 12 +++ .../src/test/resources/zookeeper/flow.yml | 14 ++++ .../ZkNodeWithJsonSpringbootTest.java | 3 +- .../ZkNodeWithXmlSpringbootTest.java | 3 +- .../ZkNodeWithYmlSpringbootTest.java | 9 +-- .../src/test/resources/zookeeper/flow.json | 16 ---- .../zookeeper/ZkNodeWithJsonSpringTest.java | 3 +- .../zookeeper/ZkNodeWithXmlSpringTest.java | 3 +- .../zookeeper/ZkNodeWithYmlSpringTest.java | 9 +-- .../src/test/resources/zookeeper/flow.json | 16 ---- 17 files changed, 347 insertions(+), 50 deletions(-) create mode 100644 liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonTest.java create mode 100644 liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlTest.java create mode 100644 liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlTest.java create mode 100644 liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java create mode 100644 liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java create mode 100644 liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java create mode 100644 liteflow-testcase-nospring/src/test/resources/zookeeper/flow.json create mode 100644 liteflow-testcase-nospring/src/test/resources/zookeeper/flow.xml create mode 100644 liteflow-testcase-nospring/src/test/resources/zookeeper/flow.yml diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonTest.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonTest.java new file mode 100644 index 000000000..1f5cdb7c1 --- /dev/null +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonTest.java @@ -0,0 +1,75 @@ +package com.yomahub.liteflow.test.zookeeper; + +import cn.hutool.core.io.resource.ResourceUtil; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.FlowExecutorHolder; +import com.yomahub.liteflow.entity.data.DefaultSlot; +import com.yomahub.liteflow.entity.data.LiteflowResponse; +import com.yomahub.liteflow.property.LiteflowConfig; +import com.yomahub.liteflow.test.BaseTest; +import org.I0Itec.zkclient.ZkClient; +import org.I0Itec.zkclient.exception.ZkMarshallingError; +import org.I0Itec.zkclient.serialize.ZkSerializer; +import org.apache.curator.test.TestingServer; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import java.nio.charset.Charset; +import java.util.concurrent.CountDownLatch; + +/** + * springboot环境下的zk配置源功能测试 + * ZK节点存储数据的格式为json文件 + * @author zendwang + * @since 2.5.0 + */ +public class ZkNodeWithJsonTest extends BaseTest { + + private static final String ZK_NODE_PATH = "/lite-flow/flow"; + + private static TestingServer zkServer; + + private static FlowExecutor flowExecutor; + + @BeforeClass + public static void setUpBeforeClass() throws Exception { + zkServer = new TestingServer(21810); + CountDownLatch latch = new CountDownLatch(1); + new Thread(() -> { + String data = ResourceUtil.readUtf8Str("zookeeper/flow.json"); + ZkClient zkClient = new ZkClient("127.0.0.1:21810"); + zkClient.setZkSerializer(new ZkSerializer() { + @Override + public byte[] serialize(final Object o) throws ZkMarshallingError { + return o.toString().getBytes(Charset.forName("UTF-8")); + } + + @Override + public Object deserialize(final byte[] bytes) throws ZkMarshallingError { + return new String(bytes, Charset.forName("UTF-8")); + } + }); + zkClient.createPersistent(ZK_NODE_PATH, true); + zkClient.writeData(ZK_NODE_PATH, data); + zkClient.close(); + latch.countDown(); + }).start(); + latch.await(); + + LiteflowConfig config = new LiteflowConfig(); + config.setRuleSource("json:127.0.0.1:21810"); + flowExecutor = FlowExecutorHolder.loadInstance(config); + } + + @Test + public void testZkNodeWithJson() { + LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); + Assert.assertTrue(response.isSuccess()); + } + + @AfterClass + public static void tearDown() throws Exception { + zkServer.stop(); + } +} diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlTest.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlTest.java new file mode 100644 index 000000000..a185f4175 --- /dev/null +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlTest.java @@ -0,0 +1,75 @@ +package com.yomahub.liteflow.test.zookeeper; + +import cn.hutool.core.io.resource.ResourceUtil; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.FlowExecutorHolder; +import com.yomahub.liteflow.entity.data.DefaultSlot; +import com.yomahub.liteflow.entity.data.LiteflowResponse; +import com.yomahub.liteflow.property.LiteflowConfig; +import com.yomahub.liteflow.test.BaseTest; +import org.I0Itec.zkclient.ZkClient; +import org.I0Itec.zkclient.exception.ZkMarshallingError; +import org.I0Itec.zkclient.serialize.ZkSerializer; +import org.apache.curator.test.TestingServer; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import java.nio.charset.Charset; +import java.util.concurrent.CountDownLatch; + +/** + * springboot环境下的zk配置源功能测试 + * ZK节点存储数据的格式为xml文件 + * @author zendwang + * @since 2.5.0 + */ +public class ZkNodeWithXmlTest extends BaseTest { + + private static final String ZK_NODE_PATH = "/lite-flow/flow"; + + private static TestingServer zkServer; + + private static FlowExecutor flowExecutor; + + @BeforeClass + public static void setUpBeforeClass() throws Exception { + zkServer = new TestingServer(21810); + CountDownLatch latch = new CountDownLatch(1); + new Thread(() -> { + String data = ResourceUtil.readUtf8Str("zookeeper/flow.xml"); + ZkClient zkClient = new ZkClient("127.0.0.1:21810"); + zkClient.setZkSerializer(new ZkSerializer() { + @Override + public byte[] serialize(final Object o) throws ZkMarshallingError { + return o.toString().getBytes(Charset.forName("UTF-8")); + } + + @Override + public Object deserialize(final byte[] bytes) throws ZkMarshallingError { + return new String(bytes, Charset.forName("UTF-8")); + } + }); + zkClient.createPersistent(ZK_NODE_PATH, true); + zkClient.writeData(ZK_NODE_PATH, data); + zkClient.close(); + latch.countDown(); + }).start(); + latch.await(); + + LiteflowConfig config = new LiteflowConfig(); + config.setRuleSource("xml:127.0.0.1:21810"); + flowExecutor = FlowExecutorHolder.loadInstance(config); + } + + @Test + public void testZkNodeWithXml() { + LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); + Assert.assertTrue(response.isSuccess()); + } + + @AfterClass + public static void tearDown() throws Exception { + zkServer.stop(); + } +} diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlTest.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlTest.java new file mode 100644 index 000000000..a17200fd0 --- /dev/null +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlTest.java @@ -0,0 +1,75 @@ +package com.yomahub.liteflow.test.zookeeper; + +import cn.hutool.core.io.resource.ResourceUtil; +import com.yomahub.liteflow.core.FlowExecutor; +import com.yomahub.liteflow.core.FlowExecutorHolder; +import com.yomahub.liteflow.entity.data.DefaultSlot; +import com.yomahub.liteflow.entity.data.LiteflowResponse; +import com.yomahub.liteflow.property.LiteflowConfig; +import com.yomahub.liteflow.test.BaseTest; +import org.I0Itec.zkclient.ZkClient; +import org.I0Itec.zkclient.exception.ZkMarshallingError; +import org.I0Itec.zkclient.serialize.ZkSerializer; +import org.apache.curator.test.TestingServer; +import org.junit.AfterClass; +import org.junit.Assert; +import org.junit.BeforeClass; +import org.junit.Test; +import java.nio.charset.Charset; +import java.util.concurrent.CountDownLatch; + +/** + * springboot环境下的zk配置源功能测试 + * ZK节点存储数据的格式为yml文件 + * @author zendwang + * @since 2.5.0 + */ +public class ZkNodeWithYmlTest extends BaseTest { + + private static final String ZK_NODE_PATH = "/lite-flow/flow"; + + private static TestingServer zkServer; + + private static FlowExecutor flowExecutor; + + @BeforeClass + public static void setUpBeforeClass() throws Exception { + zkServer = new TestingServer(21810); + CountDownLatch latch = new CountDownLatch(1); + new Thread(() -> { + String data = ResourceUtil.readUtf8Str("zookeeper/flow.yml"); + ZkClient zkClient = new ZkClient("127.0.0.1:21810"); + zkClient.setZkSerializer(new ZkSerializer() { + @Override + public byte[] serialize(final Object o) throws ZkMarshallingError { + return o.toString().getBytes(Charset.forName("UTF-8")); + } + + @Override + public Object deserialize(final byte[] bytes) throws ZkMarshallingError { + return new String(bytes, Charset.forName("UTF-8")); + } + }); + zkClient.createPersistent(ZK_NODE_PATH, true); + zkClient.writeData(ZK_NODE_PATH, data); + zkClient.close(); + latch.countDown(); + }).start(); + latch.await(); + + LiteflowConfig config = new LiteflowConfig(); + config.setRuleSource("yml:127.0.0.1:21810"); + flowExecutor = FlowExecutorHolder.loadInstance(config); + } + + @Test + public void testZkNodeWithYml() { + LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); + Assert.assertTrue(response.isSuccess()); + } + + @AfterClass + public static void tearDown() throws Exception { + zkServer.stop(); + } +} diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java new file mode 100644 index 000000000..9201a7b6b --- /dev/null +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/ACmp.java @@ -0,0 +1,18 @@ +/** + *

Title: liteflow

+ *

Description: 轻量级的组件式流程框架

+ * @author Bryan.Zhang + * @email weenyc31@163.com + * @Date 2020/4/1 + */ +package com.yomahub.liteflow.test.zookeeper.cmp; + +import com.yomahub.liteflow.core.NodeComponent; + +public class ACmp extends NodeComponent { + + @Override + public void process() { + System.out.println("ACmp executed!"); + } +} diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java new file mode 100644 index 000000000..da6444f5f --- /dev/null +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/BCmp.java @@ -0,0 +1,19 @@ +/** + *

Title: liteflow

+ *

Description: 轻量级的组件式流程框架

+ * @author Bryan.Zhang + * @email weenyc31@163.com + * @Date 2020/4/1 + */ +package com.yomahub.liteflow.test.zookeeper.cmp; + +import com.yomahub.liteflow.core.NodeComponent; + +public class BCmp extends NodeComponent { + + @Override + public void process() { + System.out.println("BCmp executed!"); + } + +} diff --git a/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java new file mode 100644 index 000000000..a4d7ed06b --- /dev/null +++ b/liteflow-testcase-nospring/src/test/java/com/yomahub/liteflow/test/zookeeper/cmp/CCmp.java @@ -0,0 +1,19 @@ +/** + *

Title: liteflow

+ *

Description: 轻量级的组件式流程框架

+ * @author Bryan.Zhang + * @email weenyc31@163.com + * @Date 2020/4/1 + */ +package com.yomahub.liteflow.test.zookeeper.cmp; + +import com.yomahub.liteflow.core.NodeComponent; + +public class CCmp extends NodeComponent { + + @Override + public void process() { + System.out.println("CCmp executed!"); + } + +} diff --git a/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.json b/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.json new file mode 100644 index 000000000..097d548c5 --- /dev/null +++ b/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.json @@ -0,0 +1,28 @@ +{ + "flow": { + "nodes": { + "node": [ + { + "id": "a", + "class": "com.yomahub.liteflow.test.zookeeper.cmp.ACmp" + }, + { + "id": "b", + "class": "com.yomahub.liteflow.test.zookeeper.cmp.BCmp" + }, + { + "id": "c", + "class": "com.yomahub.liteflow.test.zookeeper.cmp.CCmp" + } + ] + }, + "chain": [ + { + "name": "chain1", + "condition": [ + {"type": "then", "value": "a,b,c"} + ] + } + ] + } +} \ No newline at end of file diff --git a/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.xml b/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.xml new file mode 100644 index 000000000..5edf60188 --- /dev/null +++ b/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.xml @@ -0,0 +1,12 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.yml b/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.yml new file mode 100644 index 000000000..935c50bd5 --- /dev/null +++ b/liteflow-testcase-nospring/src/test/resources/zookeeper/flow.yml @@ -0,0 +1,14 @@ +flow: + nodes: + node: + - id: a + class: com.yomahub.liteflow.test.zookeeper.cmp.ACmp + - id: b + class: com.yomahub.liteflow.test.zookeeper.cmp.BCmp + - id: c + class: com.yomahub.liteflow.test.zookeeper.cmp.CCmp + chain: + - name: chain1 + condition: + - type: then + value: 'a,b,c' diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringbootTest.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringbootTest.java index dd5a8dc73..474c3fd9f 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringbootTest.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringbootTest.java @@ -1,5 +1,6 @@ package com.yomahub.liteflow.test.zookeeper; +import cn.hutool.core.io.resource.ResourceUtil; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.entity.data.DefaultSlot; import com.yomahub.liteflow.entity.data.LiteflowResponse; @@ -48,7 +49,7 @@ public class ZkNodeWithJsonSpringbootTest extends BaseTest { zkServer = new TestingServer(21810); CountDownLatch latch = new CountDownLatch(1); new Thread(() -> { - String data = "{\"flow\":{\"chain\":[{\"name\":\"chain1\",\"condition\":[{\"type\":\"then\",\"value\":\"a,b,c\"}]}]}}"; + String data = ResourceUtil.readUtf8Str("zookeeper/flow.json"); ZkClient zkClient = new ZkClient("127.0.0.1:21810"); zkClient.setZkSerializer(new ZkSerializer() { @Override diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringbootTest.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringbootTest.java index 6f7d3a3a3..c80a72fc3 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringbootTest.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringbootTest.java @@ -1,5 +1,6 @@ package com.yomahub.liteflow.test.zookeeper; +import cn.hutool.core.io.resource.ResourceUtil; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.entity.data.DefaultSlot; import com.yomahub.liteflow.entity.data.LiteflowResponse; @@ -48,7 +49,7 @@ public class ZkNodeWithXmlSpringbootTest extends BaseTest { zkServer = new TestingServer(21810); CountDownLatch latch = new CountDownLatch(1); new Thread(() -> { - String data = ""; + String data = ResourceUtil.readUtf8Str("zookeeper/flow.xml"); ZkClient zkClient = new ZkClient("127.0.0.1:21810"); zkClient.setZkSerializer(new ZkSerializer() { @Override diff --git a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringbootTest.java b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringbootTest.java index 99a42bcc4..5cc62daae 100644 --- a/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringbootTest.java +++ b/liteflow-testcase-springboot/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringbootTest.java @@ -1,5 +1,6 @@ package com.yomahub.liteflow.test.zookeeper; +import cn.hutool.core.io.resource.ResourceUtil; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.entity.data.DefaultSlot; import com.yomahub.liteflow.entity.data.LiteflowResponse; @@ -48,13 +49,7 @@ public class ZkNodeWithYmlSpringbootTest extends BaseTest { zkServer = new TestingServer(21810); CountDownLatch latch = new CountDownLatch(1); new Thread(() -> { - StringBuilder data = new StringBuilder() - .append("flow:\n") - .append(" chain:\n") - .append(" - name: chain1\n") - .append(" condition:\n") - .append(" - type: then\n") - .append(" value: 'a,b,c'"); + String data = ResourceUtil.readUtf8Str("zookeeper/flow.yml"); ZkClient zkClient = new ZkClient("127.0.0.1:21810"); zkClient.setZkSerializer(new ZkSerializer() { @Override diff --git a/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.json b/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.json index c3a7a8763..24615d628 100644 --- a/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.json +++ b/liteflow-testcase-springboot/src/test/resources/zookeeper/flow.json @@ -1,21 +1,5 @@ { "flow": { - "nodes": { - "node": [ - { - "id": "a", - "class": "com.yomahub.liteflow.test.config.cmp.ACmp" - }, - { - "id": "b", - "class": "com.yomahub.liteflow.test.config.cmp.BCmp" - }, - { - "id": "c", - "class": "com.yomahub.liteflow.test.config.cmp.CCmp" - } - ] - }, "chain": [ { "name": "chain1", diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringTest.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringTest.java index f836dbb45..3c75f2b3b 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringTest.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithJsonSpringTest.java @@ -1,5 +1,6 @@ package com.yomahub.liteflow.test.zookeeper; +import cn.hutool.core.io.resource.ResourceUtil; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.entity.data.DefaultSlot; import com.yomahub.liteflow.entity.data.LiteflowResponse; @@ -42,7 +43,7 @@ public class ZkNodeWithJsonSpringTest extends BaseTest { zkServer = new TestingServer(21810); CountDownLatch latch = new CountDownLatch(1); new Thread(() -> { - String data = "{\"flow\":{\"chain\":[{\"name\":\"chain1\",\"condition\":[{\"type\":\"then\",\"value\":\"a,b,c\"}]}]}}"; + String data = ResourceUtil.readUtf8Str("zookeeper/flow.json"); ZkClient zkClient = new ZkClient("127.0.0.1:21810"); zkClient.setZkSerializer(new ZkSerializer() { @Override diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringTest.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringTest.java index 3759333eb..4869b2958 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringTest.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithXmlSpringTest.java @@ -1,5 +1,6 @@ package com.yomahub.liteflow.test.zookeeper; +import cn.hutool.core.io.resource.ResourceUtil; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.entity.data.DefaultSlot; import com.yomahub.liteflow.entity.data.LiteflowResponse; @@ -42,7 +43,7 @@ public class ZkNodeWithXmlSpringTest extends BaseTest { zkServer = new TestingServer(21810); CountDownLatch latch = new CountDownLatch(1); new Thread(() -> { - String data = ""; + String data = ResourceUtil.readUtf8Str("zookeeper/flow.xml"); ZkClient zkClient = new ZkClient("127.0.0.1:21810"); zkClient.setZkSerializer(new ZkSerializer() { @Override diff --git a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringTest.java b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringTest.java index e625c0da2..8af3de003 100644 --- a/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringTest.java +++ b/liteflow-testcase-springnative/src/test/java/com/yomahub/liteflow/test/zookeeper/ZkNodeWithYmlSpringTest.java @@ -1,5 +1,6 @@ package com.yomahub.liteflow.test.zookeeper; +import cn.hutool.core.io.resource.ResourceUtil; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.entity.data.DefaultSlot; import com.yomahub.liteflow.entity.data.LiteflowResponse; @@ -42,13 +43,7 @@ public class ZkNodeWithYmlSpringTest extends BaseTest { zkServer = new TestingServer(21810); CountDownLatch latch = new CountDownLatch(1); new Thread(() -> { - StringBuilder data = new StringBuilder() - .append("flow:\n") - .append(" chain:\n") - .append(" - name: chain1\n") - .append(" condition:\n") - .append(" - type: then\n") - .append(" value: 'a,b,c'"); + String data = ResourceUtil.readUtf8Str("zookeeper/flow.yml"); ZkClient zkClient = new ZkClient("127.0.0.1:21810"); zkClient.setZkSerializer(new ZkSerializer() { @Override diff --git a/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.json b/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.json index 097d548c5..24615d628 100644 --- a/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.json +++ b/liteflow-testcase-springnative/src/test/resources/zookeeper/flow.json @@ -1,21 +1,5 @@ { "flow": { - "nodes": { - "node": [ - { - "id": "a", - "class": "com.yomahub.liteflow.test.zookeeper.cmp.ACmp" - }, - { - "id": "b", - "class": "com.yomahub.liteflow.test.zookeeper.cmp.BCmp" - }, - { - "id": "c", - "class": "com.yomahub.liteflow.test.zookeeper.cmp.CCmp" - } - ] - }, "chain": [ { "name": "chain1",