Changeset 1608 in products for quintagroup.seoptimizer/trunk

Timestamp:

Jan 29, 2010 4:50:23 PM (14 years ago)

Author:

liebster

Message:

Added tests for setup using keywords

Location:

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests

Files:

• testQSEOptimizerAdditionalKeywords.py (modified) (4 diffs)
• testQSEOptimizerResponse.py (modified) (1 diff)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests/testQSEOptimizerAdditionalKeywords.py

@@ -1 +1 @@
 import urllib, re
+from Acquisition import aq_inner
 from base import getToolByName, FunctionalTestCase, newSecurityManager
 from config import *
@@ -23 +24 @@
         self.my_doc = self.portal['my_doc']
 
+    def test_default_values_radiobutton_in_configlet(self):
+        self.assertEqual(self.sp.getProperty('settings_use_keywords_sg', 0), 1)
+        self.assertEqual(self.sp.getProperty('settings_use_keywords_lg', 0), 1)
+
+    def test_changes_using_keywords_in_configlet(self):
+        for sg, lg in ((1, 1), (1, 2), (2, 1), (2, 2), (3, 1), (3, 2)):
+            path = self.portal.id+'/@@seo-controlpanel?settingsUseKeywordsSG=%s'\
+                                '&settingsUseKeywordsLG=%s&form.submitted=1' % (sg, lg)
+            self.publish(path, self.basic_auth)
+            self.assertEqual(self.sp.getProperty('settings_use_keywords_sg', 0), sg)
+            self.assertEqual(self.sp.getProperty('settings_use_keywords_lg', 0), lg)
+
     def test_additional_keywords_in_configlet(self):
         quoted_keywords = urllib.quote('foo\nbar')
@@ -35 +48 @@
         self.assert_('keywords' not in metatags)
 
-    def test_listMetaTags_one(self):        
+    def test_listMetaTags_one(self):
+        self.sp.manage_changeProperties(settings_use_keywords_sg=3, settings_use_keywords_lg=2)
         self.my_doc.manage_addProperty('qSEO_keywords', ('foo',), 'lines')
         self.html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
-        m = re.match('.*<meta\ content="foo"\ name="keywords"\ />', self.html, re.S|re.M)
-        if not m:
-            m = re.match('.*<meta\ name="keywords"\ content="foo"\ />', self.html, re.S|re.M)
+        m = re.match('.*(<meta\s+(?:(?:name="keywords"\s*)|(?:content="foo"\s*)){2}/>)', self.html, re.S|re.M)
         self.assert_(m, "No 'foo' keyword find")
 
-    def test_listMetaTags_two(self):        
+    def test_listMetaTags_two(self):
+        self.sp.manage_changeProperties(settings_use_keywords_sg=3, settings_use_keywords_lg=2)
         self.my_doc.manage_addProperty('qSEO_keywords', ('foo', 'bar'), 'lines')
         self.html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
-        m = re.match('.*<meta\ content="foo, bar"\ name="keywords"\ />', self.html, re.S|re.M)
-        if not m:
-            m = re.match('.*<meta\ name="keywords"\ content="foo, bar"\ />', self.html, re.S|re.M)
+        m = re.match('.*(<meta\s+(?:(?:name="keywords"\s*)|(?:content="(?:foo|bar),\s*(?:foo|bar)"\s*)){2}/>)',
+                     self.html, re.S|re.M)
         self.assert_(m, "No 'foo, bar' keyword find")
 
-    def test_additional_keywords_in_listMetaTags_empty(self):        
+    def test_additional_keywords_in_listMetaTags_empty(self):
+        self.sp.manage_changeProperties(settings_use_keywords_sg=3, settings_use_keywords_lg=2)
         self.sp.additional_keywords = ('foo',)
         metatags = self.pu.listMetaTags(self.my_doc)
@@ -57 +70 @@
 
     def test_additional_keywords_in_listMetaTags_one(self):
-        self.my_doc.setText('<p>foo</p>')
+        self.sp.manage_changeProperties(settings_use_keywords_sg=3, settings_use_keywords_lg=2)
+        #self.my_doc.setText('<p>foo</p>') # XXX
         self.sp.additional_keywords = ('foo',)
         self.html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
-        m = re.match('.*<meta\ content="foo"\ name="keywords"\ />', self.html, re.S|re.M)
-        if not m:
-            m = re.match('.*<meta\ name="keywords"\ content="foo"\ />', self.html, re.S|re.M)
+        m = re.match('.*(<meta\s+(?:(?:name="keywords"\s*)|(?:content="foo"\s*)){2}/>)', self.html, re.S|re.M)
         self.assert_(m, "No 'foo' keyword find")
 
     def test_additional_keywords_in_listMetaTags_two(self):
-        self.my_doc.setText('<p>foo bar</p>')
+        self.sp.manage_changeProperties(settings_use_keywords_sg=3, settings_use_keywords_lg=2)
+        #self.my_doc.setText('<p>foo bar</p>') # XXX
         self.sp.additional_keywords = ('foo', 'bar')
         self.html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
