--- a/web/test/unittest_formfields.py	Thu Apr 23 17:21:39 2009 +0200
+++ b/web/test/unittest_formfields.py	Thu Apr 23 17:22:02 2009 +0200
@@ -11,76 +11,73 @@
 config = TestServerConfiguration('data')
 config.bootstrap_cubes()
 schema = config.load_schema()
-Card.schema = schema
-Card.__initialize__()
-CWUser.schema = schema
-CWUser.__initialize__()
-File.schema = schema
-File.__initialize__()
-        
+card_schema = schema['Card']
+cwuser_schema = schema['CWUser']
+file_schema.schema = schema['File']
+
 class GuessFieldTC(TestCase):
-    
+
     def test_card_fields(self):
-        title_field = guess_field(Card, schema['title'])
+        title_field = guess_field(card_schema, schema['title'])
         self.assertIsInstance(title_field, StringField)
         self.assertEquals(title_field.required, True)
-        
-        synopsis_field = guess_field(Card, schema['synopsis'])
+
+        synopsis_field = guess_field(card_schema, schema['synopsis'])
         self.assertIsInstance(synopsis_field, TextField)
         self.assertEquals(synopsis_field.required, False)
         self.assertEquals(synopsis_field.help, 'an abstract for this card')
-        
-        content_field = guess_field(Card, schema['content'])
+
+        content_field = guess_field(card_schema, schema['content'])
         self.assertIsInstance(content_field, RichTextField)
         self.assertEquals(content_field.required, False)
         self.assertEquals(content_field.format_field, None)
-                          
-        content_format_field = guess_field(Card, schema['content_format'])
+
+        content_format_field = guess_field(card_schema, schema['content_format'])
         self.assertEquals(content_format_field, None)
-        
-        content_format_field = guess_field(Card, schema['content_format'], skip_meta_attr=False)
+
+        content_format_field = guess_field(card_schema, schema['content_format'], skip_meta_attr=False)
         self.assertEquals(content_format_field.internationalizable, True)
         self.assertEquals(content_format_field.sort, True)
         self.assertEquals(content_format_field.initial, 'text/rest')
 
-        wikiid_field = guess_field(Card, schema['wikiid'])
+        wikiid_field = guess_field(card_schema, schema['wikiid'])
         self.assertIsInstance(wikiid_field, StringField)
         self.assertEquals(wikiid_field.required, False)
 
-        
+
     def test_euser_fields(self):
-        upassword_field = guess_field(CWUser, schema['upassword'])
+        upassword_field = guess_field(cwuser_schema, schema['upassword'])
         self.assertIsInstance(upassword_field, StringField)
         self.assertIsInstance(upassword_field.widget, PasswordInput)
         self.assertEquals(upassword_field.required, True)
 
-        last_login_time_field = guess_field(CWUser, schema['last_login_time'])
+        last_login_time_field = guess_field(cwuser_schema, schema['last_login_time'])
         self.assertIsInstance(last_login_time_field, DateTimeField)
         self.assertEquals(last_login_time_field.required, False)
 
-        in_group_field = guess_field(CWUser, schema['in_group'])
+        in_group_field = guess_field(cwuser_schema, schema['in_group'])
         self.assertIsInstance(in_group_field, RelationField)
         self.assertEquals(in_group_field.required, True)
         self.assertEquals(in_group_field.role, 'subject')
         self.assertEquals(in_group_field.help, 'groups grant permissions to the user')
 
-        owned_by_field = guess_field(CWUser, schema['owned_by'], 'object')
+        owned_by_field = guess_field(cwuser_schema, schema['owned_by'], 'object')
         self.assertIsInstance(owned_by_field, RelationField)
         self.assertEquals(owned_by_field.required, False)
         self.assertEquals(owned_by_field.role, 'object')
 
 
     def test_file_fields(self):
-        data_format_field = guess_field(File, schema['data_format'])
+        data_format_field = guess_field(file_schema, schema['data_format'])
         self.assertEquals(data_format_field, None)
-        data_encoding_field = guess_field(File, schema['data_encoding'])
+        data_encoding_field = guess_field(file_schema, schema['data_encoding'])
         self.assertEquals(data_encoding_field, None)
 
-        data_field = guess_field(File, schema['data'])
+        data_field = guess_field(file_schema, schema['data'])
         self.assertIsInstance(data_field, FileField)
         self.assertEquals(data_field.required, True)
         self.assertIsInstance(data_field.format_field, StringField)
         self.assertIsInstance(data_field.encoding_field, StringField)
-        
+
 if __name__ == '__main__':
     unittest_main()