Modified: james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/base/ImapResponseComposerImplTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/base/ImapResponseComposerImplTest.java?rev=639967&r1=639966&r2=639967&view=diff ============================================================================== --- james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/base/ImapResponseComposerImplTest.java (original) +++ james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/base/ImapResponseComposerImplTest.java Sat Mar 22 01:53:26 2008 @@ -19,10 +19,12 @@ package org.apache.james.imapserver.codec.encode.base; +import java.util.Collection; import java.util.List; import javax.mail.Flags; +import org.apache.james.api.imap.ImapCommand; import org.apache.james.imapserver.codec.encode.AbstractTestImapResponseComposer; public class ImapResponseComposerImplTest extends @@ -62,6 +64,11 @@ protected byte[] encodeStatusResponse(Long messages, Long recent, Long uidNext, Long uidValidity, Long unseen, String mailbox) throws Exception { composer.statusResponse(messages, recent, uidNext, uidValidity, unseen, mailbox); + return writer.getBytes(); + } + + protected byte[] encodeStatusResponse(String tag, ImapCommand command, String type, String responseCode, Collection parameters, int number, String text) throws Exception { + composer.statusResponse(tag, command, type, responseCode, parameters, number, text); return writer.getBytes(); }
Modified: james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/StatusResponseEncoderTest.java URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/StatusResponseEncoderTest.java?rev=639967&r1=639966&r2=639967&view=diff ============================================================================== --- james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/StatusResponseEncoderTest.java (original) +++ james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/StatusResponseEncoderTest.java Sat Mar 22 01:53:26 2008 @@ -59,19 +59,23 @@ } public void testTaggedOkCode() throws Exception { - execute(StatusResponse.Type.OK, StatusResponse.ResponseCode.ALERT, KEY, TAG); - assertEquals(6, this.writer.operations.size()); + execute(StatusResponse.Type.OK, StatusResponse.ResponseCode.alert(), KEY, TAG); + assertEquals(8, this.writer.operations.size()); assertEquals(new MockImapResponseWriter.TagOperation(TAG), writer.operations.get(0)); assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.OK), writer.operations.get(1)); - assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.ALERT.getCode()), + assertEquals(MockImapResponseWriter.BracketOperation.openSquare(), writer.operations.get(2)); - assertEquals(new MockImapResponseWriter.CommandNameOperation(COMMAND), + assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.alert().getCode()), writer.operations.get(3)); - assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()), + assertEquals(MockImapResponseWriter.BracketOperation.closeSquare(), writer.operations.get(4)); + assertEquals(new MockImapResponseWriter.CommandNameOperation(COMMAND), + writer.operations.get(5)); + assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()), + writer.operations.get(6)); assertEquals(new MockImapResponseWriter.EndOperation(), - writer.operations.get(5)); + writer.operations.get(7)); } public void testTaggedOkNoCode() throws Exception { @@ -89,19 +93,23 @@ } public void testTaggedBadCode() throws Exception { - execute(StatusResponse.Type.BAD, StatusResponse.ResponseCode.ALERT, KEY, TAG); - assertEquals(6, this.writer.operations.size()); + execute(StatusResponse.Type.BAD, StatusResponse.ResponseCode.alert(), KEY, TAG); + assertEquals(8, this.writer.operations.size()); assertEquals(new MockImapResponseWriter.TagOperation(TAG), writer.operations.get(0)); assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.BAD), writer.operations.get(1)); - assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.ALERT.getCode()), + assertEquals(MockImapResponseWriter.BracketOperation.openSquare(), writer.operations.get(2)); - assertEquals(new MockImapResponseWriter.CommandNameOperation(COMMAND), + assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.alert().getCode()), writer.operations.get(3)); - assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()), + assertEquals(MockImapResponseWriter.BracketOperation.closeSquare(), writer.operations.get(4)); + assertEquals(new MockImapResponseWriter.CommandNameOperation(COMMAND), + writer.operations.get(5)); + assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()), + writer.operations.get(6)); assertEquals(new MockImapResponseWriter.EndOperation(), - writer.operations.get(5)); + writer.operations.get(7)); } public void testTaggedBadNoCode() throws Exception { @@ -119,19 +127,23 @@ } public void testTaggedNoCode() throws Exception { - execute(StatusResponse.Type.NO, StatusResponse.ResponseCode.ALERT, KEY, TAG); - assertEquals(6, this.writer.operations.size()); + execute(StatusResponse.Type.NO, StatusResponse.ResponseCode.alert(), KEY, TAG); + assertEquals(8, this.writer.operations.size()); assertEquals(new MockImapResponseWriter.TagOperation(TAG), writer.operations.get(0)); assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.NO), writer.operations.get(1)); - assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.ALERT.getCode()), + assertEquals(MockImapResponseWriter.BracketOperation.openSquare(), writer.operations.get(2)); - assertEquals(new MockImapResponseWriter.CommandNameOperation(COMMAND), + assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.alert().getCode()), writer.operations.get(3)); - assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()), + assertEquals(MockImapResponseWriter.BracketOperation.closeSquare(), writer.operations.get(4)); + assertEquals(new MockImapResponseWriter.CommandNameOperation(COMMAND), + writer.operations.get(5)); + assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()), + writer.operations.get(6)); assertEquals(new MockImapResponseWriter.EndOperation(), - writer.operations.get(5)); + writer.operations.get(7)); } public void testTaggedNoNoCode() throws Exception { @@ -150,17 +162,21 @@ public void testUntaggedOkCode() throws Exception { - execute(StatusResponse.Type.OK, StatusResponse.ResponseCode.ALERT, KEY, null); - assertEquals(5, this.writer.operations.size()); + execute(StatusResponse.Type.OK, StatusResponse.ResponseCode.alert(), KEY, null); + assertEquals(7, this.writer.operations.size()); assertEquals(new MockImapResponseWriter.UntaggedOperation(), writer.operations.get(0)); assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.OK), writer.operations.get(1)); - assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.ALERT.getCode()), + assertEquals(MockImapResponseWriter.BracketOperation.openSquare(), writer.operations.get(2)); - assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()), + assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.alert().getCode()), writer.operations.get(3)); + assertEquals(MockImapResponseWriter.BracketOperation.closeSquare(), + writer.operations.get(4)); + assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()), + writer.operations.get(5)); assertEquals(new MockImapResponseWriter.EndOperation(), - writer.operations.get(4)); + writer.operations.get(6)); } public void testUntaggedOkNoCode() throws Exception { @@ -176,17 +192,21 @@ } public void testUntaggedBadCode() throws Exception { - execute(StatusResponse.Type.BAD, StatusResponse.ResponseCode.ALERT, KEY, null); - assertEquals(5, this.writer.operations.size()); + execute(StatusResponse.Type.BAD, StatusResponse.ResponseCode.alert(), KEY, null); + assertEquals(7, this.writer.operations.size()); assertEquals(new MockImapResponseWriter.UntaggedOperation(), writer.operations.get(0)); assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.BAD), writer.operations.get(1)); - assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.ALERT.getCode()), + assertEquals(MockImapResponseWriter.BracketOperation.openSquare(), writer.operations.get(2)); - assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()), + assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.alert().getCode()), writer.operations.get(3)); + assertEquals(MockImapResponseWriter.BracketOperation.closeSquare(), + writer.operations.get(4)); + assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()), + writer.operations.get(5)); assertEquals(new MockImapResponseWriter.EndOperation(), - writer.operations.get(4)); + writer.operations.get(6)); } public void testUntaggedBadNoCode() throws Exception { @@ -202,17 +222,21 @@ } public void testUntaggedNoCode() throws Exception { - execute(StatusResponse.Type.NO, StatusResponse.ResponseCode.ALERT, KEY, null); - assertEquals(5, this.writer.operations.size()); + execute(StatusResponse.Type.NO, StatusResponse.ResponseCode.alert(), KEY, null); + assertEquals(7, this.writer.operations.size()); assertEquals(new MockImapResponseWriter.UntaggedOperation(), writer.operations.get(0)); assertEquals(new MockImapResponseWriter.TextMessageOperation(ImapConstants.NO), writer.operations.get(1)); - assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.ALERT.getCode()), + assertEquals(MockImapResponseWriter.BracketOperation.openSquare(), writer.operations.get(2)); - assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()), + assertEquals(new MockImapResponseWriter.TextMessageOperation(StatusResponse.ResponseCode.alert().getCode()), writer.operations.get(3)); + assertEquals(MockImapResponseWriter.BracketOperation.closeSquare(), + writer.operations.get(4)); + assertEquals(new MockImapResponseWriter.TextMessageOperation(KEY.getDefaultValue()), + writer.operations.get(5)); assertEquals(new MockImapResponseWriter.EndOperation(), - writer.operations.get(4)); + writer.operations.get(6)); } public void testUntaggedNoNoCode() throws Exception { Modified: james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/MockImapResponseWriter.java URL: http://svn.apache.org/viewvc/james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/MockImapResponseWriter.java?rev=639967&r1=639966&r2=639967&view=diff ============================================================================== --- james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/MockImapResponseWriter.java (original) +++ james/server/trunk/imap-codec-library/src/test/java/org/apache/james/imapserver/codec/encode/imap4rev1/legacy/MockImapResponseWriter.java Sat Mar 22 01:53:26 2008 @@ -268,17 +268,28 @@ } public void closeParen() { - operations.add(new ParenOperation(false)); + operations.add(new BracketOperation(false, false)); } public void openParen() { - operations.add(new ParenOperation(true)); + operations.add(new BracketOperation(true, false)); } - public static class ParenOperation { + public static class BracketOperation { + + public static BracketOperation openSquare() { + return new BracketOperation(true, true); + } + + public static BracketOperation closeSquare() { + return new BracketOperation(false, true); + } + private final boolean open; - public ParenOperation(final boolean open) { + private final boolean square; + public BracketOperation(final boolean open, boolean square) { this.open = open; + this.square = square; } /** @@ -290,18 +301,22 @@ } /** - * @see java.lang.Object#hashCode() + * Is this a square bracket? + * @return true if this is a square bracket, + * false otherwise */ + public final boolean isSquare() { + return square; + } + public int hashCode() { final int PRIME = 31; int result = 1; result = PRIME * result + (open ? 1231 : 1237); + result = PRIME * result + (square ? 1231 : 1237); return result; } - /** - * @see java.lang.Object#equals(java.lang.Object) - */ public boolean equals(Object obj) { if (this == obj) return true; @@ -309,12 +324,14 @@ return false; if (getClass() != obj.getClass()) return false; - final ParenOperation other = (ParenOperation) obj; + final BracketOperation other = (BracketOperation) obj; if (open != other.open) return false; + if (square != other.square) + return false; return true; } - + } @@ -355,6 +372,14 @@ } public void skipNextSpace() throws IOException { + } + + public void closeSquareBracket() throws IOException { + operations.add(new BracketOperation(false, true)); + } + + public void openSquareBracket() throws IOException { + operations.add(new BracketOperation(true, true)); } } Modified: james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AppendProcessor.java URL: http://svn.apache.org/viewvc/james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AppendProcessor.java?rev=639967&r1=639966&r2=639967&view=diff ============================================================================== --- james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AppendProcessor.java (original) +++ james/server/trunk/imap-mailbox-processor-function/src/main/java/org/apache/james/imapserver/processor/imap4rev1/AppendProcessor.java Sat Mar 22 01:53:26 2008 @@ -101,7 +101,7 @@ logger.debug("Cannot open mailbox: ", mme); } no(command, tag, responder, HumanReadableTextKey.FAILURE_NO_SUCH_MAILBOX, - StatusResponse.ResponseCode.TRYCREATE); + StatusResponse.ResponseCode.tryCreate()); } } --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
