Refactor runner: Move io_manipulator package to spec/

ia-toki · Jul 22, 2017 · 810c07f · 810c07f
1 parent 48f028f
commit 810c07f
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 32 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -80,13 +80,6 @@ set(INCLUDE
         include/tcframe/grader/GraderLoggerFactory.hpp
         include/tcframe/grader/GradingOptions.hpp
         include/tcframe/grader/TestCaseGrader.hpp
-        include/tcframe/io_manipulator.hpp
-        include/tcframe/io_manipulator/GridIOSegmentManipulator.hpp
-        include/tcframe/io_manipulator/IOManipulator.hpp
-        include/tcframe/io_manipulator/LineIOSegmentManipulator.hpp
-        include/tcframe/io_manipulator/LinesIOSegmentManipulator.hpp
-        include/tcframe/io_manipulator/RawLineIOSegmentManipulator.hpp
-        include/tcframe/io_manipulator/RawLinesIOSegmentManipulator.hpp
         include/tcframe/logger.hpp
         include/tcframe/logger/BaseLogger.hpp
         include/tcframe/logger/DefaultBaseLogger.hpp
@@ -124,6 +117,13 @@ set(INCLUDE
         include/tcframe/spec/io/LinesIOSegment.hpp
         include/tcframe/spec/io/RawLineIOSegment.hpp
         include/tcframe/spec/io/RawLinesIOSegment.hpp
+        include/tcframe/spec/io_manipulator.hpp
+        include/tcframe/spec/io_manipulator/GridIOSegmentManipulator.hpp
+        include/tcframe/spec/io_manipulator/IOManipulator.hpp
+        include/tcframe/spec/io_manipulator/LineIOSegmentManipulator.hpp
+        include/tcframe/spec/io_manipulator/LinesIOSegmentManipulator.hpp
+        include/tcframe/spec/io_manipulator/RawLineIOSegmentManipulator.hpp
+        include/tcframe/spec/io_manipulator/RawLinesIOSegmentManipulator.hpp
         include/tcframe/spec/random.hpp
         include/tcframe/spec/random/Random.hpp
         include/tcframe/spec/testcase.hpp
@@ -183,13 +183,6 @@ set(TEST_UNIT
         test/unit/tcframe/grader/MockGraderLoggerFactory.hpp
         test/unit/tcframe/grader/MockTestCaseGrader.hpp
         test/unit/tcframe/grader/TestCaseGraderTests.cpp
-        test/unit/tcframe/io_manipulator/GridIOSegmentManipulatorTests.cpp
-        test/unit/tcframe/io_manipulator/IOManipulatorTests.cpp
-        test/unit/tcframe/io_manipulator/LineIOSegmentManipulatorTests.cpp
-        test/unit/tcframe/io_manipulator/LinesIOSegmentManipulatorTests.cpp
-        test/unit/tcframe/io_manipulator/MockIOManipulator.hpp
-        test/unit/tcframe/io_manipulator/RawLineIOSegmentManipulatorTests.cpp
-        test/unit/tcframe/io_manipulator/RawLinesIOSegmentManipulatorTests.cpp
         test/unit/tcframe/logger/DefaultBaseLogggerTests.cpp
         test/unit/tcframe/logger/MockLoggerEngine.hpp
         test/unit/tcframe/logger/SimpleLoggerEngineTests.cpp
@@ -214,6 +207,13 @@ set(TEST_UNIT
         test/unit/tcframe/spec/io/LinesIOSegmentBuilderTests.cpp
         test/unit/tcframe/spec/io/RawLineIOSegmentBuilderTests.cpp
         test/unit/tcframe/spec/io/RawLinesIOSegmentBuilderTests.cpp
+        test/unit/tcframe/spec/io_manipulator/GridIOSegmentManipulatorTests.cpp
+        test/unit/tcframe/spec/io_manipulator/IOManipulatorTests.cpp
+        test/unit/tcframe/spec/io_manipulator/LineIOSegmentManipulatorTests.cpp
+        test/unit/tcframe/spec/io_manipulator/LinesIOSegmentManipulatorTests.cpp
+        test/unit/tcframe/spec/io_manipulator/MockIOManipulator.hpp
+        test/unit/tcframe/spec/io_manipulator/RawLineIOSegmentManipulatorTests.cpp
+        test/unit/tcframe/spec/io_manipulator/RawLinesIOSegmentManipulatorTests.cpp
         test/unit/tcframe/spec/random/RandomTests.cpp
         test/unit/tcframe/spec/testcase/TestCaseTests.cpp
         test/unit/tcframe/spec/testcase/TestGroupTests.cpp

diff --git a/include/tcframe/generator/TestCaseGenerator.hpp b/include/tcframe/generator/TestCaseGenerator.hpp
@@ -10,7 +10,6 @@
 #include "GenerationOptions.hpp"
 #include "GeneratorLogger.hpp"
 #include "tcframe/evaluator.hpp"
-#include "tcframe/io_manipulator.hpp"
 #include "tcframe/os.hpp"
 #include "tcframe/spec.hpp"
 #include "tcframe/verdict.hpp"

diff --git a/include/tcframe/io_manipulator.hpp b/include/tcframe/io_manipulator.hpp
diff --git a/include/tcframe/spec.hpp b/include/tcframe/spec.hpp
@@ -3,6 +3,7 @@
 #include "tcframe/spec/constraint.hpp"
 #include "tcframe/spec/core.hpp"
 #include "tcframe/spec/io.hpp"
+#include "tcframe/spec/io_manipulator.hpp"
 #include "tcframe/spec/random.hpp"
 #include "tcframe/spec/testcase.hpp"
 #include "tcframe/spec/variable.hpp"

diff --git a/include/tcframe/spec/io_manipulator.hpp b/include/tcframe/spec/io_manipulator.hpp
@@ -0,0 +1,8 @@
+#pragma once
+
+#include "tcframe/spec/io_manipulator/GridIOSegmentManipulator.hpp"
+#include "tcframe/spec/io_manipulator/IOManipulator.hpp"
+#include "tcframe/spec/io_manipulator/LineIOSegmentManipulator.hpp"
+#include "tcframe/spec/io_manipulator/LinesIOSegmentManipulator.hpp"
+#include "tcframe/spec/io_manipulator/RawLineIOSegmentManipulator.hpp"
+#include "tcframe/spec/io_manipulator/RawLinesIOSegmentManipulator.hpp"
diff --git a/..._manipulator/GridIOSegmentManipulator.hpp → ..._manipulator/GridIOSegmentManipulator.hpp b/..._manipulator/GridIOSegmentManipulator.hpp → ..._manipulator/GridIOSegmentManipulator.hpp
diff --git a/.../tcframe/io_manipulator/IOManipulator.hpp → ...ame/spec/io_manipulator/IOManipulator.hpp b/.../tcframe/io_manipulator/IOManipulator.hpp → ...ame/spec/io_manipulator/IOManipulator.hpp
diff --git a/..._manipulator/LineIOSegmentManipulator.hpp → ..._manipulator/LineIOSegmentManipulator.hpp b/..._manipulator/LineIOSegmentManipulator.hpp → ..._manipulator/LineIOSegmentManipulator.hpp
diff --git a/...manipulator/LinesIOSegmentManipulator.hpp → ...manipulator/LinesIOSegmentManipulator.hpp b/...manipulator/LinesIOSegmentManipulator.hpp → ...manipulator/LinesIOSegmentManipulator.hpp
diff --git a/...nipulator/RawLineIOSegmentManipulator.hpp → ...nipulator/RawLineIOSegmentManipulator.hpp b/...nipulator/RawLineIOSegmentManipulator.hpp → ...nipulator/RawLineIOSegmentManipulator.hpp
diff --git a/...ipulator/RawLinesIOSegmentManipulator.hpp → ...ipulator/RawLinesIOSegmentManipulator.hpp b/...ipulator/RawLinesIOSegmentManipulator.hpp → ...ipulator/RawLinesIOSegmentManipulator.hpp
diff --git a/test/unit/tcframe/generator/GeneratorTests.cpp b/test/unit/tcframe/generator/GeneratorTests.cpp
@@ -1,7 +1,6 @@
 #include "gmock/gmock.h"
 #include "../mock.hpp"
 
-#include "../io_manipulator/MockIOManipulator.hpp"
 #include "../os/MockOperatingSystem.hpp"
 #include "../spec/core/MockSeedSetter.hpp"
 #include "../spec/verifier/MockVerifier.hpp"

diff --git a/test/unit/tcframe/generator/TestCaseGeneratorTests.cpp b/test/unit/tcframe/generator/TestCaseGeneratorTests.cpp
@@ -4,8 +4,8 @@
 #include <sstream>
 
 #include "../evaluator/MockEvaluator.hpp"
-#include "../io_manipulator/MockIOManipulator.hpp"
 #include "../os/MockOperatingSystem.hpp"
+#include "../spec/io_manipulator/MockIOManipulator.hpp"
 #include "../spec/verifier/MockVerifier.hpp"
 #include "MockGeneratorLogger.hpp"
 #include "tcframe/generator/TestCaseGenerator.hpp"

diff --git a/...pulator/GridIOSegmentManipulatorTests.cpp → ...pulator/GridIOSegmentManipulatorTests.cpp b/...pulator/GridIOSegmentManipulatorTests.cpp → ...pulator/GridIOSegmentManipulatorTests.cpp
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "tcframe/io_manipulator/GridIOSegmentManipulator.hpp"
+#include "tcframe/spec/io_manipulator/GridIOSegmentManipulator.hpp"
 
 using ::testing::Eq;
 using ::testing::StrEq;

diff --git a/...ame/io_manipulator/IOManipulatorTests.cpp → ...pec/io_manipulator/IOManipulatorTests.cpp b/...ame/io_manipulator/IOManipulatorTests.cpp → ...pec/io_manipulator/IOManipulatorTests.cpp
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "tcframe/io_manipulator/IOManipulator.hpp"
+#include "tcframe/spec/io_manipulator/IOManipulator.hpp"
 
 using ::testing::Eq;
 using ::testing::StrEq;

diff --git a/...pulator/LineIOSegmentManipulatorTests.cpp → ...pulator/LineIOSegmentManipulatorTests.cpp b/...pulator/LineIOSegmentManipulatorTests.cpp → ...pulator/LineIOSegmentManipulatorTests.cpp
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "tcframe/io_manipulator/LineIOSegmentManipulator.hpp"
+#include "tcframe/spec/io_manipulator/LineIOSegmentManipulator.hpp"
 
 using ::testing::Eq;
 using ::testing::StrEq;

diff --git a/...ulator/LinesIOSegmentManipulatorTests.cpp → ...ulator/LinesIOSegmentManipulatorTests.cpp b/...ulator/LinesIOSegmentManipulatorTests.cpp → ...ulator/LinesIOSegmentManipulatorTests.cpp
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "tcframe/io_manipulator/LinesIOSegmentManipulator.hpp"
+#include "tcframe/spec/io_manipulator/LinesIOSegmentManipulator.hpp"
 
 using ::testing::Eq;
 using ::testing::StrEq;

diff --git a/...rame/io_manipulator/MockIOManipulator.hpp → ...spec/io_manipulator/MockIOManipulator.hpp b/...rame/io_manipulator/MockIOManipulator.hpp → ...spec/io_manipulator/MockIOManipulator.hpp
@@ -2,7 +2,7 @@
 
 #include "gmock/gmock.h"
 
-#include "tcframe/io_manipulator/IOManipulator.hpp"
+#include "tcframe/spec/io_manipulator/IOManipulator.hpp"
 
 namespace tcframe {
 

diff --git a/...ator/RawLineIOSegmentManipulatorTests.cpp → ...ator/RawLineIOSegmentManipulatorTests.cpp b/...ator/RawLineIOSegmentManipulatorTests.cpp → ...ator/RawLineIOSegmentManipulatorTests.cpp
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "tcframe/io_manipulator/RawLineIOSegmentManipulator.hpp"
+#include "tcframe/spec/io_manipulator/RawLineIOSegmentManipulator.hpp"
 
 using ::testing::Eq;
 using ::testing::StrEq;

diff --git a/...tor/RawLinesIOSegmentManipulatorTests.cpp → ...tor/RawLinesIOSegmentManipulatorTests.cpp b/...tor/RawLinesIOSegmentManipulatorTests.cpp → ...tor/RawLinesIOSegmentManipulatorTests.cpp
@@ -2,7 +2,7 @@
 
 #include <sstream>
 
-#include "tcframe/io_manipulator/RawLinesIOSegmentManipulator.hpp"
+#include "tcframe/spec/io_manipulator/RawLinesIOSegmentManipulator.hpp"
 
 using ::testing::Eq;
 using ::testing::StrEq;