Author: michiel
Date: 2009-08-17 08:57:08 +0200 (Mon, 17 Aug 2009)
New Revision: 37916
Modified:
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/BasicSearchQueryTest.java
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/NodeSearchQueryTest.java
Log:
didn't compile
Modified:
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/BasicSearchQueryTest.java
===================================================================
---
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/BasicSearchQueryTest.java
2009-08-17 06:56:50 UTC (rev 37915)
+++
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/BasicSearchQueryTest.java
2009-08-17 06:57:08 UTC (rev 37916)
@@ -15,30 +15,30 @@
* @version $Revision: 1.4 $
*/
public class BasicSearchQueryTest extends TestCase {
-
+
/** Test instance (non-aggregating). */
private BasicSearchQuery instance1;
-
+
/** Test instance (aggregating). */
private BasicSearchQuery instance2;
-
+
/** MMBase instance. */
private MMBase mmbase = null;
-
+
/** Images builder, used as builder example. */
private MMObjectBuilder images = null;
-
+
/** Insrel builder, used as relation builder example. */
private InsRel insrel = null;
-
+
public BasicSearchQueryTest(java.lang.String testName) {
super(testName);
}
-
+
public static void main(java.lang.String[] args) {
junit.textui.TestRunner.run(suite());
}
-
+
/**
* Sets up before each test.
*/
@@ -51,67 +51,67 @@
instance1 = new BasicSearchQuery();
instance2 = new BasicSearchQuery(true);
}
-
+
/**
* Tears down after each test.
*/
public void tearDown() throws Exception {}
-
+
/** Test of setDistinct method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testSetDistinct() {
// Default is false.
assertTrue(!instance1.isDistinct());
-
+
BasicSearchQuery result = instance1.setDistinct(true);
assertTrue(instance1.isDistinct());
assertTrue(result == instance1);
}
-
+
public void testIsAggregating() {
assertTrue(!instance1.isAggregating());
assertTrue(instance2.isAggregating());
}
-
+
/** Test of setMaxNumber method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testSetMaxNumber() {
// Default is max integer value.
assertTrue(instance1.getMaxNumber() == -1);
-
+
BasicSearchQuery result = instance1.setMaxNumber(12345);
assertTrue(instance1.getMaxNumber() == 12345);
assertTrue(result == instance1);
-
+
// Value less than -1, should throw IllegalArgumentException.
try {
instance1.setMaxNumber(-2);
fail("Value less than -1, should throw IllegalArgumentException.");
} catch (IllegalArgumentException e) {}
}
-
+
/** Test of setOffset method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testSetOffset() {
// Default is zero.
assertTrue(instance1.getOffset() == 0);
-
+
// Invalid offset, should throw IllegalArgumentException.
try {
instance1.setOffset(-789);
fail("Invalid offset, should throw IllegalArgumentException.");
} catch (IllegalArgumentException e) {}
-
+
BasicSearchQuery result = instance1.setOffset(123456);
assertTrue(instance1.getOffset() == 123456);
assertTrue(result == instance1);
}
-
+
/** Test of addStep method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testAddStep() {
// Null argument, should throw IllegalArgumentException
try {
- instance1.addStep(null);
+ instance1.addStep((MMObjectBuilder) null);
fail("Null argument, should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {}
-
+
List<Step> steps = instance1.getSteps();
assertTrue(steps.size() == 0);
Step step0 = instance1.addStep(images);
@@ -124,7 +124,7 @@
assertTrue(steps.get(0) == step0);
assertTrue(steps.get(1) == step1);
}
-
+
/** Test of addRelationStep method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testAddRelationStep() {
// No previous step, should throw IllegalStateException
@@ -132,21 +132,21 @@
instance1.addRelationStep(insrel, images);
fail("No previous step, should throw IllegalStateException");
} catch (IllegalStateException e) {}
-
+
instance1.addStep(images);
-
+
// Null builder argument, should throw IllegalArgumentException
try {
instance1.addRelationStep(null, images);
fail("Null builder argument, should throw
IllegalArgumentException");
} catch (IllegalArgumentException e) {}
-
+
// Null nextBuilder argument, should throw IllegalArgumentException
try {
instance1.addRelationStep(insrel, null);
fail("Null nextBuilder argument, should throw
IllegalArgumentException");
} catch (IllegalArgumentException e) {}
-
+
List<Step> steps = instance1.getSteps();
assertTrue(steps.size() == 1);
RelationStep relationStep = instance1.addRelationStep(insrel, images);
@@ -156,25 +156,25 @@
Step next = relationStep.getNext();
assertTrue(steps.get(2) == next);
}
-
+
/** Test of addField method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testAddField() {
Step step = instance1.addStep(images);
CoreField imagesTitle = images.getField("title");
CoreField imagesDescription = images.getField("description");
-
+
// Null step argument, should throw IllegalArgumentException
try {
instance1.addField(null, imagesTitle);
fail("Null step argument, should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {}
-
+
// Null CoreField argument, should throw IllegalArgumentException
try {
instance1.addField(step, null);
fail("Null CoreField argument, should throw
IllegalArgumentException");
} catch (IllegalArgumentException e) {}
-
+
List<StepField> fields = instance1.getFields();
assertTrue(fields.size() == 0);
StepField field0 = instance1.addField(step, imagesTitle);
@@ -186,7 +186,7 @@
assertTrue(fields.size() == 2);
assertTrue(fields.indexOf(field0) == 0);
assertTrue(fields.indexOf(field1) == 1);
-
+
// Aggregating query:
step = instance2.addStep(images);
try {
@@ -195,34 +195,34 @@
fail("Adding non-aggregated step to aggregating query, should
throw UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {}
}
-
+
/** Test of addAggregatedField method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testAddAggregatedField() {
Step step = instance2.addStep(images);
CoreField imagesTitle = images.getField("title");
CoreField imagesDescription = images.getField("description");
-
+
// Null step argument, should throw IllegalArgumentException
try {
instance2.addAggregatedField(
null, imagesTitle, AggregatedField.AGGREGATION_TYPE_COUNT);
fail("Null step argument, should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {}
-
+
// Null CoreField argument, should throw IllegalArgumentException
try {
instance2.addAggregatedField(
step, null, AggregatedField.AGGREGATION_TYPE_COUNT);
fail("Null CoreField argument, should throw
IllegalArgumentException");
} catch (IllegalArgumentException e) {}
-
+
// Invalid aggregation type argument, should throw
IllegalArgumentException
try {
instance2.addAggregatedField(
step, imagesTitle, 0);
fail("Invalid aggregation type argument, should throw
IllegalArgumentException");
} catch (IllegalArgumentException e) {}
-
+
List<StepField> fields = instance2.getFields();
assertTrue(fields.size() == 0);
StepField field0 = instance2.addAggregatedField(
@@ -236,7 +236,7 @@
assertTrue(fields.size() == 2);
assertTrue(fields.indexOf(field0) == 0);
assertTrue(fields.indexOf(field1) == 1);
-
+
// Non-aggregating query:
step = instance1.addStep(images);
try {
@@ -246,7 +246,7 @@
fail("Adding aggregated step to non-aggregating query, should
throw UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {}
}
-
+
/** Test of addSortOrder method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testAddSortOrder() {
// Null step argument, should throw IllegalArgumentException
@@ -254,13 +254,13 @@
instance1.addSortOrder(null);
fail("Null step argument, should throw IllegalArgumentException");
} catch (IllegalArgumentException e) {}
-
+
Step step = instance1.addStep(images);
CoreField imagesTitle = images.getField("title");
CoreField imagesDescription = images.getField("description");
StepField field0 = instance1.addField(step, imagesTitle);
StepField field1 = instance1.addField(step, imagesDescription);
-
+
List<SortOrder> sortOrders = instance1.getSortOrders();
assertTrue(sortOrders.size() == 0);
SortOrder sortOrder0 = instance1.addSortOrder(field0);
@@ -273,35 +273,35 @@
assertTrue(sortOrders.indexOf(sortOrder0) == 0);
assertTrue(sortOrders.indexOf(sortOrder1) == 1);
}
-
+
/** Test of setConstraint method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testSetConstraint() {
// Default is null.
assertTrue(instance1.getConstraint() == null);
-
+
BasicConstraint constraint = new BasicConstraint();
instance1.setConstraint(constraint);
assertTrue(instance1.getConstraint() == constraint);
-
+
// Null value allowed.
instance1.setConstraint(null);
assertTrue(instance1.getConstraint() == null);
}
-
+
/** Test of isDistinct method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testIsDistinct() {
// Same as:
testSetDistinct();
}
-
+
/** Test of getSortOrders method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testGetSortOrders() {
// See:
testAddSortOrder();
-
+
List<SortOrder> sortOrders = instance1.getSortOrders();
SortOrder item = sortOrders.get(0);
-
+
// List returned must be unmodifiable.
try {
sortOrders.add(item);
@@ -312,15 +312,15 @@
fail("Attempt to modify list, must throw
UnsupportedOperationException");
} catch (UnsupportedOperationException e) {}
}
-
+
/** Test of getSteps method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testGetSteps() {
// See:
testAddStep();
-
+
List<Step> steps = instance1.getSteps();
Step item = steps.get(0);
-
+
// List returned must be unmodifiable.
try {
steps.add(item);
@@ -331,15 +331,15 @@
fail("Attempt to modify list, must throw
UnsupportedOperationException");
} catch (UnsupportedOperationException e) {}
}
-
+
/** Test of getFields method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testGetFields() {
// See:
testAddField();
-
+
List<StepField> fields = instance1.getFields();
StepField item = fields.get(0);
-
+
// List returned must be unmodifiable.
try {
fields.add(item);
@@ -350,38 +350,38 @@
fail("Attempt to modify list, must throw
UnsupportedOperationException");
} catch (UnsupportedOperationException e) {}
}
-
+
/** Test of getConstraint method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testGetConstraint() {
// Same as:
testSetConstraint();
}
-
+
/** Test of getMaxNumber method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testGetMaxNumber() {
// Same as:
testSetMaxNumber();
}
-
+
/** Test of getOffset method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testGetOffset() {
// Same as:
testSetOffset();
}
-
+
/** Test of equals method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testEquals() {
// TODO: implement test
}
-
+
/** Test of hashCode method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testHashCode() {
// TODO: implement test
}
-
+
/** Test of toString method, of class
org.mmbase.storage.search.implementation.BasicSearchQuery. */
public void testToString() {
-
+
BasicStep step1 = instance1.addStep(images);
BasicStepField field1a = instance1.addField(step1,
images.getField("title"));
instance1.setConstraint(new BasicFieldNullConstraint(field1a));
@@ -420,11 +420,11 @@
+ ", max:" + instance1.getMaxNumber()
+ ", offset:" + instance1.getOffset() + ")"));
}
-
+
public static Test suite() {
TestSuite suite = new TestSuite(BasicSearchQueryTest.class);
-
+
return suite;
}
-
+
}
Modified:
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/NodeSearchQueryTest.java
===================================================================
---
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/NodeSearchQueryTest.java
2009-08-17 06:56:50 UTC (rev 37915)
+++
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/NodeSearchQueryTest.java
2009-08-17 06:57:08 UTC (rev 37916)
@@ -16,30 +16,30 @@
* @version $Revision: 1.11 $
*/
public class NodeSearchQueryTest extends TestCase {
-
+
/** Test instance. */
private NodeSearchQuery instance = null;
-
+
/** MMBase instance. */
private MMBase mmbase = null;
-
+
/** Exampler builders. */
private MMObjectBuilder images = null;
private MMObjectBuilder news = null;
private InsRel insrel = null;
-
+
/** Example fields. */
private CoreField imagesTitle = null;
private CoreField newsTitle = null;
-
+
public NodeSearchQueryTest(java.lang.String testName) {
super(testName);
}
-
+
public static void main(java.lang.String[] args) {
junit.textui.TestRunner.run(suite());
}
-
+
/**
* Sets up before each test.
*/
@@ -53,26 +53,26 @@
newsTitle = news.getField("title");
instance = new NodeSearchQuery(images);
}
-
+
/**
* Tears down after each test.
*/
public void tearDown() throws Exception {}
-
+
/** Test of constructor. */
public void testConstructor() {
try {
// Null builder, should throw IllegalArgumentException.
- new NodeSearchQuery(null);
+ new NodeSearchQuery((MMObjectBuilder) null);
fail("Null builder, should throw IllegalArgumentException.");
} catch (IllegalArgumentException e) {}
-
+
try {
// Virtual builder, should throw IllegalArgumentException.
new NodeSearchQuery(new ClusterBuilder(mmbase));
fail("Virtual builder, should throw IllegalArgumentException.");
} catch (IllegalArgumentException e) {}
-
+
Collection<CoreField> fields = images.getFields();
List<StepField> stepFields = instance.getFields();
Iterator<StepField> iStepFields = stepFields.iterator();
@@ -93,7 +93,7 @@
}
}
}
-
+
/** Test of getField method, of class
org.mmbase.storage.search.implementation.NodeSearchQuery. */
public void testGetField() {
Step step = instance.getSteps().get(0);
@@ -114,14 +114,14 @@
} catch (IllegalArgumentException e) {}
}
}
-
+
// Field not belonging to images: should throw
IllegalArgumentException.
try {
instance.getField(newsTitle);
fail("Field not belonging to images: should throw
IllegalArgumentException.");
} catch (IllegalArgumentException e) {}
}
-
+
/** Test of addStep method, of class
org.mmbase.storage.search.implementation.NodeSearchQuery. */
public void testAddStep() {
// Adding step, should throw UnsupportedOperationException.
@@ -130,7 +130,7 @@
fail("Adding step, should throw UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {}
}
-
+
/** Test of addRelationStep method, of class
org.mmbase.storage.search.implementation.NodeSearchQuery. */
public void testAddRelationStep() {
// Adding relation step, should throw UnsupportedOperationException.
@@ -139,7 +139,7 @@
fail("Adding relation step, should throw
UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {}
}
-
+
/** Test of addField method, of class
org.mmbase.storage.search.implementation.NodeSearchQuery. */
public void testAddField() {
Step step = instance.getSteps().get(0);
@@ -150,29 +150,29 @@
fail("Adding field, should throw UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {}
}
-
+
/** Test of addAggregatedField method, of class
org.mmbase.storage.search.implementation.NodeSearchQuery. */
public void testAddAggregatedField() {
Step step = instance.getSteps().get(0);
// Adding field, should throw UnsupportedOperationException.
try {
- instance.addAggregatedField(step, imagesTitle,
+ instance.addAggregatedField(step, imagesTitle,
AggregatedField.AGGREGATION_TYPE_MIN);
fail("Adding field, should throw UnsupportedOperationException.");
} catch (UnsupportedOperationException e) {}
}
-
+
/** Test of getBuilder method, of class
org.mmbase.storage.search.implementation.NodeSearchQuery. */
public void testGetBuilder() {
assertTrue(new NodeSearchQuery(images).getBuilder() == images);
assertTrue(new NodeSearchQuery(news).getBuilder() == news);
}
-
+
public static Test suite() {
TestSuite suite = new TestSuite(NodeSearchQueryTest.class);
-
+
return suite;
}
-
+
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
