You are viewing a plain text version of this content. The canonical link for it is here.
Posted to notifications@james.apache.org by bt...@apache.org on 2021/02/09 04:29:34 UTC
[james-project] 06/33: [REFACTORING] Get rid of some JUNIT 4 usages
in mailbox-adapter tests
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 9df470a1bfc718988a3c19a8392245abdd6f82df
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sat Feb 6 10:06:47 2021 +0700
[REFACTORING] Get rid of some JUNIT 4 usages in mailbox-adapter tests
---
.../mailbox/UserRepositoryAuthenticatorTest.java | 27 +++++++++-------------
.../mailbox/UserRepositoryAuthorizatorTest.java | 27 +++++++++-------------
2 files changed, 22 insertions(+), 32 deletions(-)
diff --git a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/UserRepositoryAuthenticatorTest.java b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/UserRepositoryAuthenticatorTest.java
index 60208bd..7cf075e 100644
--- a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/UserRepositoryAuthenticatorTest.java
+++ b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/UserRepositoryAuthenticatorTest.java
@@ -20,6 +20,7 @@
package org.apache.james.adapter.mailbox;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -27,10 +28,8 @@ import org.apache.james.core.Username;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class UserRepositoryAuthenticatorTest {
@@ -41,43 +40,39 @@ public class UserRepositoryAuthenticatorTest {
private UsersRepository usersRepository;
private UserRepositoryAuthenticator testee;
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
- @Before
- public void setUp() throws Exception {
+ @BeforeEach
+ void setUp() {
usersRepository = mock(UsersRepository.class);
testee = new UserRepositoryAuthenticator(usersRepository);
}
@Test
- public void isAuthenticShouldReturnTrueWhenGoodLoginPassword() throws Exception {
+ void isAuthenticShouldReturnTrueWhenGoodLoginPassword() throws Exception {
when(usersRepository.test(USER, PASSWORD)).thenReturn(true);
assertThat(testee.isAuthentic(USER, PASSWORD)).isTrue();
}
@Test
- public void isAuthenticShouldReturnFalseWhenWrongPassword() throws Exception {
+ void isAuthenticShouldReturnFalseWhenWrongPassword() throws Exception {
when(usersRepository.test(USER, BAD_PASSWORD)).thenReturn(false);
assertThat(testee.isAuthentic(USER, BAD_PASSWORD)).isFalse();
}
@Test
- public void isAuthenticShouldReturnFalseWhenBadUser() throws Exception {
+ void isAuthenticShouldReturnFalseWhenBadUser() throws Exception {
when(usersRepository.test(USER, BAD_PASSWORD)).thenReturn(false);
assertThat(testee.isAuthentic(BAD_USER, BAD_PASSWORD)).isFalse();
}
@Test
- public void isAuthenticShouldFailOnUserRepositoryFailure() throws Exception {
+ void isAuthenticShouldFailOnUserRepositoryFailure() throws Exception {
when(usersRepository.test(USER, PASSWORD)).thenThrow(new UsersRepositoryException(""));
- expectedException.expect(MailboxException.class);
-
- testee.isAuthentic(USER, PASSWORD);
+ assertThatThrownBy(() -> testee.isAuthentic(USER, PASSWORD))
+ .isInstanceOf(MailboxException.class);
}
}
diff --git a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/UserRepositoryAuthorizatorTest.java b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/UserRepositoryAuthorizatorTest.java
index c1c6ca5..fc4d09c 100644
--- a/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/UserRepositoryAuthorizatorTest.java
+++ b/server/container/mailbox-adapter/src/test/java/org/apache/james/adapter/mailbox/UserRepositoryAuthorizatorTest.java
@@ -20,6 +20,7 @@
package org.apache.james.adapter.mailbox;
import static org.assertj.core.api.Assertions.assertThat;
+import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
@@ -28,10 +29,8 @@ import org.apache.james.mailbox.Authorizator;
import org.apache.james.mailbox.exception.MailboxException;
import org.apache.james.user.api.UsersRepository;
import org.apache.james.user.api.UsersRepositoryException;
-import org.junit.Before;
-import org.junit.Rule;
-import org.junit.Test;
-import org.junit.rules.ExpectedException;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
public class UserRepositoryAuthorizatorTest {
private static final Username ADMIN = Username.of("admin");
@@ -40,27 +39,23 @@ public class UserRepositoryAuthorizatorTest {
private UsersRepository usersRepository;
private UserRepositoryAuthorizator testee;
- @Rule
- public ExpectedException expectedException = ExpectedException.none();
-
- @Before
+ @BeforeEach
public void setUp() throws Exception {
usersRepository = mock(UsersRepository.class);
testee = new UserRepositoryAuthorizator(usersRepository);
}
@Test
- public void canLoginAsOtherUserShouldThrowMailboxExceptionWhenIsAdministratorThrows() throws Exception {
+ void canLoginAsOtherUserShouldThrowMailboxExceptionWhenIsAdministratorThrows() throws Exception {
when(usersRepository.isAdministrator(ADMIN))
.thenThrow(new UsersRepositoryException("expected error"));
- expectedException.expect(MailboxException.class);
-
- testee.canLoginAsOtherUser(ADMIN, USER);
+ assertThatThrownBy(() -> testee.canLoginAsOtherUser(ADMIN, USER))
+ .isInstanceOf(MailboxException.class);
}
@Test
- public void canLoginAsOtherUserShouldReturnNotAdminWhenNotAdminAndNoUser() throws Exception {
+ void canLoginAsOtherUserShouldReturnNotAdminWhenNotAdminAndNoUser() throws Exception {
when(usersRepository.isAdministrator(ADMIN))
.thenReturn(false);
when(usersRepository.contains(USER))
@@ -70,7 +65,7 @@ public class UserRepositoryAuthorizatorTest {
}
@Test
- public void canLoginAsOtherUserShouldReturnNotAdminWhenNotAdminAndUser() throws Exception {
+ void canLoginAsOtherUserShouldReturnNotAdminWhenNotAdminAndUser() throws Exception {
when(usersRepository.isAdministrator(ADMIN))
.thenReturn(false);
when(usersRepository.contains(USER))
@@ -80,7 +75,7 @@ public class UserRepositoryAuthorizatorTest {
}
@Test
- public void canLoginAsOtherUserShouldReturnUnknownUserWhenUserIsNotInRepository() throws Exception {
+ void canLoginAsOtherUserShouldReturnUnknownUserWhenUserIsNotInRepository() throws Exception {
when(usersRepository.isAdministrator(ADMIN))
.thenReturn(true);
when(usersRepository.contains(USER))
@@ -90,7 +85,7 @@ public class UserRepositoryAuthorizatorTest {
}
@Test
- public void canLoginAsOtherUserShouldReturnAllowedWhenAdminAndUserIsInRepository() throws Exception {
+ void canLoginAsOtherUserShouldReturnAllowedWhenAdminAndUserIsInRepository() throws Exception {
when(usersRepository.isAdministrator(ADMIN))
.thenReturn(true);
when(usersRepository.contains(USER))
---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@james.apache.org
For additional commands, e-mail: notifications-help@james.apache.org