added unit tests for sarif and ran uncrustify

Nettozx · Nettozx · commit 9a402a854861 · 2025-07-02T13:38:31.000-07:00
diff --git a/Makefile b/Makefile
@@ -171,7 +171,7 @@ ifndef INCLUDE_FOR_CLI
 endif
 
 ifndef INCLUDE_FOR_TEST
-    INCLUDE_FOR_TEST=-Ilib -Ifrontend -Icli -isystem externals/simplecpp -isystem externals/tinyxml2
+    INCLUDE_FOR_TEST=-Ilib -Ifrontend -Icli -isystem externals/simplecpp -isystem externals/tinyxml2 -isystem externals/picojson
 endif
 
 BIN=$(DESTDIR)$(PREFIX)/bin
@@ -316,6 +316,7 @@ TESTOBJ =     test/fixture.o \
               test/testpreprocessor.o \
               test/testprocessexecutor.o \
               test/testprogrammemory.o \
+              test/testsarif.o \
               test/testsettings.o \
               test/testsimplifytemplate.o \
               test/testsimplifytokens.o \
@@ -834,6 +835,9 @@ test/testprocessexecutor.o: test/testprocessexecutor.cpp cli/executor.h cli/proc
 test/testprogrammemory.o: test/testprogrammemory.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/programmemory.h lib/settings.h lib/standards.h lib/templatesimplifier.h lib/token.h lib/tokenize.h lib/tokenlist.h lib/utils.h lib/vfvalue.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testprogrammemory.cpp
 
+test/testsarif.o: test/testsarif.cpp lib/config.h lib/json.h test/fixture.h test/helpers.h
+	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsarif.cpp
+
 test/testsettings.o: test/testsettings.cpp lib/addoninfo.h lib/check.h lib/checkers.h lib/color.h lib/config.h lib/errorlogger.h lib/errortypes.h lib/library.h lib/mathlib.h lib/path.h lib/platform.h lib/settings.h lib/standards.h lib/suppressions.h lib/tokenize.h lib/tokenlist.h lib/utils.h test/fixture.h test/helpers.h
 	$(CXX) ${INCLUDE_FOR_TEST} $(CPPFLAGS) $(CXXFLAGS) -c -o $@ test/testsettings.cpp
 
diff --git a/cli/cppcheckexecutor.cpp b/cli/cppcheckexecutor.cpp
diff --git a/lib/checkersreport.cpp b/lib/checkersreport.cpp
@@ -193,11 +193,11 @@ std::string CheckersReport::getReport(const std::string& criticalErrors) const
     const bool cppcheckPremium = isCppcheckPremium(mSettings);
 
     auto reportSection = [&fout, cppcheckPremium]
