simplify. thanks nicolas.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33158 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Catalog/tests/testERP5Catalog.py

@@ -2351,15 +2351,10 @@ class TestERP5Catalog(ERP5TypeTestCase, LogInterceptor):
                                         operator='AND')
     self.assertEqual(len(catalog(query=query_find_name_erp5)), 2)
 
-    try:
-      query = ComplexQuery(query_find_european,
-                           query_find_name_erp5,
-                           operator='OR')
-    except NotImplementedError:
-      # correct behaviour for now
-      raise
-    else:
-      self.fail("In this query pattern, ComplexQuery doesn't return valid result.")
+    self.assertRaises(NotImplementedError,
+                      lambda : ComplexQuery(query_find_european,
+                                            query_find_name_erp5,
+                                            operator='OR'))
  
   def test_check_security_table_content(self, quiet=quiet, run=run_all_test):
     sql_connection = self.getSQLConnection()