??? fix tests

Author: syntron

tests/test_FMIRegression.py

@@ -7,7 +7,7 @@
 
 
 def buildModelFMU(modelName):
-    omc = OMPython.OMCSessionZMQ()
+    omc = OMPython.OMCProcessLocal()
 
     tempdir = pathlib.Path(tempfile.mkdtemp())
     try:

tests/test_ModelicaSystem.py

@@ -157,8 +157,7 @@ def test_customBuildDirectory(tmp_path, model_firstorder):
 @skip_on_windows
 @skip_python_older_312
 def test_getSolutions_docker(model_firstorder):
-    omcp = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
-    omc = OMPython.OMCSessionZMQ(omc_process=omcp)
+    omc = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
 
     mod = OMPython.ModelicaSystem(
         omc_process=omc.omc_process,

tests/test_ModelicaSystemDoE.py

@@ -69,15 +69,14 @@ def test_ModelicaSystemDoE_local(tmp_path, model_doe, param_doe):
 @skip_on_windows
 @skip_python_older_312
 def test_ModelicaSystemDoE_docker(tmp_path, model_doe, param_doe):
-    omcp = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
-    omc = OMPython.OMCSessionZMQ(omc_process=omcp)
+    omc = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
     assert omc.sendExpression("getVersion()") == "OpenModelica 1.25.0"
 
     doe_mod = OMPython.ModelicaSystemDoE(
         model_file=model_doe.as_posix(),
         model_name="M",
         parameters=param_doe,
-        omc_process=omcp,
+        omc_process=omc,
         simargs={"override": {'stopTime': 1.0}},
     )
 

tests/test_OMCPath.py

@@ -15,17 +15,8 @@
 )
 
 
-def test_OMCPath_OMCSessionZMQ():
-    om = OMPython.OMCSessionZMQ()
-
-    _run_OMCPath_checks(om)
-
-    del om
-
-
 def test_OMCPath_OMCProcessLocal():
-    omp = OMPython.OMCProcessLocal()
-    om = OMPython.OMCSessionZMQ(omc_process=omp)
+    om = OMPython.OMCProcessLocal()
 
     _run_OMCPath_checks(om)
 
@@ -35,29 +26,25 @@ def test_OMCPath_OMCProcessLocal():
 @skip_on_windows
 @skip_python_older_312
 def test_OMCPath_OMCProcessDocker():
-    omcp = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
-    om = OMPython.OMCSessionZMQ(omc_process=omcp)
+    om = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
     assert om.sendExpression("getVersion()") == "OpenModelica 1.25.0"
 
     _run_OMCPath_checks(om)
 
-    del omcp
     del om
 
 
 @pytest.mark.skip(reason="Not able to run WSL on github")
 @skip_python_older_312
 def test_OMCPath_OMCProcessWSL():
-    omcp = OMPython.OMCProcessWSL(
+    om = OMPython.OMCProcessWSL(
         wsl_omc='omc',
         wsl_user='omc',
         timeout=30.0,
     )
-    om = OMPython.OMCSessionZMQ(omc_process=omcp)
 
     _run_OMCPath_checks(om)
 
-    del omcp
     del om
 
 
@@ -81,7 +68,7 @@ def _run_OMCPath_checks(om: OMPython.OMCProcess):
 
 
 def test_OMCPath_write_file(tmpdir):
-    om = OMPython.OMCSessionZMQ()
+    om = OMPython.OMCProcessLocal()
 
     data = "abc # \\t # \" # \\n # xyz"
 

tests/test_docker.py

@@ -10,23 +10,15 @@
 
 @skip_on_windows
 def test_docker():
-    omcp = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
-    om = OMPython.OMCSessionZMQ(omc_process=omcp)
+    om = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
     assert om.sendExpression("getVersion()") == "OpenModelica 1.25.0"
 
-    omcpInner = OMPython.OMCProcessDockerContainer(dockerContainer=omcp.get_docker_container_id())
-    omInner = OMPython.OMCSessionZMQ(omc_process=omcpInner)
+    omInner = OMPython.OMCProcessDockerContainer(dockerContainer=om.get_docker_container_id())
     assert omInner.sendExpression("getVersion()") == "OpenModelica 1.25.0"
 
-    omcp2 = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.25.0-minimal", port=11111)
-    om2 = OMPython.OMCSessionZMQ(omc_process=omcp2)
+    om2 = OMPython.OMCProcessDocker(docker="openmodelica/openmodelica:v1.25.0-minimal", port=11111)
     assert om2.sendExpression("getVersion()") == "OpenModelica 1.25.0"
 
-    del omcp2
     del om2
-
-    del omcpInner
     del omInner
-
-    del omcp
     del om