Merge pull request #51 from Ultimaker/fix_unit_test_reporting

Unit-test reporting tried to report on test-xmls instead of output.
Ultimaker · Mar 20, 2024 · cb553d3 · cb553d3
2 parents a1ac15d + 89bc72b
commit cb553d3
Show file tree

Hide file tree

Showing 6 changed files with 4 additions and 4 deletions.
diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
@@ -56,7 +56,7 @@ env:
 
 jobs:
     conan-recipe-version:
-        uses: ultimaker/cura/.github/workflows/conan-recipe-version.yml@main
+        uses: ultimaker/cura-workflows/.github/workflows/conan-recipe-version.yml@main
         with:
             project_name: savitar
 

diff --git a/tests/NamespaceTest.cpp b/tests/NamespaceTest.cpp
@@ -20,7 +20,7 @@ class NamespaceTest : public testing::Test
 
     void SetUp()
     {
-        std::ifstream test_model_file(std::filesystem::path(__FILE__).parent_path().append("namespaces.xml").string());
+        std::ifstream test_model_file(std::filesystem::path(__FILE__).parent_path().append("namespaces.xml.test").string());
         if (test_model_file.is_open())
         {
             const std::string xml_string(std::istreambuf_iterator<char>{ test_model_file }, {});

diff --git a/tests/ThreeMFParserTest.cpp b/tests/ThreeMFParserTest.cpp
@@ -30,7 +30,7 @@ class ThreeMFParserTest : public testing::Test
     void SetUp() override
     {
         xml_string = "";
-        std::ifstream test_model_file(std::filesystem::path(__FILE__).parent_path().append("test_model.xml").string());
+        std::ifstream test_model_file(std::filesystem::path(__FILE__).parent_path().append("test_model.xml.test").string());
         if (test_model_file.is_open())
         {
             xml_string = std::string(std::istreambuf_iterator<char>{ test_model_file }, {});
@@ -120,7 +120,7 @@ TEST_F(ThreeMFParserTest, decimalSeparatorTest)
 {
     // Don't accept a model that uses ','s for decimal separators.
     std::string xml_string_septest;
-    std::ifstream test_model_file(std::filesystem::path(__FILE__).parent_path().append("problem_model.xml").string());
+    std::ifstream test_model_file(std::filesystem::path(__FILE__).parent_path().append("problem_model.xml.test").string());
     if (test_model_file.is_open())
     {
         xml_string_septest = std::string(std::istreambuf_iterator<char>{ test_model_file }, {});

diff --git a/tests/namespaces.xml → tests/namespaces.xml.test b/tests/namespaces.xml → tests/namespaces.xml.test
diff --git a/tests/problem_model.xml → tests/problem_model.xml.test b/tests/problem_model.xml → tests/problem_model.xml.test
diff --git a/tests/test_model.xml → tests/test_model.xml.test b/tests/test_model.xml → tests/test_model.xml.test