Changeset 2940 in products for quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/tests/testBlackoutList.py

Timestamp:

Oct 28, 2010 4:57:24 PM (14 years ago)

Author:

mylan

Message:

#228: Fix filter naming overhead, fix tests

File:

• quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/tests/testBlackoutList.py (modified) (5 diffs)

quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/tests/testBlackoutList.py

@@ -7 +7 @@
 
 from Products.CMFPlone.utils import _createObjectByType
-from quintagroup.plonegooglesitemaps.config import BLACKOUT_PREFIX
 from quintagroup.plonegooglesitemaps.interfaces import IBlackoutFilter
 
-idfname = BLACKOUT_PREFIX + "id"
-pathfname = BLACKOUT_PREFIX + "path"
 
 class TestBOFilters(TestCase):
@@ -17 +14 @@
     def testDefaultId(self):
         idfilter = queryMultiAdapter((self.portal, self.app.REQUEST),
-                       IBlackoutFilter, name=idfname)
+                       IBlackoutFilter, name="id")
         self.assertTrue(idfilter is not None,
-            "Not registered default '%s' IBlackoutFilter" % idfname)
+            "Not registered default 'id' IBlackoutFilter")
 
     def testDefaultPath(self):
         pathfilter = queryMultiAdapter((self.portal, self.app.REQUEST),
-                         IBlackoutFilter, name=pathfname)
+                         IBlackoutFilter, name="path")
         self.assertTrue(pathfilter is not None,
-            "Not registered default '%s' IBlackoutFilter" % pathfname)
+            "Not registered default 'path' IBlackoutFilter")
 
 
@@ -56 +53 @@
 
     def testIdFilter(self):
-        catpaths, filtered = self.getPreparedLists(idfname, "doc1")
+        catpaths, filtered = self.getPreparedLists("id", "doc1")
         self.assertTrue(type(filtered) in [ListType, TupleType],
-            'Object type, returned by filteredOut method of "%s" utility '\
-            'not list nor tuple' % idfname)
+            'Object type, returned by filteredOut method of "id" filter '\
+            'not list nor tuple')
         excluded = ["/%s/doc1" % self.portal.absolute_url(1),
                     "/%s/doc1" % self.folder.absolute_url(1)]
         self.assertTrue(
             set(catpaths)-set(filtered) == set(excluded),
-            'Wrong filtered-out by "%s" filter:\nsrc %s\nres %s\nexcluded %s' % (
-             idfname, catpaths, filtered, excluded))
+            'Wrong filtered-out by "id" filter:\nsrc %s\nres %s\nexcluded %s' % (
+             catpaths, filtered, excluded))
 
     def testAbsolutePathFilter(self):
-        catpaths, filtered = self.getPreparedLists(pathfname, "/doc1")
+        catpaths, filtered = self.getPreparedLists("path", "/doc1")
         self.assertTrue(type(filtered) in [ListType, TupleType],
-            'Object type, returned by filteredOut method of "%s" utility '\
-            'not list nor tuple' % pathfname)
+            'Object type, returned by filteredOut method of "path" filter '\
+            'not list nor tuple')
         excluded = ["/%s/doc1" % self.portal.absolute_url(1)]
         self.assertTrue(
             set(catpaths)-set(filtered) == set(excluded),
-            'Wrong filtered-out by "%s" filter:\nsrc %s\nres %s\nexcluded %s' % (
-             pathfname, catpaths, filtered, excluded))
+            'Wrong filtered-out by "path" filter:\nsrc %s\nres %s\nexcluded %s' % (
+             catpaths, filtered, excluded))
 
     def testRelativePathFilter(self):
         self.sm = _createObjectByType('Sitemap', self.folder, id='google-sitemaps')
-        catpaths, filtered = self.getPreparedLists(pathfname, "./doc1")
+        catpaths, filtered = self.getPreparedLists("path", "./doc1")
         self.assertTrue(type(filtered) in [ListType, TupleType],
-            'Object type, returned by filteredOut method of "%s" utility '\
-            'not list nor tuple' % pathfname)
+            'Object type, returned by filteredOut method of "path" utility '\
+            'not list nor tuple')
         excluded = ["/%s/doc1" % self.folder.absolute_url(1)]
         self.assertTrue(
             set(catpaths)-set(filtered) == set(excluded),
-            'Wrong filtered-out by "%s" filter:\nsrc %s\nres %s\nexcluded %s' % (
-             pathfname, catpaths, filtered, excluded))
+            'Wrong filtered-out by "path" filter:\nsrc %s\nres %s\nexcluded %s' % (
+             catpaths, filtered, excluded))
 
 
@@ -110 +107 @@
         excluded = ["%s/doc1" % self.portal.absolute_url()]
         self.assertTrue(set(catpaths)-set(filtered) == set(excluded),
-            'Wrong filtered-out by "%s" filter:\nsrc %s\nres %s\nexcluded %s' % (
-             idfname, catpaths, filtered, excluded))
+            'Wrong filtered-out by "id" filter:\nsrc %s\nres %s\nexcluded %s' % (
+             catpaths, filtered, excluded))
 
     def testDefaultFilterUtility(self):
@@ -118 +115 @@
                     "%s/doc1" % self.folder.absolute_url()]
         self.assertTrue(set(catpaths)-set(filtered) == set(excluded),
-            'Wrong filtered-out by "%s" filter:\nsrc %s\nres %s\nexcluded %s' % (
-             idfname, catpaths, filtered, excluded))
+            'Wrong filtered-out by "id" filter:\nsrc %s\nres %s\nexcluded %s' % (
+             catpaths, filtered, excluded))
         # Now check is output of unnamed filter samed to named one.
         self.sm.edit(blackout_list="doc1")