improving test coverage

Author: mbdevpl

open_fortran_parser/ofc_wrapper.py

@@ -23,8 +23,8 @@ def execute_compiler(
     """Run Open Fortran Compiler with given parameters."""
     assert isinstance(input_path, pathlib.Path), type(input_path)
     assert output_path is None or isinstance(output_path, pathlib.Path), type(output_path)
-    assert isinstance(indent, int), type(indent)
-    assert indent >= 0, indent
+    assert indent is None or isinstance(indent, int), type(indent)
+    assert indent is None or indent > 0, indent
     assert form is None or isinstance(form, CodeForm), type(form)
 
     if ofc_config['path'] is not None:
@@ -53,8 +53,8 @@ def transpile(
         raise_on_error: bool = False) -> str:
     """Parse given (possibly non-standard) Fortran code and return standard-compliant code."""
     assert isinstance(input_path, pathlib.Path), type(input_path)
-    assert isinstance(indent, int), type(indent)
-    assert indent >= 0, indent
+    assert indent is None or isinstance(indent, int), type(indent)
+    assert indent is None or indent > 0, indent
     assert form is None or isinstance(form, CodeForm), type(form)
 
     process = execute_compiler(input_path, None, indent, form)

test/test_dependencies.py

@@ -18,9 +18,10 @@ def test_deps_script(self):
     @unittest.skipUnless(os.environ.get('TEST_DEPENDENCIES'), 'skipping dependency test')
     def test_deps(self):
         from open_fortran_parser.dependencies import DEV_DEPENDENCIES, ensure_dependencies
-        for silent in (False, True):
-            with tempfile.TemporaryDirectory() as temp_dir:
-                ensure_dependencies(DEV_DEPENDENCIES, pathlib.Path(temp_dir), silent=silent)
-                self.assertGreater(len(os.listdir(temp_dir)), 0)
-
-        return
+        with tempfile.TemporaryDirectory() as temp_dir:
+            ensure_dependencies(DEV_DEPENDENCIES, pathlib.Path(temp_dir), silent=False)
+            self.assertGreater(len(os.listdir(temp_dir)), 0)
+        with tempfile.TemporaryDirectory() as temp_dir:
+            os.rmdir(temp_dir)
+            ensure_dependencies(DEV_DEPENDENCIES, pathlib.Path(temp_dir), silent=True)
+            self.assertGreater(len(os.listdir(temp_dir)), 0)

test/test_ofc.py

@@ -3,19 +3,18 @@
 import logging
 import pathlib
 import platform
+import tempfile
 import unittest
 
-# CodeForm,
-from open_fortran_parser.ofc_wrapper import execute_compiler, transpile
+from open_fortran_parser.ofc_wrapper import CodeForm, execute_compiler, transpile
 
 _LOG = logging.getLogger(__name__)
 
 _HERE = pathlib.Path(__file__).resolve().parent
 
 INPUT_PATHS = [_HERE.joinpath('examples', _) for _ in ['empty.f']]
-OUTPUT_PATHS = [None] # [pathlib.Path('/tmp/out.f'), None]
-INDENTS = (4,) # (0, 4, 8)
-FORMS = (None,) # (CodeForm.Fixed, CodeForm.Free, None)
+INDENTS = (None, 2, 4, 8)
+FORMS = (None, CodeForm.Fixed, CodeForm.Free)
 
 
 class Tests(unittest.TestCase):
@@ -25,20 +24,23 @@ class Tests(unittest.TestCase):
     @unittest.skipIf(platform.system() == 'Windows', 'OFC not available on Windows')
     def test_execute_compiler(self):
         for input_path in INPUT_PATHS:
-            for output_path in OUTPUT_PATHS:
-                for indent in INDENTS:
-                    for form in FORMS:
+            for indent in INDENTS:
+                for form in FORMS:
+                    output_file = tempfile.NamedTemporaryFile(delete=False)
+                    output_file_path = pathlib.Path(output_file.name)
+                    for output_path in (None, output_file_path):
                         with self.subTest(input_path=input_path, output_path=output_path,
                                           indent=indent, form=form):
-                            execute_compiler(input_path, output_path, indent, form)
+                            result = execute_compiler(input_path, output_path, indent, form)
+                            self.assertEqual(result.returncode, 0, msg=result)
 
     @unittest.skipIf(platform.system() == 'Windows', 'OFC not available on Windows')
     def test_transpile(self):
         for input_path in INPUT_PATHS:
             for indent in INDENTS:
                 for form in FORMS:
                     with self.subTest(input_path=input_path, indent=indent, form=form):
-                        code = transpile(input_path, indent, form)
+                        code = transpile(input_path, indent, form, raise_on_error=True)
                         self.assertIsNotNone(code)
                         self.assertIsInstance(code, str)
                         self.assertGreater(len(code), 0)

test/test_script.py

@@ -20,6 +20,9 @@ class Tests(unittest.TestCase):
 
     maxDiff = None
 
+    def test_run_not_main(self):
+        run_module('open_fortran_parser', 'some', 'bad', 'args', run_name='not_main')
+
     def test_help(self):
         sio = io.StringIO()
         with contextlib.redirect_stderr(sio):