ajung/plone.app.discussion
ajung/plone.app.discussion
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make comment collection tests work with plone.app.collection.

Browse Source
This commit is contained in:
Timo Stollenwerk 2012-03-31 18:40:58 +02:00
parent ebb39b4994
commit 4d330f2daa
2 changed files with 29 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plone/app/discussion/testing.py
View File

@ -8,6 +8,12 @@ from plone.app.testing import FunctionalTesting
from zope.configuration import xmlconfig from zope.configuration import xmlconfig
try:
import plone.app.collection
COLLECTION_TYPE = "Collection"
except:
COLLECTION_TYPE = "Topic"
class PloneAppDiscussion(PloneSandboxLayer): class PloneAppDiscussion(PloneSandboxLayer):

32
plone/app/discussion/tests/test_catalog.py
View File

@ -18,6 +18,8 @@ from plone.app.discussion.testing import \
from plone.app.discussion.interfaces import IConversation from plone.app.discussion.interfaces import IConversation
from plone.app.discussion.testing import COLLECTION_TYPE
class CatalogSetupTest(unittest.TestCase): class CatalogSetupTest(unittest.TestCase):
@ -413,16 +415,28 @@ class CommentCatalogTest(unittest.TestCase):
self.assertEqual(len(brains), 6) self.assertEqual(len(brains), 6)
def test_collection(self): def test_collection(self):
self.portal.invokeFactory(id='topic', type_name='Topic') if COLLECTION_TYPE == "Topic":
topic = self.portal.topic self.portal.invokeFactory('Topic', id='topic')
crit = topic.addCriterion('Type', 'ATSimpleStringCriterion') topic = self.portal.topic
crit.setValue('Comment') crit = topic.addCriterion('Type', 'ATSimpleStringCriterion')
query = topic.buildQuery() crit.setValue('Comment')
query = topic.buildQuery()
# Make sure the comment we just added is returned by the collection self.assertEqual(len(query), 1)
self.assertEqual(len(query), 1) self.assertEqual(query['Type'], 'Comment')
self.assertEqual(query['Type'], 'Comment') self.assertEqual(len(topic.queryCatalog()), 1)
self.assertEqual(len(topic.queryCatalog()), 1) else:
self.portal.invokeFactory('Collection', id='collection')
collection = self.portal.collection
collection.query = [{
'i': 'Type',
'o': 'plone.app.querystring.operation.string.is',
'v': 'Comment',
}]
self.assertEqual(len(collection.results()), 1)
self.assertEqual(collection.results()[0].text, 'Comment text')
self.assertEqual(collection.results()[0].creator, 'Jim')
class NoConversationCatalogTest(unittest.TestCase): class NoConversationCatalogTest(unittest.TestCase):