diff --git a/README.md b/README.md index 28ea0d5..9f89906 100644 --- a/README.md +++ b/README.md @@ -111,6 +111,6 @@ Version 2.7.0: - New utils function: trim, getSystemLoad, getSystemLoad100 - Print the elapsed time -Version 2.7.1: +Version 2.7.2: - Some fixes in category handling diff --git a/bin/case.sh b/bin/case.sh index ff52cf2..bdc32e0 100755 --- a/bin/case.sh +++ b/bin/case.sh @@ -67,7 +67,7 @@ declare -i executedTestFinSteps=0 declare TTTT_failureOccurred='' declare TTTT_skipthis="" eval "$TTXX_runCategoryPatternArray" -declare -a TTTT_categoryArray=() +declare -a TTTT_categoryArray=( 'default' ) #test finalization function function caseFinalization { diff --git a/bin/man.sh b/bin/man.sh index 8332c1a..00a563c 100644 --- a/bin/man.sh +++ b/bin/man.sh @@ -369,14 +369,15 @@ function manpage () { Alternatively the existence of an file SKIP in the Test Case/Suite directory inhibits the execution of all variants of the Case/Suite. - The function 'setCategory' defines the categories of a Test Case or Test Suite. The categories are checked before the Case- or Suite- preparation - is executed. + The function 'setCategory' defines the categories of a Test Case or Test Suite. If the function 'setCategory' is not called during + Case or Suite initialization, the artifact has the default category 'default'. If the function 'setCategory' is called with an empty + parameter list, all catagories are cleaned. The categories are checked before the Case- or Suite- preparation is executed. The run-categories of the a test run can be defined with command line parameter -c|--category VALUE. The run-categories are considered to be patterns. If one of the run-category pattern matches any of the categories of the artifact, the Case/Suite is executed. Otherwise it is skipped. - A test Cases or Suites without a defined categorie are always executed independently from the run-categories. + A test Case or Suite without a defined categorie is always executed independently from the run-categories. If no run-category pattern is entered, all Cases and Suite are executed, regardless of the defined categories. - + If the run-caegory 'default' is specified, all Cases and Suites are executed that have no explicit category set. ## Sequence Control diff --git a/bin/suite.sh b/bin/suite.sh index 6c3ee17..3ccda52 100755 --- a/bin/suite.sh +++ b/bin/suite.sh @@ -108,7 +108,7 @@ eval "$TTXX_runCategoryPatternArray" declare -rx TTRO_suite="${suitesName[$TTRO_suiteIndex]}" declare -rx TTRO_inputDirSuite="${suitesPath[$TTRO_suiteIndex]}" declare TTTT_skipthis='' -declare -a TTTT_categoryArray=() +declare -a TTTT_categoryArray=( 'default' ) declare -a cases=() # case pathes declare -a casesNames=() # the short path diff --git a/bin/version.sh b/bin/version.sh index df1fcc9..832bbcf 100644 --- a/bin/version.sh +++ b/bin/version.sh @@ -1 +1 @@ -declare -xr TTRO_version="2.7.2__dev__" +declare -xr TTRO_version="2.7.2" diff --git a/samples/Categories/Suite1/CaseWithCat/TestCase.sh b/samples/Categories/Suite1/CaseWithCat/TestCase.sh index 0d49da9..4d98fea 100644 --- a/samples/Categories/Suite1/CaseWithCat/TestCase.sh +++ b/samples/Categories/Suite1/CaseWithCat/TestCase.sh @@ -1,4 +1,4 @@ -#--variantCount=5 +#--variantCount=6 #prepare the case categories case "$TTRO_variantCase" in diff --git a/samples/Categories/Suite1/TestSuite.sh b/samples/Categories/Suite1/TestSuite.sh index e69de29..d99dbea 100644 --- a/samples/Categories/Suite1/TestSuite.sh +++ b/samples/Categories/Suite1/TestSuite.sh @@ -0,0 +1 @@ +setCategory \ No newline at end of file