--- a/server/test/unittest_repository.py	Sat Oct 09 00:05:50 2010 +0200
+++ b/server/test/unittest_repository.py	Sat Oct 09 00:05:52 2010 +0200
@@ -95,15 +95,14 @@
         self.assertItemsEqual(person._unique_together[0],
                                            ('nom', 'prenom', 'inline2'))
 
-    def test_schema_has_owner(self):
-        repo = self.repo
-        cnxid = repo.connect(self.admlogin, password=self.admpassword)
-        self.failIf(repo.execute(cnxid, 'CWEType X WHERE NOT X owned_by U'))
-        self.failIf(repo.execute(cnxid, 'CWRType X WHERE NOT X owned_by U'))
-        self.failIf(repo.execute(cnxid, 'CWAttribute X WHERE NOT X owned_by U'))
-        self.failIf(repo.execute(cnxid, 'CWRelation X WHERE NOT X owned_by U'))
-        self.failIf(repo.execute(cnxid, 'CWConstraint X WHERE NOT X owned_by U'))
-        self.failIf(repo.execute(cnxid, 'CWConstraintType X WHERE NOT X owned_by U'))
+    def test_all_entities_have_owner(self):
+        self.failIf(self.execute('Any X WHERE NOT X owned_by U'))
+
+    def test_all_entities_have_is(self):
+        self.failIf(self.execute('Any X WHERE NOT X is ET'))
+
+    def test_all_entities_have_cw_source(self):
+        self.failIf(self.execute('Any X WHERE NOT X cw_source S'))
 
     def test_connect(self):
         self.assert_(self.repo.connect(self.admlogin, password=self.admpassword))
@@ -288,7 +287,7 @@
         self.assertListEqual([r.type for r in schema.eschema('CWAttribute').ordered_relations()
                                if not r.type in ('eid', 'is', 'is_instance_of', 'identity',
                                                  'creation_date', 'modification_date', 'cwuri',
-                                                 'owned_by', 'created_by',
+                                                 'owned_by', 'created_by', 'cw_source',
                                                  'update_permission', 'read_permission',
                                                  'in_basket')],
                               ['relation_type',
@@ -369,25 +368,25 @@
         repo = self.repo
         cnxid = repo.connect(self.admlogin, password=self.admpassword)
         session = repo._get_session(cnxid, setpool=True)
-        self.assertEqual(repo.type_and_source_from_eid(1, session),
-                          ('CWGroup', 'system', None))
-        self.assertEqual(repo.type_from_eid(1, session), 'CWGroup')
-        self.assertEqual(repo.source_from_eid(1, session).uri, 'system')
-        self.assertEqual(repo.eid2extid(repo.system_source, 1, session), None)
+        self.assertEqual(repo.type_and_source_from_eid(2, session),
+                         ('CWGroup', 'system', None))
+        self.assertEqual(repo.type_from_eid(2, session), 'CWGroup')
+        self.assertEqual(repo.source_from_eid(2, session).uri, 'system')
+        self.assertEqual(repo.eid2extid(repo.system_source, 2, session), None)
         class dummysource: uri = 'toto'
-        self.assertRaises(UnknownEid, repo.eid2extid, dummysource, 1, session)
+        self.assertRaises(UnknownEid, repo.eid2extid, dummysource, 2, session)
 
     def test_public_api(self):
         self.assertEqual(self.repo.get_schema(), self.repo.schema)
-        self.assertEqual(self.repo.source_defs(), {'system': {'adapter': 'native', 'uri': 'system'}})
+        self.assertEqual(self.repo.source_defs(), {'system': {'type': 'native', 'uri': 'system'}})
         # .properties() return a result set
         self.assertEqual(self.repo.properties().rql, 'Any K,V WHERE P is CWProperty,P pkey K, P value V, NOT P for_user U')
 
     def test_session_api(self):
         repo = self.repo
         cnxid = repo.connect(self.admlogin, password=self.admpassword)
-        self.assertEqual(repo.user_info(cnxid), (5, 'admin', set([u'managers']), {}))
-        self.assertEqual(repo.describe(cnxid, 1), (u'CWGroup', u'system', None))
+        self.assertEqual(repo.user_info(cnxid), (6, 'admin', set([u'managers']), {}))
+        self.assertEqual(repo.describe(cnxid, 2), (u'CWGroup', u'system', None))
         repo.close(cnxid)
         self.assertRaises(BadConnectionId, repo.user_info, cnxid)
         self.assertRaises(BadConnectionId, repo.describe, cnxid, 1)
@@ -518,7 +517,7 @@
 
     def test_type_from_eid(self):
         self.session.set_pool()
-        self.assertEqual(self.repo.type_from_eid(1, self.session), 'CWGroup')
+        self.assertEqual(self.repo.type_from_eid(2, self.session), 'CWGroup')
 
     def test_type_from_eid_raise(self):
         self.session.set_pool()