[MMBASE SCM] r40067 - in mmbase/trunk/core/src/test: java/org/mmbase/datatypes resources/org/mmbase/config

[michiel]

Author: michiel
Date: 2009-12-01 18:54:28 +0100 (Tue, 01 Dec 2009)
New Revision: 40067

Added:
   mmbase/trunk/core/src/test/resources/org/mmbase/config/datatypes.xml
Modified:
   mmbase/trunk/core/src/test/java/org/mmbase/datatypes/DataTypesTest.java
Log:
added a test about 'restricted' binaries

Modified: 
mmbase/trunk/core/src/test/java/org/mmbase/datatypes/DataTypesTest.java
===================================================================
--- mmbase/trunk/core/src/test/java/org/mmbase/datatypes/DataTypesTest.java     
2009-12-01 17:53:47 UTC (rev 40066)
+++ mmbase/trunk/core/src/test/java/org/mmbase/datatypes/DataTypesTest.java     
2009-12-01 17:54:28 UTC (rev 40067)
@@ -15,8 +15,7 @@
 import org.mmbase.bridge.NodeManager;
 import org.mmbase.bridge.Field;
 import org.mmbase.bridge.mock.*;
-import org.mmbase.util.LocalizedString;
-import org.mmbase.util.ResourceLoader;
+import org.mmbase.util.*;
 import org.mmbase.util.xml.DocumentReader;
 import org.mmbase.util.xml.XMLWriter;
 
@@ -34,7 +33,6 @@
  * @version $Id$
  */
 public class DataTypesTest  {
-
     @BeforeClass
     public static void setUp() throws Exception {
         LocalizedString.setDefault(new Locale("da"));
@@ -428,8 +426,18 @@
         assertEquals(aa.getNumber(), typedefDataType.cast(aa, null, 
null).getNumber());
     }
 
+    @Test
+    public void restrictedBinary() {
+        DataType restrictedBinary = DataTypes.getDataType("restricted_binary");
+        assertNotNull(restrictedBinary);
+        assertTrue(restrictedBinary instanceof BinaryDataType);
+        assertEquals(0, restrictedBinary.validate(new byte[] { 0, 1, 2, }, 
null, null).size());
+        assertEquals(1, restrictedBinary.validate(null, null, null).size());
+        assertFalse(restrictedBinary.validate(new byte[0], null, null).size() 
== 0);
+        assertFalse(restrictedBinary.validate(new NullInputStream(201), null, 
null).size() == 0);
+        assertTrue(restrictedBinary.validate(new NullInputStream(199), null, 
null).size() == 0);
+    }
 
 
 
-
 }

Added: mmbase/trunk/core/src/test/resources/org/mmbase/config/datatypes.xml
===================================================================
--- mmbase/trunk/core/src/test/resources/org/mmbase/config/datatypes.xml        
                        (rev 0)
+++ mmbase/trunk/core/src/test/resources/org/mmbase/config/datatypes.xml        
2009-12-01 17:54:28 UTC (rev 40067)
@@ -0,0 +1,13 @@
+<?xml version="1.0" ?>
+<datatypes
+    xmlns="http://www.mmbase.org/xmlns/datatypes";
+    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+    xsi:schemaLocation="http://www.mmbase.org/xmlns/datatypes 
http://www.mmbase.org/xmlns/datatypes.xsd";>
+
+  <datatype base="binary" id="restricted_binary">
+    <property name="validMimeTypes" value="image/.*" />
+    <required value="true" />
+    <minLength value="1" enforce="onchange" />
+    <maxLength value="200" enforce="onchange"/>
+  </datatype>
+</datatypes>

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