From b446f7d3f64c0cf26dbfce7d1d777b0aa441cf4a Mon Sep 17 00:00:00 2001 From: joergboe Date: Mon, 7 Oct 2019 19:03:33 +0200 Subject: [PATCH] Add test with compound commands in STEPS --- .../Functions/TestSuite.sh} | 0 .../Functions/arrayAppend/TestCase.sh | 0 .../Functions/arrayDelete/TestCase.sh | 0 .../Functions/arrayInsert/TestCase.sh | 0 .../Functions/copyAndMorph/TestCase.sh | 0 .../Functions/copyAndMorph/adir/file2.spx | 0 .../Functions/copyAndMorph/adir/file2.txt | 0 .../Functions/copyAndMorph/file1.spl | 0 .../Functions/copyAndMorph/file1.txt | 0 .../Functions/copyAndMorph2/TestCase.sh | 0 .../Functions/copyAndMorph2/file1.spl | 0 .../Functions/copyAndMorph2/file1.txt | 0 .../Functions/copyAndMorph3/TestCase.sh | 0 .../Functions/copyAndMorph3/file1.spl | 0 .../Functions/copyAndMorph3/file1.txt | 0 .../Functions/copyAndMorph3/file1_foaur.spl | 0 .../Functions/copyAndMorph3/file1_foxur.spl | 0 .../Functions/copyAndMorph3/file1_one.spl | 0 .../Functions/copyAndMorph3/file1_oneone.spl | 0 .../Functions/copyAndMorph3/file1_onewith.spl | 0 .../Functions/copyAndMorph3/file1_thre-e.spl | 0 .../Functions/copyAndMorph3/file1_two1x.spl | 0 .../Functions/echoAndExecute/TestCase.sh | 0 .../echoExecuteAndIntercept/TestCase.sh | 0 .../echoExecuteAndIntercept2/TestCase.sh | 0 .../echoExecuteInterceptAndError/TestCase.sh | 0 .../TestCase.sh | 0 .../Functions/executeAndLog/TestCase.sh | 0 .../Functions/executeLogAndError/TestCase.sh | 0 .../executeLogAndSuccess/TestCase.sh | 0 .../Functions/findTokenInDirs/TestCase.sh | 0 .../Functions/findTokenInDirs/d1/.gitkeep} | 0 .../Functions/findTokenInDirs/d2/f1.txt} | 0 .../Functions/findTokenInDirs/d2/f2.txt | 0 .../Functions/findTokenInDirs/d2/f3.sss} | 0 .../Functions/findTokenInDirs/d3/f3.txt | 0 .../Functions/findTokenInFiles/TestCase.sh | 0 .../Collection/Functions/findTokenInFiles/f1 | 0 .../Functions/findTokenInFiles/f2 | 0 .../Functions/isExisting/TestCase.sh | 0 .../Functions/isFalse/TestCase.sh | 0 .../Functions/isTrue/TestCase.sh | 0 .../linewisePatternMatch/TestCase.sh | 0 .../Functions/linewisePatternMatch/file | 0 .../Functions/preambl/TestCase.sh | 0 .../Functions/setVar/TestSuite.sh | 0 .../Functions/setVar/setVar/TestCase.sh | 0 .../Functions/trim/TestCase.sh | 0 .../CompondCommandsAsSteps/TestCase.sh | 10 +++ .../Collection/SpecialCases/TestSuite.sh | 0 test/functionTest/Collection/TestSuite.sh | 71 +++++++++++++++++++ test/functionTest/Functions/TestSuite.sh | 71 ------------------- 52 files changed, 81 insertions(+), 71 deletions(-) rename test/functionTest/{Functions/findTokenInDirs/d1/.gitkeep => Collection/Functions/TestSuite.sh} (100%) rename test/functionTest/{ => Collection}/Functions/arrayAppend/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/arrayDelete/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/arrayInsert/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph/adir/file2.spx (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph/adir/file2.txt (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph/file1.spl (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph/file1.txt (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph2/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph2/file1.spl (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph2/file1.txt (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph3/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph3/file1.spl (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph3/file1.txt (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph3/file1_foaur.spl (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph3/file1_foxur.spl (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph3/file1_one.spl (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph3/file1_oneone.spl (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph3/file1_onewith.spl (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph3/file1_thre-e.spl (100%) rename test/functionTest/{ => Collection}/Functions/copyAndMorph3/file1_two1x.spl (100%) rename test/functionTest/{ => Collection}/Functions/echoAndExecute/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/echoExecuteAndIntercept/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/echoExecuteAndIntercept2/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/echoExecuteInterceptAndError/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/echoExecuteInterceptAndSuccess/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/executeAndLog/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/executeLogAndError/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/executeLogAndSuccess/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/findTokenInDirs/TestCase.sh (100%) rename test/functionTest/{Functions/findTokenInDirs/d2/f1.txt => Collection/Functions/findTokenInDirs/d1/.gitkeep} (100%) rename test/functionTest/{Functions/findTokenInDirs/d2/f3.sss => Collection/Functions/findTokenInDirs/d2/f1.txt} (100%) rename test/functionTest/{ => Collection}/Functions/findTokenInDirs/d2/f2.txt (100%) rename test/functionTest/{Functions/findTokenInFiles/f1 => Collection/Functions/findTokenInDirs/d2/f3.sss} (100%) rename test/functionTest/{ => Collection}/Functions/findTokenInDirs/d3/f3.txt (100%) rename test/functionTest/{ => Collection}/Functions/findTokenInFiles/TestCase.sh (100%) create mode 100644 test/functionTest/Collection/Functions/findTokenInFiles/f1 rename test/functionTest/{ => Collection}/Functions/findTokenInFiles/f2 (100%) rename test/functionTest/{ => Collection}/Functions/isExisting/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/isFalse/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/isTrue/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/linewisePatternMatch/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/linewisePatternMatch/file (100%) rename test/functionTest/{ => Collection}/Functions/preambl/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/setVar/TestSuite.sh (100%) rename test/functionTest/{ => Collection}/Functions/setVar/setVar/TestCase.sh (100%) rename test/functionTest/{ => Collection}/Functions/trim/TestCase.sh (100%) create mode 100644 test/functionTest/Collection/SpecialCases/CompondCommandsAsSteps/TestCase.sh create mode 100644 test/functionTest/Collection/SpecialCases/TestSuite.sh create mode 100644 test/functionTest/Collection/TestSuite.sh delete mode 100644 test/functionTest/Functions/TestSuite.sh diff --git a/test/functionTest/Functions/findTokenInDirs/d1/.gitkeep b/test/functionTest/Collection/Functions/TestSuite.sh similarity index 100% rename from test/functionTest/Functions/findTokenInDirs/d1/.gitkeep rename to test/functionTest/Collection/Functions/TestSuite.sh diff --git a/test/functionTest/Functions/arrayAppend/TestCase.sh b/test/functionTest/Collection/Functions/arrayAppend/TestCase.sh similarity index 100% rename from test/functionTest/Functions/arrayAppend/TestCase.sh rename to test/functionTest/Collection/Functions/arrayAppend/TestCase.sh diff --git a/test/functionTest/Functions/arrayDelete/TestCase.sh b/test/functionTest/Collection/Functions/arrayDelete/TestCase.sh similarity index 100% rename from test/functionTest/Functions/arrayDelete/TestCase.sh rename to test/functionTest/Collection/Functions/arrayDelete/TestCase.sh diff --git a/test/functionTest/Functions/arrayInsert/TestCase.sh b/test/functionTest/Collection/Functions/arrayInsert/TestCase.sh similarity index 100% rename from test/functionTest/Functions/arrayInsert/TestCase.sh rename to test/functionTest/Collection/Functions/arrayInsert/TestCase.sh diff --git a/test/functionTest/Functions/copyAndMorph/TestCase.sh b/test/functionTest/Collection/Functions/copyAndMorph/TestCase.sh similarity index 100% rename from test/functionTest/Functions/copyAndMorph/TestCase.sh rename to test/functionTest/Collection/Functions/copyAndMorph/TestCase.sh diff --git a/test/functionTest/Functions/copyAndMorph/adir/file2.spx b/test/functionTest/Collection/Functions/copyAndMorph/adir/file2.spx similarity index 100% rename from test/functionTest/Functions/copyAndMorph/adir/file2.spx rename to test/functionTest/Collection/Functions/copyAndMorph/adir/file2.spx diff --git a/test/functionTest/Functions/copyAndMorph/adir/file2.txt b/test/functionTest/Collection/Functions/copyAndMorph/adir/file2.txt similarity index 100% rename from test/functionTest/Functions/copyAndMorph/adir/file2.txt rename to test/functionTest/Collection/Functions/copyAndMorph/adir/file2.txt diff --git a/test/functionTest/Functions/copyAndMorph/file1.spl b/test/functionTest/Collection/Functions/copyAndMorph/file1.spl similarity index 100% rename from test/functionTest/Functions/copyAndMorph/file1.spl rename to test/functionTest/Collection/Functions/copyAndMorph/file1.spl diff --git a/test/functionTest/Functions/copyAndMorph/file1.txt b/test/functionTest/Collection/Functions/copyAndMorph/file1.txt similarity index 100% rename from test/functionTest/Functions/copyAndMorph/file1.txt rename to test/functionTest/Collection/Functions/copyAndMorph/file1.txt diff --git a/test/functionTest/Functions/copyAndMorph2/TestCase.sh b/test/functionTest/Collection/Functions/copyAndMorph2/TestCase.sh similarity index 100% rename from test/functionTest/Functions/copyAndMorph2/TestCase.sh rename to test/functionTest/Collection/Functions/copyAndMorph2/TestCase.sh diff --git a/test/functionTest/Functions/copyAndMorph2/file1.spl b/test/functionTest/Collection/Functions/copyAndMorph2/file1.spl similarity index 100% rename from test/functionTest/Functions/copyAndMorph2/file1.spl rename to test/functionTest/Collection/Functions/copyAndMorph2/file1.spl diff --git a/test/functionTest/Functions/copyAndMorph2/file1.txt b/test/functionTest/Collection/Functions/copyAndMorph2/file1.txt similarity index 100% rename from test/functionTest/Functions/copyAndMorph2/file1.txt rename to test/functionTest/Collection/Functions/copyAndMorph2/file1.txt diff --git a/test/functionTest/Functions/copyAndMorph3/TestCase.sh b/test/functionTest/Collection/Functions/copyAndMorph3/TestCase.sh similarity index 100% rename from test/functionTest/Functions/copyAndMorph3/TestCase.sh rename to test/functionTest/Collection/Functions/copyAndMorph3/TestCase.sh diff --git a/test/functionTest/Functions/copyAndMorph3/file1.spl b/test/functionTest/Collection/Functions/copyAndMorph3/file1.spl similarity index 100% rename from test/functionTest/Functions/copyAndMorph3/file1.spl rename to test/functionTest/Collection/Functions/copyAndMorph3/file1.spl diff --git a/test/functionTest/Functions/copyAndMorph3/file1.txt b/test/functionTest/Collection/Functions/copyAndMorph3/file1.txt similarity index 100% rename from test/functionTest/Functions/copyAndMorph3/file1.txt rename to test/functionTest/Collection/Functions/copyAndMorph3/file1.txt diff --git a/test/functionTest/Functions/copyAndMorph3/file1_foaur.spl b/test/functionTest/Collection/Functions/copyAndMorph3/file1_foaur.spl similarity index 100% rename from test/functionTest/Functions/copyAndMorph3/file1_foaur.spl rename to test/functionTest/Collection/Functions/copyAndMorph3/file1_foaur.spl diff --git a/test/functionTest/Functions/copyAndMorph3/file1_foxur.spl b/test/functionTest/Collection/Functions/copyAndMorph3/file1_foxur.spl similarity index 100% rename from test/functionTest/Functions/copyAndMorph3/file1_foxur.spl rename to test/functionTest/Collection/Functions/copyAndMorph3/file1_foxur.spl diff --git a/test/functionTest/Functions/copyAndMorph3/file1_one.spl b/test/functionTest/Collection/Functions/copyAndMorph3/file1_one.spl similarity index 100% rename from test/functionTest/Functions/copyAndMorph3/file1_one.spl rename to test/functionTest/Collection/Functions/copyAndMorph3/file1_one.spl diff --git a/test/functionTest/Functions/copyAndMorph3/file1_oneone.spl b/test/functionTest/Collection/Functions/copyAndMorph3/file1_oneone.spl similarity index 100% rename from test/functionTest/Functions/copyAndMorph3/file1_oneone.spl rename to test/functionTest/Collection/Functions/copyAndMorph3/file1_oneone.spl diff --git a/test/functionTest/Functions/copyAndMorph3/file1_onewith.spl b/test/functionTest/Collection/Functions/copyAndMorph3/file1_onewith.spl similarity index 100% rename from test/functionTest/Functions/copyAndMorph3/file1_onewith.spl rename to test/functionTest/Collection/Functions/copyAndMorph3/file1_onewith.spl diff --git a/test/functionTest/Functions/copyAndMorph3/file1_thre-e.spl b/test/functionTest/Collection/Functions/copyAndMorph3/file1_thre-e.spl similarity index 100% rename from test/functionTest/Functions/copyAndMorph3/file1_thre-e.spl rename to test/functionTest/Collection/Functions/copyAndMorph3/file1_thre-e.spl diff --git a/test/functionTest/Functions/copyAndMorph3/file1_two1x.spl b/test/functionTest/Collection/Functions/copyAndMorph3/file1_two1x.spl similarity index 100% rename from test/functionTest/Functions/copyAndMorph3/file1_two1x.spl rename to test/functionTest/Collection/Functions/copyAndMorph3/file1_two1x.spl diff --git a/test/functionTest/Functions/echoAndExecute/TestCase.sh b/test/functionTest/Collection/Functions/echoAndExecute/TestCase.sh similarity index 100% rename from test/functionTest/Functions/echoAndExecute/TestCase.sh rename to test/functionTest/Collection/Functions/echoAndExecute/TestCase.sh diff --git a/test/functionTest/Functions/echoExecuteAndIntercept/TestCase.sh b/test/functionTest/Collection/Functions/echoExecuteAndIntercept/TestCase.sh similarity index 100% rename from test/functionTest/Functions/echoExecuteAndIntercept/TestCase.sh rename to test/functionTest/Collection/Functions/echoExecuteAndIntercept/TestCase.sh diff --git a/test/functionTest/Functions/echoExecuteAndIntercept2/TestCase.sh b/test/functionTest/Collection/Functions/echoExecuteAndIntercept2/TestCase.sh similarity index 100% rename from test/functionTest/Functions/echoExecuteAndIntercept2/TestCase.sh rename to test/functionTest/Collection/Functions/echoExecuteAndIntercept2/TestCase.sh diff --git a/test/functionTest/Functions/echoExecuteInterceptAndError/TestCase.sh b/test/functionTest/Collection/Functions/echoExecuteInterceptAndError/TestCase.sh similarity index 100% rename from test/functionTest/Functions/echoExecuteInterceptAndError/TestCase.sh rename to test/functionTest/Collection/Functions/echoExecuteInterceptAndError/TestCase.sh diff --git a/test/functionTest/Functions/echoExecuteInterceptAndSuccess/TestCase.sh b/test/functionTest/Collection/Functions/echoExecuteInterceptAndSuccess/TestCase.sh similarity index 100% rename from test/functionTest/Functions/echoExecuteInterceptAndSuccess/TestCase.sh rename to test/functionTest/Collection/Functions/echoExecuteInterceptAndSuccess/TestCase.sh diff --git a/test/functionTest/Functions/executeAndLog/TestCase.sh b/test/functionTest/Collection/Functions/executeAndLog/TestCase.sh similarity index 100% rename from test/functionTest/Functions/executeAndLog/TestCase.sh rename to test/functionTest/Collection/Functions/executeAndLog/TestCase.sh diff --git a/test/functionTest/Functions/executeLogAndError/TestCase.sh b/test/functionTest/Collection/Functions/executeLogAndError/TestCase.sh similarity index 100% rename from test/functionTest/Functions/executeLogAndError/TestCase.sh rename to test/functionTest/Collection/Functions/executeLogAndError/TestCase.sh diff --git a/test/functionTest/Functions/executeLogAndSuccess/TestCase.sh b/test/functionTest/Collection/Functions/executeLogAndSuccess/TestCase.sh similarity index 100% rename from test/functionTest/Functions/executeLogAndSuccess/TestCase.sh rename to test/functionTest/Collection/Functions/executeLogAndSuccess/TestCase.sh diff --git a/test/functionTest/Functions/findTokenInDirs/TestCase.sh b/test/functionTest/Collection/Functions/findTokenInDirs/TestCase.sh similarity index 100% rename from test/functionTest/Functions/findTokenInDirs/TestCase.sh rename to test/functionTest/Collection/Functions/findTokenInDirs/TestCase.sh diff --git a/test/functionTest/Functions/findTokenInDirs/d2/f1.txt b/test/functionTest/Collection/Functions/findTokenInDirs/d1/.gitkeep similarity index 100% rename from test/functionTest/Functions/findTokenInDirs/d2/f1.txt rename to test/functionTest/Collection/Functions/findTokenInDirs/d1/.gitkeep diff --git a/test/functionTest/Functions/findTokenInDirs/d2/f3.sss b/test/functionTest/Collection/Functions/findTokenInDirs/d2/f1.txt similarity index 100% rename from test/functionTest/Functions/findTokenInDirs/d2/f3.sss rename to test/functionTest/Collection/Functions/findTokenInDirs/d2/f1.txt diff --git a/test/functionTest/Functions/findTokenInDirs/d2/f2.txt b/test/functionTest/Collection/Functions/findTokenInDirs/d2/f2.txt similarity index 100% rename from test/functionTest/Functions/findTokenInDirs/d2/f2.txt rename to test/functionTest/Collection/Functions/findTokenInDirs/d2/f2.txt diff --git a/test/functionTest/Functions/findTokenInFiles/f1 b/test/functionTest/Collection/Functions/findTokenInDirs/d2/f3.sss similarity index 100% rename from test/functionTest/Functions/findTokenInFiles/f1 rename to test/functionTest/Collection/Functions/findTokenInDirs/d2/f3.sss diff --git a/test/functionTest/Functions/findTokenInDirs/d3/f3.txt b/test/functionTest/Collection/Functions/findTokenInDirs/d3/f3.txt similarity index 100% rename from test/functionTest/Functions/findTokenInDirs/d3/f3.txt rename to test/functionTest/Collection/Functions/findTokenInDirs/d3/f3.txt diff --git a/test/functionTest/Functions/findTokenInFiles/TestCase.sh b/test/functionTest/Collection/Functions/findTokenInFiles/TestCase.sh similarity index 100% rename from test/functionTest/Functions/findTokenInFiles/TestCase.sh rename to test/functionTest/Collection/Functions/findTokenInFiles/TestCase.sh diff --git a/test/functionTest/Collection/Functions/findTokenInFiles/f1 b/test/functionTest/Collection/Functions/findTokenInFiles/f1 new file mode 100644 index 0000000..e69de29 diff --git a/test/functionTest/Functions/findTokenInFiles/f2 b/test/functionTest/Collection/Functions/findTokenInFiles/f2 similarity index 100% rename from test/functionTest/Functions/findTokenInFiles/f2 rename to test/functionTest/Collection/Functions/findTokenInFiles/f2 diff --git a/test/functionTest/Functions/isExisting/TestCase.sh b/test/functionTest/Collection/Functions/isExisting/TestCase.sh similarity index 100% rename from test/functionTest/Functions/isExisting/TestCase.sh rename to test/functionTest/Collection/Functions/isExisting/TestCase.sh diff --git a/test/functionTest/Functions/isFalse/TestCase.sh b/test/functionTest/Collection/Functions/isFalse/TestCase.sh similarity index 100% rename from test/functionTest/Functions/isFalse/TestCase.sh rename to test/functionTest/Collection/Functions/isFalse/TestCase.sh diff --git a/test/functionTest/Functions/isTrue/TestCase.sh b/test/functionTest/Collection/Functions/isTrue/TestCase.sh similarity index 100% rename from test/functionTest/Functions/isTrue/TestCase.sh rename to test/functionTest/Collection/Functions/isTrue/TestCase.sh diff --git a/test/functionTest/Functions/linewisePatternMatch/TestCase.sh b/test/functionTest/Collection/Functions/linewisePatternMatch/TestCase.sh similarity index 100% rename from test/functionTest/Functions/linewisePatternMatch/TestCase.sh rename to test/functionTest/Collection/Functions/linewisePatternMatch/TestCase.sh diff --git a/test/functionTest/Functions/linewisePatternMatch/file b/test/functionTest/Collection/Functions/linewisePatternMatch/file similarity index 100% rename from test/functionTest/Functions/linewisePatternMatch/file rename to test/functionTest/Collection/Functions/linewisePatternMatch/file diff --git a/test/functionTest/Functions/preambl/TestCase.sh b/test/functionTest/Collection/Functions/preambl/TestCase.sh similarity index 100% rename from test/functionTest/Functions/preambl/TestCase.sh rename to test/functionTest/Collection/Functions/preambl/TestCase.sh diff --git a/test/functionTest/Functions/setVar/TestSuite.sh b/test/functionTest/Collection/Functions/setVar/TestSuite.sh similarity index 100% rename from test/functionTest/Functions/setVar/TestSuite.sh rename to test/functionTest/Collection/Functions/setVar/TestSuite.sh diff --git a/test/functionTest/Functions/setVar/setVar/TestCase.sh b/test/functionTest/Collection/Functions/setVar/setVar/TestCase.sh similarity index 100% rename from test/functionTest/Functions/setVar/setVar/TestCase.sh rename to test/functionTest/Collection/Functions/setVar/setVar/TestCase.sh diff --git a/test/functionTest/Functions/trim/TestCase.sh b/test/functionTest/Collection/Functions/trim/TestCase.sh similarity index 100% rename from test/functionTest/Functions/trim/TestCase.sh rename to test/functionTest/Collection/Functions/trim/TestCase.sh diff --git a/test/functionTest/Collection/SpecialCases/CompondCommandsAsSteps/TestCase.sh b/test/functionTest/Collection/SpecialCases/CompondCommandsAsSteps/TestCase.sh new file mode 100644 index 0000000..833a02c --- /dev/null +++ b/test/functionTest/Collection/SpecialCases/CompondCommandsAsSteps/TestCase.sh @@ -0,0 +1,10 @@ +STEPS=( \ + 'ps' \ + '( echo "******"; ps )' \ + 'for (( x=0; x<5; x++)); do echo $x; done' \ +) + +#do not use parts of composite commands as a test step like +#STEPS='ps ( ps )' + +FINS=( 'echo "******* test finailzation done *********"' ) \ No newline at end of file diff --git a/test/functionTest/Collection/SpecialCases/TestSuite.sh b/test/functionTest/Collection/SpecialCases/TestSuite.sh new file mode 100644 index 0000000..e69de29 diff --git a/test/functionTest/Collection/TestSuite.sh b/test/functionTest/Collection/TestSuite.sh new file mode 100644 index 0000000..c90890d --- /dev/null +++ b/test/functionTest/Collection/TestSuite.sh @@ -0,0 +1,71 @@ + +function testPreparation { + echo "*********************************************************" + echo " this suite tests helper functions and expected result is" + echo "cases executed=174 failures=22 errors=31 skipped=0" + echo "*********************************************************" + echo + echo "Expected failures are:" + echo + echo "**** CASE_FAILURE List : ****" +echo "#suite[:variant][::suite[:variant]..]::case[:variant]" +echo "Collection::Functions::echoAndExecute:falseCheck" +echo "Collection::Functions::echoExecuteAndIntercept2:expectSuccFails" +echo "Collection::Functions::echoExecuteAndIntercept2:expectErrorFails" +echo "Collection::Functions::echoExecuteAndIntercept2:simpleCommands27Fails" +echo "Collection::Functions::echoExecuteInterceptAndError:succ" +echo "Collection::Functions::echoExecuteInterceptAndError:simpleCommands1Succ" +echo "Collection::Functions::echoExecuteInterceptAndError:simpleCommands2Succ" +echo "Collection::Functions::echoExecuteInterceptAndSuccess:wrongCommand" +echo "Collection::Functions::echoExecuteInterceptAndSuccess:fails" +echo "Collection::Functions::echoExecuteInterceptAndSuccess:simpleCommands27" +echo "Collection::Functions::executeLogAndError:succ" +echo "Collection::Functions::executeLogAndError:simpleCommands1Succ" +echo "Collection::Functions::executeLogAndError:simpleCommands2Succ" +echo "Collection::Functions::executeLogAndSuccess:wrongCommand" +echo "Collection::Functions::executeLogAndSuccess:fails" +echo "Collection::Functions::executeLogAndSuccess:simpleCommands27" +echo "Collection::Functions::findTokenInDirs:checkTokenIsInDirsFail: Token ERROXR was not in one of these directories:..." +echo "Collection::Functions::findTokenInDirs:scheckTokenIsNotInDirsFail: Token ERROR was found in one of these directories:..." +echo "Collection::Functions::findTokenInFiles:checkTokenIsInFilesFailure: Token ERROXR was not in one of these files:..." +echo "Collection::Functions::findTokenInFiles:checkTokenIsNotInFilesFailure: Token ERROR was not in one of these files:..." +echo "Collection::Functions::linewisePatternMatch:matchSuccessFail: Not enough matches: 'linewisePatternMatchInterceptAndSuccess ...'" +echo "Collection::Functions::linewisePatternMatch:matchErrorFail: Match found: 'linewisePatternMatchInterceptAndError ...'" + +echo +echo "**** CASE_ERROR List : ****" +echo "#suite[:variant][::suite[:variant]..]::case[:variant]" +echo "Collection::Functions::arrayInsert:pasteEnd" +echo "Collection::Functions::echoAndExecute:noParm" +echo "Collection::Functions::echoAndExecute:emptyCommand" +echo "Collection::Functions::echoAndExecute:false" +echo "Collection::Functions::echoAndExecute:emptyCommandCheck" +echo "Collection::Functions::echoAndExecute:noParmCheck" +echo "Collection::Functions::echoExecuteAndIntercept:noParm" +echo "Collection::Functions::echoExecuteAndIntercept:emptyCommand" +echo "Collection::Functions::echoExecuteAndIntercept2:noParm" +echo "Collection::Functions::echoExecuteAndIntercept2:wrongCode" +echo "Collection::Functions::echoExecuteAndIntercept2:emptyCommand" +echo "Collection::Functions::echoExecuteInterceptAndError:noParm" +echo "Collection::Functions::echoExecuteInterceptAndError:emptyCommand" +echo "Collection::Functions::echoExecuteInterceptAndSuccess:noParm" +echo "Collection::Functions::echoExecuteInterceptAndSuccess:emptyCommand" +echo "Collection::Functions::executeAndLog:noParm" +echo "Collection::Functions::executeAndLog:emptyCommand" +echo "Collection::Functions::executeLogAndError:noParm" +echo "Collection::Functions::executeLogAndError:emptyCommand" +echo "Collection::Functions::executeLogAndSuccess:noParm" +echo "Collection::Functions::executeLogAndSuccess:emptyCommand" +echo "Collection::Functions::findTokenInDirs:noDirsError" +echo "Collection::Functions::findTokenInDirs:wrongDirname" +echo "Collection::Functions::findTokenInDirs:fileNotReadable" +echo "Collection::Functions::findTokenInFiles:noFilesError" +echo "Collection::Functions::findTokenInFiles:wrongFilename" +echo "Collection::Functions::isExisting:noArgumentIs" +echo "Collection::Functions::isExisting:noArgumentNot" +echo "Collection::Functions::isFalse:varNotExists" +echo "Collection::Functions::isTrue:varNotExists" +echo "Collection::Functions::setVar::setVar:2" + + promptYesNo +} diff --git a/test/functionTest/Functions/TestSuite.sh b/test/functionTest/Functions/TestSuite.sh deleted file mode 100644 index 5e4fafb..0000000 --- a/test/functionTest/Functions/TestSuite.sh +++ /dev/null @@ -1,71 +0,0 @@ - -function testPreparation { - echo "*********************************************************" - echo " this suite tests helper functions and expected result is" - echo "cases executed=173 failures=22 errors=31 skipped=0" - echo "*********************************************************" - echo - echo "Expected failures are:" - echo - echo "**** CASE_FAILURE List : ****" -echo "#suite[:variant][::suite[:variant]..]::case[:variant]" -echo "Functions::echoAndExecute:falseCheck" -echo "Functions::echoExecuteAndIntercept2:expectSuccFails" -echo "Functions::echoExecuteAndIntercept2:expectErrorFails" -echo "Functions::echoExecuteAndIntercept2:simpleCommands27Fails" -echo "Functions::echoExecuteInterceptAndError:succ" -echo "Functions::echoExecuteInterceptAndError:simpleCommands1Succ" -echo "Functions::echoExecuteInterceptAndError:simpleCommands2Succ" -echo "Functions::echoExecuteInterceptAndSuccess:wrongCommand" -echo "Functions::echoExecuteInterceptAndSuccess:fails" -echo "Functions::echoExecuteInterceptAndSuccess:simpleCommands27" -echo "Functions::executeLogAndError:succ" -echo "Functions::executeLogAndError:simpleCommands1Succ" -echo "Functions::executeLogAndError:simpleCommands2Succ" -echo "Functions::executeLogAndSuccess:wrongCommand" -echo "Functions::executeLogAndSuccess:fails" -echo "Functions::executeLogAndSuccess:simpleCommands27" -echo "Functions::findTokenInDirs:checkTokenIsInDirsFail: Token ERROXR was not in one of these directories:..." -echo "Functions::findTokenInDirs:scheckTokenIsNotInDirsFail: Token ERROR was found in one of these directories:..." -echo "Functions::findTokenInFiles:checkTokenIsInFilesFailure: Token ERROXR was not in one of these files:..." -echo "Functions::findTokenInFiles:checkTokenIsNotInFilesFailure: Token ERROR was not in one of these files:..." -echo "Functions::linewisePatternMatch:matchSuccessFail: Not enough matches: 'linewisePatternMatchInterceptAndSuccess ...'" -echo "Functions::linewisePatternMatch:matchErrorFail: Match found: 'linewisePatternMatchInterceptAndError ...'" - -echo -echo "**** CASE_ERROR List : ****" -echo "#suite[:variant][::suite[:variant]..]::case[:variant]" -echo "Functions::arrayInsert:pasteEnd" -echo "Functions::echoAndExecute:noParm" -echo "Functions::echoAndExecute:emptyCommand" -echo "Functions::echoAndExecute:false" -echo "Functions::echoAndExecute:emptyCommandCheck" -echo "Functions::echoAndExecute:noParmCheck" -echo "Functions::echoExecuteAndIntercept:noParm" -echo "Functions::echoExecuteAndIntercept:emptyCommand" -echo "Functions::echoExecuteAndIntercept2:noParm" -echo "Functions::echoExecuteAndIntercept2:wrongCode" -echo "Functions::echoExecuteAndIntercept2:emptyCommand" -echo "Functions::echoExecuteInterceptAndError:noParm" -echo "Functions::echoExecuteInterceptAndError:emptyCommand" -echo "Functions::echoExecuteInterceptAndSuccess:noParm" -echo "Functions::echoExecuteInterceptAndSuccess:emptyCommand" -echo "Functions::executeAndLog:noParm" -echo "Functions::executeAndLog:emptyCommand" -echo "Functions::executeLogAndError:noParm" -echo "Functions::executeLogAndError:emptyCommand" -echo "Functions::executeLogAndSuccess:noParm" -echo "Functions::executeLogAndSuccess:emptyCommand" -echo "Functions::findTokenInDirs:noDirsError" -echo "Functions::findTokenInDirs:wrongDirname" -echo "Functions::findTokenInDirs:fileNotReadable" -echo "Functions::findTokenInFiles:noFilesError" -echo "Functions::findTokenInFiles:wrongFilename" -echo "Functions::isExisting:noArgumentIs" -echo "Functions::isExisting:noArgumentNot" -echo "Functions::isFalse:varNotExists" -echo "Functions::isTrue:varNotExists" -echo "Functions::setVar::setVar:2" - - promptYesNo -}