test/cli/test-other.py: re-enable and implement namingng unit test

mvds00 · mvds00 · commit e5e39b929b53 · 2023-12-25T02:52:44.000+01:00
diff --git a/test/cli/test-other.py b/test/cli/test-other.py
@@ -308,25 +308,83 @@ def test_addon_naming(tmpdir):
     assert stderr == '{}:2:1: style: Variable Var violates naming convention [naming-varname]\n'.format(test_file)
 
 
-# the namingng addon only works standalone and not in CLI mode - see #12005
-@pytest.mark.skip
 def test_addon_namingng(tmpdir):
-    test_file = os.path.join(tmpdir, 'test.cpp')
-    # TODO: trigger warning
+    addon_file = os.path.join(tmpdir, 'namingng.json')
+    addon_config_file = os.path.join(tmpdir, 'namingng.config.json')
+    with open(addon_file, 'wt') as f:
+        f.write("""
+{
+    "script": "addons/namingng.py",
+    "args": [
+        "--configfile=%s"
+    ]
+}
+                """%(addon_config_file).replace('\\','\\\\'))
+
+    with open(addon_config_file, 'wt') as f:
+        f.write("""
+{
+    "RE_FILE": [
+        "[^/]*[a-z][a-z0-9_]*[a-z0-9]\\.c\\Z"
+    ],
+    "RE_VARNAME": ["[a-z]*[a-z0-9_]*[a-z0-9]\\Z"],
+    "RE_FUNCTIONNAME": ["[a-z][a-z0-9_]*[a-z0-9]\\Z"],
+    "var_prefixes": {"uint32_t": "ui32"},
+    "function_prefixes": {"uint16_t": "ui16",
+                          "uint32_t": "ui32"},
+    "skip_one_char_variables": false
+}
+                """.replace('\\','\\\\'))
+
+    test_file_basename = 'test_.c'
+    test_file = os.path.join(tmpdir, test_file_basename)
     with open(test_file, 'wt') as f:
         f.write("""
-typedef int MISRA_5_6_VIOLATION;
+void InvalidFunction();
+void invalid_function_();
+void _invalid_function();
+void valid_function1();
+void valid_function2(int _invalid_arg);
+void valid_function3(int invalid_arg_);
+void valid_function4(int valid_arg32);
+void valid_function5(uint32_t invalid_arg32);
+void valid_function6(uint32_t ui32_valid_arg);
+uint16_t invalid_function7(int valid_arg);
+uint16_t ui16_valid_function8(int valid_arg);
         """)
 
-    args = ['--addon=namingng', '--enable=all', test_file]
+    args = ['--addon='+addon_file, '--verbose', '--enable=all', test_file]
 
     exitcode, stdout, stderr = cppcheck(args)
     assert exitcode == 0
     lines = stdout.splitlines()
     assert lines == [
-        'Checking {} ...'.format(test_file)
+        'Checking {} ...'.format(test_file),
+        'Defines:',
+        'Undefines:',
+        'Includes:',
+        'Platform:native'
     ]
-    assert stderr == ''
+    lines = [line for line in stderr.splitlines() if line.strip() != '^' and line != '']
+    expect = [
+        '{}:0:0: style: File name {} violates naming convention [namingng-namingConvention]'.format(test_file,test_file_basename),
+        '{}:7:0: style: Variable invalid_arg_ violates naming convention [namingng-namingConvention]'.format(test_file),
+        'void valid_function3(int invalid_arg_);',
+        '{}:9:22: style: Variable invalid_arg32 violates naming convention [namingng-namingConvention]'.format(test_file),
+        'void valid_function5(uint32_t invalid_arg32);',
+        '{}:2:0: style: Function InvalidFunction violates naming convention [namingng-namingConvention]'.format(test_file),
+        'void InvalidFunction();',
+        '{}:3:0: style: Function invalid_function_ violates naming convention [namingng-namingConvention]'.format(test_file),
+        'void invalid_function_();',
+        '{}:4:0: style: Function _invalid_function violates naming convention [namingng-namingConvention]'.format(test_file),
+        'void _invalid_function();',
+        '{}:11:10: style: Function invalid_function7 violates naming convention [namingng-namingConvention]'.format(test_file),
+        'uint16_t invalid_function7(int valid_arg);',
+    ]
+    # test sorted lines; the order of messages may vary and is not of importance
+    lines.sort()
+    expect.sort()
+    assert lines == expect
 
 
 def test_addon_findcasts(tmpdir):
