diff --git a/common/lib/capa/capa/capa_problem.py b/common/lib/capa/capa/capa_problem.py index 96a334ef97..4b0faa91a1 100644 --- a/common/lib/capa/capa/capa_problem.py +++ b/common/lib/capa/capa/capa_problem.py @@ -34,8 +34,8 @@ import chem import chem.chemcalc import chem.chemtools import chem.miller -import graders -import graders.draganddrop +import verifiers +import verifiers.draganddrop import calc from correctmap import CorrectMap @@ -72,7 +72,7 @@ global_context = {'random': random, 'chemcalc': chem.chemcalc, 'chemtools': chem.chemtools, 'miller': chem.miller, - 'draganddrop': graders.draganddrop} + 'draganddrop': verifiers.draganddrop} # These should be removed from HTML output, including all subelements html_problem_semantics = ["codeparam", "responseparam", "answer", "script", "hintgroup", "openendedparam","openendedrubric"] diff --git a/common/lib/capa/capa/graders/__init__.py b/common/lib/capa/capa/verifiers/__init__.py similarity index 100% rename from common/lib/capa/capa/graders/__init__.py rename to common/lib/capa/capa/verifiers/__init__.py diff --git a/common/lib/capa/capa/graders/draganddrop.py b/common/lib/capa/capa/verifiers/draganddrop.py similarity index 100% rename from common/lib/capa/capa/graders/draganddrop.py rename to common/lib/capa/capa/verifiers/draganddrop.py diff --git a/common/lib/capa/capa/graders/tests.py b/common/lib/capa/capa/verifiers/tests.py similarity index 99% rename from common/lib/capa/capa/graders/tests.py rename to common/lib/capa/capa/verifiers/tests.py index 90a8a9a98a..ddcaad511d 100644 --- a/common/lib/capa/capa/graders/tests.py +++ b/common/lib/capa/capa/verifiers/tests.py @@ -68,7 +68,7 @@ class Test_DragAndDrop_Grade(unittest.TestCase): user_input = '{"use_targets": true, "draggables": [{"1": [10,10]}, \ {"name_with_icon": [[10,10],4]}]}' correct_answer = {'1': [10, 10], 'name_with_icon': [[10, 10], 4]} - self.assertTrue(draganddrop.grade(user_input, correct_answer)) + self.assertFalse(draganddrop.grade(user_input, correct_answer)) def test_position_and_targets(self): user_input = '{"use_targets": false, \