-        m = re.match('.*<meta\ content="foo, bar"\ name="keywords"\ />', self.html, re.S|re.M)
-        if not m:
-            m = re.match('.*<meta\ name="keywords"\ content="foo, bar"\ />', self.html, re.S|re.M)
+        m = re.match('.*(<meta\s+(?:(?:name="keywords"\s*)|(?:content="(?:foo|bar),\s*(?:foo|bar)"\s*)){2}/>)',
+                    self.html, re.S|re.M)
         self.assert_(m, "No 'foo, bar' keyword find")
 
-    def test_additional_keywords_in_listMetaTags_merge(self):
-        self.my_doc.setText('<p>foo bar</p>')
-        self.sp.additional_keywords = ('foo', 'bar')
-        self.my_doc.manage_addProperty('qSEO_keywords', ('baz',), 'lines')
-        self.html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
-        m = re.findall('.*(<meta\s+(?:content="(?:(?:baz|bar|foo),\s*(?:baz|foo|bar),\s*(?:baz|foo|bar)"\s*)|(?:name="keywords"\s*)){2}/>)', self.html, re.S|re.M)
-        self.assert_(m, "No 'foo, bar, baz' keyword find")
+    def setup_testing_render_keywords(self):
+        self.sp.additional_keywords = (('global',))
+        self.my_doc.manage_addProperty('qSEO_keywords', ('local'), 'lines')
+        aq_inner(self.my_doc).aq_explicit.setSubject('subject')
+        html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
+        return html
+
+    def test_render_only_subject(self):
+        self.sp.manage_changeProperties(settings_use_keywords_sg=1, settings_use_keywords_lg=1)
+        self.html = self.setup_testing_render_keywords()
+        m = re.match('.*(<meta\s+(?:(?:name="keywords"\s*)|(?:content="subject"\s*)){2}/>)', self.html, re.S|re.M)
+        self.assert_(m, "No 'subject' keyword find")
+
+    def test_render_subject_and_local_seokeywords(self):
+        self.sp.manage_changeProperties(settings_use_keywords_sg=1, settings_use_keywords_lg=2)
+        self.html = self.setup_testing_render_keywords()
+        m = re.match('.*(<meta\s+(?:(?:name="keywords"\s*)|(?:content="(?:subject|local),\s*(?:subject|local)"\s*)){2}/>)',
+                    self.html, re.S|re.M)
+        self.assert_(m, "No 'subject, local' keywords find")
+
+    def test_render_only_global_seokeywords(self):
+        self.sp.manage_changeProperties(settings_use_keywords_sg=2, settings_use_keywords_lg=1)
+        self.html = self.setup_testing_render_keywords()
+        m = re.match('.*(<meta\s+(?:(?:name="keywords"\s*)|(?:content="global"\s*)){2}/>)', self.html, re.S|re.M)
+        self.assert_(m, "No 'global' keyword find")
+
+    def test_render_global_and_local_seokeywords(self):
+        self.sp.manage_changeProperties(settings_use_keywords_sg=2, settings_use_keywords_lg=2)
+        self.html = self.setup_testing_render_keywords()
+        m = re.match('.*(<meta\s+(?:(?:name="keywords"\s*)|(?:content="(?:global|local),\s*(?:global|local)"\s*)){2}/>)',
+                    self.html, re.S|re.M)
+        self.assert_(m, "No 'global, local' keywords find")
+
+    def test_render_subject_and_global_seokeywords(self):
+        self.sp.manage_changeProperties(settings_use_keywords_sg=3, settings_use_keywords_lg=1)
+        self.html = self.setup_testing_render_keywords()
+        m = re.match('.*(<meta\s+(?:(?:name="keywords"\s*)|(?:content="(?:subject|global),\s*(?:subject|global)"\s*)){2}/>)',
+                    self.html, re.S|re.M)
+        self.assert_(m, "No 'subject, global' keywords find")
+
+    def test_render_subject_and_global_and_local_seokeywords(self):
+        self.sp.manage_changeProperties(settings_use_keywords_sg=3, settings_use_keywords_lg=2)
+        self.html = self.setup_testing_render_keywords()
+        m = re.match('.*(<meta\s+(?:(?:name="keywords"\s*)|(?:content="(?:subject|global|local),\s*(?:subject|global|local),\s*(?:subject|global|local)"\s*)){2}/>)',
+                    self.html, re.S|re.M)
+        self.assert_(m, "No 'subject, global, local' keywords find")
+
 
 def test_suite():

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests/testQSEOptimizerResponse.py

@@ -25 +25 @@
         self.canonurl = 'http://nohost/plone/test.html'
         self.sp.manage_changeProperties(**GLOBAL_CUSTOM_METATAGS)
+        self.sp.manage_changeProperties(settings_use_keywords_sg=3, settings_use_keywords_lg=2)
         abs_path = "/%s" % my_doc.absolute_url(1)
         self.form_data = {'seo_description': 'it is description', 'seo_keywords_override:int': 1, 'seo_custommetatags_override:int': 1,