You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2020/03/26 02:41:28 UTC
[james-project] 06/16: JAMES-3088 Migrate JpaUsersRepositoryTest
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit d9944148fb5f473cbe733e6cd6f4a18aba37b08b
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Thu Mar 5 11:55:36 2020 +0700
JAMES-3088 Migrate JpaUsersRepositoryTest
---
.../james/user/jpa/JpaUsersRepositoryTest.java | 52 +++++++++++++++++-----
1 file changed, 42 insertions(+), 10 deletions(-)
diff --git a/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java b/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java
index 6c44c6e..b912d30 100644
--- a/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java
+++ b/server/data/data-jpa/src/test/java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java
@@ -20,33 +20,65 @@ package org.apache.james.user.jpa;
import org.apache.commons.configuration2.BaseHierarchicalConfiguration;
import org.apache.james.backends.jpa.JpaTestCluster;
+import org.apache.james.domainlist.api.DomainList;
import org.apache.james.user.jpa.model.JPAUser;
import org.apache.james.user.lib.AbstractUsersRepository;
import org.apache.james.user.lib.AbstractUsersRepositoryTest;
import org.junit.jupiter.api.AfterEach;
import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Nested;
+import org.junit.jupiter.api.extension.RegisterExtension;
-class JpaUsersRepositoryTest extends AbstractUsersRepositoryTest {
+class JpaUsersRepositoryTest {
- static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAUser.class);
+ private static final JpaTestCluster JPA_TEST_CLUSTER = JpaTestCluster.create(JPAUser.class);
- @BeforeEach
- void setup() throws Exception {
- super.setUp();
+ @Nested
+ class WhenEnableVirtualHosting implements AbstractUsersRepositoryTest.WithVirtualHostingContract {
+ @RegisterExtension
+ UserRepositoryExtension extension = UserRepositoryExtension.withVirtualHost();
+
+ private JPAUsersRepository usersRepository;
+
+ @BeforeEach
+ void setUp(TestSystem testSystem) throws Exception {
+ usersRepository = getUsersRepository(testSystem.getDomainList(), extension.isSupportVirtualHosting());
+ }
+
+ @Override
+ public AbstractUsersRepository testee() {
+ return usersRepository;
+ }
+ }
+
+ @Nested
+ class WhenDisableVirtualHosting implements AbstractUsersRepositoryTest.WithOutVirtualHostingContract {
+ @RegisterExtension
+ UserRepositoryExtension extension = UserRepositoryExtension.withoutVirtualHosting();
+
+ private JPAUsersRepository usersRepository;
+
+ @BeforeEach
+ void setUp(TestSystem testSystem) throws Exception {
+ usersRepository = getUsersRepository(testSystem.getDomainList(), extension.isSupportVirtualHosting());
+ }
+
+ @Override
+ public AbstractUsersRepository testee() {
+ return usersRepository;
+ }
}
@AfterEach
- void teardown() throws Exception {
- super.tearDown();
+ void tearDown() {
JPA_TEST_CLUSTER.clear("JAMES_USER");
}
- @Override
- protected AbstractUsersRepository getUsersRepository() throws Exception {
+ private static JPAUsersRepository getUsersRepository(DomainList domainList, boolean enableVirtualHosting) throws Exception {
JPAUsersRepository repos = new JPAUsersRepository(domainList);
repos.setEntityManagerFactory(JPA_TEST_CLUSTER.getEntityManagerFactory());
BaseHierarchicalConfiguration configuration = new BaseHierarchicalConfiguration();
- configuration.addProperty("enableVirtualHosting", "true");
+ configuration.addProperty("enableVirtualHosting", String.valueOf(enableVirtualHosting));
repos.configure(configuration);
return repos;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org