fix tests

Author: C-likethis123

.gitignore

@@ -31,9 +31,16 @@
 *.out
 *.app
 app/gyt
-tests/tests
 build/**/*
 
+# Tests
+tests/tests
+tests/_deps
+tests/.ninja*
+tests/app/gyt
+tests/Testing
+tests/build.ninja
+
 # CMake files
 *.cmake
 **/CMakeFiles/

doc/commands/branches.md

@@ -0,0 +1,10 @@
+# Branches
+
+A branch:
+- is a ref under ref/heads
+
+# commands that creates branches
+
+`git branch -c`
+`git checkout -b`
+`git switch -c`

src/object.cpp

@@ -97,7 +97,7 @@ std::string GitObject::find(GitRepository &repo, const std::string &name,
                             bool follow) {
   fs::path ref_path;
   std::string ref_name = boost::algorithm::to_lower_copy(name);
-  if (name == "head") {
+  if (ref_name == "head") {
     ref_path = repo.repo_path("HEAD");
   } else if (fs::exists(repo.repo_path("refs/heads/" + ref_name))) {
     ref_path = repo.repo_path("refs/heads/" + ref_name);
@@ -106,7 +106,7 @@ std::string GitObject::find(GitRepository &repo, const std::string &name,
   } else if (fs::exists(repo.repo_path("refs/remotes/" + ref_name))) {
     ref_path = repo.repo_path("refs/remotes/" + ref_name);
   } else if (fs::exists(repo.repo_path(get_commit_path(ref_name)))) {
-    ref_path = repo.repo_path(get_commit_path(ref_name));
+    return ref_name;
   } else {
     throw std::runtime_error(name + ": not a valid reference");
   }

test.sh

@@ -20,19 +20,18 @@ fi
 echo "Selected build type: $BUILD_TYPE" 
 echo "Building the project... This will take a while to install dependencies for the first time."
 
-mv ../tests/gitrepo/.notgit ../tests/gitrepo/.git
+rm -rf ../tests/gitrepo/.git
+cp -R ../tests/gitrepo/.notgit ../tests/gitrepo/.git
 
 #Run CMake with the selected build type
-cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -G Ninja
+cmake .. -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_EXPORT_COMPILE_COMMANDS=1 -DBUILD_TESTS=ON -G Ninja
 
 #Build the project
 ninja
 
 # test
 ctest --output-on-failure
 
-mv ../tests/gitrepo/.git ../tests/gitrepo/.notgit
-
 #symlink - so I can run it like gyt[arguments....]
 sudo rm /usr/local/bin/gyt 
 sudo ln -s "$(pwd)/app/gyt" /usr/local/bin/gyt

tests/CMakeLists.txt

@@ -1,10 +1,9 @@
-add_executable(tests tests.cpp repository_t.cpp tag_t.cpp)
+add_executable(tests tests.cpp repository_t.cpp tag_t.cpp object_t.cpp utils/gitreposetup.cpp)
 target_include_directories(tests PUBLIC ../ext)
 
 target_link_libraries(tests PUBLIC boost_libraries repository commands)
 file(COPY ${CMAKE_SOURCE_DIR}/tests/gitrepo 
-     DESTINATION ${CMAKE_BINARY_DIR}/tests
-     FILES_MATCHING PATTERN ".*" PATTERN "*" EXCLUDE)
+     DESTINATION ${CMAKE_BINARY_DIR}/tests)
 
 # allow user to run tests with `make test` or `ctest`
 include(../cmake/Catch.cmake)

tests/compile_commands.json

@@ -1,18 +1,17 @@
 #include "catch2/catch.hpp"
 #include "object.h"
 #include "repository.h"
+#include "utils/gitreposetup.h"
 
 TEST_CASE("GitObject", "[GitObject::find]") {
   GitRepoSetup gitRepoSetup;
   SECTION("find: resolves a commit") {
     // Provide a path to a valid git repository
     GitRepository repo(".");
 
-    REQUIRE(GitObject::find(repo, "HEAD") == FIRST_COMMIT);
+    REQUIRE(GitObject::find(repo, "HEAD") == SECOND_COMMIT);
     REQUIRE(GitObject::find(repo, SECOND_COMMIT) == SECOND_COMMIT);
     REQUIRE(GitObject::find(repo, "tagv1.0") == SECOND_COMMIT);
-    REQUIRE(GitObject::find(repo, "refs/heads/test_branch") == THIRD_COMMIT);
+    REQUIRE(GitObject::find(repo, "test_branch") == THIRD_COMMIT);
   }
 }
-
-TEST_CASE("GitRepository Create", "[GitRepository]") {}

tests/gitreposetup.cpp

@@ -2,6 +2,7 @@
 #include "catch2/catch.hpp"
 #include "commands/tag.h"
 #include "repository.h"
+#include "utils/gitreposetup.h"
 #include <filesystem>
 #include <fstream>
 
@@ -20,33 +21,6 @@ std::string file_contents(const fs::path &path) {
     throw std::runtime_error("Could not open file: " + path.string());
   }
 }
-const std::string FIRST_COMMIT = "1723ac93b92db1fc2c28de8e5da814136937f8c6";
-const std::string SECOND_COMMIT = "6c2c22e7b5b7b1682e3c14668499e84141aca0d4";
-const std::string THIRD_COMMIT = "ba570884af934a79081499203ba81750a945e3c5";
-const fs::path VALID_GIT_PATH = fs::temp_directory_path() / "gitrepo";
-const fs::path OLD_CWD = fs::current_path();
-const fs::path TEST_FILE_PATH = OLD_CWD / "gitrepo";
-
-/**
-Uses RAII to manage the setup and teardown of a sample Git repo
-*/
-class GitRepoSetup {
-public:
-  GitRepoSetup() { setup(); }
-  ~GitRepoSetup() { teardown(); }
-
-  void setup() {
-    // set up a git repo with an actual commit
-    fs::copy(TEST_FILE_PATH, VALID_GIT_PATH, fs::copy_options::recursive);
-
-    fs::current_path(VALID_GIT_PATH);
-  }
-
-  void teardown() {
-    fs::remove_all(VALID_GIT_PATH);
-    fs::current_path(OLD_CWD);
-  }
-};
 
 TEST_CASE("tag command", "[tag]") {
   GitRepoSetup gitRepoSetup;

tests/object_t.cpp

@@ -0,0 +1,28 @@
+#include "gitreposetup.h"
+#include <filesystem>
+/**
+Uses RAII to manage the setup and teardown of a sample Git repo
+*/
+namespace fs = std::filesystem;
+
+const std::string FIRST_COMMIT = "1723ac93b92db1fc2c28de8e5da814136937f8c6";
+const std::string SECOND_COMMIT = "6c2c22e7b5b7b1682e3c14668499e84141aca0d4";
+const std::string THIRD_COMMIT = "ba570884af934a79081499203ba81750a945e3c5";
+const fs::path VALID_GIT_PATH = fs::temp_directory_path() / "gitrepo";
+const fs::path OLD_CWD = fs::current_path();
+const fs::path TEST_FILE_PATH = OLD_CWD / "gitrepo";
+
+GitRepoSetup::GitRepoSetup() { setup(); }
+GitRepoSetup::~GitRepoSetup() { teardown(); }
+
+void GitRepoSetup::setup() {
+  // set up a git repo with an actual commit
+  fs::copy(TEST_FILE_PATH, VALID_GIT_PATH, fs::copy_options::recursive);
+
+  fs::current_path(VALID_GIT_PATH);
+}
+
+void GitRepoSetup::teardown() {
+  fs::remove_all(VALID_GIT_PATH);
+  fs::current_path(OLD_CWD);
+}

tests/tag_t.cpp

@@ -0,0 +1,26 @@
+#ifndef GITREPOSETUP_H
+#define GITREPOSETUP_H
+
+#include <filesystem>
+
+namespace fs = std::filesystem;
+/**
+Uses RAII to manage the setup and teardown of a sample Git repo
+*/
+extern const std::string FIRST_COMMIT;
+extern const std::string SECOND_COMMIT;
+extern const std::string THIRD_COMMIT;
+extern const fs::path VALID_GIT_PATH;
+extern const fs::path OLD_CWD;
+extern const fs::path TEST_FILE_PATH;
+
+class GitRepoSetup {
+public:
+  GitRepoSetup();
+  ~GitRepoSetup();
+
+  void setup();
+  void teardown();
+};
+
+#endif // GITREPOSETUP_H