Repository: james-project Updated Branches: refs/heads/master 8e17dca85 -> 8d22e3568
http://git-wip-us.apache.org/repos/asf/james-project/blob/8d22e356/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java index a1646c3..112e436 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainMappingsRoutesTest.java @@ -29,7 +29,7 @@ import static org.assertj.core.api.Assertions.assertThat; import static org.assertj.core.api.Assertions.entry; import static org.hamcrest.CoreMatchers.is; import static org.hamcrest.Matchers.isEmptyString; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.spy; import static org.mockito.Mockito.when; @@ -59,6 +59,7 @@ import org.junit.jupiter.api.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; + import io.restassured.RestAssured; import io.restassured.filter.log.LogDetail; import io.restassured.http.ContentType; http://git-wip-us.apache.org/repos/asf/james-project/blob/8d22e356/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java index a243f56..82b7dde 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/DomainsRoutesTest.java @@ -25,7 +25,7 @@ import static io.restassured.RestAssured.with; import static org.apache.james.webadmin.Constants.SEPARATOR; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; http://git-wip-us.apache.org/repos/asf/james-project/blob/8d22e356/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java index 558bf5c..c27bc00 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/ForwardRoutesTest.java @@ -27,9 +27,9 @@ import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.hasItems; import static org.hamcrest.CoreMatchers.is; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -601,18 +601,6 @@ class ForwardRoutesTest { } @Test - void putShouldReturnErrorWhenErrorMappingExceptionIsThrown() throws Exception { - doThrow(RecipientRewriteTable.ErrorMappingException.class) - .when(memoryRecipientRewriteTable) - .addForwardMapping(any(), anyString()); - - when() - .put(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB) - .then() - .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500); - } - - @Test void putShouldReturnErrorWhenRuntimeExceptionIsThrown() throws Exception { doThrow(RuntimeException.class) .when(memoryRecipientRewriteTable) @@ -637,18 +625,6 @@ class ForwardRoutesTest { } @Test - void getAllShouldReturnErrorWhenErrorMappingExceptionIsThrown() throws Exception { - doThrow(RecipientRewriteTable.ErrorMappingException.class) - .when(memoryRecipientRewriteTable) - .getAllMappings(); - - when() - .get() - .then() - .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500); - } - - @Test void getAllShouldReturnErrorWhenRuntimeExceptionIsThrown() throws Exception { doThrow(RuntimeException.class) .when(memoryRecipientRewriteTable) @@ -673,18 +649,6 @@ class ForwardRoutesTest { } @Test - void deleteShouldReturnErrorWhenErrorMappingExceptionIsThrown() throws Exception { - doThrow(RecipientRewriteTable.ErrorMappingException.class) - .when(memoryRecipientRewriteTable) - .removeForwardMapping(any(), anyString()); - - when() - .delete(ALICE + SEPARATOR + "targets" + SEPARATOR + BOB) - .then() - .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500); - } - - @Test void deleteShouldReturnErrorWhenRuntimeExceptionIsThrown() throws Exception { doThrow(RuntimeException.class) .when(memoryRecipientRewriteTable) @@ -709,18 +673,6 @@ class ForwardRoutesTest { } @Test - void getShouldReturnErrorWhenErrorMappingExceptionIsThrown() throws Exception { - doThrow(RecipientRewriteTable.ErrorMappingException.class) - .when(memoryRecipientRewriteTable) - .getUserDomainMappings(any()); - - when() - .get(ALICE) - .then() - .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500); - } - - @Test void getShouldReturnErrorWhenRuntimeExceptionIsThrown() throws Exception { doThrow(RuntimeException.class) .when(memoryRecipientRewriteTable) http://git-wip-us.apache.org/repos/asf/james-project/blob/8d22e356/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java index 0c09d5b..153c9a4 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/GroupsRoutesTest.java @@ -26,8 +26,8 @@ import static org.apache.james.webadmin.Constants.SEPARATOR; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.is; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyString; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; @@ -609,18 +609,6 @@ class GroupsRoutesTest { } @Test - void putShouldReturnErrorWhenErrorMappingExceptionIsThrown() throws Exception { - doThrow(RecipientRewriteTable.ErrorMappingException.class) - .when(memoryRecipientRewriteTable) - .addGroupMapping(any(), anyString()); - - when() - .put(GROUP1 + SEPARATOR + GROUP2) - .then() - .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500); - } - - @Test void putShouldReturnErrorWhenRuntimeExceptionIsThrown() throws Exception { doThrow(RuntimeException.class) .when(memoryRecipientRewriteTable) @@ -645,18 +633,6 @@ class GroupsRoutesTest { } @Test - void getAllShouldReturnErrorWhenErrorMappingExceptionIsThrown() throws Exception { - doThrow(RecipientRewriteTable.ErrorMappingException.class) - .when(memoryRecipientRewriteTable) - .getAllMappings(); - - when() - .get() - .then() - .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500); - } - - @Test void getAllShouldReturnErrorWhenRuntimeExceptionIsThrown() throws Exception { doThrow(RuntimeException.class) .when(memoryRecipientRewriteTable) @@ -681,18 +657,6 @@ class GroupsRoutesTest { } @Test - void deleteShouldReturnErrorWhenErrorMappingExceptionIsThrown() throws Exception { - doThrow(RecipientRewriteTable.ErrorMappingException.class) - .when(memoryRecipientRewriteTable) - .removeGroupMapping(any(), anyString()); - - when() - .delete(GROUP1 + SEPARATOR + GROUP2) - .then() - .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500); - } - - @Test void deleteShouldReturnErrorWhenRuntimeExceptionIsThrown() throws Exception { doThrow(RuntimeException.class) .when(memoryRecipientRewriteTable) @@ -717,18 +681,6 @@ class GroupsRoutesTest { } @Test - void getShouldReturnErrorWhenErrorMappingExceptionIsThrown() throws Exception { - doThrow(RecipientRewriteTable.ErrorMappingException.class) - .when(memoryRecipientRewriteTable) - .getUserDomainMappings(any()); - - when() - .get(GROUP1) - .then() - .statusCode(HttpStatus.INTERNAL_SERVER_ERROR_500); - } - - @Test void getShouldReturnErrorWhenRuntimeExceptionIsThrown() throws Exception { doThrow(RuntimeException.class) .when(memoryRecipientRewriteTable) http://git-wip-us.apache.org/repos/asf/james-project/blob/8d22e356/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java index a7bed25..a3e4855 100644 --- a/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java +++ b/server/protocols/webadmin/webadmin-data/src/test/java/org/apache/james/webadmin/routes/UsersRoutesTest.java @@ -24,7 +24,7 @@ import static io.restassured.RestAssured.when; import static io.restassured.RestAssured.with; import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.assertj.core.api.Assertions.assertThat; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -50,6 +50,7 @@ import org.junit.jupiter.api.Nested; import org.junit.jupiter.api.Test; import com.google.common.collect.ImmutableMap; + import io.restassured.RestAssured; import io.restassured.http.ContentType; http://git-wip-us.apache.org/repos/asf/james-project/blob/8d22e356/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java index 003d407..3e3aaaf 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/UserMailboxesRoutesTest.java @@ -26,7 +26,7 @@ import static org.apache.james.webadmin.WebAdminServer.NO_CONFIGURATION; import static org.apache.james.webadmin.routes.UserMailboxesRoutes.USERS_BASE; import static org.assertj.core.api.Assertions.assertThat; import static org.hamcrest.CoreMatchers.is; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -60,6 +60,7 @@ import org.junit.jupiter.api.Test; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; + import io.restassured.RestAssured; import io.restassured.http.ContentType; http://git-wip-us.apache.org/repos/asf/james-project/blob/8d22e356/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java ---------------------------------------------------------------------- diff --git a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java index 38a253e..77b16b3 100644 --- a/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailrepository/src/test/java/org/apache/james/webadmin/routes/MailRepositoriesRoutesTest.java @@ -36,7 +36,7 @@ import static org.hamcrest.Matchers.is; import static org.hamcrest.Matchers.isEmptyOrNullString; import static org.hamcrest.Matchers.notNullValue; import static org.hamcrest.Matchers.nullValue; -import static org.mockito.Matchers.any; +import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.times; import static org.mockito.Mockito.verify; @@ -91,6 +91,7 @@ import org.mockito.stubbing.Answer; import com.github.steveash.guavate.Guavate; import com.google.common.collect.ImmutableList; + import io.restassured.RestAssured; import io.restassured.builder.RequestSpecBuilder; import io.restassured.http.ContentType; http://git-wip-us.apache.org/repos/asf/james-project/blob/8d22e356/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java b/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java index a0e312e..2ae2c50 100644 --- a/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java +++ b/server/queue/queue-jms/src/test/java/org/apache/james/queue/library/AbstractMailQueueFactoryTest.java @@ -19,8 +19,8 @@ package org.apache.james.queue.library; -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.eq; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.ArgumentMatchers.eq; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; @@ -29,7 +29,6 @@ import javax.management.InstanceNotFoundException; import javax.management.MBeanServer; import javax.management.ObjectName; -import org.apache.james.queue.api.MailQueue; import org.apache.james.queue.api.ManageableMailQueue; import org.junit.Before; import org.junit.Test; @@ -57,7 +56,7 @@ public class AbstractMailQueueFactoryTest { @Test public void destroyShouldRegisterManageableQueues() throws Exception { abstractMailQueueFactory.createQueue(QUEUE_1); - verify(mBeanServer).registerMBean(any(MailQueue.class), eq(new ObjectName(AbstractMailQueueFactory.MBEAN_NAME_QUEUE_PREFIX + QUEUE_1))); + verify(mBeanServer).registerMBean(any(MailQueueManagement.class), eq(new ObjectName(AbstractMailQueueFactory.MBEAN_NAME_QUEUE_PREFIX + QUEUE_1))); } @Test --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
