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 no...@apache.org on 2010/03/16 18:55:30 UTC
svn commit: r923904 [3/4] - in /james/imap/trunk: ./ api/
api/src/test/java/org/apache/james/imap/api/message/response/ decode/
decode/src/test/java/org/apache/james/imap/decode/parser/
deployment/src/test/java/org/apache/james/imap/functional/ deploym...
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java Tue Mar 16 17:55:28 2010
@@ -19,6 +19,8 @@
package org.apache.james.imap.encode;
+import static org.junit.Assert.*;
+
import java.util.Arrays;
import java.util.List;
@@ -30,9 +32,15 @@ import org.apache.james.imap.encode.List
import org.apache.james.imap.message.response.LSubResponse;
import org.apache.james.imap.message.response.ListResponse;
import org.jmock.Expectations;
-import org.jmock.integration.junit3.MockObjectTestCase;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
-public class SearchResponseEncoderTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class SearchResponseEncoderTest {
ListResponseEncoder encoder;
@@ -40,28 +48,28 @@ public class SearchResponseEncoderTest e
ImapResponseComposer composer;
+ private Mockery context = new JUnit4Mockery();
+
+ @Before
protected void setUp() throws Exception {
- super.setUp();
- mockNextEncoder = mock(ImapEncoder.class);
- composer = mock(ImapResponseComposer.class);
+ mockNextEncoder = context.mock(ImapEncoder.class);
+ composer = context.mock(ImapResponseComposer.class);
encoder = new ListResponseEncoder(mockNextEncoder);
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testIsAcceptable() {
assertTrue(encoder.isAcceptable(new ListResponse(true, true, true,
true, false, false, ".", "name")));
assertFalse(encoder.isAcceptable(new LSubResponse("name", ".", true)));
- assertFalse(encoder.isAcceptable(mock(ImapMessage.class)));
+ assertFalse(encoder.isAcceptable(context.mock(ImapMessage.class)));
assertFalse(encoder.isAcceptable(null));
}
+ @Test
@SuppressWarnings("unchecked")
public void testName() throws Exception {
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
oneOf(composer).listResponse(
with(same("LIST")),
with(aNull(List.class)),
@@ -71,9 +79,10 @@ public class SearchResponseEncoderTest e
encoder.encode(new ListResponse(false, false, false, false, false, false, ".", "INBOX.name"), composer, new FakeImapSession());
}
+ @Test
@SuppressWarnings("unchecked")
public void testDelimiter() throws Exception {
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
oneOf(composer).listResponse(
with(same("LIST")),
with(aNull(List.class)),
@@ -83,9 +92,10 @@ public class SearchResponseEncoderTest e
encoder.encode(new ListResponse(false, false, false, false, false, false, "@", "INBOX.name"), composer, new FakeImapSession());
}
+ @Test
@SuppressWarnings("unchecked")
public void testNoDelimiter() throws Exception {
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
oneOf(composer).listResponse(
with(same("LIST")),
with(aNull(List.class)),
@@ -95,12 +105,13 @@ public class SearchResponseEncoderTest e
encoder.encode(new ListResponse(false, false, false, false, false, false, null, "INBOX.name"), composer, new FakeImapSession());
}
+ @Test
public void testAllAttributes() throws Exception {
final String[] all = { ImapConstants.NAME_ATTRIBUTE_NOINFERIORS,
ImapConstants.NAME_ATTRIBUTE_NOSELECT,
ImapConstants.NAME_ATTRIBUTE_MARKED,
ImapConstants.NAME_ATTRIBUTE_UNMARKED };
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
oneOf(composer).listResponse(
with(same("LIST")),
with(equal(Arrays.asList(all))),
@@ -110,9 +121,10 @@ public class SearchResponseEncoderTest e
encoder.encode(new ListResponse(true, true, true, true, false, false, ".", "INBOX.name"), composer, new FakeImapSession());
}
+ @Test
public void testNoInferiors() throws Exception {
final String[] values = { ImapConstants.NAME_ATTRIBUTE_NOINFERIORS };
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
oneOf(composer).listResponse(
with(same("LIST")),
with(equal(Arrays.asList(values))),
@@ -122,9 +134,10 @@ public class SearchResponseEncoderTest e
encoder.encode(new ListResponse(true, false, false, false, false, false, ".", "INBOX.name"), composer, new FakeImapSession());
}
+ @Test
public void testNoSelect() throws Exception {
final String[] values = { ImapConstants.NAME_ATTRIBUTE_NOSELECT };
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
oneOf(composer).listResponse(
with(same("LIST")),
with(equal(Arrays.asList(values))),
@@ -134,9 +147,10 @@ public class SearchResponseEncoderTest e
encoder.encode(new ListResponse(false, true, false, false, false, false, ".", "INBOX.name"), composer, new FakeImapSession());
}
+ @Test
public void testMarked() throws Exception {
final String[] values = { ImapConstants.NAME_ATTRIBUTE_MARKED };
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
oneOf(composer).listResponse(
with(same("LIST")),
with(equal(Arrays.asList(values))),
@@ -146,9 +160,10 @@ public class SearchResponseEncoderTest e
encoder.encode(new ListResponse(false, false, true, false, false, false, ".", "INBOX.name"), composer, new FakeImapSession());
}
+ @Test
public void testUnmarked() throws Exception {
final String[] values = { ImapConstants.NAME_ATTRIBUTE_UNMARKED };
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
oneOf(composer).listResponse(
with(same("LIST")),
with(equal(Arrays.asList(values))),
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=923904&r1=923903&r2=923904&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 16 17:55:28 2010
@@ -19,6 +19,8 @@
package org.apache.james.imap.encode;
+import static org.junit.Assert.*;
+
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapConstants;
import org.apache.james.imap.api.display.HumanReadableText;
@@ -29,9 +31,15 @@ import org.apache.james.imap.encode.Stat
import org.apache.james.imap.encode.base.ImapResponseComposerImpl;
import org.apache.james.imap.encode.main.DefaultLocalizer;
import org.jmock.Expectations;
-import org.jmock.integration.junit3.MockObjectTestCase;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
-public class StatusResponseEncoderTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class StatusResponseEncoderTest {
private static final String COMMAND = "COMMAND";
@@ -52,20 +60,20 @@ public class StatusResponseEncoderTest e
ImapCommand stubCommand;
+ private Mockery context = new JUnit4Mockery();
+
+ @Before
protected void setUp() throws Exception {
- super.setUp();
writer = new MockImapResponseWriter();
response = new ImapResponseComposerImpl(writer);
- mockNextEncoder = mock(ImapEncoder.class);
- mockStatusResponse = mock(StatusResponse.class);
+ mockNextEncoder = context.mock(ImapEncoder.class);
+ mockStatusResponse = context.mock(StatusResponse.class);
encoder = new StatusResponseEncoder(mockNextEncoder, new DefaultLocalizer());
stubCommand = ImapCommand.anyStateCommand(COMMAND);
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
+ @Test
public void testTaggedOkCode() throws Exception {
execute(StatusResponse.Type.OK, StatusResponse.ResponseCode.alert(),
KEY, TAG);
@@ -89,6 +97,7 @@ public class StatusResponseEncoderTest e
writer.operations.get(7));
}
+ @Test
public void testTaggedOkNoCode() throws Exception {
execute(StatusResponse.Type.OK, null, KEY, TAG);
assertEquals(5, this.writer.operations.size());
@@ -104,6 +113,7 @@ public class StatusResponseEncoderTest e
writer.operations.get(4));
}
+ @Test
public void testTaggedBadCode() throws Exception {
execute(StatusResponse.Type.BAD, StatusResponse.ResponseCode.alert(),
KEY, TAG);
@@ -127,6 +137,7 @@ public class StatusResponseEncoderTest e
writer.operations.get(7));
}
+ @Test
public void testTaggedBadNoCode() throws Exception {
execute(StatusResponse.Type.BAD, null, KEY, TAG);
assertEquals(5, this.writer.operations.size());
@@ -142,6 +153,7 @@ public class StatusResponseEncoderTest e
writer.operations.get(4));
}
+ @Test
public void testTaggedNoCode() throws Exception {
execute(StatusResponse.Type.NO, StatusResponse.ResponseCode.alert(),
KEY, TAG);
@@ -165,6 +177,7 @@ public class StatusResponseEncoderTest e
writer.operations.get(7));
}
+ @Test
public void testTaggedNoNoCode() throws Exception {
execute(StatusResponse.Type.NO, null, KEY, TAG);
assertEquals(5, this.writer.operations.size());
@@ -180,6 +193,7 @@ public class StatusResponseEncoderTest e
writer.operations.get(4));
}
+ @Test
public void testUntaggedOkCode() throws Exception {
execute(StatusResponse.Type.OK, StatusResponse.ResponseCode.alert(),
KEY, null);
@@ -201,6 +215,7 @@ public class StatusResponseEncoderTest e
writer.operations.get(6));
}
+ @Test
public void testUntaggedOkNoCode() throws Exception {
execute(StatusResponse.Type.OK, null, KEY, null);
assertEquals(4, this.writer.operations.size());
@@ -214,6 +229,7 @@ public class StatusResponseEncoderTest e
writer.operations.get(3));
}
+ @Test
public void testUntaggedBadCode() throws Exception {
execute(StatusResponse.Type.BAD, StatusResponse.ResponseCode.alert(),
KEY, null);
@@ -235,6 +251,7 @@ public class StatusResponseEncoderTest e
writer.operations.get(6));
}
+ @Test
public void testUntaggedBadNoCode() throws Exception {
execute(StatusResponse.Type.BAD, null, KEY, null);
assertEquals(4, this.writer.operations.size());
@@ -248,6 +265,7 @@ public class StatusResponseEncoderTest e
writer.operations.get(3));
}
+ @Test
public void testUntaggedNoCode() throws Exception {
execute(StatusResponse.Type.NO, StatusResponse.ResponseCode.alert(),
KEY, null);
@@ -269,6 +287,7 @@ public class StatusResponseEncoderTest e
writer.operations.get(6));
}
+ @Test
public void testUntaggedNoNoCode() throws Exception {
execute(StatusResponse.Type.NO, null, KEY, null);
assertEquals(4, this.writer.operations.size());
@@ -289,6 +308,7 @@ public class StatusResponseEncoderTest e
compose();
}
+
private void compose() throws Exception {
encoder.doEncode(mockStatusResponse, response, new FakeImapSession());
}
@@ -296,7 +316,7 @@ public class StatusResponseEncoderTest e
private void configure(final StatusResponse.Type type,
final StatusResponse.ResponseCode code, final HumanReadableText key,
final String tag) {
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
oneOf(mockStatusResponse).getServerResponseType();will(returnValue(type));
oneOf(mockStatusResponse).getTag();will(returnValue(tag));
oneOf(mockStatusResponse).getTextKey();will(returnValue(key));
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ImapResponseComposerImplTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ImapResponseComposerImplTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ImapResponseComposerImplTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ImapResponseComposerImplTest.java Tue Mar 16 17:55:28 2010
@@ -26,6 +26,7 @@ import javax.mail.Flags;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.encode.AbstractTestImapResponseComposer;
+import org.junit.Before;
public class ImapResponseComposerImplTest extends
AbstractTestImapResponseComposer {
@@ -34,15 +35,12 @@ public class ImapResponseComposerImplTes
ByteImapResponseWriter writer;
+ @Before
protected void setUp() throws Exception {
- super.setUp();
writer = new ByteImapResponseWriter();
composer = new ImapResponseComposerImpl(writer);
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
protected byte[] encodeListResponse(String typeName, List<String> attributes,
String hierarchyDelimiter, String name) throws Exception {
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/message/response/UnpooledStatusResponseFactoryTest.java Tue Mar 16 17:55:28 2010
@@ -26,14 +26,6 @@ import org.apache.james.imap.message.res
public class UnpooledStatusResponseFactoryTest extends
AbstractTestForStatusResponseFactory {
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
protected StatusResponseFactory createInstance() {
return new UnpooledStatusResponseFactory();
}
Modified: james/imap/trunk/parent/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/parent/pom.xml?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/parent/pom.xml (original)
+++ james/imap/trunk/parent/pom.xml Tue Mar 16 17:55:28 2010
@@ -388,7 +388,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
- <version>3.8.1</version>
+ <version>4.8.1</version>
</dependency>
<dependency>
@@ -399,7 +399,7 @@
</dependency>
<dependency>
<groupId>org.jmock</groupId>
- <artifactId>jmock-junit3</artifactId>
+ <artifactId>jmock-junit4</artifactId>
<version>${version.jmock}</version>
<scope>test</scope>
</dependency>
Modified: james/imap/trunk/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/pom.xml?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/pom.xml (original)
+++ james/imap/trunk/pom.xml Tue Mar 16 17:55:28 2010
@@ -52,6 +52,13 @@
<module>maildir</module>
-->
</modules>
+ <dependencies>
+ <dependency>
+ <groupId>org.jmock</groupId>
+ <artifactId>jmock-junit4</artifactId>
+ <version>2.5.1</version>
+ </dependency>
+ </dependencies>
<distributionManagement>
<site>
Modified: james/imap/trunk/processor/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/pom.xml?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/processor/pom.xml (original)
+++ james/imap/trunk/processor/pom.xml Tue Mar 16 17:55:28 2010
@@ -79,7 +79,7 @@
</dependency>
<dependency>
<groupId>org.jmock</groupId>
- <artifactId>jmock-junit3</artifactId>
+ <artifactId>jmock-junit4</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
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=923904&r1=923903&r2=923904&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 16 17:55:28 2010
@@ -36,9 +36,15 @@ import org.apache.james.imap.message.req
import org.apache.james.imap.message.response.LSubResponse;
import org.apache.james.imap.processor.base.ImapSessionUtils;
import org.jmock.Expectations;
-import org.jmock.integration.junit3.MockObjectTestCase;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
-public class LSubProcessorTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class LSubProcessorTest {
private static final String ROOT = "ROOT";
@@ -83,30 +89,30 @@ public class LSubProcessorTest extends M
private ImapProcessor.Responder responderImpl;
+ private Mockery mockery = new JUnit4Mockery();
+
+ @Before
protected void setUp() throws Exception {
subscriptions = new ArrayList<String>();
- serverResponseFactory = mock(StatusResponseFactory.class);
- session = mock(ImapSession.class);
+ serverResponseFactory = mockery.mock(StatusResponseFactory.class);
+ session = mockery.mock(ImapSession.class);
command = ImapCommand.anyStateCommand("Command");
- next = mock(ImapProcessor.class);
- responder = mock(ImapProcessor.Responder.class);
- result = mock(MailboxMetaData.class);
- statusResponse = mock(StatusResponse.class);
+ next = mockery.mock(ImapProcessor.class);
+ responder = mockery.mock(ImapProcessor.Responder.class);
+ result = mockery.mock(MailboxMetaData.class);
+ statusResponse = mockery.mock(StatusResponse.class);
responderImpl = responder;
- manager = mock(MailboxManager.class);
- mailboxSession = mock(MailboxSession.class);
+ manager = mockery. mock(MailboxManager.class);
+ mailboxSession = mockery.mock(MailboxSession.class);
processor = new LSubProcessor(next, manager, serverResponseFactory);
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testHierarchy() throws Exception {
subscriptions.add(MAILBOX_A);
subscriptions.add(MAILBOX_B);
subscriptions.add(MAILBOX_C);
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(responder).respond(with(
equal(new LSubResponse("",
ImapConstants.HIERARCHY_DELIMITER, true))));
@@ -119,6 +125,7 @@ public class LSubProcessorTest extends M
}
+ @Test
public void testShouldRespondToRegexWithSubscribedMailboxes()
throws Exception {
subscriptions.add(MAILBOX_A);
@@ -127,7 +134,7 @@ public class LSubProcessorTest extends M
subscriptions.add(CHILD_ONE);
subscriptions.add(CHILD_TWO);
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(responder).respond(with(
equal(new LSubResponse(CHILD_ONE,
ImapConstants.HIERARCHY_DELIMITER, false))));
@@ -145,6 +152,7 @@ public class LSubProcessorTest extends M
}
+ @Test
public void testShouldRespondNoSelectToRegexWithParentsOfSubscribedMailboxes()
throws Exception {
subscriptions.add(MAILBOX_A);
@@ -153,7 +161,7 @@ public class LSubProcessorTest extends M
subscriptions.add(CHILD_ONE);
subscriptions.add(CHILD_TWO);
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(responder).respond(with(
equal(new LSubResponse(PARENT, ImapConstants.HIERARCHY_DELIMITER, true))));
}});
@@ -167,6 +175,7 @@ public class LSubProcessorTest extends M
}
+ @Test
public void testShouldRespondSelectToRegexWithParentOfSubscribedMailboxesWhenParentSubscribed()
throws Exception {
subscriptions.add(MAILBOX_A);
@@ -176,7 +185,7 @@ public class LSubProcessorTest extends M
subscriptions.add(CHILD_ONE);
subscriptions.add(CHILD_TWO);
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(responder).respond(with(
equal(new LSubResponse(PARENT, ImapConstants.HIERARCHY_DELIMITER,
false))));
@@ -191,8 +200,9 @@ public class LSubProcessorTest extends M
}
+ @Test
public void testSelectAll() throws Exception {
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(responder).respond(with(equal(
new LSubResponse(MAILBOX_A, ImapConstants.HIERARCHY_DELIMITER, false))));
oneOf(responder).respond(with(equal(
@@ -214,8 +224,9 @@ public class LSubProcessorTest extends M
}
+
private void expectOk() {
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(serverResponseFactory).taggedOk(
with(equal(TAG)),
with(same(command)),
@@ -225,7 +236,7 @@ public class LSubProcessorTest extends M
}
private void expectSubscriptions() throws Exception {
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(session).getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY);
will(returnValue(mailboxSession));
oneOf(manager).subscriptions(with(same(mailboxSession)));will(returnValue(subscriptions));
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=923904&r1=923903&r2=923904&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 16 17:55:28 2010
@@ -27,9 +27,15 @@ import org.apache.james.imap.mailbox.Mai
import org.apache.james.imap.mailbox.MailboxMetaData;
import org.apache.james.imap.message.response.ListResponse;
import org.jmock.Expectations;
-import org.jmock.integration.junit3.MockObjectTestCase;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
-public class ListProcessorTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class ListProcessorTest {
ListProcessor processor;
@@ -47,21 +53,20 @@ public class ListProcessorTest extends M
StatusResponseFactory serverResponseFactory;
+ private Mockery mockery = new JUnit4Mockery();
+
+ @Before
protected void setUp() throws Exception {
- serverResponseFactory = mock(StatusResponseFactory.class);
- session = mock(ImapSession.class);
+ serverResponseFactory = mockery.mock(StatusResponseFactory.class);
+ session = mockery.mock(ImapSession.class);
command = ImapCommand.anyStateCommand("Command");
- next = mock(ImapProcessor.class);
- responder = mock(ImapProcessor.Responder.class);
- result = mock(MailboxMetaData.class);
- manager = mock(MailboxManager.class);
+ next = mockery.mock(ImapProcessor.class);
+ responder = mockery.mock(ImapProcessor.Responder.class);
+ result = mockery.mock(MailboxMetaData.class);
+ manager = mockery.mock(MailboxManager.class);
processor = createProcessor(next, manager, serverResponseFactory);
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
ListProcessor createProcessor(ImapProcessor next,
MailboxManager manager, StatusResponseFactory factory) {
return new ListProcessor(next, manager, factory);
@@ -76,7 +81,7 @@ public class ListProcessorTest extends M
void setUpResult(final MailboxMetaData.Children children, final MailboxMetaData.Selectability selectability,
final String hierarchyDelimiter, final String name) {
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(result).inferiors();will(returnValue(children));
oneOf(result).getSelectability();will(returnValue(selectability));
oneOf(result).getHierarchyDelimiter();will(returnValue(hierarchyDelimiter));
@@ -84,50 +89,56 @@ public class ListProcessorTest extends M
}});
}
+ @Test
public void testHasChildren() throws Exception {
setUpResult(MailboxMetaData.Children.HAS_CHILDREN, MailboxMetaData.Selectability.NONE, ".", "#INBOX");
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(responder).respond(with(equal(createResponse(false, false, false, false, true, false, ".", "#INBOX"))));
}});
processor.processResult(responder, false, 0, result);
}
+ @Test
public void testHasNoChildren() throws Exception {
setUpResult(MailboxMetaData.Children.HAS_NO_CHILDREN, MailboxMetaData.Selectability.NONE, ".", "#INBOX");
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(responder).respond(with(equal(createResponse(false, false, false, false, false, true, ".", "#INBOX"))));
}});
processor.processResult(responder, false, 0, result);
}
+ @Test
public void testNoInferiors() throws Exception {
setUpResult(MailboxMetaData.Children.NO_INFERIORS, MailboxMetaData.Selectability.NONE, ".", "#INBOX");
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(responder).respond(with(equal(createResponse(true, false, false, false, false, false, ".", "#INBOX"))));
}});
processor.processResult(responder, false, 0, result);
}
+ @Test
public void testNoSelect() throws Exception {
setUpResult(MailboxMetaData.Children.CHILDREN_ALLOWED_BUT_UNKNOWN, MailboxMetaData.Selectability.NOSELECT, ".", "#INBOX");
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(responder).respond(with(equal(createResponse(false, true, false, false, false, false, ".", "#INBOX"))));
}});
processor.processResult(responder, false, 0, result);
}
+ @Test
public void testUnMarked() throws Exception {
setUpResult(MailboxMetaData.Children.CHILDREN_ALLOWED_BUT_UNKNOWN, MailboxMetaData.Selectability.UNMARKED, ".",
"#INBOX");
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(responder).respond(with(equal(createResponse(false, false, false, true, false, false, ".", "#INBOX"))));
}});
processor.processResult(responder, false, 0, result);
}
+ @Test
public void testMarked() throws Exception {
setUpResult(MailboxMetaData.Children.CHILDREN_ALLOWED_BUT_UNKNOWN, MailboxMetaData.Selectability.MARKED, ".", "#INBOX");
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(responder).respond(with(equal(createResponse(false, false, true, false, false, false, ".", "#INBOX"))));
}});
processor.processResult(responder, false, 0, result);
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java Tue Mar 16 17:55:28 2010
@@ -18,6 +18,8 @@
****************************************************************/
package org.apache.james.imap.processor;
+import static org.junit.Assert.*;
+
import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
@@ -38,9 +40,15 @@ import org.apache.james.imap.message.req
import org.apache.james.imap.message.response.NamespaceResponse;
import org.apache.james.imap.processor.base.ImapSessionUtils;
import org.jmock.Expectations;
-import org.jmock.integration.junit3.MockObjectTestCase;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
-public class NamespaceProcessorTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class NamespaceProcessorTest {
private static final char SHARED_SPACE_DELIMINATOR = '&';
private static final String SHARED_PREFIX = "SharedPrefix";
@@ -60,21 +68,23 @@ public class NamespaceProcessorTest exte
NamespaceRequest namespaceRequest;
Collection<MailboxSession.Namespace> sharedSpaces;
+ Mockery mockery = new JUnit4Mockery();
+
+ @Before
protected void setUp() throws Exception {
- super.setUp();
sharedSpaces = new ArrayList<MailboxSession.Namespace>();
- statusResponseStub = mock(StatusResponseFactory.class);
- final MailboxManager mailboxManagerStub = mock(MailboxManager.class);
- subject = new NamespaceProcessor(mock(ImapProcessor.class), mailboxManagerStub, statusResponseStub);
- imapSessionStub = mock(ImapSession.class);
- mailboxSessionStub = mock(MailboxSession.class);
- personalSpaceStub = mock(MailboxSession.Namespace.class, "PersonalNamespace");
- usersSpaceStub = mock(MailboxSession.Namespace.class, "UsersNamespace");
- sharedSpaceStub = mock(MailboxSession.Namespace.class, "SharedNamespace");
+ statusResponseStub = mockery.mock(StatusResponseFactory.class);
+ final MailboxManager mailboxManagerStub = mockery.mock(MailboxManager.class);
+ subject = new NamespaceProcessor(mockery.mock(ImapProcessor.class), mailboxManagerStub, statusResponseStub);
+ imapSessionStub = mockery.mock(ImapSession.class);
+ mailboxSessionStub = mockery.mock(MailboxSession.class);
+ personalSpaceStub = mockery.mock(MailboxSession.Namespace.class, "PersonalNamespace");
+ usersSpaceStub = mockery.mock(MailboxSession.Namespace.class, "UsersNamespace");
+ sharedSpaceStub = mockery.mock(MailboxSession.Namespace.class, "SharedNamespace");
namespaceRequest = new NamespaceRequest(ImapCommand.anyStateCommand("Name"), "TAG");
- checking (new Expectations() {{
+ mockery.checking (new Expectations() {{
allowing(imapSessionStub).getAttribute(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY); will(returnValue(mailboxSessionStub));
allowing(personalSpaceStub).getDeliminator(); will(returnValue(PERSONAL_DELIMINATOR));
allowing(personalSpaceStub).getPrefix(); will(returnValue(PERSONAL_PREFIX));
@@ -88,23 +98,21 @@ public class NamespaceProcessorTest exte
allowing(imapSessionStub).getState();will(returnValue(ImapSessionState.AUTHENTICATED));
allowing(statusResponseStub).taggedOk(
with(any(String.class)), with(any(ImapCommand.class)),
- with(any(HumanReadableText.class)), with(any(ResponseCode.class))); will(returnValue(mock(StatusResponse.class)));
+ with(any(HumanReadableText.class)), with(any(ResponseCode.class))); will(returnValue(mockery.mock(StatusResponse.class)));
ignoring(imapSessionStub);
ignoring(mailboxSessionStub);
ignoring(mailboxManagerStub);
ignoring(statusResponseStub);
}});
}
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
+ @Test
public void testShouldAcceptNamespaceRequests() throws Exception {
- assertFalse(subject.isAcceptable(mock(ImapMessage.class)));
+ assertFalse(subject.isAcceptable(mockery.mock(ImapMessage.class)));
assertTrue(subject.isAcceptable(namespaceRequest));
}
+ @Test
public void testNamespaceResponseShouldContainPersonalAndUserSpaces() throws Exception {
final NamespaceResponse response = buildResponse(null);
@@ -113,6 +121,7 @@ public class NamespaceProcessorTest exte
subject.doProcess(namespaceRequest, responderMock, imapSessionStub);
}
+ @Test
public void testNamespaceResponseShouldContainSharedSpaces() throws Exception {
this.sharedSpaces.add(sharedSpaceStub);
@@ -137,8 +146,8 @@ public class NamespaceProcessorTest exte
}
private Responder expectResponse(final NamespaceResponse response) {
- final Responder responderMock = mock(Responder.class);
- checking(new Expectations(){{
+ final Responder responderMock = mockery.mock(Responder.class);
+ mockery.checking(new Expectations(){{
oneOf(responderMock).respond(with(equal(response)));
oneOf(responderMock).respond(with(any(StatusResponse.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=923904&r1=923903&r2=923904&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 16 17:55:28 2010
@@ -45,9 +45,15 @@ import org.apache.james.imap.message.req
import org.apache.james.imap.message.response.SearchResponse;
import org.apache.james.imap.processor.base.ImapSessionUtils;
import org.jmock.Expectations;
-import org.jmock.integration.junit3.MockObjectTestCase;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
-public class SearchProcessorTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class SearchProcessorTest {
private static final int DAY = 6;
private static final int MONTH = 6;
@@ -98,33 +104,32 @@ public class SearchProcessorTest extends
SelectedMailbox selectedMailbox;
+ private Mockery mockery = new JUnit4Mockery();
+
+ @Before
protected void setUp() throws Exception {
- super.setUp();
- serverResponseFactory = mock(StatusResponseFactory.class);
- session = mock(ImapSession.class);
+ serverResponseFactory = mockery.mock(StatusResponseFactory.class);
+ session = mockery.mock(ImapSession.class);
command = ImapCommand.anyStateCommand("Command");
- next = mock(ImapProcessor.class);
- responder = mock(ImapProcessor.Responder.class);
- statusResponse = mock(StatusResponse.class);
- mailbox = mock(Mailbox.class);
- mailboxManager = mock(MailboxManager.class);
- mailboxSession = mock(MailboxSession.class);
- selectedMailbox = mock(SelectedMailbox.class);
+ next = mockery.mock(ImapProcessor.class);
+ responder = mockery.mock(ImapProcessor.Responder.class);
+ statusResponse = mockery.mock(StatusResponse.class);
+ mailbox = mockery.mock(Mailbox.class);
+ mailboxManager = mockery.mock(MailboxManager.class);
+ mailboxSession = mockery.mock(MailboxSession.class);
+ selectedMailbox = mockery.mock(SelectedMailbox.class);
processor = new SearchProcessor(next, mailboxManager, serverResponseFactory);
expectOk();
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testSequenceSetLowerUnlimited() throws Exception {
expectsGetSelectedMailbox();
final IdRange[] ids = { new IdRange(Long.MAX_VALUE, 1729) };
final SearchQuery.NumericRange[] ranges = { new SearchQuery.NumericRange(
Long.MAX_VALUE, 1729L) };
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(selectedMailbox).uid(with(equal(1729)));will(returnValue(1729L));
}});
allowUnsolicitedResponses();
@@ -133,7 +138,7 @@ public class SearchProcessorTest extends
}
private void allowUnsolicitedResponses() {
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
atMost(1).of(session).getAttribute(
with(equal(ImapSessionUtils.MAILBOX_USER_ATTRIBUTE_SESSION_KEY)));will(returnValue("user"));
atMost(1).of(session).getAttribute(
@@ -141,24 +146,26 @@ public class SearchProcessorTest extends
}});
}
+ @Test
public void testSequenceSetUpperUnlimited() throws Exception {
expectsGetSelectedMailbox();
final IdRange[] ids = { new IdRange(1, Long.MAX_VALUE) };
final SearchQuery.NumericRange[] ranges = { new SearchQuery.NumericRange(
42, Long.MAX_VALUE) };
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(selectedMailbox).uid(with(equal(1)));will(returnValue(42L));
}});
allowUnsolicitedResponses();
check(SearchKey.buildSequenceSet(ids), SearchQuery.uid(ranges));
}
+ @Test
public void testSequenceSetMsnRange() throws Exception {
expectsGetSelectedMailbox();
final IdRange[] ids = { new IdRange(1, 5) };
final SearchQuery.NumericRange[] ranges = { new SearchQuery.NumericRange(
42, 1729) };
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(selectedMailbox).uid(with(equal(1)));will(returnValue(42L));
oneOf(selectedMailbox).uid(with(equal(5)));will(returnValue(1729L));
}});
@@ -166,25 +173,27 @@ public class SearchProcessorTest extends
check(SearchKey.buildSequenceSet(ids), SearchQuery.uid(ranges));
}
+ @Test
public void testSequenceSetSingleMsn() throws Exception {
expectsGetSelectedMailbox();
final IdRange[] ids = { new IdRange(1) };
final SearchQuery.NumericRange[] ranges = { new SearchQuery.NumericRange(
42) };
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
exactly(2).of(selectedMailbox).uid(with(equal(1)));will(returnValue(42L));
}});
allowUnsolicitedResponses();
check(SearchKey.buildSequenceSet(ids), SearchQuery.uid(ranges));
}
+ @Test
public void testALL() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildAll(), SearchQuery.all());
}
private void expectsGetSelectedMailbox() throws Exception {
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
atMost(1).of(mailboxManager).resolve(with(equal("user")), with(equal("name")));will(returnValue("user"));
atMost(1).of(mailboxManager).getMailbox(with(equal("user")), with(same(mailboxSession)));will(returnValue(mailbox));
atMost(1).of(mailboxManager).getMailbox(with(equal("MailboxName")), with(same(mailboxSession)));will(returnValue(mailbox));
@@ -198,55 +207,65 @@ public class SearchProcessorTest extends
}});
}
+ @Test
public void testANSWERED() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildAnswered(), SearchQuery.flagIsSet(Flag.ANSWERED));
}
+ @Test
public void testBCC() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildBcc(ADDRESS), SearchQuery.headerContains(
ImapConstants.RFC822_BCC, ADDRESS));
}
+ @Test
public void testBEFORE() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildBefore(DAY_MONTH_YEAR), SearchQuery
.internalDateBefore(DAY, MONTH, YEAR));
}
+ @Test
public void testBODY() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildBody(SUBJECT), SearchQuery.bodyContains(SUBJECT));
}
+ @Test
public void testCC() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildCc(ADDRESS), SearchQuery.headerContains(
ImapConstants.RFC822_CC, ADDRESS));
}
+ @Test
public void testDELETED() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildDeleted(), SearchQuery.flagIsSet(Flag.DELETED));
}
+ @Test
public void testDRAFT() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildDraft(), SearchQuery.flagIsSet(Flag.DRAFT));
}
+ @Test
public void testFLAGGED() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildFlagged(), SearchQuery.flagIsSet(Flag.FLAGGED));
}
+ @Test
public void testFROM() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildFrom(ADDRESS), SearchQuery.headerContains(
ImapConstants.RFC822_FROM, ADDRESS));
}
+ @Test
public void testHEADER() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildHeader(ImapConstants.RFC822_IN_REPLY_TO, ADDRESS),
@@ -254,39 +273,47 @@ public class SearchProcessorTest extends
ADDRESS));
}
+ @Test
public void testKEYWORD() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildKeyword(KEYWORD), SearchQuery.flagIsSet(KEYWORD));
}
+ @Test
public void testLARGER() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildLarger(SIZE), SearchQuery.sizeGreaterThan(SIZE));
}
+ @Test
public void testNEW() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildNew(), SearchQuery.and(SearchQuery
.flagIsSet(Flag.RECENT), SearchQuery.flagIsUnSet(Flag.SEEN)));
}
+ @Test
public void testNOT() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildNot(SearchKey.buildOn(DAY_MONTH_YEAR)),
SearchQuery.not(SearchQuery.internalDateOn(DAY, MONTH, YEAR)));
}
+
+ @Test
public void testOLD() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildOld(), SearchQuery.flagIsUnSet(Flag.RECENT));
}
+ @Test
public void testON() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildOn(DAY_MONTH_YEAR), SearchQuery.internalDateOn(
DAY, MONTH, YEAR));
}
+ @Test
public void testAND() throws Exception {
expectsGetSelectedMailbox();
List<SearchKey> keys = new ArrayList<SearchKey>();
@@ -300,6 +327,7 @@ public class SearchProcessorTest extends
check(SearchKey.buildAnd(keys), SearchQuery.and(criteria));
}
+ @Test
public void testOR() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildOr(SearchKey.buildOn(DAY_MONTH_YEAR), SearchKey
@@ -307,99 +335,116 @@ public class SearchProcessorTest extends
MONTH, YEAR), SearchQuery.flagIsUnSet(Flag.RECENT)));
}
+ @Test
public void testRECENT() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildRecent(), SearchQuery.flagIsSet(Flag.RECENT));
}
-
+
+ @Test
public void testSEEN() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildSeen(), SearchQuery.flagIsSet(Flag.SEEN));
}
+ @Test
public void testSENTBEFORE() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildSentBefore(DAY_MONTH_YEAR), SearchQuery
.headerDateBefore(ImapConstants.RFC822_DATE, DAY, MONTH, YEAR));
}
+ @Test
public void testSENTON() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildSentOn(DAY_MONTH_YEAR), SearchQuery.headerDateOn(
ImapConstants.RFC822_DATE, DAY, MONTH, YEAR));
}
-
+ @Test
public void testSENTSINCE() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildSentSince(DAY_MONTH_YEAR), SearchQuery
.headerDateAfter(ImapConstants.RFC822_DATE, DAY, MONTH, YEAR));
}
+ @Test
public void testSINCE() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildSince(DAY_MONTH_YEAR), SearchQuery
.internalDateAfter(DAY, MONTH, YEAR));
}
+ @Test
public void testSMALLER() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildSmaller(SIZE), SearchQuery.sizeLessThan(SIZE));
}
+ @Test
public void testSUBJECT() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildSubject(SUBJECT), SearchQuery.headerContains(
ImapConstants.RFC822_SUBJECT, SUBJECT));
}
+ @Test
public void testTEXT() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildText(SUBJECT), SearchQuery.mailContains(SUBJECT));
}
+ @Test
public void testTO() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildTo(ADDRESS), SearchQuery.headerContains(
ImapConstants.RFC822_TO, ADDRESS));
}
+ @Test
public void testUID() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildUidSet(IDS), SearchQuery.uid(RANGES));
}
+ @Test
public void testUNANSWERED() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildUnanswered(), SearchQuery
.flagIsUnSet(Flag.ANSWERED));
}
+ @Test
public void testUNDELETED() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildUndeleted(), SearchQuery.flagIsUnSet(Flag.DELETED));
}
+ @Test
public void testUNDRAFT() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildUndraft(), SearchQuery.flagIsUnSet(Flag.DRAFT));
}
+ @Test
public void testUNFLAGGED() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildUnflagged(), SearchQuery.flagIsUnSet(Flag.FLAGGED));
}
+ @Test
public void testUNKEYWORD() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildUnkeyword(KEYWORD), SearchQuery
.flagIsUnSet(KEYWORD));
}
+ @Test
public void testUNSEEN() throws Exception {
expectsGetSelectedMailbox();
check(SearchKey.buildUnseen(), SearchQuery.flagIsUnSet(Flag.SEEN));
}
+ @Test
private void check(SearchKey key, SearchQuery.Criterion criterion)
throws Exception {
SearchQuery query = new SearchQuery();
@@ -408,7 +453,7 @@ public class SearchProcessorTest extends
}
private void check(final SearchKey key, final SearchQuery query) throws Exception {
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
allowing(session).getAttribute(
with(equal(ImapSessionUtils.MAILBOX_SESSION_ATTRIBUTE_SESSION_KEY))); will(returnValue((MailboxSession) mailboxSession));
oneOf(mailbox).search(
@@ -423,7 +468,7 @@ public class SearchProcessorTest extends
}
private void expectOk() {
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(serverResponseFactory).taggedOk(
with(equal(TAG)),
with(same(command)),
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java Tue Mar 16 17:55:28 2010
@@ -19,49 +19,59 @@
package org.apache.james.imap.processor.base;
+import static org.junit.Assert.*;
+
import java.util.Iterator;
import javax.mail.Flags;
import org.apache.james.imap.mailbox.MailboxListener;
import org.jmock.Expectations;
-import org.jmock.integration.junit3.MockObjectTestCase;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
-public class MailboxEventAnalyserTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class MailboxEventAnalyserTest {
private static final long BASE_SESSION_ID = 99;
MailboxEventAnalyser analyser;
+ private Mockery mockery = new JUnit4Mockery();
+
+ @Before
protected void setUp() throws Exception {
- super.setUp();
analyser = new MailboxEventAnalyser(BASE_SESSION_ID, "Mailbox Name");
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testShouldBeNoSizeChangeOnOtherEvent() throws Exception {
- final MailboxListener.Event event = mock(MailboxListener.Event.class);
- checking(new Expectations() {{
+ final MailboxListener.Event event = mockery.mock(MailboxListener.Event.class);
+ mockery.checking(new Expectations() {{
oneOf(event).getSessionId();will(returnValue(11L));
}});
analyser.event(event);
assertFalse(analyser.isSizeChanged());
}
+ @Test
public void testShouldBeNoSizeChangeOnAdded() throws Exception {
analyser.event(new FakeMailboxListenerAdded(78, 11));
assertTrue(analyser.isSizeChanged());
}
+ @Test
public void testShouldNoSizeChangeAfterReset() throws Exception {
analyser.event(new FakeMailboxListenerAdded(99, 11));
analyser.reset();
assertFalse(analyser.isSizeChanged());
}
+ @Test
public void testShouldNotSetUidWhenNoSystemFlagChange() throws Exception {
final FakeMailboxListenerFlagsUpdate update = new FakeMailboxListenerFlagsUpdate(
90, new Flags(), 11);
@@ -70,6 +80,7 @@ public class MailboxEventAnalyserTest ex
assertFalse(analyser.flagUpdateUids().iterator().hasNext());
}
+ @Test
public void testShouldSetUidWhenSystemFlagChange() throws Exception {
final long uid = 900L;
final FakeMailboxListenerFlagsUpdate update = new FakeMailboxListenerFlagsUpdate(
@@ -83,6 +94,7 @@ public class MailboxEventAnalyserTest ex
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldClearFlagUidsUponReset() throws Exception {
final long uid = 900L;
final FakeMailboxListenerFlagsUpdate update = new FakeMailboxListenerFlagsUpdate(
@@ -94,6 +106,7 @@ public class MailboxEventAnalyserTest ex
assertFalse(analyser.flagUpdateUids().iterator().hasNext());
}
+ @Test
public void testShouldNotSetUidWhenSystemFlagChangeDifferentSessionInSilentMode()
throws Exception {
final long uid = 900L;
@@ -109,6 +122,7 @@ public class MailboxEventAnalyserTest ex
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldNotSetUidWhenSystemFlagChangeSameSessionInSilentMode()
throws Exception {
final FakeMailboxListenerFlagsUpdate update = new FakeMailboxListenerFlagsUpdate(
@@ -121,6 +135,7 @@ public class MailboxEventAnalyserTest ex
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldNotSetUidWhenOnlyRecentFlagUpdated() throws Exception {
final FakeMailboxListenerFlagsUpdate update = new FakeMailboxListenerFlagsUpdate(
886, new Flags(), BASE_SESSION_ID);
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java Tue Mar 16 17:55:28 2010
@@ -19,35 +19,42 @@
package org.apache.james.imap.processor.fetch;
+import static org.junit.Assert.*;
+
import org.apache.james.imap.message.response.FetchResponse.BodyElement;
import org.apache.james.imap.processor.fetch.PartialFetchBodyElement;
import org.jmock.Expectations;
-import org.jmock.integration.junit3.MockObjectTestCase;
+import org.jmock.Mockery;
+import org.jmock.integration.junit4.JMock;
+import org.jmock.integration.junit4.JUnit4Mockery;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
-public class PartialFetchBodyElementTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class PartialFetchBodyElementTest {
private static final long NUMBER_OF_OCTETS = 100;
BodyElement mockBodyElement;
+ private Mockery mockery = new JUnit4Mockery();
+
+ @Before
protected void setUp() throws Exception {
- super.setUp();
- mockBodyElement = mock(BodyElement.class);
- checking(new Expectations() {{
+ mockBodyElement = mockery.mock(BodyElement.class);
+ mockery.checking(new Expectations() {{
oneOf(mockBodyElement).getName();will(returnValue("Name"));
}});
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testSizeShouldBeNumberOfOctetsWhenSizeMoreWhenStartIsZero()
throws Exception {
final long moreThanNumberOfOctets = NUMBER_OF_OCTETS + 1;
PartialFetchBodyElement element = new PartialFetchBodyElement(
mockBodyElement, 0, NUMBER_OF_OCTETS);
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(mockBodyElement).size();will(returnValue(new Long(moreThanNumberOfOctets)));
}});
assertEquals(
@@ -55,59 +62,64 @@ public class PartialFetchBodyElementTest
NUMBER_OF_OCTETS, element.size());
}
+ @Test
public void testSizeShouldBeSizeWhenNumberOfOctetsMoreWhenStartIsZero()
throws Exception {
final long lessThanNumberOfOctets = NUMBER_OF_OCTETS - 1;
PartialFetchBodyElement element = new PartialFetchBodyElement(
mockBodyElement, 0, NUMBER_OF_OCTETS);
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(mockBodyElement).size();will(returnValue(new Long(lessThanNumberOfOctets)));
}});
assertEquals("Size is less than number of octets so should be size",
lessThanNumberOfOctets, element.size());
}
+ @Test
public void testWhenStartPlusNumberOfOctetsIsMoreThanSizeSizeShouldBeSizeMinusStart()
throws Exception {
final long size = 60;
PartialFetchBodyElement element = new PartialFetchBodyElement(
mockBodyElement, 10, NUMBER_OF_OCTETS);
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(mockBodyElement).size();will(returnValue(new Long(size)));
}});
assertEquals("Size is less than number of octets so should be size",
50, element.size());
}
+ @Test
public void testWhenStartPlusNumberOfOctetsIsLessThanSizeSizeShouldBeNumberOfOctetsMinusStart()
throws Exception {
final long size = 100;
PartialFetchBodyElement element = new PartialFetchBodyElement(
mockBodyElement, 10, NUMBER_OF_OCTETS);
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(mockBodyElement).size();will(returnValue(new Long(size)));
}});
assertEquals("Size is less than number of octets so should be size",
90, element.size());
}
+ @Test
public void testSizeShouldBeZeroWhenStartIsMoreThanSize() throws Exception {
final long size = 100;
PartialFetchBodyElement element = new PartialFetchBodyElement(
mockBodyElement, 1000, NUMBER_OF_OCTETS);
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(mockBodyElement).size();will(returnValue(new Long(size)));
}});
assertEquals("Size is less than number of octets so should be size", 0,
element.size());
}
+ @Test
public void testSizeShouldBeNumberOfOctetsWhenStartMoreThanOctets()
throws Exception {
final long size = 2000;
PartialFetchBodyElement element = new PartialFetchBodyElement(
mockBodyElement, 1000, NUMBER_OF_OCTETS);
- checking(new Expectations() {{
+ mockery.checking(new Expectations() {{
oneOf(mockBodyElement).size();will(returnValue(new Long(size)));
}});
assertEquals("Content size is less than start. Size should be zero.",
Modified: james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractProtocolTestFramework.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractProtocolTestFramework.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractProtocolTestFramework.java (original)
+++ james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractProtocolTestFramework.java Tue Mar 16 17:55:28 2010
@@ -19,7 +19,9 @@
package org.apache.james.test.functional;
-import junit.framework.TestCase;
+import org.junit.AfterClass;
+import org.junit.Before;
+import org.junit.BeforeClass;
/**
* Abstract Protocol Test is the root of all of the James Imap Server test
@@ -31,7 +33,7 @@ import junit.framework.TestCase;
* @author Darrell DeBoer
* @author Andrew C. Oliver
*/
-public abstract class AbstractProtocolTestFramework extends TestCase {
+public abstract class AbstractProtocolTestFramework {
/** The Protocol session which is run before the testElements */
protected ProtocolSession preElements = new ProtocolSession();
@@ -52,10 +54,6 @@ public abstract class AbstractProtocolTe
this.password = password;
}
- protected void setUp() throws Exception {
- super.setUp();
- setUpEnvironment();
- }
protected void continueAfterFailure() {
preElements.setContinueAfterFailure(true);
@@ -112,8 +110,20 @@ public abstract class AbstractProtocolTe
/**
* Initialises the UsersRepository and ImapHost on first call.
*/
- private void setUpEnvironment() throws Exception {
+ @Before
+ public void setUpEnvironment() throws Exception {
hostSystem.reset();
hostSystem.addUser(userName, password);
}
+
+
+ @AfterClass
+ public void afterTests() throws Exception {
+ hostSystem.afterTests();
+ }
+
+ @BeforeClass
+ public void beforeTests() throws Exception {
+ hostSystem.beforeTests();
+ }
}
Modified: james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java (original)
+++ james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java Tue Mar 16 17:55:28 2010
@@ -22,6 +22,8 @@ package org.apache.james.test.functional
import java.io.InputStream;
import java.util.Locale;
+import org.junit.After;
+
/**
* A Protocol test which reads the test protocol session from a file. The file
@@ -51,9 +53,9 @@ public abstract class AbstractSimpleScri
this.scriptDirectory = scriptDirectory;
}
+ @After
protected void tearDown() throws Exception {
Locale.setDefault(BASE_DEFAULT_LOCALE);
- super.tearDown();
}
/**
Modified: james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/HostSystem.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/HostSystem.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/HostSystem.java (original)
+++ james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/HostSystem.java Tue Mar 16 17:55:28 2010
@@ -74,4 +74,9 @@ public interface HostSystem {
public interface Continuation {
public void doContinue();
}
+
+ public void beforeTests() throws Exception;
+
+
+ public void afterTests() throws Exception;
}
Modified: james/imap/trunk/seda/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/pom.xml?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/seda/pom.xml (original)
+++ james/imap/trunk/seda/pom.xml Tue Mar 16 17:55:28 2010
@@ -68,7 +68,7 @@
</dependency>
<dependency>
<groupId>org.jmock</groupId>
- <artifactId>jmock-junit3</artifactId>
+ <artifactId>jmock-junit4</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForAuthenticatedState.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForAuthenticatedState.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForAuthenticatedState.java Tue Mar 16 17:55:28 2010
@@ -20,6 +20,7 @@
package org.apache.james.imap.functional;
import org.apache.james.test.functional.HostSystem;
+import org.junit.Before;
/**
* <p>
@@ -68,8 +69,8 @@ public abstract class FrameworkForAuthen
*
* @throws Exception
*/
+ @Before
public void setUp() throws Exception {
- super.setUp();
addTestFile("Welcome.test", preElements);
addLogin(USER, PASSWORD);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForNonAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForNonAuthenticatedState.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForNonAuthenticatedState.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForNonAuthenticatedState.java Tue Mar 16 17:55:28 2010
@@ -20,6 +20,7 @@
package org.apache.james.imap.functional;
import org.apache.james.test.functional.HostSystem;
+import org.junit.Before;
/**
* <p>
@@ -49,8 +50,8 @@ public abstract class FrameworkForNonAut
*
* @throws Exception
*/
+ @Before
public void setUp() throws Exception {
- super.setUp();
addTestFile("Welcome.test", preElements);
}
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/external/ExternalHostSystem.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/external/ExternalHostSystem.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/external/ExternalHostSystem.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/external/ExternalHostSystem.java Tue Mar 16 17:55:28 2010
@@ -168,4 +168,12 @@ public class ExternalHostSystem implemen
}
}
}
+
+ public void afterTests() throws Exception {
+ // Do nothing
+ }
+
+ public void beforeTests() throws Exception {
+ // Do nothing
+ }
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/AuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/AuthenticatedState.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/AuthenticatedState.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/AuthenticatedState.java Tue Mar 16 17:55:28 2010
@@ -23,6 +23,7 @@ import java.util.Locale;
import org.apache.james.imap.functional.FrameworkForAuthenticatedState;
import org.apache.james.test.functional.HostSystem;
+import org.junit.Test;
public class AuthenticatedState extends FrameworkForAuthenticatedState {
@@ -31,230 +32,287 @@ public class AuthenticatedState extends
super(system);
}
+ @Test
public void testNoopUS() throws Exception {
scriptTest("Noop", Locale.US);
}
+ @Test
public void testLogoutUS() throws Exception {
scriptTest("Logout", Locale.US);
}
+ @Test
public void testCapabilityUS() throws Exception {
scriptTest("Capability", Locale.US);
}
+ @Test
public void testAppendExamineInboxUS() throws Exception {
scriptTest("AppendExamineInbox", Locale.US);
}
+ @Test
public void testAppendSelectInboxUS() throws Exception {
scriptTest("AppendSelectInbox", Locale.US);
}
+ @Test
public void testCreateUS() throws Exception {
scriptTest("Create", Locale.US);
}
+ @Test
public void testExamineEmptyUS() throws Exception {
scriptTest("ExamineEmpty", Locale.US);
}
+ @Test
public void testSelectEmptyUS() throws Exception {
scriptTest("SelectEmpty", Locale.US);
}
+ @Test
public void testListNamespaceUS() throws Exception {
scriptTest("ListNamespace", Locale.US);
}
+ @Test
public void testListMailboxesUS() throws Exception {
scriptTest("ListMailboxes", Locale.US);
}
+ @Test
public void testStatusUS() throws Exception {
scriptTest("Status", Locale.US);
}
+ @Test
public void testSubscribeUS() throws Exception {
scriptTest("Subscribe", Locale.US);
}
+ @Test
public void testDeleteUS() throws Exception {
scriptTest("Delete", Locale.US);
}
+ @Test
public void testAppendUS() throws Exception {
scriptTest("Append", Locale.US);
}
+ @Test
public void testAppendExpungeUS() throws Exception {
scriptTest("AppendExpunge", Locale.US);
}
+ @Test
public void testSelectAppendUS() throws Exception {
scriptTest("SelectAppend", Locale.US);
}
-
+
+ @Test
public void testStringArgsUS() throws Exception {
scriptTest("StringArgs", Locale.US);
}
+ @Test
public void testValidNonAuthenticatedUS() throws Exception {
scriptTest("ValidNonAuthenticated", Locale.US);
}
+ @Test
public void testNoopITALY() throws Exception {
scriptTest("Noop", Locale.ITALY);
}
+ @Test
public void testLogoutITALY() throws Exception {
scriptTest("Logout", Locale.ITALY);
}
+ @Test
public void testCapabilityITALY() throws Exception {
scriptTest("Capability", Locale.ITALY);
}
+ @Test
public void testAppendExamineInboxITALY() throws Exception {
scriptTest("AppendExamineInbox", Locale.ITALY);
}
+ @Test
public void testAppendSelectInboxITALY() throws Exception {
scriptTest("AppendSelectInbox", Locale.ITALY);
}
+ @Test
public void testCreateITALY() throws Exception {
scriptTest("Create", Locale.ITALY);
}
+ @Test
public void testExamineEmptyITALY() throws Exception {
scriptTest("ExamineEmpty", Locale.ITALY);
}
+ @Test
public void testSelectEmptyITALY() throws Exception {
scriptTest("SelectEmpty", Locale.ITALY);
}
+ @Test
public void testListNamespaceITALY() throws Exception {
scriptTest("ListNamespace", Locale.ITALY);
}
+ @Test
public void testListMailboxesITALY() throws Exception {
scriptTest("ListMailboxes", Locale.ITALY);
}
+ @Test
public void testStatusITALY() throws Exception {
scriptTest("Status", Locale.ITALY);
}
+ @Test
public void testSubscribeITALY() throws Exception {
scriptTest("Subscribe", Locale.ITALY);
}
+ @Test
public void testDeleteITALY() throws Exception {
scriptTest("Delete", Locale.ITALY);
}
+ @Test
public void testAppendITALY() throws Exception {
scriptTest("Append", Locale.ITALY);
}
+ @Test
public void testAppendExpungeITALY() throws Exception {
scriptTest("AppendExpunge", Locale.ITALY);
}
+ @Test
public void testSelectAppendITALY() throws Exception {
scriptTest("SelectAppend", Locale.ITALY);
}
-
+
+ @Test
public void testStringArgsITALY() throws Exception {
scriptTest("StringArgs", Locale.ITALY);
}
+ @Test
public void testValidNonAuthenticatedITALY() throws Exception {
scriptTest("ValidNonAuthenticated", Locale.ITALY);
}
+ @Test
public void testNoopKOREA() throws Exception {
scriptTest("Noop", Locale.KOREA);
}
+ @Test
public void testLogoutKOREA() throws Exception {
scriptTest("Logout", Locale.KOREA);
}
+ @Test
public void testCapabilityKOREA() throws Exception {
scriptTest("Capability", Locale.KOREA);
}
+ @Test
public void testAppendExamineInboxKOREA() throws Exception {
scriptTest("AppendExamineInbox", Locale.KOREA);
}
+ @Test
public void testAppendSelectInboxKOREA() throws Exception {
scriptTest("AppendSelectInbox", Locale.KOREA);
}
+ @Test
public void testCreateKOREA() throws Exception {
scriptTest("Create", Locale.KOREA);
}
+ @Test
public void testExamineEmptyKOREA() throws Exception {
scriptTest("ExamineEmpty", Locale.KOREA);
}
+ @Test
public void testSelectEmptyKOREA() throws Exception {
scriptTest("SelectEmpty", Locale.KOREA);
}
+ @Test
public void testListNamespaceKOREA() throws Exception {
scriptTest("ListNamespace", Locale.KOREA);
}
+ @Test
public void testListMailboxesKOREA() throws Exception {
scriptTest("ListMailboxes", Locale.KOREA);
}
+ @Test
public void testStatusKOREA() throws Exception {
scriptTest("Status", Locale.KOREA);
}
+ @Test
public void testSubscribeKOREA() throws Exception {
scriptTest("Subscribe", Locale.KOREA);
}
+ @Test
public void testDeleteKOREA() throws Exception {
scriptTest("Delete", Locale.KOREA);
}
+ @Test
public void testAppendKOREA() throws Exception {
scriptTest("Append", Locale.KOREA);
}
+ @Test
public void testAppendExpungeKOREA() throws Exception {
scriptTest("AppendExpunge", Locale.KOREA);
}
+ @Test
public void testSelectAppendKOREA() throws Exception {
scriptTest("SelectAppend", Locale.KOREA);
}
+ @Test
public void testStringArgsKOREA() throws Exception {
scriptTest("StringArgs", Locale.KOREA);
}
+ @Test
public void testValidNonAuthenticatedKOREA() throws Exception {
scriptTest("ValidNonAuthenticated", Locale.KOREA);
}
+ @Test
public void testNamespaceUS() throws Exception {
scriptTest("Namespace", Locale.US);
}
+ @Test
public void testNamespaceITALY() throws Exception {
scriptTest("Namespace", Locale.ITALY);
}
-
+
+ @Test
public void testNamespaceKOREA() throws Exception {
scriptTest("Namespace", Locale.KOREA);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/ConcurrentSessions.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/ConcurrentSessions.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/ConcurrentSessions.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/ConcurrentSessions.java Tue Mar 16 17:55:28 2010
@@ -23,6 +23,7 @@ import java.util.Locale;
import org.apache.james.imap.functional.FrameworkForAuthenticatedState;
import org.apache.james.test.functional.HostSystem;
+import org.junit.Test;
public class ConcurrentSessions extends FrameworkForAuthenticatedState {
@@ -30,86 +31,107 @@ public class ConcurrentSessions extends
super(system);
}
+ @Test
public void testConcurrentExpungeResponseUS() throws Exception {
scriptTest("ConcurrentExpungeResponse", Locale.US);
}
+ @Test
public void testConcurrentExpungeResponseITALY() throws Exception {
scriptTest("ConcurrentExpungeResponse", Locale.ITALY);
}
+ @Test
public void testConcurrentExpungeResponseKOREA() throws Exception {
scriptTest("ConcurrentExpungeResponse", Locale.KOREA);
}
+ @Test
public void testConcurrentCrossExpungeUS() throws Exception {
scriptTest("ConcurrentCrossExpunge", Locale.US);
}
+ @Test
public void testConcurrentCrossExpungeITALY() throws Exception {
scriptTest("ConcurrentCrossExpunge", Locale.ITALY);
}
+ @Test
public void testConcurrentCrossExpungeKOREA() throws Exception {
scriptTest("ConcurrentCrossExpunge", Locale.KOREA);
}
+ @Test
public void testConcurrentRenameSelectedSubUS() throws Exception {
scriptTest("ConcurrentRenameSelectedSub", Locale.US);
}
+ @Test
public void testConcurrentExistsResponseUS() throws Exception {
scriptTest("ConcurrentExistsResponse", Locale.US);
}
+ @Test
public void testConcurrentDeleteSelectedUS() throws Exception {
scriptTest("ConcurrentDeleteSelected", Locale.US);
}
+ @Test
public void testConcurrentFetchResponseUS() throws Exception {
scriptTest("ConcurrentFetchResponse", Locale.US);
}
+ @Test
public void testConcurrentRenameSelectedUS() throws Exception {
scriptTest("ConcurrentRenameSelected", Locale.US);
}
+ @Test
public void testConcurrentRenameSelectedSubKOREA() throws Exception {
scriptTest("ConcurrentRenameSelectedSub", Locale.KOREA);
}
+ @Test
public void testConcurrentExistsResponseKOREA() throws Exception {
scriptTest("ConcurrentExistsResponse", Locale.KOREA);
}
+ @Test
public void testConcurrentDeleteSelectedKOREA() throws Exception {
scriptTest("ConcurrentDeleteSelected", Locale.KOREA);
}
+ @Test
public void testConcurrentFetchResponseKOREA() throws Exception {
scriptTest("ConcurrentFetchResponse", Locale.KOREA);
}
+ @Test
public void testConcurrentRenameSelectedKOREA() throws Exception {
scriptTest("ConcurrentRenameSelected", Locale.KOREA);
}
+ @Test
public void testConcurrentRenameSelectedSubITALY() throws Exception {
scriptTest("ConcurrentRenameSelectedSub", Locale.ITALY);
}
+ @Test
public void testConcurrentExistsResponseITALY() throws Exception {
scriptTest("ConcurrentExistsResponse", Locale.ITALY);
}
+ @Test
public void testConcurrentDeleteSelectedITALY() throws Exception {
scriptTest("ConcurrentDeleteSelected", Locale.ITALY);
}
+ @Test
public void testConcurrentFetchResponseITALY() throws Exception {
scriptTest("ConcurrentFetchResponse", Locale.ITALY);
}
+ @Test
public void testConcurrentRenameSelectedITALY() throws Exception {
scriptTest("ConcurrentRenameSelected", Locale.ITALY);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Events.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Events.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Events.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Events.java Tue Mar 16 17:55:28 2010
@@ -23,6 +23,7 @@ import java.util.Locale;
import org.apache.james.imap.functional.FrameworkForSelectedStateBase;
import org.apache.james.test.functional.HostSystem;
+import org.junit.Test;
public class Events extends FrameworkForSelectedStateBase {
@@ -30,14 +31,17 @@ public class Events extends FrameworkFor
super(system);
}
+ @Test
public void testAppendToSelectedUS() throws Exception {
scriptTest("AppendToSelected", Locale.US);
}
+ @Test
public void testAppendToSelectedKOREA() throws Exception {
scriptTest("AppendToSelected", Locale.KOREA);
}
+ @Test
public void testAppendToSelectedITALY() throws Exception {
scriptTest("AppendToSelected", Locale.ITALY);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Expunge.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Expunge.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Expunge.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Expunge.java Tue Mar 16 17:55:28 2010
@@ -23,6 +23,7 @@ import java.util.Locale;
import org.apache.james.imap.functional.FrameworkForSelectedStateBase;
import org.apache.james.test.functional.HostSystem;
+import org.junit.Test;
public class Expunge extends FrameworkForSelectedStateBase {
@@ -30,14 +31,17 @@ public class Expunge extends FrameworkFo
super(system);
}
+ @Test
public void testBasicExpungeUS() throws Exception {
scriptTest("ExpungeBasics", Locale.US);
}
+ @Test
public void testBasicExpungeIT() throws Exception {
scriptTest("ExpungeBasics", Locale.ITALY);
}
+ @Test
public void testBasicExpungeKO() throws Exception {
scriptTest("ExpungeBasics", Locale.KOREA);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Fetch.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Fetch.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Fetch.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Fetch.java Tue Mar 16 17:55:28 2010
@@ -23,6 +23,7 @@ import java.util.Locale;
import org.apache.james.imap.functional.FrameworkForSelectedStateBase;
import org.apache.james.test.functional.HostSystem;
+import org.junit.Test;
public class Fetch extends FrameworkForSelectedStateBase {
@@ -30,98 +31,122 @@ public class Fetch extends FrameworkForS
super(system);
}
+ @Test
public void testFetchEnvelopeUS() throws Exception {
scriptTest("FetchEnvelope", Locale.US);
}
+ @Test
public void testFetchEnvelopeIT() throws Exception {
scriptTest("FetchEnvelope", Locale.ITALY);
}
+ @Test
public void testFetchEnvelopeKOREA() throws Exception {
scriptTest("FetchEnvelope", Locale.KOREA);
}
+ @Test
public void testFetchTextUS() throws Exception {
scriptTest("FetchText", Locale.US);
}
+ @Test
public void testFetchBodyNoSectionUS() throws Exception {
scriptTest("FetchBodyNoSection", Locale.US);
}
+ @Test
public void testFetchTextIT() throws Exception {
scriptTest("FetchText", Locale.ITALY);
}
+ @Test
public void testFetchBodyNoSectionIT() throws Exception {
scriptTest("FetchBodyNoSection", Locale.ITALY);
}
+ @Test
public void testFetchTextKOREA() throws Exception {
scriptTest("FetchText", Locale.KOREA);
}
+ @Test
public void testFetchBodyNoSectionKOREA() throws Exception {
scriptTest("FetchBodyNoSection", Locale.KOREA);
}
+ @Test
public void testFetchRFC822US() throws Exception {
scriptTest("FetchRFC822", Locale.US);
}
+ @Test
public void testFetchRFC822TextUS() throws Exception {
scriptTest("FetchRFC822Text", Locale.US);
}
+ @Test
public void testFetchRFC822HeaderUS() throws Exception {
scriptTest("FetchRFC822Header", Locale.US);
}
+ @Test
public void testFetchRFC822KOREA() throws Exception {
scriptTest("FetchRFC822", Locale.KOREA);
}
+ @Test
public void testFetchRFC822TextKOREA() throws Exception {
scriptTest("FetchRFC822Text", Locale.KOREA);
}
+ @Test
public void testFetchRFC822HeaderKOREA() throws Exception {
scriptTest("FetchRFC822Header", Locale.KOREA);
}
+ @Test
public void testFetchRFC822ITALY() throws Exception {
scriptTest("FetchRFC822", Locale.ITALY);
}
+ @Test
public void testFetchRFC822TextITALY() throws Exception {
scriptTest("FetchRFC822Text", Locale.ITALY);
}
+ @Test
public void testFetchRFC822HeaderITALY() throws Exception {
scriptTest("FetchRFC822Header", Locale.ITALY);
}
+ @Test
public void testFetchInternalDateUS() throws Exception {
scriptTest("FetchInternalDate", Locale.US);
}
+ @Test
public void testFetchInternalDateITALY() throws Exception {
scriptTest("FetchInternalDate", Locale.ITALY);
}
+ @Test
public void testFetchInternalDateKOREA() throws Exception {
scriptTest("FetchInternalDate", Locale.KOREA);
}
+ @Test
public void testFetchFetchRfcMixedUS() throws Exception {
scriptTest("FetchRFC822Mixed", Locale.US);
}
+ @Test
public void testFetchFetchRfcMixedKOREA() throws Exception {
scriptTest("FetchRFC822Mixed", Locale.KOREA);
}
+ @Test
public void testFetchFetchRfcMixedITALY() throws Exception {
scriptTest("FetchRFC822Mixed", Locale.ITALY);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org