SF.net SVN: mailmanager: [2981] MailManager/branches/RELENG_2_1/tests

[<ke...@us...>]

Revision: 2981
Author:   kevca
Date:     2006-05-08 09:55:26 -0700 (Mon, 08 May 2006)
ViewCVS:  http://svn.sourceforge.net/mailmanager/?rev=2981&view=rev

Log Message:
-----------
Fixing use of unicode in test suite for ZPsycopgDA adapter

Modified Paths:
--------------
    MailManager/branches/RELENG_2_1/tests/classes/testStructures.py
    MailManager/branches/RELENG_2_1/tests/testZSQL.py
Modified: MailManager/branches/RELENG_2_1/tests/classes/testStructures.py
===================================================================
--- MailManager/branches/RELENG_2_1/tests/classes/testStructures.py	2006-05-08 16:32:22 UTC (rev 2980)
+++ MailManager/branches/RELENG_2_1/tests/classes/testStructures.py	2006-05-08 16:55:26 UTC (rev 2981)
@@ -52,7 +52,7 @@
 from Products.BlackholeMailHost.BlackholeMailHost import BlackholeMailHost
 
 from Products.ZMySQLDA.DA import manage_addZMySQLConnection
-from Products.ZPsycopgDA.DA import manage_addZPsycopgConnection
+from Products.ZPsycopgDA.DA import Connection as ZPsycopgConnection
 from Products.MailHost.MailHost import manage_addMailHost
 from Products.MailManager.MailManager import manage_addMailManager
 from Products.MailManager.support.Database import sql_mapping
@@ -92,8 +92,6 @@
         self.debugState = 'ok'
 
     def query(self, query_string, max_rows=None, query_data=None):
-#        print query_string
-#        if self.logqueries:
         zLOG.LOG('ZPsycopgDA:', zLOG.INFO,
                  'query: %s %s' % (pformat(query_string), pformat(query_data)))
         if self.debugState == 'ok':
@@ -111,7 +109,6 @@
                  check=None, tilevel=2, encoding='UTF-8', ustrings=0):
         Products.ZPsycopgDA.DA.Connection.__init__(self, id, title, 
             connection_string, zdatetime, check, tilevel, encoding, ustrings)
-#        # Add on the counter hook
 
     def factory(self):
         return DebugPGDB
@@ -124,7 +121,19 @@
                                    check, tilevel, ustrings))
     if REQUEST is not None: return self.manage_main(self,REQUEST)
 
+# Replacement for the ZPsycopgDA standard method which doesn't allow 
+# unicode strings to be specified on manage_add
 
+def manage_addZPsycopgConnection(self, id, title,
+                                 connection_string, zdatetime=None,
+                                 tilevel=2, ustrings=0, check=None, REQUEST=None):
+    """Add a DB connection to a folder"""
+    self._setObject(id, ZPsycopgConnection(id, title, connection_string, zdatetime,
+                                   check, tilevel, ustrings))
+    if REQUEST is not None: return self.manage_main(self,REQUEST)
+
+
+
 #### MySQLConnection ########################################################
 
 class DebugMySQLDB(Products.ZMySQLDA.db.DB):
@@ -572,7 +581,7 @@
             if debugmode:
                 self._debugZPsycopgAdd(root, 'mailmanager_db', 'MailManager Database Connection', connstring, zdatetime=True, tilevel=2, ustrings=1)
             else:
-                self._ZPsycopgAdd(root, 'mailmanager_db', 'MailManager Database Connection', connstring, zdatetime=True, tilevel=2, ustring=1)
+                self._ZPsycopgAdd(root, 'mailmanager_db', 'MailManager Database Connection', connstring, zdatetime=True, tilevel=2, ustrings=1)
 
 
         # Create a mailhost object

Modified: MailManager/branches/RELENG_2_1/tests/testZSQL.py
===================================================================
--- MailManager/branches/RELENG_2_1/tests/testZSQL.py	2006-05-08 16:32:22 UTC (rev 2980)
+++ MailManager/branches/RELENG_2_1/tests/testZSQL.py	2006-05-08 16:55:26 UTC (rev 2981)
@@ -5,13 +5,9 @@
 # $Id$
 
 #
-# Workflow ZopeTestCase
+# Tests various issues in ZSQL methods (possibly should be refactored into
+# testDatabase.py, or testDatabase.py should have code moved into here).
 #
-# This is a higher level set of tests for the database test suite. These 
-# operate against the python code in the MailManager core. This adds in
-# testing for potential bugs in the calling of the ZSQL methods for each
-# database platform. 
-#
 
 import os, sys
 if __name__ == '__main__':


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.