Changeset 7534 for main/waeup.sirp/trunk/src/waeup/sirp/students/tests

Timestamp:

29 Jan 2012, 08:29:43 (13 years ago)

Author:

Henrik Bettermann

Message:

Fix logic. entryExists must return True or False, nothing else.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_batching.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/students/tests/test_batching.py

@@ -132 +132 @@
 
     def test_entryExists(self):
-        self.assertFalse(self.importer.entryExists(
-            dict(student_id='ID_NONE'), self.app))
-        student = self.importer.getEntry(
-            dict(student_id=self.student.student_id), self.app)
-        self.assertEqual(student.reg_number, u'123')
+        assert self.importer.entryExists(
+            dict(student_id='ID_NONE'), self.app) is False
+        assert self.importer.entryExists(
+            dict(reg_number='123'), self.app) is True
 
     def test_getParent(self):
@@ -267 +266 @@
     def test_entryExists(self):
         assert self.importer.entryExists(
-            dict(reg_number='REG_NONE'), self.app) is None
-        student = self.importer.entryExists(dict(reg_number='1'), self.app)
-        self.assertEqual(student.reg_number, u'1')
+            dict(reg_number='REG_NONE'), self.app) is False
+        assert self.importer.entryExists(
+            dict(reg_number='1'), self.app) is True
 
     def test_getEntry(self):
-        studycourse = self.importer.getEntry(dict(reg_number='1'), self.app)
-        student = studycourse.__parent__
-        s_id = student.student_id
-        assert studycourse is self.app['students'][s_id]['studycourse']
+        student = self.importer.getEntry(
+            dict(reg_number='1'), self.app).__parent__
+        self.assertEqual(student.reg_number,'1')
 
     def test_import(self):