Changeset 2950 in products

Timestamp:

Nov 1, 2010 1:20:03 PM (13 years ago)

Author:

mylan

Message:

#228: Fixed default behavior filter doctests

File:

• quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/filters.txt (modified) (10 diffs)

quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/filters.txt

@@ -114 +114 @@
 Click on "Save" button lead us to result sitemap view.
 
-    >>> browser.contents.startswith('<?xml version="1.0" encoding="UTF-8"?>')
-    True
+    >>> print browser.contents
+    <?xml version="1.0" encoding=...
+
 
 After adding "Content Sitemap", "sitemap.xml" link will appear
@@ -122 +123 @@
     >>> browser.open(portal_url + "/prefs_gsm_settings")
     >>> smedit_link = browser.getLink('sitemap.xml')
+    >>> smedit_url = smedit_link.url
 
 This link lead to edit form of the newly created sitemap.xml.
 Also prepare view link to simplifier following demonstrations.
 
-    >>> smedit_link.endswith("sitemap.xml/edit")
-    True
-    >>> smview_link = smedit_link[:-5]
+    >>> smedit_url.endswith("sitemap.xml/edit")
+    True
+    >>> smview_url = smedit_url[:-5]
 
 
@@ -136 +138 @@
 Resulted sitemap has no filters - all document should present in it.
 
-    >>> browser.open(smview_link)
+    >>> browser.open(smview_url)
     >>> file("/tmp/browser.1.html","wb").write(browser.contents)
     >>> no_filters_content = browser.contents
@@ -142 +144 @@
 Check if resulted page is real sitemap...
 
-    >>> browser.contents.startswith('<?xml version="1.0" encoding="UTF-8"?>')
-    True
+    >>> print browser.contents
+    <?xml version="1.0" encoding=...
+
 
 To check urls, which pass filters - create regular expression...
@@ -171 +174 @@
 "Blackout entries" field.
 
-    >>> browser.open(smedit_link)
+    >>> browser.open(smedit_url)
     >>> filtercontrol = browser.getControl("Blackout entries")
     >>> filtercontrol.value = "id:doc1\nid:front-page"
@@ -195 +198 @@
 not from the portal root) and the front-page from the portal root.
 
-    >>> browser.open(smedit_link)
+    >>> browser.open(smedit_url)
     >>> filtercontrol = browser.getControl("Blackout entries")
     >>> filtercontrol.value = "path:/Members/test_user_1_/doc2\npath:/front-page"
@@ -209 +212 @@
     >>> path_filter_res.sort()
     >>> print "\n".join(path_filter_res)
-    /Members/test_user_1_/doc2
+    /Members/test_user_1_/doc1
     /doc1
     /doc2
@@ -226 +229 @@
     >>> browser.open(portal_url + "/sitemap.xml/edit")
     >>> filtercontrol = browser.getControl("Blackout entries")
-    >>> filtercontrol.value = "doc1\front-page"
+    >>> filtercontrol.value = "doc1\nfront-page"
     >>> browser.getControl("Save").click()
     >>> default_filter_content = browser.contents
@@ -234 +237 @@
 
     >>> default_filter_res = reloc.findall(default_filter_content)
-    >>> len(default_filter_res) == 3
+    >>> len(default_filter_res) == 2
     True
     >>> default_filter_res.sort()
@@ -242 +245 @@
 
 
-...
-
-
-
-Return blkack-out filtered objects
-          Every record in blackout_list filter should follow the spec:
-            [<filter name>:]<filter arguments>
-          For example:
-          1|  index.html
-          2|  id:index.html
-          3|  path:/folder_1_level/obj_in_folder
-          4|  path:./folder_near_sitemap/obj_in_folder
-          5|  foo_filter:arg-1, arg-2
-         
-          1->used default "id" filter - remove "index.html" objects;
-          2->explicit "id" filter - remove "index.html" objects;
-          3->"path" filter - remove /folder_1_level/obj_in_folder object,
-              path from the root of the plone site;
-          4->same to 3), but path get from the folder, where sitemap is located;
-          5->filter name is "foo_filter" (must be registered IBlackoutFilter,
-             named "foo_filter"), which get filter arguments: arg-1, arg-2
-          
-          class FooFilterUtility(object):
-              def __init__(self, context, request):
-                  self.context = context
-                  self.request = request
-              def filterOut(self, fdata, fargs):
-                  # some logic to filter-out fdata by fargs with taking into
-                  # consideration self.context and self.request, if needed.