X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=org.argeo.cms%2Fext%2Ftest%2Forg%2Fargeo%2Fcms%2Ftabular%2FJcrTabularTest.java;h=8da6148009259b0ee41e26d52c9acab8b871599d;hb=d169026cb1939009fd90ac46a11f480cb3d803c0;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..8da614800 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
@@ -1,18 +1,3 @@
-/*
- * Copyright (C) 2007-2012 Argeo GmbH
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *         http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
 package org.argeo.cms.tabular;
 
 import java.io.InputStreamReader;
@@ -25,25 +10,27 @@ 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.api.tabular.TabularColumn;
+import org.argeo.api.tabular.TabularRow;
+import org.argeo.api.tabular.TabularRowIterator;
+import org.argeo.api.tabular.TabularWriter;
+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;
 
 public class JcrTabularTest extends AbstractJackrabbitTestCase {
 	private final static Log log = LogFactory.getLog(JcrTabularTest.class);
 
 	public void testWriteReadCsv() throws Exception {
-		session().setNamespacePrefix("argeo", ArgeoNames.ARGEO_NAMESPACE);
-		InputStreamReader reader = new InputStreamReader(getClass()
-				.getResourceAsStream("/org/argeo/node/node.cnd"));
+		// session().setNamespacePrefix("argeo", ArgeoNames.ARGEO_NAMESPACE);
+		InputStreamReader reader = new InputStreamReader(getClass().getResourceAsStream("/org/argeo/api/ldap.cnd"));
 		CndImporter.registerNodeTypes(reader, session());
 		reader.close();
+		reader = new InputStreamReader(getClass().getResourceAsStream("/org/argeo/cms/argeo.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;
@@ -54,10 +41,8 @@ public class JcrTabularTest extends AbstractJackrabbitTestCase {
 		for (int i = 0; i < columnCount; i++) {
 			header.add(new TabularColumn("col" + i, PropertyType.STRING));
 		}
-		Node tableNode = session().getRootNode().addNode("table",
-				ArgeoTypes.ARGEO_TABLE);
-		TabularWriter writer = new JcrTabularWriter(tableNode, header,
-				ArgeoTypes.ARGEO_CSV);
+		Node tableNode = session().getRootNode().addNode("table", ArgeoTypes.ARGEO_TABLE);
+		TabularWriter writer = new JcrTabularWriter(tableNode, header, ArgeoTypes.ARGEO_CSV);
 		for (int i = 0; i < rowCount; i++) {
 			List<Object> objs = new ArrayList<Object>();
 			for (int j = 0; j < columnCount; j++) {
@@ -69,8 +54,7 @@ public class JcrTabularTest extends AbstractJackrabbitTestCase {
 		session().save();
 
 		if (log.isDebugEnabled())
-			log.debug("Wrote tabular content " + rowCount + " rows, "
-					+ columnCount + " columns");
+			log.debug("Wrote tabular content " + rowCount + " rows, " + columnCount + " columns");
 		// read
 		TabularRowIterator rowIt = new JcrTabularRowIterator(tableNode);
 		Long count = 0l;
@@ -81,7 +65,6 @@ public class JcrTabularTest extends AbstractJackrabbitTestCase {
 		}
 		assertEquals(rowCount, count);
 		if (log.isDebugEnabled())
-			log.debug("Read tabular content " + rowCount + " rows, "
-					+ columnCount + " columns");
+			log.debug("Read tabular content " + rowCount + " rows, " + columnCount + " columns");
 	}
 }