Author: rdonkin
Date: Sun Jan 11 09:17:48 2009
New Revision: 733492
URL: http://svn.apache.org/viewvc?rev=733492&view=rev
Log:
Switch to JMock 2
Added:
james/protocols/imap/trunk/stage/jmock/jars/jmock-2.5.1.LICENSE
james/protocols/imap/trunk/stage/jmock/jars/jmock-2.5.1.jar (with props)
james/protocols/imap/trunk/stage/jmock/jars/jmock-junit3-2.5.1.LICENSE
james/protocols/imap/trunk/stage/jmock/jars/jmock-junit3-2.5.1.jar (with
props)
james/protocols/imap/trunk/stage/org.hamcrest/
james/protocols/imap/trunk/stage/org.hamcrest/jars/
james/protocols/imap/trunk/stage/org.hamcrest/jars/hamcrest-core-1.1.LICENSE
james/protocols/imap/trunk/stage/org.hamcrest/jars/hamcrest-core-1.1.jar
(with props)
james/protocols/imap/trunk/stage/org.hamcrest/jars/hamcrest-library-1.1.LICENSE
james/protocols/imap/trunk/stage/org.hamcrest/jars/hamcrest-library-1.1.jar
(with props)
Removed:
james/protocols/imap/trunk/stage/jmock/jars/jmock-1.1.0.LICENSE
james/protocols/imap/trunk/stage/jmock/jars/jmock-1.1.0.jar
Modified:
james/protocols/imap/trunk/LICENSE.txt
james/protocols/imap/trunk/api/src/test/java/org/apache/james/api/imap/message/response/imap4rev1/AbstractTestForStatusResponseFactory.java
james/protocols/imap/trunk/build-tools/common-build.xml
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/FetchCommandParserPartialFetchTest.java
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserAndParenthesesTest.java
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserCharsetTest.java
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserNotTest.java
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserOrTest.java
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserQuotedCharsetTest.java
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeySequenceSetTest.java
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeyTest.java
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserTopLevelAndTest.java
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/StoreCommandParserTest.java
james/protocols/imap/trunk/include.properties
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/FakeMailboxListenerFlagsUpdate.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultImplIncludedResultsTest.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultUtilsIsIncludedTest.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventAnalyserTest.java
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ImapResponseTest.java
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoderEnvelopeTest.java
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/FetchResponseEncoderTest.java
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/StatusResponseEncoderTest.java
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/server/LSubResponseEncoderTest.java
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/server/ListResponseEncoderTest.java
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/server/STATUSResponseEncoderTest.java
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/imap4rev1/server/SearchResponseEncoderTest.java
james/protocols/imap/trunk/pom.xml
james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/imap4rev1/LSubProcessorTest.java
james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/imap4rev1/ListProcessorTest.java
james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/imap4rev1/SearchProcessorTest.java
james/protocols/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/imap4rev1/fetch/PartialFetchBodyElementTest.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/MimeDescriptorImpl.java
james/protocols/imap/trunk/store/src/main/java/org/apache/james/imap/store/PartContentBuilder.java
Modified: james/protocols/imap/trunk/LICENSE.txt
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/LICENSE.txt?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
--- james/protocols/imap/trunk/LICENSE.txt (original)
+++ james/protocols/imap/trunk/LICENSE.txt Sun Jan 11 09:17:48 2009
@@ -196,7 +196,10 @@
Bnd, Bundle Tool http://www.aqute.biz/Code/Bnd, The Apache License, Version
2.0
JMock, http://www.jmock.org BSD License
- (see stage/jmock/jars/jmock-1.1.0.LICENSE)
+ (see stage/jmock/jars/jmock-2.5.1.LICENSE)
+
+ Hamcrest http://code.google.com/p/hamcrest/ BSD License
+ (see stage/org.hamcrest/jars/hamcrest-core-1.1.LICENSE)
Village 2.0, The Working-Dogs.com License, Version 1.1
/*
Modified:
james/protocols/imap/trunk/api/src/test/java/org/apache/james/api/imap/message/response/imap4rev1/AbstractTestForStatusResponseFactory.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/api/src/test/java/org/apache/james/api/imap/message/response/imap4rev1/AbstractTestForStatusResponseFactory.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/api/src/test/java/org/apache/james/api/imap/message/response/imap4rev1/AbstractTestForStatusResponseFactory.java
(original)
+++
james/protocols/imap/trunk/api/src/test/java/org/apache/james/api/imap/message/response/imap4rev1/AbstractTestForStatusResponseFactory.java
Sun Jan 11 09:17:48 2009
@@ -21,7 +21,7 @@
import org.apache.james.api.imap.ImapCommand;
import org.apache.james.api.imap.display.HumanReadableTextKey;
-import org.jmock.MockObjectTestCase;
+import org.jmock.integration.junit3.MockObjectTestCase;
abstract public class AbstractTestForStatusResponseFactory extends
MockObjectTestCase {
@@ -43,7 +43,7 @@
protected void setUp() throws Exception {
super.setUp();
factory = createInstance();
- command = (ImapCommand) mock(ImapCommand.class).proxy();
+ command = mock(ImapCommand.class);
}
protected void tearDown() throws Exception {
Modified: james/protocols/imap/trunk/build-tools/common-build.xml
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/build-tools/common-build.xml?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
--- james/protocols/imap/trunk/build-tools/common-build.xml (original)
+++ james/protocols/imap/trunk/build-tools/common-build.xml Sun Jan 11 09:17:48
2009
@@ -215,6 +215,9 @@
<fileset dir="${lib.dir}">
<include name="${junit.jar}"/>
<include name="${jmock.jar}"/>
+ <include name="${jmock-junit.jar}"/>
+ <include name="${hamcrest-library.jar}"/>
+ <include name="${hamcrest-core.jar}"/>
<include name="${commons-beanutils.jar}"/>
<include name="${derby.jar}"/>
</fileset>
Modified:
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/FetchCommandParserPartialFetchTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/FetchCommandParserPartialFetchTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/FetchCommandParserPartialFetchTest.java
(original)
+++
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/FetchCommandParserPartialFetchTest.java
Sun Jan 11 09:17:48 2009
@@ -32,22 +32,16 @@
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.imap4rev1.FetchCommandParser;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
-import org.jmock.core.Constraint;
+import org.jmock.Expectations;
+import org.jmock.integration.junit3.MockObjectTestCase;
public class FetchCommandParserPartialFetchTest extends MockObjectTestCase {
FetchCommandParser parser;
- Mock mockCommandFactory;
-
- Mock mockMessageFactory;
-
- Mock mockCommand;
-
- Mock mockMessage;
+ Imap4Rev1CommandFactory mockCommandFactory;
+ Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
ImapMessage message;
@@ -56,15 +50,14 @@
super.setUp();
parser = new FetchCommandParser();
mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- mockCommandFactory.expects(once()).method("getFetch");
+ checking(new Expectations() {{
+ oneOf (mockCommandFactory).getFetch();
+ }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- mockCommand = mock(ImapCommand.class);
- command = (ImapCommand) mockCommand.proxy();
- mockMessage = mock(ImapMessage.class);
- message = (ImapMessage) mockMessage.proxy();
- parser.init((Imap4Rev1CommandFactory) mockCommandFactory.proxy());
- parser.setMessageFactory((Imap4Rev1MessageFactory) mockMessageFactory
- .proxy());
+ command = mock(ImapCommand.class);
+ message = mock(ImapMessage.class);
+ parser.init(mockCommandFactory);
+ parser.setMessageFactory(mockMessageFactory);
}
protected void tearDown() throws Exception {
@@ -100,14 +93,14 @@
}
private void check(String input, final IdRange[] idSet,
- final boolean useUids, FetchData data, String tag) throws
Exception {
+ final boolean useUids, final FetchData data, final String tag)
throws Exception {
ImapRequestLineReader reader = new ImapRequestLineReader(
new ByteArrayInputStream(input.getBytes("US-ASCII")),
new ByteArrayOutputStream());
- Constraint[] constraints = { eq(command), eq(useUids), eq(idSet),
- eq(data), same(tag) };
- mockMessageFactory.expects(once()).method("createFetchMessage").with(
- constraints).will(returnValue(message));
+ checking(new Expectations() {{
+ oneOf (mockMessageFactory).createFetchMessage(
with(equal(command)), with(equal(useUids)),
+ with(equal(idSet)),with(equal(data)),
with(same(tag)));will(returnValue(message));
+ }});
parser.decode(command, reader, tag, useUids);
}
}
Modified:
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserAndParenthesesTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserAndParenthesesTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserAndParenthesesTest.java
(original)
+++
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserAndParenthesesTest.java
Sun Jan 11 09:17:48 2009
@@ -35,8 +35,8 @@
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.imap4rev1.SearchCommandParser;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.integration.junit3.MockObjectTestCase;
public class SearchCommandParserAndParenthesesTest extends MockObjectTestCase {
@@ -45,7 +45,7 @@
on(), unanswered() };
public static Input and(Input[] parts, boolean parens) {
- List keys = new ArrayList();
+ List<SearchKey> keys = new ArrayList<SearchKey>();
StringBuffer buffer = new StringBuffer();
if (parens) {
buffer.append("(");
@@ -143,13 +143,9 @@
SearchCommandParser parser;
- Mock mockCommandFactory;
+ Imap4Rev1CommandFactory mockCommandFactory;
- Mock mockMessageFactory;
-
- Mock mockCommand;
-
- Mock mockMessage;
+ Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
@@ -159,15 +155,14 @@
super.setUp();
parser = new SearchCommandParser();
mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- mockCommandFactory.expects(once()).method("getSearch");
+ checking(new Expectations() {{
+ oneOf (mockCommandFactory).getSearch();
+ }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- mockCommand = mock(ImapCommand.class);
- command = (ImapCommand) mockCommand.proxy();
- mockMessage = mock(ImapMessage.class);
- message = (ImapMessage) mockMessage.proxy();
- parser.init((Imap4Rev1CommandFactory) mockCommandFactory.proxy());
- parser.setMessageFactory((Imap4Rev1MessageFactory) mockMessageFactory
- .proxy());
+ command = mock(ImapCommand.class);
+ message = mock(ImapMessage.class);
+ parser.init(mockCommandFactory);
+ parser.setMessageFactory(mockMessageFactory);
}
protected void tearDown() throws Exception {
Modified:
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserCharsetTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserCharsetTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserCharsetTest.java
(original)
+++
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserCharsetTest.java
Sun Jan 11 09:17:48 2009
@@ -37,8 +37,8 @@
import
org.apache.james.api.imap.message.response.imap4rev1.StatusResponseFactory;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.imap4rev1.SearchCommandParser;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.integration.junit3.MockObjectTestCase;
public class SearchCommandParserCharsetTest extends MockObjectTestCase {
@@ -64,16 +64,12 @@
SearchCommandParser parser;
- Mock mockStatusResponseFactory;
+ StatusResponseFactory mockStatusResponseFactory;
- Mock mockCommandFactory;
-
- Mock mockMessageFactory;
-
- Mock mockCommand;
-
- Mock mockMessage;
+ Imap4Rev1CommandFactory mockCommandFactory;
+ Imap4Rev1MessageFactory mockMessageFactory;
+
ImapCommand command;
ImapMessage message;
@@ -82,19 +78,16 @@
super.setUp();
parser = new SearchCommandParser();
mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- mockCommandFactory.expects(once()).method("getSearch");
+ checking(new Expectations() {{
+ oneOf (mockCommandFactory).getSearch();
+ }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- mockCommand = mock(ImapCommand.class);
- command = (ImapCommand) mockCommand.proxy();
- mockMessage = mock(ImapMessage.class);
+ command = mock(ImapCommand.class);
+ message = mock(ImapMessage.class);
mockStatusResponseFactory = mock(StatusResponseFactory.class);
- message = (ImapMessage) mockMessage.proxy();
- parser.init((Imap4Rev1CommandFactory) mockCommandFactory.proxy());
- parser.setMessageFactory((Imap4Rev1MessageFactory) mockMessageFactory
- .proxy());
- parser
- .setStatusResponseFactory((StatusResponseFactory)
mockStatusResponseFactory
- .proxy());
+ parser.init(mockCommandFactory);
+ parser.setMessageFactory(mockMessageFactory);
+ parser.setStatusResponseFactory(mockStatusResponseFactory);
parser.setLog(new MockLogger());
}
@@ -103,16 +96,20 @@
}
public void testBadCharset() throws Exception {
- Collection charsetNames = new HashSet();
+ final Collection<String> charsetNames = new HashSet<String>();
for (final Iterator it = Charset.availableCharsets().values()
.iterator(); it.hasNext();) {
final Charset charset = (Charset) it.next();
- final Set aliases = charset.aliases();
+ final Set<String> aliases = charset.aliases();
charsetNames.addAll(aliases);
}
- mockStatusResponseFactory.expects(once()).method("taggedNo").with(
- eq(TAG), same(command), eq(HumanReadableTextKey.BAD_CHARSET),
- eq(StatusResponse.ResponseCode.badCharset(charsetNames)));
+ checking(new Expectations() {{
+ oneOf (mockStatusResponseFactory).taggedNo(
+ with(equal(TAG)),
+ with(same(command)),
+ with(equal(HumanReadableTextKey.BAD_CHARSET)),
+
with(equal(StatusResponse.ResponseCode.badCharset(charsetNames))));
+ }});
ImapRequestLineReader reader = new ImapRequestLineReader(
new ByteArrayInputStream("CHARSET BOGUS
".getBytes("US-ASCII")),
new ByteArrayOutputStream());
Modified:
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserNotTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserNotTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserNotTest.java
(original)
+++
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserNotTest.java
Sun Jan 11 09:17:48 2009
@@ -31,21 +31,16 @@
import org.apache.james.api.imap.message.request.SearchKey;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.imap4rev1.SearchCommandParser;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.integration.junit3.MockObjectTestCase;
public class SearchCommandParserNotTest extends MockObjectTestCase {
SearchCommandParser parser;
- Mock mockCommandFactory;
-
- Mock mockMessageFactory;
-
- Mock mockCommand;
-
- Mock mockMessage;
+ Imap4Rev1CommandFactory mockCommandFactory;
+ Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
ImapMessage message;
@@ -54,15 +49,14 @@
super.setUp();
parser = new SearchCommandParser();
mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- mockCommandFactory.expects(once()).method("getSearch");
+ checking(new Expectations() {{
+ oneOf (mockCommandFactory).getSearch();
+ }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- mockCommand = mock(ImapCommand.class);
- command = (ImapCommand) mockCommand.proxy();
- mockMessage = mock(ImapMessage.class);
- message = (ImapMessage) mockMessage.proxy();
- parser.init((Imap4Rev1CommandFactory) mockCommandFactory.proxy());
- parser.setMessageFactory((Imap4Rev1MessageFactory) mockMessageFactory
- .proxy());
+ command = mock(ImapCommand.class);
+ message = mock(ImapMessage.class);
+ parser.init(mockCommandFactory);
+ parser.setMessageFactory(mockMessageFactory);
}
protected void tearDown() throws Exception {
Modified:
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserOrTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserOrTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserOrTest.java
(original)
+++
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserOrTest.java
Sun Jan 11 09:17:48 2009
@@ -31,19 +31,15 @@
import org.apache.james.api.imap.message.request.SearchKey;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.imap4rev1.SearchCommandParser;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.integration.junit3.MockObjectTestCase;
public class SearchCommandParserOrTest extends MockObjectTestCase {
SearchCommandParser parser;
- Mock mockCommandFactory;
+ Imap4Rev1CommandFactory mockCommandFactory;
- Mock mockMessageFactory;
-
- Mock mockCommand;
-
- Mock mockMessage;
+ Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
@@ -53,15 +49,14 @@
super.setUp();
parser = new SearchCommandParser();
mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- mockCommandFactory.expects(once()).method("getSearch");
+ checking(new Expectations() {{
+ oneOf (mockCommandFactory).getSearch();
+ }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- mockCommand = mock(ImapCommand.class);
- command = (ImapCommand) mockCommand.proxy();
- mockMessage = mock(ImapMessage.class);
- message = (ImapMessage) mockMessage.proxy();
- parser.init((Imap4Rev1CommandFactory) mockCommandFactory.proxy());
- parser.setMessageFactory((Imap4Rev1MessageFactory) mockMessageFactory
- .proxy());
+ command = mock(ImapCommand.class);
+ message = mock(ImapMessage.class);
+ parser.init(mockCommandFactory);
+ parser.setMessageFactory(mockMessageFactory);
}
protected void tearDown() throws Exception {
Modified:
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserQuotedCharsetTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserQuotedCharsetTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserQuotedCharsetTest.java
(original)
+++
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserQuotedCharsetTest.java
Sun Jan 11 09:17:48 2009
@@ -38,8 +38,8 @@
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.imap4rev1.SearchCommandParser;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.integration.junit3.MockObjectTestCase;
public class SearchCommandParserQuotedCharsetTest extends MockObjectTestCase {
@@ -128,15 +128,11 @@
SearchCommandParser parser;
- Mock mockStatusResponseFactory;
+ StatusResponseFactory mockStatusResponseFactory;
- Mock mockCommandFactory;
+ Imap4Rev1CommandFactory mockCommandFactory;
- Mock mockMessageFactory;
-
- Mock mockCommand;
-
- Mock mockMessage;
+ Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
@@ -146,19 +142,16 @@
super.setUp();
parser = new SearchCommandParser();
mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- mockCommandFactory.expects(once()).method("getSearch");
+ checking(new Expectations() {{
+ oneOf (mockCommandFactory).getSearch();
+ }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- mockCommand = mock(ImapCommand.class);
- command = (ImapCommand) mockCommand.proxy();
- mockMessage = mock(ImapMessage.class);
+ command = mock(ImapCommand.class);
+ message = mock(ImapMessage.class);
mockStatusResponseFactory = mock(StatusResponseFactory.class);
- message = (ImapMessage) mockMessage.proxy();
- parser.init((Imap4Rev1CommandFactory) mockCommandFactory.proxy());
- parser.setMessageFactory((Imap4Rev1MessageFactory) mockMessageFactory
- .proxy());
- parser
- .setStatusResponseFactory((StatusResponseFactory)
mockStatusResponseFactory
- .proxy());
+ parser.init(mockCommandFactory);
+ parser.setMessageFactory(mockMessageFactory);
+ parser.setStatusResponseFactory(mockStatusResponseFactory);
parser.setLog(new MockLogger());
}
@@ -189,16 +182,20 @@
}
public void testBadCharset() throws Exception {
- Collection charsetNames = new HashSet();
+ final Collection<String> charsetNames = new HashSet<String>();
for (final Iterator it = Charset.availableCharsets().values()
.iterator(); it.hasNext();) {
final Charset charset = (Charset) it.next();
- final Set aliases = charset.aliases();
+ final Set<String> aliases = charset.aliases();
charsetNames.addAll(aliases);
}
- mockStatusResponseFactory.expects(once()).method("taggedNo").with(
- eq(TAG), same(command), eq(HumanReadableTextKey.BAD_CHARSET),
- eq(StatusResponse.ResponseCode.badCharset(charsetNames)));
+ checking(new Expectations() {{
+ oneOf (mockStatusResponseFactory).taggedNo(
+ with(equal(TAG)),
+ with(same(command)),
+ with(equal(HumanReadableTextKey.BAD_CHARSET)),
+
with(equal(StatusResponse.ResponseCode.badCharset(charsetNames))));
+ }});
ImapRequestLineReader reader = new ImapRequestLineReader(
new ByteArrayInputStream("CHARSET BOGUS
".getBytes("US-ASCII")),
new ByteArrayOutputStream());
Modified:
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeySequenceSetTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeySequenceSetTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeySequenceSetTest.java
(original)
+++
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeySequenceSetTest.java
Sun Jan 11 09:17:48 2009
@@ -30,21 +30,16 @@
import org.apache.james.api.imap.message.request.SearchKey;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.imap4rev1.SearchCommandParser;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.integration.junit3.MockObjectTestCase;
-public class SearchCommandParserSearchKeySequenceSetTest extends
- MockObjectTestCase {
+public class SearchCommandParserSearchKeySequenceSetTest extends
MockObjectTestCase {
SearchCommandParser parser;
- Mock mockCommandFactory;
+ Imap4Rev1CommandFactory mockCommandFactory;
- Mock mockMessageFactory;
-
- Mock mockCommand;
-
- Mock mockMessage;
+ Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
@@ -54,15 +49,14 @@
super.setUp();
parser = new SearchCommandParser();
mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- mockCommandFactory.expects(once()).method("getSearch");
+ checking(new Expectations() {{
+ oneOf (mockCommandFactory).getSearch();
+ }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- mockCommand = mock(ImapCommand.class);
- command = (ImapCommand) mockCommand.proxy();
- mockMessage = mock(ImapMessage.class);
- message = (ImapMessage) mockMessage.proxy();
- parser.init((Imap4Rev1CommandFactory) mockCommandFactory.proxy());
- parser.setMessageFactory((Imap4Rev1MessageFactory) mockMessageFactory
- .proxy());
+ command = mock(ImapCommand.class);
+ message = mock(ImapMessage.class);
+ parser.init(mockCommandFactory);
+ parser.setMessageFactory(mockMessageFactory);
}
protected void tearDown() throws Exception {
Modified:
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeyTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeyTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeyTest.java
(original)
+++
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserSearchKeyTest.java
Sun Jan 11 09:17:48 2009
@@ -32,8 +32,8 @@
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.imap4rev1.SearchCommandParser;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.integration.junit3.MockObjectTestCase;
public class SearchCommandParserSearchKeyTest extends MockObjectTestCase {
@@ -41,14 +41,10 @@
SearchCommandParser parser;
- Mock mockCommandFactory;
-
- Mock mockMessageFactory;
-
- Mock mockCommand;
-
- Mock mockMessage;
+ Imap4Rev1CommandFactory mockCommandFactory;
+ Imap4Rev1MessageFactory mockMessageFactory;
+
ImapCommand command;
ImapMessage message;
@@ -57,15 +53,14 @@
super.setUp();
parser = new SearchCommandParser();
mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- mockCommandFactory.expects(once()).method("getSearch");
+ checking(new Expectations() {{
+ oneOf (mockCommandFactory).getSearch();
+ }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- mockCommand = mock(ImapCommand.class);
- command = (ImapCommand) mockCommand.proxy();
- mockMessage = mock(ImapMessage.class);
- message = (ImapMessage) mockMessage.proxy();
- parser.init((Imap4Rev1CommandFactory) mockCommandFactory.proxy());
- parser.setMessageFactory((Imap4Rev1MessageFactory) mockMessageFactory
- .proxy());
+ command = mock(ImapCommand.class);
+ message = mock(ImapMessage.class);
+ parser.init(mockCommandFactory);
+ parser.setMessageFactory(mockMessageFactory);
}
protected void tearDown() throws Exception {
Modified:
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserTopLevelAndTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserTopLevelAndTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserTopLevelAndTest.java
(original)
+++
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/SearchCommandParserTopLevelAndTest.java
Sun Jan 11 09:17:48 2009
@@ -35,8 +35,8 @@
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.ProtocolException;
import org.apache.james.imap.decode.imap4rev1.SearchCommandParser;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.integration.junit3.MockObjectTestCase;
public class SearchCommandParserTopLevelAndTest extends MockObjectTestCase {
@@ -128,13 +128,9 @@
SearchCommandParser parser;
- Mock mockCommandFactory;
+ Imap4Rev1CommandFactory mockCommandFactory;
- Mock mockMessageFactory;
-
- Mock mockCommand;
-
- Mock mockMessage;
+ Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
@@ -144,15 +140,14 @@
super.setUp();
parser = new SearchCommandParser();
mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- mockCommandFactory.expects(once()).method("getSearch");
+ checking(new Expectations() {{
+ oneOf (mockCommandFactory).getSearch();
+ }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- mockCommand = mock(ImapCommand.class);
- command = (ImapCommand) mockCommand.proxy();
- mockMessage = mock(ImapMessage.class);
- message = (ImapMessage) mockMessage.proxy();
- parser.init((Imap4Rev1CommandFactory) mockCommandFactory.proxy());
- parser.setMessageFactory((Imap4Rev1MessageFactory) mockMessageFactory
- .proxy());
+ command = mock(ImapCommand.class);
+ message = mock(ImapMessage.class);
+ parser.init(mockCommandFactory);
+ parser.setMessageFactory(mockMessageFactory);
}
protected void tearDown() throws Exception {
@@ -176,10 +171,10 @@
}
private void permute(int mutations, Input[] inputs) throws Exception {
- permute(mutations, new ArrayList(), new StringBuffer(), inputs);
+ permute(mutations, new ArrayList<SearchKey>(), new StringBuffer(),
inputs);
}
- private void permute(int mutations, List keys, StringBuffer buffer,
+ private void permute(int mutations, List<SearchKey> keys, StringBuffer
buffer,
Input[] inputs) throws Exception {
if (mutations == 0) {
check(keys, buffer);
@@ -191,14 +186,14 @@
nextBuffer.append(' ');
}
nextBuffer.append(inputs[i].input);
- List nextKeys = new ArrayList(keys);
+ List<SearchKey> nextKeys = new ArrayList<SearchKey>(keys);
nextKeys.add(inputs[i].key);
permute(mutations, nextKeys, nextBuffer, inputs);
}
}
}
- private void check(List keys, StringBuffer buffer)
+ private void check(List<SearchKey> keys, StringBuffer buffer)
throws UnsupportedEncodingException, ProtocolException {
buffer.append("\r\n");
String input = buffer.toString();
Modified:
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/StoreCommandParserTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/StoreCommandParserTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/StoreCommandParserTest.java
(original)
+++
james/protocols/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/imap4rev1/StoreCommandParserTest.java
Sun Jan 11 09:17:48 2009
@@ -31,21 +31,16 @@
import org.apache.james.api.imap.message.IdRange;
import org.apache.james.imap.decode.ImapRequestLineReader;
import org.apache.james.imap.decode.imap4rev1.StoreCommandParser;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
-import org.jmock.core.Constraint;
+import org.jmock.Expectations;
+import org.jmock.integration.junit3.MockObjectTestCase;
public class StoreCommandParserTest extends MockObjectTestCase {
StoreCommandParser parser;
- Mock mockCommandFactory;
+ Imap4Rev1CommandFactory mockCommandFactory;
- Mock mockMessageFactory;
-
- Mock mockCommand;
-
- Mock mockMessage;
+ Imap4Rev1MessageFactory mockMessageFactory;
ImapCommand command;
@@ -55,15 +50,14 @@
super.setUp();
parser = new StoreCommandParser();
mockCommandFactory = mock(Imap4Rev1CommandFactory.class);
- mockCommandFactory.expects(once()).method("getStore");
+ checking(new Expectations() {{
+ oneOf (mockCommandFactory).getStore();
+ }});
mockMessageFactory = mock(Imap4Rev1MessageFactory.class);
- mockCommand = mock(ImapCommand.class);
- command = (ImapCommand) mockCommand.proxy();
- mockMessage = mock(ImapMessage.class);
- message = (ImapMessage) mockMessage.proxy();
- parser.init((Imap4Rev1CommandFactory) mockCommandFactory.proxy());
- parser.setMessageFactory((Imap4Rev1MessageFactory) mockMessageFactory
- .proxy());
+ command = mock(ImapCommand.class);
+ message = mock(ImapMessage.class);
+ parser.init(mockCommandFactory);
+ parser.setMessageFactory(mockMessageFactory);
}
protected void tearDown() throws Exception {
@@ -79,17 +73,24 @@
flags, false, "A01");
}
- private void check(String input, final IdRange[] idSet, boolean silent,
- Boolean sign, final Flags flags, final boolean useUids, String tag)
+ private void check(String input, final IdRange[] idSet,final boolean
silent,
+ final Boolean sign, final Flags flags, final boolean useUids,
final String tag)
throws Exception {
ImapRequestLineReader reader = new ImapRequestLineReader(
new ByteArrayInputStream(input.getBytes("US-ASCII")),
new ByteArrayOutputStream());
- Constraint[] constraints = { eq(command), eq(idSet), eq(silent),
- eq(sign), eq(flags), eq(useUids), same(tag) };
- mockMessageFactory.expects(once()).method("createStoreMessage").with(
- constraints).will(returnValue(message));
+ checking(new Expectations() {{
+ oneOf (mockMessageFactory).createStoreMessage(
+ with(equal(command)),
+ with(equal(idSet)),
+ with(equal(silent)),
+ with(equal(sign)),
+ with(equal(flags)),
+ with(equal(useUids)),
+ with(same(tag))
+ );will(returnValue(message));
+ }});
parser.decode(command, reader, tag, useUids);
}
}
Modified: james/protocols/imap/trunk/include.properties
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/include.properties?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
--- james/protocols/imap/trunk/include.properties (original)
+++ james/protocols/imap/trunk/include.properties Sun Jan 11 09:17:48 2009
@@ -79,6 +79,8 @@
path.lib.serp=net.sourceforge.serp/jars
path.lib.h2=com.h2database/jars
+path.lib.hamcrest=org.hamcrest/jars
+
# --------------------------------------------------
# REQUIRED LIBRARIES
# --------------------------------------------------
@@ -152,8 +154,14 @@
# TEST LIBRARIES
# --------------------------------------------------
-jarname.jmock.jar=jmock-1.1.0.jar
+jarname.hamcrest-core.jar=hamcrest-core-1.1.jar
+jarname.hamcrest-library.jar=hamcrest-library-1.1.jar
+hamcrest-core.jar=${path.lib.hamcrest}/${jarname.hamcrest-core.jar}
+hamcrest-library.jar=${path.lib.hamcrest}/${jarname.hamcrest-library.jar}
+jarname.jmock-junit.jar=jmock-junit3-2.5.1.jar
+jarname.jmock.jar=jmock-2.5.1.jar
jmock.jar=${path.lib.jmock}/${jarname.jmock.jar}
+jmock-junit.jar=${path.lib.jmock}/${jarname.jmock-junit.jar}
jarname.junit.jar=junit-3.8.1.jar
junit.jar=${path.lib.junit}/${jarname.junit.jar}
Modified:
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/FakeMailboxListenerFlagsUpdate.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/FakeMailboxListenerFlagsUpdate.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/FakeMailboxListenerFlagsUpdate.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/FakeMailboxListenerFlagsUpdate.java
Sun Jan 11 09:17:48 2009
@@ -29,7 +29,7 @@
public class FakeMailboxListenerFlagsUpdate extends FlagsUpdated {
- public List flags = new ArrayList();
+ public List<Flags.Flag> flags = new ArrayList<Flags.Flag>();
public long subjectUid;
Modified:
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultImplIncludedResultsTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultImplIncludedResultsTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultImplIncludedResultsTest.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultImplIncludedResultsTest.java
Sun Jan 11 09:17:48 2009
@@ -28,7 +28,7 @@
import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
import org.apache.james.imap.mailbox.util.MessageResultImpl;
import org.apache.james.imap.mailbox.util.MessageResultUtils;
-import org.jmock.MockObjectTestCase;
+import org.jmock.integration.junit3.MockObjectTestCase;
public class MessageResultImplIncludedResultsTest extends MockObjectTestCase {
@@ -39,8 +39,7 @@
protected void setUp() throws Exception {
super.setUp();
result = new MessageResultImpl();
- content = (MessageResult.Content) mock(MessageResult.Content.class)
- .proxy();
+ content = mock(MessageResult.Content.class);
}
protected void tearDown() throws Exception {
Modified:
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultUtilsIsIncludedTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultUtilsIsIncludedTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultUtilsIsIncludedTest.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MessageResultUtilsIsIncludedTest.java
Sun Jan 11 09:17:48 2009
@@ -23,8 +23,8 @@
import org.apache.james.imap.mailbox.MessageResult.FetchGroup;
import org.apache.james.imap.mailbox.util.FetchGroupImpl;
import org.apache.james.imap.mailbox.util.MessageResultUtils;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.integration.junit3.MockObjectTestCase;
public class MessageResultUtilsIsIncludedTest extends MockObjectTestCase {
@@ -108,12 +108,13 @@
return mock(included, true);
}
- private MessageResult mock(FetchGroup included, boolean willBeCalled) {
- Mock result = mock(MessageResult.class);
+ private MessageResult mock(final FetchGroup included, boolean
willBeCalled) {
+ final MessageResult result = mock(MessageResult.class,
included.toString());
if (willBeCalled) {
- result.expects(once()).method("getIncludedResults").will(
- returnValue(included));
+ checking(new Expectations() {{
+ oneOf
(result).getIncludedResults();will(returnValue(included));
+ }});
}
- return (MessageResult) result.proxy();
+ return result;
}
}
Modified:
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventAnalyserTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventAnalyserTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventAnalyserTest.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventAnalyserTest.java
Sun Jan 11 09:17:48 2009
@@ -27,8 +27,8 @@
import org.apache.james.imap.mailbox.FakeMailboxListenerAdded;
import org.apache.james.imap.mailbox.FakeMailboxListenerFlagsUpdate;
import org.apache.james.imap.mailbox.util.MailboxEventAnalyser;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.integration.junit3.MockObjectTestCase;
public class MailboxEventAnalyserTest extends MockObjectTestCase {
@@ -46,10 +46,11 @@
}
public void testShouldBeNoSizeChangeOnOtherEvent() throws Exception {
- final Mock mock = mock(MailboxListener.Event.class);
- mock.expects(atLeastOnce()).method("getSessionId").will(
- returnValue(11L));
- analyser.event((MailboxListener.Event) mock.proxy());
+ final MailboxListener.Event event = mock(MailboxListener.Event.class);
+ checking(new Expectations() {{
+ oneOf(event).getSessionId();will(returnValue(11L));
+ }});
+ analyser.event(event);
assertFalse(analyser.isSizeChanged());
}
Modified:
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java
(original)
+++
james/protocols/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java
Sun Jan 11 09:17:48 2009
@@ -26,8 +26,8 @@
import org.apache.james.imap.mailbox.MailboxListener;
import org.apache.james.imap.mailbox.MessageResult;
import org.apache.james.imap.mailbox.util.MailboxEventDispatcher;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.integration.junit3.MockObjectTestCase;
public class MailboxEventDispatcherFlagsTest extends MockObjectTestCase {
@@ -39,17 +39,15 @@
int sessionId = 10;
- Mock mockMessageResult;
-
protected void setUp() throws Exception {
super.setUp();
dispatcher = new MailboxEventDispatcher();
collector = new EventCollector();
dispatcher.addMailboxListener(collector);
- mockMessageResult = mock(MessageResult.class);
- mockMessageResult.expects(once()).method("getUid").will(
- returnValue(23L));
- result = (MessageResult) mockMessageResult.proxy();
+ result = mock(MessageResult.class);
+ checking(new Expectations() {{
+ oneOf (result).getUid();will(returnValue(23L));
+ }});
}
protected void tearDown() throws Exception {
Modified:
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java
(original)
+++
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java
Sun Jan 11 09:17:48 2009
@@ -27,11 +27,10 @@
import javax.mail.Flags;
import org.apache.james.api.imap.ImapCommand;
-import org.jmock.Mock;
-import org.jmock.MockObjectTestCase;
+import org.jmock.Expectations;
+import org.jmock.integration.junit3.MockObjectTestCase;
-public abstract class AbstractTestImapResponseComposer extends
- MockObjectTestCase {
+public abstract class AbstractTestImapResponseComposer extends
MockObjectTestCase {
private static final long[] ONE_TWO_THREE = { 1, 2, 3 };
@@ -39,7 +38,7 @@
private static final long[] EMPTY = {};
- Mock mockCommand;
+ ImapCommand mockCommand;
protected void setUp() throws Exception {
super.setUp();
@@ -108,7 +107,7 @@
}
public void testAttributes() throws Exception {
- List attributes = new ArrayList();
+ List<String> attributes = new ArrayList<String>();
attributes.add("\\one");
attributes.add("\\two");
attributes.add("\\three");
@@ -166,7 +165,7 @@
}
public void testShouldEncodeListParameterStatus() throws Exception {
- Collection parameters = new ArrayList();
+ Collection<String> parameters = new ArrayList<String>();
parameters.add("ONE");
parameters.add("TWO");
parameters.add("THREE");
@@ -259,8 +258,10 @@
clear();
}
- private ImapCommand command(String name) {
- mockCommand.expects(once()).method("getName").will(returnValue(name));
- return (ImapCommand) mockCommand.proxy();
+ private ImapCommand command(final String name) {
+ checking(new Expectations() {{
+ oneOf (mockCommand).getName();will(returnValue(name));
+ }});
+ return mockCommand;
}
}
Modified:
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ImapResponseTest.java
URL:
http://svn.apache.org/viewvc/james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ImapResponseTest.java?rev=733492&r1=733491&r2=733492&view=diff
==============================================================================
---
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ImapResponseTest.java
(original)
+++
james/protocols/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ImapResponseTest.java
Sun Jan 11 09:17:48 2009
@@ -21,11 +21,9 @@
import javax.mail.Flags;
-import org.apache.james.api.imap.ImapConstants;
-import org.apache.james.imap.encode.ImapResponseComposer;
import org.apache.james.imap.encode.base.ImapResponseComposerImpl;
import org.apache.james.imap.encode.imap4rev1.legacy.MockImapResponseWriter;
-import org.jmock.MockObjectTestCase;
+import org.jmock.integration.junit3.MockObjectTestCase;
public class ImapResponseTest extends MockObjectTestCase {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
