Changeset 1875 in products

Timestamp:

Mar 10, 2010 5:12:33 PM (15 years ago)

Author:

mylan

Message:

#161: Celan-up 'Expose DC metatags' tests

File:

• quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests/testExposeDCMetaTags.py (modified) (2 diffs)

quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests/testExposeDCMetaTags.py

@@ -1 +1 @@
 import re
-from base import getToolByName, FunctionalTestCase, newSecurityManager
+from base import getToolByName, FunctionalTestCase, newSecurityManager, ptc
 from config import *
+
+METATAG = '.*(<meta\s+(?:(?:name="%s"\s*)|(?:content=".*?"\s*)){2}/>)'
 
 class TestExposeDCMetaTags(FunctionalTestCase):
@@ -7 +9 @@
     def afterSetUp(self):
         self.sp = self.portal.portal_properties.site_properties
-        self.basic_auth = 'portal_manager:secret'
-        uf = self.app.acl_users
-        uf.userFolderAddUser('portal_manager', 'secret', ['Manager'], [])
-        user = uf.getUserById('portal_manager')
-        if not hasattr(user, 'aq_base'):
-            user = user.__of__(uf)
-        newSecurityManager(None, user)
-
-        '''Preparation for functional testing'''
+        self.basic_auth = ':'.join((ptc.portal_owner,ptc.default_password))
+        self.loginAsPortalOwner()
+        # Preparation for functional testing
         self.my_doc = self.portal.invokeFactory('Document', id='my_doc')
         self.my_doc = self.portal['my_doc']
-
-    def test_exposeDCMetaTags_in_configletOn(self):
-        path = self.portal.id+'/@@seo-controlpanel?form.actions.save=1' \
-            '&form.exposeDCMetaTags=on&_authenticator=%s' % self._getauth()
-        self.publish(path, self.basic_auth)
-        self.assert_(self.sp.exposeDCMetaTags)
-
-    def test_exposeDCMetaTags_in_configletOff(self):
-        self.publish(self.portal.id+'/@@seo-controlpanel?form.actions.save=1' \
-            '&form.exposeDCMetaTags=&_authenticator=%s' % self._getauth(),
-             self.basic_auth)
-        self.assert_(not self.sp.exposeDCMetaTags)
 
     def test_exposeDCMetaTagsPropertyOff(self):
         self.sp.manage_changeProperties(exposeDCMetaTags = False)
         self.html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
-        m1 = re.match('.*(<meta\s+(?:(?:name="DC.format"\s*)|(?:content=".*?"\s*)){2}/>)', self.html, re.S|re.M)
-        m2 = re.match('.*(<meta\s+(?:(?:name="DC.distribution"\s*)|(?:content=".*?"\s*)){2}/>)', self.html, re.S|re.M)
-        m = m1 or m2
-        self.assert_(not m, 'DC meta tags avaliable when exposeDCMetaTags=False')
+        m1 = re.match(METATAG % "DC.format", self.html, re.S|re.M)
+        m2 = re.match(METATAG % "DC.distribution", self.html, re.S|re.M)
+        self.assert_(not (m1 or m2), 'DC meta tags avaliable when exposeDCMetaTags=False')
 
     def test_exposeDCMetaTagsPropertyOn(self):
         self.sp.manage_changeProperties(exposeDCMetaTags = True)
         self.html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
-        m1 = re.match('.*(<meta\s+(?:(?:name="DC.format"\s*)|(?:content=".*?"\s*)){2}/>)', self.html, re.S|re.M)
-        m2 = re.match('.*(<meta\s+(?:(?:name="DC.type"\s*)|(?:content=".*?"\s*)){2}/>)', self.html, re.S|re.M)
-        m = m1 and m2
-        self.assert_(m, 'DC meta tags not avaliable when createManager=True')
+        m1 = re.match(METATAG % "DC.format", self.html, re.S|re.M)
+        m2 = re.match(METATAG % "DC.type", self.html, re.S|re.M)
+        self.assert_(m1 and m2, 'DC meta tags not avaliable when createManager=True')
 
 def test_suite():