Author: michiel
Date: 2010-02-01 18:58:40 +0100 (Mon, 01 Feb 2010)
New Revision: 40767

Modified:
   
mmbase/branches/MMBase-1_9/tests/dbsq/org/mmbase/storage/search/implementation/database/BasicSqlHandlerTest.java
Log:
ported from trunk

Modified: 
mmbase/branches/MMBase-1_9/tests/dbsq/org/mmbase/storage/search/implementation/database/BasicSqlHandlerTest.java
===================================================================
--- 
mmbase/branches/MMBase-1_9/tests/dbsq/org/mmbase/storage/search/implementation/database/BasicSqlHandlerTest.java
    2010-02-01 17:14:31 UTC (rev 40766)
+++ 
mmbase/branches/MMBase-1_9/tests/dbsq/org/mmbase/storage/search/implementation/database/BasicSqlHandlerTest.java
    2010-02-01 17:58:40 UTC (rev 40767)
@@ -1439,13 +1439,12 @@
         BasicCompositeConstraint compositeConstraint =
         new BasicCompositeConstraint(CompositeConstraint.LOGICAL_AND);
 
-        try {
-            // Empty composite constraint, should throw IllegalStateException.
-            instance.appendCompositeConstraintToSql(sb, compositeConstraint,
-            query, false, false, instance);
-            fail("Empty composite constraint, should throw 
IllegalStateException.");
-        } catch (IllegalStateException e) {}
+        // Empty composite constraint
+        instance.appendCompositeConstraintToSql(sb, compositeConstraint,
+                                                query, false, false, instance);
+        assertTrue(sb.toString(), sb.toString().equalsIgnoreCase("(1 = 1)"));
 
+
         sb.setLength(0);
         compositeConstraint.addChild(constraint2); // Add first child 
constraint.
         instance.appendCompositeConstraintToSql(sb, compositeConstraint,

_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs

Reply via email to