Changeset 2940 in products
- Timestamp:
- Oct 28, 2010 4:57:24 PM (13 years ago)
- Location:
- quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/browser/commonview.py
r2939 r2940 8 8 9 9 from quintagroup.plonegooglesitemaps import qPloneGoogleSitemapsMessageFactory as _ 10 from quintagroup.plonegooglesitemaps.config import BLACKOUT_PREFIX11 10 from quintagroup.plonegooglesitemaps.interfaces import IBlackoutFilter 12 11 from quintagroup.plonegooglesitemaps.browser.utils import additionalURLs, applyOperations … … 114 113 fspec = frec.split(":") 115 114 fargs = fspec.pop() 116 fname = BLACKOUT_PREFIX + (fspec and fspec.pop() or "id")115 fname = fspec and fspec.pop() or "id" 117 116 fengine = queryMultiAdapter((self.context, self.request), 118 117 interface=IBlackoutFilter, name=fname) -
quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/config.py
r2909 r2940 33 33 except ImportError: 34 34 SUPPORT_BLAYER = False 35 36 BLACKOUT_PREFIX = "seoptimzier.blackoutfilter." -
quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/configure.zcml
r2939 r2940 31 31 <!-- Register default filters --> 32 32 <adapter 33 34 35 36 name=" seoptimzier.blackoutfilter.id"37 33 for="* 34 zope.publisher.interfaces.browser.IBrowserRequest" 35 factory=".filters.IdBlackoutFilter" 36 name="id" 37 permission="zope.Public" /> 38 38 39 39 <adapter … … 41 41 zope.publisher.interfaces.browser.IBrowserRequest" 42 42 factory=".filters.PathBlackoutFilter" 43 name=" seoptimzier.blackoutfilter.path"44 43 name="path" 44 permission="zope.Public" /> 45 45 46 46 -
quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/tests/testBlackoutList.py
r2939 r2940 7 7 8 8 from Products.CMFPlone.utils import _createObjectByType 9 from quintagroup.plonegooglesitemaps.config import BLACKOUT_PREFIX10 9 from quintagroup.plonegooglesitemaps.interfaces import IBlackoutFilter 11 10 12 idfname = BLACKOUT_PREFIX + "id"13 pathfname = BLACKOUT_PREFIX + "path"14 11 15 12 class TestBOFilters(TestCase): … … 17 14 def testDefaultId(self): 18 15 idfilter = queryMultiAdapter((self.portal, self.app.REQUEST), 19 IBlackoutFilter, name= idfname)16 IBlackoutFilter, name="id") 20 17 self.assertTrue(idfilter is not None, 21 "Not registered default ' %s' IBlackoutFilter" % idfname)18 "Not registered default 'id' IBlackoutFilter") 22 19 23 20 def testDefaultPath(self): 24 21 pathfilter = queryMultiAdapter((self.portal, self.app.REQUEST), 25 IBlackoutFilter, name= pathfname)22 IBlackoutFilter, name="path") 26 23 self.assertTrue(pathfilter is not None, 27 "Not registered default ' %s' IBlackoutFilter" % pathfname)24 "Not registered default 'path' IBlackoutFilter") 28 25 29 26 … … 56 53 57 54 def testIdFilter(self): 58 catpaths, filtered = self.getPreparedLists( idfname, "doc1")55 catpaths, filtered = self.getPreparedLists("id", "doc1") 59 56 self.assertTrue(type(filtered) in [ListType, TupleType], 60 'Object type, returned by filteredOut method of " %s" utility'\61 'not list nor tuple' % idfname)57 'Object type, returned by filteredOut method of "id" filter '\ 58 'not list nor tuple') 62 59 excluded = ["/%s/doc1" % self.portal.absolute_url(1), 63 60 "/%s/doc1" % self.folder.absolute_url(1)] 64 61 self.assertTrue( 65 62 set(catpaths)-set(filtered) == set(excluded), 66 'Wrong filtered-out by " %s" filter:\nsrc %s\nres %s\nexcluded %s' % (67 idfname,catpaths, filtered, excluded))63 'Wrong filtered-out by "id" filter:\nsrc %s\nres %s\nexcluded %s' % ( 64 catpaths, filtered, excluded)) 68 65 69 66 def testAbsolutePathFilter(self): 70 catpaths, filtered = self.getPreparedLists( pathfname, "/doc1")67 catpaths, filtered = self.getPreparedLists("path", "/doc1") 71 68 self.assertTrue(type(filtered) in [ListType, TupleType], 72 'Object type, returned by filteredOut method of " %s" utility'\73 'not list nor tuple' % pathfname)69 'Object type, returned by filteredOut method of "path" filter '\ 70 'not list nor tuple') 74 71 excluded = ["/%s/doc1" % self.portal.absolute_url(1)] 75 72 self.assertTrue( 76 73 set(catpaths)-set(filtered) == set(excluded), 77 'Wrong filtered-out by " %s" filter:\nsrc %s\nres %s\nexcluded %s' % (78 pathfname,catpaths, filtered, excluded))74 'Wrong filtered-out by "path" filter:\nsrc %s\nres %s\nexcluded %s' % ( 75 catpaths, filtered, excluded)) 79 76 80 77 def testRelativePathFilter(self): 81 78 self.sm = _createObjectByType('Sitemap', self.folder, id='google-sitemaps') 82 catpaths, filtered = self.getPreparedLists( pathfname, "./doc1")79 catpaths, filtered = self.getPreparedLists("path", "./doc1") 83 80 self.assertTrue(type(filtered) in [ListType, TupleType], 84 'Object type, returned by filteredOut method of " %s" utility '\85 'not list nor tuple' % pathfname)81 'Object type, returned by filteredOut method of "path" utility '\ 82 'not list nor tuple') 86 83 excluded = ["/%s/doc1" % self.folder.absolute_url(1)] 87 84 self.assertTrue( 88 85 set(catpaths)-set(filtered) == set(excluded), 89 'Wrong filtered-out by " %s" filter:\nsrc %s\nres %s\nexcluded %s' % (90 pathfname,catpaths, filtered, excluded))86 'Wrong filtered-out by "path" filter:\nsrc %s\nres %s\nexcluded %s' % ( 87 catpaths, filtered, excluded)) 91 88 92 89 … … 110 107 excluded = ["%s/doc1" % self.portal.absolute_url()] 111 108 self.assertTrue(set(catpaths)-set(filtered) == set(excluded), 112 'Wrong filtered-out by " %s" filter:\nsrc %s\nres %s\nexcluded %s' % (113 idfname,catpaths, filtered, excluded))109 'Wrong filtered-out by "id" filter:\nsrc %s\nres %s\nexcluded %s' % ( 110 catpaths, filtered, excluded)) 114 111 115 112 def testDefaultFilterUtility(self): … … 118 115 "%s/doc1" % self.folder.absolute_url()] 119 116 self.assertTrue(set(catpaths)-set(filtered) == set(excluded), 120 'Wrong filtered-out by " %s" filter:\nsrc %s\nres %s\nexcluded %s' % (121 idfname,catpaths, filtered, excluded))117 'Wrong filtered-out by "id" filter:\nsrc %s\nres %s\nexcluded %s' % ( 118 catpaths, filtered, excluded)) 122 119 # Now check is output of unnamed filter samed to named one. 123 120 self.sm.edit(blackout_list="doc1")
Note: See TracChangeset
for help on using the changeset viewer.