X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=server%2Fruntime%2Forg.argeo.server.jcr%2Fsrc%2Ftest%2Fjava%2Forg%2Fargeo%2Fjcr%2Ftabular%2FJcrTabularTest.java;h=672c8742076750f48b5f8df18d2a476f120fd921;hb=18c8ea2376fe85245d50a98ea7c0a95a51b17370;hp=f91917d98f8511369f0302483c9f36ef6a85b171;hpb=5b8a94ea4b5ecba326ebd3f755b3e2c2f1d94310;p=lgpl%2Fargeo-commons.git

diff --git a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/tabular/JcrTabularTest.java b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/tabular/JcrTabularTest.java
index f91917d98..672c87420 100644
--- a/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/tabular/JcrTabularTest.java
+++ b/server/runtime/org.argeo.server.jcr/src/test/java/org/argeo/jcr/tabular/JcrTabularTest.java
@@ -16,30 +16,25 @@
 
 package org.argeo.jcr.tabular;
 
-import java.io.File;
 import java.io.InputStreamReader;
 import java.util.ArrayList;
 import java.util.List;
 
 import javax.jcr.Node;
 import javax.jcr.PropertyType;
-import javax.jcr.Repository;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.apache.jackrabbit.commons.cnd.CndImporter;
-import org.apache.jackrabbit.core.TransientRepository;
+import org.argeo.jcr.AbstractInternalJackrabbitTestCase;
 import org.argeo.jcr.ArgeoNames;
 import org.argeo.jcr.ArgeoTypes;
-import org.argeo.jcr.unit.AbstractJcrTestCase;
 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.springframework.core.io.ClassPathResource;
-import org.springframework.core.io.Resource;
 
-public class JcrTabularTest extends AbstractJcrTestCase {
+public class JcrTabularTest extends AbstractInternalJackrabbitTestCase {
 	private final static Log log = LogFactory.getLog(JcrTabularTest.class);
 
 	public void testWriteReadCsv() throws Exception {
@@ -51,7 +46,7 @@ public class JcrTabularTest extends AbstractJcrTestCase {
 
 		// write
 		Integer columnCount = 15;
-		Long rowCount = 10000l;
+		Long rowCount = 1000l;
 		String stringValue = "test, \ntest";
 
 		List<TabularColumn> header = new ArrayList<TabularColumn>();
@@ -67,7 +62,7 @@ public class JcrTabularTest extends AbstractJcrTestCase {
 			for (int j = 0; j < columnCount; j++) {
 				objs.add(stringValue);
 			}
-			writer.appendRow(objs);
+			writer.appendRow(objs.toArray());
 		}
 		writer.close();
 		session().save();
@@ -88,23 +83,4 @@ public class JcrTabularTest extends AbstractJcrTestCase {
 			log.debug("Read tabular content " + rowCount + " rows, "
 					+ columnCount + " columns");
 	}
-
-	protected File getRepositoryFile() throws Exception {
-		Resource res = new ClassPathResource(
-				"org/argeo/server/jcr/repository-h2.xml");
-		return res.getFile();
-	}
-
-	protected Repository createRepository() throws Exception {
-		// JackrabbitContainer repo = new JackrabbitContainer();
-		// repo.setHomeDirectory(getHomeDir());
-		// repo.setConfiguration(new FileSystemResource(
-		// getRepositoryFile()));
-		// repo.setInMemory(true);
-		// repo.set
-		Repository repository = new TransientRepository(getRepositoryFile(),
-				getHomeDir());
-		return repository;
-	}
-
 }