From 6457e820f3379a9f26986338f4364c40889b51b6 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Sat, 12 Feb 2022 11:23:08 +0100 Subject: [PATCH] Remove JUnit dependency --- .../unit/AbstractJackrabbitTestCase.java | 51 -------- .../src/org/argeo/jackrabbit/unit/jaas.config | 7 -- .../argeo/jackrabbit/unit/package-info.java | 2 - .../argeo/jackrabbit/unit/repository-h2.xml | 81 ------------ .../jackrabbit/unit/repository-memory.xml | 72 ----------- .../argeo/jcr/unit/AbstractJcrTestCase.java | 115 ------------------ .../src/org/argeo/jcr/unit/package-info.java | 2 - 7 files changed, 330 deletions(-) delete mode 100644 jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java delete mode 100644 jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/jaas.config delete mode 100644 jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/package-info.java delete mode 100644 jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml delete mode 100644 jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/repository-memory.xml delete mode 100644 jcr/org.argeo.cms.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java delete mode 100644 jcr/org.argeo.cms.jcr/src/org/argeo/jcr/unit/package-info.java diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java b/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java deleted file mode 100644 index f65432eb7..000000000 --- a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/AbstractJackrabbitTestCase.java +++ /dev/null @@ -1,51 +0,0 @@ -package org.argeo.jackrabbit.unit; - -import java.net.URL; - -import javax.jcr.Repository; - -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; - -/** Factorizes configuration of an in memory transient repository */ -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(); - // } - - public AbstractJackrabbitTestCase() { - URL url = AbstractJackrabbitTestCase.class.getResource("jaas.config"); - assert url != null; - System.setProperty("java.security.auth.login.config", url.toString()); - } - - protected Repository createRepository() throws Exception { - // Repository repository = new TransientRepository(getRepositoryFile(), - // getHomeDir()); - RepositoryConfig repositoryConfig = RepositoryConfig.create( - AbstractJackrabbitTestCase.class - .getResourceAsStream(getRepositoryConfigResource()), - getHomeDir().getAbsolutePath()); - RepositoryImpl repositoryImpl = RepositoryImpl.create(repositoryConfig); - return repositoryImpl; - } - - protected String getRepositoryConfigResource() { - return "repository-memory.xml"; - } - - @Override - protected void clearRepository(Repository repository) throws Exception { - RepositoryImpl repositoryImpl = (RepositoryImpl) repository; - if (repositoryImpl != null) - repositoryImpl.shutdown(); - FileUtils.deleteDirectory(getHomeDir()); - } - -} diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/jaas.config b/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/jaas.config deleted file mode 100644 index 0313f91e5..000000000 --- a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/jaas.config +++ /dev/null @@ -1,7 +0,0 @@ -TEST_JACKRABBIT_ADMIN { - org.argeo.cms.auth.DataAdminLoginModule requisite; -}; - -Jackrabbit { - org.argeo.security.jackrabbit.SystemJackrabbitLoginModule requisite; -}; diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/package-info.java b/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/package-info.java deleted file mode 100644 index 3b6143b34..000000000 --- a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** Helpers for unit tests with Jackrabbit repositories. */ -package org.argeo.jackrabbit.unit; \ No newline at end of file diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml b/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml deleted file mode 100644 index 348dc288b..000000000 --- a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/repository-h2.xml +++ /dev/null @@ -1,81 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/repository-memory.xml b/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/repository-memory.xml deleted file mode 100644 index 839542417..000000000 --- a/jcr/org.argeo.cms.jcr/src/org/argeo/jackrabbit/unit/repository-memory.xml +++ /dev/null @@ -1,72 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java b/jcr/org.argeo.cms.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java deleted file mode 100644 index 84e8cd31a..000000000 --- a/jcr/org.argeo.cms.jcr/src/org/argeo/jcr/unit/AbstractJcrTestCase.java +++ /dev/null @@ -1,115 +0,0 @@ -package org.argeo.jcr.unit; - -import java.io.File; -import java.security.AccessController; -import java.security.PrivilegedAction; - -import javax.jcr.Repository; -import javax.jcr.RepositoryException; -import javax.jcr.Session; -import javax.jcr.SimpleCredentials; -import javax.security.auth.Subject; -import javax.security.auth.login.LoginContext; -import javax.security.auth.login.LoginException; - -import org.apache.commons.io.FileUtils; -import org.argeo.api.cms.CmsLog; -import org.argeo.jcr.JcrException; - -import junit.framework.TestCase; - -/** Base for unit tests with a JCR repository. */ -public abstract class AbstractJcrTestCase extends TestCase { - private final static CmsLog log = CmsLog.getLog(AbstractJcrTestCase.class); - - private Repository repository; - private Session session = null; - - public final static String LOGIN_CONTEXT_TEST_SYSTEM = "TEST_JACKRABBIT_ADMIN"; - - // 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(); - FileUtils.deleteDirectory(homeDir); - repository = createRepository(); - } - - @Override - protected void tearDown() throws Exception { - if (session != null) { - session.logout(); - if (log.isTraceEnabled()) - log.trace("Logout session"); - } - clearRepository(repository); - } - - protected Session session() { - if (session != null && session.isLive()) - return session; - Session session; - if (getLoginContext() != null) { - LoginContext lc; - try { - lc = new LoginContext(getLoginContext()); - lc.login(); - } catch (LoginException e) { - throw new IllegalStateException("JAAS login failed", e); - } - session = Subject.doAs(lc.getSubject(), new PrivilegedAction() { - - @Override - public Session run() { - return login(); - } - - }); - } else - session = login(); - this.session = session; - return this.session; - } - - protected String getLoginContext() { - return null; - } - - protected Session login() { - try { - if (log.isTraceEnabled()) - log.trace("Login session"); - Subject subject = Subject.getSubject(AccessController.getContext()); - if (subject != null) - return getRepository().login(); - else - return getRepository().login(new SimpleCredentials("demo", "demo".toCharArray())); - } catch (RepositoryException e) { - throw new JcrException("Cannot login to repository", e); - } - } - - protected Repository getRepository() { - return repository; - } - - /** - * enables children class to set an existing repository in case it is not - * deleted on startup, to test migration by instance - */ - public void setRepository(Repository repository) { - this.repository = repository; - } - - protected File getHomeDir() { - File homeDir = new File(System.getProperty("java.io.tmpdir"), - AbstractJcrTestCase.class.getSimpleName() + "-" + System.getProperty("user.name")); - return homeDir; - } - -} diff --git a/jcr/org.argeo.cms.jcr/src/org/argeo/jcr/unit/package-info.java b/jcr/org.argeo.cms.jcr/src/org/argeo/jcr/unit/package-info.java deleted file mode 100644 index c6e741524..000000000 --- a/jcr/org.argeo.cms.jcr/src/org/argeo/jcr/unit/package-info.java +++ /dev/null @@ -1,2 +0,0 @@ -/** Helpers for unit tests with JCR repositories. */ -package org.argeo.jcr.unit; \ No newline at end of file -- 2.30.2