Refactor runner: Move evaluator package to runner/

ia-toki · Jul 25, 2017 · d76baed · d76baed
1 parent 06c55ab
commit d76baed
Show file tree

Hide file tree

Showing 49 changed files with 98 additions and 97 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -42,24 +42,6 @@ include_directories("${source_dir}/googlemock/include")
 include_directories(include)
 
 set(INCLUDE
-        include/tcframe/evaluator.hpp
-        include/tcframe/evaluator/BatchEvaluator.hpp
-        include/tcframe/evaluator/EvaluationOptions.hpp
-        include/tcframe/evaluator/EvaluationResult.hpp
-        include/tcframe/evaluator/Evaluator.hpp
-        include/tcframe/evaluator/EvaluatorConfig.hpp
-        include/tcframe/evaluator/EvaluatorHelperRegistry.hpp
-        include/tcframe/evaluator/EvaluatorRegistry.hpp
-        include/tcframe/evaluator/InteractiveEvaluator.hpp
-        include/tcframe/evaluator/GenerationResult.hpp
-        include/tcframe/evaluator/communicator.hpp
-        include/tcframe/evaluator/communicator/CommunicationResult.hpp
-        include/tcframe/evaluator/communicator/Communicator.hpp
-        include/tcframe/evaluator/scorer.hpp
-        include/tcframe/evaluator/scorer/CustomScorer.hpp
-        include/tcframe/evaluator/scorer/DiffScorer.hpp
-        include/tcframe/evaluator/scorer/Scorer.hpp
-        include/tcframe/evaluator/scorer/ScoringResult.hpp
         include/tcframe/logger.hpp
         include/tcframe/logger/BaseLogger.hpp
         include/tcframe/logger/DefaultBaseLogger.hpp
@@ -75,6 +57,24 @@ set(INCLUDE
         include/tcframe/runner/aggregator/AggregatorRegistry.hpp
         include/tcframe/runner/aggregator/MinAggregator.hpp
         include/tcframe/runner/aggregator/SumAggregator.hpp
+        include/tcframe/runner/evaluator.hpp
+        include/tcframe/runner/evaluator/BatchEvaluator.hpp
+        include/tcframe/runner/evaluator/EvaluationOptions.hpp
+        include/tcframe/runner/evaluator/EvaluationResult.hpp
+        include/tcframe/runner/evaluator/Evaluator.hpp
+        include/tcframe/runner/evaluator/EvaluatorConfig.hpp
+        include/tcframe/runner/evaluator/EvaluatorHelperRegistry.hpp
+        include/tcframe/runner/evaluator/EvaluatorRegistry.hpp
+        include/tcframe/runner/evaluator/InteractiveEvaluator.hpp
+        include/tcframe/runner/evaluator/GenerationResult.hpp
+        include/tcframe/runner/evaluator/communicator.hpp
+        include/tcframe/runner/evaluator/communicator/CommunicationResult.hpp
+        include/tcframe/runner/evaluator/communicator/Communicator.hpp
+        include/tcframe/runner/evaluator/scorer.hpp
+        include/tcframe/runner/evaluator/scorer/CustomScorer.hpp
+        include/tcframe/runner/evaluator/scorer/DiffScorer.hpp
+        include/tcframe/runner/evaluator/scorer/Scorer.hpp
+        include/tcframe/runner/evaluator/scorer/ScoringResult.hpp
         include/tcframe/runner/grader.hpp
         include/tcframe/runner/grader/BriefGraderLogger.hpp
         include/tcframe/runner/grader/DefaultGraderLogger.hpp
@@ -158,14 +158,6 @@ set(INCLUDE
 set(TEST_UNIT
         test/unit/tcframe/helper.hpp
         test/unit/tcframe/mock.hpp
-        test/unit/tcframe/evaluator/BatchEvaluatorTests.cpp
-        test/unit/tcframe/evaluator/InteractiveEvaluatorTests.cpp
-        test/unit/tcframe/evaluator/MockEvaluator.hpp
-        test/unit/tcframe/evaluator/MockEvaluatorRegistry.hpp
-        test/unit/tcframe/evaluator/communicator/CommunicatorTests.cpp
-        test/unit/tcframe/evaluator/communicator/MockCommunicator.hpp
-        test/unit/tcframe/evaluator/scorer/CustomScorerTests.cpp
-        test/unit/tcframe/evaluator/scorer/MockScorer.hpp
         test/unit/tcframe/logger/DefaultBaseLogggerTests.cpp
         test/unit/tcframe/logger/MockLoggerEngine.hpp
         test/unit/tcframe/logger/SimpleLoggerEngineTests.cpp
@@ -174,6 +166,14 @@ set(TEST_UNIT
         test/unit/tcframe/runner/aggregator/MockAggregator.hpp
         test/unit/tcframe/runner/aggregator/MockAggregatorRegistry.hpp
         test/unit/tcframe/runner/aggregator/SumAggregatorTests.cpp
+        test/unit/tcframe/runner/evaluator/BatchEvaluatorTests.cpp
+        test/unit/tcframe/runner/evaluator/InteractiveEvaluatorTests.cpp
+        test/unit/tcframe/runner/evaluator/MockEvaluator.hpp
+        test/unit/tcframe/runner/evaluator/MockEvaluatorRegistry.hpp
+        test/unit/tcframe/runner/evaluator/communicator/CommunicatorTests.cpp
+        test/unit/tcframe/runner/evaluator/communicator/MockCommunicator.hpp
+        test/unit/tcframe/runner/evaluator/scorer/CustomScorerTests.cpp
+        test/unit/tcframe/runner/evaluator/scorer/MockScorer.hpp
         test/unit/tcframe/runner/generator/DefaultGeneratorLoggerTests.cpp
         test/unit/tcframe/runner/generator/GeneratorTests.cpp
         test/unit/tcframe/runner/generator/MockGenerator.hpp
@@ -245,9 +245,9 @@ target_link_libraries(test_unit
 )
 
 set(TEST_INTEGRATION
-        test/integration/tcframe/evaluator/communicator/CommunicatorIntegrationTests.cpp
-        test/integration/tcframe/evaluator/scorer/CustomScorerIntegrationTests.cpp
-        test/integration/tcframe/evaluator/scorer/DiffScorerIntegrationTests.cpp
+        test/integration/tcframe/runner/evaluator/communicator/CommunicatorIntegrationTests.cpp
+        test/integration/tcframe/runner/evaluator/scorer/CustomScorerIntegrationTests.cpp
+        test/integration/tcframe/runner/evaluator/scorer/DiffScorerIntegrationTests.cpp
         test/integration/tcframe/os/OperatingSystemIntegrationTests.cpp
 )
 

diff --git a/include/tcframe/evaluator.hpp b/include/tcframe/evaluator.hpp
diff --git a/include/tcframe/evaluator/communicator.hpp b/include/tcframe/evaluator/communicator.hpp
diff --git a/include/tcframe/evaluator/scorer.hpp b/include/tcframe/evaluator/scorer.hpp
diff --git a/include/tcframe/runner.hpp b/include/tcframe/runner.hpp
@@ -2,6 +2,7 @@
 
 #include "tcframe/runner/aggregator.hpp"
 #include "tcframe/runner/core.hpp"
+#include "tcframe/runner/evaluator.hpp"
 #include "tcframe/runner/generator.hpp"
 #include "tcframe/runner/grader.hpp"
 #include "tcframe/runner/logger.hpp"
diff --git a/include/tcframe/runner/core/Runner.hpp b/include/tcframe/runner/core/Runner.hpp
@@ -5,9 +5,9 @@
 #include "Args.hpp"
 #include "ArgsParser.hpp"
 #include "SlugParser.hpp"
-#include "tcframe/evaluator.hpp"
 #include "tcframe/os.hpp"
 #include "tcframe/runner/aggregator.hpp"
+#include "tcframe/runner/evaluator.hpp"
 #include "tcframe/runner/generator.hpp"
 #include "tcframe/runner/grader.hpp"
 #include "tcframe/runner/logger.hpp"

diff --git a/include/tcframe/runner/evaluator.hpp b/include/tcframe/runner/evaluator.hpp
@@ -0,0 +1,13 @@
+#pragma once
+
+#include "tcframe/runner/evaluator/BatchEvaluator.hpp"
+#include "tcframe/runner/evaluator/EvaluationOptions.hpp"
+#include "tcframe/runner/evaluator/EvaluationResult.hpp"
+#include "tcframe/runner/evaluator/Evaluator.hpp"
+#include "tcframe/runner/evaluator/EvaluatorConfig.hpp"
+#include "tcframe/runner/evaluator/EvaluatorHelperRegistry.hpp"
+#include "tcframe/runner/evaluator/EvaluatorRegistry.hpp"
+#include "tcframe/runner/evaluator/GenerationResult.hpp"
+#include "tcframe/runner/evaluator/InteractiveEvaluator.hpp"
+#include "tcframe/runner/evaluator/communicator.hpp"
+#include "tcframe/runner/evaluator/scorer.hpp"
diff --git a/include/tcframe/evaluator/BatchEvaluator.hpp → ...frame/runner/evaluator/BatchEvaluator.hpp b/include/tcframe/evaluator/BatchEvaluator.hpp → ...frame/runner/evaluator/BatchEvaluator.hpp
diff --git a/...e/tcframe/evaluator/EvaluationOptions.hpp → ...me/runner/evaluator/EvaluationOptions.hpp b/...e/tcframe/evaluator/EvaluationOptions.hpp → ...me/runner/evaluator/EvaluationOptions.hpp
diff --git a/...de/tcframe/evaluator/EvaluationResult.hpp → ...ame/runner/evaluator/EvaluationResult.hpp b/...de/tcframe/evaluator/EvaluationResult.hpp → ...ame/runner/evaluator/EvaluationResult.hpp
diff --git a/include/tcframe/evaluator/Evaluator.hpp → ...de/tcframe/runner/evaluator/Evaluator.hpp b/include/tcframe/evaluator/Evaluator.hpp → ...de/tcframe/runner/evaluator/Evaluator.hpp
diff --git a/...ude/tcframe/evaluator/EvaluatorConfig.hpp → ...rame/runner/evaluator/EvaluatorConfig.hpp b/...ude/tcframe/evaluator/EvaluatorConfig.hpp → ...rame/runner/evaluator/EvaluatorConfig.hpp
diff --git a/...ame/evaluator/EvaluatorHelperRegistry.hpp → ...ner/evaluator/EvaluatorHelperRegistry.hpp b/...ame/evaluator/EvaluatorHelperRegistry.hpp → ...ner/evaluator/EvaluatorHelperRegistry.hpp
diff --git a/...e/tcframe/evaluator/EvaluatorRegistry.hpp → ...me/runner/evaluator/EvaluatorRegistry.hpp b/...e/tcframe/evaluator/EvaluatorRegistry.hpp → ...me/runner/evaluator/EvaluatorRegistry.hpp
diff --git a/...de/tcframe/evaluator/GenerationResult.hpp → ...ame/runner/evaluator/GenerationResult.hpp b/...de/tcframe/evaluator/GenerationResult.hpp → ...ame/runner/evaluator/GenerationResult.hpp
diff --git a/...cframe/evaluator/InteractiveEvaluator.hpp → ...runner/evaluator/InteractiveEvaluator.hpp b/...cframe/evaluator/InteractiveEvaluator.hpp → ...runner/evaluator/InteractiveEvaluator.hpp
diff --git a/include/tcframe/runner/evaluator/communicator.hpp b/include/tcframe/runner/evaluator/communicator.hpp
@@ -0,0 +1,4 @@
+#pragma once
+
+#include "tcframe/runner/evaluator/communicator/CommunicationResult.hpp"
+#include "tcframe/runner/evaluator/communicator/Communicator.hpp"
diff --git a/...ator/communicator/CommunicationResult.hpp → ...ator/communicator/CommunicationResult.hpp b/...ator/communicator/CommunicationResult.hpp → ...ator/communicator/CommunicationResult.hpp
diff --git a/...e/evaluator/communicator/Communicator.hpp → ...r/evaluator/communicator/Communicator.hpp b/...e/evaluator/communicator/Communicator.hpp → ...r/evaluator/communicator/Communicator.hpp
diff --git a/include/tcframe/runner/evaluator/scorer.hpp b/include/tcframe/runner/evaluator/scorer.hpp
@@ -0,0 +1,6 @@
+#pragma once
+
+#include "tcframe/runner/evaluator/scorer/CustomScorer.hpp"
+#include "tcframe/runner/evaluator/scorer/DiffScorer.hpp"
+#include "tcframe/runner/evaluator/scorer/Scorer.hpp"
+#include "tcframe/runner/evaluator/scorer/ScoringResult.hpp"
diff --git a/...tcframe/evaluator/scorer/CustomScorer.hpp → .../runner/evaluator/scorer/CustomScorer.hpp b/...tcframe/evaluator/scorer/CustomScorer.hpp → .../runner/evaluator/scorer/CustomScorer.hpp
diff --git a/...e/tcframe/evaluator/scorer/DiffScorer.hpp → ...me/runner/evaluator/scorer/DiffScorer.hpp b/...e/tcframe/evaluator/scorer/DiffScorer.hpp → ...me/runner/evaluator/scorer/DiffScorer.hpp
diff --git a/include/tcframe/evaluator/scorer/Scorer.hpp → ...cframe/runner/evaluator/scorer/Scorer.hpp b/include/tcframe/evaluator/scorer/Scorer.hpp → ...cframe/runner/evaluator/scorer/Scorer.hpp
diff --git a/...cframe/evaluator/scorer/ScoringResult.hpp → ...runner/evaluator/scorer/ScoringResult.hpp b/...cframe/evaluator/scorer/ScoringResult.hpp → ...runner/evaluator/scorer/ScoringResult.hpp
diff --git a/include/tcframe/runner/generator/TestCaseGenerator.hpp b/include/tcframe/runner/generator/TestCaseGenerator.hpp
@@ -9,8 +9,8 @@
 #include "GenerationException.hpp"
 #include "GenerationOptions.hpp"
 #include "GeneratorLogger.hpp"
-#include "tcframe/evaluator.hpp"
 #include "tcframe/os.hpp"
+#include "tcframe/runner/evaluator.hpp"
 #include "tcframe/spec.hpp"
 #include "tcframe/verdict.hpp"
 

diff --git a/include/tcframe/runner/grader/TestCaseGrader.hpp b/include/tcframe/runner/grader/TestCaseGrader.hpp
@@ -4,7 +4,7 @@
 
 #include "GradingOptions.hpp"
 #include "GraderLogger.hpp"
-#include "tcframe/evaluator.hpp"
+#include "tcframe/runner/evaluator.hpp"
 #include "tcframe/util.hpp"
 #include "tcframe/verdict.hpp"
 

diff --git a/...s/evaluator/communicator/communicator.cpp → ...r/evaluator/communicator/communicator.cpp b/...s/evaluator/communicator/communicator.cpp → ...r/evaluator/communicator/communicator.cpp
diff --git a/...ces/evaluator/communicator/contestant.cpp → ...ner/evaluator/communicator/contestant.cpp b/...ces/evaluator/communicator/contestant.cpp → ...ner/evaluator/communicator/contestant.cpp
diff --git a/...resources/evaluator/communicator/judge.in → ...es/runner/evaluator/communicator/judge.in b/...resources/evaluator/communicator/judge.in → ...es/runner/evaluator/communicator/judge.in
diff --git a/...es/evaluator/scorer/custom/contestant.out → ...er/evaluator/scorer/custom/contestant.out b/...es/evaluator/scorer/custom/contestant.out → ...er/evaluator/scorer/custom/contestant.out
diff --git a/...ources/evaluator/scorer/custom/scorer.cpp → ...runner/evaluator/scorer/custom/scorer.cpp b/...ources/evaluator/scorer/custom/scorer.cpp → ...runner/evaluator/scorer/custom/scorer.cpp
diff --git a/...s/evaluator/scorer/diff/contestant_ac.out → ...r/evaluator/scorer/diff/contestant_ac.out b/...s/evaluator/scorer/diff/contestant_ac.out → ...r/evaluator/scorer/diff/contestant_ac.out
diff --git a/...s/evaluator/scorer/diff/contestant_wa.out → ...r/evaluator/scorer/diff/contestant_wa.out b/...s/evaluator/scorer/diff/contestant_wa.out → ...r/evaluator/scorer/diff/contestant_wa.out
diff --git a/...ation/resources/evaluator/scorer/judge.in → ...esources/runner/evaluator/scorer/judge.in b/...ation/resources/evaluator/scorer/judge.in → ...esources/runner/evaluator/scorer/judge.in
diff --git a/...tion/resources/evaluator/scorer/judge.out → ...sources/runner/evaluator/scorer/judge.out b/...tion/resources/evaluator/scorer/judge.out → ...sources/runner/evaluator/scorer/judge.out
diff --git a/...unicator/CommunicatorIntegrationTests.cpp → ...unicator/CommunicatorIntegrationTests.cpp b/...unicator/CommunicatorIntegrationTests.cpp → ...unicator/CommunicatorIntegrationTests.cpp
@@ -2,7 +2,7 @@
 
 #include <cstdlib>
 
-#include "tcframe/evaluator/communicator/Communicator.hpp"
+#include "tcframe/runner/evaluator/communicator/Communicator.hpp"
 
 using ::testing::Eq;
 using ::testing::HasSubstr;
@@ -16,27 +16,27 @@ class CommunicatorIntegrationTests : public Test {
     Communicator communicator = Communicator(
             new OperatingSystem(),
             new VerdictCreator(),
-            "test-integration/evaluator/communicator/communicator");
+            "test-integration/runner/evaluator/communicator/communicator");
 
     static void SetUpTestCase() {
         system(
                 "g++ -o "
-                "test-integration/evaluator/communicator/communicator "
-                "test-integration/evaluator/communicator/communicator.cpp");
+                "test-integration/runner/evaluator/communicator/communicator "
+                "test-integration/runner/evaluator/communicator/communicator.cpp");
     }
 };
 
 TEST_F(CommunicatorIntegrationTests, Communication) {
     system(
             "g++ -o "
-            "test-integration/evaluator/communicator/contestant "
-            "test-integration/evaluator/communicator/contestant.cpp");
+            "test-integration/runner/evaluator/communicator/contestant "
+            "test-integration/runner/evaluator/communicator/contestant.cpp");
 
     EvaluationOptions options = EvaluationOptionsBuilder()
-            .setSolutionCommand("test-integration/evaluator/communicator/contestant")
+            .setSolutionCommand("test-integration/runner/evaluator/communicator/contestant")
             .build();
     CommunicationResult result = communicator.communicate(
-            "test-integration/evaluator/communicator/judge.in",
+            "test-integration/runner/evaluator/communicator/judge.in",
             options);
     EXPECT_THAT(result.verdict(), Eq(Verdict(VerdictStatus::ac())));
     EXPECT_THAT(result.executionResult().standardError(), IsEmpty());

diff --git a/...r/scorer/CustomScorerIntegrationTests.cpp → ...r/scorer/CustomScorerIntegrationTests.cpp b/...r/scorer/CustomScorerIntegrationTests.cpp → ...r/scorer/CustomScorerIntegrationTests.cpp
@@ -2,7 +2,7 @@
 
 #include <cstdlib>
 
-#include "tcframe/evaluator/scorer/CustomScorer.hpp"
+#include "tcframe/runner/evaluator/scorer/CustomScorer.hpp"
 
 using ::testing::AllOf;
 using ::testing::Eq;
@@ -17,21 +17,21 @@ class CustomScorerIntegrationTests : public Test {
     CustomScorer scorer = CustomScorer(
             new OperatingSystem(),
             new VerdictCreator(),
-            "test-integration/evaluator/scorer/custom/scorer");
+            "test-integration/runner/evaluator/scorer/custom/scorer");
 
     static void SetUpTestCase() {
         system(
                 "g++ -o "
-                "test-integration/evaluator/scorer/custom/scorer "
-                "test-integration/evaluator/scorer/custom/scorer.cpp");
+                "test-integration/runner/evaluator/scorer/custom/scorer "
+                "test-integration/runner/evaluator/scorer/custom/scorer.cpp");
     }
 };
 
 TEST_F(CustomScorerIntegrationTests, Scoring) {
     ScoringResult result = scorer.score(
-            "test-integration/evaluator/scorer/judge.in",
-            "test-integration/evaluator/scorer/judge.out",
-            "test-integration/evaluator/scorer/custom/contestant.out");
+            "test-integration/runner/evaluator/scorer/judge.in",
+            "test-integration/runner/evaluator/scorer/judge.out",
+            "test-integration/runner/evaluator/scorer/custom/contestant.out");
     EXPECT_THAT(result.verdict(), Eq(Verdict(VerdictStatus::ac())));
 }
 

