Skip to content

Commit d7deb6b

Browse files
syntronsyntron
committed
[unittests] use new definitions / remove OMCSessionZMQ
1 parent 229a015 commit d7deb6b

File tree

8 files changed

+82
-106
lines changed

8 files changed

+82
-106
lines changed

‎tests/test_ArrayDimension.py‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22

33

44
def test_ArrayDimension(tmp_path):
5-
omc = OMPython.OMCSessionZMQ()
5+
omcs = OMPython.OMCSessionLocal()
66

7-
omc.sendExpression(f'cd("{tmp_path.as_posix()}")')
7+
omcs.sendExpression(f'cd("{tmp_path.as_posix()}")')
88

9-
omc.sendExpression('loadString("model A Integer x[5+1,1+6]; end A;")')
10-
omc.sendExpression("getErrorString()")
9+
omcs.sendExpression('loadString("model A Integer x[5+1,1+6]; end A;")')
10+
omcs.sendExpression("getErrorString()")
1111

12-
result = omc.sendExpression("getComponents(A)")
12+
result = omcs.sendExpression("getComponents(A)")
1313
assert result[0][-1] == (6, 7), "array dimension does not match"
1414

15-
omc.sendExpression('loadString("model A Integer y = 5; Integer x[y+1,1+9]; end A;")')
16-
omc.sendExpression("getErrorString()")
15+
omcs.sendExpression('loadString("model A Integer y = 5; Integer x[y+1,1+9]; end A;")')
16+
omcs.sendExpression("getErrorString()")
1717

18-
result = omc.sendExpression("getComponents(A)")
18+
result = omcs.sendExpression("getComponents(A)")
1919
assert result[-1][-1] == ('y+1', 10), "array dimension does not match"

‎tests/test_FMIRegression.py‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,21 +7,21 @@
77

88

99
def buildModelFMU(modelName):
10-
omc = OMPython.OMCSessionZMQ()
10+
omcs = OMPython.OMCSessionLocal()
1111

1212
tempdir = pathlib.Path(tempfile.mkdtemp())
1313
try:
14-
omc.sendExpression(f'cd("{tempdir.as_posix()}")')
14+
omcs.sendExpression(f'cd("{tempdir.as_posix()}")')
1515

16-
omc.sendExpression("loadModel(Modelica)")
17-
omc.sendExpression("getErrorString()")
16+
omcs.sendExpression("loadModel(Modelica)")
17+
omcs.sendExpression("getErrorString()")
1818

1919
fileNamePrefix = modelName.split(".")[-1]
2020
exp = f'buildModelFMU({modelName}, fileNamePrefix="{fileNamePrefix}")'
21-
fmu = omc.sendExpression(exp)
21+
fmu = omcs.sendExpression(exp)
2222
assert os.path.exists(fmu)
2323
finally:
24-
del omc
24+
del omcs
2525
shutil.rmtree(tempdir, ignore_errors=True)
2626

2727

‎tests/test_ModelicaSystem.py‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -47,14 +47,15 @@ def worker():
4747
)
4848
mod.simulate()
4949
mod.convertMo2Fmu(fmuType="me")
50+
5051
for _ in range(10):
5152
worker()
5253

5354

