[MMBASE CVS] tests/bridge/org/mmbase/bridge DataTypesTest.java

[Michiel Meeuwissen]

Update of /var/cvs/tests/bridge/org/mmbase/bridge
In directory james.mmbase.org:/tmp/cvs-serv7766

Modified Files:
        DataTypesTest.java 
Log Message:



See also: http://cvs.mmbase.org/viewcvs/tests/bridge/org/mmbase/bridge


Index: DataTypesTest.java
===================================================================
RCS file: /var/cvs/tests/bridge/org/mmbase/bridge/DataTypesTest.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -u -b -r1.42 -r1.43
--- DataTypesTest.java  12 Sep 2008 09:30:28 -0000      1.42
+++ DataTypesTest.java  12 Sep 2008 16:10:44 -0000      1.43
@@ -80,6 +80,11 @@
                               new Object[] { "1e50",  "asdfe", "-100", new 
Integer(-100) }
                 }
                 ,
+                new Object[] {"duration_required",
+                              new Object[] { new Integer(100), "100", new 
Float(10.0), "1234", "1234.4", "1e7", "10:10:10", new Long(Long.MAX_VALUE)},
+                              new Object[] { "1e50",  "asdfe", "-100", new 
Integer(-100), null, "" }
+                }
+                ,
                 new Object[] {"range",
                               new Object[] {new Integer(5), "1", "6.0", new 
Float(2.0), null},
                               new Object[] {"-1", "11", "xyz", new Integer(0), 
new Integer(10)}},
@@ -330,10 +335,17 @@
                     if(field.getName().equals("handle") && validValues[j] != 
null) {
                         assertFalse("Checksum is null", 
newNode.isNull("checksum"));
                     }
-                    if (validValues[j] != null &&
+                    if (field.getDataType().isRequired() ||
+                        (
+                         validValues[j] != null &&
+                         (! (validValues[j].equals("") && field.getDataType() 
instanceof NumberDataType)) && // "" for numbers may be interpreted as null
                         ! (field.getDataType() instanceof NodeDataType && 
validValues[j].equals(new Integer(-1))) // -1 casts to null for node-fields.
+                         )
                         ) {
                         assertFalse("field " + field.getName() + " was null, 
after we set " + validValues[j] + " in it", newNode.isNull(field.getName()));
+                    } else {
+
+                        assertTrue("field " + field.getName() + " was not 
null, after we set " + validValues[j] + " in it", 
newNode.isNull(field.getName()));
                     }
                     if (! field.getDataType().isRequired()) {
                         // so, it must be possible to set field back to null.
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs