Changeset 1826 in products for quintagroup.seoptimizer/branches/refactoring2.3.0/quintagroup/seoptimizer/tests

Timestamp:

Feb 25, 2010 2:11:31 PM (14 years ago)

Author:

mylan

Message:

#153: Update keywords tests: remove additional_keywords and settings_use_keywords_{s,l}g properties usage

Location:

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

Files:

• config.py (modified) (1 diff)
• testQSEOptimizerUsageKeywords.py (modified) (5 diffs)

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

@@ -5 +5 @@
 FIELDS = ['seo_title', 'seo_description', 'seo_keywords']
 
-PROPS = {'stop_words':STOP_WORDS, 'fields':FIELDS, 'additional_keywords': []}
+PROPS = {'stop_words':STOP_WORDS, 'fields':FIELDS}
 
 CUSTOM_METATAGS = [{'meta_name'    : 'metatag1',

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

@@ -25 +25 @@
         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), 3)
-        self.assertEqual(self.sp.getProperty('settings_use_keywords_lg', 0), 2)
-
-    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?form.settings_use_keywords_sg=%s'\
-                                '&form.settings_use_keywords_lg=%s&form.actions.save=1'\
-                                '&_authenticator=%s' % (sg, lg, self._getauth())
-
-            html = self.publish(path, self.basic_auth)
-            open('/tmp/sg.html','w').write(str(html))
-            #self.app.REQUEST.form['_authenticator'] = self._getauth()
-            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')
-        path = self.portal.id+'/@@seo-controlpanel?form.additional_keywords=%s'\
-            '&form.actions.save=1&_authenticator=%s' % (quoted_keywords, self._getauth())
-        self.publish(path, self.basic_auth)
-        self.assertEqual(self.sp.additional_keywords, ('foo', 'bar'))
-
-        self.publish(self.portal.id+'/@@seo-controlpanel?form.actions.save=1'\
-            '&form.additional_keywords=&_authenticator=%s' % self._getauth(), self.basic_auth)
-        self.assertEqual(self.sp.additional_keywords, ())
-
     def test_listMetaTags_empty(self):
         metatags = self.pu.listMetaTags(self.my_doc)
@@ -58 +31 @@
     def test_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.manage_addProperty('qSEO_keywords', ('foo',), 'lines')
         self.html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
@@ -66 +38 @@
     def test_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.manage_addProperty('qSEO_keywords', ('foo', 'bar'), 'lines')
         self.html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
@@ -73 +44 @@
         self.assert_(m, "No 'foo, bar' keyword find")
 
-    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)
-        self.assert_('keywords' not in metatags)
-
-    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.sp.additional_keywords = ('foo',)
-        self.html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
-        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.sp.additional_keywords = ('foo', 'bar')
-        self.html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
-        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 setup_testing_render_keywords(self, html='<p>global local subject</p>'):
+    def setup_testing_render_keywords(self, keywords=('local',),
+                                      html='<p>local subject</p>'):
         self.my_doc.setText(html)
-        self.sp.additional_keywords = (('global',))
-        self.my_doc.manage_addProperty('qSEO_keywords', ('local'), 'lines')
+        if len(keywords):
+            self.my_doc.manage_addProperty('qSEO_keywords', keywords, 'lines')
         aq_inner(self.my_doc).aq_explicit.setSubject('subject')
         html = str(self.publish(self.portal.id+'/my_doc', self.basic_auth))
@@ -105 +54 @@
 
     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()
+        self.html = self.setup_testing_render_keywords(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)
+    def test_render_only_local_seokeywords(self):
         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")
+        m = re.match('.*(<meta\s+(?:(?:name="keywords"\s*)|(?:content="local\s*"\s*)){2}/>)', self.html, re.S|re.M)
+        self.assert_(m, "No '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():