not end

Author: Vladislav Kalugin

server/src/ProjectTarget.cpp

@@ -725,3 +725,11 @@ fs::path BuildDatabase::newDirForFile(const fs::path &file) const {
                                                    this->projectContext.projectPath);
     return Paths::createNewDirForFile(file, base, this->serverBuildDir);
 }
+
+CollectionUtils::FileSet BuildDatabase::getSourceFilesForTarget(const std::string &_target) {
+    return CollectionUtils::transformTo<CollectionUtils::FileSet>(
+            getArchiveObjectFiles(_target),
+            [this](fs::path const &objectPath) {
+                return getClientCompilationUnitInfo(objectPath)->getSourcePath();
+            });
+}

server/src/ProjectTarget.h

@@ -203,6 +203,7 @@ class BuildDatabase {
     fs::path buildCommandsJsonPath;
     fs::path linkCommandsJsonPath;
     fs::path compileCommandsJsonPath;
+    std::optional<std::string> target;
     CollectionUtils::MapFileTo<std::vector<std::shared_ptr<ObjectFileInfo>>> sourceFileInfos;
     CollectionUtils::MapFileTo<std::shared_ptr<ObjectFileInfo>> objectFileInfos;
     CollectionUtils::MapFileTo<std::shared_ptr<TargetInfo>> targetInfos;
@@ -227,6 +228,7 @@ class BuildDatabase {
     void mergeLibraryOptions(std::vector<std::string> &jsonArguments) const;
     fs::path newDirForFile(fs::path const& file) const;
     fs::path createExplicitObjectFileCompilationCommand(const std::shared_ptr<ObjectFileInfo> &objectInfo);
+    CollectionUtils::FileSet getSourceFilesForTarget(const std::string &_target);
 
     using sharedLibrariesMap = std::unordered_map<std::string, CollectionUtils::MapFileTo<fs::path>>;
 

server/src/building/BuildDatabase.cpp

@@ -2,7 +2,6 @@
 #define UNITTESTBOT_BASETESTGEN_H
 
 #include "ProjectContext.h"
-#include "ProjectTarget.h"
 #include "SettingsContext.h"
 #include "Tests.h"
 #include "building/BuildDatabase.h"
@@ -33,7 +32,6 @@ class BaseTestGen {
     std::vector<Stubs> synchronizedStubs;
     types::TypeMaps types;
 
-    std::optional<fs::path> targetPath;
     CollectionUtils::FileSet targetSources;
 
     virtual std::string toString() = 0;
@@ -42,9 +40,9 @@ class BaseTestGen {
 
     bool isBatched() const;
 
-    bool hasAutoTarget() const;
-    fs::path const &getTargetPath() const;
-    void setTargetPath(fs::path _targetPath);
+//    bool hasAutoTarget() const;
+//    fs::path const &getTargetPath() const;
+//    void setTargetPath(fs::path _targetPath);
 
     virtual ~BaseTestGen() = default;
 protected:
@@ -55,7 +53,7 @@ class BaseTestGen {
 
     void setInitializedTestsMap();
 
-    virtual void setTargetForSource(fs::path const& sourcePath) = 0;
+//    virtual void setTargetForSource(fs::path const& sourcePath) = 0;
 
     void updateTargetSources();
 };

server/src/building/BuildDatabase.h

@@ -2,7 +2,6 @@
 #define UNITTESTBOT_PROJECTTESTGEN_H
 
 #include "BaseTestGen.h"
-#include "ProjectTarget.h"
 
 #include <optional>
 
@@ -19,7 +18,7 @@ class ProjectTestGen : public BaseTestGen {
 
     const testsgen::ProjectRequest *getRequest() const;
 
-    void setTargetForSource(fs::path const &sourcePath) override;
+//    void setTargetForSource(fs::path const &sourcePath) override;
 
 private:
     testsgen::ProjectRequest const *const request;

server/src/testgens/BaseTestGen.h

@@ -2,7 +2,7 @@
 
 namespace GrpcUtils {
     static const std::string UTBOT_AUTO_TARGET = "UTBot: auto";
-    const std::string UTBOT_AUTO_TARGET_PATH = fs::path("/utbot/auto/target/path");
+//    const std::string UTBOT_AUTO_TARGET_PATH = fs::path("/utbot/auto/target/path");
     static inline const std::string UTBOT_AUTO_TARGET_DESCRIPTION = "Finds any target that contains the code under testing";
 
     std::unique_ptr<testsgen::SnippetRequest>

server/src/testgens/ProjectTestGen.h

@@ -2,7 +2,6 @@
 #define UNITTESTBOT_GRPCUTILS_H
 
 #include "ProjectContext.h"
-#include "ProjectTarget.h"
 #include "utils/path/FileSystemPath.h"
 
 #include <protobuf/testgen.grpc.pb.h>

server/src/utils/GrpcUtils.cpp

@@ -3,7 +3,6 @@
 
 #include "gtest/gtest.h"
 
-#include "ProjectTarget.h"
 #include "Server.h"
 #include "Tests.h"
 #include "coverage/Coverage.h"