You are viewing a plain text version of this content. The canonical link for it is here.
Posted to server-dev@james.apache.org by bt...@apache.org on 2019/11/20 01:57:00 UTC
[james-project] 32/49: [Refactoring] MockMailProcessor shouldThrow
is never used
This is an automated email from the ASF dual-hosted git repository.
btellier pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/james-project.git
commit b3355704ed1cbc7f9eb84c7ee3eb79144689be95
Author: Benoit Tellier <bt...@linagora.com>
AuthorDate: Sun Nov 17 15:27:19 2019 +0700
[Refactoring] MockMailProcessor shouldThrow is never used
---
.../mailetcontainer/api/mock/MockMailProcessor.java | 20 ++++----------------
.../lib/AbstractStateCompositeProcessorTest.java | 5 +----
2 files changed, 5 insertions(+), 20 deletions(-)
diff --git a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java
index cf1451b..507a3bc 100644
--- a/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java
+++ b/server/mailet/mailetcontainer-api/src/test/java/org/apache/james/mailetcontainer/api/mock/MockMailProcessor.java
@@ -18,30 +18,18 @@
****************************************************************/
package org.apache.james.mailetcontainer.api.mock;
-import javax.mail.MessagingException;
-
import org.apache.james.mailetcontainer.api.MailProcessor;
import org.apache.mailet.Mail;
public class MockMailProcessor implements MailProcessor {
+ private String newState;
- private boolean shouldThrow = false;
- private String newState = null;
-
- public MockMailProcessor(boolean shouldThrow) {
- this.shouldThrow = shouldThrow;
- }
-
- public MockMailProcessor(String newState) {
+ protected MockMailProcessor(String newState) {
this.newState = newState;
}
@Override
- public void service(Mail mail) throws MessagingException {
- if (shouldThrow) {
- throw new MessagingException();
- } else {
- mail.setState(newState);
- }
+ public void service(Mail mail) {
+ mail.setState(newState);
}
}
diff --git a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
index 0f1170f..fbe8000 100644
--- a/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
+++ b/server/mailet/mailetcontainer-camel/src/test/java/org/apache/james/mailetcontainer/lib/AbstractStateCompositeProcessorTest.java
@@ -26,8 +26,6 @@ import java.io.IOException;
import java.util.Arrays;
import java.util.List;
-import javax.mail.MessagingException;
-
import org.apache.commons.configuration2.HierarchicalConfiguration;
import org.apache.commons.configuration2.ex.ConfigurationException;
import org.apache.commons.configuration2.tree.ImmutableNode;
@@ -53,9 +51,8 @@ public abstract class AbstractStateCompositeProcessorTest {
protected MailProcessor createMailProcessor(final String state, HierarchicalConfiguration<ImmutableNode> config) throws
Exception {
return new MockMailProcessor("") {
-
@Override
- public void service(Mail mail) throws MessagingException {
+ public void service(Mail mail) {
// check if the right processor wasAbstractStateMailetProcessorTest selected depending on the state
assertThat(mail.getState()).isEqualTo(state);
super.service(mail);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org