Refactor: move logger/ and os/ to runner/

ia-toki · Sep 9, 2017 · fc0ee3f · fc0ee3f
1 parent c4f7445
commit fc0ee3f
Show file tree

Hide file tree

Showing 57 changed files with 85 additions and 90 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -47,16 +47,6 @@ set(INCLUDE
         include/tcframe/driver/SlugParser.hpp
         include/tcframe/driver/SpecDriver.hpp
         include/tcframe/driver/TestCaseDriver.hpp
-        include/tcframe/logger.hpp
-        include/tcframe/logger/BaseLogger.hpp
-        include/tcframe/logger/DefaultBaseLogger.hpp
-        include/tcframe/logger/LoggerEngine.hpp
-        include/tcframe/logger/SimpleLoggerEngine.hpp
-        include/tcframe/os.hpp
-        include/tcframe/os/ExecutionResult.hpp
-        include/tcframe/os/ExecutionRequest.hpp
-        include/tcframe/os/OperatingSystem.hpp
-        include/tcframe/os/TestCasePathCreator.hpp
         include/tcframe/runner.hpp
         include/tcframe/runner/aggregator.hpp
         include/tcframe/runner/aggregator/Aggregator.hpp
@@ -103,7 +93,16 @@ set(INCLUDE
         include/tcframe/runner/generator/GeneratorLogger.hpp
         include/tcframe/runner/generator/TestCaseGenerator.hpp
         include/tcframe/runner/logger.hpp
+        include/tcframe/runner/logger/BaseLogger.hpp
+        include/tcframe/runner/logger/DefaultBaseLogger.hpp
+        include/tcframe/runner/logger/LoggerEngine.hpp
         include/tcframe/runner/logger/RunnerLogger.hpp
+        include/tcframe/runner/logger/SimpleLoggerEngine.hpp
+        include/tcframe/runner/os.hpp
+        include/tcframe/runner/os/ExecutionResult.hpp
+        include/tcframe/runner/os/ExecutionRequest.hpp
+        include/tcframe/runner/os/OperatingSystem.hpp
+        include/tcframe/runner/os/TestCasePathCreator.hpp
         include/tcframe/runner/verdict.hpp
         include/tcframe/runner/verdict/Verdict.hpp
         include/tcframe/runner/verdict/VerdictCreator.hpp
@@ -174,11 +173,6 @@ set(TEST_UNIT
         test/unit/tcframe/driver/TestCaseDriverTests.cpp
         test/unit/tcframe/helper.hpp
         test/unit/tcframe/mock.hpp
-        test/unit/tcframe/logger/DefaultBaseLogggerTests.cpp
-        test/unit/tcframe/logger/MockLoggerEngine.hpp
-        test/unit/tcframe/logger/SimpleLoggerEngineTests.cpp
-        test/unit/tcframe/os/MockOperatingSystem.hpp
-        test/unit/tcframe/os/TestCasePathCreatorTests.cpp
         test/unit/tcframe/runner/aggregator/MinAggregatorTests.cpp
         test/unit/tcframe/runner/aggregator/MockAggregator.hpp
         test/unit/tcframe/runner/aggregator/MockAggregatorRegistry.hpp
@@ -212,8 +206,13 @@ set(TEST_UNIT
         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/DefaultBaseLogggerTests.cpp
         test/unit/tcframe/runner/logger/MockRunnerLogger.hpp
+        test/unit/tcframe/runner/logger/MockLoggerEngine.hpp
         test/unit/tcframe/runner/logger/RunnerLoggerTests.cpp
+        test/unit/tcframe/runner/logger/SimpleLoggerEngineTests.cpp
+        test/unit/tcframe/runner/os/MockOperatingSystem.hpp
+        test/unit/tcframe/runner/os/TestCasePathCreatorTests.cpp
         test/unit/tcframe/runner/verdict/MockVerdictCreator.hpp
         test/unit/tcframe/runner/verdict/VerdictCreatorTests.cpp
         test/unit/tcframe/runner/verdict/VerdictTests.cpp
@@ -266,7 +265,7 @@ set(TEST_INTEGRATION
         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
+        test/integration/tcframe/runner/os/OperatingSystemIntegrationTests.cpp
 )
 
 add_executable(test_integration ${INCLUDE} ${TEST_INTEGRATION})

diff --git a/include/tcframe/logger.hpp b/include/tcframe/logger.hpp
diff --git a/include/tcframe/os.hpp b/include/tcframe/os.hpp
diff --git a/include/tcframe/runner.hpp b/include/tcframe/runner.hpp
@@ -9,4 +9,5 @@
 #include "tcframe/runner/generator.hpp"
 #include "tcframe/runner/grader.hpp"
 #include "tcframe/runner/logger.hpp"
+#include "tcframe/runner/os.hpp"
 #include "tcframe/runner/verdict.hpp"
diff --git a/include/tcframe/runner/client/SpecClient.hpp b/include/tcframe/runner/client/SpecClient.hpp
@@ -3,7 +3,7 @@
 #include <string>
 
 #include "tcframe/driver.hpp"
-#include "tcframe/os.hpp"
+#include "tcframe/runner/os.hpp"
 #include "tcframe/spec/testcase.hpp"
 
 using std::string;

diff --git a/include/tcframe/runner/core/Runner.hpp b/include/tcframe/runner/core/Runner.hpp
@@ -5,13 +5,13 @@
 
 #include "Args.hpp"
 #include "ArgsParser.hpp"
-#include "tcframe/os.hpp"
 #include "tcframe/runner/aggregator.hpp"
 #include "tcframe/runner/client.hpp"
 #include "tcframe/runner/evaluator.hpp"
 #include "tcframe/runner/generator.hpp"
 #include "tcframe/runner/grader.hpp"
 #include "tcframe/runner/logger.hpp"
+#include "tcframe/runner/os.hpp"
 #include "tcframe/spec.hpp"
 #include "tcframe/util.hpp"
 

diff --git a/include/tcframe/runner/evaluator/BatchEvaluator.hpp b/include/tcframe/runner/evaluator/BatchEvaluator.hpp
@@ -8,7 +8,7 @@
 #include "Evaluator.hpp"
 #include "GenerationResult.hpp"
 #include "scorer.hpp"
-#include "tcframe/os.hpp"
+#include "tcframe/runner/os.hpp"
 #include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
 

diff --git a/include/tcframe/runner/evaluator/EvaluationResult.hpp b/include/tcframe/runner/evaluator/EvaluationResult.hpp
@@ -4,7 +4,7 @@
 #include <string>
 #include <tuple>
 
-#include "tcframe/os.hpp"
+#include "tcframe/runner/os.hpp"
 #include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
 

diff --git a/include/tcframe/runner/evaluator/EvaluatorHelperRegistry.hpp b/include/tcframe/runner/evaluator/EvaluatorHelperRegistry.hpp
@@ -2,7 +2,7 @@
 
 #include <string>
 
-#include "tcframe/os.hpp"
+#include "tcframe/runner/os.hpp"
 #include "tcframe/util.hpp"
 #include "communicator.hpp"
 #include "scorer.hpp"

diff --git a/include/tcframe/runner/evaluator/EvaluatorRegistry.hpp b/include/tcframe/runner/evaluator/EvaluatorRegistry.hpp
@@ -9,7 +9,7 @@
 #include "InteractiveEvaluator.hpp"
 #include "communicator.hpp"
 #include "scorer.hpp"
-#include "tcframe/os.hpp"
+#include "tcframe/runner/os.hpp"
 #include "tcframe/runner/verdict.hpp"
 #include "tcframe/spec.hpp"
 #include "tcframe/util.hpp"

diff --git a/include/tcframe/runner/evaluator/GenerationResult.hpp b/include/tcframe/runner/evaluator/GenerationResult.hpp
@@ -2,7 +2,7 @@
 
 #include <tuple>
 
-#include "tcframe/os.hpp"
+#include "tcframe/runner/os.hpp"
 #include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
 

diff --git a/include/tcframe/runner/evaluator/communicator/CommunicationResult.hpp b/include/tcframe/runner/evaluator/communicator/CommunicationResult.hpp
@@ -2,7 +2,7 @@
 
 #include <tuple>
 
-#include "tcframe/os.hpp"
+#include "tcframe/runner/os.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
@@ -6,7 +6,7 @@
 
 #include "../EvaluationOptions.hpp"
 #include "CommunicationResult.hpp"
-#include "tcframe/os.hpp"
+#include "tcframe/runner/os.hpp"
 #include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
 

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

diff --git a/include/tcframe/runner/evaluator/scorer/DiffScorer.hpp b/include/tcframe/runner/evaluator/scorer/DiffScorer.hpp
@@ -5,7 +5,7 @@
 
 #include "Scorer.hpp"
 #include "ScoringResult.hpp"
-#include "tcframe/os.hpp"
+#include "tcframe/runner/os.hpp"
 #include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
 

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

diff --git a/include/tcframe/runner/generator/DefaultGeneratorLogger.hpp b/include/tcframe/runner/generator/DefaultGeneratorLogger.hpp
@@ -6,7 +6,7 @@
 #include <vector>
 
 #include "GeneratorLogger.hpp"
-#include "tcframe/logger.hpp"
+#include "tcframe/runner/logger.hpp"
 #include "tcframe/spec/constraint.hpp"
 #include "tcframe/spec/exception.hpp"
 #include "tcframe/spec/verifier.hpp"

diff --git a/include/tcframe/runner/generator/Generator.hpp b/include/tcframe/runner/generator/Generator.hpp
@@ -6,7 +6,7 @@
 #include "GenerationOptions.hpp"
 #include "GeneratorLogger.hpp"
 #include "TestCaseGenerator.hpp"
-#include "tcframe/os.hpp"
+#include "tcframe/runner/os.hpp"
 #include "tcframe/runner/client.hpp"
 #include "tcframe/spec/core.hpp"
 #include "tcframe/spec/exception.hpp"

diff --git a/include/tcframe/runner/generator/GeneratorLogger.hpp b/include/tcframe/runner/generator/GeneratorLogger.hpp
@@ -5,7 +5,7 @@
 #include <utility>
 #include <vector>
 
-#include "tcframe/logger.hpp"
+#include "tcframe/runner/logger.hpp"
 #include "tcframe/spec/constraint.hpp"
 #include "tcframe/spec/exception.hpp"
 #include "tcframe/spec/verifier.hpp"

diff --git a/include/tcframe/runner/grader/BriefGraderLogger.hpp b/include/tcframe/runner/grader/BriefGraderLogger.hpp
@@ -3,7 +3,7 @@
 #include <map>
 
 #include "GraderLogger.hpp"
-#include "tcframe/logger.hpp"
+#include "tcframe/runner/logger.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
@@ -3,7 +3,7 @@
 #include <map>
 
 #include "GraderLogger.hpp"
-#include "tcframe/logger.hpp"
+#include "tcframe/runner/logger.hpp"
 #include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
 

diff --git a/include/tcframe/runner/grader/Grader.hpp b/include/tcframe/runner/grader/Grader.hpp
@@ -8,7 +8,7 @@
 #include "GradingOptions.hpp"
 #include "GraderLogger.hpp"
 #include "TestCaseGrader.hpp"
-#include "tcframe/os.hpp"
+#include "tcframe/runner/os.hpp"
 #include "tcframe/runner/aggregator.hpp"
 #include "tcframe/runner/client.hpp"
 #include "tcframe/runner/verdict.hpp"

diff --git a/include/tcframe/runner/grader/GraderLogger.hpp b/include/tcframe/runner/grader/GraderLogger.hpp
@@ -2,7 +2,7 @@
 
 #include <map>
 
-#include "tcframe/logger.hpp"
+#include "tcframe/runner/logger.hpp"
 #include "tcframe/runner/verdict.hpp"
 #include "tcframe/util.hpp"
 

diff --git a/include/tcframe/runner/grader/GraderLoggerFactory.hpp b/include/tcframe/runner/grader/GraderLoggerFactory.hpp
@@ -3,7 +3,7 @@
 #include "BriefGraderLogger.hpp"
 #include "DefaultGraderLogger.hpp"
 #include "GraderLogger.hpp"
-#include "tcframe/logger.hpp"
+#include "tcframe/runner/logger.hpp"
 
 namespace tcframe {
 

diff --git a/include/tcframe/runner/logger.hpp b/include/tcframe/runner/logger.hpp
@@ -1,3 +1,7 @@
 #pragma once
 
+#include "tcframe/runner/logger/BaseLogger.hpp"
+#include "tcframe/runner/logger/DefaultBaseLogger.hpp"
+#include "tcframe/runner/logger/LoggerEngine.hpp"
 #include "tcframe/runner/logger/RunnerLogger.hpp"
+#include "tcframe/runner/logger/SimpleLoggerEngine.hpp"
diff --git a/include/tcframe/logger/BaseLogger.hpp → include/tcframe/runner/logger/BaseLogger.hpp b/include/tcframe/logger/BaseLogger.hpp → include/tcframe/runner/logger/BaseLogger.hpp
@@ -3,7 +3,7 @@
 #include <map>
 #include <string>
 
-#include "tcframe/os.hpp"
+#include "tcframe/runner/os.hpp"
 
 using std::map;
 using std::string;

diff --git a/include/tcframe/logger/DefaultBaseLogger.hpp → ...frame/runner/logger/DefaultBaseLogger.hpp b/include/tcframe/logger/DefaultBaseLogger.hpp → ...frame/runner/logger/DefaultBaseLogger.hpp
@@ -6,7 +6,7 @@
 
 #include "BaseLogger.hpp"
 #include "LoggerEngine.hpp"
-#include "tcframe/os.hpp"
+#include "tcframe/runner/os.hpp"
 #include "tcframe/spec/testcase.hpp"
 #include "tcframe/util.hpp"
 

diff --git a/include/tcframe/logger/LoggerEngine.hpp → ...de/tcframe/runner/logger/LoggerEngine.hpp b/include/tcframe/logger/LoggerEngine.hpp → ...de/tcframe/runner/logger/LoggerEngine.hpp
diff --git a/include/tcframe/runner/logger/RunnerLogger.hpp b/include/tcframe/runner/logger/RunnerLogger.hpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <vector>
 
-#include "tcframe/logger.hpp"
+#include "LoggerEngine.hpp"
 
 using std::string;
 using std::vector;

diff --git a/...ude/tcframe/logger/SimpleLoggerEngine.hpp → ...rame/runner/logger/SimpleLoggerEngine.hpp b/...ude/tcframe/logger/SimpleLoggerEngine.hpp → ...rame/runner/logger/SimpleLoggerEngine.hpp
diff --git a/include/tcframe/runner/os.hpp b/include/tcframe/runner/os.hpp
@@ -0,0 +1,6 @@
+#pragma once
+
+#include "tcframe/runner/os/ExecutionResult.hpp"
+#include "tcframe/runner/os/ExecutionRequest.hpp"
+#include "tcframe/runner/os/OperatingSystem.hpp"
+#include "tcframe/runner/os/TestCasePathCreator.hpp"
diff --git a/include/tcframe/os/ExecutionRequest.hpp → ...de/tcframe/runner/os/ExecutionRequest.hpp b/include/tcframe/os/ExecutionRequest.hpp → ...de/tcframe/runner/os/ExecutionRequest.hpp
diff --git a/include/tcframe/os/ExecutionResult.hpp → ...ude/tcframe/runner/os/ExecutionResult.hpp b/include/tcframe/os/ExecutionResult.hpp → ...ude/tcframe/runner/os/ExecutionResult.hpp
diff --git a/include/tcframe/os/OperatingSystem.hpp → ...ude/tcframe/runner/os/OperatingSystem.hpp b/include/tcframe/os/OperatingSystem.hpp → ...ude/tcframe/runner/os/OperatingSystem.hpp
diff --git a/include/tcframe/os/TestCasePathCreator.hpp → ...tcframe/runner/os/TestCasePathCreator.hpp b/include/tcframe/os/TestCasePathCreator.hpp → ...tcframe/runner/os/TestCasePathCreator.hpp
diff --git a/include/tcframe/runner/verdict/VerdictCreator.hpp b/include/tcframe/runner/verdict/VerdictCreator.hpp
@@ -6,7 +6,7 @@
 #include <sys/signal.h>
 
 #include "Verdict.hpp"
-#include "tcframe/os.hpp"
+#include "tcframe/runner/os.hpp"
 #include "tcframe/util.hpp"
 
 using std::getline;

diff --git a/include/tcframe/spec/core/Magic.hpp b/include/tcframe/spec/core/Magic.hpp
@@ -5,7 +5,6 @@
 #include <string>
 #include <vector>
 
-#include "tcframe/logger.hpp"
 #include "tcframe/spec/io.hpp"
 #include "tcframe/spec/variable.hpp"
 #include "tcframe/util.hpp"

diff --git a/...me/os/OperatingSystemIntegrationTests.cpp → ...er/os/OperatingSystemIntegrationTests.cpp b/...me/os/OperatingSystemIntegrationTests.cpp → ...er/os/OperatingSystemIntegrationTests.cpp
@@ -2,7 +2,7 @@
 
 #include <cstdlib>
 
-#include "tcframe/os/OperatingSystem.hpp"
+#include "tcframe/runner/os/OperatingSystem.hpp"
 #include "tcframe/util.hpp"
 
 using ::testing::Eq;

diff --git a/test/unit/tcframe/runner/client/SpecClientTests.cpp b/test/unit/tcframe/runner/client/SpecClientTests.cpp
@@ -5,7 +5,7 @@
 
 #include "../../util/TestUtils.hpp"
 #include "../../driver/MockSpecDriver.hpp"
-#include "../../os/MockOperatingSystem.hpp"
+#include "../os/MockOperatingSystem.hpp"
 #include "tcframe/runner/client/SpecClient.hpp"
 
 using ::testing::_;

diff --git a/test/unit/tcframe/runner/core/BaseRunnerTests.hpp b/test/unit/tcframe/runner/core/BaseRunnerTests.hpp
@@ -1,17 +1,17 @@
 #include "gmock/gmock.h"
 #include "../../mock.hpp"
 
-#include "../../os/MockOperatingSystem.hpp"
 #include "../../driver/MockDriver.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"
-#include "../../runner/grader/MockGraderLoggerFactory.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 "../logger/MockRunnerLogger.hpp"
+#include "../os/MockOperatingSystem.hpp"
 #include "tcframe/runner/core/Runner.hpp"
 
 using ::testing::_;

diff --git a/test/unit/tcframe/runner/evaluator/BatchEvaluatorTests.cpp b/test/unit/tcframe/runner/evaluator/BatchEvaluatorTests.cpp
@@ -3,8 +3,8 @@
 
 #include <sstream>
 
-#include "../../os/MockOperatingSystem.hpp"
-#include "../../runner/verdict/MockVerdictCreator.hpp"
+#include "../os/MockOperatingSystem.hpp"
+#include "../verdict/MockVerdictCreator.hpp"
 #include "scorer/MockScorer.hpp"
 #include "tcframe/runner/evaluator/BatchEvaluator.hpp"
 

diff --git a/test/unit/tcframe/runner/evaluator/InteractiveEvaluatorTests.cpp b/test/unit/tcframe/runner/evaluator/InteractiveEvaluatorTests.cpp
@@ -1,7 +1,7 @@
 #include "gmock/gmock.h"
 #include "../../mock.hpp"
 
-#include "./communicator/MockCommunicator.hpp"
+#include "communicator/MockCommunicator.hpp"
 #include "tcframe/runner/evaluator/InteractiveEvaluator.hpp"
 
 using ::testing::Eq;