fix unit tests for smartSimFunctionObject

OFDataCommittee · Oct 28, 2023 · a87ddbf · a87ddbf
1 parent 0ce4ac2
commit a87ddbf
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 12 deletions.
diff --git a/.github/workflows/smartsim.yaml b/.github/workflows/smartsim.yaml
@@ -58,4 +58,3 @@ jobs:
           cd $FOAM_FOAMUT || exit 1
           rm -rf tests/exampleTests
           ./Alltest "$@"
-          if [ -f $FOAM_FOAMUT/tests/adaptiveFvMeshTests/log.wmake ]; then cat $FOAM_FOAMUT/tests/adaptiveFvMeshTests/log.wmake; fi 
diff --git a/2023-01/smartsim/smartsim_function_object/tests/smartSimFOTest.C b/2023-01/smartsim/smartsim_function_object/tests/smartSimFOTest.C
@@ -5,22 +5,39 @@
 #include "fvCFD.H"
 #include "fvMesh.H"
 
-#include <csetjmp>
-#include <csignal>
-#include <cstdlib>
-#include <functional>
+#include "smartSimFunctionObject.H"
+#include "functionObjectList.H"
 
 using namespace Foam;
 extern Time* timePtr;
 extern argList* argsPtr;
 
 TEST_CASE("Shared SmartRedis client", "[cavity][serial][parallel]")
 {
-    dictionary dict;
-    dict.set("type", "smartSimFunctionObject");
-    dict.set("fieldNames", wordList());
-    dict.set("fieldDimensions", labelList());
-    functionObjects::smartSimFunctionObject fo1("smartSimFo1", *timePtr, dict);
-    functionObjects::smartSimFunctionObject fo2("smartSimFo2", *timePtr, dict);
-    REQUIRE(&fo1.redisDB == &fo2.redisDB);
+    Time& runTime = *timePtr;
+    FatalError.dontThrowExceptions();
+    fvMesh mesh
+    (
+        IOobject
+        (
+            polyMesh::defaultRegion,
+            runTime.constant(),
+            runTime,
+            IOobject::MUST_READ,
+            IOobject::NO_WRITE
+        )
+    );
+    dictionary dict0;
+    dict0.set("region", polyMesh::defaultRegion);
+    dict0.set("type", "smartSimFunctionObject");
+    dict0.set("fieldNames", wordList());
+    dict0.set("fieldDimensions", labelList());
+    dictionary dict1;
+    dict1.set("region", polyMesh::defaultRegion);
+    dict1.set("type", "smartSimFunctionObject");
+    dict1.set("fieldNames", wordList());
+    dict1.set("fieldDimensions", labelList());
+    functionObjects::smartSimFunctionObject o0("smartSim0", runTime, dict0);
+    functionObjects::smartSimFunctionObject o1("smartSim1", runTime, dict1);
+    REQUIRE(&(o0.redisDB) == &(o1.redisDB));
 }