Fix flake8 warnings in tests

Author: ondras12345

tests/test_ArrayDimension.py

@@ -1,30 +1,28 @@
 import OMPython
-import tempfile, shutil, os
-import pytest
+import tempfile
+import shutil
+import os
 
 
-"""
-do not change the prefix class name, the class name should have prefix "Test"
-according to the documenation of pytest
-"""
+# do not change the prefix class name, the class name should have prefix "Test"
+# according to the documenation of pytest
 class Test_ArrayDimension:
-
     def test_ArrayDimension(self):
         omc = OMPython.OMCSessionZMQ()
 
-        ## create a temp dir for each session
+        # create a temp dir for each session
         tempdir = tempfile.mkdtemp()
         if not os.path.exists(tempdir):
             return print(tempdir, " cannot be created")
 
-        tempdirExp="".join(["cd(","\"",tempdir,"\"",")"]).replace("\\","/")
+        tempdirExp = "".join(["cd(", "\"", tempdir, "\"", ")"]).replace("\\", "/")
         omc.sendExpression(tempdirExp)
 
         omc.sendExpression("loadString(\"model A Integer x[5+1,1+6]; end A;\")")
         omc.sendExpression("getErrorString()")
 
         result = omc.sendExpression("getComponents(A)")
-        assert result[0][-1] == (6,7), f"array dimension does not match the expected value. Got: {result[0][-1]}, Expected: {(6, 7)}"
+        assert result[0][-1] == (6, 7), f"array dimension does not match the expected value. Got: {result[0][-1]}, Expected: {(6, 7)}"
 
         omc.sendExpression("loadString(\"model A Integer y = 5; Integer x[y+1,1+9]; end A;\")")
         omc.sendExpression("getErrorString()")
@@ -33,5 +31,4 @@ def test_ArrayDimension(self):
         assert result[-1][-1] == ('y+1', 10), f"array dimension does not match the expected value. Got: {result[-1][-1]}, Expected: {('y+1', 10)}"
 
         omc.__del__()
-        shutil.rmtree(tempdir, ignore_errors= True)
-
+        shutil.rmtree(tempdir, ignore_errors=True)

tests/test_FMIExport.py

@@ -1,6 +1,8 @@
 import OMPython
 import unittest
-import tempfile, shutil, os
+import shutil
+import os
+
 
 class testFMIExport(unittest.TestCase):
     def __init__(self, *args, **kwargs):
@@ -26,5 +28,6 @@ def testDrumBoiler(self):
         fmu = mod.convertMo2Fmu(fileNamePrefix="DrumBoiler")
         self.assertEqual(True, os.path.exists(fmu))
 
+
 if __name__ == '__main__':
     unittest.main()

tests/test_FMIRegression.py

@@ -1,36 +1,35 @@
 import OMPython
-import tempfile, shutil, os
-import pytest
+import tempfile
+import shutil
+import os
 
 
-"""
-do not change the prefix class name, the class name should have prefix "Test"
-according to the documenation of pytest
-"""
+# do not change the prefix class name, the class name should have prefix "Test"
+# according to the documenation of pytest
 class Test_FMIRegression:
 
     def buildModelFMU(self, modelName):
         omc = OMPython.OMCSessionZMQ()
 
-        ## create a temp dir for each session
+        # create a temp dir for each session
         tempdir = tempfile.mkdtemp()
         if not os.path.exists(tempdir):
             return print(tempdir, " cannot be created")
 
-        tempdirExp="".join(["cd(","\"",tempdir,"\"",")"]).replace("\\","/")
+        tempdirExp = "".join(["cd(", "\"", tempdir, "\"", ")"]).replace("\\", "/")
         omc.sendExpression(tempdirExp)
 
         omc.sendExpression("loadModel(Modelica)")
         omc.sendExpression("getErrorString()")
 
         fileNamePrefix = modelName.split(".")[-1]
