This is an automated email from the ASF dual-hosted git repository.
aduprat pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit 5f9b8b576ddbdb2313fc0d1a9e7f24c82684195e
Author: Matthieu Baechler <matth...@apache.org>
AuthorDate: Thu Mar 21 11:18:09 2019 +0100
JAMES-2671 SmtpTestRule should be used as as Rule
---
.../james/mpt/smtp/AwsS3RabbitMQForwardSmtpTest.java | 14 +-------------
.../mpt/smtp/AwsS3RabbitMQSmtpStarttlsCommandTest.java | 16 +---------------
.../james/mpt/smtp/SwiftRabbitMQForwardSmtpTest.java | 13 -------------
.../mpt/smtp/SwiftRabbitMQSmtpStarttlsCommandTest.java | 15 ---------------
.../apache/james/mpt/smtp/CassandraForwardSmtpTest.java | 11 -----------
.../james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java | 12 ------------
.../java/org/apache/james/mpt/smtp/SmtpTestRule.java | 12 +++++++++++-
7 files changed, 13 insertions(+), 80 deletions(-)
diff --git
a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/AwsS3RabbitMQForwardSmtpTest.java
b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/AwsS3RabbitMQForwardSmtpTest.java
index 6620839..368e031 100644
---
a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/AwsS3RabbitMQForwardSmtpTest.java
+++
b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/AwsS3RabbitMQForwardSmtpTest.java
@@ -22,8 +22,7 @@ package org.apache.james.mpt.smtp;
import static
org.apache.james.modules.protocols.SmtpGuiceProbe.SmtpServerConnectedType.SMTP_GLOBAL_SERVER;
import org.apache.james.backends.cassandra.DockerCassandraRule;
-import org.junit.After;
-import org.junit.Before;
+import org.apache.james.modules.objectstorage.aws.s3.DockerAwsS3TestRule;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -34,20 +33,9 @@ public class AwsS3RabbitMQForwardSmtpTest extends
ForwardSmtpTest {
@Rule
public SmtpTestRule cassandraRabbitMQAwsS3SmtpTestRule =
CassandraRabbitMQAwsS3SmtpTestRuleFactory.create(SMTP_GLOBAL_SERVER,
cassandraServer.getHost());
- @Before
- @Override
- public void setUp() throws Exception {
- cassandraRabbitMQAwsS3SmtpTestRule.beforeTest();
- super.setUp();
- }
-
@Override
protected SmtpHostSystem createSmtpHostSystem() {
return cassandraRabbitMQAwsS3SmtpTestRule;
}
- @After
- public void tearDown() {
- cassandraRabbitMQAwsS3SmtpTestRule.afterTest();
- }
}
diff --git
a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/AwsS3RabbitMQSmtpStarttlsCommandTest.java
b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/AwsS3RabbitMQSmtpStarttlsCommandTest.java
index 8faeed1..882076b 100644
---
a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/AwsS3RabbitMQSmtpStarttlsCommandTest.java
+++
b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/AwsS3RabbitMQSmtpStarttlsCommandTest.java
@@ -22,8 +22,7 @@ package org.apache.james.mpt.smtp;
import static
org.apache.james.modules.protocols.SmtpGuiceProbe.SmtpServerConnectedType.SMTP_START_TLS_SERVER;
import org.apache.james.backends.cassandra.DockerCassandraRule;
-import org.junit.After;
-import org.junit.Before;
+import org.apache.james.modules.objectstorage.aws.s3.DockerAwsS3TestRule;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -34,22 +33,9 @@ public class AwsS3RabbitMQSmtpStarttlsCommandTest extends
SmtpStarttlsCommandTes
@Rule
public SmtpTestRule cassandraRabbitMQAwsS3SmtpTestRule =
CassandraRabbitMQAwsS3SmtpTestRuleFactory.create(SMTP_START_TLS_SERVER,
cassandraServer.getHost());
- @Before
- @Override
- public void setUp() throws Exception {
- cassandraRabbitMQAwsS3SmtpTestRule.beforeTest();
- super.setUp();
- }
-
@Override
protected SmtpHostSystem createSmtpHostSystem() {
return cassandraRabbitMQAwsS3SmtpTestRule;
}
-
- @After
- public void tearDown() {
- cassandraRabbitMQAwsS3SmtpTestRule.afterTest();
- }
-
}
diff --git
a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/SwiftRabbitMQForwardSmtpTest.java
b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/SwiftRabbitMQForwardSmtpTest.java
index 9e9ce21..dce21c6 100644
---
a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/SwiftRabbitMQForwardSmtpTest.java
+++
b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/SwiftRabbitMQForwardSmtpTest.java
@@ -22,8 +22,6 @@ package org.apache.james.mpt.smtp;
import static
org.apache.james.modules.protocols.SmtpGuiceProbe.SmtpServerConnectedType.SMTP_GLOBAL_SERVER;
import org.apache.james.backends.cassandra.DockerCassandraRule;
-import org.junit.After;
-import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -34,20 +32,9 @@ public class SwiftRabbitMQForwardSmtpTest extends
ForwardSmtpTest {
@Rule
public SmtpTestRule cassandraRabbitMQSwiftSmtpTestRule =
CassandraRabbitMQSwiftSmtpTestRuleFactory.create(SMTP_GLOBAL_SERVER,
cassandraServer.getHost());
- @Before
- @Override
- public void setUp() throws Exception {
- cassandraRabbitMQSwiftSmtpTestRule.beforeTest();
- super.setUp();
- }
-
@Override
protected SmtpHostSystem createSmtpHostSystem() {
return cassandraRabbitMQSwiftSmtpTestRule;
}
- @After
- public void tearDown() {
- cassandraRabbitMQSwiftSmtpTestRule.afterTest();
- }
}
diff --git
a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/SwiftRabbitMQSmtpStarttlsCommandTest.java
b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/SwiftRabbitMQSmtpStarttlsCommandTest.java
index c26a78a..bc3aa4d 100644
---
a/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/SwiftRabbitMQSmtpStarttlsCommandTest.java
+++
b/mpt/impl/smtp/cassandra-rabbitmq-object-storage/src/test/java/org/apache/james/mpt/smtp/SwiftRabbitMQSmtpStarttlsCommandTest.java
@@ -22,8 +22,6 @@ package org.apache.james.mpt.smtp;
import static
org.apache.james.modules.protocols.SmtpGuiceProbe.SmtpServerConnectedType.SMTP_START_TLS_SERVER;
import org.apache.james.backends.cassandra.DockerCassandraRule;
-import org.junit.After;
-import org.junit.Before;
import org.junit.ClassRule;
import org.junit.Rule;
@@ -34,22 +32,9 @@ public class SwiftRabbitMQSmtpStarttlsCommandTest extends
SmtpStarttlsCommandTes
@Rule
public SmtpTestRule cassandraRabbitMQSwiftSmtpTestRule =
CassandraRabbitMQSwiftSmtpTestRuleFactory.create(SMTP_START_TLS_SERVER,
cassandraServer.getHost());
- @Before
- @Override
- public void setUp() throws Exception {
- cassandraRabbitMQSwiftSmtpTestRule.beforeTest();
- super.setUp();
- }
-
@Override
protected SmtpHostSystem createSmtpHostSystem() {
return cassandraRabbitMQSwiftSmtpTestRule;
}
-
- @After
- public void tearDown() {
- cassandraRabbitMQSwiftSmtpTestRule.afterTest();
- }
-
}
diff --git
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
index 96ea702..28b18bf 100644
---
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
+++
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraForwardSmtpTest.java
@@ -34,20 +34,9 @@ public class CassandraForwardSmtpTest extends
ForwardSmtpTest {
@Rule
public SmtpTestRule cassandraSmtpTestRule =
CassandraSmtpTestRuleFactory.create(SMTP_GLOBAL_SERVER,
cassandraServer.getHost());
- @Before
- @Override
- public void setUp() throws Exception {
- cassandraSmtpTestRule.beforeTest();
- super.setUp();
- }
-
@Override
protected SmtpHostSystem createSmtpHostSystem() {
return cassandraSmtpTestRule;
}
- @After
- public void tearDown() {
- cassandraSmtpTestRule.afterTest();
- }
}
diff --git
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
index c609133..2c81915 100644
---
a/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
+++
b/mpt/impl/smtp/cassandra/src/test/java/org/apache/james/mpt/smtp/CassandraSmtpStarttlsCommandTest.java
@@ -34,22 +34,10 @@ public class CassandraSmtpStarttlsCommandTest extends
SmtpStarttlsCommandTest {
@Rule
public SmtpTestRule cassandraSmtpTestRule =
CassandraSmtpTestRuleFactory.create(SMTP_START_TLS_SERVER,
cassandraServer.getHost());
- @Before
- @Override
- public void setUp() throws Exception {
- cassandraSmtpTestRule.beforeTest();
- super.setUp();
- }
-
@Override
protected SmtpHostSystem createSmtpHostSystem() {
return cassandraSmtpTestRule;
}
- @After
- public void tearDown() {
- cassandraSmtpTestRule.afterTest();
- }
-
}
diff --git
a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpTestRule.java
b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpTestRule.java
index e7ded4b..1056c0f 100644
---
a/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpTestRule.java
+++
b/mpt/impl/smtp/core/src/main/java/org/apache/james/mpt/smtp/SmtpTestRule.java
@@ -68,7 +68,17 @@ public class SmtpTestRule implements TestRule,
SmtpHostSystem {
@Override
public Statement apply(Statement base, Description description) {
- return base;
+ return new Statement() {
+ @Override
+ public void evaluate() throws Throwable {
+ beforeTest();
+ try {
+ base.evaluate();
+ } finally {
+ afterTest();
+ }
+ }
+ };
}
@Override
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
