Refactor runner: Move grader package to runner/

CMakeLists.txt

@@ -60,14 +60,6 @@ set(INCLUDE
         include/tcframe/evaluator/scorer/DiffScorer.hpp
         include/tcframe/evaluator/scorer/Scorer.hpp
         include/tcframe/evaluator/scorer/ScoringResult.hpp
-        include/tcframe/grader.hpp
-        include/tcframe/grader/BriefGraderLogger.hpp
-        include/tcframe/grader/DefaultGraderLogger.hpp
-        include/tcframe/grader/Grader.hpp
-        include/tcframe/grader/GraderLogger.hpp
-        include/tcframe/grader/GraderLoggerFactory.hpp
-        include/tcframe/grader/GradingOptions.hpp
-        include/tcframe/grader/TestCaseGrader.hpp
         include/tcframe/logger.hpp
         include/tcframe/logger/BaseLogger.hpp
         include/tcframe/logger/DefaultBaseLogger.hpp
@@ -83,6 +75,14 @@ set(INCLUDE
         include/tcframe/runner/aggregator/AggregatorRegistry.hpp
         include/tcframe/runner/aggregator/MinAggregator.hpp
         include/tcframe/runner/aggregator/SumAggregator.hpp
+        include/tcframe/runner/grader.hpp
+        include/tcframe/runner/grader/BriefGraderLogger.hpp
+        include/tcframe/runner/grader/DefaultGraderLogger.hpp
+        include/tcframe/runner/grader/Grader.hpp
+        include/tcframe/runner/grader/GraderLogger.hpp
+        include/tcframe/runner/grader/GraderLoggerFactory.hpp
+        include/tcframe/runner/grader/GradingOptions.hpp
+        include/tcframe/runner/grader/TestCaseGrader.hpp
         include/tcframe/runner/generator.hpp
         include/tcframe/runner/generator/DefaultGeneratorLogger.hpp
         include/tcframe/runner/generator/GenerationException.hpp
@@ -166,14 +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/grader/BriefGraderLoggerTests.cpp
-        test/unit/tcframe/grader/DefaultGraderLoggerTests.cpp
-        test/unit/tcframe/grader/GraderTests.cpp
-        test/unit/tcframe/grader/MockGrader.hpp
-        test/unit/tcframe/grader/MockGraderLogger.hpp
-        test/unit/tcframe/grader/MockGraderLoggerFactory.hpp
-        test/unit/tcframe/grader/MockTestCaseGrader.hpp
-        test/unit/tcframe/grader/TestCaseGraderTests.cpp
         test/unit/tcframe/logger/DefaultBaseLogggerTests.cpp
         test/unit/tcframe/logger/MockLoggerEngine.hpp
         test/unit/tcframe/logger/SimpleLoggerEngineTests.cpp
@@ -188,6 +180,14 @@ set(TEST_UNIT
         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/grader/BriefGraderLoggerTests.cpp
+        test/unit/tcframe/runner/grader/DefaultGraderLoggerTests.cpp
+        test/unit/tcframe/runner/grader/GraderTests.cpp
+        test/unit/tcframe/runner/grader/MockGrader.hpp
+        test/unit/tcframe/runner/grader/MockGraderLogger.hpp
+        test/unit/tcframe/runner/grader/MockGraderLoggerFactory.hpp
+        test/unit/tcframe/runner/grader/MockTestCaseGrader.hpp
+        test/unit/tcframe/runner/grader/TestCaseGraderTests.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

@@ -3,4 +3,5 @@
 #include "tcframe/runner/aggregator.hpp"
 #include "tcframe/runner/core.hpp"
 #include "tcframe/runner/generator.hpp"
+#include "tcframe/runner/grader.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/grader.hpp"
 #include "tcframe/os.hpp"
-#include "tcframe/runner/logger.hpp"
 #include "tcframe/runner/aggregator.hpp"
 #include "tcframe/runner/generator.hpp"
+#include "tcframe/runner/grader.hpp"
+#include "tcframe/runner/logger.hpp"
 #include "tcframe/spec.hpp"
 #include "tcframe/util.hpp"
 

include/tcframe/runner/grader.hpp

@@ -0,0 +1,9 @@
+#pragma once
+
+#include "tcframe/runner/grader/BriefGraderLogger.hpp"
+#include "tcframe/runner/grader/DefaultGraderLogger.hpp"
+#include "tcframe/runner/grader/Grader.hpp"
+#include "tcframe/runner/grader/GraderLogger.hpp"
+#include "tcframe/runner/grader/GraderLoggerFactory.hpp"
+#include "tcframe/runner/grader/GradingOptions.hpp"
+#include "tcframe/runner/grader/TestCaseGrader.hpp"

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

@@ -3,13 +3,13 @@
 
 #include "../../evaluator/MockEvaluator.hpp"
 #include "../../evaluator/MockEvaluatorRegistry.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 "../../runner/grader/MockGrader.hpp"
+#include "../../runner/grader/MockGraderLogger.hpp"
+#include "../../runner/grader/MockGraderLoggerFactory.hpp"
 #include "../logger/MockRunnerLogger.hpp"
 #include "tcframe/runner/core/Runner.hpp"
 

test/unit/tcframe/grader/BriefGraderLoggerTests.cpp → test/unit/tcframe/runner/grader/BriefGraderLoggerTests.cpp

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

test/unit/tcframe/grader/DefaultGraderLoggerTests.cpp → test/unit/tcframe/runner/grader/DefaultGraderLoggerTests.cpp

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

test/unit/tcframe/grader/GraderTests.cpp → test/unit/tcframe/runner/grader/GraderTests.cpp

@@ -1,11 +1,11 @@
 #include "gmock/gmock.h"
-#include "../mock.hpp"
+#include "../../mock.hpp"
 
-#include "../runner/aggregator/MockAggregator.hpp"
-#include "../util/TestUtils.hpp"
+#include "../../runner/aggregator/MockAggregator.hpp"
+#include "../../util/TestUtils.hpp"
 #include "MockTestCaseGrader.hpp"
 #include "MockGraderLogger.hpp"
-#include "tcframe/grader/Grader.hpp"
+#include "tcframe/runner/grader/Grader.hpp"
 
 using ::testing::_;
 using ::testing::Eq;

test/unit/tcframe/grader/MockGrader.hpp → test/unit/tcframe/runner/grader/MockGrader.hpp

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

test/unit/tcframe/grader/MockGraderLogger.hpp → test/unit/tcframe/runner/grader/MockGraderLogger.hpp

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

test/unit/tcframe/grader/MockGraderLoggerFactory.hpp → test/unit/tcframe/runner/grader/MockGraderLoggerFactory.hpp

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

test/unit/tcframe/grader/MockTestCaseGrader.hpp → test/unit/tcframe/runner/grader/MockTestCaseGrader.hpp

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

test/unit/tcframe/grader/TestCaseGraderTests.cpp → test/unit/tcframe/runner/grader/TestCaseGraderTests.cpp

@@ -1,10 +1,10 @@
 #include "gmock/gmock.h"
-#include "../mock.hpp"
+#include "../../mock.hpp"
 
-#include "../evaluator/MockEvaluator.hpp"
-#include "../util/TestUtils.hpp"
+#include "../../evaluator/MockEvaluator.hpp"
+#include "../../util/TestUtils.hpp"
 #include "MockGraderLogger.hpp"
-#include "tcframe/grader/TestCaseGrader.hpp"
+#include "tcframe/runner/grader/TestCaseGrader.hpp"
 
 using ::testing::_;
 using ::testing::Eq;