Refactor runner: Move verdict package to runner/

ia-toki · Jul 26, 2017 · c4c3368 · c4c3368
1 parent d76baed
commit c4c3368
Show file tree

Hide file tree

Showing 31 changed files with 48 additions and 47 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -57,6 +57,11 @@ set(INCLUDE
         include/tcframe/runner/aggregator/AggregatorRegistry.hpp
         include/tcframe/runner/aggregator/MinAggregator.hpp
         include/tcframe/runner/aggregator/SumAggregator.hpp
+        include/tcframe/runner/core.hpp
+        include/tcframe/runner/core/Args.hpp
+        include/tcframe/runner/core/ArgsParser.hpp
+        include/tcframe/runner/core/Runner.hpp
+        include/tcframe/runner/core/SlugParser.hpp
         include/tcframe/runner/evaluator.hpp
         include/tcframe/runner/evaluator/BatchEvaluator.hpp
         include/tcframe/runner/evaluator/EvaluationOptions.hpp
@@ -92,11 +97,10 @@ set(INCLUDE
         include/tcframe/runner/generator/TestCaseGenerator.hpp
         include/tcframe/runner/logger.hpp
         include/tcframe/runner/logger/RunnerLogger.hpp
-        include/tcframe/runner/core.hpp
-        include/tcframe/runner/core/Args.hpp
-        include/tcframe/runner/core/ArgsParser.hpp
-        include/tcframe/runner/core/Runner.hpp
-        include/tcframe/runner/core/SlugParser.hpp
+        include/tcframe/runner/verdict.hpp
+        include/tcframe/runner/verdict/Verdict.hpp
+        include/tcframe/runner/verdict/VerdictCreator.hpp
+        include/tcframe/runner/verdict/VerdictStatus.hpp
         include/tcframe/spec.hpp
         include/tcframe/spec/constraint.hpp
         include/tcframe/spec/constraint/Constraint.hpp
@@ -149,10 +153,6 @@ set(INCLUDE
         include/tcframe/util/NotImplementedException.hpp
         include/tcframe/util/StringUtils.hpp
         include/tcframe/util/optional.hpp
-        include/tcframe/verdict.hpp
-        include/tcframe/verdict/Verdict.hpp
-        include/tcframe/verdict/VerdictCreator.hpp
-        include/tcframe/verdict/VerdictStatus.hpp
 )
 
 set(TEST_UNIT
@@ -166,6 +166,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/core/ArgsParserTests.cpp
+        test/unit/tcframe/runner/core/BatchRunnerTests.cpp
+        test/unit/tcframe/runner/core/BaseRunnerTests.hpp
+        test/unit/tcframe/runner/core/InteractiveRunnerTests.cpp
+        test/unit/tcframe/runner/core/RunnerTests.cpp
+        test/unit/tcframe/runner/core/SlugParserTests.cpp
         test/unit/tcframe/runner/evaluator/BatchEvaluatorTests.cpp
         test/unit/tcframe/runner/evaluator/InteractiveEvaluatorTests.cpp
         test/unit/tcframe/runner/evaluator/MockEvaluator.hpp
@@ -190,12 +196,9 @@ set(TEST_UNIT
         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
-        test/unit/tcframe/runner/core/BatchRunnerTests.cpp
-        test/unit/tcframe/runner/core/BaseRunnerTests.hpp
-        test/unit/tcframe/runner/core/InteractiveRunnerTests.cpp
-        test/unit/tcframe/runner/core/RunnerTests.cpp
-        test/unit/tcframe/runner/core/SlugParserTests.cpp
+        test/unit/tcframe/runner/verdict/MockVerdictCreator.hpp
+        test/unit/tcframe/runner/verdict/VerdictCreatorTests.cpp
+        test/unit/tcframe/runner/verdict/VerdictTests.cpp
         test/unit/tcframe/spec/constraint/ConstraintSuiteTests.cpp
         test/unit/tcframe/spec/constraint/ConstraintSuiteBuilderTests.cpp
         test/unit/tcframe/spec/core/BaseTestSpecTests.cpp
@@ -230,9 +233,6 @@ set(TEST_UNIT
         test/unit/tcframe/util/OptionalTests.cpp
         test/unit/tcframe/util/StringUtilsTests.cpp
         test/unit/tcframe/util/TestUtils.hpp
-        test/unit/tcframe/verdict/MockVerdictCreator.hpp
-        test/unit/tcframe/verdict/VerdictCreatorTests.cpp
-        test/unit/tcframe/verdict/VerdictTests.cpp
 )
 
 add_executable(test_unit ${INCLUDE} ${TEST_UNIT})

diff --git a/include/tcframe/runner.hpp b/include/tcframe/runner.hpp
@@ -6,3 +6,4 @@
 #include "tcframe/runner/generator.hpp"
 #include "tcframe/runner/grader.hpp"
 #include "tcframe/runner/logger.hpp"
+#include "tcframe/runner/verdict.hpp"
diff --git a/include/tcframe/runner/aggregator/Aggregator.hpp b/include/tcframe/runner/aggregator/Aggregator.hpp
@@ -2,7 +2,7 @@
 
 #include <vector>
 
-#include "tcframe/verdict.hpp"
+#include "tcframe/runner/verdict.hpp"
 
 using std::vector;
 

diff --git a/include/tcframe/runner/aggregator/MinAggregator.hpp b/include/tcframe/runner/aggregator/MinAggregator.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "Aggregator.hpp"
-#include "tcframe/verdict.hpp"
+#include "tcframe/runner/verdict.hpp"
 
 using std::max;
 using std::min;

diff --git a/include/tcframe/runner/aggregator/SumAggregator.hpp b/include/tcframe/runner/aggregator/SumAggregator.hpp
@@ -4,7 +4,7 @@
 #include <vector>
 
 #include "Aggregator.hpp"
-#include "tcframe/verdict.hpp"
+#include "tcframe/runner/verdict.hpp"
 
 using std::max;
 using std::vector;

diff --git a/include/tcframe/runner/evaluator/BatchEvaluator.hpp b/include/tcframe/runner/evaluator/BatchEvaluator.hpp
@@ -9,8 +9,8 @@
 #include "GenerationResult.hpp"
 #include "scorer.hpp"
 #include "tcframe/os.hpp"
+#include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
-#include "tcframe/verdict.hpp"
 
 using std::map;
 using std::string;

diff --git a/include/tcframe/runner/evaluator/EvaluationResult.hpp b/include/tcframe/runner/evaluator/EvaluationResult.hpp
@@ -5,8 +5,8 @@
 #include <tuple>
 
 #include "tcframe/os.hpp"
+#include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
-#include "tcframe/verdict.hpp"
 
 using std::map;
 using std::string;

diff --git a/include/tcframe/runner/evaluator/EvaluatorRegistry.hpp b/include/tcframe/runner/evaluator/EvaluatorRegistry.hpp
@@ -10,9 +10,9 @@
 #include "communicator.hpp"
 #include "scorer.hpp"
 #include "tcframe/os.hpp"
+#include "tcframe/runner/verdict.hpp"
 #include "tcframe/spec.hpp"
 #include "tcframe/util.hpp"
-#include "tcframe/verdict.hpp"
 
 using std::map;
 using std::string;

diff --git a/include/tcframe/runner/evaluator/GenerationResult.hpp b/include/tcframe/runner/evaluator/GenerationResult.hpp
@@ -3,8 +3,8 @@
 #include <tuple>
 
 #include "tcframe/os.hpp"
+#include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
-#include "tcframe/verdict.hpp"
 
 using std::tie;
 

diff --git a/include/tcframe/runner/evaluator/communicator/CommunicationResult.hpp b/include/tcframe/runner/evaluator/communicator/CommunicationResult.hpp
@@ -3,7 +3,7 @@
 #include <tuple>
 
 #include "tcframe/os.hpp"
-#include "tcframe/verdict.hpp"
+#include "tcframe/runner/verdict.hpp"
 
 using std::tie;
 

diff --git a/include/tcframe/runner/evaluator/communicator/Communicator.hpp b/include/tcframe/runner/evaluator/communicator/Communicator.hpp
@@ -7,8 +7,8 @@
 #include "../EvaluationOptions.hpp"
 #include "CommunicationResult.hpp"
 #include "tcframe/os.hpp"
+#include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
-#include "tcframe/verdict.hpp"
 
 using std::runtime_error;
 using std::string;

diff --git a/include/tcframe/runner/evaluator/scorer/CustomScorer.hpp b/include/tcframe/runner/evaluator/scorer/CustomScorer.hpp
@@ -8,7 +8,7 @@
 #include "Scorer.hpp"
 #include "ScoringResult.hpp"
 #include "tcframe/os.hpp"
-#include "tcframe/verdict.hpp"
+#include "tcframe/runner/verdict.hpp"
 
 using std::istream;
 using std::runtime_error;

diff --git a/include/tcframe/runner/evaluator/scorer/DiffScorer.hpp b/include/tcframe/runner/evaluator/scorer/DiffScorer.hpp
@@ -6,8 +6,8 @@
 #include "Scorer.hpp"
 #include "ScoringResult.hpp"
 #include "tcframe/os.hpp"
+#include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
-#include "tcframe/verdict.hpp"
 
 using std::istream;
 using std::string;

diff --git a/include/tcframe/runner/evaluator/scorer/ScoringResult.hpp b/include/tcframe/runner/evaluator/scorer/ScoringResult.hpp
@@ -3,7 +3,7 @@
 #include <tuple>
 
 #include "tcframe/os.hpp"
-#include "tcframe/verdict.hpp"
+#include "tcframe/runner/verdict.hpp"
 
 using std::tie;
 

diff --git a/include/tcframe/runner/generator/TestCaseGenerator.hpp b/include/tcframe/runner/generator/TestCaseGenerator.hpp
@@ -11,8 +11,8 @@
 #include "GeneratorLogger.hpp"
 #include "tcframe/os.hpp"
 #include "tcframe/runner/evaluator.hpp"
+#include "tcframe/runner/verdict.hpp"
 #include "tcframe/spec.hpp"
-#include "tcframe/verdict.hpp"
 
 using std::char_traits;
 using std::endl;

diff --git a/include/tcframe/runner/grader/BriefGraderLogger.hpp b/include/tcframe/runner/grader/BriefGraderLogger.hpp
@@ -4,7 +4,7 @@
 
 #include "GraderLogger.hpp"
 #include "tcframe/logger.hpp"
-#include "tcframe/verdict.hpp"
+#include "tcframe/runner/verdict.hpp"
 
 using std::map;
 

diff --git a/include/tcframe/runner/grader/DefaultGraderLogger.hpp b/include/tcframe/runner/grader/DefaultGraderLogger.hpp
@@ -4,8 +4,8 @@
 
 #include "GraderLogger.hpp"
 #include "tcframe/logger.hpp"
+#include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
-#include "tcframe/verdict.hpp"
 
 using std::map;
 

diff --git a/include/tcframe/runner/grader/Grader.hpp b/include/tcframe/runner/grader/Grader.hpp
@@ -10,9 +10,9 @@
 #include "TestCaseGrader.hpp"
 #include "tcframe/os.hpp"
 #include "tcframe/runner/aggregator.hpp"
+#include "tcframe/runner/verdict.hpp"
 #include "tcframe/spec.hpp"
 #include "tcframe/util.hpp"
-#include "tcframe/verdict.hpp"
 
 using std::map;
 using std::max;

diff --git a/include/tcframe/runner/grader/GraderLogger.hpp b/include/tcframe/runner/grader/GraderLogger.hpp
@@ -3,8 +3,8 @@
 #include <map>
 
 #include "tcframe/logger.hpp"
+#include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
-#include "tcframe/verdict.hpp"
 
 using std::map;
 

diff --git a/include/tcframe/runner/grader/TestCaseGrader.hpp b/include/tcframe/runner/grader/TestCaseGrader.hpp
@@ -5,8 +5,8 @@
 #include "GradingOptions.hpp"
 #include "GraderLogger.hpp"
 #include "tcframe/runner/evaluator.hpp"
+#include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
-#include "tcframe/verdict.hpp"
 
 using std::string;
 

diff --git a/include/tcframe/runner/verdict.hpp b/include/tcframe/runner/verdict.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "tcframe/runner/verdict/Verdict.hpp"
+#include "tcframe/runner/verdict/VerdictCreator.hpp"
+#include "tcframe/runner/verdict/VerdictStatus.hpp"
diff --git a/include/tcframe/verdict/Verdict.hpp → include/tcframe/runner/verdict/Verdict.hpp b/include/tcframe/verdict/Verdict.hpp → include/tcframe/runner/verdict/Verdict.hpp
diff --git a/include/tcframe/verdict/VerdictCreator.hpp → ...tcframe/runner/verdict/VerdictCreator.hpp b/include/tcframe/verdict/VerdictCreator.hpp → ...tcframe/runner/verdict/VerdictCreator.hpp
diff --git a/include/tcframe/verdict/VerdictStatus.hpp → .../tcframe/runner/verdict/VerdictStatus.hpp b/include/tcframe/verdict/VerdictStatus.hpp → .../tcframe/runner/verdict/VerdictStatus.hpp
diff --git a/include/tcframe/verdict.hpp b/include/tcframe/verdict.hpp
diff --git a/test/unit/tcframe/runner/evaluator/BatchEvaluatorTests.cpp b/test/unit/tcframe/runner/evaluator/BatchEvaluatorTests.cpp
@@ -4,7 +4,7 @@
 #include <sstream>
 
 #include "../../os/MockOperatingSystem.hpp"
-#include "../../verdict/MockVerdictCreator.hpp"
+#include "../../runner/verdict/MockVerdictCreator.hpp"
 #include "scorer/MockScorer.hpp"
 #include "tcframe/runner/evaluator/BatchEvaluator.hpp"
 

diff --git a/test/unit/tcframe/runner/evaluator/communicator/CommunicatorTests.cpp b/test/unit/tcframe/runner/evaluator/communicator/CommunicatorTests.cpp
@@ -4,7 +4,7 @@
 #include <sstream>
 
 #include "../../../os/MockOperatingSystem.hpp"
-#include "../../../verdict/MockVerdictCreator.hpp"
+#include "../../../runner/verdict/MockVerdictCreator.hpp"
 #include "tcframe/runner/evaluator/communicator/Communicator.hpp"
 
 using ::testing::_;

diff --git a/test/unit/tcframe/runner/evaluator/scorer/CustomScorerTests.cpp b/test/unit/tcframe/runner/evaluator/scorer/CustomScorerTests.cpp
@@ -4,7 +4,7 @@
 #include <sstream>
 
 #include "../../../os/MockOperatingSystem.hpp"
-#include "../../../verdict/MockVerdictCreator.hpp"
+#include "../../../runner/verdict/MockVerdictCreator.hpp"
 #include "tcframe/runner/evaluator/scorer/CustomScorer.hpp"
 
 using ::testing::_;

diff --git a/...it/tcframe/verdict/MockVerdictCreator.hpp → ...ame/runner/verdict/MockVerdictCreator.hpp b/...it/tcframe/verdict/MockVerdictCreator.hpp → ...ame/runner/verdict/MockVerdictCreator.hpp
@@ -2,7 +2,7 @@
 
 #include "gmock/gmock.h"
 
-#include "tcframe/verdict/VerdictCreator.hpp"
+#include "tcframe/runner/verdict/VerdictCreator.hpp"
 
 namespace tcframe {
 

diff --git a/...t/tcframe/verdict/VerdictCreatorTests.cpp → ...me/runner/verdict/VerdictCreatorTests.cpp b/...t/tcframe/verdict/VerdictCreatorTests.cpp → ...me/runner/verdict/VerdictCreatorTests.cpp
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "tcframe/verdict/VerdictCreator.hpp"
+#include "tcframe/runner/verdict/VerdictCreator.hpp"
 
 using ::testing::Eq;
 using ::testing::StrEq;

diff --git a/test/unit/tcframe/verdict/VerdictTests.cpp → ...t/tcframe/runner/verdict/VerdictTests.cpp b/test/unit/tcframe/verdict/VerdictTests.cpp → ...t/tcframe/runner/verdict/VerdictTests.cpp
@@ -1,6 +1,6 @@
 #include "gmock/gmock.h"
 
-#include "tcframe/verdict/Verdict.hpp"
+#include "tcframe/runner/verdict/Verdict.hpp"
 
 using ::testing::Eq;
 using ::testing::Test;