Changeset 1721 in products for quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests/testCanonicalURL.py

Timestamp:

Feb 11, 2010 9:00:11 PM (14 years ago)

Author:

mylan

Message:

#134: Update canonical url tests

File:

• quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests/testCanonicalURL.py (modified) (3 diffs)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/tests/testCanonicalURL.py

@@ -7 +7 @@
 from Products.Archetypes.interfaces import IBaseContent
 
+from quintagroup.canonicalpath.interfaces import ICanonicalPath
 from quintagroup.seoptimizer.interfaces import ISEOCanonicalPath
 from base import getToolByName, FunctionalTestCase, newSecurityManager
@@ -58 +59 @@
            foundcurls, mydoc_url_new))
 
-    def test_seoCanonicalAdapterRegistration(self):
-        seocanonical = queryAdapter(self.mydoc, interface=ISEOCanonicalPath)
-        self.assertTrue(seocanonical is not None,
+    def test_SEOCanonicalAdapterRegistration(self):
+        portal_seocanonical = queryAdapter(self.portal, interface=ISEOCanonicalPath)
+        self.assertTrue(portal_seocanonical is not None,
+            "Not registered ISEOCanonicalPath adapter")
+
+        mydoc_seocanonical = queryAdapter(self.mydoc, interface=ISEOCanonicalPath)
+        self.assertTrue(mydoc_seocanonical is not None,
             "Not registered ISEOCanonicalPath adapter")
 
     def test_canonicalAdapterRegistration(self):
-        import quintagroup
-        if hasattr(quintagroup, 'canonicalpath'):
-            from quintagroup.canonicalpath.interfaces import ICanonicalPath
-            canonical = queryAdapter(self.mydoc, interface=ICanonicalPath)
-            self.assertTrue(canonical is not None,
-                "Not registered ICanonicalPath adapter")
+        canonical_portal = queryAdapter(self.portal, interface=ICanonicalPath)
+        self.assertTrue(canonical_portal is not None,
+            "Not registered ICanonicalPath adapter for portal root")
+
+        canonical_mydoc = queryAdapter(self.mydoc, interface=ICanonicalPath)
+        self.assertTrue(canonical_mydoc is not None,
+            "Not registered ICanonicalPath adapter for the documnent")
 
     def test_canonicalAdapter(self):
@@ -134 +140 @@
              newcpath, mydoc_catalog_canonical))
 
-    def test_Canonical4Plone(self):
-        canonical = queryAdapter(self.portal, ISEOCanonicalPath)
-        self.assertTrue(canonical is not None,
-            "No 'ISEOCanonicalPath' adapter registered for the Plone object")
-
 
 def test_suite():