Changeset 652

Timestamp:

11/23/06 10:23:20

Author:

piv

Message:

added testing for case CMFMember products is installed

Files:

• qMemberdataExport/trunk/CMFMemberdataHandler.py (modified) (1 diff)
• qMemberdataExport/trunk/Extensions/Install.py (modified) (2 diffs)
• qMemberdataExport/trunk/config.py (modified) (1 diff)
• qMemberdataExport/trunk/tests/commonTestingStuff.py (modified) (4 diffs)
• qMemberdataExport/trunk/tests/runtests.sh (deleted)
• qMemberdataExport/trunk/tests/testExternalMethod.py (modified) (2 diffs)
• qMemberdataExport/trunk/tests/testFunctional.py (modified) (4 diffs)

qMemberdataExport/trunk/CMFMemberdataHandler.py

@@ -42 +42 @@
-                schema = member.getSchema()
-                fields = [f.getName() for f in schema.filterFields()
-
+n
-                for field in fields:
-                    if field not in all_props:

qMemberdataExport/trunk/Extensions/Install.py

@@ -23 +23 @@
-    else: out.write('%s external method already exists in portal\n' % EXTERNAL_METHOD)
-
-def addPythonScript(self, out):
-    """Add a PythonScript to portal root directory """
-
-    if not hasattr(self, PYTHON_SCRIPT):
-        factory = self.manage_addProduct['PythonScripts']
-        factory.manage_addPythonScript(PYTHON_SCRIPT)
-        script = getattr(self, PYTHON_SCRIPT)
-        if script:
-            script.ZPythonScript_edit(params='start=0,batch=400,exclude_props=None,include_props=None',
-                                      body='return context.%s(context, start, batch, exclude_props, include_props)' % EXTERNAL_METHOD)
-            out.write('%s python script added to portal\n' % PYTHON_SCRIPT)
-        else: out.write('installation procedure could not create python script\n')
-    else: out.write('%s python script already exists in portal\n' % PYTHON_SCRIPT)
-
-def install(self):
-    """ Product installation """
@@ -44 +30 @@
-    # add external method
-    addExternalMethod(self, out)
-
-    # add python script
-#    addPythonScript(self, out)
-
-    return out.getvalue()

qMemberdataExport/trunk/config.py

@@ -4 +4 @@
-
-EXTERNAL_METHOD = 'export_memberdata_as_csv'
-PYTHON_SCRIPT   = 'exportMemberData'
-
-CLEAR_CACHE_COUNTER = 100

qMemberdataExport/trunk/tests/commonTestingStuff.py

@@ -5 +5 @@
-from Products.PloneTestCase import PloneTestCase
-
-PYTHON_SCRIPT, 
+
-
-
+
+
+
+
+
+
+
+
+
-
-map(PloneTestCase.installProduct, PRODUCTS)
@@ -31 +39 @@
-    from cStringIO import StringIO
-    from Products.qMemberdataExport import getRegisteredMemberdataHandlers as registry
+    from Products.qMemberdataExport import CMFMemberdataHandler, BaseMemberdataHandler
-
-    datahandler = False
-
+
-    for handler in registry():
-        try:
@@ -40 +49 @@
-        except:
-            pass
+
-    if datahandler:
-        props = datahandler.listAllMemberProperties(exclude_props=EXCLUDE_PROPS, include_props=INCLUDE_PROPS)
+        if cmfmember_installed:
+            self.assertEquals(datahandler.__class__, CMFMemberdataHandler)
+        else:
+            self.assertEquals(datahandler.__class__, BaseMemberdataHandler)
-    else:
-
+
+
-    reader = csv.DictReader(StringIO(data), fieldnames = props, quoting=csv.QUOTE_ALL)
+
-    i = 0
-    res = []
-    for row in reader:
-        properties = {}
-!= 'test_user_1_'
+not in ['test_user_1_', 'portal_owner']
-            for field in row.keys():
-                properties[field] = row[field]
-            res.append(properties)
-        i += 1
+
-    self.failUnless(i-2 == len(PORTAL_MEMBERS), 'CSV output does not matcht to amount of portal members')
+
-    members = [memb.copy() for memb in PORTAL_MEMBERS]
-    for memb in members:
-        del memb['roles']
-        del memb['last_login_time']
+
-    return (members, res)
-
@@ -97 +116 @@
-EXCLUDE_PROPS = ['portrait', 'password', 'mail_me',
-                 'confirm_password','login_time', 'last_login_time',
-
+
+
-
-, 'roles', 'domains', 'groups'
+

qMemberdataExport/trunk/tests/testExternalMethod.py

@@ -14 +14 @@
-    def afterSetUp(self):
-        """ AfterSetUp features """
+
+        self.loginAsPortalOwner()
-        self.qi = getToolByName(self.portal, 'portal_quickinstaller')
-        self.qi.installProduct(PRODUCT)
-        self.method = getattr(self.portal, EXTERNAL_METHOD)
-        self.membership = self.portal.portal_membership
@@ -24 +25 @@
-        """ Test external script for good csv output stream """
-
+        if cmfmember_installed:
+            getToolByName(self.portal, 'cmfmember_control').upgrade(swallow_errors=0)
-        forCompare = parseCSV(self, self.method(self.portal, exclude_props=EXCLUDE_PROPS, include_props=INCLUDE_PROPS))
-        self.failUnless(forCompare[0] == forCompare[1], 'Bad output from external method script')

qMemberdataExport/trunk/tests/testFunctional.py

@@ -17 +17 @@
-        self.loginAsPortalOwner()
-        self.qi = getToolByName(self.portal, 'portal_quickinstaller')
-        self.qi.installProduct(PRODUCT)
-        self.membership = self.portal.portal_membership
+        self.path = '%s/%s' % (self.portal.id, EXTERNAL_METHOD)
-        for m in PORTAL_MEMBERS:
-            addMember(self, m['id'], m['fullname'], m['email'], m['roles'], m['last_login_time'])
-        self.response = self.sendRequest('%s/%s' % (self.portal.id, EXTERNAL_METHOD), {'exclude_props':[], 'include_props':INCLUDE_PROPS}, "GET")
-
-    def sendRequest(self, path, params={}, method="POST"):
-        """ Utility function """
-
-        return self.publish(path, self.auth, extra=params, request_method=method)
-
-
-    def testExternalMethod(self):
-portMemberData python script
+ternal method script for publishing
-
-
+
+
+
+
-        self.failUnless(forCompare[0] == forCompare[1], '%s external method return bad CSV value' % EXTERNAL_METHOD)
-
@@ -40 +36 @@
-        import re
-        pattern = re.compile(r'\s*attachment\;\s*filename=\s*memberdata\-\d{4}\-\d{2}\-\d{2}\-\d{2}\-\d{2}\-\d{2}\.csv\s*', re.I)
-
+
+
-                                       'Bad response header \'Content Disposition\'')
-
@@ -46 +43 @@
-        """ Test response for content-type header """
-
-
+
+
-                        'Bad response header \'Content Type\'')
-
@@ -52 +50 @@
-        """ Test external method for 'View' permission """
-
-'%s/%s' % (self.portal.id, EXTERNAL_METHOD)
+self.path
-        type_header = response.getHeader('bobo-exception-type')
-        location_header = response.getHeader('location') or ''