Add tests for "OVAL details in HTML report by default"

Improves existing test for OVAL details to check both
old a new behavior. Test if OVAL details are present in HTML
report without specifying --oval-details and --results.
At the same time it verifies that the old way still works
and the OVAL results XML is created as expected.

Author: jan-cerny

tests/oval_details/test_oval_details.sh

@@ -10,13 +10,37 @@ output_dir=`mktemp -d -t oval_details_XXXXXX`
 
 # Test cases.
 
-function test_oval_details {
+function test_oval_details_implicit {
+  # Tests if OVAL Details are present in HTML report by default
+  # without specifing --oval-results --results (new behavior)
   xccdffile=$srcdir/$1.xccdf.xml
   resultfile=$output_dir/$1.result.xml
   reportfile=$output_dir/$1.report.html
+  oval_resultfile="$1.oval.xml.result.xml"
+  $OSCAP xccdf eval --report $reportfile $xccdffile
+  [ -f $reportfile ]
+  [ ! -f $resultfile ]
+  [ ! -f $oval_resultfile ]
+  grep -i $2 $reportfile >/dev/null && grep -i $3 $reportfile >/dev/null
+  rm $reportfile
+}
+
+function test_oval_details_explicit {
+  # Tests if OVAL details are present in HTML report when options
+  # --oval-results and --results are explicitely specified
+  # (backwards-compatible behavior)
+  xccdffile=$srcdir/$1.xccdf.xml
+  resultfile=$output_dir/$1.result.xml
+  reportfile=$output_dir/$1.report.html
+  oval_resultfile="$1.oval.xml.result.xml"
   $OSCAP xccdf eval --results $resultfile --oval-results --report $reportfile $xccdffile
   grep -i $2 $reportfile >/dev/null && grep -i $3 $reportfile >/dev/null
-  rm "$1.oval.xml.result.xml"
+  [ -f $reportfile ]
+  [ -f $resultfile ]
+  [ -f $oval_resultfile ]
+  rm $reportfile
+  rm $resultfile
+  rm $oval_resultfile
 }
 
 # Testing.
@@ -29,16 +53,24 @@ if ! [ -f foo.txt ] ; then
   cp $srcdir/foo.src.txt ./foo.txt
 fi
 
-test_run "test_oval_details_file_object" test_oval_details file "path.*UID.*permissions" "/dev/null"
-test_run "test_oval_details_partition_object" test_oval_details partition "mount point.*device.*uuid" "/"
-test_run "test_oval_details_rpminfo_object" test_oval_details rpminfo "name.*release.*version" "rpm"
+test_run "test_oval_details_file_object_implicit" test_oval_details_implicit file "path.*UID.*permissions" "/dev/null"
+test_run "test_oval_details_file_object_explicit" test_oval_details_explicit file "path.*UID.*permissions" "/dev/null"
+test_run "test_oval_details_partition_object_implicit" test_oval_details_implicit partition "mount point.*device.*uuid" "/"
+test_run "test_oval_details_partition_object_explicit" test_oval_details_explicit partition "mount point.*device.*uuid" "/"
+test_run "test_oval_details_rpminfo_object_implicit" test_oval_details_implicit rpminfo "name.*release.*version" "rpm"
+test_run "test_oval_details_rpminfo_object_explicit" test_oval_details_explicit rpminfo "name.*release.*version" "rpm"
 if ! pidof systemd > /dev/null ; then
-  test_run "test_oval_details_runlevel_object" test_oval_details runlevel "service name.*runlevel" "smartd"
+  test_run "test_oval_details_runlevel_object_implicit" test_oval_details_implicit runlevel "service name.*runlevel" "smartd"
+  test_run "test_oval_details_runlevel_object_explicit" test_oval_details_explicit runlevel "service name.*runlevel" "smartd"
 fi
-test_run "test_oval_details_sysctl_object" test_oval_details sysctl "name.*value" "net\.ipv4\.ip_forward"
-test_run "test_oval_details_textfilecontent54_object" test_oval_details textfilecontent54 "path.*content" "foo\.txt.*Hello"
-test_run "test_oval_details_variable_object" test_oval_details variable "var ref.*value" "oval:x:var:1.*42"
-test_run "test_oval_details_xmlfilecontent_object" test_oval_details xmlfilecontent "filepath.*xpath.*value of" "countries\.xml.*London"
+test_run "test_oval_details_sysctl_object_implicit" test_oval_details_implicit sysctl "name.*value" "net\.ipv4\.ip_forward"
+test_run "test_oval_details_sysctl_object_explicit" test_oval_details_explicit sysctl "name.*value" "net\.ipv4\.ip_forward"
+test_run "test_oval_details_textfilecontent54_object_implicit" test_oval_details_implicit textfilecontent54 "path.*content" "foo\.txt.*Hello"
+test_run "test_oval_details_textfilecontent54_object_explicit" test_oval_details_explicit textfilecontent54 "path.*content" "foo\.txt.*Hello"
+test_run "test_oval_details_variable_object_implicit" test_oval_details_implicit variable "var ref.*value" "oval:x:var:1.*42"
+test_run "test_oval_details_variable_object_explicit" test_oval_details_explicit variable "var ref.*value" "oval:x:var:1.*42"
+test_run "test_oval_details_xmlfilecontent_object_implicit" test_oval_details_implicit xmlfilecontent "filepath.*xpath.*value of" "countries\.xml.*London"
+test_run "test_oval_details_xmlfilecontent_object_explicit" test_oval_details_explicit xmlfilecontent "filepath.*xpath.*value of" "countries\.xml.*London"
 
 rm -rf $output_dir
 rm -f ./foo.txt ./countries.xml