Delete unused code, suppress warnings, fix formatting

Author: Vladislav Kalugin

server/src/KleeGenerator.h

@@ -112,13 +112,13 @@ class KleeGenerator {
      * @throws ExecutionProcessException if a Clang call returns non-zero code.
      */
     void parseKTestsToFinalCode(
-        const utbot::ProjectContext &projectContext,
-        tests::Tests &tests,
-        const std::unordered_map<std::string, types::Type> &methodNameToReturnTypeMap,
-        const std::vector<MethodKtests> &kleeOutput,
-        const std::shared_ptr<LineInfo> &lineInfo = nullptr,
-                           bool verbose = false,
-                           ErrorMode errorMode = ErrorMode::FAILING);
+            const utbot::ProjectContext &projectContext,
+            tests::Tests &tests,
+            const std::unordered_map<std::string, types::Type> &methodNameToReturnTypeMap,
+            const std::vector<MethodKtests> &kleeOutput,
+            const std::shared_ptr<LineInfo> &lineInfo = nullptr,
+            bool verbose = false,
+            ErrorMode errorMode = ErrorMode::FAILING);
 
     [[nodiscard]] fs::path getBitcodeFile(const fs::path &sourcePath) const;
 

server/src/Paths.cpp

@@ -125,7 +125,7 @@ namespace Paths {
         return replaceExtension(path, StringUtils::stringFormat(".%s.err", suffix));
     }
 
-    static bool errorFileExists(const fs::path &path, std::string const& suffix) {
+    bool errorFileExists(const fs::path &path, std::string const& suffix) {
         return fs::exists(errorFile(path, suffix));
     }
 

server/src/Paths.h

@@ -42,7 +42,7 @@ namespace Paths {
                           const std::vector<fs::path> &dirNames,
                           const std::function<bool(const fs::path &path)> &filter);
 
-    static bool errorFileExists(const fs::path &path, std::string const& suffix);
+    bool errorFileExists(const fs::path &path, std::string const& suffix);
 
     static inline void setOptPath(fs::path &path, const std::string &value) {
         path = fs::path(value);

server/src/printers/TestsPrinter.cpp

@@ -757,8 +757,8 @@ std::string TestsPrinter::constrVisitorFunctionCall(const Tests::MethodDescripti
     if (testCase.returnValue.view && testCase.returnValue.view->getEntryValue(nullptr) != PrinterUtils::C_NULL) {
         returnPointersCount = methodDescription.returnType.countReturnPointers(true);
     }
-    std::string functionCall = constrFunctionCall(methodDescription.name, methodArgs, "", classObjName, false, returnPointersCount,
-                              castType);
+    std::string functionCall = constrFunctionCall(methodDescription.name, methodArgs, "", classObjName,
+                                                  false, returnPointersCount, castType);
     switch (errorMode) {
         case ErrorMode::PASSING:
             if (testCase.errorInfo.errorType == ErrorType::EXCEPTION_THROWN) {
@@ -769,6 +769,7 @@ std::string TestsPrinter::constrVisitorFunctionCall(const Tests::MethodDescripti
             break;
         case ErrorMode::PASSING_IN_TARGET_ONLY:
             // TODO: generate EXPECT_ANY_THROW and ASSERT_DEATH only if runtime error was in target function
+        default:
             break;
     }
     return functionCall;

server/src/utils/StringFormat.h

@@ -30,16 +30,20 @@ namespace StringUtils {
      * @param args each of elements must either be primitive or have c_str method
      * (e.g. std::string, fs::path and others)
      */
-    template <typename... Args>
-    std::string stringFormat(const std::string &format, Args&&... args) {
-        size_t size = snprintf(nullptr, 0, format.c_str(), internal::extractCString(std::forward<Args>(args))...) + 1; // Extra space for '\0'
+    template<typename... Args>
+    std::string stringFormat(const std::string &format, Args &&... args) {
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wformat-security"
+        size_t size = snprintf(nullptr, 0, format.c_str(), internal::extractCString(std::forward<Args>(args))...) +
+                      1; // Extra space for '\0'
         if (size <= 0) {
             throw std::runtime_error("Error during formatting.");
         }
         formatBuffer.resize(std::max(formatBuffer.size(), size));
         snprintf(formatBuffer.data(), size, format.c_str(), internal::extractCString(std::forward<Args>(args))...);
         return {formatBuffer.begin(), formatBuffer.begin() + size - 1}; // We don't want the '\0' inside
     }
+#pragma GCC diagnostic pop
 }
 
 #endif //UNITTESTBOT_STRINGFORMAT_H

server/src/utils/TraceUtils.cpp

@@ -40,8 +40,7 @@ bool errorInExceptionHeader(const std::string &fileWhereErrorFound) {
 }
 
 [[nodiscard]]ErrorInfo getErrorInfo(const fs::path &path) {
-    if (Paths::errorFileExists(path, "uncaught_exception") ||
-        Paths::errorFileExists(path, "unexpected_exception")) {
+    if (Paths::errorFileExists(path, "uncaught_exception") || Paths::errorFileExists(path, "unexpected_exception")) {
         return {ErrorType::EXCEPTION_THROWN};
     }
     if (Paths::errorFileExists(path, "ptr")) {
@@ -55,25 +54,11 @@ bool errorInExceptionHeader(const std::string &fileWhereErrorFound) {
         }
     }
     if (Paths::errorFileExists(path, "assert")) {
-        ErrorInfo errorInfo;
-        errorInfo.errorType = ErrorType::ASSERTION_FAILURE;
         fs::path errorFilePath = Paths::replaceExtension(path, ".assert.err");
-        errorInfo.failureBody = getTypeOfError(errorFilePath);
-        errorInfo.fileWithFailure = getFileErrorFound(errorFilePath);
-        errorInfo.lineWithFailure = getLineErrorFound(errorFilePath);
-        return errorInfo;
+        return {ErrorType::ASSERTION_FAILURE,
+                getTypeOfError(errorFilePath),
+                getFileErrorFound(errorFilePath),
+                getLineErrorFound(errorFilePath)};
     }
     return {ErrorType::NO_ERROR};
 }
-
-//[[nodiscard]]ErrorInfo hasFailedAssert(const fs::path& path) {
-//    ErrorInfo errorInfo;
-//    if (Paths::errorFileExists(path, "assert")) {
-//        errorInfo.errorType = ErrorType::ASSERTION_FAILURE;
-//        fs::path errorFilePath = Paths::replaceExtension(path, ".assert.err");
-//        errorInfo.assertBody = getTypeOfError(errorFilePath);
-//        errorInfo.fileWithFailure = getFileErrorFound(errorFilePath);
-//        errorInfo.lineWithFailure = getLineErrorFound(errorFilePath);
-//    }
-//    return errorInfo;
-//}