JAMES-2469 Fasten Group tests Avoid launching FakeSmtp when not needed
Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/74d54189 Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/74d54189 Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/74d54189 Branch: refs/heads/master Commit: 74d54189475dbc2eb02ae28c3864da451e0c46c9 Parents: 1169a7d Author: benwa <[email protected]> Authored: Sat Jul 14 11:38:56 2018 +0700 Committer: benwa <[email protected]> Committed: Wed Jul 25 09:35:48 2018 +0700 ---------------------------------------------------------------------- .../mailets/GroupMappingRelayTest.java | 161 +++++++++++++++++++ .../transport/mailets/GroupMappingTest.java | 30 +--- 2 files changed, 162 insertions(+), 29 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/74d54189/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java new file mode 100644 index 0000000..2094628 --- /dev/null +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingRelayTest.java @@ -0,0 +1,161 @@ +/**************************************************************** + * Licensed to the Apache Software Foundation (ASF) under one * + * or more contributor license agreements. See the NOTICE file * + * distributed with this work for additional information * + * regarding copyright ownership. The ASF licenses this file * + * to you under the Apache License, Version 2.0 (the * + * "License"); you may not use this file except in compliance * + * with the License. You may obtain a copy of the License at * + * * + * http://www.apache.org/licenses/LICENSE-2.0 * + * * + * Unless required by applicable law or agreed to in writing, * + * software distributed under the License is distributed on an * + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * + * KIND, either express or implied. See the License for the * + * specific language governing permissions and limitations * + * under the License. * + ****************************************************************/ + +package org.apache.james.transport.mailets; + + +import static io.restassured.RestAssured.given; +import static org.apache.james.mailets.configuration.Constants.DEFAULT_DOMAIN; +import static org.apache.james.mailets.configuration.Constants.LOCALHOST_IP; +import static org.apache.james.mailets.configuration.Constants.PASSWORD; +import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; +import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; +import static org.hamcrest.Matchers.equalTo; + +import javax.mail.internet.MimeMessage; + +import org.apache.james.core.builder.MimeMessageBuilder; +import org.apache.james.jmap.mailet.VacationMailet; +import org.apache.james.mailets.TemporaryJamesServer; +import org.apache.james.mailets.configuration.CommonProcessors; +import org.apache.james.mailets.configuration.MailetConfiguration; +import org.apache.james.mailets.configuration.MailetContainer; +import org.apache.james.mailets.configuration.ProcessorConfiguration; +import org.apache.james.mailrepository.api.MailRepositoryUrl; +import org.apache.james.probe.DataProbe; +import org.apache.james.transport.matchers.All; +import org.apache.james.transport.matchers.IsSenderInRRTLoop; +import org.apache.james.transport.matchers.RecipientIsLocal; +import org.apache.james.utils.DataProbeImpl; +import org.apache.james.utils.FakeSmtp; +import org.apache.james.utils.IMAPMessageReader; +import org.apache.james.utils.SMTPMessageSender; +import org.apache.james.utils.WebAdminGuiceProbe; +import org.apache.james.webadmin.WebAdminUtils; +import org.apache.james.webadmin.routes.GroupsRoutes; +import org.apache.mailet.base.test.FakeMail; +import org.junit.After; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.TemporaryFolder; + +import com.jayway.awaitility.Duration; + +import io.restassured.specification.RequestSpecification; + +public class GroupMappingRelayTest { + private static final String DOMAIN1 = "domain1.com"; + + public static final String SENDER_LOCAL_PART = "fromuser"; + private static final String SENDER = SENDER_LOCAL_PART + "@" + DOMAIN1; + private static final String GROUP_ON_DOMAIN1 = "group@" + DOMAIN1; + + private static final String MESSAGE_CONTENT = "any text"; + public static final String RRT_ERROR = "rrt-error"; + public static final MailRepositoryUrl RRT_ERROR_REPOSITORY = MailRepositoryUrl.from("file://var/mail/rrt-error/"); + + private TemporaryJamesServer jamesServer; + private MimeMessage message; + private RequestSpecification webAdminApi; + + @Rule + public final FakeSmtp fakeSmtp = new FakeSmtp(); + @Rule + public TemporaryFolder temporaryFolder = new TemporaryFolder(); + @Rule + public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); + @Rule + public SMTPMessageSender messageSender = new SMTPMessageSender(DEFAULT_DOMAIN); + + @Before + public void setup() throws Exception { + MailetContainer.Builder mailetContainer = TemporaryJamesServer.SIMPLE_MAILET_CONTAINER_CONFIGURATION + .putProcessor(ProcessorConfiguration.transport() + .addMailet(MailetConfiguration.builder() + .matcher(All.class) + .mailet(RecipientRewriteTable.class) + .addProperty("errorProcessor", RRT_ERROR)) + .addMailet(MailetConfiguration.builder() + .matcher(RecipientIsLocal.class) + .mailet(VacationMailet.class)) + .addMailetsFrom(CommonProcessors.deliverOnlyTransport()) + .addMailet(MailetConfiguration.remoteDeliveryBuilder() + .matcher(All.class) + .addProperty("gateway", fakeSmtp.getContainer().getContainerIp()))) + .putProcessor(ProcessorConfiguration.builder() + .state(RRT_ERROR) + .addMailet(MailetConfiguration.builder() + .matcher(All.class) + .mailet(ToRepository.class) + .addProperty("passThrough", "true") + .addProperty("repositoryPath", RRT_ERROR_REPOSITORY.asString())) + .addMailet(MailetConfiguration.builder() + .matcher(IsSenderInRRTLoop.class) + .mailet(Null.class)) + .addMailet(MailetConfiguration.builder() + .matcher(All.class) + .mailet(Bounce.class))); + + jamesServer = TemporaryJamesServer.builder() + .withMailetContainer(mailetContainer) + .build(temporaryFolder); + + fakeSmtp.awaitStarted(awaitAtMostOneMinute); + + DataProbe dataProbe = jamesServer.getProbe(DataProbeImpl.class); + dataProbe.addDomain(DOMAIN1); + + dataProbe.addUser(SENDER, PASSWORD); + + WebAdminGuiceProbe webAdminGuiceProbe = jamesServer.getProbe(WebAdminGuiceProbe.class); + webAdminGuiceProbe.await(); + webAdminApi = given() + .spec(WebAdminUtils.buildRequestSpecification(webAdminGuiceProbe.getWebAdminPort()).build()); + + message = MimeMessageBuilder.mimeMessageBuilder() + .setSubject("test") + .setText(MESSAGE_CONTENT) + .build(); + } + + @After + public void tearDown() { + jamesServer.shutdown(); + } + + @Test + public void sendMessageShouldSendAMessageToAnExternalGroupMember() throws Exception { + String externalMail = "[email protected]"; + webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + externalMail); + + messageSender.connect(LOCALHOST_IP, SMTP_PORT) + .sendMessage(FakeMail.builder() + .mimeMessage(message) + .sender(SENDER) + .recipient(GROUP_ON_DOMAIN1)); + + awaitAtMostOneMinute + .pollDelay(Duration.ONE_HUNDRED_MILLISECONDS) + .until(() -> fakeSmtp.isReceived(response -> response + .body("[0].from", equalTo(SENDER)) + .body("[0].to[0]", equalTo(externalMail)) + .body("[0].text", equalTo(MESSAGE_CONTENT)))); + } +} http://git-wip-us.apache.org/repos/asf/james-project/blob/74d54189/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java ---------------------------------------------------------------------- diff --git a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java index dd501cd..1aadb4f 100644 --- a/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java +++ b/server/mailet/integration-testing/src/test/java/org/apache/james/transport/mailets/GroupMappingTest.java @@ -27,7 +27,6 @@ import static org.apache.james.mailets.configuration.Constants.PASSWORD; import static org.apache.james.mailets.configuration.Constants.SMTP_PORT; import static org.apache.james.mailets.configuration.Constants.awaitAtMostOneMinute; import static org.assertj.core.api.Assertions.assertThat; -import static org.hamcrest.Matchers.equalTo; import javax.mail.internet.MimeMessage; @@ -46,7 +45,6 @@ import org.apache.james.transport.matchers.All; import org.apache.james.transport.matchers.IsSenderInRRTLoop; import org.apache.james.transport.matchers.RecipientIsLocal; import org.apache.james.utils.DataProbeImpl; -import org.apache.james.utils.FakeSmtp; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.MailRepositoryProbeImpl; import org.apache.james.utils.SMTPMessageSender; @@ -85,8 +83,6 @@ public class GroupMappingTest { private RequestSpecification webAdminApi; @Rule - public final FakeSmtp fakeSmtp = new FakeSmtp(); - @Rule public TemporaryFolder temporaryFolder = new TemporaryFolder(); @Rule public IMAPMessageReader imapMessageReader = new IMAPMessageReader(); @@ -104,10 +100,7 @@ public class GroupMappingTest { .addMailet(MailetConfiguration.builder() .matcher(RecipientIsLocal.class) .mailet(VacationMailet.class)) - .addMailetsFrom(CommonProcessors.deliverOnlyTransport()) - .addMailet(MailetConfiguration.remoteDeliveryBuilder() - .matcher(All.class) - .addProperty("gateway", fakeSmtp.getContainer().getContainerIp()))) + .addMailetsFrom(CommonProcessors.deliverOnlyTransport())) .putProcessor(ProcessorConfiguration.builder() .state(RRT_ERROR) .addMailet(MailetConfiguration.builder() @@ -126,8 +119,6 @@ public class GroupMappingTest { .withMailetContainer(mailetContainer) .build(temporaryFolder); - fakeSmtp.awaitStarted(awaitAtMostOneMinute); - dataProbe = jamesServer.getProbe(DataProbeImpl.class); dataProbe.addDomain(DOMAIN1); dataProbe.addDomain(DOMAIN2); @@ -492,23 +483,4 @@ public class GroupMappingTest { .select(IMAPMessageReader.INBOX) .awaitMessage(awaitAtMostOneMinute); } - - @Test - public void sendMessageShouldSendAMessageToAnExternalGroupMember() throws Exception { - String externalMail = "[email protected]"; - webAdminApi.put(GroupsRoutes.ROOT_PATH + "/" + GROUP_ON_DOMAIN1 + "/" + externalMail); - - messageSender.connect(LOCALHOST_IP, SMTP_PORT) - .sendMessage(FakeMail.builder() - .mimeMessage(message) - .sender(SENDER) - .recipient(GROUP_ON_DOMAIN1)); - - awaitAtMostOneMinute - .pollDelay(Duration.ONE_HUNDRED_MILLISECONDS) - .until(() -> fakeSmtp.isReceived(response -> response - .body("[0].from", equalTo(SENDER)) - .body("[0].to[0]", equalTo(externalMail)) - .body("[0].text", equalTo(MESSAGE_CONTENT)))); - } } --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
