diff options
Diffstat (limited to 'grades/tests')
| -rw-r--r-- | grades/tests/test_models.py | 9 | ||||
| -rw-r--r-- | grades/tests/test_views.py | 11 |
2 files changed, 10 insertions, 10 deletions
diff --git a/grades/tests/test_models.py b/grades/tests/test_models.py index 89708e2..f8d5c5c 100644 --- a/grades/tests/test_models.py +++ b/grades/tests/test_models.py @@ -1,7 +1,7 @@ from django.test import TestCase from grades.models import GradingSystem, GradeRange -# Create your tests here. + class GradingSystemTestCase(TestCase): def setUp(self): GradingSystem.objects.create(name='unusable') @@ -9,8 +9,9 @@ class GradingSystemTestCase(TestCase): def test_get_grade(self): # Given grading_system = GradingSystem.objects.get(name='default') - expected_grades = {0:'F', 31:'F', 49:'P', 55:'C', 60:'B', 80:'A', - 95:'A+', 100:'A+', 100.5:'A+', 101:None, 109:None} + expected_grades = {0: 'F', 31: 'F', 49: 'P', 55: 'C', 60: 'B', 80: 'A', + 95: 'A+', 100: 'A+', 100.5: 'A+', 101: None, + 109: None} for marks in expected_grades.keys(): # When grade = grading_system.get_grade(marks) @@ -19,9 +20,9 @@ class GradingSystemTestCase(TestCase): def test_grade_system_unusable(self): # Given + # System with out ranges grading_system = GradingSystem.objects.get(name='unusable') # When grade = grading_system.get_grade(29) # Then self.assertIsNone(grade) - diff --git a/grades/tests/test_views.py b/grades/tests/test_views.py index 2c29ae5..c944f03 100644 --- a/grades/tests/test_views.py +++ b/grades/tests/test_views.py @@ -6,7 +6,8 @@ from grades.models import GradingSystem def setUpModule(): user = User.objects.create_user(username='grades_user', - password='grades_user') + password='grades_user') + def tearDownModule(): User.objects.all().delete() @@ -66,9 +67,9 @@ class AddGradingSystemTest(TestCase): def test_add_grades_post(self): # Given self.client.login(username='grades_user', password='grades_user') - data = {'name': ['new_sys'], 'description': ['About the grading system!'], + data = {'name': ['new_sys'], 'description': ['About grading system!'], 'graderange_set-MIN_NUM_FORMS': ['0'], - 'graderange_set-TOTAL_FORMS': ['0'], 'can_be_used': ['on'], + 'graderange_set-TOTAL_FORMS': ['0'], 'graderange_set-MAX_NUM_FORMS': ['1000'], 'add': ['Add'], 'graderange_set-INITIAL_FORMS': ['0']} # When @@ -86,12 +87,11 @@ class AddGradingSystemTest(TestCase): # Given data = {'graderange_set-0-upper_limit': ['40'], - 'graderange_set-0-order': ['0'], 'graderange_set-0-description': ['Fail'], 'graderange_set-0-lower_limit': ['0'], 'graderange_set-0-system': [''], 'name': ['new_sys'], 'graderange_set-MIN_NUM_FORMS': ['0'], - 'graderange_set-TOTAL_FORMS': ['1'], 'can_be_used': ['on'], + 'graderange_set-TOTAL_FORMS': ['1'], 'graderange_set-MAX_NUM_FORMS': ['1000'], 'graderange_set-0-id': [''], 'description': ['About the grading system!'], @@ -103,4 +103,3 @@ class AddGradingSystemTest(TestCase): # Then ranges = grading_system.graderange_set.all() self.assertEqual(len(ranges), 1) - |