Extend test_skip_paths

Extend test_skip_paths to test the "skip selected paths" feature
also in the filehash58 probe.

Author: jan-cerny

tests/API/OVAL/skip_paths/test_skip_paths.sh

@@ -30,5 +30,12 @@ assert_exists 1 '/oval_results/results/system/definitions/definition[@definition
 assert_exists 1 '/oval_results/results/system/oval_system_characteristics/collected_objects/object[@id="oval:x:obj:4" and @flag="does not exist"]'
 assert_exists 0 '/oval_results/results/system/oval_system_characteristics/system_data/ind-sys:textfilecontent_item/ind-sys:filepath[text()="/tmp/oscap_test_skip_paths/b/y"]'
 assert_exists 0 '/oval_results/results/system/oval_system_characteristics/system_data/ind-sys:textfilecontent_item/ind-sys:filepath[text()="/tmp/oscap_test_skip_paths/c/z"]'
+assert_exists 1 '/oval_results/results/system/definitions/definition[@definition_id="oval:x:def:5" and @result="true"]'
+assert_exists 1 '/oval_results/results/system/oval_system_characteristics/collected_objects/object[@id="oval:x:obj:5" and @flag="complete"]'
+assert_exists 1 '/oval_results/results/system/oval_system_characteristics/system_data/ind-sys:filehash58_item/ind-sys:filepath[text()="/tmp/oscap_test_skip_paths/a/x"]'
+assert_exists 1 '/oval_results/results/system/definitions/definition[@definition_id="oval:x:def:6" and @result="true"]'
+assert_exists 1 '/oval_results/results/system/oval_system_characteristics/collected_objects/object[@id="oval:x:obj:6" and @flag="does not exist"]'
+assert_exists 0 '/oval_results/results/system/oval_system_characteristics/system_data/ind-sys:filehash58_item/ind-sys:filepath[text()="/tmp/oscap_test_skip_paths/b/y"]'
+assert_exists 0 '/oval_results/results/system/oval_system_characteristics/system_data/ind-sys:filehash58_item/ind-sys:filepath[text()="/tmp/oscap_test_skip_paths/c/z"]'
 rm -f $result
 rm -rf "$root"

tests/API/OVAL/skip_paths/test_skip_paths.xml

@@ -29,6 +29,18 @@
         <criterion test_ref="oval:x:tst:4"/>
       </criteria>
     </definition>
+    <definition class="compliance" version="1" id="oval:x:def:5">
+      <metadata><title/><description/></metadata>
+      <criteria operator="AND">
+        <criterion test_ref="oval:x:tst:5"/>
+      </criteria>
+    </definition>
+    <definition class="compliance" version="1" id="oval:x:def:6">
+      <metadata><title/><description/></metadata>
+      <criteria operator="AND">
+        <criterion test_ref="oval:x:tst:6"/>
+      </criteria>
+    </definition>
   </definitions>
   <tests>
     <file_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix" check_existence="at_least_one_exists" version="1" id="oval:x:tst:1" check="all" comment="read file from directory 'a' - should be read">
@@ -43,6 +55,12 @@
     <textfilecontent54_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" check_existence="none_exist" version="1" id="oval:x:tst:4" check="all" comment="read file from directory 'b' - should be skip">
       <object object_ref="oval:x:obj:4"/>
     </textfilecontent54_test>
+    <filehash58_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" check_existence="at_least_one_exists" version="1" id="oval:x:tst:5" check="all" comment="read file from directory 'a' - should be read">
+      <object object_ref="oval:x:obj:5"/>
+    </filehash58_test>
+    <filehash58_test xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" check_existence="none_exist" version="1" id="oval:x:tst:6" check="all" comment="read file from directory 'b' - should be skip">
+      <object object_ref="oval:x:obj:6"/>
+    </filehash58_test>
   </tests>
   <objects>
     <file_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#unix" version="1" id="oval:x:obj:1">
@@ -61,5 +79,13 @@
       <pattern>^.*$</pattern>
       <instance datatype="int" operation="greater than or equal">1</instance>
     </textfilecontent54_object>
+    <filehash58_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" version="1" id="oval:x:obj:5">
+      <filepath>/tmp/oscap_test_skip_paths/a/x</filepath>
+      <hash_type>SHA-512</hash_type>
+    </filehash58_object>
+    <filehash58_object xmlns="http://oval.mitre.org/XMLSchema/oval-definitions-5#independent" version="1" id="oval:x:obj:6">
+      <filepath>/tmp/oscap_test_skip_paths/b/y</filepath>
+      <hash_type>SHA-512</hash_type>
+    </filehash58_object>
   </objects>
 </oval_definitions>