Refactor runner: Move verifier package to spec/

ia-toki · Jul 19, 2017 · 48f028f · 48f028f
1 parent 23c7e77
commit 48f028f
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 20 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -140,6 +140,10 @@ set(INCLUDE
         include/tcframe/spec/variable/Variable.hpp
         include/tcframe/spec/variable/Vector.hpp
         include/tcframe/spec/variable/WhitespaceManipulator.hpp
+        include/tcframe/spec/verifier.hpp
+        include/tcframe/spec/verifier/ConstraintsVerificationResult.hpp
+        include/tcframe/spec/verifier/MultipleTestCasesConstraintsVerificationResult.hpp
+        include/tcframe/spec/verifier/Verifier.hpp
         include/tcframe/util.hpp
         include/tcframe/util/NotImplementedException.hpp
         include/tcframe/util/StringUtils.hpp
@@ -148,10 +152,6 @@ set(INCLUDE
         include/tcframe/verdict/Verdict.hpp
         include/tcframe/verdict/VerdictCreator.hpp
         include/tcframe/verdict/VerdictStatus.hpp
-        include/tcframe/verifier.hpp
-        include/tcframe/verifier/ConstraintsVerificationResult.hpp
-        include/tcframe/verifier/MultipleTestCasesConstraintsVerificationResult.hpp
-        include/tcframe/verifier/Verifier.hpp
 )
 
 set(TEST_UNIT
@@ -224,14 +224,14 @@ set(TEST_UNIT
         test/unit/tcframe/spec/variable/VariableTests.cpp
         test/unit/tcframe/spec/variable/VectorTests.cpp
         test/unit/tcframe/spec/variable/WhitespaceManipulatorTests.cpp
+        test/unit/tcframe/spec/verifier/MockVerifier.hpp
+        test/unit/tcframe/spec/verifier/VerifierTests.cpp
         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
-        test/unit/tcframe/verifier/MockVerifier.hpp
-        test/unit/tcframe/verifier/VerifierTests.cpp
 )
 
 add_executable(test_unit ${INCLUDE} ${TEST_UNIT})

diff --git a/include/tcframe/generator/DefaultGeneratorLogger.hpp b/include/tcframe/generator/DefaultGeneratorLogger.hpp
@@ -7,8 +7,8 @@
 #include "GeneratorLogger.hpp"
 #include "tcframe/logger.hpp"
 #include "tcframe/spec/constraint.hpp"
+#include "tcframe/spec/verifier.hpp"
 #include "tcframe/util.hpp"
-#include "tcframe/verifier.hpp"
 
 using std::string;
 using std::vector;

diff --git a/include/tcframe/generator/Generator.hpp b/include/tcframe/generator/Generator.hpp
@@ -11,7 +11,6 @@
 #include "TestCaseGenerator.hpp"
 #include "tcframe/os.hpp"
 #include "tcframe/spec/core.hpp"
-#include "tcframe/verifier.hpp"
 
 using std::function;
 using std::istringstream;

diff --git a/include/tcframe/generator/GeneratorLogger.hpp b/include/tcframe/generator/GeneratorLogger.hpp
@@ -4,8 +4,8 @@
 
 #include "tcframe/logger.hpp"
 #include "tcframe/spec/constraint.hpp"
+#include "tcframe/spec/verifier.hpp"
 #include "tcframe/util.hpp"
-#include "tcframe/verifier.hpp"
 
 using std::string;
 

diff --git a/include/tcframe/generator/TestCaseGenerator.hpp b/include/tcframe/generator/TestCaseGenerator.hpp
@@ -14,7 +14,6 @@
 #include "tcframe/os.hpp"
 #include "tcframe/spec.hpp"
 #include "tcframe/verdict.hpp"
-#include "tcframe/verifier.hpp"
 
 using std::char_traits;
 using std::endl;

diff --git a/include/tcframe/runner/Runner.hpp b/include/tcframe/runner/Runner.hpp
@@ -13,7 +13,6 @@
 #include "tcframe/os.hpp"
 #include "tcframe/spec.hpp"
 #include "tcframe/util.hpp"
-#include "tcframe/verifier.hpp"
 
 using std::cout;
 using std::endl;

diff --git a/include/tcframe/spec.hpp b/include/tcframe/spec.hpp
@@ -6,4 +6,5 @@
 #include "tcframe/spec/random.hpp"
 #include "tcframe/spec/testcase.hpp"
 #include "tcframe/spec/variable.hpp"
+#include "tcframe/spec/verifier.hpp"
 
diff --git a/include/tcframe/spec/verifier.hpp b/include/tcframe/spec/verifier.hpp
@@ -0,0 +1,5 @@
+#pragma once
+
+#include "tcframe/spec/verifier/ConstraintsVerificationResult.hpp"
+#include "tcframe/spec/verifier/MultipleTestCasesConstraintsVerificationResult.hpp"
+#include "tcframe/spec/verifier/Verifier.hpp"
diff --git a/...erifier/ConstraintsVerificationResult.hpp → ...erifier/ConstraintsVerificationResult.hpp b/...erifier/ConstraintsVerificationResult.hpp → ...erifier/ConstraintsVerificationResult.hpp
diff --git a/...estCasesConstraintsVerificationResult.hpp → ...estCasesConstraintsVerificationResult.hpp b/...estCasesConstraintsVerificationResult.hpp → ...estCasesConstraintsVerificationResult.hpp
diff --git a/include/tcframe/verifier/Verifier.hpp → include/tcframe/spec/verifier/Verifier.hpp b/include/tcframe/verifier/Verifier.hpp → include/tcframe/spec/verifier/Verifier.hpp
diff --git a/include/tcframe/verifier.hpp b/include/tcframe/verifier.hpp
diff --git a/test/unit/tcframe/generator/GeneratorTests.cpp b/test/unit/tcframe/generator/GeneratorTests.cpp
@@ -4,8 +4,8 @@
 #include "../io_manipulator/MockIOManipulator.hpp"
 #include "../os/MockOperatingSystem.hpp"
 #include "../spec/core/MockSeedSetter.hpp"
+#include "../spec/verifier/MockVerifier.hpp"
 #include "../util/TestUtils.hpp"
-#include "../verifier/MockVerifier.hpp"
 #include "MockGeneratorLogger.hpp"
 #include "MockTestCaseGenerator.hpp"
 #include "tcframe/generator/Generator.hpp"

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

diff --git a/test/unit/tcframe/verifier/MockVerifier.hpp → ...it/tcframe/spec/verifier/MockVerifier.hpp b/test/unit/tcframe/verifier/MockVerifier.hpp → ...it/tcframe/spec/verifier/MockVerifier.hpp
@@ -2,7 +2,7 @@
 
 #include "gmock/gmock.h"
 
-#include "tcframe/verifier/Verifier.hpp"
+#include "tcframe/spec/verifier/Verifier.hpp"
 
 namespace tcframe {
 

diff --git a/test/unit/tcframe/verifier/VerifierTests.cpp → ...t/tcframe/spec/verifier/VerifierTests.cpp b/test/unit/tcframe/verifier/VerifierTests.cpp → ...t/tcframe/spec/verifier/VerifierTests.cpp
@@ -1,6 +1,6 @@
 #include "gmock/gmock.h"
 
-#include "tcframe/verifier/Verifier.hpp"
+#include "tcframe/spec/verifier/Verifier.hpp"
 
 using ::testing::ElementsAre;
 using ::testing::IsEmpty;