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 154148decba06b2d60b4ef72620bf8aa6e70e6b4
Author: Tran Tien Duc <dt...@linagora.com>
AuthorDate: Thu Mar 5 12:33:13 2020 +0700

    JAMES-3088 s/AbstractUsersRepositoryTest/AbstractUsersRepositoryContract
---
 .../james/user/cassandra/CassandraUsersRepositoryTest.java     |  6 +++---
 .../java/org/apache/james/user/jpa/JpaUsersRepositoryTest.java |  6 +++---
 ...epositoryTest.java => AbstractUsersRepositoryContract.java} | 10 +++++-----
 .../apache/james/user/memory/MemoryUsersRepositoryTest.java    |  6 +++---
 4 files changed, 14 insertions(+), 14 deletions(-)

diff --git 
a/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java
 
b/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java
index c039679..6c2adee 100644
--- 
a/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java
+++ 
b/server/data/data-cassandra/src/test/java/org/apache/james/user/cassandra/CassandraUsersRepositoryTest.java
@@ -23,7 +23,7 @@ import 
org.apache.commons.configuration2.BaseHierarchicalConfiguration;
 import org.apache.james.backends.cassandra.CassandraClusterExtension;
 import org.apache.james.domainlist.api.DomainList;
 import org.apache.james.user.lib.AbstractUsersRepository;
