This is an automated email from the ASF dual-hosted git repository. rcordier pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/james-project.git
commit ea6a9018081057c76afa14d8d192bb21911d90ff Author: Tran Tien Duc <[email protected]> AuthorDate: Wed Jan 22 11:45:36 2020 +0700 JAMES-3016 Extract MockSMTPServer image name to Images class --- .../test/java/org/apache/james/mailets/RemoteDeliveryErrorTest.java | 5 +++-- .../testing/src/main/java/org/apache/james/util/docker/Images.java | 1 + 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryErrorTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryErrorTest.java index 493e976..7e6adeb 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryErrorTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/mailets/RemoteDeliveryErrorTest.java @@ -28,6 +28,7 @@ import static org.apache.james.mock.smtp.server.ConfigurationClient.BehaviorsPar import static org.apache.james.mock.smtp.server.ConfigurationClient.BehaviorsParamsBuilder.ConditionStep.inputContaining; import static org.apache.james.mock.smtp.server.ConfigurationClient.BehaviorsParamsBuilder.ResponseStep.doesNotAcceptAnyMail; import static org.apache.james.mock.smtp.server.ConfigurationClient.BehaviorsParamsBuilder.ResponseStep.serviceNotAvailable; +import static org.apache.james.util.docker.Images.MOCK_SMTP_SERVER; import static org.assertj.core.api.Assertions.assertThat; import java.net.InetAddress; @@ -108,10 +109,10 @@ public class RemoteDeliveryErrorTest { @Rule public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN); @ClassRule - public static DockerContainer mockSmtp = DockerContainer.fromName("linagora/mock-smtp-server") + public static DockerContainer mockSmtp = DockerContainer.fromName(MOCK_SMTP_SERVER) .withLogConsumer(outputFrame -> LOGGER.debug("MockSMTP 1: " + outputFrame.getUtf8String())); @ClassRule - public static DockerContainer mockSmtp2 = DockerContainer.fromName("linagora/mock-smtp-server") + public static DockerContainer mockSmtp2 = DockerContainer.fromName(MOCK_SMTP_SERVER) .withLogConsumer(outputFrame -> LOGGER.debug("MockSMTP 2: " + outputFrame.getUtf8String())); private TemporaryJamesServer jamesServer; diff --git a/server/testing/src/main/java/org/apache/james/util/docker/Images.java b/server/testing/src/main/java/org/apache/james/util/docker/Images.java index f880197..bd2f2e1 100644 --- a/server/testing/src/main/java/org/apache/james/util/docker/Images.java +++ b/server/testing/src/main/java/org/apache/james/util/docker/Images.java @@ -27,4 +27,5 @@ public interface Images { String NGINX = "nginx:1.15.1"; String TIKA = "apache/tika:1.22"; String SPAMASSASSIN = "dinkel/spamassassin:3.4.0"; + String MOCK_SMTP_SERVER = "linagora/mock-smtp-server"; } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