-                         (const std::string& title,
-                          const Settings& settings,
-                          const std::set<std::string>& activeCheckers,
-                          const std::map<std::string, std::string>& premiumCheckers,
-                          const std::string& substring) {
+                             (const std::string& title,
+                             const Settings& settings,
+                             const std::set<std::string>& activeCheckers,
+                             const std::map<std::string, std::string>& premiumCheckers,
+                             const std::string& substring) {
         fout << std::endl << std::endl;
         fout << title << std::endl;
         fout << std::string(title.size(), '-') << std::endl;
diff --git a/lib/clangimport.cpp b/lib/clangimport.cpp
@@ -1499,12 +1499,12 @@ void clangimport::AstNode::createTokensForCXXRecord(TokenList &tokenList)
         std::vector<AstNodePtr> children2;
         std::copy_if(children.cbegin(), children.cend(), std::back_inserter(children2), [](const AstNodePtr& child) {
             return child->nodeType == CXXConstructorDecl ||
-                   child->nodeType == CXXDestructorDecl ||
-                   child->nodeType == CXXMethodDecl ||
-                   child->nodeType == FieldDecl ||
-                   child->nodeType == VarDecl ||
-                   child->nodeType == AccessSpecDecl ||
-                   child->nodeType == TypedefDecl;
+            child->nodeType == CXXDestructorDecl ||
+            child->nodeType == CXXMethodDecl ||
+            child->nodeType == FieldDecl ||
+            child->nodeType == VarDecl ||
+            child->nodeType == AccessSpecDecl ||
+            child->nodeType == TypedefDecl;
         });
         Scope *scope = createScope(tokenList, isStruct ? ScopeType::eStruct : ScopeType::eClass, children2, classToken);
         const std::string addr = mExtTokens[0];
diff --git a/lib/symboldatabase.cpp b/lib/symboldatabase.cpp
@@ -5767,11 +5767,11 @@ static bool hasMatchingConstructor(const Scope* classScope, const ValueType* arg
             return false;
         const ValueType* vt = f.getArgumentVar(0)->valueType();
         return vt &&
-               vt->type == argType->type &&
-               (argType->sign == ValueType::Sign::UNKNOWN_SIGN || vt->sign == argType->sign) &&
-               vt->pointer == argType->pointer &&
-               (vt->constness & 1) >= (argType->constness & 1) &&
-               (vt->volatileness & 1) >= (argType->volatileness & 1);
+        vt->type == argType->type &&
+        (argType->sign == ValueType::Sign::UNKNOWN_SIGN || vt->sign == argType->sign) &&
+        vt->pointer == argType->pointer &&
+        (vt->constness & 1) >= (argType->constness & 1) &&
+        (vt->volatileness & 1) >= (argType->volatileness & 1);
     });
 }
 
diff --git a/lib/token.cpp b/lib/token.cpp
@@ -2541,7 +2541,7 @@ bool Token::hasKnownSymbolicValue(const Token* tok) const
     return mImpl->mValues &&
            std::any_of(mImpl->mValues->begin(), mImpl->mValues->end(), [&](const ValueFlow::Value& value) {
         return value.isKnown() && value.isSymbolicValue() && value.tokvalue &&
-               value.tokvalue->exprId() == tok->exprId();
+        value.tokvalue->exprId() == tok->exprId();
     });
 }
 
@@ -2614,7 +2614,7 @@ const ValueFlow::Value* Token::getMovedValue() const
         return nullptr;
     const auto it = std::find_if(mImpl->mValues->begin(), mImpl->mValues->end(), [](const ValueFlow::Value& value) {
         return value.isMovedValue() && !value.isImpossible() &&
-               value.moveKind != ValueFlow::Value::MoveKind::NonMovedVariable;
+        value.moveKind != ValueFlow::Value::MoveKind::NonMovedVariable;
     });
     return it == mImpl->mValues->end() ? nullptr : &*it;
 }
diff --git a/lib/tokenize.cpp b/lib/tokenize.cpp
@@ -10930,10 +10930,10 @@ bool Tokenizer::hasIfdef(const Token *start, const Token *end) const
     const auto& directives = mDirectives;
     return std::any_of(directives.cbegin(), directives.cend(), [&](const Directive& d) {
         return startsWith(d.str, "#if") &&
-               d.linenr >= start->linenr() &&
-               d.linenr <= end->linenr() &&
-               start->fileIndex() < list.getFiles().size() &&
-               d.file == list.getFiles()[start->fileIndex()];
+        d.linenr >= start->linenr() &&
+        d.linenr <= end->linenr() &&
+        start->fileIndex() < list.getFiles().size() &&
+        d.file == list.getFiles()[start->fileIndex()];
     });
 }
 
diff --git a/lib/valueflow.cpp b/lib/valueflow.cpp
@@ -2760,7 +2760,7 @@ static void valueFlowLifetimeFunction(Token *tok, const TokenList &tokenlist, Er
                 const Token* varTok = args[iArg - 1];
                 if (varTok->variable() && varTok->variable()->isLocal())
                     LifetimeStore{ varTok, "Passed to '" + tok->str() + "'.", ValueFlow::Value::LifetimeKind::Address }.byRef(
-                        tok->next(), tokenlist, errorLogger, settings);
+                    tok->next(), tokenlist, errorLogger, settings);
             }
         }
     }
