From 2e7b5578166da0854f29b69b1d2f25ee102d0d85 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sun, 16 Aug 2015 12:58:14 +0000 Subject: [PATCH] Improve JCR tests git-svn-id: https://svn.argeo.org/commons/trunk@8326 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- org.argeo.server.jcr/build.properties | 4 +- .../ext/test/log4j.properties | 3 +- .../unit/AbstractJackrabbitTestCase.java | 42 +++++++++----- .../argeo/jackrabbit/unit/repository-h2.xml | 17 ------ .../argeo/jcr/unit/AbstractJcrTestCase.java | 57 ++++++++++++++----- 5 files changed, 75 insertions(+), 48 deletions(-) diff --git a/org.argeo.server.jcr/build.properties b/org.argeo.server.jcr/build.properties index fa96ec909..f132db9f9 100644 --- a/org.argeo.server.jcr/build.properties +++ b/org.argeo.server.jcr/build.properties @@ -20,4 +20,6 @@ additional.bundles = org.junit,\ org.apache.lucene,\ org.apache.tika.core,\ org.apache.tika.parsers,\ - org.argeo.security.jackrabbit + org.argeo.security.jackrabbit,\ + org.apache.commons.dbcp,\ + org.apache.commons.pool diff --git a/org.argeo.server.jcr/ext/test/log4j.properties b/org.argeo.server.jcr/ext/test/log4j.properties index ca995af8e..3d7528963 100644 --- a/org.argeo.server.jcr/ext/test/log4j.properties +++ b/org.argeo.server.jcr/ext/test/log4j.properties @@ -10,4 +10,5 @@ log4j.appender.console=org.apache.log4j.ConsoleAppender # console uses PatternLayout. log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n +#log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n +log4j.appender.console.layout.ConversionPattern=%m%n diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java b/org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java index e8fed98cb..f1e552308 100644 --- a/org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java +++ b/org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java @@ -15,28 +15,40 @@ */ package org.argeo.jackrabbit.unit; -import java.io.File; - import javax.jcr.Repository; -import org.apache.jackrabbit.core.TransientRepository; +import org.apache.commons.io.FileUtils; +import org.apache.jackrabbit.core.RepositoryImpl; +import org.apache.jackrabbit.core.config.RepositoryConfig; import org.argeo.jcr.unit.AbstractJcrTestCase; -import org.springframework.core.io.ClassPathResource; -import org.springframework.core.io.Resource; /** Factorizes configuration of an in memory transient repository */ -public abstract class AbstractJackrabbitTestCase extends - AbstractJcrTestCase { - protected File getRepositoryFile() throws Exception { - Resource res = new ClassPathResource( - "org/argeo/jackrabbit/unit/repository-memory.xml"); - return res.getFile(); - } +public abstract class AbstractJackrabbitTestCase extends AbstractJcrTestCase { + protected RepositoryImpl repositoryImpl; + + // protected File getRepositoryFile() throws Exception { + // Resource res = new ClassPathResource( + // "org/argeo/jackrabbit/unit/repository-memory.xml"); + // return res.getFile(); + // } protected Repository createRepository() throws Exception { - Repository repository = new TransientRepository(getRepositoryFile(), - getHomeDir()); - return repository; + // Repository repository = new TransientRepository(getRepositoryFile(), + // getHomeDir()); + RepositoryConfig repositoryConfig = RepositoryConfig.create( + AbstractJackrabbitTestCase.class + .getResourceAsStream("repository-memory.xml"), + getHomeDir().getAbsolutePath()); + RepositoryImpl repositoryImpl = RepositoryImpl.create(repositoryConfig); + return repositoryImpl; + } + + @Override + protected void clearRepository(Repository repository) throws Exception { + RepositoryImpl repositoryImpl = (RepositoryImpl) repository; + if (repositoryImpl != null) + repositoryImpl.shutdown(); + FileUtils.deleteDirectory(getHomeDir()); } } diff --git a/org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml b/org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml index ef3f0c426..348dc288b 100644 --- a/org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml +++ b/org.argeo.server.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml @@ -1,21 +1,4 @@ - diff --git a/org.argeo.server.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java b/org.argeo.server.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java index 530605eac..ca32f7df0 100644 --- a/org.argeo.server.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java +++ b/org.argeo.server.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java @@ -34,10 +34,13 @@ public abstract class AbstractJcrTestCase extends TestCase { private Repository repository; private Session session = null; - protected abstract File getRepositoryFile() throws Exception; +// protected abstract File getRepositoryFile() throws Exception; protected abstract Repository createRepository() throws Exception; + protected abstract void clearRepository(Repository repository) + throws Exception; + @Override protected void setUp() throws Exception { File homeDir = getHomeDir(); @@ -45,27 +48,21 @@ public abstract class AbstractJcrTestCase extends TestCase { repository = createRepository(); } - protected File getHomeDir() { - File homeDir = new File(System.getProperty("java.io.tmpdir"), - AbstractJcrTestCase.class.getSimpleName() + "-" - + System.getProperty("user.name")); - return homeDir; - } - @Override protected void tearDown() throws Exception { if (session != null) { session.logout(); - if (log.isDebugEnabled()) - log.debug("Logout session"); + if (log.isTraceEnabled()) + log.trace("Logout session"); } + clearRepository(repository); } protected Session session() { - if (session == null) { + if (session == null || !session.isLive()) { try { - if (log.isDebugEnabled()) - log.debug("Login session"); + if (log.isTraceEnabled()) + log.trace("Login session"); session = getRepository().login( new SimpleCredentials("demo", "demo".toCharArray())); } catch (Exception e) { @@ -83,7 +80,39 @@ public abstract class AbstractJcrTestCase extends TestCase { * enables children class to set an existing repository in case it is not * deleted on startup, to test migration by instance */ - protected void setRepository(Repository repository) { + public void setRepository(Repository repository) { this.repository = repository; } + + // public void logout() { + // if (session != null && session.isLive()) + // JcrUtils.logoutQuietly(session); + // } + // + // protected static TestSuite defaultTestSuite(Class + // clss) { + // String testSuiteClassName = + // "org.argeo.jackrabbit.unit.JackrabbitTestSuite"; + // try { + // Class testSuiteClass = AbstractJcrTestCase.class + // .getClassLoader().loadClass(testSuiteClassName); + // if (clss == null) { + // return (TestSuite) testSuiteClass.newInstance(); + // } else { + // return (TestSuite) testSuiteClass.getConstructor(Class.class) + // .newInstance(clss); + // } + // } catch (Exception e) { + // throw new ArgeoException("Cannot find default test suite " + // + testSuiteClassName, e); + // } + // } + + protected File getHomeDir() { + File homeDir = new File(System.getProperty("java.io.tmpdir"), + AbstractJcrTestCase.class.getSimpleName() + "-" + + System.getProperty("user.name")); + return homeDir; + } + } -- 2.30.2