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 3a6d15a08aa11713cff87a6a23b2ec2061ef3748 Author: Benoit Tellier <btell...@linagora.com> AuthorDate: Thu Feb 21 10:05:41 2019 +0700 JAMES-2661 WebAdmin for EventDeadLetter: List groups --- .../james/webadmin/routes/EventDeadLettersRoutesTest.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java index 3febba0..0afee01 100644 --- a/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java +++ b/server/protocols/webadmin/webadmin-mailbox/src/test/java/org/apache/james/webadmin/routes/EventDeadLettersRoutesTest.java @@ -85,6 +85,7 @@ class EventDeadLettersRoutesTest { " \"sessionId\":452" + " }" + "}"; + public static final String SERIALIZED_GROUP_A = new EventBusTestFixture.GroupA().asString(); private WebAdminServer webAdminServer; private EventDeadLetters deadLetters; @@ -134,7 +135,7 @@ class EventDeadLettersRoutesTest { .then() .statusCode(HttpStatus.OK_200) .contentType(ContentType.JSON) - .body(".", contains(EventBusTestFixture.GroupA.class.getName())); + .body(".", containsInAnyOrder(EventBusTestFixture.GroupA.class.getName())); } @Test @@ -147,7 +148,7 @@ class EventDeadLettersRoutesTest { .then() .statusCode(HttpStatus.OK_200) .contentType(ContentType.JSON) - .body(".", contains(EventBusTestFixture.GroupA.class.getName())); + .body(".", containsInAnyOrder(EventBusTestFixture.GroupA.class.getName())); } @Test @@ -181,7 +182,7 @@ class EventDeadLettersRoutesTest { @Test void listEventsShouldReturnEmptyWhenNone() { when() - .get("/events/deadLetter/groups/" + new EventBusTestFixture.GroupA().asString() + "/events") + .get("/events/deadLetter/groups/" + SERIALIZED_GROUP_A + "/events") .then() .statusCode(HttpStatus.OK_200) .contentType(ContentType.JSON) @@ -193,7 +194,7 @@ class EventDeadLettersRoutesTest { deadLetters.store(new EventBusTestFixture.GroupA(), EVENT_1).block(); when() - .get("/events/deadLetter/groups/" + new EventBusTestFixture.GroupA().asString() + "/events") + .get("/events/deadLetter/groups/" + SERIALIZED_GROUP_A + "/events") .then() .statusCode(HttpStatus.OK_200) .contentType(ContentType.JSON) @@ -206,7 +207,7 @@ class EventDeadLettersRoutesTest { deadLetters.store(new EventBusTestFixture.GroupB(), EVENT_2).block(); when() - .get("/events/deadLetter/groups/" + new EventBusTestFixture.GroupA().asString() + "/events") + .get("/events/deadLetter/groups/" + SERIALIZED_GROUP_A + "/events") .then() .statusCode(HttpStatus.OK_200) .contentType(ContentType.JSON) @@ -219,7 +220,7 @@ class EventDeadLettersRoutesTest { deadLetters.store(new EventBusTestFixture.GroupA(), EVENT_2).block(); when() - .get("/events/deadLetter/groups/" + new EventBusTestFixture.GroupA().asString() + "/events") + .get("/events/deadLetter/groups/" + SERIALIZED_GROUP_A + "/events") .then() .statusCode(HttpStatus.OK_200) .contentType(ContentType.JSON) --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org