JAMES-2340 Cassandra keyspace was the same across tests Keyspace was generated once for an entire class.
Also I solved some inteliJ warnings. Project: http://git-wip-us.apache.org/repos/asf/james-project/repo Commit: http://git-wip-us.apache.org/repos/asf/james-project/commit/6b8999ed Tree: http://git-wip-us.apache.org/repos/asf/james-project/tree/6b8999ed Diff: http://git-wip-us.apache.org/repos/asf/james-project/diff/6b8999ed Branch: refs/heads/master Commit: 6b8999eddb91df41635ac88b885a033de9467131 Parents: d335c7b Author: benwa <btell...@linagora.com> Authored: Thu Mar 22 10:25:09 2018 +0700 Committer: benwa <btell...@linagora.com> Committed: Tue Mar 27 15:17:38 2018 +0700 ---------------------------------------------------------------------- .../apache/james/jmap/cassandra/CassandraJmapExtension.java | 8 +++++--- .../james/jmap/methods/integration/SpamAssassinContract.java | 8 -------- .../methods/integration/SpamAssassinGuiceMailetLoader.java | 2 +- .../james/jmap/methods/integration/SpamAssassinModule.java | 6 +----- .../org/apache/james/jmap/memory/MemoryJmapExtension.java | 2 ++ 5 files changed, 9 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/james-project/blob/6b8999ed/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java index 60fb85c..b1fbf62 100644 --- a/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java +++ b/server/protocols/jmap-integration-testing/cassandra-jmap-integration-testing/src/test/java/org/apache/james/jmap/cassandra/CassandraJmapExtension.java @@ -51,14 +51,13 @@ public class CassandraJmapExtension implements BeforeAllCallback, AfterAllCallba private final DockerCassandraRule cassandra; private final EmbeddedElasticSearch elasticSearch; private final SpamAssassinExtension spamAssassinExtension; - private final JamesWithSpamAssassin james; + private JamesWithSpamAssassin james; public CassandraJmapExtension() { this.temporaryFolder = new TemporaryFolder(); this.cassandra = new DockerCassandraRule(); this.elasticSearch = new EmbeddedElasticSearch(temporaryFolder, MailboxElasticSearchConstants.DEFAULT_MAILBOX_INDEX); this.spamAssassinExtension = new SpamAssassinExtension(); - this.james = james(); } private JamesWithSpamAssassin james() { @@ -90,12 +89,15 @@ public class CassandraJmapExtension implements BeforeAllCallback, AfterAllCallba } @Override - public void beforeEach(ExtensionContext context) { + public void beforeEach(ExtensionContext context) throws Exception { + james = james(); spamAssassinExtension.beforeEach(context); + james.getJmapServer().start(); } @Override public void afterEach(ExtensionContext context) { + james.getJmapServer().stop(); spamAssassinExtension.afterEach(context); } http://git-wip-us.apache.org/repos/asf/james-project/blob/6b8999ed/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java index 40f19df..452e023 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinContract.java @@ -40,7 +40,6 @@ import org.apache.james.mailbox.Role; import org.apache.james.utils.DataProbeImpl; import org.apache.james.utils.IMAPMessageReader; import org.apache.james.utils.JmapGuiceProbe; -import org.junit.jupiter.api.AfterEach; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -66,8 +65,6 @@ public interface SpamAssassinContract { @BeforeEach default void setup(JamesWithSpamAssassin james) throws Throwable { - james.getJmapServer().start(); - RestAssured.requestSpecification = new RequestSpecBuilder() .setContentType(ContentType.JSON) .setAccept(ContentType.JSON) @@ -96,11 +93,6 @@ public interface SpamAssassinContract { .setCharset(StandardCharsets.UTF_8); } - @AfterEach - default void teardown(JamesWithSpamAssassin james) { - james.getJmapServer().stop(); - } - @Test default void spamShouldBeDeliveredInSpamMailboxWhenSameMessageHasAlreadyBeenMovedToSpam(JamesWithSpamAssassin james) throws Exception { james.getSpamAssassinExtension().getSpamAssassin().train(ALICE); http://git-wip-us.apache.org/repos/asf/james-project/blob/6b8999ed/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinGuiceMailetLoader.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinGuiceMailetLoader.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinGuiceMailetLoader.java index a504d3e..1ffcd12 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinGuiceMailetLoader.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinGuiceMailetLoader.java @@ -62,7 +62,7 @@ public class SpamAssassinGuiceMailetLoader implements MailetLoader { } } - private Mailet configureSpamAssassinMailet(String mailetName) throws Exception, MessagingException { + private Mailet configureSpamAssassinMailet(String mailetName) throws Exception { Mailet mailet = genericLoader.instanciate(mailetName); mailet.init(spamAssassinMailetConfig()); return mailet; http://git-wip-us.apache.org/repos/asf/james-project/blob/6b8999ed/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinModule.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinModule.java b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinModule.java index 88a5a79..c70ad26 100644 --- a/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinModule.java +++ b/server/protocols/jmap-integration-testing/jmap-integration-testing-common/src/test/java/org/apache/james/jmap/methods/integration/SpamAssassinModule.java @@ -18,19 +18,15 @@ ****************************************************************/ package org.apache.james.jmap.methods.integration; -import java.io.IOException; -import java.net.URISyntaxException; import java.util.Optional; import javax.inject.Singleton; -import org.apache.commons.configuration.ConfigurationException; import org.apache.james.mailbox.spamassassin.SpamAssassinConfiguration; import org.apache.james.mailetcontainer.api.MailetLoader; import org.apache.james.util.Host; import org.apache.james.util.scanner.SpamAssassinExtension; import org.apache.james.util.scanner.SpamAssassinExtension.SpamAssassin; -import org.apache.james.utils.PropertiesProvider; import com.google.inject.AbstractModule; import com.google.inject.Provides; @@ -52,7 +48,7 @@ public class SpamAssassinModule extends AbstractModule { @Provides @Singleton - private SpamAssassinConfiguration getSpamAssassinConfiguration(PropertiesProvider propertiesProvider) throws ConfigurationException, IOException, URISyntaxException { + private SpamAssassinConfiguration getSpamAssassinConfiguration() { SpamAssassin spamAssassin = spamAssassinExtension.getSpamAssassin(); return new SpamAssassinConfiguration(Optional.of(Host.from(spamAssassin.getIp(), spamAssassin.getBindingPort()))); } http://git-wip-us.apache.org/repos/asf/james-project/blob/6b8999ed/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapExtension.java ---------------------------------------------------------------------- diff --git a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapExtension.java b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapExtension.java index 900ff71..17ace26 100644 --- a/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapExtension.java +++ b/server/protocols/jmap-integration-testing/memory-jmap-integration-testing/src/test/java/org/apache/james/jmap/memory/MemoryJmapExtension.java @@ -70,10 +70,12 @@ public class MemoryJmapExtension implements BeforeEachCallback, AfterEachCallbac public void beforeEach(ExtensionContext context) throws Exception { spamAssassinExtension.beforeEach(context); temporaryFolder.create(); + james.getJmapServer().start(); } @Override public void afterEach(ExtensionContext context) { + james.getJmapServer().stop(); spamAssassinExtension.afterEach(context); temporaryFolder.delete(); } --------------------------------------------------------------------- To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org For additional commands, e-mail: server-dev-h...@james.apache.org
