[Test] Refactor test code

Author: gongminmin

Source/Tests/CMakeLists.txt

@@ -3,8 +3,13 @@
 
 set(EXE_NAME ShaderConductorTest)
 
+set(HEADER_FILES
+    Common.hpp
+)
+
 set(SOURCE_FILES
-    ShaderConductorTest.cpp
+    Common.cpp
+    CrossCompileTest.cpp
 )
 
 set(DATA_INC_FILES
@@ -38,11 +43,12 @@ set_source_files_properties(${DATA_FILES}
     PROPERTIES VS_TOOL_OVERRIDE "None"
 )
 
+source_group("Header Files" FILES ${HEADER_FILES})
 source_group("Source Files" FILES ${SOURCE_FILES})
 source_group("Data Files\\Input" FILES ${DATA_FILES})
 source_group("Data Files\\Input\\Inc" FILES ${DATA_INC_FILES})
 
-add_executable(${EXE_NAME} ${SOURCE_FILES} ${DATA_FILES} ${DATA_INC_FILES})
+add_executable(${EXE_NAME} ${HEADER_FILES} ${SOURCE_FILES} ${DATA_FILES} ${DATA_INC_FILES})
 
 target_compile_definitions(${EXE_NAME}
     PRIVATE

Source/Tests/Common.cpp

@@ -0,0 +1,88 @@
+/*
+ * ShaderConductor
+ *
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ * MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
+ * software and associated documentation files (the "Software"), to deal in the Software
+ * without restriction, including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+ * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#include "Common.hpp"
+
+#include <gtest/gtest.h>
+
+#include <fstream>
+#include <string>
+#include <vector>
+
+namespace ShaderConductor
+{
+    std::vector<uint8_t> LoadFile(const std::string& name, bool isText)
+    {
+        std::vector<uint8_t> ret;
+        std::ios_base::openmode mode = std::ios_base::in;
+        if (!isText)
+        {
+            mode |= std::ios_base::binary;
+        }
+        std::ifstream file(name, mode);
+        if (file)
+        {
+            file.seekg(0, std::ios::end);
+            ret.resize(static_cast<size_t>(file.tellg()));
+            file.seekg(0, std::ios::beg);
+            file.read(reinterpret_cast<char*>(ret.data()), ret.size());
+            ret.resize(static_cast<size_t>(file.gcount()));
+        }
+        return ret;
+    }
+
+    void CompareWithExpected(const std::vector<uint8_t>& actual, bool isText, const std::string& compareName)
+    {
+        std::vector<uint8_t> expected = LoadFile(TEST_DATA_DIR "Expected/" + compareName, isText);
+        if (expected != actual)
+        {
+            if (!actual.empty())
+            {
+                std::ios_base::openmode mode = std::ios_base::out;
+                if (!isText)
+                {
+                    mode |= std::ios_base::binary;
+                }
+                std::ofstream actualFile(TEST_DATA_DIR "Result/" + compareName, mode);
+                actualFile.write(reinterpret_cast<const char*>(actual.data()), actual.size());
+            }
+        }
+
+        EXPECT_EQ(std::string(expected.begin(), expected.end()), std::string(actual.begin(), actual.end()));
+    }
+} // namespace ShaderConductor
+
+int main(int argc, char** argv)
+{
+    testing::InitGoogleTest(&argc, argv);
+
+    int retVal = RUN_ALL_TESTS();
+    if (retVal != 0)
+    {
+        getchar();
+    }
+
+    return retVal;
+}

Source/Tests/Common.hpp

@@ -0,0 +1,40 @@
+/*
+ * ShaderConductor
+ *
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License.
+ *
+ * MIT License
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of this
+ * software and associated documentation files (the "Software"), to deal in the Software
+ * without restriction, including without limitation the rights to use, copy, modify, merge,
+ * publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+ * to whom the Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all copies or
+ * substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED *AS IS*, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ * INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ * PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+ * FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+ * OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef SHADER_CONDUCTOR_TEST_COMMON_HPP
+#define SHADER_CONDUCTOR_TEST_COMMON_HPP
+
+#pragma once
+
+#include <string>
+#include <vector>
+
+namespace ShaderConductor
+{
+    std::vector<uint8_t> LoadFile(const std::string& name, bool isText);
+    void CompareWithExpected(const std::vector<uint8_t>& actual, bool isText, const std::string& compareName);
+} // namespace ShaderConductor
+
+#endif

Source/Tests/ShaderConductorTest.cpp renamed to Source/Tests/CrossCompileTest.cpp

@@ -25,10 +25,10 @@
 
 #include <ShaderConductor/ShaderConductor.hpp>
 
+#include "Common.hpp"
+
 #include <gtest/gtest.h>
 
-#include <cassert>
-#include <fstream>
 #include <string>
 #include <tuple>
 #include <vector>
@@ -37,46 +37,6 @@ using namespace ShaderConductor;
 
 namespace
 {
-    std::vector<uint8_t> LoadFile(const std::string& name, bool isText)
-    {
-        std::vector<uint8_t> ret;
-        std::ios_base::openmode mode = std::ios_base::in;
-        if (!isText)
-        {
-            mode |= std::ios_base::binary;
-        }
-        std::ifstream file(name, mode);
-        if (file)
-        {
-            file.seekg(0, std::ios::end);
-            ret.resize(static_cast<size_t>(file.tellg()));
-            file.seekg(0, std::ios::beg);
-            file.read(reinterpret_cast<char*>(ret.data()), ret.size());
-            ret.resize(static_cast<size_t>(file.gcount()));
-        }
-        return ret;
-    }
-
-    void CompareWithExpected(const std::vector<uint8_t>& actual, bool isText, const std::string& compareName)
-    {
-        std::vector<uint8_t> expected = LoadFile(TEST_DATA_DIR "Expected/" + compareName, isText);
-        if (expected != actual)
-        {
-            if (!actual.empty())
-            {
-                std::ios_base::openmode mode = std::ios_base::out;
-                if (!isText)
-                {
-                    mode |= std::ios_base::binary;
-                }
-                std::ofstream actualFile(TEST_DATA_DIR "Result/" + compareName, mode);
-                actualFile.write(reinterpret_cast<const char*>(actual.data()), actual.size());
-            }
-        }
-
-        EXPECT_EQ(std::string(expected.begin(), expected.end()), std::string(actual.begin(), actual.end()));
-    }
-
     void HlslToAnyTest(const std::string& name, const Compiler::SourceDesc& source, const Compiler::Options& options,
                        const std::vector<Compiler::TargetDesc>& targets, const std::vector<bool>& expectSuccessFlags)
     {
@@ -642,16 +602,3 @@ namespace
         }
     }
 } // namespace
-
-int main(int argc, char** argv)
-{
-    testing::InitGoogleTest(&argc, argv);
-
-    int retVal = RUN_ALL_TESTS();
-    if (retVal != 0)
-    {
-        getchar();
-    }
-
-    return retVal;
-}