Skip to content

Commit

Permalink
Adapt tests
Browse files Browse the repository at this point in the history 
With PLIP 1343 being merged some tests need to be adapted.

Now the catalog no longer processes indexing operations right away.

Some tests rely on that, so a minimal adaptation was needed.

References:
plone/Products.CMFPlone#1343
  • Loading branch information
@gforcada
gforcada committed Feb 26, 2016
1 parent d2a9535 commit b1e6c91
Show file tree
Hide file tree
Showing 2 changed files with 34 additions and 27 deletions.
59 changes: 32 additions & 27 deletions Products/ATContentTypes/tests/reindex_sanity.txt
View file
Expand Up @@ -7,6 +7,7 @@ Those tests make sure that the catalog is only called as necessary.
>>> from os.path import sep
>>> from Products.ZCatalog.ZCatalog import ZCatalog
>>> from Products.CMFCore.utils import getToolByName
>>> from Products.CMFCore.indexing import processQueue
>>> from Products.Archetypes.utils import wrap_method
>>> from Products.Archetypes.utils import unwrap_method
>>> from Products.Archetypes.utils import call_original as call
Expand All @@ -20,6 +21,7 @@ Those tests make sure that the catalog is only called as necessary.
>>> folder = portal.portal_membership.getHomeFolder(TEST_USER_ID)

>>> _ = folder.invokeFactory(type_name='Folder', id='sub')
>>> result = processQueue()

>>> def callers(n=1):
... stack = []
Expand Down Expand Up @@ -101,6 +103,7 @@ setting:
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_doc1 ['review_state']
------------------------------------------------------------
>>> result = processQueue()
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_doc1 []
------------------------------------------------------------
Expand All @@ -126,6 +129,7 @@ More complex invokeFactory call, setting title and description:
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_doc2 ['review_state']
------------------------------------------------------------
>>> result = processQueue()
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_doc2 []
------------------------------------------------------------
Expand All @@ -148,15 +152,16 @@ Rename:
Catalog: uid_catalog
UnIndexing: Members/test_user_1_/new_doc1
------------------------------------------------------------
Catalog: portal_catalog
UnIndexing: /plone/Members/test_user_1_/new_doc1
------------------------------------------------------------
Catalog: uid_catalog
Indexing: Members/test_user_1_/new_doc11 []
------------------------------------------------------------
Catalog: portal_catalog
UnIndexing: /plone/Members/test_user_1_/new_doc1
------------------------------------------------------------
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_doc11 []
------------------------------------------------------------
>>> result = processQueue()
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_doc11 ['getObjPositionInParent']
------------------------------------------------------------
Expand All @@ -171,12 +176,10 @@ Copy and paste:
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/sub/new_doc2 ['review_state']
------------------------------------------------------------
>>> result = processQueue()
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/sub/new_doc2 []
------------------------------------------------------------
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/sub/new_doc2 ['created']
------------------------------------------------------------

Cut and paste:

Expand All @@ -185,12 +188,12 @@ Cut and paste:
Catalog: uid_catalog
UnIndexing: Members/test_user_1_/new_doc11
------------------------------------------------------------
Catalog: portal_catalog
UnIndexing: /plone/Members/test_user_1_/new_doc11
------------------------------------------------------------
Catalog: uid_catalog
Indexing: Members/test_user_1_/sub/new_doc11 []
------------------------------------------------------------
Catalog: portal_catalog
UnIndexing: /plone/Members/test_user_1_/new_doc11
------------------------------------------------------------
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/sub/new_doc11 []
------------------------------------------------------------
Expand All @@ -212,6 +215,7 @@ setting:
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_folder1 ['review_state']
------------------------------------------------------------
>>> result = processQueue()
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_folder1 []
------------------------------------------------------------
Expand All @@ -237,6 +241,7 @@ More complex invokeFactory call, setting title and description:
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_folder2 ['review_state']
------------------------------------------------------------
>>> result = processQueue()
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_folder2 []
------------------------------------------------------------
Expand All @@ -259,15 +264,16 @@ Rename:
Catalog: uid_catalog
UnIndexing: Members/test_user_1_/new_folder1
------------------------------------------------------------
Catalog: portal_catalog
UnIndexing: /plone/Members/test_user_1_/new_folder1
------------------------------------------------------------
Catalog: uid_catalog
Indexing: Members/test_user_1_/new_folder11 []
------------------------------------------------------------
Catalog: portal_catalog
UnIndexing: /plone/Members/test_user_1_/new_folder1
------------------------------------------------------------
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_folder11 []
------------------------------------------------------------
>>> result = processQueue()
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_folder11 ['getObjPositionInParent']
------------------------------------------------------------
Expand All @@ -282,12 +288,10 @@ Copy and paste:
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/sub/new_folder2 ['review_state']
------------------------------------------------------------
>>> result = processQueue()
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/sub/new_folder2 []
------------------------------------------------------------
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/sub/new_folder2 ['created']
------------------------------------------------------------

