looks like all tests pass with full coverage

dwhswenson · Oct 28, 2021 · Jul 24, 2021 · Sep 27, 2021 · Sep 30, 2021 · Oct 2, 2021
commit 934040a9c44d1c18fb3841c0532705f6bd865400
diff --git a/paths_cli/tests/wizard/test_plugin_classes.py b/paths_cli/tests/wizard/test_plugin_classes.py
@@ -110,7 +110,7 @@ def test_call(self):
 
     def test_call_with_prereq(self):
         # ensure that prerequisites get run if they are provided
-        def prereq(wizard):
+        def prereq(wizard, context):
             wizard.say("Running prereq")
             return {'prereq': ['results']}
 
@@ -258,8 +258,9 @@ def setup(self):
         self.plugin_format = WizardObjectPlugin(
             name="bar",
             category="foo",
-            builder=(lambda wizard, context:
-                     "bar_obj baz={baz}".format(**context)),
+            prerequisite=lambda wizard, context: {'baz': context['baz']},
+            builder=(lambda wizard, prereq:
+                     "bar_obj baz={baz}".format(**prereq)),
         )
 
     @pytest.mark.parametrize('input_type', ['method', 'None'])

diff --git a/paths_cli/tests/wizard/test_volumes.py b/paths_cli/tests/wizard/test_volumes.py
@@ -5,7 +5,8 @@
 
 from paths_cli.wizard.volumes import (
     INTERSECTION_VOLUME_PLUGIN, UNION_VOLUME_PLUGIN, NEGATED_VOLUME_PLUGIN,
-    CV_DEFINED_VOLUME_PLUGIN, VOLUMES_PLUGIN, volume_intro, _VOL_DESC
+    CV_DEFINED_VOLUME_PLUGIN, VOLUMES_PLUGIN, volume_intro, _VOL_DESC,
+    volume_ask
 )
 
 
@@ -100,6 +101,19 @@ def test_negated_volume(volume_setup):
     assert not vol(traj[0])
     assert vol(traj[1])
 
+@pytest.mark.parametrize('depth', [0, 1, None])
+def test_volume_ask(depth):
+    context = {0: {'depth': 0},
+               1: {'depth': 1},
+               None: {}}[depth]
+    wiz = mock_wizard([])
+    result = volume_ask(wiz, context)
+    if depth == 1:
+        assert result == "What describes this volume?"
+    else:
+        assert result == "What describes this state?"
+
+
 @pytest.mark.parametrize('periodic', [True, False])
 def test_cv_defined_volume(periodic):
     if periodic:

diff --git a/paths_cli/wizard/parameters.py b/paths_cli/wizard/parameters.py
@@ -151,7 +151,7 @@ def select_single_existing(self, wizard):
                                   self.create_func)
         return self.load_func(obj)
 
-    def __call__(self, wizard):
+    def __call__(self, wizard, context=None):
         n_existing = len(getattr(wizard, self.store_name))
         if n_existing == self.n_required:
             # early return in this case (return silently)

diff --git a/paths_cli/wizard/plugin_classes.py b/paths_cli/wizard/plugin_classes.py
@@ -145,12 +145,11 @@ def __call__(self, wizard, context=None):
             wizard.say(self.intro)
 
         if self.prerequisite is not None:
-            prereqs = self.prerequisite(wizard)
+            prereqs = self.prerequisite(wizard, context)
         else:
             prereqs = {}
 
-        context.update(prereqs)
-        result = self.builder(wizard, context)
+        result = self.builder(wizard, prereqs)
         summary = self.get_summary(wizard, context, result)
         for line in summary:
             wizard.say(line)

diff --git a/paths_cli/wizard/volumes.py b/paths_cli/wizard/volumes.py
@@ -10,22 +10,16 @@
 from functools import partial
 
 def _binary_func_volume(wizard, context, op):
-    def summarize(volname):
-        def inner(wizard, context, result):
-            return f"The {volname} volume is:\n  {str(result)}"
-
     as_state = context.get('depth', 0) == 0
     wizard.say("Let's make the first constituent volume:")
     new_context = volume_set_context(wizard, context, selected=None)
     new_context['part'] = 1
-    new_context['summarize'] = summarize("first")
     vol1 = VOLUMES_PLUGIN(wizard, new_context)
     wizard.say("Let's make the second constituent volume:")
     new_context['part'] = 2
-    new_context['summarize'] = summarize("second")
     vol2 = VOLUMES_PLUGIN(wizard, new_context)
+    wizard.say("Now we'll combine those two constituent volumes...")
     vol = op(vol1, vol2)
-    # wizard.say(f"Created a volume:\n{vol}")
     return vol
 
 _LAMBDA_STR = ("What is the {minmax} allowed value for "