rename syntax.testutil to syntax.testingtools (more descriptive)

Technologicat · Technologicat · commit 9165b4ca3865 · 2020-08-28T17:11:46.000+03:00
diff --git a/HACKING.md b/HACKING.md
@@ -78,7 +78,7 @@ Automated tests are in `test`, under the directory whose modules they test. The
 
 For coverage analysis, [`coverage.py`](https://github.com/nedbat/coveragepy) works fine. Block macros do cause [some false negatives](https://github.com/nedbat/coveragepy/issues/1004), but this is minor.
 
-We use a custom testing framework, which lives in the modules `unpythonic.test.fixtures` and `unpythonic.syntax.testutil`. It uses conditions and restarts to communicate between individual tests and the testset, which acts as a reporter.
+We use a custom testing framework, which lives in the modules `unpythonic.test.fixtures` and `unpythonic.syntax.testingtools`. It uses conditions and restarts to communicate between individual tests and the testset, which acts as a reporter.
 
 In retrospect, given that the main aim was compact testing syntax for macro-enabled Python code (without installing another import hook, doing which would disable the macro expander), it might have made more sense to make the testing macros compile to [pytest](https://docs.pytest.org/en/latest/). But hey, it's short, may have applications in teaching... and now we can easily write custom runners, since the testing framework is just a MacroPy library.
 
diff --git a/README.md b/README.md
@@ -413,7 +413,7 @@ The `with session()` is optional. The human-readable session name is also option
 
 Tests can optionally be grouped into testsets. Each `testset` tallies passed, failed and errored tests within it, and displays the totals when it exits. Testsets can be named and nested.
 
-Testsets also provide the option to locally install a `postproc` handler that gets a copy of each failure or error in that testset (and by default, any of its inner testsets), after the failure or error has been printed. In nested testsets, the dynamically innermost `postproc` wins. A failure is an instance of `unpythonic.syntax.testutil.TestFailure`, and an error is an instance of `unpythonic.syntax.testutil.TestError`. Both inherit from `unpythonic.syntax.testutil.TestingException`.
+Testsets also provide the option to locally install a `postproc` handler that gets a copy of each failure or error in that testset (and by default, any of its inner testsets), after the failure or error has been printed. In nested testsets, the dynamically innermost `postproc` wins. A failure is an instance of `unpythonic.test.fixtures.TestFailure`, and an error is an instance of `unpythonic.test.fixtures.TestError`. Both inherit from `unpythonic.test.fixtures.TestingException`.
 
 If you want to set a default global `postproc`, which is used when no local `postproc` is in effect, see the `TestConfig` bunch of constants in `unpythonic.test.fixtures`. It also contains some other configuration options.
 
diff --git a/unpythonic/syntax/__init__.py b/unpythonic/syntax/__init__.py
@@ -31,15 +31,15 @@
 from .prefix import prefix as _prefix
 from .tailtools import (autoreturn as _autoreturn, tco as _tco,  # noqa: F401
                         continuations as _continuations, call_cc)
-from .testutil import (test_expr as _test_expr,
-                       test_expr_signals as _test_expr_signals,
-                       test_expr_raises as _test_expr_raises,
-                       test_block as _test_block,
-                       test_block_signals as _test_block_signals,
-                       test_block_raises as _test_block_raises,
-                       fail_expr as _fail_expr,
-                       error_expr as _error_expr,
-                       warn_expr as _warn_expr)
+from .testingtools import (test_expr as _test_expr,
+                           test_expr_signals as _test_expr_signals,
+                           test_expr_raises as _test_expr_raises,
+                           test_block as _test_block,
+                           test_block_signals as _test_block_signals,
+                           test_block_raises as _test_block_raises,
+                           fail_expr as _fail_expr,
+                           error_expr as _error_expr,
+                           warn_expr as _warn_expr)
 # "where" is only for passing through (export).
 from .letdoutil import UnexpandedLetView, _canonize_bindings, where  # noqa: F401
 from ..dynassign import dyn, make_dynvar
diff --git a/unpythonic/syntax/nb.py b/unpythonic/syntax/nb.py
@@ -10,7 +10,7 @@
 
 from macropy.core.quotes import macros, q, ast_literal  # noqa: F401
 
-from .testutil import istestmacro
+from .testingtools import istestmacro
 
 def nb(body, args):
     p = args[0] if args else q[print]  # custom print function hook
diff --git a/unpythonic/syntax/prefix.py b/unpythonic/syntax/prefix.py
@@ -23,7 +23,7 @@
 from macropy.core.walkers import Walker
 
 from .letdoutil import islet, isdo, UnexpandedLetView, UnexpandedDoView
-from .testutil import isunexpandedtestmacro
+from .testingtools import isunexpandedtestmacro
 
 from ..it import flatmap, rev, uniqify
 
diff --git a/unpythonic/syntax/test/testing_testingtools.py b/unpythonic/syntax/test/testing_testingtools.py
diff --git a/unpythonic/syntax/testingtools.py b/unpythonic/syntax/testingtools.py
diff --git a/unpythonic/test/fixtures.py b/unpythonic/test/fixtures.py
@@ -373,7 +373,7 @@ def returns_normally(expr):
     # The magic is, `test[]` lifts its expr into a lambda. When the test runs,
     # our arg gets evaluated first, and then its value is passed to us.
     #
-    # To make the test succeed whenever `unpythonic.syntax.testutil._observe`
+    # To make the test succeed whenever `unpythonic.syntax.testingtools._observe`
     # didn't catch an unexpected signal or exception in `expr`, we just ignore
     # our arg, and:
     return True
@@ -476,7 +476,7 @@ def makeindent(level):
                        maybe_colorize("BEGIN", TC.BRIGHT, TestConfig.CS.HEADING))
 
     def print_and_proceed(condition):
-        # The assert helpers in `unpythonic.syntax.testutil` signal only
+        # The assert helpers in `unpythonic.syntax.testingtools` signal only
         # the descendants of `TestingException`, no matter what happens
         # inside the test expression.
         if isinstance(condition, TestFailure):
diff --git a/unpythonic/test/test_conditions.py b/unpythonic/test/test_conditions.py
@@ -12,7 +12,7 @@
 # `unpythonic` is to write tests that test the testing framework. Currently we
 # don't do that. The test framework is considered to change at most slowly, so
 # for that, manual testing is sufficient (see commented-out example session in
-# `unpythonic.syntax.test.test_testutil`).
+# `unpythonic.syntax.test.testing_testingtools`).
 
 from ..syntax import macros, test, test_raises, test_signals, fail  # noqa: F401
 from .fixtures import session, testset, catch_signals, returns_normally
