Refactor runner: Move aggregator package to runner/

CMakeLists.txt

@@ -42,11 +42,6 @@ include_directories("${source_dir}/googlemock/include")
 include_directories(include)
 
 set(INCLUDE
-        include/tcframe/aggregator.hpp
-        include/tcframe/aggregator/Aggregator.hpp
-        include/tcframe/aggregator/AggregatorRegistry.hpp
-        include/tcframe/aggregator/MinAggregator.hpp
-        include/tcframe/aggregator/SumAggregator.hpp
         include/tcframe/evaluator.hpp
         include/tcframe/evaluator/BatchEvaluator.hpp
         include/tcframe/evaluator/EvaluationOptions.hpp
@@ -90,6 +85,11 @@ set(INCLUDE
         include/tcframe/os/ExecutionRequest.hpp
         include/tcframe/os/OperatingSystem.hpp
         include/tcframe/runner.hpp
+        include/tcframe/runner/aggregator.hpp
+        include/tcframe/runner/aggregator/Aggregator.hpp
+        include/tcframe/runner/aggregator/AggregatorRegistry.hpp
+        include/tcframe/runner/aggregator/MinAggregator.hpp
+        include/tcframe/runner/aggregator/SumAggregator.hpp
         include/tcframe/runner/logger.hpp
         include/tcframe/runner/logger/RunnerLogger.hpp
         include/tcframe/runner/core.hpp
@@ -158,10 +158,6 @@ set(INCLUDE
 set(TEST_UNIT
         test/unit/tcframe/helper.hpp
         test/unit/tcframe/mock.hpp
-        test/unit/tcframe/aggregator/MinAggregatorTests.cpp
-        test/unit/tcframe/aggregator/MockAggregator.hpp
-        test/unit/tcframe/aggregator/MockAggregatorRegistry.hpp
-        test/unit/tcframe/aggregator/SumAggregatorTests.cpp
         test/unit/tcframe/evaluator/BatchEvaluatorTests.cpp
         test/unit/tcframe/evaluator/InteractiveEvaluatorTests.cpp
         test/unit/tcframe/evaluator/MockEvaluator.hpp
@@ -188,6 +184,10 @@ set(TEST_UNIT
         test/unit/tcframe/logger/MockLoggerEngine.hpp
         test/unit/tcframe/logger/SimpleLoggerEngineTests.cpp
         test/unit/tcframe/os/MockOperatingSystem.hpp
+        test/unit/tcframe/runner/aggregator/MinAggregatorTests.cpp
+        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/logger/MockRunnerLogger.hpp
         test/unit/tcframe/runner/logger/RunnerLoggerTests.cpp
         test/unit/tcframe/runner/core/ArgsParserTests.cpp

include/tcframe/grader/Grader.hpp

@@ -8,8 +8,8 @@
 #include "GradingOptions.hpp"
 #include "GraderLogger.hpp"
 #include "TestCaseGrader.hpp"
-#include "tcframe/aggregator.hpp"
 #include "tcframe/os.hpp"
+#include "tcframe/runner/aggregator.hpp"
 #include "tcframe/spec.hpp"
 #include "tcframe/util.hpp"
 #include "tcframe/verdict.hpp"

include/tcframe/runner.hpp

@@ -1,4 +1,5 @@
 #pragma once
 
+#include "tcframe/runner/aggregator.hpp"
 #include "tcframe/runner/core.hpp"
 #include "tcframe/runner/logger.hpp"

include/tcframe/runner/aggregator.hpp

@@ -0,0 +1,6 @@
+#pragma once
+
+#include "tcframe/runner/aggregator/Aggregator.hpp"
+#include "tcframe/runner/aggregator/AggregatorRegistry.hpp"
+#include "tcframe/runner/aggregator/MinAggregator.hpp"
+#include "tcframe/runner/aggregator/SumAggregator.hpp"

include/tcframe/aggregator/AggregatorRegistry.hpp → include/tcframe/runner/aggregator/AggregatorRegistry.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "tcframe/aggregator/Aggregator.hpp"
-#include "tcframe/aggregator/MinAggregator.hpp"
-#include "tcframe/aggregator/SumAggregator.hpp"
+#include "Aggregator.hpp"
+#include "MinAggregator.hpp"
+#include "SumAggregator.hpp"
 
 namespace tcframe {
 

include/tcframe/runner/core/Runner.hpp

@@ -5,12 +5,12 @@
 #include "Args.hpp"
 #include "ArgsParser.hpp"
 #include "SlugParser.hpp"
-#include "tcframe/aggregator.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/spec.hpp"
 #include "tcframe/util.hpp"
 

test/unit/tcframe/grader/GraderTests.cpp

@@ -1,7 +1,7 @@
 #include "gmock/gmock.h"
 #include "../mock.hpp"
 
-#include "../aggregator/MockAggregator.hpp"
+#include "../runner/aggregator/MockAggregator.hpp"
 #include "../util/TestUtils.hpp"
 #include "MockTestCaseGrader.hpp"
 #include "MockGraderLogger.hpp"

test/unit/tcframe/aggregator/MinAggregatorTests.cpp → test/unit/tcframe/runner/aggregator/MinAggregatorTests.cpp

@@ -1,6 +1,6 @@
 #include "gmock/gmock.h"
 
-#include "tcframe/aggregator/MinAggregator.hpp"
+#include "tcframe/runner/aggregator/MinAggregator.hpp"
 
 using ::testing::Eq;
 using ::testing::Test;

test/unit/tcframe/aggregator/MockAggregator.hpp → test/unit/tcframe/runner/aggregator/MockAggregator.hpp

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

test/unit/tcframe/aggregator/MockAggregatorRegistry.hpp → test/unit/tcframe/runner/aggregator/MockAggregatorRegistry.hpp

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

test/unit/tcframe/aggregator/SumAggregatorTests.cpp → test/unit/tcframe/runner/aggregator/SumAggregatorTests.cpp

@@ -1,6 +1,6 @@
 #include "gmock/gmock.h"
 
-#include "tcframe/aggregator/SumAggregator.hpp"
+#include "tcframe/runner/aggregator/SumAggregator.hpp"
 
 using ::testing::Eq;
 using ::testing::Test;

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

@@ -1,14 +1,14 @@
 #include "gmock/gmock.h"
 #include "../../mock.hpp"
 
-#include "../../aggregator/MockAggregator.hpp"
-#include "../../aggregator/MockAggregatorRegistry.hpp"
 #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 "../../runner/aggregator/MockAggregator.hpp"
+#include "../../runner/aggregator/MockAggregatorRegistry.hpp"
 #include "../../os/MockOperatingSystem.hpp"
 #include "../logger/MockRunnerLogger.hpp"
 #include "tcframe/runner/core/Runner.hpp"