Merge pull request OpenSCAP#380 from NonerKao/maint-1.2

Reuse existing function during the check
redhatrises · Apr 9, 2016 · 7bffe59 · 7bffe59
2 parents 71ac62d + ca8c39b
commit 7bffe59
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 70 deletions.
diff --git a/tests/API/XCCDF/applicability/all.sh b/tests/API/XCCDF/applicability/all.sh
@@ -12,61 +12,43 @@ function test_api_xccdf_cpe_eval {
     local CPE_DICT=$srcdir/$2
     local EXPECTED_NA=$3
 
-    local TMP_RESULTS=`mktemp`
-    $OSCAP xccdf eval --cpe $CPE_DICT --results $TMP_RESULTS $INPUT
+    result=`mktemp`
+    $OSCAP xccdf eval --cpe $CPE_DICT --results $result $INPUT
     if [ "$?" != "0" ]; then
         return 1
     fi
 
-    local NOTAPPLICABLE_COUNT=$($XPATH $TMP_RESULTS 'count(//result[text()="notapplicable"])')
-    rm -f $TMP_RESULTS
-
-    if [ "$NOTAPPLICABLE_COUNT" == "$EXPECTED_NA" ]; then
-        return 0
-    fi
-
-    return 1
+    assert_exists $EXPECTED_NA '//result[text()="notapplicable"]'
+    rm -f $result
 }
 
 function test_api_xccdf_cpe2_eval {
     local INPUT=$srcdir/$1
     local CPE_DICT=$srcdir/$2
     local EXPECTED_NA=$3
 
-    local TMP_RESULTS=`mktemp`
-    $OSCAP xccdf eval --cpe $CPE_DICT --results $TMP_RESULTS $INPUT
+    result=`mktemp`
+    $OSCAP xccdf eval --cpe $CPE_DICT --results $result $INPUT
     if [ "$?" != "0" ]; then
         return 1
     fi
 
-    local NOTAPPLICABLE_COUNT=$($XPATH $TMP_RESULTS 'count(//result[text()="notapplicable"])')
-    rm -f $TMP_RESULTS
-
-    if [ "$NOTAPPLICABLE_COUNT" == "$EXPECTED_NA" ]; then
-        return 0
-    fi
-
-    return 1
+    assert_exists $EXPECTED_NA '//result[text()="notapplicable"]'
+    rm -f $result
 }
 
 function test_api_xccdf_embedded_cpe_eval {
     local INPUT=$srcdir/$1
     local EXPECTED_NA=$2
 
-    local TMP_RESULTS=`mktemp`
-    $OSCAP xccdf eval --results $TMP_RESULTS $INPUT
+    result=`mktemp`
+    $OSCAP xccdf eval --results $result $INPUT
     if [ "$?" != "0" ]; then
         return 1
     fi
 
-    local NOTAPPLICABLE_COUNT=$($XPATH $TMP_RESULTS 'count(//result[text()="notapplicable"])')
-    rm -f $TMP_RESULTS
-
-    if [ "$NOTAPPLICABLE_COUNT" == "$EXPECTED_NA" ]; then
-        return 0
-    fi
-
-    return 1
+    assert_exists $EXPECTED_NA '//result[text()="notapplicable"]'
+    rm -f $result
 }
 # Testing.
 

diff --git a/tests/API/XCCDF/tailoring/all.sh b/tests/API/XCCDF/tailoring/all.sh
@@ -13,20 +13,14 @@ function test_api_xccdf_tailoring {
     local PROFILE=$3
     local EXPECTED_PASS=$4
 
-    local TMP_RESULTS=`mktemp`
-    $OSCAP xccdf eval --tailoring-file $TAILORING --profile $PROFILE --results $TMP_RESULTS $INPUT
+    result=`mktemp`
+    $OSCAP xccdf eval --tailoring-file $TAILORING --profile $PROFILE --results $result $INPUT
     if [ "$?" != "0" ]; then
         return 1
     fi
 
-    local PASS_COUNT=$($XPATH $TMP_RESULTS 'count(//result[text()="pass"])')
-    rm -f $TMP_RESULTS
-
-    if [ "$PASS_COUNT" == "$EXPECTED_PASS" ]; then
-        return 0
-    fi
-
-    return 1
+    assert_exists $EXPECTED_PASS '//result[text()="pass"]'
+    rm -f $result
 }
 
 function test_api_xccdf_tailoring_ds {
@@ -35,20 +29,14 @@ function test_api_xccdf_tailoring_ds {
     local PROFILE=$3
     local EXPECTED_PASS=$4
 
-    local TMP_RESULTS=`mktemp`
-    $OSCAP xccdf eval --tailoring-id $TAILORING_ID --profile $PROFILE --results $TMP_RESULTS $INPUT
+    result=`mktemp`
+    $OSCAP xccdf eval --tailoring-id $TAILORING_ID --profile $PROFILE --results $result $INPUT
     if [ "$?" != "0" ]; then
         return 1
     fi
 
-    local PASS_COUNT=$($XPATH $TMP_RESULTS 'count(//result[text()="pass"])')
-    rm -f $TMP_RESULTS
-
-    if [ "$PASS_COUNT" == "$EXPECTED_PASS" ]; then
-        return 0
-    fi
-
-    return 1
+    assert_exists $EXPECTED_PASS '//result[text()="pass"]'
+    rm -f $result
 }
 
 function test_api_xccdf_tailoring_ds_hybrid {
@@ -57,20 +45,14 @@ function test_api_xccdf_tailoring_ds_hybrid {
     local PROFILE=$3
     local EXPECTED_PASS=$4
 
-    local TMP_RESULTS=`mktemp`
-    $OSCAP xccdf eval --tailoring-file $TAILORING --profile $PROFILE --results $TMP_RESULTS $INPUT
+    result=`mktemp`
+    $OSCAP xccdf eval --tailoring-file $TAILORING --profile $PROFILE --results $result $INPUT
     if [ "$?" != "0" ]; then
         return 1
     fi
 
-    local PASS_COUNT=$($XPATH $TMP_RESULTS 'count(//result[text()="pass"])')
-    rm -f $TMP_RESULTS
-
-    if [ "$PASS_COUNT" == "$EXPECTED_PASS" ]; then
-        return 0
-    fi
-
-    return 1
+    assert_exists $EXPECTED_PASS '//result[text()="pass"]'
+    rm -f $result
 }
 
 function test_api_xccdf_tailoring_oscap_info {
@@ -92,20 +74,14 @@ function test_api_xccdf_tailoring_autonegotiation {
     local PROFILE=$2
     local EXPECTED_PASS=$3
 
-    local TMP_RESULTS=`mktemp`
-    $OSCAP xccdf eval --profile $PROFILE --results $TMP_RESULTS $TAILORING
+    result=`mktemp`
+    $OSCAP xccdf eval --profile $PROFILE --results $result $TAILORING
     if [ "$?" != "0" ]; then
         return 1
     fi
 
-    local PASS_COUNT=$($XPATH $TMP_RESULTS 'count(//result[text()="pass"])')
-    rm -f $TMP_RESULTS
-
-    if [ "$PASS_COUNT" == "$EXPECTED_PASS" ]; then
-        return 0
-    fi
-
-    return 1
+    assert_exists $EXPECTED_PASS '//result[text()="pass"]'
+    rm -f $result
 }
 
 # Testing.