Merge pull request #59 from Neko-Box-Coder/CITestFix

Adding missing config parsing test

Author: Neko-Box-Coder

Include/Tests/ConfigParsing/MockComponents.hpp

@@ -19,14 +19,14 @@ namespace ghc
         CO_INSERT_METHOD(   OverrideInstance, 
                             bool, 
                             Mock_exists, 
-                            (const std::string&, std::error_code&),
+                            (const ghc::filesystem::path&, std::error_code&),
                             /* no prepend */,
                             noexcept)
 
         CO_INSERT_METHOD(   OverrideInstance, 
                             bool, 
                             Mock_is_directory, 
-                            (const std::string&, std::error_code&),
+                            (const ghc::filesystem::path&, std::error_code&),
                             /* no prepend */,
                             noexcept)
     }

Src/Tests/ConfigParsingTest.cpp

@@ -60,17 +60,19 @@ int main(int argc, char** argv)
         */
 
         CO_INSTRUCT_REF (OverrideInstance, ghc::filesystem, Mock_exists)
-                        .WhenCalledWith<const std::string&, CO_ANY_TYPE>(configPath, CO_ANY)
+                        .WhenCalledWith<const ghc::filesystem::path&, CO_ANY_TYPE>(configPath, CO_ANY)
                         .Times(1)
                         .Returns<bool>(true)
                         .Expected();
         CO_INSTRUCT_REF (OverrideInstance, ghc::filesystem, Mock_exists)
-                        .WhenCalledWith<const std::string&, CO_ANY_TYPE>(versionPath, CO_ANY)
+                        .WhenCalledWith<const ghc::filesystem::path&, CO_ANY_TYPE>( versionPath, 
+                                                                                    CO_ANY)
                         .Times(1)
                         .Returns<bool>(true)
                         .Expected();
         CO_INSTRUCT_REF (OverrideInstance, ghc::filesystem, Mock_is_directory)
-                        .WhenCalledWith<const std::string&, CO_ANY_TYPE>(configPath, CO_ANY)
+                        .WhenCalledWith<const ghc::filesystem::path&, CO_ANY_TYPE>( configPath, 
+                                                                                    CO_ANY)
                         .Times(1)
                         .Returns<bool>(false)
                         .Expected();
@@ -292,12 +294,14 @@ int main(int argc, char** argv)
         (
             ssTEST_CALL_COMMON_CLEANUP();
             CO_INSTRUCT_REF (OverrideInstance, ghc::filesystem, Mock_exists)
-                            .WhenCalledWith<const std::string&, CO_ANY_TYPE>(configPath, CO_ANY)
+                            .WhenCalledWith<const ghc::filesystem::path&, CO_ANY_TYPE>( configPath, 
+                                                                                        CO_ANY)
                             .Times(1)
                             .Returns<bool>(true)
                             .Expected();
             CO_INSTRUCT_REF (OverrideInstance, ghc::filesystem, Mock_exists)
-                            .WhenCalledWith<const std::string&, CO_ANY_TYPE>(versionPath, CO_ANY)
+                            .WhenCalledWith<const ghc::filesystem::path&, CO_ANY_TYPE>( versionPath, 
+                                                                                        CO_ANY)
                             .Times(1)
                             .Returns<bool>(false)
                             .Expected();
@@ -660,14 +664,14 @@ int main(int argc, char** argv)
                 "some/config/dir/Default/gccCompilerLinker.yaml";
 
             CO_INSTRUCT_REF (OverrideInstance, ghc::filesystem, Mock_exists)
-                            .WhenCalledWith<const std::string&, 
+                            .WhenCalledWith<const ghc::filesystem::path&, 
                                             CO_ANY_TYPE>(   gccExpectedImportPath, 
                                                             CO_ANY)
                             .Returns<bool>(true)
                             .Times(1)
                             .Expected();
             CO_INSTRUCT_REF (OverrideInstance, ghc::filesystem, Mock_exists)
-                            .WhenCalledWith<const std::string&, 
+                            .WhenCalledWith<const ghc::filesystem::path&, 
                                             CO_ANY_TYPE>(   filetypesExpectedImportPath, 
                                                             CO_ANY)
                             .Returns<bool>(true)
@@ -676,7 +680,7 @@ int main(int argc, char** argv)
             CO_INSTRUCT_REF (OverrideInstance, ghc::filesystem, Mock_exists)
                             .WhenCalledWith
                             <
-                                const std::string&, 
+                                const ghc::filesystem::path&, 
                                 CO_ANY_TYPE
                             >
                             (

Src/Tests/RunAllTests.bat

@@ -22,9 +22,9 @@ GOTO :FINAL
 :RUN_TEST <testFile>
     @REM Setlocal EnableDelayedExpansion
     IF NOT EXIST "%~1" (
-        ECHO "[Auto Test Warning] %~1 doesn't exist, skipping"
+        ECHO "%~1 doesn't exist"
         ECHO ""
-        EXIT /b
+        GOTO :FAILED
     )
     PUSHD "%~dp1"
     CALL "%~1"
@@ -54,6 +54,7 @@ CALL :RUN_TEST "%~dp0\%MODE%DependencyInfoTest.exe"
 CALL :RUN_TEST "%~dp0\%MODE%ScriptInfoTest.exe"
 CALL :RUN_TEST "%~dp0\%MODE%ProfileTest.exe"
 CALL :RUN_TEST "%~dp0\%MODE%BuildTypeTest.exe"
+CALL :RUN_TEST "%~dp0\%MODE%ConfigParsingTest.exe"
 
 EXIT 0
 

Src/Tests/RunAllTests.sh

@@ -9,7 +9,7 @@ function runTest()
         $1
     else
         echo "[Auto Test Warning] $1 doesn't exist, skipping"
-        echo ""
+        exit 1
     fi
 }
 
@@ -30,3 +30,4 @@ runTest ./DependencyInfoTest
 runTest ./ScriptInfoTest
 runTest ./ProfileTest
 runTest ./BuildTypeTest
+runTest ./ConfigParsingTest