[Erp5-report] r33158 yusuke - /erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py

[nobody at svn.erp5.org]

Author: yusuke
Date: Mon Mar  1 08:13:13 2010
New Revision: 33158

URL: http://svn.erp5.org?rev=33158&view=rev
Log:
simplify. thanks nicolas.

Modified:
    erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py

Modified: erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py?rev=33158&r1=33157&r2=33158&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py [utf8] (original)
+++ erp5/trunk/products/ERP5Catalog/tests/testERP5Catalog.py [utf8] Mon Mar  1 08:13:13 2010
@@ -2351,15 +2351,10 @@
                                         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()