Changeset 14116 for main


Ignore:
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:
2 edited

Legend:

Unmodified
Added
Removed
  • main/waeup.aaue/trunk/src/waeup/aaue/students/reports/tests/test_raw_score_report.py

    r14082 r14116  
    4646        result = get_students('fac1', 'dep1', 2010, 100, course_codes)
    4747        self.assertEqual(result,
    48             [(u'1234', u'TESTER, Bob', {'Course1': (88, 'A')})])
     48            [(u'1234', u'TESTER, Bob', {'Course1': (70, 'A')})])
    4949        return
    5050
  • main/waeup.aaue/trunk/src/waeup/aaue/students/tests/test_browser.py

    r14075 r14116  
    347347        self.browser.open(self.edit_scores_url)
    348348        upload_ctrl = self.browser.getControl(name='uploadfile:file')
    349         upload_file = StringIO(UPLOAD_CSV_TEMPLATE % ('65','77'))
     349        upload_file = StringIO(UPLOAD_CSV_TEMPLATE % ('65','22'))
    350350        upload_ctrl.add_file(upload_file, 'text/csv', 'myscores.csv')
    351351        self.browser.getControl("Update editable scores from").click()
     
    354354            self.student['studycourse']['100']['COURSE1'].score, 65)
    355355        self.assertEqual(
    356             self.student['studycourse']['100']['COURSE1'].ca, 77)
     356            self.student['studycourse']['100']['COURSE1'].ca, 22)
    357357
    358358    def test_lecturers_can_download_course_tickets(self):
     
    461461                           self.browser.contents)
    462462        self.browser.getControl("Create course list now").click()
    463         self.student['studycourse']['100']['COURSE1'].score = 987
     463        self.student['studycourse']['100']['COURSE1'].score = 67
    464464        self.browser.getLink("100").click()
    465465        # Course results can't be seen
    466         self.assertFalse('987' in self.browser.contents)
     466        self.assertFalse('<td>67</td>' in self.browser.contents)
    467467        self.browser.getLink("Edit course list").click()
    468         self.assertFalse('987' in self.browser.contents)
     468        self.assertFalse('<td>67</td>' in self.browser.contents)
    469469        self.browser.getControl("Register course list").click()
    470470        self.assertTrue('Course registration has ended. Please pay' in self.browser.contents)
     
    782782            in self.browser.contents)
    783783        self.browser.getControl(name="scores:list", index=0).value = '55'
    784         self.browser.getControl(name="cas:list", index=0).value = '66'
     784        self.browser.getControl(name="cas:list", index=0).value = '22'
    785785        self.browser.getControl("Update scores from").click()
    786786        # New score and ca has been set.
     
    788788            self.student['studycourse']['100']['COURSE1'].score, 55)
    789789        self.assertEqual(
    790             self.student['studycourse']['100']['COURSE1'].ca, 66)
     790            self.student['studycourse']['100']['COURSE1'].ca, 22)
    791791        # Score editing has been logged.
    792792        logfile = os.path.join(
     
    796796                        'E1000000 100/COURSE1 score updated (55)' in logcontent)
    797797        self.assertTrue('mrslecturer - waeup.aaue.students.browser.CustomEditScoresPage - '
    798                         'E1000000 100/COURSE1 ca updated (66)' in logcontent)
     798                        'E1000000 100/COURSE1 ca updated (22)' in logcontent)
    799799        # Non-integer scores won't be accepted.
    800800        self.browser.open(
Note: See TracChangeset for help on using the changeset viewer.