Repository: james-project Updated Branches: refs/heads/master 6bfbc8ed4 -> 12d825a96
JAMES-2544 Gauge is now registered for RabbitMQ Ensure Metric contract uses different names to avoid conflicts Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/12d825a9 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/12d825a9 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/12d825a9 Branch: refs/heads/master Commit: 12d825a96ca3a777128ff2e75144cef41d8e5c90 Parents: 7ed58e9 Author: Benoit Tellier <btell...@linagora.com> Authored: Thu Oct 4 16:19:21 2018 +0700 Committer: Benoit Tellier <btell...@linagora.com> Committed: Fri Oct 5 09:42:10 2018 +0700 ---------------------------------------------------------------------- .../apache/james/queue/api/MailQueueMetricContract.java | 10 +++++----- .../james/queue/rabbitmq/RabbitMQMailQueueTest.java | 6 ------ 2 files changed, 5 insertions(+), 11 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/12d825a9/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueMetricContract.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueMetricContract.java b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueMetricContract.java index c6de9f6..c315efd 100644 --- a/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueMetricContract.java +++ b/server/queue/queue-api/src/test/java/org/apache/james/queue/api/MailQueueMetricContract.java @@ -42,19 +42,19 @@ import com.github.fge.lambdas.Throwing; @ExtendWith(MailQueueMetricExtension.class) public interface MailQueueMetricContract extends MailQueueContract { - default FakeMail fakeMail() throws MessagingException { + default FakeMail fakeMail(int i) throws MessagingException { return defaultMail() - .name("name1") + .name("name" + i) .build(); } - default void enQueueMail(Integer times) throws Exception { + default void enQueueMail(Integer times) { IntStream .rangeClosed(1, times) - .forEach(Throwing.intConsumer(time -> enQueue(fakeMail()))); + .forEach(Throwing.intConsumer(time -> enQueue(fakeMail(time)))); } - default void deQueueMail(Integer times) throws Exception { + default void deQueueMail(Integer times) { IntStream .rangeClosed(1, times) .forEach(Throwing.intConsumer(time -> getMailQueue().deQueue().done(true))); http://git-wip-us.apache.org/repos/asf/james-project/blob/12d825a9/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java ---------------------------------------------------------------------- diff --git a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java index 37507f5..bb06e36 100644 --- a/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java +++ b/server/queue/queue-rabbitmq/src/test/java/org/apache/james/queue/rabbitmq/RabbitMQMailQueueTest.java @@ -62,7 +62,6 @@ import org.apache.james.queue.rabbitmq.view.cassandra.configuration.CassandraMai import org.apache.james.util.streams.Iterators; import org.apache.mailet.Mail; import org.junit.jupiter.api.BeforeEach; -import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.RegisterExtension; @@ -224,11 +223,6 @@ public class RabbitMQMailQueueTest implements ManageableMailQueueContract, MailQ assertThat(initialized).isTrue(); } - @Disabled("RabbitMQ Mail Queue do not yet implement getSize()") - @Override - public void constructorShouldRegisterGetQueueSizeGauge(MailQueueMetricExtension.MailQueueMetricTestSystem testSystem) { - } - private void enqueueSomeMails(Function<Integer, String> namePattern, int emailCount) { IntStream.rangeClosed(1, emailCount) .forEach(Throwing.intConsumer(i -> enQueue(defaultMail() --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
