improve coverage

Technologicat · Technologicat · commit a51efa51fcfd · 2020-08-30T00:53:49.000+03:00
diff --git a/unpythonic/fploop.py b/unpythonic/fploop.py
@@ -120,7 +120,7 @@ def loop(*args, **kwargs):
     try:
         if not arity_includes(body, 1):
             raise ValueError("Body arity mismatch. (Is 'loop' parameter declared? Do all extra parameters have their defaults set?)")
-    except UnknownArity:  # well, we tried!
+    except UnknownArity:  # well, we tried!  # pragma: no cover
         pass
     tb = trampolined(body)  # enable "return jump(...)"
     return tb(loop)  # like @call, run the (now trampolined) body.
@@ -169,7 +169,7 @@ def loop(*args, **kwargs):
         try:
             if not arity_includes(body, 2):
                 raise ValueError("Body arity mismatch. (Are (loop, brk) declared? Do all extra parameters have their defaults set?)")
-        except UnknownArity:  # well, we tried!
+        except UnknownArity:  # well, we tried!  # pragma: no cover
             pass
         tb = trampolined(body)
         return tb(loop, brk)
@@ -261,7 +261,7 @@ def loop(*args, **kwargs):
         try:
             if not arity_includes(body, 3):
                 raise ValueError("Body arity mismatch. (Are (loop, x, acc) declared? Do all extra parameters have their defaults set?)")
-        except UnknownArity:  # well, we tried!
+        except UnknownArity:  # well, we tried!  # pragma: no cover
             pass
         try:
             x0 = next(it)
@@ -332,7 +332,7 @@ def loop(*args, **kwargs):
             try:
                 if not arity_includes(body, 5):
                     raise ValueError("Body arity mismatch. (Are (loop, x, acc, cnt, brk) declared? Do all extra parameters have their defaults set?)")
-            except UnknownArity:  # well, we tried!
+            except UnknownArity:  # well, we tried!  # pragma: no cover
                 pass
             try:
                 x0 = next(it)
diff --git a/unpythonic/test/test_fploop.py b/unpythonic/test/test_fploop.py
@@ -327,6 +327,11 @@ def result(loop, brk, acc=0, i=0):
             return loop(acc + i, i + 1)  # provide the additional parameters
         test[result == 45]
 
+        with test_raises(ValueError):
+            @breakably_looped
+            def result(loop):  # missing `brk` parameter
+                pass  # pragma: no cover
+
         # break, continue
         @breakably_looped_over(range(100), acc=0)
         def s(loop, x, acc, cnt, brk):
@@ -346,6 +351,28 @@ def s(loop, x, acc, cnt, brk):
             return loop(acc + x)
         test[s == 15]
 
+        # termination by running out of input elements
+        @breakably_looped_over(range(10), acc=0)
+        def s(loop, x, acc, cnt, brk):
+            return loop(acc + x)
+        test[s == 45]
+
+        # empty input iterable
+        @breakably_looped_over((), acc=0)
+        def s(loop, x, acc, cnt, brk):
+            return loop(acc + x)
+        test[s == 0]
+
+        with test_raises(ValueError):
+            @breakably_looped_over(range(10), acc=0)
+            def s(loop, x, acc):  # missing `cnt` and `brk` parameters
+                return loop(acc + x)
+
+        with test_raises(ValueError):
+            @breakably_looped_over(range(10), acc=0)
+            def s(loop, x, acc, cnt):  # missing `brk` parameter
+                return loop(acc + x)
+
     # TODO: need some kind of benchmarking tools to do this properly.
     with testset("performance benchmark"):
         n = 100000
diff --git a/unpythonic/test/test_let.py b/unpythonic/test/test_let.py
@@ -141,6 +141,12 @@ def result(*, env):
         test[result is False]
 
     with testset("error cases"):
+        # TODO: Python 3.6+ (up to 3.5, can't guarantee argument evaluation order)
+        # test_raises[AttributeError,
+        #             letrec(a=lambda e: e.b + 1,  # error, e.b does not exist yet (simple value refers to binding below it)
+        #                    b=42,
+        #                    body=lambda e: e.a)]
+
         test_raises[AttributeError,
                     let(x=0,
                         body=lambda e: e.set('y', 3)),
@@ -151,6 +157,12 @@ def result(*, env):
             def error1(*, env):
                 env.y = 2  # error, cannot introduce new bindings into a let environment
 
+        test_raises[TypeError, let(body="not a callable")]
+        test_raises[TypeError, let(body=lambda: None)]  # body callable must be able to take in environment
+        # Reassigning the same name is blocked by Python itself (SyntaxError), so no test for that.
+        test_raises[TypeError, letrec(x=lambda: 1,
+                                      body=lambda e: e.x)]  # callable value must be able to take in environment
+
 if __name__ == '__main__':  # pragma: no cover
     with session(__file__):
         runtests()
