Changeset 6244

Timestamp:

30 May 2011, 07:17:03 (13 years ago)

Author:

Henrik Bettermann

Message:

Fix tests.

Location:

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

Files:

• browser/batchprocessing.txt (modified) (1 diff)
• university/certificate.txt (modified) (1 diff)
• university/courserefs.txt (modified) (3 diffs)
• utils/batching.txt (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/browser/batchprocessing.txt

@@ -476 +476 @@
     >>> print open(pending_file).read()
     title_prefix,--IGNORE--,code,title,--ERRORS--
-    faculty,static,FAC1,Faculty 1,This object already exists. Skipping.
+    faculty,static,FAC1,Faculty 1,This object already exists in the same container. Skipping.
 
     >>> finished_file = dc_path + '/finished/newfaculties_zope.mgr.create.finished.csv'

main/waeup.sirp/trunk/src/waeup/sirp/university/certificate.txt

@@ -338 +338 @@
     >>> mycourse.code = 'MYCOURSE'
     >>> mydept.courses.addCourse(mycourse)
-    'Course added (for tests only).'
     >>> mycert = createObject('waeup.Certificate')
     >>> mycert.code = 'MYCERT'
     >>> mydept.certificates.addCertificate(mycert)
-    'Certificate added (for tests only).'
     >>> mycert.addCourseRef(mycourse)
 

main/waeup.sirp/trunk/src/waeup/sirp/university/courserefs.txt

@@ -48 +48 @@
     >>> course.code = 'CRS1'
     >>> fac['DEPT'].courses.addCourse(course)
-    'Course added.'
 
 Now let's add another department, which will also hold a course:
@@ -59 +58 @@
     >>> course.code = 'CRS2'
     >>> fac['DEPT2'].courses.addCourse(course)
-    'Course added.'
 
 Finally, we add a certificate with referrers (certificate courses) to
@@ -67 +65 @@
     >>> cert.code = 'CERT'
     >>> fac['DEPT'].certificates.addCertificate(cert)
-    'Certificate added.'
 
     >>> fac['DEPT'].certificates['CERT'].addCourseRef(

main/waeup.sirp/trunk/src/waeup/sirp/utils/batching.txt

@@ -323 +323 @@
     >>> print open(result[3]).read()
     owner,name,taxpayer,dinoports,--ERRORS--
-    Barney,Barneys Home,1,2,This object already exists. Skipping.
-    Wilma,Wilmas Asylum,1,1,This object already exists. Skipping.
-    Fred,Freds Dinoburgers,0,10,This object already exists. Skipping.
-    Joey,Joeys Drive-in,0,110,This object already exists. Skipping.
+    Barney,Barneys Home,1,2,This object already exists in the same container. Skipping.
+    Wilma,Wilmas Asylum,1,1,This object already exists in the same container. Skipping.
+    Fred,Freds Dinoburgers,0,10,This object already exists in the same container. Skipping.
+    Joey,Joeys Drive-in,0,110,This object already exists in the same container. Skipping.
 
 This way we can correct the faulty entries and afterwards retry without
@@ -364 +364 @@
     >>> print open(result[3], 'rb').read()
     --IGNORE--,name,--IGNORE--,dinoports,--ERRORS--
-    Barney,Barneys Home,1,2,This object already exists. Skipping.
-    Wilma,Wilmas Asylum,1,1,This object already exists. Skipping.
-    Fred,Freds Dinoburgers,0,10,This object already exists. Skipping.
-    Joey,Joeys Drive-in,0,110,This object already exists. Skipping.
+    Barney,Barneys Home,1,2,This object already exists in the same container. Skipping.
+    Wilma,Wilmas Asylum,1,1,This object already exists in the same container. Skipping.
+    Fred,Freds Dinoburgers,0,10,This object already exists in the same container. Skipping.
+    Joey,Joeys Drive-in,0,110,This object already exists in the same container. Skipping.
 
 The first ignored column ('owner') provides different contents than