From b5d2ec218aa89b9e053d05a3d1f30f7ed19315c3 Mon Sep 17 00:00:00 2001 From: joergboe Date: Fri, 22 Dec 2017 13:12:38 +0100 Subject: [PATCH] Construct workspace --- .gitignore | 2 + .../DEVELOPMENT.md => DEVELOPMENT.md | 0 README.md | 54 ++++++++++++++++++- {testframework/bin => bin}/case.sh | 0 {testframework/bin => bin}/collection.sh | 0 {testframework/bin => bin}/defs.sh | 0 {testframework/bin => bin}/mainutil.sh | 0 {testframework/bin => bin}/man.sh | 0 {testframework/bin => bin}/manbash.sh | 0 {testframework/bin => bin}/runTTF | 0 {testframework/bin => bin}/specialperf.sh | 0 {testframework/bin => bin}/streamsutils.sh | 0 {testframework/bin => bin}/suite.sh | 0 {testframework/bin => bin}/testutils.sh | 0 {testframework/bin => bin}/util.sh | 0 {testframework/bin => bin}/version.sh | 0 ...eleasePackage.sh => buildReleasePackage.sh | 0 testframework/runTTFLink => runTTFLink | 0 .../samples => samples}/ANewTest/README.md | 0 .../ANewTest/Suite1/TestCase1/TestCase.sh | 0 .../ANewTest/Suite1/TestCase2/TestCase.sh | 0 .../ANewTest/Suite1/TestCase3/TestCase.sh | 0 .../ANewTest/Suite1/TestSuite.sh | 0 .../ANewTest/TestCollection.sh | 0 .../ANewTest/TestProperties.sh | 0 .../CollectionWithVariant/Case/TestCase.sh | 0 .../CollectionWithVariant/README.md | 0 .../CollectionWithVariant/TestCollection.sh | 0 .../MostEssentialTestCase/Case/TestCase.sh | 0 .../MostEssentialTestCase/README.md | 0 .../MostEssentialTestCase/TestCollection.sh | 0 .../SimpleCaseWithVariants/README.md | 0 .../Suite/Case/TestCase.sh | 0 .../SimpleCaseWithVariants/Suite/TestSuite.sh | 0 .../SimpleCaseWithVariants/TestCollection.sh | 0 .../SimpleCases/CaseWithError/TestCase.sh | 0 .../SimpleCases/CaseWithFailure/TestCase.sh | 0 .../SimpleCases/CaseWithSuccess/TestCase.sh | 0 .../samples => samples}/SimpleCases/README.md | 0 .../SimpleCases/SkippedCase/SKIP | 0 .../SimpleCases/SkippedCase/TestCase.sh | 0 .../SimpleCases/TesCollection.sh | 0 .../SimpleCases/TestCollection.sh | 0 .../samples => samples}/Streams1/README.md | 0 .../RuntestSuite/InetSource2/GetWeather.spl | 0 .../RuntestSuite/InetSource2/TestCase.sh | 0 .../Streams1/RuntestSuite/TestSuite.sh | 0 .../Streams1/TestCollection.sh | 0 .../Streams1/TestProperties.sh | 0 .../TranslationSuite/InetSource/TestCase.sh | 0 .../com.ibm.streamsx.inet.sample/.namespace | 0 .../GetWeather.spl | 0 .../com.ibm.streamsx.inet.sample/bla.txt | 0 .../Streams1/TranslationSuite/TestSuite.sh | 0 .../Selftest/Execution/TestSuite.sh | 0 .../Execution/simpleCaseSucc/TestCase.sh | 0 .../testCollection/Suite/Case/TTestCase.sh | 0 .../testCollection/Suite/TTestSuite.sh | 0 .../testCollection/TTestCollection.sh | 0 .../Invocation/HelpFunctions/TestCase.sh | 0 .../HelpFunctions/test/TestCollection.sh | 0 .../Invocation/InvokeError/TestCase.sh | 0 .../Selftest/Invocation/NoParams/TestCase.sh | 0 .../Selftest/Invocation/TestSuite.sh | 0 .../SuitesAndCases/EmptyCase/TestCase.sh | 0 .../testCollection/Suite/Case/TTestCase.sh | 0 .../testCollection/Suite/TTestSuite.sh | 0 .../testCollection/TTestCollection.sh | 0 .../SuitesAndCases/EmptyInputDir/TestCase.sh | 0 .../EmptyInputDir/testCollection/.gitkeep | 0 .../SuitesAndCases/EmptySuite/TestCase.sh | 0 .../testCollection/Suite/TTestSuite.sh | 0 .../testCollection/TTestCollection.sh | 0 .../SuitesAndCases/NoSuite/TestCase.sh | 0 .../NoSuite/testCollection/TestCollection.sh | 0 .../Selftest/SuitesAndCases/TestSuite.sh | 0 .../test => test}/Selftest/TestCollection.sh | 0 .../test => test}/Selftest/TestProperties.sh | 0 .../test => test}/Selftest/TestTools.sh | 0 .../emptyCase/Suite1/Case1/TestCase.sh | 0 .../emptyCase/Suite1/TestSuite.sh | 0 .../test => test}/emptyCase/TestCollection.sh | 0 .../test => test}/emptyInput/.gitkeep | 0 .../emptySuite/Suite1/TestSuite.sh | 0 .../emptySuite/TestCollection.sh | 0 .../test => test}/noSuite/TestCollection.sh | 0 .../test => test}/noSuite/TestProperties | 0 .../parallel/Suite1/RunParallel/TestCase.sh | 0 .../parallel/Suite1/TestSuite.sh | 0 .../parallel/Suite2/RunParallel/TestCase.sh | 0 .../parallel/Suite2/TestSuite.sh | 0 .../test => test}/parallel/TestCollection.sh | 0 testframework/.gitignore | 4 -- testframework/README.TXT | 52 ------------------ {testframework/tools => tools}/selfextract.sh | 0 95 files changed, 55 insertions(+), 57 deletions(-) rename testframework/DEVELOPMENT.md => DEVELOPMENT.md (100%) rename {testframework/bin => bin}/case.sh (100%) rename {testframework/bin => bin}/collection.sh (100%) rename {testframework/bin => bin}/defs.sh (100%) rename {testframework/bin => bin}/mainutil.sh (100%) rename {testframework/bin => bin}/man.sh (100%) rename {testframework/bin => bin}/manbash.sh (100%) rename {testframework/bin => bin}/runTTF (100%) rename {testframework/bin => bin}/specialperf.sh (100%) rename {testframework/bin => bin}/streamsutils.sh (100%) rename {testframework/bin => bin}/suite.sh (100%) rename {testframework/bin => bin}/testutils.sh (100%) rename {testframework/bin => bin}/util.sh (100%) rename {testframework/bin => bin}/version.sh (100%) rename testframework/buildReleasePackage.sh => buildReleasePackage.sh (100%) rename testframework/runTTFLink => runTTFLink (100%) rename {testframework/samples => samples}/ANewTest/README.md (100%) rename {testframework/samples => samples}/ANewTest/Suite1/TestCase1/TestCase.sh (100%) rename {testframework/samples => samples}/ANewTest/Suite1/TestCase2/TestCase.sh (100%) rename {testframework/samples => samples}/ANewTest/Suite1/TestCase3/TestCase.sh (100%) rename {testframework/samples => samples}/ANewTest/Suite1/TestSuite.sh (100%) rename {testframework/samples => samples}/ANewTest/TestCollection.sh (100%) rename {testframework/samples => samples}/ANewTest/TestProperties.sh (100%) rename {testframework/samples => samples}/CollectionWithVariant/Case/TestCase.sh (100%) rename {testframework/samples => samples}/CollectionWithVariant/README.md (100%) rename {testframework/samples => samples}/CollectionWithVariant/TestCollection.sh (100%) rename {testframework/samples => samples}/MostEssentialTestCase/Case/TestCase.sh (100%) rename {testframework/samples => samples}/MostEssentialTestCase/README.md (100%) rename {testframework/samples => samples}/MostEssentialTestCase/TestCollection.sh (100%) rename {testframework/samples => samples}/SimpleCaseWithVariants/README.md (100%) rename {testframework/samples => samples}/SimpleCaseWithVariants/Suite/Case/TestCase.sh (100%) rename {testframework/samples => samples}/SimpleCaseWithVariants/Suite/TestSuite.sh (100%) rename {testframework/samples => samples}/SimpleCaseWithVariants/TestCollection.sh (100%) rename {testframework/samples => samples}/SimpleCases/CaseWithError/TestCase.sh (100%) rename {testframework/samples => samples}/SimpleCases/CaseWithFailure/TestCase.sh (100%) rename {testframework/samples => samples}/SimpleCases/CaseWithSuccess/TestCase.sh (100%) rename {testframework/samples => samples}/SimpleCases/README.md (100%) rename {testframework/samples => samples}/SimpleCases/SkippedCase/SKIP (100%) rename {testframework/samples => samples}/SimpleCases/SkippedCase/TestCase.sh (100%) rename {testframework/samples => samples}/SimpleCases/TesCollection.sh (100%) rename {testframework/samples => samples}/SimpleCases/TestCollection.sh (100%) rename {testframework/samples => samples}/Streams1/README.md (100%) rename {testframework/samples => samples}/Streams1/RuntestSuite/InetSource2/GetWeather.spl (100%) rename {testframework/samples => samples}/Streams1/RuntestSuite/InetSource2/TestCase.sh (100%) rename {testframework/samples => samples}/Streams1/RuntestSuite/TestSuite.sh (100%) rename {testframework/samples => samples}/Streams1/TestCollection.sh (100%) rename {testframework/samples => samples}/Streams1/TestProperties.sh (100%) rename {testframework/samples => samples}/Streams1/TranslationSuite/InetSource/TestCase.sh (100%) rename {testframework/samples => samples}/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/.namespace (100%) rename {testframework/samples => samples}/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/GetWeather.spl (100%) rename {testframework/samples => samples}/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/bla.txt (100%) rename {testframework/samples => samples}/Streams1/TranslationSuite/TestSuite.sh (100%) rename {testframework/test => test}/Selftest/Execution/TestSuite.sh (100%) rename {testframework/test => test}/Selftest/Execution/simpleCaseSucc/TestCase.sh (100%) rename {testframework/test => test}/Selftest/Execution/simpleCaseSucc/testCollection/Suite/Case/TTestCase.sh (100%) rename {testframework/test => test}/Selftest/Execution/simpleCaseSucc/testCollection/Suite/TTestSuite.sh (100%) rename {testframework/test => test}/Selftest/Execution/simpleCaseSucc/testCollection/TTestCollection.sh (100%) rename {testframework/test => test}/Selftest/Invocation/HelpFunctions/TestCase.sh (100%) rename {testframework/test => test}/Selftest/Invocation/HelpFunctions/test/TestCollection.sh (100%) rename {testframework/test => test}/Selftest/Invocation/InvokeError/TestCase.sh (100%) rename {testframework/test => test}/Selftest/Invocation/NoParams/TestCase.sh (100%) rename {testframework/test => test}/Selftest/Invocation/TestSuite.sh (100%) rename {testframework/test => test}/Selftest/SuitesAndCases/EmptyCase/TestCase.sh (100%) rename {testframework/test => test}/Selftest/SuitesAndCases/EmptyCase/testCollection/Suite/Case/TTestCase.sh (100%) rename {testframework/test => test}/Selftest/SuitesAndCases/EmptyCase/testCollection/Suite/TTestSuite.sh (100%) rename {testframework/test => test}/Selftest/SuitesAndCases/EmptyCase/testCollection/TTestCollection.sh (100%) rename {testframework/test => test}/Selftest/SuitesAndCases/EmptyInputDir/TestCase.sh (100%) rename {testframework/test => test}/Selftest/SuitesAndCases/EmptyInputDir/testCollection/.gitkeep (100%) rename {testframework/test => test}/Selftest/SuitesAndCases/EmptySuite/TestCase.sh (100%) rename {testframework/test => test}/Selftest/SuitesAndCases/EmptySuite/testCollection/Suite/TTestSuite.sh (100%) rename {testframework/test => test}/Selftest/SuitesAndCases/EmptySuite/testCollection/TTestCollection.sh (100%) rename {testframework/test => test}/Selftest/SuitesAndCases/NoSuite/TestCase.sh (100%) rename {testframework/test => test}/Selftest/SuitesAndCases/NoSuite/testCollection/TestCollection.sh (100%) rename {testframework/test => test}/Selftest/SuitesAndCases/TestSuite.sh (100%) rename {testframework/test => test}/Selftest/TestCollection.sh (100%) rename {testframework/test => test}/Selftest/TestProperties.sh (100%) rename {testframework/test => test}/Selftest/TestTools.sh (100%) rename {testframework/test => test}/emptyCase/Suite1/Case1/TestCase.sh (100%) rename {testframework/test => test}/emptyCase/Suite1/TestSuite.sh (100%) rename {testframework/test => test}/emptyCase/TestCollection.sh (100%) rename {testframework/test => test}/emptyInput/.gitkeep (100%) rename {testframework/test => test}/emptySuite/Suite1/TestSuite.sh (100%) rename {testframework/test => test}/emptySuite/TestCollection.sh (100%) rename {testframework/test => test}/noSuite/TestCollection.sh (100%) rename {testframework/test => test}/noSuite/TestProperties (100%) rename {testframework/test => test}/parallel/Suite1/RunParallel/TestCase.sh (100%) rename {testframework/test => test}/parallel/Suite1/TestSuite.sh (100%) rename {testframework/test => test}/parallel/Suite2/RunParallel/TestCase.sh (100%) rename {testframework/test => test}/parallel/Suite2/TestSuite.sh (100%) rename {testframework/test => test}/parallel/TestCollection.sh (100%) delete mode 100644 testframework/.gitignore delete mode 100644 testframework/README.TXT rename {testframework/tools => tools}/selfextract.sh (100%) diff --git a/.gitignore b/.gitignore index d8fe4fa..9e4b129 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,3 @@ /.project +/runTTFWorkdir/ +/releases/ diff --git a/testframework/DEVELOPMENT.md b/DEVELOPMENT.md similarity index 100% rename from testframework/DEVELOPMENT.md rename to DEVELOPMENT.md diff --git a/README.md b/README.md index 62f3dfb..cbcb761 100644 --- a/README.md +++ b/README.md @@ -1,2 +1,54 @@ # testframework -A shell script based test framework + +The test script is a framework for the control of test case execution. + +To learn more start with execution of help and man: + +./bin/runTTF --help + +and + +./bin/runTTF --man + +In directory samples you can see the Test Collection ANewTest, which is a sample for a basic Test Collection + +It is recommended to enter the location of the test framework into your PATH like: + +export PATH="/bin:$PATH" + +Whats new: +---------- +Version 1.0.0: +- re-name TestProperties to TestProperties.sh +- Removed propertie section in preamble, all properties moved to script section +- Preamble now supports only variantList, variantCount and timeout +- Preamble requires now quoting (for lists) +- Check whether variantCount and timeout are digits +- New test steps / pres / fins invocation local space separated list STEPS/PREPS/FINS +- New test steps / pres / fins invocation local array STEPS/PREPS/FINS possible +- New test steps / pres / fins invocation local functions testStep, testPreparation, testFinalization +- Global space separated lists steps / pres / fins invocation re-named: + TTRO_prepsCase TTRO_prepsSuite TTRO_preps + TTRO_stepsCase + TTRO_finsCase TTRO_finsSuite TTRO_fins +- Improved handling and display in case of erroros in suite/collection initialization and preparation +- All function calls for collection/suite/case preparation and steps and finalization are now unchecked called + to improve failure propagation +- Collections variant support +- TstCollection.sh and TestSuite.sh are now only once sourced in collection and suite context +- TTRO_extraTime renamed to TTP_additionalTime +- New utis functions isArray, isFunction, arrayHasKey, isExistingAndTrue, isTrue, isFalse +- Re-named properties TTRO_noStart -> TTPN_.. +- Handle debug and verbose as propertie +- Re-names TTRO_caseVariant -> TTRO_variantCase TTRO_suiteVariant -> TTRO_variantSuite + + +Version 0.2.0: +- Dummy Suite support: Test cases can be defined without suite context. +- Test collection now requires a TestCollection.sh file and the TestProperties file is now optional +- Installer +- New global initialization in streamsutils +- Use variables for sab file main composite .. +- New test cases +- Streams sample + diff --git a/testframework/bin/case.sh b/bin/case.sh similarity index 100% rename from testframework/bin/case.sh rename to bin/case.sh diff --git a/testframework/bin/collection.sh b/bin/collection.sh similarity index 100% rename from testframework/bin/collection.sh rename to bin/collection.sh diff --git a/testframework/bin/defs.sh b/bin/defs.sh similarity index 100% rename from testframework/bin/defs.sh rename to bin/defs.sh diff --git a/testframework/bin/mainutil.sh b/bin/mainutil.sh similarity index 100% rename from testframework/bin/mainutil.sh rename to bin/mainutil.sh diff --git a/testframework/bin/man.sh b/bin/man.sh similarity index 100% rename from testframework/bin/man.sh rename to bin/man.sh diff --git a/testframework/bin/manbash.sh b/bin/manbash.sh similarity index 100% rename from testframework/bin/manbash.sh rename to bin/manbash.sh diff --git a/testframework/bin/runTTF b/bin/runTTF similarity index 100% rename from testframework/bin/runTTF rename to bin/runTTF diff --git a/testframework/bin/specialperf.sh b/bin/specialperf.sh similarity index 100% rename from testframework/bin/specialperf.sh rename to bin/specialperf.sh diff --git a/testframework/bin/streamsutils.sh b/bin/streamsutils.sh similarity index 100% rename from testframework/bin/streamsutils.sh rename to bin/streamsutils.sh diff --git a/testframework/bin/suite.sh b/bin/suite.sh similarity index 100% rename from testframework/bin/suite.sh rename to bin/suite.sh diff --git a/testframework/bin/testutils.sh b/bin/testutils.sh similarity index 100% rename from testframework/bin/testutils.sh rename to bin/testutils.sh diff --git a/testframework/bin/util.sh b/bin/util.sh similarity index 100% rename from testframework/bin/util.sh rename to bin/util.sh diff --git a/testframework/bin/version.sh b/bin/version.sh similarity index 100% rename from testframework/bin/version.sh rename to bin/version.sh diff --git a/testframework/buildReleasePackage.sh b/buildReleasePackage.sh similarity index 100% rename from testframework/buildReleasePackage.sh rename to buildReleasePackage.sh diff --git a/testframework/runTTFLink b/runTTFLink similarity index 100% rename from testframework/runTTFLink rename to runTTFLink diff --git a/testframework/samples/ANewTest/README.md b/samples/ANewTest/README.md similarity index 100% rename from testframework/samples/ANewTest/README.md rename to samples/ANewTest/README.md diff --git a/testframework/samples/ANewTest/Suite1/TestCase1/TestCase.sh b/samples/ANewTest/Suite1/TestCase1/TestCase.sh similarity index 100% rename from testframework/samples/ANewTest/Suite1/TestCase1/TestCase.sh rename to samples/ANewTest/Suite1/TestCase1/TestCase.sh diff --git a/testframework/samples/ANewTest/Suite1/TestCase2/TestCase.sh b/samples/ANewTest/Suite1/TestCase2/TestCase.sh similarity index 100% rename from testframework/samples/ANewTest/Suite1/TestCase2/TestCase.sh rename to samples/ANewTest/Suite1/TestCase2/TestCase.sh diff --git a/testframework/samples/ANewTest/Suite1/TestCase3/TestCase.sh b/samples/ANewTest/Suite1/TestCase3/TestCase.sh similarity index 100% rename from testframework/samples/ANewTest/Suite1/TestCase3/TestCase.sh rename to samples/ANewTest/Suite1/TestCase3/TestCase.sh diff --git a/testframework/samples/ANewTest/Suite1/TestSuite.sh b/samples/ANewTest/Suite1/TestSuite.sh similarity index 100% rename from testframework/samples/ANewTest/Suite1/TestSuite.sh rename to samples/ANewTest/Suite1/TestSuite.sh diff --git a/testframework/samples/ANewTest/TestCollection.sh b/samples/ANewTest/TestCollection.sh similarity index 100% rename from testframework/samples/ANewTest/TestCollection.sh rename to samples/ANewTest/TestCollection.sh diff --git a/testframework/samples/ANewTest/TestProperties.sh b/samples/ANewTest/TestProperties.sh similarity index 100% rename from testframework/samples/ANewTest/TestProperties.sh rename to samples/ANewTest/TestProperties.sh diff --git a/testframework/samples/CollectionWithVariant/Case/TestCase.sh b/samples/CollectionWithVariant/Case/TestCase.sh similarity index 100% rename from testframework/samples/CollectionWithVariant/Case/TestCase.sh rename to samples/CollectionWithVariant/Case/TestCase.sh diff --git a/testframework/samples/CollectionWithVariant/README.md b/samples/CollectionWithVariant/README.md similarity index 100% rename from testframework/samples/CollectionWithVariant/README.md rename to samples/CollectionWithVariant/README.md diff --git a/testframework/samples/CollectionWithVariant/TestCollection.sh b/samples/CollectionWithVariant/TestCollection.sh similarity index 100% rename from testframework/samples/CollectionWithVariant/TestCollection.sh rename to samples/CollectionWithVariant/TestCollection.sh diff --git a/testframework/samples/MostEssentialTestCase/Case/TestCase.sh b/samples/MostEssentialTestCase/Case/TestCase.sh similarity index 100% rename from testframework/samples/MostEssentialTestCase/Case/TestCase.sh rename to samples/MostEssentialTestCase/Case/TestCase.sh diff --git a/testframework/samples/MostEssentialTestCase/README.md b/samples/MostEssentialTestCase/README.md similarity index 100% rename from testframework/samples/MostEssentialTestCase/README.md rename to samples/MostEssentialTestCase/README.md diff --git a/testframework/samples/MostEssentialTestCase/TestCollection.sh b/samples/MostEssentialTestCase/TestCollection.sh similarity index 100% rename from testframework/samples/MostEssentialTestCase/TestCollection.sh rename to samples/MostEssentialTestCase/TestCollection.sh diff --git a/testframework/samples/SimpleCaseWithVariants/README.md b/samples/SimpleCaseWithVariants/README.md similarity index 100% rename from testframework/samples/SimpleCaseWithVariants/README.md rename to samples/SimpleCaseWithVariants/README.md diff --git a/testframework/samples/SimpleCaseWithVariants/Suite/Case/TestCase.sh b/samples/SimpleCaseWithVariants/Suite/Case/TestCase.sh similarity index 100% rename from testframework/samples/SimpleCaseWithVariants/Suite/Case/TestCase.sh rename to samples/SimpleCaseWithVariants/Suite/Case/TestCase.sh diff --git a/testframework/samples/SimpleCaseWithVariants/Suite/TestSuite.sh b/samples/SimpleCaseWithVariants/Suite/TestSuite.sh similarity index 100% rename from testframework/samples/SimpleCaseWithVariants/Suite/TestSuite.sh rename to samples/SimpleCaseWithVariants/Suite/TestSuite.sh diff --git a/testframework/samples/SimpleCaseWithVariants/TestCollection.sh b/samples/SimpleCaseWithVariants/TestCollection.sh similarity index 100% rename from testframework/samples/SimpleCaseWithVariants/TestCollection.sh rename to samples/SimpleCaseWithVariants/TestCollection.sh diff --git a/testframework/samples/SimpleCases/CaseWithError/TestCase.sh b/samples/SimpleCases/CaseWithError/TestCase.sh similarity index 100% rename from testframework/samples/SimpleCases/CaseWithError/TestCase.sh rename to samples/SimpleCases/CaseWithError/TestCase.sh diff --git a/testframework/samples/SimpleCases/CaseWithFailure/TestCase.sh b/samples/SimpleCases/CaseWithFailure/TestCase.sh similarity index 100% rename from testframework/samples/SimpleCases/CaseWithFailure/TestCase.sh rename to samples/SimpleCases/CaseWithFailure/TestCase.sh diff --git a/testframework/samples/SimpleCases/CaseWithSuccess/TestCase.sh b/samples/SimpleCases/CaseWithSuccess/TestCase.sh similarity index 100% rename from testframework/samples/SimpleCases/CaseWithSuccess/TestCase.sh rename to samples/SimpleCases/CaseWithSuccess/TestCase.sh diff --git a/testframework/samples/SimpleCases/README.md b/samples/SimpleCases/README.md similarity index 100% rename from testframework/samples/SimpleCases/README.md rename to samples/SimpleCases/README.md diff --git a/testframework/samples/SimpleCases/SkippedCase/SKIP b/samples/SimpleCases/SkippedCase/SKIP similarity index 100% rename from testframework/samples/SimpleCases/SkippedCase/SKIP rename to samples/SimpleCases/SkippedCase/SKIP diff --git a/testframework/samples/SimpleCases/SkippedCase/TestCase.sh b/samples/SimpleCases/SkippedCase/TestCase.sh similarity index 100% rename from testframework/samples/SimpleCases/SkippedCase/TestCase.sh rename to samples/SimpleCases/SkippedCase/TestCase.sh diff --git a/testframework/samples/SimpleCases/TesCollection.sh b/samples/SimpleCases/TesCollection.sh similarity index 100% rename from testframework/samples/SimpleCases/TesCollection.sh rename to samples/SimpleCases/TesCollection.sh diff --git a/testframework/samples/SimpleCases/TestCollection.sh b/samples/SimpleCases/TestCollection.sh similarity index 100% rename from testframework/samples/SimpleCases/TestCollection.sh rename to samples/SimpleCases/TestCollection.sh diff --git a/testframework/samples/Streams1/README.md b/samples/Streams1/README.md similarity index 100% rename from testframework/samples/Streams1/README.md rename to samples/Streams1/README.md diff --git a/testframework/samples/Streams1/RuntestSuite/InetSource2/GetWeather.spl b/samples/Streams1/RuntestSuite/InetSource2/GetWeather.spl similarity index 100% rename from testframework/samples/Streams1/RuntestSuite/InetSource2/GetWeather.spl rename to samples/Streams1/RuntestSuite/InetSource2/GetWeather.spl diff --git a/testframework/samples/Streams1/RuntestSuite/InetSource2/TestCase.sh b/samples/Streams1/RuntestSuite/InetSource2/TestCase.sh similarity index 100% rename from testframework/samples/Streams1/RuntestSuite/InetSource2/TestCase.sh rename to samples/Streams1/RuntestSuite/InetSource2/TestCase.sh diff --git a/testframework/samples/Streams1/RuntestSuite/TestSuite.sh b/samples/Streams1/RuntestSuite/TestSuite.sh similarity index 100% rename from testframework/samples/Streams1/RuntestSuite/TestSuite.sh rename to samples/Streams1/RuntestSuite/TestSuite.sh diff --git a/testframework/samples/Streams1/TestCollection.sh b/samples/Streams1/TestCollection.sh similarity index 100% rename from testframework/samples/Streams1/TestCollection.sh rename to samples/Streams1/TestCollection.sh diff --git a/testframework/samples/Streams1/TestProperties.sh b/samples/Streams1/TestProperties.sh similarity index 100% rename from testframework/samples/Streams1/TestProperties.sh rename to samples/Streams1/TestProperties.sh diff --git a/testframework/samples/Streams1/TranslationSuite/InetSource/TestCase.sh b/samples/Streams1/TranslationSuite/InetSource/TestCase.sh similarity index 100% rename from testframework/samples/Streams1/TranslationSuite/InetSource/TestCase.sh rename to samples/Streams1/TranslationSuite/InetSource/TestCase.sh diff --git a/testframework/samples/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/.namespace b/samples/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/.namespace similarity index 100% rename from testframework/samples/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/.namespace rename to samples/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/.namespace diff --git a/testframework/samples/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/GetWeather.spl b/samples/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/GetWeather.spl similarity index 100% rename from testframework/samples/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/GetWeather.spl rename to samples/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/GetWeather.spl diff --git a/testframework/samples/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/bla.txt b/samples/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/bla.txt similarity index 100% rename from testframework/samples/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/bla.txt rename to samples/Streams1/TranslationSuite/InetSource/com.ibm.streamsx.inet.sample/bla.txt diff --git a/testframework/samples/Streams1/TranslationSuite/TestSuite.sh b/samples/Streams1/TranslationSuite/TestSuite.sh similarity index 100% rename from testframework/samples/Streams1/TranslationSuite/TestSuite.sh rename to samples/Streams1/TranslationSuite/TestSuite.sh diff --git a/testframework/test/Selftest/Execution/TestSuite.sh b/test/Selftest/Execution/TestSuite.sh similarity index 100% rename from testframework/test/Selftest/Execution/TestSuite.sh rename to test/Selftest/Execution/TestSuite.sh diff --git a/testframework/test/Selftest/Execution/simpleCaseSucc/TestCase.sh b/test/Selftest/Execution/simpleCaseSucc/TestCase.sh similarity index 100% rename from testframework/test/Selftest/Execution/simpleCaseSucc/TestCase.sh rename to test/Selftest/Execution/simpleCaseSucc/TestCase.sh diff --git a/testframework/test/Selftest/Execution/simpleCaseSucc/testCollection/Suite/Case/TTestCase.sh b/test/Selftest/Execution/simpleCaseSucc/testCollection/Suite/Case/TTestCase.sh similarity index 100% rename from testframework/test/Selftest/Execution/simpleCaseSucc/testCollection/Suite/Case/TTestCase.sh rename to test/Selftest/Execution/simpleCaseSucc/testCollection/Suite/Case/TTestCase.sh diff --git a/testframework/test/Selftest/Execution/simpleCaseSucc/testCollection/Suite/TTestSuite.sh b/test/Selftest/Execution/simpleCaseSucc/testCollection/Suite/TTestSuite.sh similarity index 100% rename from testframework/test/Selftest/Execution/simpleCaseSucc/testCollection/Suite/TTestSuite.sh rename to test/Selftest/Execution/simpleCaseSucc/testCollection/Suite/TTestSuite.sh diff --git a/testframework/test/Selftest/Execution/simpleCaseSucc/testCollection/TTestCollection.sh b/test/Selftest/Execution/simpleCaseSucc/testCollection/TTestCollection.sh similarity index 100% rename from testframework/test/Selftest/Execution/simpleCaseSucc/testCollection/TTestCollection.sh rename to test/Selftest/Execution/simpleCaseSucc/testCollection/TTestCollection.sh diff --git a/testframework/test/Selftest/Invocation/HelpFunctions/TestCase.sh b/test/Selftest/Invocation/HelpFunctions/TestCase.sh similarity index 100% rename from testframework/test/Selftest/Invocation/HelpFunctions/TestCase.sh rename to test/Selftest/Invocation/HelpFunctions/TestCase.sh diff --git a/testframework/test/Selftest/Invocation/HelpFunctions/test/TestCollection.sh b/test/Selftest/Invocation/HelpFunctions/test/TestCollection.sh similarity index 100% rename from testframework/test/Selftest/Invocation/HelpFunctions/test/TestCollection.sh rename to test/Selftest/Invocation/HelpFunctions/test/TestCollection.sh diff --git a/testframework/test/Selftest/Invocation/InvokeError/TestCase.sh b/test/Selftest/Invocation/InvokeError/TestCase.sh similarity index 100% rename from testframework/test/Selftest/Invocation/InvokeError/TestCase.sh rename to test/Selftest/Invocation/InvokeError/TestCase.sh diff --git a/testframework/test/Selftest/Invocation/NoParams/TestCase.sh b/test/Selftest/Invocation/NoParams/TestCase.sh similarity index 100% rename from testframework/test/Selftest/Invocation/NoParams/TestCase.sh rename to test/Selftest/Invocation/NoParams/TestCase.sh diff --git a/testframework/test/Selftest/Invocation/TestSuite.sh b/test/Selftest/Invocation/TestSuite.sh similarity index 100% rename from testframework/test/Selftest/Invocation/TestSuite.sh rename to test/Selftest/Invocation/TestSuite.sh diff --git a/testframework/test/Selftest/SuitesAndCases/EmptyCase/TestCase.sh b/test/Selftest/SuitesAndCases/EmptyCase/TestCase.sh similarity index 100% rename from testframework/test/Selftest/SuitesAndCases/EmptyCase/TestCase.sh rename to test/Selftest/SuitesAndCases/EmptyCase/TestCase.sh diff --git a/testframework/test/Selftest/SuitesAndCases/EmptyCase/testCollection/Suite/Case/TTestCase.sh b/test/Selftest/SuitesAndCases/EmptyCase/testCollection/Suite/Case/TTestCase.sh similarity index 100% rename from testframework/test/Selftest/SuitesAndCases/EmptyCase/testCollection/Suite/Case/TTestCase.sh rename to test/Selftest/SuitesAndCases/EmptyCase/testCollection/Suite/Case/TTestCase.sh diff --git a/testframework/test/Selftest/SuitesAndCases/EmptyCase/testCollection/Suite/TTestSuite.sh b/test/Selftest/SuitesAndCases/EmptyCase/testCollection/Suite/TTestSuite.sh similarity index 100% rename from testframework/test/Selftest/SuitesAndCases/EmptyCase/testCollection/Suite/TTestSuite.sh rename to test/Selftest/SuitesAndCases/EmptyCase/testCollection/Suite/TTestSuite.sh diff --git a/testframework/test/Selftest/SuitesAndCases/EmptyCase/testCollection/TTestCollection.sh b/test/Selftest/SuitesAndCases/EmptyCase/testCollection/TTestCollection.sh similarity index 100% rename from testframework/test/Selftest/SuitesAndCases/EmptyCase/testCollection/TTestCollection.sh rename to test/Selftest/SuitesAndCases/EmptyCase/testCollection/TTestCollection.sh diff --git a/testframework/test/Selftest/SuitesAndCases/EmptyInputDir/TestCase.sh b/test/Selftest/SuitesAndCases/EmptyInputDir/TestCase.sh similarity index 100% rename from testframework/test/Selftest/SuitesAndCases/EmptyInputDir/TestCase.sh rename to test/Selftest/SuitesAndCases/EmptyInputDir/TestCase.sh diff --git a/testframework/test/Selftest/SuitesAndCases/EmptyInputDir/testCollection/.gitkeep b/test/Selftest/SuitesAndCases/EmptyInputDir/testCollection/.gitkeep similarity index 100% rename from testframework/test/Selftest/SuitesAndCases/EmptyInputDir/testCollection/.gitkeep rename to test/Selftest/SuitesAndCases/EmptyInputDir/testCollection/.gitkeep diff --git a/testframework/test/Selftest/SuitesAndCases/EmptySuite/TestCase.sh b/test/Selftest/SuitesAndCases/EmptySuite/TestCase.sh similarity index 100% rename from testframework/test/Selftest/SuitesAndCases/EmptySuite/TestCase.sh rename to test/Selftest/SuitesAndCases/EmptySuite/TestCase.sh diff --git a/testframework/test/Selftest/SuitesAndCases/EmptySuite/testCollection/Suite/TTestSuite.sh b/test/Selftest/SuitesAndCases/EmptySuite/testCollection/Suite/TTestSuite.sh similarity index 100% rename from testframework/test/Selftest/SuitesAndCases/EmptySuite/testCollection/Suite/TTestSuite.sh rename to test/Selftest/SuitesAndCases/EmptySuite/testCollection/Suite/TTestSuite.sh diff --git a/testframework/test/Selftest/SuitesAndCases/EmptySuite/testCollection/TTestCollection.sh b/test/Selftest/SuitesAndCases/EmptySuite/testCollection/TTestCollection.sh similarity index 100% rename from testframework/test/Selftest/SuitesAndCases/EmptySuite/testCollection/TTestCollection.sh rename to test/Selftest/SuitesAndCases/EmptySuite/testCollection/TTestCollection.sh diff --git a/testframework/test/Selftest/SuitesAndCases/NoSuite/TestCase.sh b/test/Selftest/SuitesAndCases/NoSuite/TestCase.sh similarity index 100% rename from testframework/test/Selftest/SuitesAndCases/NoSuite/TestCase.sh rename to test/Selftest/SuitesAndCases/NoSuite/TestCase.sh diff --git a/testframework/test/Selftest/SuitesAndCases/NoSuite/testCollection/TestCollection.sh b/test/Selftest/SuitesAndCases/NoSuite/testCollection/TestCollection.sh similarity index 100% rename from testframework/test/Selftest/SuitesAndCases/NoSuite/testCollection/TestCollection.sh rename to test/Selftest/SuitesAndCases/NoSuite/testCollection/TestCollection.sh diff --git a/testframework/test/Selftest/SuitesAndCases/TestSuite.sh b/test/Selftest/SuitesAndCases/TestSuite.sh similarity index 100% rename from testframework/test/Selftest/SuitesAndCases/TestSuite.sh rename to test/Selftest/SuitesAndCases/TestSuite.sh diff --git a/testframework/test/Selftest/TestCollection.sh b/test/Selftest/TestCollection.sh similarity index 100% rename from testframework/test/Selftest/TestCollection.sh rename to test/Selftest/TestCollection.sh diff --git a/testframework/test/Selftest/TestProperties.sh b/test/Selftest/TestProperties.sh similarity index 100% rename from testframework/test/Selftest/TestProperties.sh rename to test/Selftest/TestProperties.sh diff --git a/testframework/test/Selftest/TestTools.sh b/test/Selftest/TestTools.sh similarity index 100% rename from testframework/test/Selftest/TestTools.sh rename to test/Selftest/TestTools.sh diff --git a/testframework/test/emptyCase/Suite1/Case1/TestCase.sh b/test/emptyCase/Suite1/Case1/TestCase.sh similarity index 100% rename from testframework/test/emptyCase/Suite1/Case1/TestCase.sh rename to test/emptyCase/Suite1/Case1/TestCase.sh diff --git a/testframework/test/emptyCase/Suite1/TestSuite.sh b/test/emptyCase/Suite1/TestSuite.sh similarity index 100% rename from testframework/test/emptyCase/Suite1/TestSuite.sh rename to test/emptyCase/Suite1/TestSuite.sh diff --git a/testframework/test/emptyCase/TestCollection.sh b/test/emptyCase/TestCollection.sh similarity index 100% rename from testframework/test/emptyCase/TestCollection.sh rename to test/emptyCase/TestCollection.sh diff --git a/testframework/test/emptyInput/.gitkeep b/test/emptyInput/.gitkeep similarity index 100% rename from testframework/test/emptyInput/.gitkeep rename to test/emptyInput/.gitkeep diff --git a/testframework/test/emptySuite/Suite1/TestSuite.sh b/test/emptySuite/Suite1/TestSuite.sh similarity index 100% rename from testframework/test/emptySuite/Suite1/TestSuite.sh rename to test/emptySuite/Suite1/TestSuite.sh diff --git a/testframework/test/emptySuite/TestCollection.sh b/test/emptySuite/TestCollection.sh similarity index 100% rename from testframework/test/emptySuite/TestCollection.sh rename to test/emptySuite/TestCollection.sh diff --git a/testframework/test/noSuite/TestCollection.sh b/test/noSuite/TestCollection.sh similarity index 100% rename from testframework/test/noSuite/TestCollection.sh rename to test/noSuite/TestCollection.sh diff --git a/testframework/test/noSuite/TestProperties b/test/noSuite/TestProperties similarity index 100% rename from testframework/test/noSuite/TestProperties rename to test/noSuite/TestProperties diff --git a/testframework/test/parallel/Suite1/RunParallel/TestCase.sh b/test/parallel/Suite1/RunParallel/TestCase.sh similarity index 100% rename from testframework/test/parallel/Suite1/RunParallel/TestCase.sh rename to test/parallel/Suite1/RunParallel/TestCase.sh diff --git a/testframework/test/parallel/Suite1/TestSuite.sh b/test/parallel/Suite1/TestSuite.sh similarity index 100% rename from testframework/test/parallel/Suite1/TestSuite.sh rename to test/parallel/Suite1/TestSuite.sh diff --git a/testframework/test/parallel/Suite2/RunParallel/TestCase.sh b/test/parallel/Suite2/RunParallel/TestCase.sh similarity index 100% rename from testframework/test/parallel/Suite2/RunParallel/TestCase.sh rename to test/parallel/Suite2/RunParallel/TestCase.sh diff --git a/testframework/test/parallel/Suite2/TestSuite.sh b/test/parallel/Suite2/TestSuite.sh similarity index 100% rename from testframework/test/parallel/Suite2/TestSuite.sh rename to test/parallel/Suite2/TestSuite.sh diff --git a/testframework/test/parallel/TestCollection.sh b/test/parallel/TestCollection.sh similarity index 100% rename from testframework/test/parallel/TestCollection.sh rename to test/parallel/TestCollection.sh diff --git a/testframework/.gitignore b/testframework/.gitignore deleted file mode 100644 index 4c78acf..0000000 --- a/testframework/.gitignore +++ /dev/null @@ -1,4 +0,0 @@ -/runTTFWorkdir/ -/releases/ -/adir/ -/.project diff --git a/testframework/README.TXT b/testframework/README.TXT deleted file mode 100644 index 50a64d3..0000000 --- a/testframework/README.TXT +++ /dev/null @@ -1,52 +0,0 @@ -The test script is a framework for the control of test case execution. - -To learn more start with execution of help and man: - -./bin/runTTF --help - -and - -./bin/runTTF --man - -In directory samples you can see the Test Collection ANewTest, which is a sample for a basic Test Collection - -It is recommended to enter the location of the test framework into your PATH like: - -export PATH="/bin:$PATH" - -Whats new: ----------- -Version 1.0.0: -- re-name TestProperties to TestProperties.sh -- Removed propertie section in preamble, all properties moved to script section -- Preamble now supports only variantList, variantCount and timeout -- Preamble requires now quoting (for lists) -- Check whether variantCount and timeout are digits -- New test steps / pres / fins invocation local space separated list STEPS/PREPS/FINS -- New test steps / pres / fins invocation local array STEPS/PREPS/FINS possible -- New test steps / pres / fins invocation local functions testStep, testPreparation, testFinalization -- Global space separated lists steps / pres / fins invocation re-named: - TTRO_prepsCase TTRO_prepsSuite TTRO_preps - TTRO_stepsCase - TTRO_finsCase TTRO_finsSuite TTRO_fins -- Improved handling and display in case of erroros in suite/collection initialization and preparation -- All function calls for collection/suite/case preparation and steps and finalization are now unchecked called - to improve failure propagation -- Collections variant support -- TstCollection.sh and TestSuite.sh are now only once sourced in collection and suite context -- TTRO_extraTime renamed to TTP_additionalTime -- New utis functions isArray, isFunction, arrayHasKey, isExistingAndTrue, isTrue, isFalse -- Re-named properties TTRO_noStart -> TTPN_.. -- Handle debug and verbose as propertie -- Re-names TTRO_caseVariant -> TTRO_variantCase TTRO_suiteVariant -> TTRO_variantSuite - - -Version 0.2.0: -- Dummy Suite support: Test cases can be defined without suite context. -- Test collection now requires a TestCollection.sh file and the TestProperties file is now optional -- Installer -- New global initialization in streamsutils -- Use variables for sab file main composite .. -- New test cases -- Streams sample - diff --git a/testframework/tools/selfextract.sh b/tools/selfextract.sh similarity index 100% rename from testframework/tools/selfextract.sh rename to tools/selfextract.sh