Fixing test

Author: jolyonb

mitxgraders/helpers/math_helpers.py

@@ -16,7 +16,7 @@
 from voluptuous import Schema, Required, Any, All, Length, Coerce
 
 from mitxgraders.baseclasses import ItemGrader
-from mitxgraders.exceptions import InvalidInput, ConfigError
+from mitxgraders.exceptions import InvalidInput, ConfigError, MissingInput
 from mitxgraders.comparers import CorrelatedComparer
 from mitxgraders.sampling import (VariableSamplingSet, RealInterval, DiscreteSet, DependentSampler,
                                   gen_symbols_samples, construct_functions,
@@ -545,6 +545,8 @@ def gen_var_and_func_samples(self, *args):
                     # This is a sibling dictionary. Add it to the list of variables to sample.
                     for k in entry:
                         variables.append(k)
+                        if entry[k] == '':
+                            raise MissingInput('Cannot grade answer, a required input is missing.')
                         sample_from_dict[k] = DependentSampler(formula=entry[k])
                     break
 

tests/formulagrader/test_formulagrader.py

@@ -688,6 +688,36 @@ def test_fg_evals_numbered_variables_in_siblings():
         # The second call should provide only the first sibling formula
         assert results[1] == {'sibling_1': 'x_{0}+1'}
 
+def test_siblings_in_dependent_samplers():
+    grader = ListGrader(
+        answers=['1', 'x'],
+        subgraders=[
+            FormulaGrader(),
+            FormulaGrader(variables=['x'], sample_from={'x': DependentSampler(formula='sibling_1+1')})
+        ],
+        ordered=True
+    )
+
+    submission = ['1', '2']
+    expected_result = {
+        'overall_message': '',
+        'input_list': [
+            {'ok': True, 'grade_decimal': 1, 'msg': ''},
+            {'ok': True, 'grade_decimal': 1, 'msg': ''},
+        ]
+    }
+    assert grader(None, submission) == expected_result
+
+    submission = ['2', '3']
+    expected_result = {
+        'overall_message': '',
+        'input_list': [
+            {'ok': False, 'grade_decimal': 0, 'msg': ''},
+            {'ok': True, 'grade_decimal': 1, 'msg': ''},
+        ]
+    }
+    assert grader(None, submission) == expected_result
+
 def test_ng_config():
     """Test that the NumericalGrader config bars unwanted entries"""
     expect = r"not a valid value for dictionary value @ data\[u?'failable_evals'\]. Got 1"

tests/test_listgrader.py

@@ -9,7 +9,6 @@
                          NumericalGrader, SingleListGrader)
 from mitxgraders import CalcError
 from tests.helpers import mock
-from mitxgraders.sampling import DependentSampler
 
 pp = pprint.PrettyPrinter(indent=4)
 printit = pp.pprint
@@ -589,35 +588,6 @@ def test_siblings_passed_to_subgrader_check_if_ordered_and_subgrader_list():
                 for _, kwargs in check2.call_args_list:
                     assert kwargs['siblings'] == siblings
 
-def test_siblings_in_dependent_samplers():
-    grader = ListGrader(
-        answers=['1', 'x'],
-        subgraders=[
-            FormulaGrader(),
-            FormulaGrader(variables=['x'], sample_from={'x': DependentSampler(formula='sibling_1+1')})
-        ]
-    )
-
-    submission = ['1', '2']
-    expected_result = {
-        'overall_message': '',
-        'input_list': [
-            {'ok': True, 'grade_decimal': 1, 'msg': ''},
-            {'ok': True, 'grade_decimal': 1, 'msg': ''},
-        ]
-    }
-    assert grader(None, submission) == expected_result
-
-    submission = ['2', '3']
-    expected_result = {
-        'overall_message': '',
-        'input_list': [
-            {'ok': False, 'grade_decimal': 0, 'msg': ''},
-            {'ok': True, 'grade_decimal': 1, 'msg': ''},
-        ]
-    }
-    assert grader(None, submission) == expected_result
-
 
 def test_grouping_unordered_different_lengths():
     """Test that an error is raised if unordered groupings use different numbers of inputs"""