Separate v1 and v2 tests (#284)

Move tests to v1 and v2 subpackages as done for the library.

Also improve error handling for incorrect SBML models / paths.

Author: dweindl

petab/v1/sbml.py

@@ -213,10 +213,16 @@ def load_sbml_from_file(
     :param sbml_file: Filename of the SBML file
     :return: The SBML reader, document, model
     """
+    if not Path(sbml_file).is_file():
+        raise FileNotFoundError(f"File not found: {sbml_file}")
+
     sbml_reader = libsbml.SBMLReader()
     sbml_document = sbml_reader.readSBML(sbml_file)
     sbml_model = sbml_document.getModel()
 
+    if sbml_model is None:
+        raise ValueError(f"SBML model could not be loaded from {sbml_file}")
+
     return sbml_reader, sbml_document, sbml_model
 
 

tests/v1/__init__.py

@@ -9,7 +9,7 @@
 
 # import fixtures
 pytest_plugins = [
-    "tests.test_petab",
+    "tests.v1.test_petab",
 ]
 
 

tests/math/test_math.py tests/v1/math/test_math.pytests/math/test_math.py renamed to tests/v1/math/test_math.py

@@ -12,7 +12,7 @@
 
 # import fixtures
 pytest_plugins = [
-    "tests.test_petab",
+    "tests.v1.test_petab",
 ]
 
 
@@ -427,8 +427,8 @@ def test_petablint_succeeds():
     """Run petablint and ensure we exit successfully for a file that should
     contain no errors
     """
-    dir_isensee = "../doc/example/example_Isensee/"
-    dir_fujita = "../doc/example/example_Fujita/"
+    dir_isensee = "../../doc/example/example_Isensee/"
+    dir_fujita = "../../doc/example/example_Fujita/"
 
     # run with measurement file
     script_path = os.path.abspath(os.path.dirname(__file__))