Changeset 1561 for WAeUP_SRP/branches

Timestamp:

16 Mar 2007, 03:45:15 (18 years ago)

Author:

uli

Message:

Fixed broken accomodation initialization. Updated portal_accomodation tests.

Location:

WAeUP_SRP/branches/uli

Files:

• profiles/default/accommodation.xml (modified) (1 diff)
• tests/test_tables.py (modified) (1 diff)

WAeUP_SRP/branches/uli/profiles/default/accommodation.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <?xml-stylesheet type="text/xsl" href="catalog.xsl"?>
-<object name="portal_catalog" meta_type="WAeUP Table">
+<object name="portal_catalog" meta_type="CMF Catalog">
  <column value="bed"/>
  <column value="bed_type"/>

WAeUP_SRP/branches/uli/tests/test_tables.py

@@ -24 +24 @@
     
     # Test that data does not go away on reinstall
-    def test_install(self):
+    def test_accomodation_install(self):
         # Make sure the table got installed properly
         patool = self.portal.portal_accommodation
         self.failUnlessEqual(patool.meta_type, 'WAeUP Accommodation Tool')
-        self.failUnlessEqual(patool.schema(), ['bed', 'student'])
-        self.failUnlessEqual(patool.indexes(), ['bed', 'student'])
+        schemalist = patool.schema()
+        schemalist.sort()
+        self.failUnlessEqual(schemalist, ['bed', 'bed_type', 'hall', 'student'])
+        indexeslist = patool.indexes()
+        indexeslist.sort()
+        self.failUnlessEqual(indexeslist, ['bed', 'bed_type', 'hall', 'student'])
         
-    def test_add_change_delete(self):
+    def test_accomodation_add_change_delete(self):
         patool = self.portal.portal_accommodation
         
         # Add
-        uid = patool.addRecord(bed='bed', student='student')
+        uid = patool.addRecord(bed='bed', bed_type='fresh', hall='hall', student='student')
         result = patool.searchResults({'bed':'bed'})
         self.failUnlessEqual(len(result), 1)
+        self.failUnlessEqual(result[0].hall, 'hall')
         self.failUnlessEqual(result[0].student, 'student')
+        self.failUnlessEqual(result[0].bed, 'bed')
+        self.failUnlessEqual(result[0].bed_type, 'fresh')
         
         # Change
-        patool.modifyRecord(uid, student='newstudent')
+        patool.modifyRecord(bed=uid, student='newstudent')
         result = patool.searchResults({'bed':'bed'})
         self.failUnlessEqual(len(result), 1)