Changeset 14116

Timestamp:

23 Aug 2016, 09:03:03 (8 years ago)

Author:

Henrik Bettermann

Message:

Adjust tests.

Location:

main/waeup.aaue/trunk/src/waeup/aaue/students

Files:

• reports/tests/test_raw_score_report.py (modified) (1 diff)
• tests/test_browser.py (modified) (6 diffs)

main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_raw_score_report.py

@@ -46 +46 @@
         result = get_students('fac1', 'dep1', 2010, 100, course_codes)
         self.assertEqual(result,
-            [(u'1234', u'TESTER, Bob', {'Course1': (88, 'A')})])
+            [(u'1234', u'TESTER, Bob', {'Course1': (70, 'A')})])
         return
 

main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

@@ -347 +347 @@
         self.browser.open(self.edit_scores_url)
         upload_ctrl = self.browser.getControl(name='uploadfile:file')
-        upload_file = StringIO(UPLOAD_CSV_TEMPLATE % ('65','77'))
+        upload_file = StringIO(UPLOAD_CSV_TEMPLATE % ('65','22'))
         upload_ctrl.add_file(upload_file, 'text/csv', 'myscores.csv')
         self.browser.getControl("Update editable scores from").click()
@@ -354 +354 @@
             self.student['studycourse']['100']['COURSE1'].score, 65)
         self.assertEqual(
-            self.student['studycourse']['100']['COURSE1'].ca, 77)
+            self.student['studycourse']['100']['COURSE1'].ca, 22)
 
     def test_lecturers_can_download_course_tickets(self):
@@ -461 +461 @@
                            self.browser.contents)
         self.browser.getControl("Create course list now").click()
-        self.student['studycourse']['100']['COURSE1'].score = 987
+        self.student['studycourse']['100']['COURSE1'].score = 67
         self.browser.getLink("100").click()
         # Course results can't be seen
-        self.assertFalse('987' in self.browser.contents)
+        self.assertFalse('<td>67</td>' in self.browser.contents)
         self.browser.getLink("Edit course list").click()
-        self.assertFalse('987' in self.browser.contents)
+        self.assertFalse('<td>67</td>' in self.browser.contents)
         self.browser.getControl("Register course list").click()
         self.assertTrue('Course registration has ended. Please pay' in self.browser.contents)
@@ -782 +782 @@
             in self.browser.contents)
         self.browser.getControl(name="scores:list", index=0).value = '55'
-        self.browser.getControl(name="cas:list", index=0).value = '66'
+        self.browser.getControl(name="cas:list", index=0).value = '22'
         self.browser.getControl("Update scores from").click()
         # New score and ca has been set.
@@ -788 +788 @@
             self.student['studycourse']['100']['COURSE1'].score, 55)
         self.assertEqual(
-            self.student['studycourse']['100']['COURSE1'].ca, 66)
+            self.student['studycourse']['100']['COURSE1'].ca, 22)
         # Score editing has been logged.
         logfile = os.path.join(
@@ -796 +796 @@
                         'E1000000 100/COURSE1 score updated (55)' in logcontent)
         self.assertTrue('mrslecturer - waeup.aaue.students.browser.CustomEditScoresPage - '
-                        'E1000000 100/COURSE1 ca updated (66)' in logcontent)
+                        'E1000000 100/COURSE1 ca updated (22)' in logcontent)
         # Non-integer scores won't be accepted.
         self.browser.open(