Fail with explicit error when searchPredicateList is passed a context with non existant categories

product/CMFCategory/CategoryTool.py

@@ -1587,9 +1587,14 @@ class CategoryTool( UniqueObject, Folder, Base ):
             if len(category_uid_list) == 0:
               # New base category, append it to the ordered list.
               ordered_base_category_uid_list.append(base_category_uid)
-            category_uid_list.append(self.getCategoryUid(category))
-          else: 
-            LOG('CategoryTool', 0, 'Received invalid category %r' % (category, ))
+            category_uid = self.getCategoryUid(category)
+            category_uid_list.append(category_uid)
+
+          if category_uid is None and category != 'NULL':
+            raise TypeError(
+              "Invalid category passed to buildAdvancedSQLSelector: %r"
+                % category )
+
         # Generate "left join" and "where" expressions.
         left_join_list = [catalog_table_name]
         where_expression_list = []

product/ERP5/tests/testDomainTool.py

@@ -649,6 +649,38 @@ class TestDomainTool(TestPredicateMixIn):
       tested_base_category_list=['WAAA', 'BOOO'],
       src__=1))
 
+  def test_searchPredicateInvalidCategories(self):
+    predicate = self.portal.sale_supply_module.newContent(
+      portal_type='Sale Supply')
+    predicate.validate()
+    self.assertNotEquals(predicate.asPredicate(), None)
+
+    context = self.portal.person_module.newContent(
+      portal_type='Person',
+      region=('broken/category'))
+
+    # An invalid category should raise explicitly, for all parameters of
+    # searchPredicateList ( the code paths are different )
+    self.assertRaises(TypeError, self.portal.portal_domains.searchPredicateList,
+      context=context, portal_type=predicate.portal_type)
+    self.assertRaises(TypeError, self.portal.portal_domains.searchPredicateList,
+      context=context, portal_type=predicate.portal_type, acquired=False)
+    self.assertRaises(TypeError, self.portal.portal_domains.searchPredicateList,
+      context=context, portal_type=predicate.portal_type,
+      tested_base_category_list=['region'])
+    self.assertRaises(TypeError, self.portal.portal_domains.searchPredicateList,
+      context=context, portal_type=predicate.portal_type,
+      tested_base_category_list=['region'], acquired=False)
+
+    # This is also the case if there are multiple categories (another code
+    # path)
+    context = self.portal.person_module.newContent(
+      portal_type='Person',
+      region=('broken/category', 'region'))
+    self.assertRaises(TypeError, self.portal.portal_domains.searchPredicateList,
+      context=context, portal_type=predicate.portal_type)
+
+
   def test_setRelationToBaseDomain(self):
     # category accessors can be useed to set relations to base domains.
     base_domain = self.portal.portal_domains.newContent(