[z3-checkins] r36218 - in z3/sqlos/branch/kobold-sqlos/src/sqlos: . ftests

[kobold at codespeak.net]

Author: kobold
Date: Sun Jan  7 23:16:28 2007
New Revision: 36218

Modified:
   z3/sqlos/branch/kobold-sqlos/src/sqlos/configure.zcml
   z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/localutilities.txt
Log:
Minor changes.


Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/configure.zcml
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/configure.zcml	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/configure.zcml	Sun Jan  7 23:16:28 2007
@@ -156,7 +156,6 @@
   </configure>
 
   <configure zcml:condition="installed mysqldbda">
-    <!-- if this doesnt work, you need a new version of mysqldbda-->
     <adapter
         provides=".interfaces.IZopeSQLConnection"
         for="mysqldbda.adapter.IMySQLZopeConnection"

Modified: z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/localutilities.txt
==============================================================================
--- z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/localutilities.txt	(original)
+++ z3/sqlos/branch/kobold-sqlos/src/sqlos/ftests/localutilities.txt	Sun Jan  7 23:16:28 2007
@@ -7,7 +7,8 @@
 
 First we need to set up some folder structure to set up a site.
 
-    >>> from zope.app import zapi
+    >>> import zope.component
+    >>> import zope.traversing.api
     >>> from zope.app.folder import Folder
     >>> from zope.app.component import interfaces as componentInterfaces
     >>> from zope.app.component.site import LocalSiteManager
@@ -26,26 +27,19 @@
 Let's get the connection name:
 
     >>> from sqlos.interfaces import IConnectionName
-    >>> connection_name = zapi.getUtility(IConnectionName).name
+    >>> connection_name = zope.component.getUtility(IConnectionName).name
 
 Now we set up a local database utility
 
     >>> from zope.rdb.interfaces import IZopeDatabaseAdapter
-    >>> from zope.app.component.interfaces.registration import ActiveStatus
     >>> from sqlos.testing.testdb import SQLiteda
-    >>> from zope.app.utility import UtilityRegistration
 
     >>> dbAdapter = SQLiteda(u'dbi://:memory:')
-    >>> reg = UtilityRegistration(connection_name,
-    ...                           IZopeDatabaseAdapter,
-    ...                           dbAdapter)
-    >>> default = sm['default']
-    >>> key = default.registrationManager.addRegistration(reg)
-    >>> zapi.traverse(default.registrationManager, key).status = ActiveStatus
+    >>> sm.registerUtility(dbAdapter, provided=IZopeDatabaseAdapter, name=connection_name)
 
     >>> localUtility = sm.queryUtility(IZopeDatabaseAdapter, connection_name)
-    >>> localUtility
-    <sqlos.testing.testdb.SQLiteda object at ...>
+    >>> localUtility is dbAdapter
+    True
 
     >>> localUtility is dbAdapter
     True
@@ -54,7 +48,7 @@
 make sure that our localUtility is not identical to the global sqlite utility
 that has been registered through ftesting.zcml.
 
-    >>> gsm = zapi.getGlobalSiteManager()
+    >>> gsm = zope.component.getGlobalSiteManager()
     >>> globalUtility = gsm.queryUtility(IZopeDatabaseAdapter, connection_name)
     >>> globalUtility is not localUtility
     True
@@ -67,7 +61,7 @@
     ...         '''create table dog (
     ...                   id integer primary key,
     ...                   fullname varchar(50) not null,
-    ...                   owner_id integer not null)''')
+    ...                   owner varchar(20) not null)''')
     >>> c = cursor.execute(
     ...         '''create table sample_isolated_person (
     ...                   id integer primary key,