stormpy is now also optional in the tests

stormvogel/result.py

@@ -3,10 +3,8 @@
 
 try:
     import stormpy
-
-    stormpy_installed = True
 except ImportError:
-    stormpy_installed = False
+    stormpy = None
 
 
 class Scheduler:
@@ -148,6 +146,7 @@ def convert_model_checking_result(
     """
     Takes a model checking result from stormpy and its associated model and converts it to a stormvogel representation
     """
+    assert stormpy is not None
 
     if (
         type(stormpy_result) == stormpy.core.ExplicitQuantitativeCheckResult

stormvogel/simulator.py

@@ -7,11 +7,8 @@
 
 try:
     import stormpy.simulator
-
-    stormpy_installed = True
 except ImportError:
     stormpy = None
-    stormpy_installed = False
 
 
 class Path:

tests/test_mapping.py

@@ -12,8 +12,10 @@
 import examples.simple_ma
 from stormvogel.model import EmptyAction
 
-
-import stormpy.storage
+try:
+    import stormpy
+except ImportError:
+    stormpy = None
 
 
 def sparse_equal(
@@ -24,6 +26,7 @@ def sparse_equal(
     outputs true if the sparse models are the same and false otherwise
     Note: this function is only here because the equality functions in storm do not work currently.
     """
+    assert stormpy is not None
 
     # check if states are the same:
     states_equal = True

tests/test_model_checking.py

@@ -2,12 +2,14 @@
 import examples.monty_hall
 import examples.die
 
-
-import stormpy
+try:
+    import stormpy
+except ImportError:
+    stormpy = None
 
 
 def test_model_checking():
-    # TODO this test is maybe too trivial?
+    assert stormpy is not None
 
     # we get our result using the stormvogel model checker function indirectly
     mdp = examples.monty_hall.create_monty_hall_mdp()

tests/test_result.py

@@ -1,11 +1,14 @@
 import stormvogel.result
 import pytest
 
-
-import stormpy
+try:
+    import stormpy
+except ImportError:
+    stormpy = None
 
 
 def test_convert_model_checker_results_dtmc():
+    assert stormpy is not None
     path = stormpy.examples.files.prism_dtmc_die
     prism_program = stormpy.parse_prism_program(path)
     formula_str = "P=? [F s=7 & d=2]"
@@ -38,6 +41,7 @@ def test_convert_model_checker_results_dtmc():
 
 
 def test_convert_model_checker_results_dtmc_qualitative():
+    assert stormpy is not None
     path = stormpy.examples.files.prism_dtmc_die
     prism_program = stormpy.parse_prism_program(path)
     formula_str = "P>=0.5 [F s=7 & d=2]"
@@ -71,6 +75,7 @@ def test_convert_model_checker_results_dtmc_qualitative():
 
 
 def test_convert_model_checker_results_mdp():
+    assert stormpy is not None
     path = stormpy.examples.files.prism_mdp_coin_2_2
 
     prism_program = stormpy.parse_prism_program(path)
@@ -643,6 +648,7 @@ def test_convert_model_checker_results_mdp():
 
 
 def test_convert_model_checker_results_mdp_qualitative():
+    assert stormpy is not None
     path = stormpy.examples.files.prism_mdp_coin_2_2
 
     prism_program = stormpy.parse_prism_program(path)