[MMBASE SCM] r41873 - mmbase/trunk/bridge/src/test/java/org/mmbase/datatypes

[michiel]

Author: michiel
Date: 2010-04-13 13:08:15 +0200 (Tue, 13 Apr 2010)
New Revision: 41873

Modified:
   
mmbase/trunk/bridge/src/test/java/org/mmbase/datatypes/BinaryDataTypeTest.java
   
mmbase/trunk/bridge/src/test/java/org/mmbase/datatypes/ParameterizedDataTypesTest.java
Log:
fixed failing test-cases

Modified: 
mmbase/trunk/bridge/src/test/java/org/mmbase/datatypes/BinaryDataTypeTest.java
===================================================================
--- 
mmbase/trunk/bridge/src/test/java/org/mmbase/datatypes/BinaryDataTypeTest.java  
    2010-04-13 10:44:41 UTC (rev 41872)
+++ 
mmbase/trunk/bridge/src/test/java/org/mmbase/datatypes/BinaryDataTypeTest.java  
    2010-04-13 11:08:15 UTC (rev 41873)
@@ -56,10 +56,10 @@
         assertTrue(new MimeType("image", 
MimeType.STAR).matches(dt.getMimeType(new ByteArrayInputStream(GIF), null, 
null)));
         assertEquals(new MimeType("image", "gif"), dt.getMimeType(new 
ByteArrayInputStream(GIF), null, null)); //FAILS
 
-        assertEquals(MimeType.OCTETSTREAM, dt.getMimeType(new byte[] {0, 1, 
2}, null, null));
-        assertEquals(MimeType.OCTETSTREAM, dt.getMimeType(new byte[] {1, 2, 3, 
4}, null, null));
-        assertEquals(MimeType.OCTETSTREAM, dt.getMimeType(new byte[0], null, 
null));
-        assertEquals(MimeType.OCTETSTREAM, dt.getMimeType(new 
NullInputStream(100), null, null));
+        assertEquals(MimeType.UNDETERMINED, dt.getMimeType(new byte[] {0, 1, 
2}, null, null));
+        assertEquals(MimeType.UNDETERMINED, dt.getMimeType(new byte[] {1, 2, 
3, 4}, null, null));
+        assertEquals(MimeType.UNDETERMINED, dt.getMimeType(new byte[0], null, 
null));
+        assertEquals(MimeType.UNDETERMINED, dt.getMimeType(new 
NullInputStream(100), null, null));
 
     }
 
@@ -81,9 +81,14 @@
         BinaryDataType restrictedBinary = (BinaryDataType) 
DataTypes.getDataType("mimetype_restricted_binary");
         assertNotNull(restrictedBinary);
 
-        assertFalse(restrictedBinary.mimeTypeRestriction.simpleValid(new 
byte[] { 0, 1, 2, }, null, null));
-        assertEquals(1, restrictedBinary.castAndValidate(new byte[] { 0, 1, 
2}, null, null).size());
+        // UNDETERMINED, so valid for now
+        assertTrue(restrictedBinary.mimeTypeRestriction.simpleValid(new byte[] 
{ 0, 1, 2, }, null, null));
+        assertEquals(0, restrictedBinary.castAndValidate(new byte[] { 0, 1, 
2}, null, null).size());
 
+        // TODO make a test for somethign which _can_ be determined.
+
+
+
     }
 
 

Modified: 
mmbase/trunk/bridge/src/test/java/org/mmbase/datatypes/ParameterizedDataTypesTest.java
===================================================================
--- 
mmbase/trunk/bridge/src/test/java/org/mmbase/datatypes/ParameterizedDataTypesTest.java
      2010-04-13 10:44:41 UTC (rev 41872)
+++ 
mmbase/trunk/bridge/src/test/java/org/mmbase/datatypes/ParameterizedDataTypesTest.java
      2010-04-13 11:08:15 UTC (rev 41873)
@@ -152,12 +152,13 @@
                           new Object[] {new Double(Double.POSITIVE_INFINITY), 
"bla bla"
                           }},
             new Object[] {"handle",
-                          new Object[] {null, binary},
-                          new Object[] {new byte[] {1, 2}}
+                          new Object[] {null, binary /* UNDETERMINED so valid, 
or at least unknnown*/},
+                          new Object[] {new byte[] {1, 2} /* too short */}
             },
             new Object[] {"image",
-                          new Object[] {null},
-                          new Object[] { binary, new byte[] {1, 2}
+                          new Object[] {null, binary /* UNDTERMINED so valid 
(or at least unknown) */
+                },
+                          new Object[] {new byte[] {1, 2}// TODO think of 
invalid binaries.
                           }
             },
             new Object[] {"boolean",

_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs