refactor tests (#120)

Author: markaren

.github/workflows/publish.yml

@@ -33,7 +33,7 @@ jobs:
           mkdir tmp-build
           cd tmp-build
           cmake $GITHUB_WORKSPACE/pythonfmu/pythonfmu-export -DCMAKE_BUILD_TYPE=Release
-          cmake --build . --config Release
+          cmake --build .
           cd ..
       - name: Archive wrapper library
         uses: actions/upload-artifact@v2

MANIFEST.in

@@ -1,7 +1,8 @@
 include LICENSE
 include README.md
 
-include pythonfmu/tests/csvdemo.csv
+recursive-include pythonfmu/tests/data *
+recursive-include pythonfmu/tests/slaves *
 
-recursive-include pythonfmu/pythonfmu-export *
 recursive-include pythonfmu/resources *
+recursive-include pythonfmu/pythonfmu-export *

pythonfmu/pythonfmu-export/build_unix.sh

@@ -0,0 +1,4 @@
+mkdir build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release
+cmake --build .

pythonfmu/pythonfmu-export/build_win.sh

@@ -0,0 +1,4 @@
+mkdir build
+cd build
+cmake .. -DCMAKE_BUILD_TYPE=Release -A x64
+cmake --build . --config Release

pythonfmu/tests/csvdemo.csv pythonfmu/tests/data/csvdemo.csvpythonfmu/tests/csvdemo.csv renamed to pythonfmu/tests/data/csvdemo.csv

@@ -0,0 +1,15 @@
+from pythonfmu.fmi2slave import Fmi2Slave, Fmi2Causality, Real
+
+
+class PythonSlaveWithException(Fmi2Slave):
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        self.realIn = 22.0
+        self.realOut = 0.0
+        self.register_variable(Real("realIn", causality=Fmi2Causality.input))
+        self.register_variable(Real("realOut", causality=Fmi2Causality.output))
+
+    def do_step(self, current_time, step_size):
+        raise RuntimeError()

pythonfmu/tests/slaves/PythonSlaveWithException.py

@@ -0,0 +1,8 @@
+
+
+def get_amplitude():
+    return 5.
+
+
+def get_time_constant():
+    return 0.1

pythonfmu/tests/slaves/localmodule.py

@@ -0,0 +1,18 @@
+import math
+from pythonfmu.fmi2slave import Fmi2Slave, Fmi2Causality, Real
+from localmodule import get_amplitude, get_time_constant
+
+
+class PythonSlaveWithDep(Fmi2Slave):
+
+    def __init__(self, **kwargs):
+        super().__init__(**kwargs)
+
+        self.realIn = 22.0
+        self.realOut = 0.0
+        self.register_variable(Real("realIn", causality=Fmi2Causality.input))
+        self.register_variable(Real("realOut", causality=Fmi2Causality.output))
+
+    def do_step(self, current_time, step_size):
+        self.realOut = self.realIn * get_amplitude() * math.exp((current_time + step_size) / get_time_constant())
+        return True

pythonfmu/tests/pythonslave.py pythonfmu/tests/slaves/pythonslave.pypythonfmu/tests/pythonslave.py renamed to pythonfmu/tests/slaves/pythonslave.py

@@ -1,6 +1,5 @@
 import itertools
 import platform
-import sys
 import tempfile
 import zipfile
 from pathlib import Path
@@ -10,7 +9,6 @@
 import pythonfmu
 from pythonfmu.builder import FmuBuilder, get_platform
 
-DEMO = "pythonslave.py"
 PROJECT_TEST_CASES = [
     ("dummy.txt",),
     ("dummy.py", "subdir/dummy.txt"),
@@ -25,8 +23,9 @@
 
 
 def test_zip_content(tmp_path):
-    script_file = Path(__file__).parent / DEMO
 
+    script_name = "pythonslave.py"
+    script_file = Path(__file__).parent / "slaves" / script_name
     fmu = FmuBuilder.build_FMU(script_file, dest=tmp_path)
     assert fmu.exists()
     assert zipfile.is_zipfile(fmu)
@@ -35,7 +34,7 @@ def test_zip_content(tmp_path):
         names = files.namelist()
 
         assert "modelDescription.xml" in names
-        assert "/".join(("resources", DEMO)) in names
+        assert "/".join(("resources", script_name)) in names
         module_file = "/".join(("resources", "slavemodule.txt"))
         assert module_file in names
 
@@ -72,9 +71,8 @@ def test_zip_content(tmp_path):
 
 @pytest.mark.parametrize("pfiles", PROJECT_TEST_CASES)
 def test_project_files(tmp_path, pfiles):
-    script_file = Path(__file__).parent / DEMO
     pfiles = map(Path, pfiles)
-
+    script_file = Path(__file__).parent / "slaves/pythonslave.py"
     def build():
         with tempfile.TemporaryDirectory() as project_dir:
             project_dir = Path(project_dir)
@@ -120,13 +118,13 @@ def build():
 
 @pytest.mark.parametrize("pfiles", PROJECT_TEST_CASES)
 def test_project_files_containing_script(tmp_path, pfiles):
-    orig_script_file = Path(__file__).parent / DEMO
+    orig_script_file = Path(__file__).parent / "slaves/pythonslave.py"
     pfiles = map(Path, pfiles)
 
     def build():
         with tempfile.TemporaryDirectory() as project_dir:
             project_dir = Path(project_dir)
-            script_file = project_dir / DEMO
+            script_file = project_dir / "slave.py"
             with open(orig_script_file) as script_f:
                 script_file.write_text(script_f.read())
 
@@ -159,8 +157,7 @@ def build():
 
 
 def test_documentation(tmp_path):
-    script_file = Path(__file__).parent / DEMO
-
+    script_file = Path(__file__).parent / "slaves/pythonslave.py"
     def build():
         with tempfile.TemporaryDirectory() as documentation_dir:
             doc_dir = Path(documentation_dir)