Update tests

Author: adeas31

OMPython/__init__.py

@@ -44,6 +44,7 @@ class which means it will use OMCSessionZMQ by default. If you want to use
 import platform
 import psutil
 import re
+import shlex
 import signal
 import subprocess
 import sys

tests/test_ArrayDimension.py

@@ -10,7 +10,7 @@
 class Test_ArrayDimension:
 
     def test_ArrayDimension(self):
-        omc = OMPython.OMCSessionZMQ()
+        omc = OMPython.OMCSession()
 
         ## create a temp dir for each session
         tempdir = tempfile.mkdtemp()

tests/test_FMIRegression.py

@@ -10,7 +10,7 @@
 class Test_FMIRegression:
 
     def buildModelFMU(self, modelName):
-        omc = OMPython.OMCSessionZMQ()
+        omc = OMPython.OMCSession()
 
         ## create a temp dir for each session
         tempdir = tempfile.mkdtemp()

tests/test_ZMQ.py

@@ -11,7 +11,7 @@ def __init__(self, *args, **kwargs):
     self.tmp = tempfile.mkdtemp(prefix='tmpOMPython.tests')
     self.origDir = os.getcwd()
     os.chdir(self.tmp)
-    self.om = OMPython.OMCSessionZMQ()
+    self.om = OMPython.OMCSession()
     os.chdir(self.origDir)
   def __del__(self):
     shutil.rmtree(self.tmp, ignore_errors=True)
@@ -33,27 +33,5 @@ def testSimulate(self):
     self.assertNotEqual("", self.om.sendExpression('res.resultFile'))
     self.clean()
 
-class FindBestOMCSession(unittest.TestCase):
-  def __init__(self, *args, **kwargs):
-    super(FindBestOMCSession, self).__init__(*args, **kwargs)
-    self.simpleModel = """model M
-  Real r = time;
-end M;"""
-    self.tmp = tempfile.mkdtemp(prefix='tmpOMPython.extratests')
-    self.origDir = os.getcwd()
-    os.chdir(self.tmp)
-    self.om = OMPython.FindBestOMCSession()
-    os.chdir(self.origDir)
-  def __del__(self):
-    shutil.rmtree(self.tmp, ignore_errors=True)
-    del(self.om)
-  def clean(self):
-    del(self.om)
-    self.om = None
-
-  def testHelloWorldBestOMCSession(self):
-    self.assertEqual("HelloWorld!", self.om.sendExpression('"HelloWorld!"'))
-    self.clean()
-
 if __name__ == '__main__':
     unittest.main()

tests/test_docker.py

@@ -6,11 +6,11 @@
 class DockerTester(unittest.TestCase):
   @pytest.mark.skip(reason="This test would fail")
   def testDocker(self):
-    om = OMPython.OMCSessionZMQ(docker="openmodelica/openmodelica:v1.16.1-minimal")
+    om = OMPython.OMCSession(docker="openmodelica/openmodelica:v1.16.1-minimal")
     assert(om.sendExpression("getVersion()") == "OpenModelica 1.16.1")
-    omInner = OMPython.OMCSessionZMQ(dockerContainer=om._dockerCid)
+    omInner = OMPython.OMCSession(dockerContainer=om._dockerCid)
     assert(omInner.sendExpression("getVersion()") == "OpenModelica 1.16.1")
-    om2 = OMPython.OMCSessionZMQ(docker="openmodelica/openmodelica:v1.16.1-minimal", port=11111)
+    om2 = OMPython.OMCSession(docker="openmodelica/openmodelica:v1.16.1-minimal", port=11111)
     assert(om2.sendExpression("getVersion()") == "OpenModelica 1.16.1")
     del(om2)
     del(omInner)