-import org.apache.james.user.lib.AbstractUsersRepositoryTest;
+import org.apache.james.user.lib.AbstractUsersRepositoryContract;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.extension.RegisterExtension;
@@ -34,7 +34,7 @@ class CassandraUsersRepositoryTest {
     static CassandraClusterExtension cassandraCluster = new 
CassandraClusterExtension(CassandraUsersRepositoryModule.MODULE);
 
     @Nested
-    class WhenEnableVirtualHosting implements 
AbstractUsersRepositoryTest.WithVirtualHostingContract {
+    class WhenEnableVirtualHosting implements 
AbstractUsersRepositoryContract.WithVirtualHostingContract {
         @RegisterExtension
         UserRepositoryExtension extension = 
UserRepositoryExtension.withVirtualHost();
 
@@ -52,7 +52,7 @@ class CassandraUsersRepositoryTest {
     }
 
     @Nested
-    class WhenDisableVirtualHosting implements 
AbstractUsersRepositoryTest.WithOutVirtualHostingContract {
+    class WhenDisableVirtualHosting implements 
AbstractUsersRepositoryContract.WithOutVirtualHostingContract {
         @RegisterExtension
         UserRepositoryExtension extension = 
UserRepositoryExtension.withoutVirtualHosting();
 
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 b912d30..02a2ebb 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
@@ -23,7 +23,7 @@ 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.apache.james.user.lib.AbstractUsersRepositoryContract;
 import org.junit.jupiter.api.AfterEach;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
@@ -34,7 +34,7 @@ class JpaUsersRepositoryTest {
     private static final JpaTestCluster JPA_TEST_CLUSTER = 
JpaTestCluster.create(JPAUser.class);
 
     @Nested
-    class WhenEnableVirtualHosting implements 
AbstractUsersRepositoryTest.WithVirtualHostingContract {
+    class WhenEnableVirtualHosting implements 
AbstractUsersRepositoryContract.WithVirtualHostingContract {
         @RegisterExtension
         UserRepositoryExtension extension = 
UserRepositoryExtension.withVirtualHost();
 
@@ -52,7 +52,7 @@ class JpaUsersRepositoryTest {
     }
 
     @Nested
-    class WhenDisableVirtualHosting implements 
AbstractUsersRepositoryTest.WithOutVirtualHostingContract {
+    class WhenDisableVirtualHosting implements 
AbstractUsersRepositoryContract.WithOutVirtualHostingContract {
         @RegisterExtension
         UserRepositoryExtension extension = 
UserRepositoryExtension.withoutVirtualHosting();
 
diff --git 
a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
 
b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryContract.java
similarity index 99%
rename from 
server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
rename to 
server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryContract.java
index 93a20a8..6c0fd3b 100644
--- 
a/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryTest.java
+++ 
b/server/data/data-library/src/test/java/org/apache/james/user/lib/AbstractUsersRepositoryContract.java
@@ -45,7 +45,7 @@ import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.Arguments;
 import org.junit.jupiter.params.provider.MethodSource;
 
-public interface AbstractUsersRepositoryTest {
+public interface AbstractUsersRepositoryContract {
 
     class UserRepositoryExtension implements BeforeEachCallback, 
ParameterResolver {
 
@@ -107,8 +107,8 @@ public interface AbstractUsersRepositoryTest {
             user2 = toUsername("username2");
             user3 = toUsername("username3");
             user1CaseVariation = toUsername("uSeRnaMe");
-            admin = toUsername("testSystem.admin");
-            adminCaseVariation = toUsername("testSystem.admin");
+            admin = toUsername("admin");
+            adminCaseVariation = toUsername("admin");
         }
 
         private Username toUsername(String login) {
@@ -124,7 +124,7 @@ public interface AbstractUsersRepositoryTest {
         }
     }
 
-    interface WithVirtualHostingContract extends AbstractUsersRepositoryTest {
+    interface WithVirtualHostingContract extends 
AbstractUsersRepositoryContract {
 
         @Test
         default void 
testShouldReturnTrueWhenAUserHasACorrectPasswordAndOtherCaseInDomain(TestSystem 
testSystem) throws Exception {
@@ -163,7 +163,7 @@ public interface AbstractUsersRepositoryTest {
         }
     }
 
-    interface WithOutVirtualHostingContract extends 
AbstractUsersRepositoryTest {
+    interface WithOutVirtualHostingContract extends 
AbstractUsersRepositoryContract {
         @Test
         default void 
nonVirtualHostedUsersRepositoryShouldUseLocalPartAsUsername() throws Exception {
             // Some implementations do not support changing virtual hosting 
value
diff --git 
a/server/data/data-memory/src/test/java/org/apache/james/user/memory/MemoryUsersRepositoryTest.java
 
b/server/data/data-memory/src/test/java/org/apache/james/user/memory/MemoryUsersRepositoryTest.java
index 51cc61e..cbae5da 100644
--- 
a/server/data/data-memory/src/test/java/org/apache/james/user/memory/MemoryUsersRepositoryTest.java
+++ 
b/server/data/data-memory/src/test/java/org/apache/james/user/memory/MemoryUsersRepositoryTest.java
@@ -28,7 +28,7 @@ import org.apache.james.dnsservice.api.InMemoryDNSService;
 import org.apache.james.domainlist.memory.MemoryDomainList;
 import org.apache.james.user.api.UsersRepositoryException;
 import org.apache.james.user.lib.AbstractUsersRepository;
-import org.apache.james.user.lib.AbstractUsersRepositoryTest;
+import org.apache.james.user.lib.AbstractUsersRepositoryContract;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
@@ -37,7 +37,7 @@ import org.junit.jupiter.api.extension.RegisterExtension;
 class MemoryUsersRepositoryTest {
 
     @Nested
-    class WhenEnableVirtualHosting implements 
AbstractUsersRepositoryTest.WithVirtualHostingContract {
+    class WhenEnableVirtualHosting implements 
AbstractUsersRepositoryContract.WithVirtualHostingContract {
         @RegisterExtension
         UserRepositoryExtension extension = 
UserRepositoryExtension.withVirtualHost();
 
@@ -90,7 +90,7 @@ class MemoryUsersRepositoryTest {
     }
 
     @Nested
-    class WhenDisableVirtualHosting implements 
AbstractUsersRepositoryTest.WithOutVirtualHostingContract {
+    class WhenDisableVirtualHosting implements 
AbstractUsersRepositoryContract.WithOutVirtualHostingContract {
         @RegisterExtension
         UserRepositoryExtension extension = 
UserRepositoryExtension.withoutVirtualHosting();
 


---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org

Reply via email to