Cut and paste:

Expand All @@ -296,12 +300,12 @@ Cut and paste:
Catalog: uid_catalog
UnIndexing: Members/test_user_1_/new_folder11
------------------------------------------------------------
Catalog: portal_catalog
UnIndexing: /plone/Members/test_user_1_/new_folder11
------------------------------------------------------------
Catalog: uid_catalog
Indexing: Members/test_user_1_/sub/new_folder11 []
------------------------------------------------------------
Catalog: portal_catalog
UnIndexing: /plone/Members/test_user_1_/new_folder11
------------------------------------------------------------
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/sub/new_folder11 []
------------------------------------------------------------
Expand All @@ -323,6 +327,7 @@ setting:
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_btree_folder1 ['review_state']
------------------------------------------------------------
>>> result = processQueue()
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_btree_folder1 []
------------------------------------------------------------
Expand All @@ -348,6 +353,7 @@ More complex invokeFactory call, setting title and description:
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_btree_folder2 ['review_state']
------------------------------------------------------------
>>> result = processQueue()
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_btree_folder2 []
------------------------------------------------------------
Expand All @@ -370,15 +376,16 @@ Rename:
Catalog: uid_catalog
UnIndexing: Members/test_user_1_/new_btree_folder1
------------------------------------------------------------
Catalog: portal_catalog
UnIndexing: /plone/Members/test_user_1_/new_btree_folder1
------------------------------------------------------------
Catalog: uid_catalog
Indexing: Members/test_user_1_/new_btree_folder11 []
------------------------------------------------------------
Catalog: portal_catalog
UnIndexing: /plone/Members/test_user_1_/new_btree_folder1
------------------------------------------------------------
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_btree_folder11 []
------------------------------------------------------------
>>> result = processQueue()
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/new_btree_folder11 ['getObjPositionInParent']
------------------------------------------------------------
Expand All @@ -393,12 +400,10 @@ Copy and paste:
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/sub/new_btree_folder2 ['review_state']
------------------------------------------------------------
>>> result = processQueue()
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/sub/new_btree_folder2 []
------------------------------------------------------------
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/sub/new_btree_folder2 ['created']
------------------------------------------------------------


Cut and paste:
Expand All @@ -408,12 +413,12 @@ Cut and paste:
Catalog: uid_catalog
UnIndexing: Members/test_user_1_/new_btree_folder11
------------------------------------------------------------
Catalog: portal_catalog
UnIndexing: /plone/Members/test_user_1_/new_btree_folder11
------------------------------------------------------------
Catalog: uid_catalog
Indexing: Members/test_user_1_/sub/new_btree_folder11 []
------------------------------------------------------------
Catalog: portal_catalog
UnIndexing: /plone/Members/test_user_1_/new_btree_folder11
------------------------------------------------------------
Catalog: portal_catalog
Indexing: /plone/Members/test_user_1_/sub/new_btree_folder11 []
------------------------------------------------------------
Expand Down
2 changes: 2 additions & 0 deletions Products/ATContentTypes/tests/test_criteria.py
View file
Expand Up @@ -21,6 +21,7 @@
from Products.ATContentTypes.interfaces import IATTopicCriterion
from Products.ATContentTypes.tests import atcttestcase
from zope.interface.verify import verifyObject
from Products.CMFCore.indexing import processQueue

import unittest

Expand Down Expand Up @@ -430,6 +431,7 @@ def test_reference_vocab(self):
self.folder.doc2.setRelatedItems([uid1])
self.folder.doc1.reindexObject()
self.folder.doc2.reindexObject()
processQueue()
vocab = self.dummy.getCurrentValues()
self.assertEqual(len(vocab), 2)
self.assertTrue(uid1 in vocab.keys())
Expand Down

0 comments on commit b1e6c91

Please sign in to comment.