Refactor runner: Move generator package to runner/

CMakeLists.txt

@@ -60,13 +60,6 @@ set(INCLUDE
         include/tcframe/evaluator/scorer/DiffScorer.hpp
         include/tcframe/evaluator/scorer/Scorer.hpp
         include/tcframe/evaluator/scorer/ScoringResult.hpp
-        include/tcframe/generator.hpp
-        include/tcframe/generator/DefaultGeneratorLogger.hpp
-        include/tcframe/generator/GenerationException.hpp
-        include/tcframe/generator/GenerationOptions.hpp
-        include/tcframe/generator/Generator.hpp
-        include/tcframe/generator/GeneratorLogger.hpp
-        include/tcframe/generator/TestCaseGenerator.hpp
         include/tcframe/grader.hpp
         include/tcframe/grader/BriefGraderLogger.hpp
         include/tcframe/grader/DefaultGraderLogger.hpp
@@ -90,6 +83,13 @@ set(INCLUDE
         include/tcframe/runner/aggregator/AggregatorRegistry.hpp
         include/tcframe/runner/aggregator/MinAggregator.hpp
         include/tcframe/runner/aggregator/SumAggregator.hpp
+        include/tcframe/runner/generator.hpp
+        include/tcframe/runner/generator/DefaultGeneratorLogger.hpp
+        include/tcframe/runner/generator/GenerationException.hpp
+        include/tcframe/runner/generator/GenerationOptions.hpp
+        include/tcframe/runner/generator/Generator.hpp
+        include/tcframe/runner/generator/GeneratorLogger.hpp
+        include/tcframe/runner/generator/TestCaseGenerator.hpp
         include/tcframe/runner/logger.hpp
         include/tcframe/runner/logger/RunnerLogger.hpp
         include/tcframe/runner/core.hpp
@@ -166,12 +166,6 @@ set(TEST_UNIT
         test/unit/tcframe/evaluator/communicator/MockCommunicator.hpp
         test/unit/tcframe/evaluator/scorer/CustomScorerTests.cpp
         test/unit/tcframe/evaluator/scorer/MockScorer.hpp
-        test/unit/tcframe/generator/DefaultGeneratorLoggerTests.cpp
-        test/unit/tcframe/generator/GeneratorTests.cpp
-        test/unit/tcframe/generator/MockGenerator.hpp
-        test/unit/tcframe/generator/MockGeneratorLogger.hpp
-        test/unit/tcframe/generator/MockTestCaseGenerator.hpp
-        test/unit/tcframe/generator/TestCaseGeneratorTests.cpp
         test/unit/tcframe/grader/BriefGraderLoggerTests.cpp
         test/unit/tcframe/grader/DefaultGraderLoggerTests.cpp
         test/unit/tcframe/grader/GraderTests.cpp
@@ -188,6 +182,12 @@ 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/generator/DefaultGeneratorLoggerTests.cpp
+        test/unit/tcframe/runner/generator/GeneratorTests.cpp
+        test/unit/tcframe/runner/generator/MockGenerator.hpp
+        test/unit/tcframe/runner/generator/MockGeneratorLogger.hpp
+        test/unit/tcframe/runner/generator/MockTestCaseGenerator.hpp
+        test/unit/tcframe/runner/generator/TestCaseGeneratorTests.cpp
         test/unit/tcframe/runner/logger/MockRunnerLogger.hpp
         test/unit/tcframe/runner/logger/RunnerLoggerTests.cpp
         test/unit/tcframe/runner/core/ArgsParserTests.cpp

include/tcframe/runner.hpp

@@ -2,4 +2,5 @@
 
 #include "tcframe/runner/aggregator.hpp"
 #include "tcframe/runner/core.hpp"
+#include "tcframe/runner/generator.hpp"
 #include "tcframe/runner/logger.hpp"

include/tcframe/runner/core/Runner.hpp

@@ -6,11 +6,11 @@
 #include "ArgsParser.hpp"
 #include "SlugParser.hpp"
 #include "tcframe/evaluator.hpp"
-#include "tcframe/generator.hpp"
 #include "tcframe/grader.hpp"
 #include "tcframe/os.hpp"
 #include "tcframe/runner/logger.hpp"
 #include "tcframe/runner/aggregator.hpp"
+#include "tcframe/runner/generator.hpp"
 #include "tcframe/spec.hpp"
 #include "tcframe/util.hpp"
 

include/tcframe/runner/generator.hpp

@@ -0,0 +1,8 @@
+#pragma once
+
+#include "tcframe/runner/generator/DefaultGeneratorLogger.hpp"
+#include "tcframe/runner/generator/GenerationException.hpp"
+#include "tcframe/runner/generator/GenerationOptions.hpp"
+#include "tcframe/runner/generator/Generator.hpp"
+#include "tcframe/runner/generator/GeneratorLogger.hpp"
+#include "tcframe/runner/generator/TestCaseGenerator.hpp"

test/unit/tcframe/runner/core/BaseRunnerTests.hpp

@@ -3,13 +3,13 @@
 
 #include "../../evaluator/MockEvaluator.hpp"
 #include "../../evaluator/MockEvaluatorRegistry.hpp"
-#include "../../generator/MockGenerator.hpp"
 #include "../../grader/MockGrader.hpp"
 #include "../../grader/MockGraderLogger.hpp"
 #include "../../grader/MockGraderLoggerFactory.hpp"
 #include "../../os/MockOperatingSystem.hpp"
 #include "../../runner/aggregator/MockAggregator.hpp"
 #include "../../runner/aggregator/MockAggregatorRegistry.hpp"
+#include "../../runner/generator/MockGenerator.hpp"
 #include "../logger/MockRunnerLogger.hpp"
 #include "tcframe/runner/core/Runner.hpp"
 

test/unit/tcframe/generator/DefaultGeneratorLoggerTests.cpp → test/unit/tcframe/runner/generator/DefaultGeneratorLoggerTests.cpp

@@ -1,8 +1,8 @@
 #include "gmock/gmock.h"
-#include "../mock.hpp"
+#include "../../mock.hpp"
 
-#include "../logger/MockLoggerEngine.hpp"
-#include "tcframe/generator/DefaultGeneratorLogger.hpp"
+#include "../../logger/MockLoggerEngine.hpp"
+#include "tcframe/runner/generator/DefaultGeneratorLogger.hpp"
 
 using ::testing::_;
 using ::testing::InSequence;

test/unit/tcframe/generator/GeneratorTests.cpp → test/unit/tcframe/runner/generator/GeneratorTests.cpp

@@ -1,13 +1,13 @@
 #include "gmock/gmock.h"
-#include "../mock.hpp"
+#include "../../mock.hpp"
 
-#include "../os/MockOperatingSystem.hpp"
-#include "../spec/core/MockSeedSetter.hpp"
-#include "../spec/verifier/MockVerifier.hpp"
-#include "../util/TestUtils.hpp"
+#include "../../os/MockOperatingSystem.hpp"
+#include "../../spec/core/MockSeedSetter.hpp"
+#include "../../spec/verifier/MockVerifier.hpp"
+#include "../../util/TestUtils.hpp"
 #include "MockGeneratorLogger.hpp"
 #include "MockTestCaseGenerator.hpp"
-#include "tcframe/generator/Generator.hpp"
+#include "tcframe/runner/generator/Generator.hpp"
 
 using ::testing::_;
 using ::testing::Eq;

test/unit/tcframe/generator/MockGenerator.hpp → test/unit/tcframe/runner/generator/MockGenerator.hpp

@@ -2,7 +2,7 @@
 
 #include "gmock/gmock.h"
 
-#include "tcframe/generator/Generator.hpp"
+#include "tcframe/runner/generator/Generator.hpp"
 
 namespace tcframe {
 

test/unit/tcframe/generator/MockGeneratorLogger.hpp → test/unit/tcframe/runner/generator/MockGeneratorLogger.hpp

@@ -2,7 +2,7 @@
 
 #include "gmock/gmock.h"
 
-#include "tcframe/generator/GeneratorLogger.hpp"
+#include "tcframe/runner/generator/GeneratorLogger.hpp"
 
 namespace tcframe {
 

test/unit/tcframe/generator/MockTestCaseGenerator.hpp → test/unit/tcframe/runner/generator/MockTestCaseGenerator.hpp

@@ -2,7 +2,7 @@
 
 #include "gmock/gmock.h"
 
-#include "tcframe/generator/TestCaseGenerator.hpp"
+#include "tcframe/runner/generator/TestCaseGenerator.hpp"
 
 namespace tcframe {
 

test/unit/tcframe/generator/TestCaseGeneratorTests.cpp → test/unit/tcframe/runner/generator/TestCaseGeneratorTests.cpp

@@ -1,14 +1,14 @@
 #include "gmock/gmock.h"
-#include "../mock.hpp"
+#include "../../mock.hpp"
 
 #include <sstream>
 
-#include "../evaluator/MockEvaluator.hpp"
-#include "../os/MockOperatingSystem.hpp"
-#include "../spec/io/MockIOManipulator.hpp"
-#include "../spec/verifier/MockVerifier.hpp"
+#include "../../evaluator/MockEvaluator.hpp"
+#include "../../os/MockOperatingSystem.hpp"
+#include "../../spec/io/MockIOManipulator.hpp"
+#include "../../spec/verifier/MockVerifier.hpp"
 #include "MockGeneratorLogger.hpp"
-#include "tcframe/generator/TestCaseGenerator.hpp"
+#include "tcframe/runner/generator/TestCaseGenerator.hpp"
 
 using ::testing::_;
 using ::testing::AllOf;