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=a7a704ef230b1bde5a16f9fcc96402f7079b152c;hb=1d5afdce3e91054f07ddd3c98309c363b4cf1d46;hp=7bb8e90bc5e83c5787df9a37b42075604083b182;hpb=a473a5c7af8d33a931510dec4c93413a341da1d9;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 7bb8e90bc..a7a704ef2 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 @@ -1,5 +1,5 @@ /* - * Copyright (C) 2010 Mathieu Baudier + * Copyright (C) 2007-2012 Mathieu Baudier * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -13,33 +13,27 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - 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 { @@ -88,23 +82,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; - } - }