Merge pull request #321 from edx/will/move-test-data

Move test data files into test/data directories for consistency

apps/openassessment/assessment/test/test_peer.py

@@ -257,7 +257,7 @@ class TestPeerApi(CacheResetTest):
         for part in AssessmentPart.objects.all():
             self.assertEqual(len(part.feedback), Assessment.MAXSIZE)
 
-    @file_data('valid_assessments.json')
+    @file_data('data/valid_assessments.json')
     def test_get_assessments(self, assessment_dict):
         self._create_student_and_submission("Tim", "Tim's answer")
         bob_sub, bob = self._create_student_and_submission("Bob", "Bob's answer")
@@ -274,7 +274,7 @@ class TestPeerApi(CacheResetTest):
         assessments = peer_api.get_assessments(sub["uuid"], scored_only=False)
         self.assertEqual(1, len(assessments))
 
-    @file_data('valid_assessments.json')
+    @file_data('data/valid_assessments.json')
     def test_get_assessments_with_date(self, assessment_dict):
         self._create_student_and_submission("Tim", "Tim's answer")
         bob_sub, bob = self._create_student_and_submission("Bob", "Bob's answer")

apps/submissions/tests/test_api.py

@@ -114,7 +114,7 @@ class TestSubmissionsApi(TestCase):
         self._assert_submission(submissions[0], ANSWER_TWO, student_item.pk, 1)
 
 
-    @file_data('test_valid_student_items.json')
+    @file_data('data/valid_student_items.json')
     def test_various_student_items(self, valid_student_item):
         api.create_submission(valid_student_item, ANSWER_ONE)
         student_item = self._get_student_item(valid_student_item)
@@ -141,7 +141,7 @@ class TestSubmissionsApi(TestCase):
         self._assert_submission(submissions[0], ANSWER_ONE, student_item.pk, 2)
 
     @raises(api.SubmissionRequestError)
-    @file_data('test_bad_student_items.json')
+    @file_data('data/bad_student_items.json')
     def test_error_checking(self, bad_student_item):
         api.create_submission(bad_student_item, -100)