Author: michiel
Date: 2009-07-06 16:26:53 +0200 (Mon, 06 Jul 2009)
New Revision: 36570
Modified:
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/TestConstraint.java
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/database/BasicSqlHandlerTest.java
Log:
Modified:
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/TestConstraint.java
===================================================================
---
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/TestConstraint.java
2009-07-06 14:10:53 UTC (rev 36569)
+++
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/TestConstraint.java
2009-07-06 14:26:53 UTC (rev 36570)
@@ -3,30 +3,34 @@
import org.mmbase.storage.search.*;
/**
- * Test implementation of the <@link Constraint Constraint> interface,
+ * Test implementation of the <@link Constraint Constraint> interface,
* with fixed support level that is specified when creating an instance.
*
* @author Rob van Maris
* @version $Revision: 1.1 $
*/
public class TestConstraint implements Constraint {
-
+
/** The support level. */
private int support;
-
+
/** Creates a new instance of TestConstraint, with the specified support.
*/
public TestConstraint(int support) {
this.support = support;
}
-
+
// javadoc is inherited
public int getBasicSupportLevel() {
return support;
}
-
+
// javadoc is inherited
public boolean isInverse() {
return false;
}
-
+
+ public void setUnmodifiable() {
+ // TODO
+ }
+
}
Modified:
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/database/BasicSqlHandlerTest.java
===================================================================
---
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/database/BasicSqlHandlerTest.java
2009-07-06 14:10:53 UTC (rev 36569)
+++
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/database/BasicSqlHandlerTest.java
2009-07-06 14:26:53 UTC (rev 36570)
@@ -793,31 +793,26 @@
query = new BasicSearchQuery(true);
step1 = query.addStep(images).setAlias(null);
BasicAggregatedField field4a
- = (BasicAggregatedField) query.addAggregatedField(
- step1, imagesTitle, AggregatedField.AGGREGATION_TYPE_COUNT)
- .setAlias(null);
+ = (BasicAggregatedField) query.addAggregatedField(step1,
imagesTitle, AggregatedField.AGGREGATION_TYPE_COUNT)
+ .setAlias(null);
sb.setLength(0);
instance.appendQueryBodyToSql(sb, query, instance);
strSql = sb.toString();
- assertTrue(strSql, strSql.equalsIgnoreCase(
- "COUNT(TITLE) " + "FROM " + prefix + "images IMAGES"));
+ assertTrue(strSql, strSql.equalsIgnoreCase("COUNT(TITLE) " + "FROM " +
prefix + "images IMAGES"));
- field4a.setAggregationType(
- AggregatedField.AGGREGATION_TYPE_COUNT_DISTINCT);
+
field4a.setAggregationType(AggregatedField.AGGREGATION_TYPE_COUNT_DISTINCT);
sb.setLength(0);
instance.appendQueryBodyToSql(sb, query, instance);
strSql = sb.toString();
- assertTrue(strSql, strSql.equalsIgnoreCase(
- "COUNT(DISTINCT TITLE) "
- + "FROM " + prefix + "images IMAGES"));
+ assertTrue(strSql, strSql.equalsIgnoreCase("COUNT(DISTINCT TITLE) "
+ + "FROM " + prefix +
"images IMAGES"));
field4a.setAggregationType(AggregatedField.AGGREGATION_TYPE_MIN);
sb.setLength(0);
instance.appendQueryBodyToSql(sb, query, instance);
strSql = sb.toString();
- assertTrue(strSql, strSql.equalsIgnoreCase(
- "MIN(TITLE) "
- + "FROM " + prefix + "images IMAGES"));
+ assertTrue(strSql, strSql.equalsIgnoreCase("MIN(TITLE) "
+ + "FROM " + prefix +
"images IMAGES"));
field4a.setAggregationType(AggregatedField.AGGREGATION_TYPE_MAX);
sb.setLength(0);
@@ -842,10 +837,9 @@
sb.setLength(0);
instance.appendQueryBodyToSql(sb, query, instance);
strSql = sb.toString();
- assertTrue(strSql, strSql.equalsIgnoreCase(
- "MAX(TITLE) AS maxTitle,"
- + "COUNT(NUMBER) "
- + "FROM " + prefix + "images IMAGES"));
+ assertTrue(strSql, strSql.equalsIgnoreCase("MAX(TITLE) AS maxTitle,"
+ + "COUNT(NUMBER) "
+ + "FROM " + prefix +
"images IMAGES"));
field4b.setAggregationType(AggregatedField.AGGREGATION_TYPE_GROUP_BY);
sb.setLength(0);
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
