UP-18, UP-19 unit tests for circular buffer, some for executor and in…

…sert command

include/document/document.h

@@ -9,9 +9,22 @@
 const int pageWidth = 500;
 const int pageHeight = 1000;
 
+/**
+ * Interface for google mock.
+ * Executor's commands depend on this interface
+ */
+class IDocument {
+   public:
+    virtual void Insert(Glyph::GlyphPtr& glyph) = 0;
+    virtual void Remove(Glyph::GlyphPtr& glyph) = 0;
+    virtual void SelectGlyphs(GlyphContainer::GlyphList& glyphs) = 0;
+    virtual void PasteGlyphs(int x, int y) = 0;
+    virtual void CutGlyphs(GlyphContainer::GlyphList& glyphs) = 0;
+};
+
 class Compositor;
 
-class Document {
+class Document : public IDocument {
    public:
     using PageList = std::list<Page::PagePtr>;
 
@@ -73,4 +86,5 @@ class Document {
     GlyphContainer::GlyphList selectedGlyphs;
 };
 
+
 #endif  // TEXT_EDITOR_DOCUMENT_H_

include/executor/command/insert_character.h

@@ -7,7 +7,7 @@
 
 class InsertCharacter : public ReversibleCommand {
    public:
-    InsertCharacter(Document& doc, int x, int y, int wight, int height,
+    InsertCharacter(IDocument& doc, int x, int y, int wight, int height,
                     char symbol);
 
     InsertCharacter(InsertCharacter&&) = default;
@@ -21,7 +21,7 @@ class InsertCharacter : public ReversibleCommand {
     ~InsertCharacter() override;
 
    private:
-    Document& doc;
+    IDocument& doc;
     Glyph::GlyphPtr character;
 };
 

include/executor/command/remove_character.h

@@ -7,7 +7,7 @@
 
 class RemoveCharacter : public ReversibleCommand {
    public:
-    RemoveCharacter(Document& doc, int x, int y);
+    RemoveCharacter(IDocument& doc, int x, int y);
 
     RemoveCharacter(RemoveCharacter&&) = default;
     RemoveCharacter& operator=(RemoveCharacter&&) = default;
@@ -20,7 +20,7 @@ class RemoveCharacter : public ReversibleCommand {
     ~RemoveCharacter() override;
 
    private:
-    Document& doc;
+    IDocument& doc;
     Glyph::GlyphPtr character;
 };
 

include/executor/utils/circular_buffer.hpp

@@ -11,19 +11,19 @@ class CircularBuffer {
     explicit CircularBuffer(size_t capacity)
         : buffer(std::vector<T>(capacity)),
           capacity(capacity),
-          next_indx(capacity) {}
+          next_index(capacity) {}
 
     bool empty() { return capacity == 0; }
 
     void push(T&& obj) {
-        buffer[next_indx++] = std::move(obj);
+        buffer[next_index++] = std::move(obj);
         ++capacity;
     }
 
-    const T& get_next() { return buffer[next_indx++]; }
+    const T& get_next() { return buffer[next_index++]; }
 
     const T& pop() {
-        auto& v = buffer[--next_indx];
+        auto& v = buffer[--next_index];
         --capacity;
         return v;
     }
@@ -55,6 +55,8 @@ class CircularBuffer {
             return v;
         }
 
+        bool operator==(const int o) { return val == o; }
+
         std::size_t get_value() { return val; }
 
        private:
@@ -88,7 +90,7 @@ class CircularBuffer {
             return v;
         }
 
-        bool operator==(int o) { return val == o; }
+        bool operator==(const int o) { return val == o; }
 
         std::size_t get_value() { return val; }
 
@@ -98,6 +100,6 @@ class CircularBuffer {
     };
 
     std::vector<T> buffer;
-    CircularValue next_indx;  // Index there to push new element
+    CircularValue next_index;  // Index there to push new element
     LimitedValue capacity;    // Current number of elements in circular buffer
 };

main.cpp

@@ -21,11 +21,12 @@ int main() {
     auto document = std::make_shared<Document>();
     document->SetCompositor(std::make_shared<SimpleCompositor>());
 
-    auto controller = std::make_unique<Executor>(5);
+    auto controller = std::make_unique<Executor>(2);
 
     controller->Do(std::make_shared<InsertCharacter>(*document, 0, 0, 10, 10, 'A'));
     controller->Do(std::make_shared<InsertCharacter>(*document, 10, 0, 10, 10, 'B'));
     controller->Do(std::make_shared<InsertCharacter>(*document, 20, 0, 10, 10, 'C'));
+    controller->Do(std::make_shared<InsertCharacter>(*document, 30, 0, 10, 10, 'D'));
     controller->Undo();
     controller->Redo();
 

src/executor/command/insert_character.cpp

@@ -2,7 +2,7 @@
 
 #include "document/glyphs/character.h"
 
-InsertCharacter::InsertCharacter(Document& doc, int x, int y, int width,
+InsertCharacter::InsertCharacter(IDocument& doc, int x, int y, int width,
                                  int height, char symbol)
     : doc(doc),
       character(std::make_shared<Character>(x, y, width, height, symbol))

src/executor/command/remove_character.cpp

@@ -2,7 +2,7 @@
 
 #include "document/glyphs/character.h"
 
-RemoveCharacter::RemoveCharacter(Document& doc, int x, int y)
+RemoveCharacter::RemoveCharacter(IDocument& doc, int x, int y)
     : doc(doc),
       character(std::make_shared<Character>(x, y, 0, 0, 0))  // Constuctor OK?
 {}

test/CMakeLists.txt

@@ -5,4 +5,5 @@ FetchContent_Declare(
 )
 FetchContent_MakeAvailable(googletest)
 
-add_subdirectory(model)
+add_subdirectory(model)
+add_subdirectory(controller)

test/controller/CMakeLists.txt

@@ -0,0 +1,10 @@
+add_executable(circular_buffer_test circular_buffer_tests.cpp)
+target_include_directories(circular_buffer_test PRIVATE ${include_dir})
+target_link_libraries(circular_buffer_test PRIVATE GTest::gtest_main)
+add_test(NAME circular_buffer_test COMMAND circular_buffer_test)
+
+add_executable(executor_test executor_tests.cpp)
+target_link_libraries(executor_test PRIVATE executor document compositor point GTest::gtest_main GTest::gmock_main)
+add_test(NAME executor_test COMMAND executor_test)
+
+set_tests_properties(executor_test PROPERTIES DEPENDS circular_buffer_test)