Merge pull request #214 from Honny1/fix-bugzilla-2011382

Fix bugzilla 2011382

Author: matejak

oval_graph/command_line_client/arf_to_html.py

@@ -10,6 +10,7 @@ def __init__(self, args):
 
     def _get_message(self):
         return {
+            'command_name': 'arf-to-graph',
             'description': 'Client for visualization of SCAP rule evaluation results',
             'source_filename': 'ARF scan file',
         }

oval_graph/command_line_client/arf_to_json.py

@@ -13,6 +13,7 @@ def __init__(self, args):
 
     def _get_message(self):
         return {
+            'command_name': 'arf-to-json',
             'description': 'Client for generating JSON of SCAP rule evaluation results',
             'source_filename': 'ARF scan file',
         }

oval_graph/command_line_client/client.py

@@ -25,6 +25,7 @@ def __init__(self, args):
     @staticmethod
     def _get_message():
         return {
+            'command_name': '',
             'description': '',
             'source_filename': '',
         }
@@ -123,7 +124,7 @@ def _get_wanted_rules(self, rules):
 
     def parse_arguments(self, args):
         parser = argparse.ArgumentParser(
-            prog='oval-graph',
+            prog=self._get_message().get('command_name'),
             description=self._get_message().get('description'))
         self.prepare_parser(parser)
         if args is None:

oval_graph/command_line_client/json_to_html.py

@@ -27,6 +27,7 @@ def _get_rows_of_unselected_rules(self):
 
     def _get_message(self):
         return {
+            'command_name': 'json-to-graph',
             'description': 'Client for visualization of JSON created by command arf-to-json',
             'source_filename': 'JSON file',
         }

test_commands.sh

@@ -180,6 +180,26 @@ test_command_rise_error() {
     report "${msg}"
 }
 
+test_of_command_output_contains_expected_str() {
+    test_name="$1"
+    command="$2"
+    expected_str="$3"
+    msg=""
+    echo "Start: $test_name"
+    output=$($command 2>&1)
+    exit_code=$?
+    if [[ $output =~ $expected_str ]]; then
+        test_result=0
+        msg="$test_name"
+    else
+        echo "$output"
+        test_result=1
+        overall_test_result=1
+        msg="$test_name: $command"
+    fi
+    report "${msg}"
+}
+
 clean() {
     file=$1
     if [ "$_arg_verbose" = "on" ]; then
@@ -222,6 +242,11 @@ hide_all_passing_tests_test() {
     test_command run-json-to-graph "json-to-graph -o ${tmp_dir_src} ${tmp_json_file_src} --hide-passing-tests -i fips"
 }
 
+test_of_reference_to_right_binary_in_help() {
+    test_of_command_output_contains_expected_str expect_right_reference_in_help "arf-to-graph -h" "arf-to-graph"
+    test_of_command_output_contains_expected_str expect_right_reference_in_help "arf-to-json -h" "arf-to-json"
+    test_of_command_output_contains_expected_str expect_right_reference_in_help "json-to-graph -h" "json-to-graph"
+}
 
 # Backup descriptors stdout -> 3, stderr -> 4
 exec 3>&1 4>&2
@@ -241,6 +266,7 @@ basic_test
 regex_and_all_test
 regex_and_all_in_one_test
 hide_all_passing_tests_test
+test_of_reference_to_right_binary_in_help
 
 if [ "$_arg_clean" = "on" ]; then
     clean "${tmp_dir_src}"