Changeset 2940 in products


Ignore:
Timestamp:
Oct 28, 2010 4:57:24 PM (13 years ago)
Author:
mylan
Message:

#228: Fix filter naming overhead, fix tests

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  
    88 
    99from quintagroup.plonegooglesitemaps import qPloneGoogleSitemapsMessageFactory as _ 
    10 from quintagroup.plonegooglesitemaps.config import BLACKOUT_PREFIX 
    1110from quintagroup.plonegooglesitemaps.interfaces import IBlackoutFilter 
    1211from quintagroup.plonegooglesitemaps.browser.utils import additionalURLs, applyOperations 
     
    114113            fspec = frec.split(":") 
    115114            fargs = fspec.pop() 
    116             fname = BLACKOUT_PREFIX + (fspec and fspec.pop() or "id") 
     115            fname = fspec and fspec.pop() or "id" 
    117116            fengine = queryMultiAdapter((self.context, self.request), 
    118117                          interface=IBlackoutFilter, name=fname) 
  • quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/config.py

    r2909 r2940  
    3333except ImportError: 
    3434    SUPPORT_BLAYER = False 
    35  
    36 BLACKOUT_PREFIX = "seoptimzier.blackoutfilter." 
  • quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/configure.zcml

    r2939 r2940  
    3131    <!-- Register default filters --> 
    3232    <adapter 
    33         for="* 
    34              zope.publisher.interfaces.browser.IBrowserRequest" 
    35         factory=".filters.IdBlackoutFilter" 
    36         name="seoptimzier.blackoutfilter.id" 
    37         permission="zope.Public" /> 
     33        for="* 
     34             zope.publisher.interfaces.browser.IBrowserRequest" 
     35        factory=".filters.IdBlackoutFilter" 
     36        name="id" 
     37        permission="zope.Public" /> 
    3838 
    3939    <adapter 
     
    4141             zope.publisher.interfaces.browser.IBrowserRequest" 
    4242        factory=".filters.PathBlackoutFilter" 
    43         name="seoptimzier.blackoutfilter.path" 
    44         permission="zope.Public" /> 
     43        name="path" 
     44        permission="zope.Public" /> 
    4545 
    4646 
  • quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/tests/testBlackoutList.py

    r2939 r2940  
    77 
    88from Products.CMFPlone.utils import _createObjectByType 
    9 from quintagroup.plonegooglesitemaps.config import BLACKOUT_PREFIX 
    109from quintagroup.plonegooglesitemaps.interfaces import IBlackoutFilter 
    1110 
    12 idfname = BLACKOUT_PREFIX + "id" 
    13 pathfname = BLACKOUT_PREFIX + "path" 
    1411 
    1512class TestBOFilters(TestCase): 
     
    1714    def testDefaultId(self): 
    1815        idfilter = queryMultiAdapter((self.portal, self.app.REQUEST), 
    19                        IBlackoutFilter, name=idfname) 
     16                       IBlackoutFilter, name="id") 
    2017        self.assertTrue(idfilter is not None, 
    21             "Not registered default '%s' IBlackoutFilter" % idfname) 
     18            "Not registered default 'id' IBlackoutFilter") 
    2219 
    2320    def testDefaultPath(self): 
    2421        pathfilter = queryMultiAdapter((self.portal, self.app.REQUEST), 
    25                          IBlackoutFilter, name=pathfname) 
     22                         IBlackoutFilter, name="path") 
    2623        self.assertTrue(pathfilter is not None, 
    27             "Not registered default '%s' IBlackoutFilter" % pathfname) 
     24            "Not registered default 'path' IBlackoutFilter") 
    2825 
    2926 
     
    5653 
    5754    def testIdFilter(self): 
    58         catpaths, filtered = self.getPreparedLists(idfname, "doc1") 
     55        catpaths, filtered = self.getPreparedLists("id", "doc1") 
    5956        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') 
    6259        excluded = ["/%s/doc1" % self.portal.absolute_url(1), 
    6360                    "/%s/doc1" % self.folder.absolute_url(1)] 
    6461        self.assertTrue( 
    6562            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)) 
    6865 
    6966    def testAbsolutePathFilter(self): 
    70         catpaths, filtered = self.getPreparedLists(pathfname, "/doc1") 
     67        catpaths, filtered = self.getPreparedLists("path", "/doc1") 
    7168        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') 
    7471        excluded = ["/%s/doc1" % self.portal.absolute_url(1)] 
    7572        self.assertTrue( 
    7673            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)) 
    7976 
    8077    def testRelativePathFilter(self): 
    8178        self.sm = _createObjectByType('Sitemap', self.folder, id='google-sitemaps') 
    82         catpaths, filtered = self.getPreparedLists(pathfname, "./doc1") 
     79        catpaths, filtered = self.getPreparedLists("path", "./doc1") 
    8380        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') 
    8683        excluded = ["/%s/doc1" % self.folder.absolute_url(1)] 
    8784        self.assertTrue( 
    8885            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)) 
    9188 
    9289 
     
    110107        excluded = ["%s/doc1" % self.portal.absolute_url()] 
    111108        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)) 
    114111 
    115112    def testDefaultFilterUtility(self): 
     
    118115                    "%s/doc1" % self.folder.absolute_url()] 
    119116        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)) 
    122119        # Now check is output of unnamed filter samed to named one. 
    123120        self.sm.edit(blackout_list="doc1") 
Note: See TracChangeset for help on using the changeset viewer.