Author: michiel
Date: 2010-06-08 11:52:20 +0200 (Tue, 08 Jun 2010)
New Revision: 42447
Modified:
mmbase/branches/MMBase-1_9/core/src/test/java/org/mmbase/datatypes/DataTypesTest.java
mmbase/branches/MMBase-1_9/core/src/test/java/org/mmbase/datatypes/ParameterizedDataTypesTest.java
mmbase/branches/MMBase-1_9/core/src/test/resources/org/mmbase/config/builders/tests/datatypes.xml
Log:
testcases, e.g. for MMB-1901
Modified:
mmbase/branches/MMBase-1_9/core/src/test/java/org/mmbase/datatypes/DataTypesTest.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/test/java/org/mmbase/datatypes/DataTypesTest.java
2010-06-08 09:33:39 UTC (rev 42446)
+++
mmbase/branches/MMBase-1_9/core/src/test/java/org/mmbase/datatypes/DataTypesTest.java
2010-06-08 09:52:20 UTC (rev 42447)
@@ -439,6 +439,16 @@
}
@Test
+ public void virtualField() {
+ NodeManager aa =
MockCloudContext.getInstance().getCloud("mmbase").getNodeManager("aa");
+ NodeManager insrel =
MockCloudContext.getInstance().getCloud("mmbase").getNodeManager("insrel");
+ assertEquals(aa.getField("security_context").getType(),
Field.TYPE_STRING);
+ assertEquals(insrel.getField("security_context").getType(),
Field.TYPE_STRING);
+ assertEquals(aa.getField("name").getType(), Field.TYPE_STRING);
+ }
+
+
+ @Test
public void dataTypeOfAnotherField() {
NodeManager aa =
MockCloudContext.getInstance().getCloud("mmbase").getNodeManager("aa");
NodeManager datatypes =
MockCloudContext.getInstance().getCloud("mmbase").getNodeManager("datatypes");
Modified:
mmbase/branches/MMBase-1_9/core/src/test/java/org/mmbase/datatypes/ParameterizedDataTypesTest.java
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/test/java/org/mmbase/datatypes/ParameterizedDataTypesTest.java
2010-06-08 09:33:39 UTC (rev 42446)
+++
mmbase/branches/MMBase-1_9/core/src/test/java/org/mmbase/datatypes/ParameterizedDataTypesTest.java
2010-06-08 09:52:20 UTC (rev 42447)
@@ -73,6 +73,7 @@
/* {field,
{valid values},
{invalid values}} */
+
new Object[] {"string",
new Object[] {"abcdefg", "ijklm\nopqrstx", null},
new Object[] {}},
@@ -100,6 +101,10 @@
new Object[] {"required_stringlength",
new Object[] {"aaa", "0123456789", "123456789\n",
"\n123456789"},
new Object[] {null, "", "bbbbbbbbbbb",
"123456789\n\n"}},
+ new Object[] {"required_string",
+ new Object[] {"aaa", "0123456789", "123456789\n",
"\n123456789", ""},
+ new Object[] {null}}
+ ,
new Object[] {"required_legacy",
new Object[] {"aaa", "0123456789", "123456789\n",
"\n123456789", ""},
new Object[] {null}}
@@ -185,14 +190,16 @@
new Object[] {"", "asjdlkf", node1}}
,
new Object[] {"decimal",
- new Object[]
{"22222222222222222222222222222222222.111111111111111111111111111111"/*35.30*/,
"1", new Integer(100),
+ new Object[]
{"22222222222222222222222222222222222.111111111111111111111111111111", //35.30
+ "1", new Integer(100),
new
BigDecimal("22222222222222222222222222222222222.1234")},
new Object[]
{"333333333333333333333333333333333333", "asjdlkf"}}
,
new Object[] {"currency",
- new Object[] {"222222222222222.11111"/*15.5*/, "1",
new Integer(100),
+ new Object[] {"222222222222222.11111", //15.5
+ "1", new Integer(100),
new BigDecimal("1.123456789"),
"12345.1111111111"},
- new Object[] {"3333333333333333", "asjdlkf"}}
+ new Object[] {"3333333333333333", "asjdlkf"}}
/*
XML not very well supported yet
new Object[] {"xml",
@@ -268,7 +275,19 @@
throw new RuntimeException(toString() + ":" + t.getMessage(), t);
}
}
+ /**
+ * MMB-1901
+ */
+ @Test
+ public void defaultValue() {
+ Cloud cloud = getCloud();
+ NodeManager nodeManager = cloud.getNodeManager("datatypes");
+ Field field = nodeManager.getField(fieldName);
+ System.out.println("Testing " + fieldName + " "+
field.getDataType().getDefaultValue());
+ assertEquals("For " + fieldName + " " + field.getDataType(),
field.getDataType().getDefaultValue(),
nodeManager.createNode().getValue(fieldName));
+ }
+
@Override
public String toString() {
return fieldName + ":" + value + "(" + (valid ? "valid" : "invalid") +
")";
Modified:
mmbase/branches/MMBase-1_9/core/src/test/resources/org/mmbase/config/builders/tests/datatypes.xml
===================================================================
---
mmbase/branches/MMBase-1_9/core/src/test/resources/org/mmbase/config/builders/tests/datatypes.xml
2010-06-08 09:33:39 UTC (rev 42446)
+++
mmbase/branches/MMBase-1_9/core/src/test/resources/org/mmbase/config/builders/tests/datatypes.xml
2010-06-08 09:52:20 UTC (rev 42447)
@@ -103,6 +103,17 @@
</db>
</field>
+
+ <field name="required_string">
+ <descriptions>
+ <description>Example of required string</description>
+ </descriptions>
+ <datatype xmlns="http://www.mmbase.org/xmlns/datatypes"; base="line">
+ <required value="true" />
+ <maxLength value="10" />
+ </datatype>
+ </field>
+
<field name="required_legacy">
<descriptions>
<description>Required by db notnull</description>
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
