Merge pull request #45 from psx95/makefile-update

Update makefile to add new folder in test
psx95 · Dec 13, 2020 · 1de3d54 · 1de3d54
2 parents e4c3e15 + 5007849
commit 1de3d54
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 12 deletions.
diff --git a/Makefile b/Makefile
@@ -7,7 +7,7 @@ INCLUDE=-I./include/
 TARGET := collaborative_text_editor collaborative_text_editor_test
 
 SOURCE := ./src/crdt/*.cpp ./src/editor/*.cpp ./src/exceptions/*.cpp ./src/networking/*.cpp ./src/version_vector/*.cpp src/ApplicationController.cpp
-TEST_SOURCE := ./tst/*.cpp
+TEST_SOURCE := ./tst/*.cpp ./tst/mock_models/*.cpp
 
 all: $(TARGET)
 

diff --git a/include/EditorContent.hpp b/include/EditorContent.hpp
@@ -111,9 +111,6 @@ class EditorContent {
 
   void InsertTextAtPosition(std::string &text, int position);
 
-  std::string GetStringContent();
-  std::vector<int> &GetLinePositions();
-
 };
 
 #endif //COLLABORATIVE_TEXT_EDITOR_SRC_EDITOR_EDITORCONTENT_HPP_
diff --git a/src/editor/EditorContent.cpp b/src/editor/EditorContent.cpp
@@ -41,14 +41,6 @@ void EditorContent::DeleteCharacterFromCursorPosition(int number_of_characters)
   callbacks->OnLocalDelete(deleted_position);
 }
 
-std::string EditorContent::GetStringContent() {
-
-}
-
-std::vector<int> &EditorContent::GetLinePositions() {
-
-}
-
 void EditorContent::MoveCursorRight() {
   if (this->cursor.GetLineNumber() >= this->text_document.GetNumberOfTotalLines()) {
     return;