-        exp = "buildModelFMU(" + modelName + ", fileNamePrefix=\"" + fileNamePrefix  + "\"" + ")"
+        exp = "buildModelFMU(" + modelName + ", fileNamePrefix=\"" + fileNamePrefix + "\"" + ")"
 
         fmu = omc.sendExpression(exp)
-        assert True == os.path.exists(fmu)
+        assert os.path.exists(fmu)
 
         omc.__del__()
-        shutil.rmtree(tempdir, ignore_errors= True)
+        shutil.rmtree(tempdir, ignore_errors=True)
 
     def test_Modelica_Blocks_Examples_Filter(self):
         self.buildModelFMU("Modelica.Blocks.Examples.Filter")

tests/test_ModelicaSystem.py

@@ -1,6 +1,9 @@
 import OMPython
 import unittest
-import tempfile, shutil, os
+import tempfile
+import shutil
+import os
+
 
 class ModelicaSystemTester(unittest.TestCase):
     def __init__(self, *args, **kwargs):
@@ -20,12 +23,13 @@ def __del__(self):
 
     def testModelicaSystemLoop(self):
         def worker():
-            filePath = os.path.join(self.tmp,"M.mo").replace("\\", "/")
+            filePath = os.path.join(self.tmp, "M.mo").replace("\\", "/")
             m = OMPython.ModelicaSystem(filePath, "M")
             m.simulate()
             m.convertMo2Fmu(fmuType="me")
             for _ in range(10):
                 worker()
 
+
 if __name__ == '__main__':
     unittest.main()

tests/test_ZMQ.py

@@ -1,6 +1,9 @@
 import OMPython
 import unittest
-import tempfile, shutil, os
+import tempfile
+import shutil
+import os
+
 
 class ZMQTester(unittest.TestCase):
     def __init__(self, *args, **kwargs):
@@ -16,10 +19,10 @@ def __init__(self, *args, **kwargs):
 
     def __del__(self):
         shutil.rmtree(self.tmp, ignore_errors=True)
-        del(self.om)
+        del self.om
 
     def clean(self):
-        del(self.om)
+        del self.om
         self.om = None
 
     def testHelloWorld(self):
@@ -37,5 +40,6 @@ def testSimulate(self):
         self.assertNotEqual("", self.om.sendExpression('res.resultFile'))
         self.clean()
 
+
 if __name__ == '__main__':
     unittest.main()

tests/test_docker.py

@@ -1,20 +1,20 @@
 import OMPython
 import unittest
-import tempfile, shutil, os
 import pytest
 
+
 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")
-        assert(om.sendExpression("getVersion()") == "OpenModelica 1.16.1")
+        assert om.sendExpression("getVersion()") == "OpenModelica 1.16.1"
         omInner = OMPython.OMCSessionZMQ(dockerContainer=om._dockerCid)
-        assert(omInner.sendExpression("getVersion()") == "OpenModelica 1.16.1")
+        assert omInner.sendExpression("getVersion()") == "OpenModelica 1.16.1"
         om2 = OMPython.OMCSessionZMQ(docker="openmodelica/openmodelica:v1.16.1-minimal", port=11111)
-        assert(om2.sendExpression("getVersion()") == "OpenModelica 1.16.1")
-        del(om2)
-        del(omInner)
-        del(om)
+        assert om2.sendExpression("getVersion()") == "OpenModelica 1.16.1"
+        del om2
+        del omInner
+        del om
 
 
 if __name__ == '__main__':

tests/test_linearization.py

@@ -1,6 +1,8 @@
 import OMPython
-import tempfile, shutil, os
-import pytest
+import tempfile
+import shutil
+import os
+
 
 class Test_Linearization:
     def loadModel(self):
@@ -26,7 +28,7 @@ def __del__(self):
 
     def test_example(self):
         self.loadModel()
-        filePath = os.path.join(self.tmp,"linearTest.mo").replace("\\", "/")
+        filePath = os.path.join(self.tmp, "linearTest.mo").replace("\\", "/")
         print(filePath)
         mod = OMPython.ModelicaSystem(filePath, "linearTest")
         [A, B, C, D] = mod.linearize()