Fix build for Java 11

[lgpl/argeo-commons.git] / org.argeo.cms / ext / test / org / argeo / cms / tabular / JcrTabularTest.java

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 0d8a8ce5f9530b0adef00cb4f72329a03673df1c..112562c3fd68f0f061f83a1d41bf47f3f6d43cda 100644 (file)
--- 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;