diff --git a/...tor/scorer/DiffScorerIntegrationTests.cpp → ...tor/scorer/DiffScorerIntegrationTests.cpp b/...tor/scorer/DiffScorerIntegrationTests.cpp → ...tor/scorer/DiffScorerIntegrationTests.cpp
@@ -1,6 +1,6 @@
 #include "gmock/gmock.h"
 
-#include "tcframe/evaluator/scorer/DiffScorer.hpp"
+#include "tcframe/runner/evaluator/scorer/DiffScorer.hpp"
 
 using ::testing::AllOf;
 using ::testing::Eq;
@@ -19,17 +19,17 @@ class DiffScorerIntegrationTests : public Test {
 TEST_F(DiffScorerIntegrationTests, Scoring_AC) {
     ScoringResult result = scorer.score(
             "",
-            "test-integration/evaluator/scorer/judge.out",
-            "test-integration/evaluator/scorer/diff/contestant_ac.out");
+            "test-integration/runner/evaluator/scorer/judge.out",
+            "test-integration/runner/evaluator/scorer/diff/contestant_ac.out");
     EXPECT_THAT(result.verdict(), Eq(Verdict(VerdictStatus::ac())));
     EXPECT_THAT(result.executionResult().standardError(), IsEmpty());
 }
 
 TEST_F(DiffScorerIntegrationTests, Scoring_WA) {
     ScoringResult result = scorer.score(
             "",
-            "test-integration/evaluator/scorer/judge.out",
-            "test-integration/evaluator/scorer/diff/contestant_wa.out");
+            "test-integration/runner/evaluator/scorer/judge.out",
+            "test-integration/runner/evaluator/scorer/diff/contestant_wa.out");
     EXPECT_THAT(result.verdict(), Eq(Verdict(VerdictStatus::wa())));
 
     EXPECT_THAT(result.executionResult().standardError(), AllOf(

diff --git a/test/unit/tcframe/runner/core/BaseRunnerTests.hpp b/test/unit/tcframe/runner/core/BaseRunnerTests.hpp
@@ -1,11 +1,11 @@
 #include "gmock/gmock.h"
 #include "../../mock.hpp"
 
-#include "../../evaluator/MockEvaluator.hpp"
-#include "../../evaluator/MockEvaluatorRegistry.hpp"
 #include "../../os/MockOperatingSystem.hpp"
 #include "../../runner/aggregator/MockAggregator.hpp"
 #include "../../runner/aggregator/MockAggregatorRegistry.hpp"
+#include "../../runner/evaluator/MockEvaluator.hpp"
+#include "../../runner/evaluator/MockEvaluatorRegistry.hpp"
 #include "../../runner/generator/MockGenerator.hpp"
 #include "../../runner/grader/MockGrader.hpp"
 #include "../../runner/grader/MockGraderLogger.hpp"

diff --git a/...tcframe/evaluator/BatchEvaluatorTests.cpp → .../runner/evaluator/BatchEvaluatorTests.cpp b/...tcframe/evaluator/BatchEvaluatorTests.cpp → .../runner/evaluator/BatchEvaluatorTests.cpp
@@ -1,12 +1,12 @@
 #include "gmock/gmock.h"
-#include "../mock.hpp"
+#include "../../mock.hpp"
 
 #include <sstream>
 
-#include "../os/MockOperatingSystem.hpp"
-#include "../verdict/MockVerdictCreator.hpp"
+#include "../../os/MockOperatingSystem.hpp"
+#include "../../verdict/MockVerdictCreator.hpp"
 #include "scorer/MockScorer.hpp"
-#include "tcframe/evaluator/BatchEvaluator.hpp"
+#include "tcframe/runner/evaluator/BatchEvaluator.hpp"
 
 using ::testing::_;
 using ::testing::AllOf;

diff --git a/...e/evaluator/InteractiveEvaluatorTests.cpp → ...r/evaluator/InteractiveEvaluatorTests.cpp b/...e/evaluator/InteractiveEvaluatorTests.cpp → ...r/evaluator/InteractiveEvaluatorTests.cpp
@@ -1,8 +1,8 @@
 #include "gmock/gmock.h"
-#include "../mock.hpp"
+#include "../../mock.hpp"
 
 #include "./communicator/MockCommunicator.hpp"
-#include "tcframe/evaluator/InteractiveEvaluator.hpp"
+#include "tcframe/runner/evaluator/InteractiveEvaluator.hpp"
 
 using ::testing::Eq;
 using ::testing::Return;

diff --git a/.../unit/tcframe/evaluator/MockEvaluator.hpp → ...cframe/runner/evaluator/MockEvaluator.hpp b/.../unit/tcframe/evaluator/MockEvaluator.hpp → ...cframe/runner/evaluator/MockEvaluator.hpp
@@ -2,7 +2,7 @@
 
 #include "gmock/gmock.h"
 
-#include "tcframe/evaluator/Evaluator.hpp"
+#include "tcframe/runner/evaluator/Evaluator.hpp"
 
 namespace tcframe {
 

diff --git a/...frame/evaluator/MockEvaluatorRegistry.hpp → ...unner/evaluator/MockEvaluatorRegistry.hpp b/...frame/evaluator/MockEvaluatorRegistry.hpp → ...unner/evaluator/MockEvaluatorRegistry.hpp
@@ -2,7 +2,7 @@
 
 #include "gmock/gmock.h"
 
-#include "tcframe/evaluator/EvaluatorRegistry.hpp"
+#include "tcframe/runner/evaluator/EvaluatorRegistry.hpp"
 
 namespace tcframe {
 

diff --git a/...luator/communicator/CommunicatorTests.cpp → ...luator/communicator/CommunicatorTests.cpp b/...luator/communicator/CommunicatorTests.cpp → ...luator/communicator/CommunicatorTests.cpp
@@ -1,11 +1,11 @@
 #include "gmock/gmock.h"
-#include "../../mock.hpp"
+#include "../../../mock.hpp"
 
 #include <sstream>
 
-#include "../../os/MockOperatingSystem.hpp"
-#include "../../verdict/MockVerdictCreator.hpp"
-#include "tcframe/evaluator/communicator/Communicator.hpp"
+#include "../../../os/MockOperatingSystem.hpp"
+#include "../../../verdict/MockVerdictCreator.hpp"
+#include "tcframe/runner/evaluator/communicator/Communicator.hpp"
 
 using ::testing::_;
 using ::testing::Eq;

diff --git a/...aluator/communicator/MockCommunicator.hpp → ...aluator/communicator/MockCommunicator.hpp b/...aluator/communicator/MockCommunicator.hpp → ...aluator/communicator/MockCommunicator.hpp
@@ -2,7 +2,7 @@
 
 #include "gmock/gmock.h"
 
-#include "tcframe/evaluator/communicator/Communicator.hpp"
+#include "tcframe/runner/evaluator/communicator/Communicator.hpp"
 
 namespace tcframe {
 

diff --git a/...me/evaluator/scorer/CustomScorerTests.cpp → ...er/evaluator/scorer/CustomScorerTests.cpp b/...me/evaluator/scorer/CustomScorerTests.cpp → ...er/evaluator/scorer/CustomScorerTests.cpp
@@ -1,11 +1,11 @@
 #include "gmock/gmock.h"
-#include "../../mock.hpp"
+#include "../../../mock.hpp"
 
 #include <sstream>
 
-#include "../../os/MockOperatingSystem.hpp"
-#include "../../verdict/MockVerdictCreator.hpp"
-#include "tcframe/evaluator/scorer/CustomScorer.hpp"
+#include "../../../os/MockOperatingSystem.hpp"
+#include "../../../verdict/MockVerdictCreator.hpp"
+#include "tcframe/runner/evaluator/scorer/CustomScorer.hpp"
 
 using ::testing::_;
 using ::testing::Eq;