X-Git-Url: https://jxself.org/git/?a=blobdiff_plain;f=kconfig_hardened_check%2Ftest_engine.py;h=99fd96cf88c431b5e8bee6b9140e0a463c3b665f;hb=c1090722157b531261a7cf0257f2dccb744bd93d;hp=0b3fca945cc108d5fa045d23390f0a666e6a8e3d;hpb=d58e674ecffe074f5210aa7300114f3fb97ed0d1;p=kconfig-hardened-check.git

diff --git a/kconfig_hardened_check/test_engine.py b/kconfig_hardened_check/test_engine.py
index 0b3fca9..99fd96c 100644
--- a/kconfig_hardened_check/test_engine.py
+++ b/kconfig_hardened_check/test_engine.py
@@ -98,7 +98,7 @@ class TestEngine(unittest.TestCase):
         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')]
@@ -141,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')]
@@ -184,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'),
@@ -227,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'),
@@ -306,7 +306,7 @@ class TestEngine(unittest.TestCase):
                  ["CONFIG_NAME_4", "kconfig", "expected_4", "decision_4", "reason_4", "OK: version >= 42.43"]]
         )
 
-    def test_verbose(self):
+    def test_stdout(self):
         # 1. prepare the checklist
         config_checklist = []
         config_checklist += [OR(KconfigCheck('reason_1', 'decision_1', 'NAME_1', 'expected_1'),
@@ -316,12 +316,13 @@ class TestEngine(unittest.TestCase):
                                  OR(KconfigCheck('reason_5', 'decision_5', 'NAME_5', 'expected_5'),
                                     CmdlineCheck('reason_6', 'decision_6', 'name_6', 'expected_6')))]
 
-        # 2. prepare the parsed kconfig options
-        parsed_kconfig_options = OrderedDict()
-        parsed_kconfig_options['CONFIG_NAME_5'] = 'expected_5'
+        # 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, parsed_kconfig_options, None, None)
+        self.run_engine(config_checklist, None, parsed_cmdline_options, None)
 
         # 4. check that the results are correct
         json_result = []
@@ -329,7 +330,18 @@ class TestEngine(unittest.TestCase):
         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: 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 = []
@@ -345,10 +357,10 @@ name_2                                  |cmdline| expected_2 |decision_2|     re
 CONFIG_NAME_3                           |kconfig| expected_3 |decision_3|     reason_3     | FAIL: is not found\
 "\
 "\
-    <<< AND >>>                                                                            | FAIL: is not found\n\
-name_4                                  |cmdline| expected_4 |decision_4|     reason_4     | FAIL: is not found\n\
-    <<< OR >>>                                                                             | OK\n\
-CONFIG_NAME_5                           |kconfig| expected_5 |decision_5|     reason_5     | OK\n\
-name_6                                  |cmdline| expected_6 |decision_6|     reason_6     | None\
+    <<< 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\"\
 "               ]
         )