From 35532d6186b7de8cb76e1ce673a28190cfbb110a Mon Sep 17 00:00:00 2001 From: tangkc <1016771049@qq.com> Date: Sun, 10 Jul 2022 16:26:15 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=20liteflow-testcase-el-nospr?= =?UTF-8?q?ing=20=E6=B5=8B=E8=AF=95=E7=94=A8=E4=BE=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../test/config/LiteflowConfigTest1.java | 2 +- .../liteflow/test/exception/Exception1Test.java | 2 +- .../liteflow/test/exception/Exception2Test.java | 2 ++ .../src/test/resources/cmpRetry/flow.el.xml | 10 +++++----- .../src/test/resources/config/flow.el.xml | 12 ++++++++++++ .../src/test/resources/emptyFlow/flow.el.xml | 0 .../test/resources/execute2Future/flow.el.xml | 7 +++++++ .../src/test/resources/flowmeta/flow.el.xml | 12 ++++++++++++ .../src/test/resources/nullParam/flow.el.xml | 12 ++++++++++++ .../src/test/resources/removeChain/flow.el.xml | 17 +++++++++++++++++ .../src/test/resources/resizeSlot/flow.el.xml | 12 ++++++++++++ 11 files changed, 81 insertions(+), 7 deletions(-) create mode 100644 liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/config/flow.el.xml create mode 100644 liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/emptyFlow/flow.el.xml create mode 100644 liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/flowmeta/flow.el.xml create mode 100644 liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/nullParam/flow.el.xml create mode 100644 liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/removeChain/flow.el.xml create mode 100644 liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/resizeSlot/flow.el.xml diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/config/LiteflowConfigTest1.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/config/LiteflowConfigTest1.java index 8f213d53c..2195047a3 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/config/LiteflowConfigTest1.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/config/LiteflowConfigTest1.java @@ -31,7 +31,7 @@ public class LiteflowConfigTest1 extends BaseTest { LiteflowConfig config = LiteflowConfigGetter.get(); LiteflowResponse response = flowExecutor.execute2Resp("chain1", "arg"); Assert.assertTrue(response.isSuccess()); - Assert.assertEquals("config/flow.xml", config.getRuleSource()); + Assert.assertEquals("config/flow.el.xml", config.getRuleSource()); Assert.assertEquals(15, config.getWhenMaxWaitSeconds().intValue()); Assert.assertEquals(200, config.getQueueLimit().intValue()); Assert.assertEquals(300000L, config.getDelay().longValue()); diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/exception/Exception1Test.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/exception/Exception1Test.java index 551b9b613..6b9dc217e 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/exception/Exception1Test.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/exception/Exception1Test.java @@ -35,7 +35,7 @@ public class Exception1Test extends BaseTest { @Test(expected = ChainDuplicateException.class) public void testChainDuplicateException() { LiteflowConfig config = LiteflowConfigGetter.get(); - config.setRuleSource("exception/flow-exception.xml"); + config.setRuleSource("exception/flow-exception.el.xml"); flowExecutor.init(); } diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/exception/Exception2Test.java b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/exception/Exception2Test.java index f28d379f3..34c56e6b8 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/exception/Exception2Test.java +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/java/com/yomahub/liteflow/test/exception/Exception2Test.java @@ -1,5 +1,6 @@ package com.yomahub.liteflow.test.exception; +import com.yomahub.liteflow.builder.LiteFlowChainBuilder; import com.yomahub.liteflow.core.FlowExecutor; import com.yomahub.liteflow.core.FlowExecutorHolder; import com.yomahub.liteflow.exception.ChainNotFoundException; @@ -41,6 +42,7 @@ public class Exception2Test extends BaseTest { @Test(expected = FlowSystemException.class) public void testNoConditionInChainException() throws Throwable { + LiteFlowChainBuilder.createChain().setChainName("chain2").build(); LiteflowResponse response = flowExecutor.execute2Resp("chain2", "test"); Assert.assertFalse(response.isSuccess()); Assert.assertEquals("no conditionList in this chain[chain2]", response.getMessage()); diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/cmpRetry/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/cmpRetry/flow.el.xml index c8d0b7a39..8a03387c8 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/cmpRetry/flow.el.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/cmpRetry/flow.el.xml @@ -2,11 +2,11 @@ - - - - - + + + + + diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/config/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/config/flow.el.xml new file mode 100644 index 000000000..8bf0cebb3 --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/config/flow.el.xml @@ -0,0 +1,12 @@ + + + + + + + + + + THEN(a,b,c); + + \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/emptyFlow/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/emptyFlow/flow.el.xml new file mode 100644 index 000000000..e69de29bb diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/execute2Future/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/execute2Future/flow.el.xml index 47cf69680..2d362e1f3 100644 --- a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/execute2Future/flow.el.xml +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/execute2Future/flow.el.xml @@ -1,5 +1,12 @@ + + + + + + + THEN(a, b, WHEN(c, d)); diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/flowmeta/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/flowmeta/flow.el.xml new file mode 100644 index 000000000..01f1bcb20 --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/flowmeta/flow.el.xml @@ -0,0 +1,12 @@ + + + + + + + + + + THEN(a,b,c,d); + + \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/nullParam/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/nullParam/flow.el.xml new file mode 100644 index 000000000..c099415f9 --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/nullParam/flow.el.xml @@ -0,0 +1,12 @@ + + + + + + + + + + THEN(a, b, WHEN(c)); + + diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/removeChain/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/removeChain/flow.el.xml new file mode 100644 index 000000000..cd19da339 --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/removeChain/flow.el.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + THEN(a, b, WHEN(c,d)); + + + + THEN(a, b, c,d); + + \ No newline at end of file diff --git a/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/resizeSlot/flow.el.xml b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/resizeSlot/flow.el.xml new file mode 100644 index 000000000..db211ca32 --- /dev/null +++ b/liteflow-testcase-el/liteflow-testcase-el-nospring/src/test/resources/resizeSlot/flow.el.xml @@ -0,0 +1,12 @@ + + + + + + + + + + THEN(a, b, c); + + \ No newline at end of file