diff --git a/lib/vf_settokenvalue.cpp b/lib/vf_settokenvalue.cpp
@@ -528,7 +528,7 @@ namespace ValueFlow
                                                        args2.begin(),
                                                        [&](const Token* atok, const Token* btok) {
                                         return atok->getKnownIntValue() ==
-                                               btok->getKnownIntValue();
+                                        btok->getKnownIntValue();
                                     });
                                 } else {
                                     equal = false;
diff --git a/samples/passedByValue_1/bad.cpp b/samples/passedByValue_1/bad.cpp
@@ -2,9 +2,8 @@ class C
 {
 public:
     explicit C(std::string s)
-    : _s(s)
-    {
-    }
+        : _s(s)
+    {}
     void foo();
 private:
     std::string _s;
diff --git a/samples/passedByValue_1/good.cpp b/samples/passedByValue_1/good.cpp
@@ -2,9 +2,8 @@ class C
 {
 public:
     explicit C(std::string s)
-    : _s(std::move(s))
-    {
-    }
+        : _s(std::move(s))
+    {}
     void foo();
 private:
     std::string _s;
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
@@ -20,6 +20,7 @@ if (BUILD_TESTS)
         target_include_directories(testrunner SYSTEM PRIVATE ${tinyxml2_INCLUDE_DIRS})
     endif()
     target_externals_include_directories(testrunner PRIVATE ${PROJECT_SOURCE_DIR}/externals/simplecpp/)
+    target_externals_include_directories(testrunner PRIVATE ${PROJECT_SOURCE_DIR}/externals/picojson/)
     if (HAVE_RULES)
         target_link_libraries(testrunner ${PCRE_LIBRARY})
     endif()
diff --git a/test/cfg/boost.cpp b/test/cfg/boost.cpp
@@ -141,8 +141,8 @@ void test_BOOST_FOREACH_3(std::vector<int> data)
 void test_BOOST_FOREACH_4(std::vector<int> data)
 {
     BOOST_FOREACH(const int& i, data)
-        // cppcheck-suppress invalidContainerLoop
-        data.clear();
+    // cppcheck-suppress invalidContainerLoop
+    data.clear();
 }
 
 // Container returned as result of a function -> Be quiet
@@ -151,7 +151,7 @@ void test_BOOST_FOREACH_5()
 {
     std::set<int> data;
     BOOST_FOREACH(const int& i, get_data())
-        data.insert(i);
+    data.insert(i);
 }
 
 // Break after modification (#4788)
diff --git a/test/cfg/googletest.cpp b/test/cfg/googletest.cpp
@@ -33,13 +33,11 @@ namespace ExampleNamespace {
 
     // syntaxError when TYPED_TEST is not known
     TYPED_TEST (ExampleTypedTest, cppcheck_test)
-    {
-    }
+    {}
 
     // syntaxError when TYPED_TEST_P is not known
     TYPED_TEST_P (ExampleTypedTestP, cppcheck)
-    {
-    }
+    {}
 }
 
 TEST(ASSERT, ASSERT)
diff --git a/test/cfg/gtk.c b/test/cfg/gtk.c
@@ -488,11 +488,11 @@ void g_variant_test() {
     g_variant_builder_add(&builder, "{sv}", "UInt32", g_variant_new_uint32(32));
     g_variant_builder_add(&builder, "{sv}", "UInt64", g_variant_new_uint64(64));
     g_variant_builder_add(&builder, "{sv}", "Boolean",
-                            g_variant_new_boolean(TRUE));
+                          g_variant_new_boolean(TRUE));
     g_variant_builder_add(&builder, "{sv}", "TakenString",
-                            g_variant_new_take_string(g_strdup("Owned string")));
+                          g_variant_new_take_string(g_strdup("Owned string")));
     g_variant_builder_add(&builder, "{sv}", "PrintfString",
-                            g_variant_new_printf("Formatted %d", 1));
+                          g_variant_new_printf("Formatted %d", 1));
     g_variant_builder_add_value(
         &builder, g_variant_new("{sv}", "String",
                                 g_variant_new_string("Owned string 2")));
diff --git a/test/cfg/kde.cpp b/test/cfg/kde.cpp
@@ -49,7 +49,7 @@ class PluginWithoutMetaData : public QObject
 public:
     // Add a default arg to make sure we do not get an ambiguity compiler error
     explicit PluginWithoutMetaData(const QObject *, const QVariantList &args = {})
-    : QObject()
+        : QObject()
     {
         Q_UNUSED(args)
     };
@@ -64,7 +64,7 @@ class StaticSimplePluginClass : public QObject
 public:
     // Next to the assertion below, ensure that we have no ambiguity!
     explicit StaticSimplePluginClass(QObject *parent, const QString &data = {})
-    : QObject(parent)
+        : QObject(parent)
     {
         // We have added a default arg, but KPluginFactory should still provide the valid metadata instead of the default one
         data = QString("foo");
diff --git a/test/cfg/qt.cpp b/test/cfg/qt.cpp
@@ -852,5 +852,5 @@ int qdateIsValid()
 {
     QDate qd(1,1,2025);
     Q_ASSERT(qd.isValid()); // Should not warn here with assertWithSideEffect
-    return qd.month(); 
+    return qd.month();
 }
diff --git a/test/cfg/std.cpp b/test/cfg/std.cpp
@@ -83,12 +83,12 @@ int ignoredReturnValue_std_clamp(const int x)
 void knownConditionTrueFalse_std_clamp(const int x)
 {
     // cppcheck-suppress knownConditionTrueFalse
-    if(std::clamp(-2, -1, 1) == -1){}
+    if (std::clamp(-2, -1, 1) == -1) {}
     // cppcheck-suppress knownConditionTrueFalse
-    if(std::clamp(2, -1, 1) == 1){}
+    if (std::clamp(2, -1, 1) == 1) {}
     // cppcheck-suppress knownConditionTrueFalse
-    if(std::clamp(0, -1, 1) == 0){}
-    if(std::clamp(x, 0, 2)){}
+    if (std::clamp(0, -1, 1) == 0) {}
+    if (std::clamp(x, 0, 2)) {}
 }
 #endif // __cpp_lib_clamp
 
diff --git a/test/cfg/windows.cpp b/test/cfg/windows.cpp
@@ -1211,8 +1211,6 @@ void SEH_knownConditionTrueFalse() { // #8434
 }
 
 void SEH_unusedLabel() { // #13233
-    __try {
-    }
-    __finally {
-    }
+    __try {}
+    __finally {}
 }
diff --git a/test/testerrorlogger.cpp b/test/testerrorlogger.cpp
@@ -315,7 +315,7 @@ class TestErrorLogger : public TestFixture {
     }
 
     #define testReportType(reportType, severity, errorId, expectedClassification, expectedGuideline) \
-        testReportType_(__FILE__, __LINE__, reportType, severity, errorId, expectedClassification, expectedGuideline)
+    testReportType_(__FILE__, __LINE__, reportType, severity, errorId, expectedClassification, expectedGuideline)
     void testReportType_(const char *file, int line, ReportType reportType, Severity severity, const std::string &errorId,
                          const std::string &expectedClassification, const std::string &expectedGuideline) const
     {
diff --git a/test/testsarif.cpp b/test/testsarif.cpp

Original file line number	Diff line number	Diff line change
`@@ -2760,7 +2760,7 @@ static void valueFlowLifetimeFunction(Token *tok, const TokenList &tokenlist, Er`
`2760`	`2760`	`const Token* varTok = args[iArg - 1];`
`2761`	`2761`	`if (varTok->variable() && varTok->variable()->isLocal())`
`2762`	`2762`	`LifetimeStore{ varTok, "Passed to '" + tok->str() + "'.", ValueFlow::Value::LifetimeKind::Address }.byRef(`
`2763`		`- tok->next(), tokenlist, errorLogger, settings);`
	`2763`	`+ tok->next(), tokenlist, errorLogger, settings);`
`2764`	`2764`	`}`
`2765`	`2765`	`}`
`2766`	`2766`	`}`