[test_ModelicaSystemDoE] update test definition for local/docker/WSL

Author: syntron

tests/test_ModelicaSystemDoE.py

@@ -2,12 +2,24 @@
 import OMPython
 import pathlib
 import pytest
+import sys
+
+skip_on_windows = pytest.mark.skipif(
+    sys.platform.startswith("win"),
+    reason="OpenModelica Docker image is Linux-only; skipping on Windows.",
+)
+
+skip_python_older_312 = pytest.mark.skipif(
+    sys.version_info < (3, 12),
+    reason="OMCPath(non-local) only working for Python >= 3.12.",
+)
 
 
 @pytest.fixture
 def model_doe(tmp_path: pathlib.Path) -> pathlib.Path:
     # see: https://trac.openmodelica.org/OpenModelica/ticket/4052
     mod = tmp_path / "M.mo"
+    # TODO: update for bool and string parameters; check if these can be used in DoE
     mod.write_text("""
 model M
   parameter Integer p=1;
@@ -37,7 +49,46 @@ def param_doe() -> dict[str, list]:
     return param
 
 
-def test_ModelicaSystemDoE(tmp_path, model_doe, param_doe):
+def test_ModelicaSystemDoE_local(tmp_path, model_doe, param_doe):
+    tmpdir = tmp_path / 'DoE'
+    tmpdir.mkdir(exist_ok=True)
+
+    doe_mod = OMPython.ModelicaSystemDoE(
+        fileName=model_doe.as_posix(),
+        modelName="M",
+        parameters=param_doe,
+        resultpath=tmpdir,
+        simargs={"override": {'stopTime': 1.0}},
+    )
+
+    _run_ModelicaSystemDoe(doe_mod=doe_mod)
+
+
+@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)
+    assert omc.sendExpression("getVersion()") == "OpenModelica 1.25.0"
+
+    modelpath = omc.omcpath_tempdir() / 'M.mo'
+    modelpath.write_text(model_doe.read_text())
+
+    doe_mod = OMPython.ModelicaSystemDoE(
+        fileName=modelpath.as_posix(),
+        modelName="M",
+        parameters=param_doe,
+        omc_process=omcp,
+        resultpath=modelpath.parent,
+        simargs={"override": {'stopTime': 1.0}},
+    )
+
+    _run_ModelicaSystemDoe(doe_mod=doe_mod)
+
+
+@pytest.mark.skip(reason="Not able to run WSL on github")
+@skip_python_older_312
+def test_ModelicaSystemDoE_WSL(tmp_path, model_doe, param_doe):
     tmpdir = tmp_path / 'DoE'
     tmpdir.mkdir(exist_ok=True)
 
@@ -48,20 +99,34 @@ def test_ModelicaSystemDoE(tmp_path, model_doe, param_doe):
         resultpath=tmpdir,
         simargs={"override": {'stopTime': 1.0}},
     )
+
+    _run_ModelicaSystemDoe(doe_mod=doe_mod)
+
+
+def _run_ModelicaSystemDoe(doe_mod):
     doe_count = doe_mod.prepare()
     assert doe_count == 16
 
-    doe_dict = doe_mod.get_doe()
-    assert isinstance(doe_dict, dict)
-    assert len(doe_dict.keys()) == 16
+    doe_def = doe_mod.get_doe_definition()
+    assert isinstance(doe_def, dict)
+    assert len(doe_def.keys()) == doe_count
+
+    doe_cmd = doe_mod.get_doe_command()
+    assert isinstance(doe_cmd, dict)
+    assert len(doe_cmd.keys()) == doe_count
 
     doe_status = doe_mod.simulate()
     assert doe_status is True
 
-    doe_sol = doe_mod.get_solutions()
+    doe_sol = doe_mod.get_doe_solutions()
+    assert isinstance(doe_sol, dict)
+    assert len(doe_sol.keys()) == doe_count
+
+    assert sorted(doe_def.keys()) == sorted(doe_cmd.keys())
+    assert sorted(doe_cmd.keys()) == sorted(doe_sol.keys())
 
-    for resultfilename in doe_dict:
-        row = doe_dict[resultfilename]
+    for resultfilename in doe_def:
+        row = doe_def[resultfilename]
 
         assert resultfilename in doe_sol
         sol = doe_sol[resultfilename]