moved test_util to pyfmi/src

modelon-community · Nov 11, 2024 · 7d56bbe · 7d56bbe
1 parent 612fd48
commit 7d56bbe
Show file tree

Hide file tree

Showing 11 changed files with 8 additions and 24 deletions.
diff --git a/setup.py b/setup.py
@@ -248,7 +248,7 @@ def check_extensions():
                     compiler_directives={'language_level' : "3str"})
 
     # Test utilities
-    ext_list += cythonize([os.path.join("src", "pyfmi", "tests", "test_util.pyx")], 
+    ext_list += cythonize([os.path.join("src", "pyfmi", "test_util.pyx")], 
                     include_path = incl_path, 
                     compiler_directives={'language_level' : "3str"})
 

diff --git a/src/pyfmi/tests/test_util.pxd → src/pyfmi/test_util.pxd b/src/pyfmi/tests/test_util.pxd → src/pyfmi/test_util.pxd
diff --git a/src/pyfmi/tests/test_util.pyx → src/pyfmi/test_util.pyx b/src/pyfmi/tests/test_util.pyx → src/pyfmi/test_util.pyx
diff --git a/src/pyfmi/tests/__init__.py b/src/pyfmi/tests/__init__.py
diff --git a/tests/test_fmi.py b/tests/test_fmi.py
@@ -28,7 +28,7 @@
 import pyfmi.fmi as fmi
 from pyfmi.fmi_algorithm_drivers import AssimuloFMIAlg, AssimuloFMIAlgOptions, \
                                         PYFMI_JACOBIAN_LIMIT, PYFMI_JACOBIAN_SPARSE_SIZE_LIMIT
-from pyfmi.tests.test_util import Dummy_FMUModelCS1, Dummy_FMUModelME1, Dummy_FMUModelME2, Dummy_FMUModelCS2, get_examples_folder
+from pyfmi.test_util import Dummy_FMUModelCS1, Dummy_FMUModelME1, Dummy_FMUModelME2, Dummy_FMUModelCS2, get_examples_folder
 from pyfmi.common.io import ResultHandler
 from pyfmi.common.algorithm_drivers import UnrecognizedOptionError
 from pyfmi.common.core import create_temp_dir

diff --git a/tests/test_fmi_coupled.py b/tests/test_fmi_coupled.py
@@ -21,7 +21,7 @@
 from pyfmi.fmi import FMUModelME2
 from pyfmi.fmi_coupled import CoupledFMUModelME2
 import pyfmi.fmi as fmi
-from pyfmi.tests.test_util import Dummy_FMUModelME2
+from pyfmi.test_util import Dummy_FMUModelME2
 
 assimulo_installed = True
 try:

diff --git a/tests/test_fmi_estimate.py b/tests/test_fmi_estimate.py
@@ -18,7 +18,7 @@
 import os
 import numpy as np
 
-from pyfmi.tests.test_util import Dummy_FMUModelME2
+from pyfmi.test_util import Dummy_FMUModelME2
 from scipy.io.matlab import loadmat
 
 assimulo_installed = True

diff --git a/tests/test_fmi_master.py b/tests/test_fmi_master.py
@@ -23,7 +23,7 @@
 
 from pyfmi import Master
 from pyfmi.fmi import FMUException, FMUModelCS2, FMUModelME2
-from pyfmi.tests.test_util import Dummy_FMUModelCS2
+from pyfmi.test_util import Dummy_FMUModelCS2
 from pyfmi.common.io import ResultHandler, ResultSizeError
 from pyfmi.common.algorithm_drivers import UnrecognizedOptionError
 

diff --git a/tests/test_io.py b/tests/test_io.py
@@ -30,7 +30,7 @@
 from pyfmi.common.diagnostics import DIAGNOSTICS_PREFIX, setup_diagnostics_variables
 
 import pyfmi.fmi as fmi
-from pyfmi.tests.test_util import Dummy_FMUModelME1, Dummy_FMUModelCS1, Dummy_FMUModelME2, Dummy_FMUModelCS2
+from pyfmi.test_util import Dummy_FMUModelME1, Dummy_FMUModelCS1, Dummy_FMUModelME2, Dummy_FMUModelCS2
 
 file_path = os.path.dirname(os.path.abspath(__file__))
 

diff --git a/tests/test_log.py b/tests/test_log.py
@@ -19,7 +19,7 @@
 
 from pyfmi.common.log import extract_xml_log, parse_xml_log
 from pyfmi.common.diagnostics import DIAGNOSTICS_PREFIX
-from pyfmi.tests.test_util import Dummy_FMUModelME2
+from pyfmi.test_util import Dummy_FMUModelME2
 from pyfmi.fmi_util import decode
 
 import numpy as np

diff --git a/tests/test_stream.py b/tests/test_stream.py
@@ -23,7 +23,7 @@
 from filecmp import cmp as compare_files
 
 from pyfmi.fmi import FMUException, load_fmu, FMUModelCS2, FMUModelME2
-from pyfmi.tests.test_util import get_examples_folder
+from pyfmi.test_util import get_examples_folder
 
 file_path = os.path.dirname(os.path.abspath(__file__))