Commit 21e3f8a5 authored by Ivan Tyagov's avatar Ivan Tyagov

Rather than test a scriptable key which simply exposes built in catalog...

Rather than test a scriptable key which simply exposes built in catalog SearchableText tests SearchableText instead. Add more testing for passed portal_type outside SearchableText.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33316 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent e68bb1d4
...@@ -736,20 +736,13 @@ class TestDocument(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -736,20 +736,13 @@ class TestDocument(ERP5TypeTestCase, ZopeTestCase.Functional):
# image = image_list[0] # image = image_list[0]
# self.assertEquals('embedded', image.getValidationState()) # self.assertEquals('embedded', image.getValidationState())
def test_09_ScriptableKeys(self, quiet=QUIET, run=RUN_ALL_TEST): def test_09_SearchableText(self, quiet=QUIET, run=RUN_ALL_TEST):
""" """
Check the default DMS scriptale keys Check DMS SearchableText capabilities.
""" """
if not run: return if not run: return
printAndLog('\nScriptable Keys')
portal = self.portal portal = self.portal
# Check that SQL generated is valid
self.portal.portal_catalog(advanced_search_text='')
self.portal.portal_catalog(advanced_search_text='a search text')
self.portal.portal_catalog(portal_search_text='')
self.portal.portal_catalog(portal_search_text='a search text')
# Create a document. # Create a document.
document_1 = self.portal.document_module.newContent( document_1 = self.portal.document_module.newContent(
portal_type = 'File', portal_type = 'File',
...@@ -775,8 +768,10 @@ class TestDocument(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -775,8 +768,10 @@ class TestDocument(ERP5TypeTestCase, ZopeTestCase.Functional):
title='Super nova organisation') title='Super nova organisation')
self.stepTic() self.stepTic()
def getAdvancedSearchTextResultList(advanced_search_text): def getAdvancedSearchTextResultList(searchable_text, portal_type=None):
kw = {'advanced_search_text': advanced_search_text} kw = {'SearchableText': searchable_text}
if portal_type is not None:
kw['portal_type'] = portal_type
return [x.getObject() for x in portal.portal_catalog(**kw)] return [x.getObject() for x in portal.portal_catalog(**kw)]
# full text search # full text search
...@@ -802,6 +797,15 @@ class TestDocument(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -802,6 +797,15 @@ class TestDocument(ERP5TypeTestCase, ZopeTestCase.Functional):
getAdvancedSearchTextResultList('%s portal_type:%s' \ getAdvancedSearchTextResultList('%s portal_type:%s' \
%(organisation.getTitle(), %(organisation.getTitle(),
organisation.getPortalType()))) organisation.getPortalType())))
# full text search with portal_type passed outside searchable_text
self.assertSameSet([web_page, person],
getAdvancedSearchTextResultList('Great'))
self.assertSameSet([web_page], \
getAdvancedSearchTextResultList('Great', web_page.getPortalType()))
self.assertSameSet([person], \
getAdvancedSearchTextResultList('Great', person.getPortalType()))
# full text search with portal_type & reference # full text search with portal_type & reference
self.assertSameSet([person], \ self.assertSameSet([person], \
getAdvancedSearchTextResultList('reference:%s portal_type:%s' \ getAdvancedSearchTextResultList('reference:%s portal_type:%s' \
...@@ -825,6 +829,7 @@ class TestDocument(ERP5TypeTestCase, ZopeTestCase.Functional): ...@@ -825,6 +829,7 @@ class TestDocument(ERP5TypeTestCase, ZopeTestCase.Functional):
web_page.getReference(), web_page.getReference(),
web_page.getLanguage(), web_page.getLanguage(),
web_page.getVersion()))) web_page.getVersion())))
def test_10_SearchString(self, quiet=QUIET, run=RUN_ALL_TEST): def test_10_SearchString(self, quiet=QUIET, run=RUN_ALL_TEST):
""" """
Test search string search generation and parsing. Test search string search generation and parsing.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment