Changeset 1610 in products

Timestamp:

Jan 29, 2010 5:42:31 PM (14 years ago)

Author:

liebster

Message:

Changed regular expression in estQSEOptimizerExposeDCMetaTags and testQSEOptimizerMetaTagsDuplication

Location:

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests

Files:

• testQSEOptimizerExposeDCMetaTags.py (modified) (2 diffs)
• testQSEOptimizerMetaTagsDuplication.py (modified) (2 diffs)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests/testQSEOptimizerExposeDCMetaTags.py

@@ -33 +33 @@
         self.sp.manage_changeProperties(exposeDCMetaTags = False)
         self.html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
-        m1 = re.match('.*<meta\ name="DC.format"\ content=".*?"\ />', self.html, re.S|re.M)
-        if not m1:
-            m1 = re.match('.*<meta content=".*?" name="DC.format" />', self.html, re.S|re.M)
-        m2 = re.match('.*<meta name="DC.distribution" content=".*?" />', self.html, re.S|re.M)
-        if not m2:
-            m2 = re.match('.*<meta content=".*?" name="DC.distribution" />', self.html, re.S|re.M)
+        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')
@@ -45 +41 @@
         self.sp.manage_changeProperties(exposeDCMetaTags = True)
         self.html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
-        m1 = re.match('.*<meta\ content=".*?"\ name="DC.format"\ />', self.html, re.S|re.M)
-        if not m1:
-            m1 = re.match('.*<meta\ name="DC.format"\ content=".*?"\ />', self.html, re.S|re.M)
-        m2 = re.match('.*<meta\ content=".*?"\ name="DC.type"\ />', self.html, re.S|re.M)
-        if not m2:
-            m2 = re.match('.*<meta\ name="DC.type"\ content=".*?"\ />', self.html, re.S|re.M)
+        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')

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests/testQSEOptimizerMetaTagsDuplication.py

@@ -23 +23 @@
         # Get document without customized canonical url
         abs_path = "/%s" % self.my_doc.absolute_url(1)
-        regen = re.compile('<meta\s+[^>]*name=\"generator\"[^>]*>', re.S|re.M)
 
         # Before product installation
-        html = self.publish(abs_path, self.basic_auth).getBody()
-        lengen = len(regen.findall(html))
+        self.html = self.publish(abs_path, self.basic_auth).getBody()
+        f = re.findall('.*(<meta\s+(?:(?:name="generator"\s*)|(?:content=".*?"\s*)){2}/>)', self.html, re.S|re.M)
+        lengen = len(f)
         self.assert_(lengen==1, "There is %d generator meta tag(s) " \
            "before seoptimizer installation" % lengen)
@@ -41 +41 @@
         # Get document without customized canonical url
         abs_path = "/%s" % self.my_doc.absolute_url(1)
-        regen = re.compile('<meta\s+[^>]*name=\"description\"[^>]*>', re.S|re.M)
 
         # Before product installation
-        html = self.publish(abs_path, self.basic_auth).getBody()
-        lendesc = len(regen.findall(html))
+        self.html = self.publish(abs_path, self.basic_auth).getBody()
+        f = re.findall('.*(<meta\s+(?:(?:name="description"\s*)|(?:content=".*?"\s*)){2}/>)', self.html, re.S|re.M)
+        lendesc = len(f)
         self.assert_(lendesc==1, "There is %d DESCRIPTION meta tag(s) " \
            "before seoptimizer installation" % lendesc)