Author: michiel
Date: 2010-05-18 18:25:12 +0200 (Tue, 18 May 2010)
New Revision: 42228
Added:
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/lists.xml
Modified:
mmbase/trunk/bridge/src/test/java/org/mmbase/datatypes/DataTypesTest.java
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/INDEX
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/aa.xml
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/datatypes.xml
Log:
test cases for MMB-1959
Modified:
mmbase/trunk/bridge/src/test/java/org/mmbase/datatypes/DataTypesTest.java
===================================================================
--- mmbase/trunk/bridge/src/test/java/org/mmbase/datatypes/DataTypesTest.java
2010-05-18 16:22:03 UTC (rev 42227)
+++ mmbase/trunk/bridge/src/test/java/org/mmbase/datatypes/DataTypesTest.java
2010-05-18 16:25:12 UTC (rev 42228)
@@ -443,12 +443,35 @@
assertEquals(DataType.ENFORCE_ALWAYS,
dt.getMaxLengthRestriction().getEnforceStrength());
}
+ @Test
+ public void dataTypeOfAnotherField() {
+ NodeManager aa =
MockCloudContext.getInstance().getCloud("mmbase").getNodeManager("aa");
+ NodeManager datatypes =
MockCloudContext.getInstance().getCloud("mmbase").getNodeManager("datatypes");
+ assertEquals(aa.getField("datatypesstring").getDataType(),
datatypes.getField("string").getDataType());
+ assertEquals(datatypes.getField("aaname").getDataType(),
aa.getField("name").getDataType());
+ System.out.println(aa.getField("datatypesstring") + "==" +
datatypes.getField("string"));
+ }
+
+
@Test
- public void reinitialize() {
- // doesn't work
- //DataTypes.reinitialize();
+ public void listDataTypes() {
+ NodeManager lists =
MockCloudContext.getInstance().getCloud("mmbase").getNodeManager("lists");
+ {
+ Field string = lists.getField("stringlist");
+ ListDataType dataType = (ListDataType) string.getDataType();
+ assertTrue(dataType.getItemDataType() instanceof StringDataType);
+ }
+ {
+ Field legacy = lists.getField("legacy_stringlist");
+ ListDataType dataType = (ListDataType) legacy.getDataType();
+ assertTrue("" + dataType.getItemDataType().getClass().getName(),
dataType.getItemDataType() instanceof StringDataType);
+ }
+
+
}
+
+
}
Modified:
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/INDEX
===================================================================
---
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/INDEX
2010-05-18 16:22:03 UTC (rev 42227)
+++
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/INDEX
2010-05-18 16:25:12 UTC (rev 42228)
@@ -10,3 +10,4 @@
./legacy_types.xml
./invalid_defaults.xml
./processors.xml
+./lists.xml
Modified:
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/aa.xml
===================================================================
---
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/aa.xml
2010-05-18 16:22:03 UTC (rev 42227)
+++
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/aa.xml
2010-05-18 16:25:12 UTC (rev 42228)
@@ -127,6 +127,11 @@
</db>
</field>
-->
+ <field name="datatypesstring">
+ <!-- intentionally circular -->
+ <datatype field="datatypes|string"
xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ </datatype>
+ </field>
</fieldlist>
</builder>
\ No newline at end of file
Modified:
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/datatypes.xml
===================================================================
---
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/datatypes.xml
2010-05-18 16:22:03 UTC (rev 42227)
+++
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/datatypes.xml
2010-05-18 16:25:12 UTC (rev 42228)
@@ -443,6 +443,11 @@
</datatype>
</field>
+ <field name="aaname">
+ <datatype field="aa|name" xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ </datatype>
+ </field>
+
</fieldlist>
<functionlist>
Copied:
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/lists.xml
(from rev 42227,
mmbase/branches/MMBase-1_9/core/src/test/resources/org/mmbase/config/builders/tests/lists.xml)
===================================================================
---
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/lists.xml
(rev 0)
+++
mmbase/trunk/bridge/src/test/resources/org/mmbase/config/builders/tests/lists.xml
2010-05-18 16:25:12 UTC (rev 42228)
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<builder
+ xmlns="http://www.mmbase.org/xmlns/builder";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xsi:schemaLocation="http://www.mmbase.org/xmlns/builder
+ http://www.mmbase.org/xmlns/builder.xsd";
+ name="lists" maintainer="mmbase.org" version="0" extends="object">
+ <names>
+ <singular xml:lang="en">lists</singular>
+ <plural xml:lang="en">lists</plural>
+ </names>
+
+ <descriptions>
+ <description xml:lang="nl">Builder voor het testen van de bridge
classes</description>
+ <description xml:lang="en">Builder to test the bridge classes</description>
+ </descriptions>
+
+ <fieldlist>
+ <field name="stringlist">
+ <datatype base="list" xmlns="http://www.mmbase.org/xmlns/datatypes";>
+ <property name="itemDataType" value="string" />
+ </datatype>
+ </field>
+ <field name="legacy_stringlist">
+ <db>
+ <type key="false" notnull="false" state="persistent">LIST:STRING</type>
+ </db>
+ </field>
+ </fieldlist>
+
+</builder>
\ No newline at end of file
_______________________________________________
Cvs mailing list
Cvs@lists.mmbase.org
http://lists.mmbase.org/mailman/listinfo/cvs