5455
def test_setParameters():
55-
omc = OMPython.OMCSessionZMQ()
56-
model_path_str = omc.sendExpression("getInstallationDirectoryPath()") + "/share/doc/omc/testmodels"
57-
model_path = omc.omcpath(model_path_str)
56+
omcs = OMPython.OMCSessionLocal()
57+
model_path_str = omcs.sendExpression("getInstallationDirectoryPath()") + "/share/doc/omc/testmodels"
58+
model_path = omcs.omcpath(model_path_str)
5859
mod = OMPython.ModelicaSystem()
5960
mod.model(
6061
model_file=model_path / "BouncingBall.mo",
@@ -87,9 +88,9 @@ def test_setParameters():
8788

8889

8990
def test_setSimulationOptions():
90-
omc = OMPython.OMCSessionZMQ()
91-
model_path_str = omc.sendExpression("getInstallationDirectoryPath()") + "/share/doc/omc/testmodels"
92-
model_path = omc.omcpath(model_path_str)
91+
omcs = OMPython.OMCSessionLocal()
92+
model_path_str = omcs.sendExpression("getInstallationDirectoryPath()") + "/share/doc/omc/testmodels"
93+
model_path = omcs.omcpath(model_path_str)
9394
mod = OMPython.ModelicaSystem()
9495
mod.model(
9596
model_file=model_path / "BouncingBall.mo",
@@ -155,11 +156,9 @@ def test_customBuildDirectory(tmp_path, model_firstorder):
155156
@skip_on_windows
156157
@skip_python_older_312
157158
def test_getSolutions_docker(model_firstorder):
158-
omcp = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
159-
omc = OMPython.OMCSessionZMQ(omc_process=omcp)
160-
159+
omcs = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
161160
mod = OMPython.ModelicaSystem(
162-
session=omc.omc_process,
161+
session=omcs,
163162
)
164163
mod.model(
165164
model_file=model_firstorder,

‎tests/test_ModelicaSystemDoE.py‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,14 @@ def test_ModelicaSystemDoE_local(tmp_path, model_doe, param_doe):
6969
@skip_on_windows
7070
@skip_python_older_312
7171
def test_ModelicaSystemDoE_docker(tmp_path, model_doe, param_doe):
72-
omcp = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
73-
omc = OMPython.OMCSessionZMQ(omc_process=omcp)
74-
assert omc.sendExpression("getVersion()") == "OpenModelica 1.25.0"
72+
omcs = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
73+
assert omcs.sendExpression("getVersion()") == "OpenModelica 1.25.0"
7574

7675
doe_mod = OMPython.ModelicaSystemDoE(
7776
model_file=model_doe,
7877
model_name="M",
7978
parameters=param_doe,
80-
session=omcp,
79+
session=omcs,
8180
simargs={"override": {'stopTime': 1.0}},
8281
)
8382

‎tests/test_OMCPath.py‎

Lines changed: 15 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -15,54 +15,41 @@
1515
)
1616

1717

18-
def test_OMCPath_OMCSessionZMQ():
19-
om = OMPython.OMCSessionZMQ()
20-
21-
_run_OMCPath_checks(om)
22-
23-
del om
24-
25-
2618
def test_OMCPath_OMCProcessLocal():
27-
omp = OMPython.OMCSessionLocal()
28-
om = OMPython.OMCSessionZMQ(omc_process=omp)
19+
omcs = OMPython.OMCSessionLocal()
2920

30-
_run_OMCPath_checks(om)
21+
_run_OMCPath_checks(omcs)
3122

32-
del om
23+
del omcs
3324

3425

3526
@skip_on_windows
3627
@skip_python_older_312
3728
def test_OMCPath_OMCProcessDocker():
38-
omcp = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
39-
om = OMPython.OMCSessionZMQ(omc_process=omcp)
40-
assert om.sendExpression("getVersion()") == "OpenModelica 1.25.0"
29+
omcs = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
30+
assert omcs.sendExpression("getVersion()") == "OpenModelica 1.25.0"
4131

42-
_run_OMCPath_checks(om)
32+
_run_OMCPath_checks(omcs)
4333

44-
del omcp
45-
del om
34+
del omcs
4635

4736

4837
@pytest.mark.skip(reason="Not able to run WSL on github")
4938
@skip_python_older_312
5039
def test_OMCPath_OMCProcessWSL():
51-
omcp = OMPython.OMCSessionWSL(
40+
omcs = OMPython.OMCSessionWSL(
5241
wsl_omc='omc',
5342
wsl_user='omc',
5443
timeout=30.0,
5544
)
56-
om = OMPython.OMCSessionZMQ(omc_process=omcp)
5745

58-
_run_OMCPath_checks(om)
46+
_run_OMCPath_checks(omcs)
5947

60-
del omcp
61-
del om
48+
del omcs
6249

6350

64-
def _run_OMCPath_checks(om: OMPython.OMCSessionZMQ):
65-
p1 = om.omcpath_tempdir()
51+
def _run_OMCPath_checks(omcs: OMPython.OMCSession):
52+
p1 = omcs.omcpath_tempdir()
6653
p2 = p1 / 'test'
6754
p2.mkdir()
6855
assert p2.is_dir()
@@ -81,14 +68,14 @@ def _run_OMCPath_checks(om: OMPython.OMCSessionZMQ):
8168

8269

8370
def test_OMCPath_write_file(tmpdir):
84-
om = OMPython.OMCSessionZMQ()
71+
omcs = OMPython.OMCSessionLocal()
8572

8673
data = "abc # \\t # \" # \\n # xyz"
8774

88-
p1 = om.omcpath_tempdir()
75+
p1 = omcs.omcpath_tempdir()
8976
p2 = p1 / 'test.txt'
9077
p2.write_text(data=data)
9178

9279
assert data == p2.read_text()
9380

94-
del om
81+
del omcs

‎tests/test_OMSessionCmd.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22

33

44
def test_isPackage():
5-
omczmq = OMPython.OMCSessionZMQ()
6-
omccmd = OMPython.OMCSessionCmd(session=omczmq.omc_process)
5+
omcs = OMPython.OMCSessionLocal()
6+
omccmd = OMPython.OMCSessionCmd(session=omcs)
77
assert not omccmd.isPackage('Modelica')
88

99

‎tests/test_ZMQ.py‎

Lines changed: 30 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -14,58 +14,55 @@ def model_time_str():
1414

1515

1616
@pytest.fixture
17-
def om(tmp_path):
17+
def omcs(tmp_path):
1818
origDir = pathlib.Path.cwd()
1919
os.chdir(tmp_path)
20-
om = OMPython.OMCSessionZMQ()
20+
omcs = OMPython.OMCSessionLocal()
2121
os.chdir(origDir)
22-
return om
22+
return omcs
2323

2424

25-
def testHelloWorld(om):
26-
assert om.sendExpression('"HelloWorld!"') == "HelloWorld!"
25+
def testHelloWorld(omcs):
26+
assert omcs.sendExpression('"HelloWorld!"') == "HelloWorld!"
2727

2828

29-
def test_Translate(om, model_time_str):
30-
assert om.sendExpression(model_time_str) == ("M",)
31-
assert om.sendExpression('translateModel(M)') is True
29+
def test_Translate(omcs, model_time_str):
30+
assert omcs.sendExpression(model_time_str) == ("M",)
31+
assert omcs.sendExpression('translateModel(M)') is True
3232

3333

34-
def test_Simulate(om, model_time_str):
35-
assert om.sendExpression(f'loadString("{model_time_str}")') is True
36-
om.sendExpression('res:=simulate(M, stopTime=2.0)')
37-
assert om.sendExpression('res.resultFile')
34+
def test_Simulate(omcs, model_time_str):
35+
assert omcs.sendExpression(f'loadString("{model_time_str}")') is True
36+
omcs.sendExpression('res:=simulate(M, stopTime=2.0)')
37+
assert omcs.sendExpression('res.resultFile')
3838

3939

40-
def test_execute(om):
40+
def test_execute(omcs):
4141
with pytest.deprecated_call():
42-
assert om.execute('"HelloWorld!"') == '"HelloWorld!"\n'
43-
assert om.sendExpression('"HelloWorld!"', parsed=False) == '"HelloWorld!"\n'
44-
assert om.sendExpression('"HelloWorld!"', parsed=True) == 'HelloWorld!'
42+
assert omcs.execute('"HelloWorld!"') == '"HelloWorld!"\n'
43+
assert omcs.sendExpression('"HelloWorld!"', parsed=False) == '"HelloWorld!"\n'
44+
assert omcs.sendExpression('"HelloWorld!"', parsed=True) == 'HelloWorld!'
4545

4646

47-
def test_omcprocessport_execute(om):
48-
port = om.omc_process.get_port()
49-
omcp = OMPython.OMCSessionPort(omc_port=port)
47+
def test_omcprocessport_execute(omcs):
48+
port = omcs.get_port()
49+
omcs2 = OMPython.OMCSessionPort(omc_port=port)
5050

5151
# run 1
52-
om1 = OMPython.OMCSessionZMQ(omc_process=omcp)
53-
assert om1.sendExpression('"HelloWorld!"', parsed=False) == '"HelloWorld!"\n'
52+
assert omcs.sendExpression('"HelloWorld!"', parsed=False) == '"HelloWorld!"\n'
5453

5554
# run 2
56-
om2 = OMPython.OMCSessionZMQ(omc_process=omcp)
57-
assert om2.sendExpression('"HelloWorld!"', parsed=False) == '"HelloWorld!"\n'
55+
assert omcs2.sendExpression('"HelloWorld!"', parsed=False) == '"HelloWorld!"\n'
5856

59-
del om1
60-
del om2
57+
del omcs2
6158

6259

63-
def test_omcprocessport_simulate(om, model_time_str):
64-
port = om.omc_process.get_port()
65-
omcp = OMPython.OMCSessionPort(omc_port=port)
60+
def test_omcprocessport_simulate(omcs, model_time_str):
61+
port = omcs.get_port()
62+
omcs2 = OMPython.OMCSessionPort(omc_port=port)
6663

67-
om = OMPython.OMCSessionZMQ(omc_process=omcp)
68-
assert om.sendExpression(f'loadString("{model_time_str}")') is True
69-
om.sendExpression('res:=simulate(M, stopTime=2.0)')
70-
assert om.sendExpression('res.resultFile') != ""
71-
del om
64+
assert omcs2.sendExpression(f'loadString("{model_time_str}")') is True
65+
omcs2.sendExpression('res:=simulate(M, stopTime=2.0)')
66+
assert omcs2.sendExpression('res.resultFile') != ""
67+
68+
del omcs2

‎tests/test_docker.py‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,17 @@
1010

1111
@skip_on_windows
1212
def test_docker():
13-
omcp = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
14-
om = OMPython.OMCSessionZMQ(omc_process=omcp)
15-
assert om.sendExpression("getVersion()") == "OpenModelica 1.25.0"
13+
omcs = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal")
14+
assert omcs.sendExpression("getVersion()") == "OpenModelica 1.25.0"
1615

17-
omcpInner = OMPython.OMCSessionDockerContainer(dockerContainer=omcp.get_docker_container_id())
18-
omInner = OMPython.OMCSessionZMQ(omc_process=omcpInner)
19-
assert omInner.sendExpression("getVersion()") == "OpenModelica 1.25.0"
16+
omcsInner = OMPython.OMCSessionDockerContainer(dockerContainer=omcs.get_docker_container_id())
17+
assert omcsInner.sendExpression("getVersion()") == "OpenModelica 1.25.0"
2018

21-
omcp2 = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal", port=11111)
22-
om2 = OMPython.OMCSessionZMQ(omc_process=omcp2)
23-
assert om2.sendExpression("getVersion()") == "OpenModelica 1.25.0"
19+
omcs2 = OMPython.OMCSessionDocker(docker="openmodelica/openmodelica:v1.25.0-minimal", port=11111)
20+
assert omcs2.sendExpression("getVersion()") == "OpenModelica 1.25.0"
2421

25-
del omcp2
26-
del om2
22+
del omcs2
2723

28-
del omcpInner
29-
del omInner
24+
del omcsInner
3025

31-
del omcp
32-
del om
26+
del omcs

0 commit comments

Comments
 (0)