Changed the name to the correct "example-based-assessment"

apps/openassessment/xblock/test/data/serialize.json

@@ -1016,7 +1016,7 @@
         ],
         "assessments": [
             {
-                "name": "sample-based-assessment",
+                "name": "example-based-assessment",
                 "algorithm_id": "sample-algorithm-id",
                 "examples": [
                     {
@@ -1056,7 +1056,7 @@
             "<openassessment>",
             "<title>Foo</title>",
             "<assessments>",
-                "<assessment name=\"sample-based-assessment\" algorithm_id=\"sample-algorithm-id\">",
+                "<assessment name=\"example-based-assessment\" algorithm_id=\"sample-algorithm-id\">",
                     "<example>",
                         "<answer>тєѕт αηѕωєя</answer>",
                         "<select criterion=\"Test criterion\" option=\"No\" />",

apps/openassessment/xblock/validation.py

@@ -64,6 +64,11 @@ def _is_valid_assessment_sequence(assessments):
         ['peer-assessment', 'self-assessment'],
         ['student-training', 'peer-assessment'],
         ['student-training', 'peer-assessment', 'self-assessment'],
+        ['example-based-assessment', 'self-assessment'],
+        ['example-based-assessment', 'peer-assessment'],
+        ['example-based-assessment', 'peer-assessment', 'self-assessment'],
+        ['example-based-assessment', 'student-training', 'peer-assessment'],
+        ['example-based-assessment', 'student-training', 'peer-assessment', 'self-assessment'],
     ]
 
     sequence = [asmnt.get('name') for asmnt in assessments]

apps/openassessment/xblock/xml.py

@@ -428,11 +428,11 @@ def _parse_assessments_xml(assessments_root):
         # Student training and AI Grading should always have examples set, even if it's an empty list.
         # (Validation rules, applied later, are responsible for
         # ensuring that users specify at least one example).
-        # All assessments except for Student Training and AI (sample-based-assessment) types ignore examples.
+        # All assessments except for Student Training and AI (example-based-assessment) types ignore examples.
         if assessment_dict['name'] == 'student-training':
             assessment_dict['examples'] = _parse_examples_xml(examples)
 
-        if assessment_dict['name'] == 'sample-based-assessment':
+        if assessment_dict['name'] == 'example-based-assessment':
             assessment_dict['examples'] = _parse_examples_xml(examples)
             assessment_dict['algorithm_id'] = unicode(assessment.get('algorithm_id'))