Changeset 7267

Timestamp:

4 Dec 2011, 16:01:15 (13 years ago)

Author:

Henrik Bettermann

Message:

Fix importer semantic also in students (see last comment of Uli).

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• batching.py (modified) (5 diffs)
• tests/test_batching.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/students/batching.py

@@ -95 +95 @@
     # The entry never exists in create mode.
     def entryExists(self, row, site):
+        return self.getEntry(row, site) is not None
+
+    def getParent(self, row, site):
+        return site['students']
+
+    def getEntry(self, row, site):
         if not 'students' in site.keys():
             return None
@@ -117 +123 @@
         return None
 
-    def getParent(self, row, site):
-        return site['students']
-
-    def getEntry(self, row, site):
-        return self.entryExists(row, site)
-
+        
     def addEntry(self, obj, row, site):
         parent = self.getParent(row, site)
@@ -129 +130 @@
 
     def delEntry(self, row, site):
-        student = self.entryExists(row, site)
+        student = self.getEntry(row, site)
         if student is not None:
             parent = self.getParent(row, site)
@@ -203 +204 @@
         return True
 
-    def parentsExist(self, row, site):
+    def getParent(self, row, site):
         if not 'students' in site.keys():
             return None
@@ -227 +228 @@
         return None
 
+    def parentsExist(self, row, site):
+        return self.getParent(row, site) is not None
+
     def entryExists(self, row, site):
-        student = self.parentsExist(row, site)
+        student = self.getParent(row, site)
         if not student:
             return None

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

@@ -116 +116 @@
 
     def test_parentsExist(self):
-        assert self.importer.parentsExist(None, dict()) is False
-        assert self.importer.parentsExist(None, self.app) is True
+        self.assertFalse(self.importer.parentsExist(None, dict()))
+        self.assertTrue(self.importer.parentsExist(None, self.app))
 
     def test_entryExists(self):
-        assert self.importer.entryExists(
-            dict(student_id='ID_NONE'), self.app) is None
+        self.assertFalse(assert self.importer.entryExists(
+            dict(student_id='ID_NONE'), self.app))
         student = self.importer.getEntry(
             dict(student_id=self.student.student_id), self.app)