Tests utils: some minor cleaning up.

cellml · Oct 22, 2024 · a3f72e6 · a3f72e6
1 parent b7e9fd3
commit a3f72e6
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 16 deletions.
diff --git a/tests/test_utils.cpp b/tests/test_utils.cpp
@@ -259,6 +259,22 @@ void expectEqualIssuesCellmlElementTypesLevelsReferenceRulesUrls(const std::vect
     }
 }
 
+void expectEqualFileContents(const std::string &fileName, const std::string &fileContents)
+{
+    // Uncomment the below when you want to generate the expected file contents.
+    // #define NEW_GENERATOR
+
+#ifdef NEW_GENERATOR
+    std::ofstream file(resourcePath(fileName));
+
+    file << fileContents;
+
+    file.close();
+#endif
+
+    EXPECT_EQ(::fileContents(fileName), fileContents);
+}
+
 libcellml::ModelPtr createModel(const std::string &name)
 {
     libcellml::ModelPtr model = libcellml::Model::create();
@@ -416,19 +432,3 @@ void compareReset(const libcellml::ResetPtr &r1, const libcellml::ResetPtr &r2)
     EXPECT_EQ(r1->testValueId(), r2->testValueId());
     EXPECT_EQ(r1->resetValueId(), r2->resetValueId());
 }
-
-void expectEqualFileContents(const std::string &fileName, const std::string &fileContents)
-{
-    // Uncomment the below when you want to generate the expected file contents.
-    // #define NEW_GENERATOR
-
-#ifdef NEW_GENERATOR
-    std::ofstream file(resourcePath(fileName));
-
-    file << fileContents;
-
-    file.close();
-#endif
-
-    EXPECT_EQ(::fileContents(fileName), fileContents);
-}
diff --git a/tests/test_utils.h b/tests/test_utils.h
@@ -104,6 +104,7 @@ void TEST_EXPORT expectEqualIssuesCellmlElementTypesLevelsReferenceRulesUrls(con
                                                                              const std::vector<libcellml::Issue::ReferenceRule> &referenceRules,
                                                                              const std::vector<std::string> &urls,
                                                                              const libcellml::LoggerPtr &logger);
+
 void TEST_EXPORT expectEqualFileContents(const std::string &fileName, const std::string &fileContents);
 
 libcellml::ModelPtr TEST_EXPORT createModel(const std::string &name = "");