[REFACTORING] UsersRepositoryContract - Fix grammar
diff --git a/server/data/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryContract.java b/server/data/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryContract.java
index eabe6db..8384fdd 100644
--- a/server/data/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryContract.java
+++ b/server/data/data-library/src/test/java/org/apache/james/user/lib/UsersRepositoryContract.java
@@ -34,6 +34,7 @@
import org.apache.james.domainlist.api.mock.SimpleDomainList;
import org.apache.james.user.api.AlreadyExistInUsersRepositoryException;
import org.apache.james.user.api.InvalidUsernameException;
+import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
import org.apache.james.user.api.model.User;
import org.apache.james.user.lib.model.Algorithm;
@@ -53,15 +54,12 @@
class UserRepositoryExtension implements BeforeEachCallback, ParameterResolver {
- private static final boolean ENABLE_VIRTUAL_HOSTING = true;
- private static final boolean DISABLE_VIRTUAL_HOSTING = !ENABLE_VIRTUAL_HOSTING;
-
public static UserRepositoryExtension withVirtualHost() {
- return new UserRepositoryExtension(ENABLE_VIRTUAL_HOSTING);
+ return new UserRepositoryExtension(true);
}
public static UserRepositoryExtension withoutVirtualHosting() {
- return new UserRepositoryExtension(DISABLE_VIRTUAL_HOSTING);
+ return new UserRepositoryExtension(false);
}
private final boolean supportVirtualHosting;
@@ -93,7 +91,7 @@
class TestSystem {
static final Domain DOMAIN = Domain.of("james.org");
- static final Domain UNKNOW_DOMAIN = Domain.of("unknown.org");
+ static final Domain UNKNOWN_DOMAIN = Domain.of("unknown.org");
private final boolean supportVirtualHosting;
private final SimpleDomainList domainList;
@@ -103,7 +101,7 @@
private final Username user3;
private final Username admin;
private final Username adminCaseVariation;
- private final Username userWithUnknowDomain;
+ private final Username userWithUnknownDomain;
private final Username invalidUsername;
TestSystem(boolean supportVirtualHosting) throws Exception {
@@ -116,7 +114,7 @@
user1CaseVariation = toUsername("uSeRnaMe");
admin = toUsername("admin");
adminCaseVariation = toUsername("adMin");
- userWithUnknowDomain = toUsername("unknown", UNKNOW_DOMAIN);
+ userWithUnknownDomain = toUsername("unknown", UNKNOWN_DOMAIN);
invalidUsername = toUsername("userContains)*(");
}
@@ -140,8 +138,8 @@
return admin;
}
- public Username getUserWithUnknowDomain() {
- return userWithUnknowDomain;
+ public Username getUserWithUnknownDomain() {
+ return userWithUnknownDomain;
}
}
@@ -169,7 +167,7 @@
}
@Test
- default void isAdministratorShouldBeCaseInsentive(TestSystem testSystem) throws Exception {
+ default void isAdministratorShouldBeCaseInsensitive(TestSystem testSystem) throws Exception {
testee().setAdministratorId(Optional.of(testSystem.admin));
assertThat(testee().isAdministrator(testSystem.adminCaseVariation))
.isTrue();
@@ -255,14 +253,14 @@
}
@Test
- default void containsShouldBeCaseInsentive(TestSystem testSystem) throws UsersRepositoryException {
+ default void containsShouldBeCaseInsensitive(TestSystem testSystem) throws UsersRepositoryException {
testee().addUser(testSystem.user1CaseVariation, "password2");
assertThat(testee().contains(testSystem.user1)).isTrue();
}
@Test
- default void containsShouldBeCaseInsentiveWhenOriginalValueLowerCased(TestSystem testSystem) throws UsersRepositoryException {
+ default void containsShouldBeCaseInsensitiveWhenOriginalValueLowerCased(TestSystem testSystem) throws UsersRepositoryException {
testee().addUser(testSystem.user1, "password2");
assertThat(testee().contains(testSystem.user1CaseVariation)).isTrue();
@@ -294,7 +292,7 @@
}
@Test
- default void removeUserShouldBeCaseInsentiveOnCaseVariationUser(TestSystem testSystem) throws UsersRepositoryException {
+ default void removeUserShouldBeCaseInsensitiveOnCaseVariationUser(TestSystem testSystem) throws UsersRepositoryException {
testee().addUser(testSystem.user1CaseVariation, "password2");
testee().removeUser(testSystem.user1);
@@ -305,7 +303,7 @@
}
@Test
- default void removeUserShouldBeCaseInsentive(TestSystem testSystem) throws UsersRepositoryException {
+ default void removeUserShouldBeCaseInsensitive(TestSystem testSystem) throws UsersRepositoryException {
testee().addUser(testSystem.user1, "password2");
testee().removeUser(testSystem.user1CaseVariation);
@@ -316,7 +314,7 @@
}
@Test
- default void getUserByNameShouldBeCaseInsentive(TestSystem testSystem) throws UsersRepositoryException {
+ default void getUserByNameShouldBeCaseInsensitive(TestSystem testSystem) throws UsersRepositoryException {
testee().addUser(testSystem.user1, "password2");
assertThat(testee().getUserByName(testSystem.user1CaseVariation).getUserName())
@@ -333,7 +331,7 @@
@Test
- default void testShouldBeCaseInsentiveOnCaseVariationUser(TestSystem testSystem) throws UsersRepositoryException {
+ default void testShouldBeCaseInsensitiveOnCaseVariationUser(TestSystem testSystem) throws UsersRepositoryException {
String password = "password2";
testee().addUser(testSystem.user1CaseVariation, password);
@@ -342,7 +340,7 @@
}
@Test
- default void testShouldBeCaseInsentive(TestSystem testSystem) throws UsersRepositoryException {
+ default void testShouldBeCaseInsensitive(TestSystem testSystem) throws UsersRepositoryException {
String password = "password2";
testee().addUser(testSystem.user1, password);
@@ -552,7 +550,7 @@
@Test
default void addUserShouldThrowWhenUserDoesNotBelongToDomainList(TestSystem testSystem) {
- assertThatThrownBy(() -> testee().addUser(testSystem.userWithUnknowDomain, "password"))
+ assertThatThrownBy(() -> testee().addUser(testSystem.userWithUnknownDomain, "password"))
.isInstanceOf(InvalidUsernameException.class)
.hasMessage("Domain does not exist in DomainList");
}
@@ -566,7 +564,7 @@
@Test
default void updateUserShouldThrowWhenUserDoesNotBelongToDomainList(TestSystem testSystem) {
- assertThatThrownBy(() -> testee().updateUser(new DefaultUser(testSystem.userWithUnknowDomain, Algorithm.DEFAULT_FACTORY.of("hasAlg"))))
+ assertThatThrownBy(() -> testee().updateUser(new DefaultUser(testSystem.userWithUnknownDomain, Algorithm.DEFAULT_FACTORY.of("hasAlg"))))
.isInstanceOf(InvalidUsernameException.class)
.hasMessage("Domain does not exist in DomainList");
}
@@ -579,7 +577,7 @@
@Test
default void removeUserShouldThrowWhenUserDoesNotBelongToDomainList(TestSystem testSystem) {
- assertThatThrownBy(() -> testee().removeUser(testSystem.userWithUnknowDomain))
+ assertThatThrownBy(() -> testee().removeUser(testSystem.userWithUnknownDomain))
.isInstanceOf(InvalidUsernameException.class)
.hasMessage("Domain does not exist in DomainList");
}
@@ -595,25 +593,25 @@
@Test
default void getUserByNameShouldNotThrowWhenUserDoesNotBelongToDomainList(TestSystem testSystem) {
- assertThatCode(() -> testee().getUserByName(testSystem.userWithUnknowDomain))
+ assertThatCode(() -> testee().getUserByName(testSystem.userWithUnknownDomain))
.doesNotThrowAnyException();
}
@Test
default void containsShouldNotThrowWhenUserDoesNotBelongToDomainList(TestSystem testSystem) {
- assertThatCode(() -> testee().contains(testSystem.userWithUnknowDomain))
+ assertThatCode(() -> testee().contains(testSystem.userWithUnknownDomain))
.doesNotThrowAnyException();
}
@Test
default void testShouldNotThrowWhenUserDoesNotBelongToDomainList(TestSystem testSystem) {
- assertThatCode(() -> testee().test(testSystem.userWithUnknowDomain, "password"))
+ assertThatCode(() -> testee().test(testSystem.userWithUnknownDomain, "password"))
.doesNotThrowAnyException();
}
@Test
default void isAdministratorShouldThrowWhenUserDoesNotBelongToDomainList(TestSystem testSystem) {
- assertThatThrownBy(() -> testee().isAdministrator(testSystem.userWithUnknowDomain))
+ assertThatThrownBy(() -> testee().isAdministrator(testSystem.userWithUnknownDomain))
.isInstanceOf(InvalidUsernameException.class)
.hasMessage("Domain does not exist in DomainList");
}
@@ -653,7 +651,7 @@
@Test
default void assertDomainPartValidShouldThrowWhenDomainPartIsNotManaged(TestSystem testSystem) {
- assertThatThrownBy(() -> testee().assertDomainPartValid(testSystem.userWithUnknowDomain))
+ assertThatThrownBy(() -> testee().assertDomainPartValid(testSystem.userWithUnknownDomain))
.isInstanceOf(InvalidUsernameException.class)
.hasMessage("Domain does not exist in DomainList");
}
