From: Alexander Popov Date: Sun, 26 Mar 2023 17:04:38 +0000 (+0300) Subject: test_engine: add missing cases for test_OR() and test_AND() X-Git-Tag: v0.6.6~188 X-Git-Url: https://jxself.org/git/?a=commitdiff_plain;h=33239ac7423d52b521331897ee6b20faaa3a0167;p=kconfig-hardened-check.git test_engine: add missing cases for test_OR() and test_AND() I mean testing 'is present' and 'is not off' in OR/AND --- diff --git a/kconfig_hardened_check/test_engine.py b/kconfig_hardened_check/test_engine.py index 2140892..473e2f7 100644 --- a/kconfig_hardened_check/test_engine.py +++ b/kconfig_hardened_check/test_engine.py @@ -171,6 +171,10 @@ class TestEngine(unittest.TestCase): KconfigCheck('reason_6', 'decision_6', 'NAME_6', 'expected_6'))] config_checklist += [OR(KconfigCheck('reason_6', 'decision_6', 'NAME_6', 'expected_6'), KconfigCheck('reason_7', 'decision_7', 'NAME_7', 'is not set'))] + config_checklist += [OR(KconfigCheck('reason_8', 'decision_8', 'NAME_8', 'expected_8'), + KconfigCheck('reason_9', 'decision_9', 'NAME_9', 'is present'))] + config_checklist += [OR(KconfigCheck('reason_10', 'decision_10', 'NAME_10', 'expected_10'), + KconfigCheck('reason_11', 'decision_11', 'NAME_11', 'is not off'))] # 2. prepare the parsed kconfig options parsed_kconfig_options = OrderedDict() @@ -180,6 +184,8 @@ class TestEngine(unittest.TestCase): parsed_kconfig_options['CONFIG_NAME_4'] = 'expected_4' parsed_kconfig_options['CONFIG_NAME_5'] = 'UNexpected_5' parsed_kconfig_options['CONFIG_NAME_6'] = 'UNexpected_6' + parsed_kconfig_options['CONFIG_NAME_9'] = 'UNexpected_9' + parsed_kconfig_options['CONFIG_NAME_11'] = 'really_not_off' # 3. run the engine result = [] @@ -191,18 +197,26 @@ class TestEngine(unittest.TestCase): [["CONFIG_NAME_1", "kconfig", "expected_1", "decision_1", "reason_1", "OK"], ["CONFIG_NAME_3", "kconfig", "expected_3", "decision_3", "reason_3", "OK: CONFIG_NAME_4 is \"expected_4\""], ["CONFIG_NAME_5", "kconfig", "expected_5", "decision_5", "reason_5", "FAIL: \"UNexpected_5\""], - ["CONFIG_NAME_6", "kconfig", "expected_6", "decision_6", "reason_6", "OK: CONFIG_NAME_7 is not found"]] + ["CONFIG_NAME_6", "kconfig", "expected_6", "decision_6", "reason_6", "OK: CONFIG_NAME_7 is not found"], + ["CONFIG_NAME_8", "kconfig", "expected_8", "decision_8", "reason_8", "OK: CONFIG_NAME_9 is present"], + ["CONFIG_NAME_10", "kconfig", "expected_10", "decision_10", "reason_10", "OK: CONFIG_NAME_11 is not off"]] ) def test_AND(self): # 1. prepare the checklist config_checklist = [] config_checklist += [AND(KconfigCheck('reason_1', 'decision_1', 'NAME_1', 'expected_1'), - KconfigCheck('reason_2', 'decision_2', 'NAME_2', 'expected_2'))] + KconfigCheck('reason_2', 'decision_2', 'NAME_2', 'expected_2'))] config_checklist += [AND(KconfigCheck('reason_3', 'decision_3', 'NAME_3', 'expected_3'), - KconfigCheck('reason_4', 'decision_4', 'NAME_4', 'expected_4'))] + KconfigCheck('reason_4', 'decision_4', 'NAME_4', 'expected_4'))] config_checklist += [AND(KconfigCheck('reason_5', 'decision_5', 'NAME_5', 'expected_5'), - KconfigCheck('reason_6', 'decision_6', 'NAME_6', 'expected_6'))] + KconfigCheck('reason_6', 'decision_6', 'NAME_6', 'expected_6'))] + config_checklist += [AND(KconfigCheck('reason_8', 'decision_8', 'NAME_8', 'expected_8'), + KconfigCheck('reason_9', 'decision_9', 'NAME_9', 'is present'))] + config_checklist += [AND(KconfigCheck('reason_10', 'decision_10', 'NAME_10', 'expected_10'), + KconfigCheck('reason_11', 'decision_11', 'NAME_11', 'is not off'))] + config_checklist += [AND(KconfigCheck('reason_12', 'decision_12', 'NAME_12', 'expected_12'), + KconfigCheck('reason_13', 'decision_13', 'NAME_13', 'is not off'))] # 2. prepare the parsed kconfig options parsed_kconfig_options = OrderedDict() @@ -212,6 +226,10 @@ class TestEngine(unittest.TestCase): parsed_kconfig_options['CONFIG_NAME_4'] = 'UNexpected_4' parsed_kconfig_options['CONFIG_NAME_5'] = 'UNexpected_5' parsed_kconfig_options['CONFIG_NAME_6'] = 'expected_6' + parsed_kconfig_options['CONFIG_NAME_8'] = 'expected_8' + parsed_kconfig_options['CONFIG_NAME_10'] = 'expected_10' + parsed_kconfig_options['CONFIG_NAME_11'] = '0' + parsed_kconfig_options['CONFIG_NAME_12'] = 'expected_12' # 3. run the engine result = [] @@ -222,5 +240,8 @@ class TestEngine(unittest.TestCase): result, [["CONFIG_NAME_1", "kconfig", "expected_1", "decision_1", "reason_1", "OK"], ["CONFIG_NAME_3", "kconfig", "expected_3", "decision_3", "reason_3", "FAIL: CONFIG_NAME_4 is not \"expected_4\""], - ["CONFIG_NAME_5", "kconfig", "expected_5", "decision_5", "reason_5", "FAIL: \"UNexpected_5\""]] + ["CONFIG_NAME_5", "kconfig", "expected_5", "decision_5", "reason_5", "FAIL: \"UNexpected_5\""], + ["CONFIG_NAME_8", "kconfig", "expected_8", "decision_8", "reason_8", "FAIL: CONFIG_NAME_9 is not present"], + ["CONFIG_NAME_10", "kconfig", "expected_10", "decision_10", "reason_10", "FAIL: CONFIG_NAME_11 is off"], + ["CONFIG_NAME_12", "kconfig", "expected_12", "decision_12", "reason_12", "FAIL: CONFIG_NAME_13 is off, not found"]] )