Author: michiel
Date: 2010-01-07 14:46:21 +0100 (Thu, 07 Jan 2010)
New Revision: 40390
Modified:
mmbase/branches/MMBase-1_9/tests/clustering/org/mmbase/tests/Clustering.java
Log:
ported a detail from trunk
Modified:
mmbase/branches/MMBase-1_9/tests/clustering/org/mmbase/tests/Clustering.java
===================================================================
---
mmbase/branches/MMBase-1_9/tests/clustering/org/mmbase/tests/Clustering.java
2010-01-07 12:55:20 UTC (rev 40389)
+++
mmbase/branches/MMBase-1_9/tests/clustering/org/mmbase/tests/Clustering.java
2010-01-07 13:46:21 UTC (rev 40390)
@@ -60,18 +60,22 @@
} catch (InterruptedException ie) {
}
}
-
public void fieldEquals(Node n1, Node n2) {
- FieldIterator fi =
n1.getNodeManager().getFields(NodeManager.ORDER_CREATE).fieldIterator();
- while (fi.hasNext()) {
- Field f = fi.nextField();
+ for (Field f :
n1.getNodeManager().getFields(NodeManager.ORDER_CREATE)) {
if (f.getName().equals("number")) {
// sigh, 'number' is a NODE field...
assertEquals(n1.getNumber(), n2.getNumber());
+ } else if (f.getName().equals("otype")) {
+ // 'otype' is a NODE field too
+ assertEquals(n1.getNumber(), n2.getNumber());
} else {
Object value1 = n1.getValue(f.getName());
Object value2 = n2.getValue(f.getName());
- assertTrue("" + value1 + " != " + value2 + " (value of " +
n1.getNumber() + "/" + f.getName() + ")", value1 == null ? value2 == null :
value1.equals(value2));
+ assertTrue("" +
+ (value1 == null ? "" : value1.getClass().getName())
+ value1 +
+ " != " +
+ (value2 == null ? "" : value2.getClass().getName())
+ value2 +
+ " (value of " + n1.getNumber() + "/" + f.getName()
+ ")", value1 == null ? value2 == null : value1.equals(value2));
}
}
}
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
