From 8410ea596a7ed478c61293648027c14f74903fa9 Mon Sep 17 00:00:00 2001
From: Remco Burema <r.burema@ultimaker.com>
Date: Thu, 14 Mar 2024 11:54:25 +0100
Subject: [PATCH 1/2] Unit-test reporting tried to report on test-xmls instead
 of output.

---
 tests/NamespaceTest.cpp                             | 2 +-
 tests/ThreeMFParserTest.cpp                         | 4 ++--
 tests/{namespaces.xml => namespaces.xml.test}       | 0
 tests/{problem_model.xml => problem_model.xml.test} | 0
 tests/{test_model.xml => test_model.xml.test}       | 0
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename tests/{namespaces.xml => namespaces.xml.test} (100%)
 rename tests/{problem_model.xml => problem_model.xml.test} (100%)
 rename tests/{test_model.xml => test_model.xml.test} (100%)

diff --git a/tests/NamespaceTest.cpp b/tests/NamespaceTest.cpp
index 5358db1..982a816 100644
--- 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
index d9c2e49..8af6bf5 100644
--- 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 b/tests/namespaces.xml.test
similarity index 100%
rename from tests/namespaces.xml
rename to tests/namespaces.xml.test
diff --git a/tests/problem_model.xml b/tests/problem_model.xml.test
similarity index 100%
rename from tests/problem_model.xml
rename to tests/problem_model.xml.test
diff --git a/tests/test_model.xml b/tests/test_model.xml.test
similarity index 100%
rename from tests/test_model.xml
rename to tests/test_model.xml.test

From 89bc72b4cb0debb5ef38ab73267bf47073c6f42d Mon Sep 17 00:00:00 2001
From: Remco Burema <r.burema@ultimaker.com>
Date: Thu, 14 Mar 2024 11:59:02 +0100
Subject: [PATCH 2/2] Fix outdated workflow-reference.

---
 .github/workflows/unit-test.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/unit-test.yml b/.github/workflows/unit-test.yml
index 763345c..4140004 100644
--- 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