X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=kconfig_hardened_check%2Ftest_engine.py;h=99fd96cf88c431b5e8bee6b9140e0a463c3b665f;hb=9297ada275232cc9ae6d188f55dbf05fc9c31add;hp=960f5168f8fa14f4c0996ccbb0260d29d2e508a1;hpb=6aa06e0b61870939c770a18ec8ffd5a0e36f75fe;p=kconfig-hardened-check.git

diff --git a/kconfig_hardened_check/test_engine.py b/kconfig_hardened_check/test_engine.py
index 960f516..99fd96c 100644
--- a/kconfig_hardened_check/test_engine.py
+++ b/kconfig_hardened_check/test_engine.py
@@ -79,7 +79,7 @@ class TestEngine(unittest.TestCase):
 
     @staticmethod
     def get_engine_result(checklist, result, result_type):
-        assert(result_type in ('json', 'stdout')), \
+        assert(result_type in ('json', 'stdout', 'stdout_verbose')), \
                f'invalid result type "{result_type}"'
 
         if result_type == 'json':
@@ -91,11 +91,14 @@ class TestEngine(unittest.TestCase):
         stdout_backup = sys.stdout
         sys.stdout = captured_output
         for opt in checklist:
-            opt.table_print('verbose', True) # verbose mode, with_results
+            if result_type == 'stdout_verbose':
+                opt.table_print('verbose', True) # verbose mode, with_results
+            else:
+                opt.table_print(None, True) # normal mode, with_results
         sys.stdout = stdout_backup
         result.append(captured_output.getvalue())
 
-    def test_single_kconfig(self):
+    def test_simple_kconfig(self):
         # 1. prepare the checklist
         config_checklist = []
         config_checklist += [KconfigCheck('reason_1', 'decision_1', 'NAME_1', 'expected_1')]
@@ -138,7 +141,7 @@ class TestEngine(unittest.TestCase):
                  ["CONFIG_NAME_10", "kconfig", "is not off", "decision_10", "reason_10", "FAIL: is off, not found"]]
         )
 
-    def test_single_cmdline(self):
+    def test_simple_cmdline(self):
         # 1. prepare the checklist
         config_checklist = []
         config_checklist += [CmdlineCheck('reason_1', 'decision_1', 'name_1', 'expected_1')]
@@ -181,7 +184,7 @@ class TestEngine(unittest.TestCase):
                  ["name_10", "cmdline", "is not off", "decision_10", "reason_10", "FAIL: is off, not found"]]
         )
 
-    def test_OR(self):
+    def test_complex_or(self):
         # 1. prepare the checklist
         config_checklist = []
         config_checklist += [OR(KconfigCheck('reason_1', 'decision_1', 'NAME_1', 'expected_1'),
@@ -224,7 +227,7 @@ class TestEngine(unittest.TestCase):
                  ["CONFIG_NAME_10", "kconfig", "expected_10", "decision_10", "reason_10", "OK: CONFIG_NAME_11 is not off"]]
         )
 
-    def test_AND(self):
+    def test_complex_and(self):
         # 1. prepare the checklist
         config_checklist = []
         config_checklist += [AND(KconfigCheck('reason_1', 'decision_1', 'NAME_1', 'expected_1'),
@@ -303,3 +306,61 @@ class TestEngine(unittest.TestCase):
                  ["CONFIG_NAME_4", "kconfig", "expected_4", "decision_4", "reason_4", "OK: version >= 42.43"]]
         )
 
+    def test_stdout(self):
+        # 1. prepare the checklist
+        config_checklist = []
+        config_checklist += [OR(KconfigCheck('reason_1', 'decision_1', 'NAME_1', 'expected_1'),
+                                AND(CmdlineCheck('reason_2', 'decision_2', 'name_2', 'expected_2'),
+                                    KconfigCheck('reason_3', 'decision_3', 'NAME_3', 'expected_3')))]
+        config_checklist += [AND(CmdlineCheck('reason_4', 'decision_4', 'name_4', 'expected_4'),
+                                 OR(KconfigCheck('reason_5', 'decision_5', 'NAME_5', 'expected_5'),
+                                    CmdlineCheck('reason_6', 'decision_6', 'name_6', 'expected_6')))]
+
+        # 2. prepare the parsed cmdline options
+        parsed_cmdline_options = OrderedDict()
+        parsed_cmdline_options['name_4'] = 'expected_4'
+        parsed_cmdline_options['name_6'] = 'UNexpected_6'
+
+        # 3. run the engine
+        self.run_engine(config_checklist, None, parsed_cmdline_options, None)
+
+        # 4. check that the results are correct
+        json_result = []
+        self.get_engine_result(config_checklist, json_result, 'json')
+        self.assertEqual(
+                json_result,
+                [["CONFIG_NAME_1", "kconfig", "expected_1", "decision_1", "reason_1", "FAIL: is not found"],
+                 ["name_4", "cmdline", "expected_4", "decision_4", "reason_4", "FAIL: CONFIG_NAME_5 is not \"expected_5\""]]
+        )
+
+        stdout_result = []
+        self.get_engine_result(config_checklist, stdout_result, 'stdout')
+        self.assertEqual(
+                stdout_result,
+                [
+"\
+CONFIG_NAME_1                           |kconfig| expected_1 |decision_1|     reason_1     | FAIL: is not found\
+name_4                                  |cmdline| expected_4 |decision_4|     reason_4     | FAIL: CONFIG_NAME_5 is not \"expected_5\"\
+"               ]
+        )
+
+        stdout_result = []
+        self.get_engine_result(config_checklist, stdout_result, 'stdout_verbose')
+        self.assertEqual(
+                stdout_result,
+                [
+"\
+    <<< OR >>>                                                                             | FAIL: is not found\n\
+CONFIG_NAME_1                           |kconfig| expected_1 |decision_1|     reason_1     | FAIL: is not found\n\
+    <<< AND >>>                                                                            | FAIL: CONFIG_NAME_3 is not \"expected_3\"\n\
+name_2                                  |cmdline| expected_2 |decision_2|     reason_2     | None\n\
+CONFIG_NAME_3                           |kconfig| expected_3 |decision_3|     reason_3     | FAIL: is not found\
+"\
+"\
+    <<< AND >>>                                                                            | FAIL: CONFIG_NAME_5 is not \"expected_5\"\n\
+name_4                                  |cmdline| expected_4 |decision_4|     reason_4     | None\n\
+    <<< OR >>>                                                                             | FAIL: is not found\n\
+CONFIG_NAME_5                           |kconfig| expected_5 |decision_5|     reason_5     | FAIL: is not found\n\
+name_6                                  |cmdline| expected_6 |decision_6|     reason_6     | FAIL: \"UNexpected_6\"\
+"               ]
+        )