further cleaning

Author: sjunges

main.py

@@ -1,11 +1,17 @@
 from pathlib import Path
 from umbtest.benchmarks import Tester
-from umbtest.tools import PrismCLI, StormCLI, UmbPython
+from umbtest.tools import PrismCLI, StormCLI, UmbPython, check_tools
 
 # Note. The following can be used to configure the locations of the tools.
-# PrismCLI.prism_dir_path = "/Users/junges/prism-umb/"
-# StormCLI._storm_path = "/Users/junges/storm-umb/build/bin/storm"
+# PrismCLI.prism_dir_path = /path_to_prism_dir/
+# StormCLI._storm_path = /path_to_storm_binary
+check_tools(PrismCLI, StormCLI, UmbPython)
+
 
 tester = Tester()
+tester.set_chain(PrismCLI, UmbPython, StormCLI)
 
-tester.check_prism_file(Path(PrismCLI.prism_dir_path) / "prism-examples/simple/dice/dice.pm", ["R=? [F d=7]"])
+tester.check_prism_file(
+    Path(PrismCLI.prism_dir_path) / "prism-examples/simple/dice/dice.pm",
+    ["R=? [F d=7]"],
+)

umbtest/benchmarks.py

@@ -1,15 +1,17 @@
 import tempfile
 from typing import List
-from umbtest.tools import UmbTool
+from umbtest.tools import UmbTool, ReportedResults
 from pathlib import Path
 
 
 class UmbBenchmark:
     def __init__(self, location):
         self._location = location
 
+
 benchmarks = []
 
+
 class Tester:
     def __init__(self):
         self._tmpdir = tempfile.TemporaryDirectory()
@@ -23,30 +25,40 @@ def _tmpumbfile(self):
     def _tmplogfile(self):
         return tempfile.NamedTemporaryFile(dir=self._tmpdir.name, suffix=".log")
 
-    def set_chain(self, loader: UmbTool, transformer: None | UmbTool, checker: UmbTool):
+    def set_chain(
+        self, loader: UmbTool, transformer: None | UmbTool, checker: UmbTool
+    ) -> None:
         self._loader = loader
         self._transformer = transformer
         self._checker = checker
 
-    def check_prism_file(self, prism_file: Path, properties: List[str]):
+    def check_prism_file(
+        self, prism_file: Path, properties: List[str]
+    ) -> dict[str, ReportedResults]:
+        result = dict()
         if self._loader is None or self._checker is None:
             raise RuntimeError("You must first set the tool chain, using set_chain()")
         tmpfile_in = self._tmpumbfile()
         log_file_to_umb = self._tmplogfile()
-        result1 = self._loader.prism_file_to_umb(prism_file, Path(tmpfile_in.name), log_file=Path(log_file_to_umb.name))
+        result["loader"] = self._loader.prism_file_to_umb(
+            prism_file, Path(tmpfile_in.name), log_file=Path(log_file_to_umb.name)
+        )
         if result1.error_code != 0:
             with open(result1.logfile, "r") as f:
                 print(f.read())
 
         if self._transformer:
             tmpfile_out = self._tmpumbfile()
-            result2 = self._transformer.umb_to_umb(Path(tmpfile_in.name), Path(tmpfile_out.name),
-                                   log_file=Path(self._tmplogfile().name))
+            result["transformer"] = self._transformer.umb_to_umb(
+                Path(tmpfile_in.name),
+                Path(tmpfile_out.name),
+                log_file=Path(self._tmplogfile().name),
+            )
         else:
             tmpfile_out = tmpfile_in
-        result3 = self._checker.check_umb(Path(tmpfile_out.name), log_file=Path(self._tmplogfile().name), properties=properties)
-
-        print(result1)
-        if self._transformer:
-            print(result2)
-        print(result3)
+        result["checker"] = self._checker.check_umb(
+            Path(tmpfile_out.name),
+            log_file=Path(self._tmplogfile().name),
+            properties=properties,
+        )
+        return result