X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fext%2Ftest%2Forg%2Fargeo%2Fcms%2Ftabular%2FJcrTabularTest.java;h=112562c3fd68f0f061f83a1d41bf47f3f6d43cda;hb=7b70ef11fc56e519ddd5394b25e00bd4ff0c3a9d;hp=0d8a8ce5f9530b0adef00cb4f72329a03673df1c;hpb=61780b581925666edd4bd7743a00dca7170f1d35;p=lgpl%2Fargeo-commons.git

diff --git a/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java b/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java
index 0d8a8ce5f..112562c3f 100644
--- a/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java
+++ b/org.argeo.cms/ext/test/org/argeo/cms/tabular/JcrTabularTest.java
@@ -25,15 +25,13 @@ import javax.jcr.PropertyType;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.commons.cnd.CndImporter;
-import org.argeo.cms.tabular.JcrTabularRowIterator;
-import org.argeo.cms.tabular.JcrTabularWriter;
+import org.argeo.cms.ArgeoNames;
+import org.argeo.cms.ArgeoTypes;
 import org.argeo.jackrabbit.unit.AbstractJackrabbitTestCase;
-import org.argeo.node.ArgeoNames;
-import org.argeo.node.ArgeoTypes;
-import org.argeo.util.tabular.TabularColumn;
-import org.argeo.util.tabular.TabularRow;
-import org.argeo.util.tabular.TabularRowIterator;
-import org.argeo.util.tabular.TabularWriter;
+import org.argeo.node.tabular.TabularColumn;
+import org.argeo.node.tabular.TabularRow;
+import org.argeo.node.tabular.TabularRowIterator;
+import org.argeo.node.tabular.TabularWriter;
 
 public class JcrTabularTest extends AbstractJackrabbitTestCase {
 	private final static Log log = LogFactory.getLog(JcrTabularTest.class);
@@ -44,6 +42,10 @@ public class JcrTabularTest extends AbstractJackrabbitTestCase {
 				.getResourceAsStream("/org/argeo/node/node.cnd"));
 		CndImporter.registerNodeTypes(reader, session());
 		reader.close();
+		reader = new InputStreamReader(getClass()
+				.getResourceAsStream("/org/argeo/cms/cms.cnd"));
+		CndImporter.registerNodeTypes(reader, session());
+		reader.close();
 
 		// write
 		Integer columnCount = 15;