Author: michiel
Date: 2010-04-08 12:40:55 +0200 (Thu, 08 Apr 2010)
New Revision: 41787
Modified:
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/BasicStepTest.java
Log:
restrictions on BasicStep were a bit relaxed. Test-cases failing because of
that. This fixes it again
Modified:
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/BasicStepTest.java
===================================================================
---
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/BasicStepTest.java
2010-04-08 10:40:16 UTC (rev 41786)
+++
mmbase/trunk/tests/dbsq/org/mmbase/storage/search/implementation/BasicStepTest.java
2010-04-08 10:40:55 UTC (rev 41787)
@@ -85,30 +85,36 @@
testSetAlias();
}
+
+
+
/** Test of addNode method, of class
org.mmbase.storage.search.implementation.BasicStep. */
public void testAddNode() {
- // Negative node, should throw IllegalArgumentException
- try {
- instance.addNode(-1);
- fail("Negative node, should throw IllegalArgumentException");
- } catch (IllegalArgumentException e) {}
-
SortedSet<Integer> nodes = instance.getNodes();
assertNull(nodes); // MMB-1682
+
+ // Negative node, should not throw IllegalArgumentException
+ instance.addNode(-10);
+
+
int nodeNumber0 = 23456;
instance.addNode(nodeNumber0);
nodes = instance.getNodes();
- assertTrue(nodes.size() == 1);
+ assertTrue(nodes.size() == 2);
Iterator<Integer> iNodes = nodes.iterator();
assertTrue(iNodes.hasNext());
+ assertTrue(iNodes.next().equals(new Integer(-10)));
+ assertTrue(iNodes.hasNext());
assertTrue(iNodes.next().equals(new Integer(nodeNumber0)));
assertTrue(!iNodes.hasNext());
int nodeNumber1 = 2345;
Step result = instance.addNode(nodeNumber1);
nodes = instance.getNodes();
- assertTrue(nodes.size() == 2);
+ assertTrue(nodes.size() == 3);
iNodes = nodes.iterator();
assertTrue(iNodes.hasNext());
+ assertTrue(iNodes.next().equals(new Integer(-10)));
+ assertTrue(iNodes.hasNext());
assertTrue(iNodes.next().equals(new Integer(nodeNumber1)));
assertTrue(iNodes.hasNext());
assertTrue(iNodes.next().equals(new Integer(nodeNumber0)));
@@ -121,6 +127,8 @@
// See:
testAddNode();
+ instance.setUnmodifiable();
+
SortedSet<Integer> nodes = instance.getNodes();
Integer item = nodes.first();
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
