Author: rdonkin
Date: Tue Mar 31 17:48:58 2009
New Revision: 760540
URL: http://svn.apache.org/viewvc?rev=760540&view=rev
Log:
Simplify design by removing unnecessary interface
Modified:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapCommand.java
james/imap/trunk/api/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
james/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/StandardImap4Rev1CommandFactory.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/StatusResponseEncoderTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
Modified:
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapCommand.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapCommand.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapCommand.java
(original)
+++
james/imap/trunk/api/src/main/java/org/apache/james/imap/api/ImapCommand.java
Tue Mar 31 17:48:58 2009
@@ -19,27 +19,71 @@
package org.apache.james.imap.api;
+
/**
* Represents a processor for a particular Imap command. Implementations of
this
* interface should encpasulate all command specific processing.
*
* @version $Revision: 109034 $
*/
-public interface ImapCommand {
- /**
- * @return the name of the command, as specified in rfc2060.
- */
- String getName();
-
- /**
- * Specifies if this command is valid for the given session state.
- *
- * @param state
- * The current
- * {...@link org.apache.james.imap.api.ImapSessionState state}
of
- * the
- * {...@link
org.apache.james.experimental.imapserver.ImapSession}
- * @return <code>true</code> if the command is valid in this state.
- */
- boolean validForState(ImapSessionState state);
+public class ImapCommand {
+ public static ImapCommand nonAuthenticatedStateCommand(final String
name) {
+ return new ImapCommand(false, false, true, name);
+ }
+
+ public static ImapCommand authenticatedStateCommand(final String name) {
+ return new ImapCommand(true, true, false, name);
+ }
+
+ public static ImapCommand selectedStateCommand(final String name) {
+ return new ImapCommand(false, true, false, name);
+ }
+
+ public static ImapCommand anyStateCommand(final String name) {
+ return new ImapCommand(true, true, true, name);
+ }
+
+ private final boolean validInAuthenticated;
+
+ private final boolean validInSelected;
+
+ private final boolean validInNonAuthenticated;
+
+ private final String name;
+
+ private ImapCommand(boolean validInAuthenticated,
+ boolean validInSelected, boolean
validInNonAuthenticated,
+ final String name) {
+ super();
+ this.validInAuthenticated = validInAuthenticated;
+ this.validInSelected = validInSelected;
+ this.validInNonAuthenticated = validInNonAuthenticated;
+ this.name = name;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public boolean validForState(ImapSessionState state) {
+ final boolean result;
+ switch (state) {
+ case AUTHENTICATED:
+ result = validInAuthenticated;
+ break;
+ case NON_AUTHENTICATED:
+ result = validInNonAuthenticated;
+ break;
+ case SELECTED:
+ result = validInSelected;
+ break;
+ default:
+ result = false;
+ }
+ return result;
+ }
+
+ public String toString() {
+ return name;
+ }
}
Modified:
james/imap/trunk/api/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/api/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/api/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java
(original)
+++
james/imap/trunk/api/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java
Tue Mar 31 17:48:58 2009
@@ -45,7 +45,7 @@
protected void setUp() throws Exception {
super.setUp();
factory = createInstance();
- command = mock(ImapCommand.class);
+ command = ImapCommand.anyStateCommand("Command");
}
protected void tearDown() throws Exception {
Modified:
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
(original)
+++
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
Tue Mar 31 17:48:58 2009
@@ -54,7 +54,7 @@
oneOf (mockCommandFactory).getFetch();
}});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- command = mock(ImapCommand.class);
+ command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
Modified:
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
(original)
+++
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
Tue Mar 31 17:48:58 2009
@@ -159,7 +159,7 @@
oneOf (mockCommandFactory).getSearch();
}});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- command = mock(ImapCommand.class);
+ command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
Modified:
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
(original)
+++
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
Tue Mar 31 17:48:58 2009
@@ -82,7 +82,7 @@
oneOf (mockCommandFactory).getSearch();
}});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- command = mock(ImapCommand.class);
+ command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
mockStatusResponseFactory = mock(StatusResponseFactory.class);
parser.init(mockCommandFactory);
Modified:
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
(original)
+++
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
Tue Mar 31 17:48:58 2009
@@ -53,7 +53,7 @@
oneOf (mockCommandFactory).getSearch();
}});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- command = mock(ImapCommand.class);
+ command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
Modified:
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
(original)
+++
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
Tue Mar 31 17:48:58 2009
@@ -53,7 +53,7 @@
oneOf (mockCommandFactory).getSearch();
}});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- command = mock(ImapCommand.class);
+ command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
Modified:
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
(original)
+++
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
Tue Mar 31 17:48:58 2009
@@ -146,7 +146,7 @@
oneOf (mockCommandFactory).getSearch();
}});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- command = mock(ImapCommand.class);
+ command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
mockStatusResponseFactory = mock(StatusResponseFactory.class);
parser.init(mockCommandFactory);
Modified:
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
(original)
+++
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
Tue Mar 31 17:48:58 2009
@@ -53,7 +53,7 @@
oneOf (mockCommandFactory).getSearch();
}});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- command = mock(ImapCommand.class);
+ command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
Modified:
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
(original)
+++
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
Tue Mar 31 17:48:58 2009
@@ -57,7 +57,7 @@
oneOf (mockCommandFactory).getSearch();
}});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- command = mock(ImapCommand.class);
+ command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
Modified:
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
(original)
+++
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
Tue Mar 31 17:48:58 2009
@@ -144,7 +144,7 @@
oneOf (mockCommandFactory).getSearch();
}});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- command = mock(ImapCommand.class);
+ command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
Modified:
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
(original)
+++
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
Tue Mar 31 17:48:58 2009
@@ -54,7 +54,7 @@
oneOf (mockCommandFactory).getStore();
}});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- command = mock(ImapCommand.class);
+ command = ImapCommand.anyStateCommand("Command");
message = mock(ImapMessage.class);
parser.init(mockCommandFactory);
parser.setMessageFactory(mockMessageFactory);
Modified:
james/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/StandardImap4Rev1CommandFactory.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/StandardImap4Rev1CommandFactory.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/StandardImap4Rev1CommandFactory.java
(original)
+++
james/imap/trunk/message/src/main/java/org/apache/james/imap/command/imap4rev1/StandardImap4Rev1CommandFactory.java
Tue Mar 31 17:48:58 2009
@@ -24,76 +24,76 @@
public class StandardImap4Rev1CommandFactory implements
Imap4Rev1CommandFactory {
- private final ImapCommand append = ImapCommandImpl
+ private final ImapCommand append = ImapCommand
.authenticatedStateCommand(ImapConstants.APPEND_COMMAND_NAME);
- private final ImapCommand authenticate = ImapCommandImpl
+ private final ImapCommand authenticate = ImapCommand
.nonAuthenticatedStateCommand(ImapConstants.AUTHENTICATE_COMMAND_NAME);
- private final ImapCommand capability = ImapCommandImpl
+ private final ImapCommand capability = ImapCommand
.anyStateCommand(ImapConstants.CAPABILITY_COMMAND_NAME);
- private final ImapCommand check = ImapCommandImpl
+ private final ImapCommand check = ImapCommand
.selectedStateCommand(ImapConstants.CHECK_COMMAND_NAME);
- private final ImapCommand close = ImapCommandImpl
+ private final ImapCommand close = ImapCommand
.selectedStateCommand(ImapConstants.CLOSE_COMMAND_NAME);
- private final ImapCommand copy = ImapCommandImpl
+ private final ImapCommand copy = ImapCommand
.selectedStateCommand(ImapConstants.COPY_COMMAND_NAME);
- private final ImapCommand create = ImapCommandImpl
+ private final ImapCommand create = ImapCommand
.authenticatedStateCommand(ImapConstants.CREATE_COMMAND_NAME);
- private final ImapCommand delete = ImapCommandImpl
+ private final ImapCommand delete = ImapCommand
.authenticatedStateCommand(ImapConstants.DELETE_COMMAND_NAME);
- private final ImapCommand examine = ImapCommandImpl
+ private final ImapCommand examine = ImapCommand
.authenticatedStateCommand(ImapConstants.EXAMINE_COMMAND_NAME);
- private final ImapCommand expunge = ImapCommandImpl
+ private final ImapCommand expunge = ImapCommand
.selectedStateCommand(ImapConstants.EXPUNGE_COMMAND_NAME);
- private final ImapCommand fetch = ImapCommandImpl
+ private final ImapCommand fetch = ImapCommand
.selectedStateCommand(ImapConstants.FETCH_COMMAND_NAME);
- private final ImapCommand list = ImapCommandImpl
+ private final ImapCommand list = ImapCommand
.authenticatedStateCommand(ImapConstants.LIST_COMMAND_NAME);
- private final ImapCommand login = ImapCommandImpl
+ private final ImapCommand login = ImapCommand
.nonAuthenticatedStateCommand(ImapConstants.LOGIN_COMMAND_NAME);
- private final ImapCommand logout = ImapCommandImpl
+ private final ImapCommand logout = ImapCommand
.anyStateCommand(ImapConstants.LOGOUT_COMMAND_NAME);
- private final ImapCommand lsub = ImapCommandImpl
+ private final ImapCommand lsub = ImapCommand
.authenticatedStateCommand(ImapConstants.LSUB_COMMAND_NAME);
- private final ImapCommand noop = ImapCommandImpl
+ private final ImapCommand noop = ImapCommand
.anyStateCommand(ImapConstants.NOOP_COMMAND_NAME);
- private final ImapCommand rename = ImapCommandImpl
+ private final ImapCommand rename = ImapCommand
.authenticatedStateCommand(ImapConstants.RENAME_COMMAND_NAME);
- private final ImapCommand search = ImapCommandImpl
+ private final ImapCommand search = ImapCommand
.selectedStateCommand(ImapConstants.SEARCH_COMMAND_NAME);
- private final ImapCommand select = ImapCommandImpl
+ private final ImapCommand select = ImapCommand
.authenticatedStateCommand(ImapConstants.SELECT_COMMAND_NAME);
- private final ImapCommand status = ImapCommandImpl
+ private final ImapCommand status = ImapCommand
.authenticatedStateCommand(ImapConstants.STATUS_COMMAND_NAME);
- private final ImapCommand store = ImapCommandImpl
+ private final ImapCommand store = ImapCommand
.selectedStateCommand(ImapConstants.STORE_COMMAND_NAME);
- private final ImapCommand subscribe = ImapCommandImpl
+ private final ImapCommand subscribe = ImapCommand
.authenticatedStateCommand(ImapConstants.SUBSCRIBE_COMMAND_NAME);
- private final ImapCommand uid = ImapCommandImpl
+ private final ImapCommand uid = ImapCommand
.selectedStateCommand(ImapConstants.UID_COMMAND_NAME);
- private final ImapCommand unsubscribe = ImapCommandImpl
+ private final ImapCommand unsubscribe = ImapCommand
.authenticatedStateCommand(ImapConstants.UNSUBSCRIBE_COMMAND_NAME);
/**
Modified:
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java
(original)
+++
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java
Tue Mar 31 17:48:58 2009
@@ -27,7 +27,6 @@
import javax.mail.Flags;
import org.apache.james.imap.api.ImapCommand;
-import org.jmock.Expectations;
import org.jmock.integration.junit3.MockObjectTestCase;
public abstract class AbstractTestImapResponseComposer extends
MockObjectTestCase {
@@ -38,11 +37,8 @@
private static final long[] EMPTY = {};
- ImapCommand mockCommand;
-
protected void setUp() throws Exception {
super.setUp();
- mockCommand = mock(ImapCommand.class);
}
protected void tearDown() throws Exception {
@@ -259,9 +255,6 @@
}
private ImapCommand command(final String name) {
- checking(new Expectations() {{
- oneOf (mockCommand).getName();will(returnValue(name));
- }});
- return mockCommand;
+ return ImapCommand.anyStateCommand(name);
}
}
Modified:
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java
(original)
+++
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java
Tue Mar 31 17:48:58 2009
@@ -59,7 +59,7 @@
FetchResponseEncoder encoder;
- ImapCommand mockCommand;
+ ImapCommand stubCommand;
FetchResponse message;
@@ -104,7 +104,7 @@
composer = mock(ImapResponseComposer.class);
mockNextEncoder = mock(ImapEncoder.class);
encoder = new FetchResponseEncoder(mockNextEncoder);
- mockCommand = mock(ImapCommand.class);
+ stubCommand = ImapCommand.anyStateCommand("COMMAND");
flags = new Flags(Flags.Flag.DELETED);
}
Modified:
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java
(original)
+++
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java
Tue Mar 31 17:48:58 2009
@@ -42,14 +42,14 @@
FetchResponseEncoder encoder;
- ImapCommand mockCommand;
+ ImapCommand stubCommand;
protected void setUp() throws Exception {
super.setUp();
composer = mock(ImapResponseComposer.class);
mockNextEncoder = mock(ImapEncoder.class);
encoder = new FetchResponseEncoder(mockNextEncoder);
- mockCommand = mock(ImapCommand.class);
+ stubCommand = ImapCommand.anyStateCommand("COMMAND");
flags = new Flags(Flags.Flag.DELETED);
}
Modified:
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/StatusResponseEncoderTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/StatusResponseEncoderTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/StatusResponseEncoderTest.java
(original)
+++
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/StatusResponseEncoderTest.java
Tue Mar 31 17:48:58 2009
@@ -49,7 +49,7 @@
StatusResponseEncoder encoder;
- ImapCommand mockCommand;
+ ImapCommand stubCommand;
protected void setUp() throws Exception {
super.setUp();
@@ -58,7 +58,7 @@
mockNextEncoder = mock(ImapEncoder.class);
mockStatusResponse = mock(StatusResponse.class);
encoder = new StatusResponseEncoder(mockNextEncoder);
- mockCommand = mock(ImapCommand.class);
+ stubCommand = ImapCommand.anyStateCommand(COMMAND);
}
protected void tearDown() throws Exception {
@@ -303,8 +303,7 @@
if (tag == null) {
oneOf(mockStatusResponse).getCommand();will(returnValue(null));
} else {
- oneOf(mockCommand).getName();will(returnValue(COMMAND));
-
oneOf(mockStatusResponse).getCommand();will(returnValue(mockCommand));
+
oneOf(mockStatusResponse).getCommand();will(returnValue(stubCommand));
}
}});
}
Modified:
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
(original)
+++
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
Tue Mar 31 17:48:58 2009
@@ -90,7 +90,7 @@
subscriptions = new ArrayList<String>();
serverResponseFactory = mock(StatusResponseFactory.class);
session = mock(ImapSession.class);
- command = mock(ImapCommand.class);
+ command = ImapCommand.anyStateCommand("Command");
next = mock(ImapProcessor.class);
responder = mock(ImapProcessor.Responder.class);
result = mock(MailboxMetaData.class);
Modified:
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java
(original)
+++
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java
Tue Mar 31 17:48:58 2009
@@ -51,7 +51,7 @@
protected void setUp() throws Exception {
serverResponseFactory = mock(StatusResponseFactory.class);
session = mock(ImapSession.class);
- command = mock(ImapCommand.class);
+ command = ImapCommand.anyStateCommand("Command");
next = mock(ImapProcessor.class);
responder = mock(ImapProcessor.Responder.class);
result = mock(MailboxMetaData.class);
Modified:
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
URL:
http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java?rev=760540&r1=760539&r2=760540&view=diff
==============================================================================
---
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
(original)
+++
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
Tue Mar 31 17:48:58 2009
@@ -106,7 +106,7 @@
super.setUp();
serverResponseFactory = mock(StatusResponseFactory.class);
session = mock(ImapSession.class);
- command = mock(ImapCommand.class);
+ command = ImapCommand.anyStateCommand("Command");
next = mock(ImapProcessor.class);
responder = mock(ImapProcessor.Responder.class);
statusResponse = mock(StatusResponse.class);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscr...@james.apache.org
For additional commands, e-mail: server-dev-h...@james.apache.org
