refactor: remove struct

Author: Samat Gaynutdinov

server/src/Paths.cpp

@@ -278,11 +278,12 @@ namespace Paths {
     //endregion
 
     //region transformation
-    const std::string Extensions::MAKEFILE_EXTENSION = ".mk";
-    const std::string Extensions::TEST_SUFFIX = "_test";
-    const std::string Extensions::STUB_SUFFIX = "_stub";
-    const std::string Extensions::DOT_SEP = "_dot_";
-    const std::string Extensions::MAKE_WRAPPER_SUFFIX = "_wrapper";
+    const std::string MAKEFILE_EXTENSION = ".mk";
+    const std::string TEST_SUFFIX = "_test";
+    const std::string STUB_SUFFIX = "_stub";
+    const std::string DOT_SEP = "_dot_";
+    const std::string MAKE_WRAPPER_SUFFIX = "_wrapper";
+    const char dot = '.';
 
     fs::path sourcePathToTestPath(const utbot::ProjectContext &projectContext,
                                   const fs::path &sourceFilePath) {
@@ -295,7 +296,7 @@ namespace Paths {
         std::string extensionAsSuffix = path.extension().string();
         if (!extensionAsSuffix.empty()) {
             std::string fnWithNewExt =
-                path.stem().string() + Extensions::DOT_SEP + extensionAsSuffix.substr(1) + newExt;
+                path.stem().string() + DOT_SEP + extensionAsSuffix.substr(1) + newExt;
             return path.parent_path() / fnWithNewExt;
         }
         return replaceExtension(path, newExt);
@@ -305,32 +306,32 @@ namespace Paths {
                                                       const std::string &defaultExt) {
         std::string fnWithoutExt = path.stem();
         fs::path fnWithExt;
-        std::size_t posEncodedExtension = fnWithoutExt.rfind(Extensions::DOT_SEP);
+        std::size_t posEncodedExtension = fnWithoutExt.rfind(DOT_SEP);
         if (posEncodedExtension == std::string::npos) {
             // In `sample_class_test.cpp` the `class` is not an extension
             fnWithExt = fnWithoutExt + defaultExt;
         }
         else {
             // In `sample_class_dot_cpp.cpp` the `cpp` is an extension
             fnWithExt = fnWithoutExt.substr(0, posEncodedExtension)
-                        + Extensions::dot
-                        + fnWithoutExt.substr(posEncodedExtension + Extensions::DOT_SEP.length());
+                        + dot
+                        + fnWithoutExt.substr(posEncodedExtension + DOT_SEP.length());
         }
         return path.parent_path() / fs::path(fnWithExt);
     }
 
     fs::path sourcePathToTestName(const fs::path &source) {
         return addSuffix(addOrigExtensionAsSuffixAndAddNew(source, ".cpp"),
-                         Extensions::TEST_SUFFIX).filename();
+                         TEST_SUFFIX).filename();
     }
     fs::path testPathToSourceName(const fs::path &testFilePath) {
-        return restoreExtensionFromSuffix(removeSuffix(testFilePath, Extensions::TEST_SUFFIX), ".c").filename();
+        return restoreExtensionFromSuffix(removeSuffix(testFilePath, TEST_SUFFIX), ".c").filename();
     }
     fs::path sourcePathToStubName(const fs::path &source) {
-        return addSuffix(source, Extensions::STUB_SUFFIX).filename();
+        return addSuffix(source, STUB_SUFFIX).filename();
     }
     fs::path getStubBitcodeFilePath(const fs::path &bitcodeFilePath) {
-        return Paths::addSuffix(bitcodeFilePath, Extensions::STUB_SUFFIX);
+        return Paths::addSuffix(bitcodeFilePath, STUB_SUFFIX);
     }
 
     fs::path sourcePathToStubHeaderPath(const utbot::ProjectContext &projectContext,
@@ -362,15 +363,15 @@ namespace Paths {
         if (!suffix.empty()) {
             addSuffix(makefileDir, suffix);
         }
-        std::string makefileName = replaceExtension(sourceFilePath, Extensions::MAKEFILE_EXTENSION).filename();
+        std::string makefileName = replaceExtension(sourceFilePath, MAKEFILE_EXTENSION).filename();
         return makefileDir / makefileName;
     }
 
     fs::path getStubsMakefilePath(const utbot::ProjectContext &projectContext,
                                   const fs::path &sourceFilePath) {
         fs::path makefileDir = getMakefileDir(projectContext, sourceFilePath);
         std::string makefileName =
-            addExtension(addSuffix(sourceFilePath.stem(), Extensions::STUB_SUFFIX), Extensions::MAKEFILE_EXTENSION);
+            addExtension(addSuffix(sourceFilePath.stem(), STUB_SUFFIX), MAKEFILE_EXTENSION);
         return makefileDir / makefileName;
     }
 
@@ -409,11 +410,11 @@ namespace Paths {
         fs::path sourceFilePath =
             projectContext.projectPath /
             fs::relative(stubPath, getStubsDirPath(projectContext));
-        return removeSuffix(sourceFilePath, Extensions::STUB_SUFFIX);
+        return removeSuffix(sourceFilePath, STUB_SUFFIX);
     }
 
     bool isHeadersEqual(const fs::path &srcPath, const fs::path &headerPath) {
-        return removeSuffix(srcPath, Extensions::STUB_SUFFIX).stem() == headerPath.stem();
+        return removeSuffix(srcPath, STUB_SUFFIX).stem() == headerPath.stem();
     }
     fs::path getUtbotBuildDir(const utbot::ProjectContext &projectContext) {
         return projectContext.buildDir / CompilationUtils::UTBOT_BUILD_DIR_NAME;

server/src/Paths.h

@@ -318,14 +318,12 @@ namespace Paths {
     //endregion
 
     //region transformations
-    struct Extensions {
-        static const std::string MAKEFILE_EXTENSION;
-        static const std::string TEST_SUFFIX;
-        static const std::string STUB_SUFFIX;
-        static const std::string DOT_SEP;
-        static const std::string MAKE_WRAPPER_SUFFIX;
-        static const char dot = '.';
-    };
+    extern const std::string MAKEFILE_EXTENSION;
+    extern const std::string TEST_SUFFIX;
+    extern const std::string STUB_SUFFIX;
+    extern const std::string DOT_SEP;
+    extern const std::string MAKE_WRAPPER_SUFFIX;
+    extern const char dot;
 
     fs::path sourcePathToTestPath(const utbot::ProjectContext &projectContext, const fs::path &sourceFilePath);
 

server/test/framework/CLI_Tests.cpp

@@ -80,8 +80,8 @@ namespace {
             FileSystemUtils::RecursiveDirectoryIterator directoryIterator(getTestDirectory());
             for (auto &&it : directoryIterator) {
                 if (!it.is_regular_file() ||
-                it.path().extension() == Paths::Extensions::MAKEFILE_EXTENSION ||
-                StringUtils::endsWith(Paths::removeExtension(it.path().filename()).string(), Paths::Extensions::MAKE_WRAPPER_SUFFIX)) {
+                it.path().extension() == Paths::MAKEFILE_EXTENSION ||
+                StringUtils::endsWith(Paths::removeExtension(it.path().filename()).string(), Paths::MAKE_WRAPPER_SUFFIX)) {
                     continue;
                 }
                 EXPECT_TRUE(Paths::isSubPathOf(getStubsDirectory(), it.path()) ||