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 [2/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/deployment/src/test/java/org/apache/james/imap/functional/jcr/JCRHostSystem.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/JCRHostSystem.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/JCRHostSystem.java (original)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/JCRHostSystem.java Tue Mar 16 17:55:28 2010
@@ -20,11 +20,8 @@ package org.apache.james.imap.functional
import java.io.File;
-import javax.jcr.Session;
-import javax.jcr.SimpleCredentials;
-
import org.apache.commons.io.FileUtils;
-import org.apache.jackrabbit.core.RepositoryImpl;
+import org.apache.jackrabbit.core.TransientRepository;
import org.apache.jackrabbit.core.config.RepositoryConfig;
import org.apache.james.imap.encode.main.DefaultImapEncoderFactory;
import org.apache.james.imap.functional.ImapHostSystem;
@@ -38,52 +35,49 @@ import org.xml.sax.InputSource;
public class JCRHostSystem extends ImapHostSystem{
-
- public static final String META_DATA_DIRECTORY = "target/user-meta-data";
- private static JCRHostSystem host;
public static HostSystem build() throws Exception {
- if (host == null) host = new JCRHostSystem();
- return host;
+ return new JCRHostSystem();
}
private final JCRGlobalUserMailboxManager mailboxManager;
private final InMemoryUserManager userManager;
- private static final String JACKRABBIT_HOME = "target/jackrabbit";
-
- private RepositoryImpl repository;
+ private static final String JACKRABBIT_HOME = "deployment/target/jackrabbit";
+ public static final String META_DATA_DIRECTORY = "target/user-meta-data";
+ private static TransientRepository repository;
+
+ private javax.jcr.Session session;
public JCRHostSystem() throws Exception {
- userManager = new InMemoryUserManager();
- File home = new File(JACKRABBIT_HOME);
- if (home.exists()) {
- delete(home);
- }
- home.mkdir();
+ if (repository == null) {
+ File home = new File(JACKRABBIT_HOME);
+ if (home.exists()) {
+ FileUtils.deleteDirectory(home);
+ }
+
+ RepositoryConfig config = RepositoryConfig.create(new InputSource(this.getClass().getClassLoader().getResourceAsStream("test-repository.xml")), JACKRABBIT_HOME);
+ repository = new TransientRepository(config);
+ session = repository.login();
+ }
- RepositoryConfig config = RepositoryConfig.create(new InputSource(this.getClass().getClassLoader().getResourceAsStream("test-repository.xml")), JACKRABBIT_HOME);
- repository = RepositoryImpl.create(config);
+ userManager = new InMemoryUserManager();
+
+
mailboxManager = new JCRGlobalUserMailboxManager(userManager, new JCRGlobalUserSubscriptionManager(repository, null, "user", "pass"), repository, null, "user", "pass");
final DefaultImapProcessorFactory defaultImapProcessorFactory = new DefaultImapProcessorFactory();
resetUserMetaData();
+ mailboxManager.deleteEverything();
+
defaultImapProcessorFactory.configure(mailboxManager);
configure(new DefaultImapDecoderFactory().buildImapDecoder(),
new DefaultImapEncoderFactory().buildImapEncoder(),
defaultImapProcessorFactory.buildImapProcessor());
}
- private void delete(File file) {
- if (file.isDirectory()) {
- File[] contents = file.listFiles();
- for (int i = 0; i < contents.length; i++) {
- delete(contents[i]);
- }
- }
- file.delete();
- }
+
public boolean addUser(String user, String password) {
userManager.addUser(user, password);
return true;
@@ -91,9 +85,14 @@ public class JCRHostSystem extends ImapH
public void resetData() throws Exception {
resetUserMetaData();
-
- mailboxManager.deleteEverything();
- //repository.shutdown();
+ /*
+ if (session != null && session.isLive()) {
+ session.logout();
+ }
+ */
+ repository.shutdown();
+
+ //FileUtils.deleteDirectory(new File(JACKRABBIT_HOME));
}
public void resetUserMetaData() throws Exception {
@@ -104,10 +103,12 @@ public class JCRHostSystem extends ImapH
dir.mkdirs();
}
- protected void stop() throws Exception {
- //repository.shutdown();
- }
-
-
+ @Override
+ public void afterTests() throws Exception {
+ session.logout();
+ }
+
+
+
}
Added: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/NonAuthenticatedStateTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/NonAuthenticatedStateTest.java?rev=923904&view=auto
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/NonAuthenticatedStateTest.java (added)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/NonAuthenticatedStateTest.java Tue Mar 16 17:55:28 2010
@@ -0,0 +1,30 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.imap.functional.jcr;
+
+import org.apache.james.imap.functional.suite.NonAuthenticatedState;
+
+public class NonAuthenticatedStateTest extends
+ NonAuthenticatedState {
+
+ public NonAuthenticatedStateTest() throws Exception {
+ super(JCRHostSystem.build());
+ }
+}
Added: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/PartialFetchTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/PartialFetchTest.java?rev=923904&view=auto
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/PartialFetchTest.java (added)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/PartialFetchTest.java Tue Mar 16 17:55:28 2010
@@ -0,0 +1,30 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.imap.functional.jcr;
+
+import org.apache.james.imap.functional.suite.PartialFetch;
+
+public class PartialFetchTest extends PartialFetch {
+
+ public PartialFetchTest() throws Exception {
+ super(JCRHostSystem.build());
+ }
+
+}
Added: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/RenameTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/RenameTest.java?rev=923904&view=auto
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/RenameTest.java (added)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/RenameTest.java Tue Mar 16 17:55:28 2010
@@ -0,0 +1,12 @@
+package org.apache.james.imap.functional.jcr;
+
+import org.apache.james.imap.functional.suite.Rename;
+
+public class RenameTest extends Rename {
+
+ public RenameTest() throws Exception {
+ super(JCRHostSystem.build());
+ }
+
+}
+
Added: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SearchTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SearchTest.java?rev=923904&view=auto
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SearchTest.java (added)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SearchTest.java Tue Mar 16 17:55:28 2010
@@ -0,0 +1,10 @@
+package org.apache.james.imap.functional.jcr;
+
+import org.apache.james.imap.functional.suite.Search;
+
+public class SearchTest extends Search{
+
+ public SearchTest() throws Exception {
+ super(JCRHostSystem.build());
+ }
+}
Added: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SecurityTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SecurityTest.java?rev=923904&view=auto
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SecurityTest.java (added)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SecurityTest.java Tue Mar 16 17:55:28 2010
@@ -0,0 +1,30 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.imap.functional.jcr;
+
+import org.apache.james.imap.functional.suite.Security;
+
+public class SecurityTest extends Security {
+
+ public SecurityTest() throws Exception {
+ super(JCRHostSystem.build());
+ }
+
+}
Added: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SelectTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SelectTest.java?rev=923904&view=auto
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SelectTest.java (added)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SelectTest.java Tue Mar 16 17:55:28 2010
@@ -0,0 +1,10 @@
+package org.apache.james.imap.functional.jcr;
+
+import org.apache.james.imap.functional.suite.Select;
+
+public class SelectTest extends Select{
+
+ public SelectTest() throws Exception {
+ super(JCRHostSystem.build());
+ }
+}
Added: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SelectedInboxTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SelectedInboxTest.java?rev=923904&view=auto
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SelectedInboxTest.java (added)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SelectedInboxTest.java Tue Mar 16 17:55:28 2010
@@ -0,0 +1,29 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.imap.functional.jcr;
+
+import org.apache.james.imap.functional.suite.SelectedInbox;
+
+public class SelectedInboxTest extends SelectedInbox {
+
+ public SelectedInboxTest() throws Exception {
+ super(JCRHostSystem.build());
+ }
+}
Added: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SelectedStateTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SelectedStateTest.java?rev=923904&view=auto
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SelectedStateTest.java (added)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/SelectedStateTest.java Tue Mar 16 17:55:28 2010
@@ -0,0 +1,29 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.imap.functional.jcr;
+
+import org.apache.james.imap.functional.suite.SelectedState;
+
+public class SelectedStateTest extends SelectedState {
+
+ public SelectedStateTest() throws Exception {
+ super(JCRHostSystem.build());
+ }
+}
Added: james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/UidSearchTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/UidSearchTest.java?rev=923904&view=auto
==============================================================================
--- james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/UidSearchTest.java (added)
+++ james/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/jcr/UidSearchTest.java Tue Mar 16 17:55:28 2010
@@ -0,0 +1,10 @@
+package org.apache.james.imap.functional.jcr;
+
+import org.apache.james.imap.functional.suite.UidSearch;
+
+public class UidSearchTest extends UidSearch{
+
+ public UidSearchTest() throws Exception {
+ super(JCRHostSystem.build());
+ }
+}
Modified: james/imap/trunk/deployment/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/resources/log4j.properties?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/deployment/src/test/resources/log4j.properties (original)
+++ james/imap/trunk/deployment/src/test/resources/log4j.properties Tue Mar 16 17:55:28 2010
@@ -1,10 +1,8 @@
-log4j.rootLogger=DEBUG, A1
+log4j.rootLogger=INGO, A1
log4j.appender.A1=org.apache.log4j.ConsoleAppender
log4j.appender.A1.layout=org.apache.log4j.PatternLayout
# Print the date in ISO 8601 format
log4j.appender.A1.layout.ConversionPattern=%d [%t] %-5p %c - %m%n
-
-org.apache.jackrabbit.core.config.ConfigurationErrorHandler=DEBUG,CONS
org.apache.james.imap=DEBUG,CONS
\ No newline at end of file
Modified: james/imap/trunk/deployment/src/test/resources/test-repository.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/deployment/src/test/resources/test-repository.xml?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/deployment/src/test/resources/test-repository.xml (original)
+++ james/imap/trunk/deployment/src/test/resources/test-repository.xml Tue Mar 16 17:55:28 2010
@@ -27,10 +27,8 @@
virtual file system where the repository stores global state
(e.g. registered namespaces, custom node types, etc.)
-->
- <FileSystem class="org.apache.jackrabbit.core.fs.local.LocalFileSystem">
- <param name='path' value='${rep.home}/repository'/>
+ <FileSystem class='org.apache.jackrabbit.core.fs.mem.MemoryFileSystem'>
</FileSystem>
-
<!--
security configuration
-->
@@ -55,12 +53,9 @@
persistence manager of the workspace:
class: FQN of class implementing the PersistenceManager interface
-->
- <PersistenceManager class="org.apache.jackrabbit.core.persistence.db.SimpleDbPersistenceManager">
- <param name="url" value="jdbc:h2:target/wsp_name/db"/>
- <param name="driver" value="org.h2.Driver"/>
- <param name="schema" value="h2"/>
- <param name='schemaObjectPrefix' value='${wsp.name}_'/>
- </PersistenceManager>
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager">
+ <param name="persistent" value="false"/>
+ </PersistenceManager>
<SearchIndex class='org.apache.jackrabbit.core.query.lucene.SearchIndex'>
<param name='path' value='${wsp.home}/index'/>
@@ -76,17 +71,11 @@
-->
<Versioning rootPath='${rep.home}/version'>
<FileSystem class='org.apache.jackrabbit.core.fs.mem.MemoryFileSystem'>
- <!--
- <param name='path' value='${rep.home}/version' />
- -->
</FileSystem>
- <PersistenceManager class="org.apache.jackrabbit.core.persistence.db.SimpleDbPersistenceManager">
- <param name='url' value='jdbc:h2:${rep.home}/version/db'/>
- <param name="driver" value="org.h2.Driver"/>
- <param name="schema" value="h2"/>
- <param name="schemaObjectPrefix" value="version_"/>
- </PersistenceManager>
+ <PersistenceManager class="org.apache.jackrabbit.core.persistence.mem.InMemPersistenceManager">
+ <param name="persistent" value="false"/>
+ </PersistenceManager>
</Versioning>
<!--
Modified: james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java (original)
+++ james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java Tue Mar 16 17:55:28 2010
@@ -19,6 +19,8 @@
package org.apache.james.imap.mailbox.util;
+import static org.junit.Assert.*;
+
import java.util.Iterator;
import javax.mail.Flags;
@@ -26,9 +28,15 @@ import javax.mail.Flags;
import org.apache.james.imap.mailbox.MailboxListener;
import org.apache.james.imap.mailbox.MessageResult;
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 MailboxEventDispatcherFlagsTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class MailboxEventDispatcherFlagsTest {
MailboxEventDispatcher dispatcher;
@@ -38,21 +46,21 @@ public class MailboxEventDispatcherFlags
int sessionId = 10;
+ private Mockery mockery = new JUnit4Mockery();
+
+ @Before
protected void setUp() throws Exception {
- super.setUp();
dispatcher = new MailboxEventDispatcher();
collector = new EventCollector();
dispatcher.addMailboxListener(collector);
- result = mock(MessageResult.class);
- checking(new Expectations() {{
+ result = mockery.mock(MessageResult.class);
+ mockery.checking(new Expectations() {{
oneOf (result).getUid();will(returnValue(23L));
}});
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+
+ @Test
public void testShouldReturnNoChangesWhenOriginalNull() throws Exception {
dispatcher.flagsUpdated(result.getUid(), sessionId, null, new Flags(
Flags.Flag.DELETED));
@@ -65,6 +73,7 @@ public class MailboxEventDispatcherFlags
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldReturnNoChangesWhenSystemFlagsUnchanged() {
dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(
Flags.Flag.DELETED), new Flags(Flags.Flag.DELETED));
@@ -77,6 +86,7 @@ public class MailboxEventDispatcherFlags
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldShowAnsweredAdded() {
dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(),
new Flags(Flags.Flag.ANSWERED));
@@ -91,6 +101,7 @@ public class MailboxEventDispatcherFlags
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldShowAnsweredRemoved() {
dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(
Flags.Flag.ANSWERED), new Flags());
@@ -105,6 +116,7 @@ public class MailboxEventDispatcherFlags
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldShowDeletedAdded() {
dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(),
new Flags(Flags.Flag.DELETED));
@@ -119,6 +131,7 @@ public class MailboxEventDispatcherFlags
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldShowDeletedRemoved() {
dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(
Flags.Flag.DELETED), new Flags());
@@ -133,6 +146,7 @@ public class MailboxEventDispatcherFlags
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldShowDraftAdded() {
dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(),
new Flags(Flags.Flag.DRAFT));
@@ -147,6 +161,7 @@ public class MailboxEventDispatcherFlags
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldShowDraftRemoved() {
dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(
Flags.Flag.DRAFT), new Flags());
@@ -161,6 +176,7 @@ public class MailboxEventDispatcherFlags
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldShowFlaggedAdded() {
dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(),
new Flags(Flags.Flag.FLAGGED));
@@ -175,6 +191,7 @@ public class MailboxEventDispatcherFlags
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldShowFlaggedRemoved() {
dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(
Flags.Flag.FLAGGED), new Flags());
@@ -189,6 +206,7 @@ public class MailboxEventDispatcherFlags
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldShowRecentAdded() {
dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(),
new Flags(Flags.Flag.RECENT));
@@ -203,6 +221,7 @@ public class MailboxEventDispatcherFlags
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldShowRecentRemoved() {
dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(
Flags.Flag.RECENT), new Flags());
@@ -217,6 +236,7 @@ public class MailboxEventDispatcherFlags
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldShowSeenAdded() {
dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(),
new Flags(Flags.Flag.SEEN));
@@ -231,6 +251,7 @@ public class MailboxEventDispatcherFlags
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldShowSeenRemoved() {
dispatcher.flagsUpdated(result.getUid(), sessionId, new Flags(
Flags.Flag.SEEN), new Flags());
@@ -245,6 +266,7 @@ public class MailboxEventDispatcherFlags
assertFalse(iterator.hasNext());
}
+ @Test
public void testShouldShowMixedChanges() {
Flags originals = new Flags();
originals.add(Flags.Flag.DRAFT);
Modified: james/imap/trunk/message/pom.xml
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/pom.xml?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/pom.xml (original)
+++ james/imap/trunk/message/pom.xml Tue Mar 16 17:55:28 2010
@@ -78,7 +78,7 @@
</dependency>
<dependency>
<groupId>org.jmock</groupId>
- <artifactId>jmock-junit3</artifactId>
+ <artifactId>jmock-junit4</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java Tue Mar 16 17:55:28 2010
@@ -26,9 +26,13 @@ import java.util.List;
import javax.mail.Flags;
import org.apache.james.imap.api.ImapCommand;
-import org.jmock.integration.junit3.MockObjectTestCase;
+import org.jmock.integration.junit4.JMock;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import static org.junit.Assert.assertEquals;
-public abstract class AbstractTestImapResponseComposer extends MockObjectTestCase {
+@RunWith(JMock.class)
+public abstract class AbstractTestImapResponseComposer {
private static final long[] ONE_TWO_THREE = { 1, 2, 3 };
@@ -36,21 +40,16 @@ public abstract class AbstractTestImapRe
private static final long[] EMPTY = {};
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
+ @Test
public void testSearch() throws Exception {
checkSearchResponseEncode("* SEARCH 1 2 3\r\n", ONE_TWO_THREE);
checkSearchResponseEncode("* SEARCH 1 1 2 3 5 8 13 21 34 65 99\r\n",
FIBS);
checkSearchResponseEncode("* SEARCH\r\n", EMPTY);
}
-
+
+ @Test
public void testQuotedDelimiter() throws Exception {
checkListResponseEncode("* LSUB () \"\\\"\" \"#news\"\r\n", "LSUB",
null, "\"", "#news");
@@ -61,7 +60,8 @@ public abstract class AbstractTestImapRe
checkListResponseEncode("* LIST () \"\\\\\" \"#INBOX\"\r\n", "LIST",
null, "\\", "#INBOX");
}
-
+
+ @Test
public void testNilDelimiter() throws Exception {
checkListResponseEncode("* LSUB () NIL \"#news\"\r\n", "LSUB", null,
null, "#news");
@@ -69,6 +69,7 @@ public abstract class AbstractTestImapRe
null, "#INBOX");
}
+ @Test
public void testSimple() throws Exception {
checkListResponseEncode("* LSUB () \".\" \"#news\"\r\n", "LSUB", null,
".", "#news");
@@ -80,6 +81,7 @@ public abstract class AbstractTestImapRe
null, ".", "#INBOX.sub");
}
+ @Test
public void testSpecialNames() throws Exception {
checkListResponseEncode(
"* LSUB () \"\\\\\" \"#news\\\\sub\\\\directory\"\r\n", "LSUB",
@@ -101,6 +103,7 @@ public abstract class AbstractTestImapRe
"LIST", null, ".", "#INBOX.\"sub directory\".what");
}
+ @Test
public void testAttributes() throws Exception {
List<String> attributes = new ArrayList<String>();
attributes.add("\\one");
@@ -115,6 +118,7 @@ public abstract class AbstractTestImapRe
"LIST", attributes, ".", "#INBOX");
}
+ @Test
public void testEncodeStatus() throws Exception {
checkStatusResponseEncode(
"* STATUS \"#INBOX.\\\"sub directory\\\".what\" (MESSAGES 3 RECENT 5 UIDNEXT 7 UIDVALIDITY 11 UNSEEN 13)\r\n",
@@ -132,6 +136,7 @@ public abstract class AbstractTestImapRe
null, null, null, new Long(42), "#INBOX");
}
+ @Test
public void testShouldEncodeFlagsCorrectly() throws Exception {
checkFlagsEncode(" FLAGS (\\Seen)", new Flags(Flags.Flag.SEEN));
checkFlagsEncode(" FLAGS (\\Recent)", new Flags(Flags.Flag.RECENT));
@@ -150,6 +155,7 @@ public abstract class AbstractTestImapRe
" FLAGS (\\Answered \\Deleted \\Draft \\Flagged \\Seen)", flags);
}
+ @Test
public void testShouldEncodeUnparameterisedStatus() throws Exception {
checkStatusResponseEncode("A1 NO [ALERT] APPEND failed\r\n", "A1",
command("APPEND"), "NO", "ALERT", new ArrayList<String>(), 0,
@@ -159,6 +165,7 @@ public abstract class AbstractTestImapRe
new ArrayList<String>(), 0, "whatever");
}
+ @Test
public void testShouldEncodeListParameterStatus() throws Exception {
Collection<String> parameters = new ArrayList<String>();
parameters.add("ONE");
@@ -169,6 +176,7 @@ public abstract class AbstractTestImapRe
command("APPEND"), "NO", "BADCHARSET", parameters, 0, "failed");
}
+ @Test
public void testShouldEncodeNumberParameterStatus() throws Exception {
checkStatusResponseEncode("A1 NO [UIDNEXT 10] APPEND failed\r\n", "A1",
command("APPEND"), "NO", "UIDNEXT", null, 10, "failed");
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/EncoderUtilsDateTimeLocaleTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/EncoderUtilsDateTimeLocaleTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/EncoderUtilsDateTimeLocaleTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/EncoderUtilsDateTimeLocaleTest.java Tue Mar 16 17:55:28 2010
@@ -19,69 +19,80 @@
package org.apache.james.imap.encode;
+import static org.junit.Assert.*;
+
import java.util.Date;
import java.util.Locale;
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Test;
-public class EncoderUtilsDateTimeLocaleTest extends TestCase {
+public class EncoderUtilsDateTimeLocaleTest {
private static final Locale BASE_DEFAULT_LOCALE = Locale.getDefault();
- protected void setUp() throws Exception {
- super.setUp();
- }
-
+ @After
protected void tearDown() throws Exception {
- super.tearDown();
Locale.setDefault(BASE_DEFAULT_LOCALE);
}
+ @Test
public void testUS() throws Exception {
runTests(Locale.US);
}
-
+
+ @Test
public void testUK() throws Exception {
runTests(Locale.UK);
}
+ @Test
public void testITALY() throws Exception {
runTests(Locale.ITALY);
}
+ @Test
public void testGERMANY() throws Exception {
runTests(Locale.GERMANY);
}
+ @Test
public void testFRANCE() throws Exception {
runTests(Locale.FRANCE);
}
+ @Test
public void testCANADA() throws Exception {
runTests(Locale.CANADA);
}
+ @Test
public void testCHINA() throws Exception {
runTests(Locale.CHINA);
}
+ @Test
public void testJAPAN() throws Exception {
runTests(Locale.JAPAN);
}
+ @Test
public void testKOREA() throws Exception {
runTests(Locale.KOREA);
}
+ @Test
public void testTAIWAN() throws Exception {
runTests(Locale.TAIWAN);
}
+ @Test
private void runTests(Locale locale) {
Locale.setDefault(locale);
runEncodeDateTime();
}
+ @Test
private void runEncodeDateTime() {
assertEquals("03-Sep-2004 05:08:43 +0000", EncoderUtils
.encodeDateTime(new Date(1094188123661L)));
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/EncoderUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/EncoderUtilsTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/EncoderUtilsTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/EncoderUtilsTest.java Tue Mar 16 17:55:28 2010
@@ -19,20 +19,18 @@
package org.apache.james.imap.encode;
+import static org.junit.Assert.*;
+
import java.util.Date;
+import org.junit.Test;
+
import junit.framework.TestCase;
-public class EncoderUtilsTest extends TestCase {
+public class EncoderUtilsTest {
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
+ @Test
public void testSimpleEncodeDateTime() {
assertEquals("03-Sep-2004 05:08:43 +0000", EncoderUtils
.encodeDateTime(new Date(1094188123661L)));
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java Tue Mar 16 17:55:28 2010
@@ -28,10 +28,16 @@ import org.apache.james.imap.encode.Imap
import org.apache.james.imap.message.response.FetchResponse;
import org.apache.james.imap.message.response.FetchResponse.Envelope.Address;
import org.jmock.Expectations;
+import org.jmock.Mockery;
import org.jmock.Sequence;
-import org.jmock.integration.junit3.MockObjectTestCase;
+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 FetchResponseEncoderEnvelopeTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class FetchResponseEncoderEnvelopeTest {
private static final String ADDRESS_ONE_HOST = "HOST";
@@ -51,6 +57,8 @@ public class FetchResponseEncoderEnvelop
private static final int MSN = 100;
+ private Mockery context = new JUnit4Mockery();
+
Flags flags;
ImapResponseComposer composer;
@@ -85,9 +93,9 @@ public class FetchResponseEncoderEnvelop
Address[] to;
+ @Before
protected void setUp() throws Exception {
- super.setUp();
- envelope = mock(FetchResponse.Envelope.class);
+ envelope = context.mock(FetchResponse.Envelope.class);
bcc = null;
cc = null;
@@ -101,8 +109,8 @@ public class FetchResponseEncoderEnvelop
to = null;
message = new FetchResponse(MSN, null, null, null, null, envelope, null, null, null);
- composer = mock(ImapResponseComposer.class);
- mockNextEncoder = mock(ImapEncoder.class);
+ composer = context.mock(ImapResponseComposer.class);
+ mockNextEncoder = context.mock(ImapEncoder.class);
encoder = new FetchResponseEncoder(mockNextEncoder, false);
stubCommand = ImapCommand.anyStateCommand("COMMAND");
flags = new Flags(Flags.Flag.DELETED);
@@ -125,8 +133,8 @@ public class FetchResponseEncoderEnvelop
private Address mockAddress(final String name, final String domainList,
final String mailbox, final String host) {
- final Address address = mock(Address.class, name + host);
- checking(new Expectations() {{
+ final Address address = context.mock(Address.class, name + host);
+ context.checking(new Expectations() {{
oneOf (address).getPersonalName();will(returnValue(name));
oneOf (address).getAtDomainList();will(returnValue(domainList));
oneOf (address).getMailboxName();will(returnValue(mailbox));
@@ -136,7 +144,7 @@ public class FetchResponseEncoderEnvelop
}
private void envelopExpects() {
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
oneOf(envelope).getBcc();will(returnValue(bcc));
oneOf(envelope).getCc();will(returnValue(cc));
oneOf(envelope).getDate();will(returnValue(date));
@@ -150,14 +158,11 @@ public class FetchResponseEncoderEnvelop
}});
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testShouldNilAllNullProperties() throws Exception {
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
exactly(6).of(composer).nil(); inSequence(composition);
@@ -167,11 +172,12 @@ public class FetchResponseEncoderEnvelop
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldComposeDate() throws Exception {
date = "a date";
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(date), with(aNull(String.class)), with(equal(true))); inSequence(composition);
exactly(6).of(composer).nil(); inSequence(composition);
@@ -180,12 +186,13 @@ public class FetchResponseEncoderEnvelop
}});
encoder.doEncode(message, composer, new FakeImapSession());
}
-
+
+ @Test
public void testShouldComposeSubject() throws Exception {
subject = "some subject";
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(equal(subject)), with(equal(true))); inSequence(composition);
exactly(6).of(composer).nil(); inSequence(composition);
@@ -195,11 +202,12 @@ public class FetchResponseEncoderEnvelop
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldComposeInReplyTo() throws Exception {
inReplyTo = "some reply to";
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
exactly(6).of(composer).nil(); inSequence(composition);
@@ -209,11 +217,12 @@ public class FetchResponseEncoderEnvelop
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldComposeMessageId() throws Exception {
messageId = "some message id";
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
exactly(6).of(composer).nil(); inSequence(composition);
@@ -223,11 +232,12 @@ public class FetchResponseEncoderEnvelop
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldComposeOneFromAddress() throws Exception {
from = mockOneAddress();
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
oneOf(composer).startAddresses(); inSequence(composition);
@@ -244,11 +254,12 @@ public class FetchResponseEncoderEnvelop
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldComposeManyFromAddress() throws Exception {
from = mockManyAddresses();
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
oneOf(composer).startAddresses(); inSequence(composition);
@@ -270,11 +281,12 @@ public class FetchResponseEncoderEnvelop
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldComposeOneSenderAddress() throws Exception {
sender = mockOneAddress();
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
exactly(1).of(composer).nil(); inSequence(composition);
@@ -292,11 +304,12 @@ public class FetchResponseEncoderEnvelop
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldComposeManySenderAddress() throws Exception {
sender = mockManyAddresses();
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
exactly(1).of(composer).nil(); inSequence(composition);
@@ -320,11 +333,12 @@ public class FetchResponseEncoderEnvelop
}
+ @Test
public void testShouldComposeOneReplyToAddress() throws Exception {
replyTo = mockOneAddress();
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
exactly(2).of(composer).nil(); inSequence(composition);
@@ -342,11 +356,12 @@ public class FetchResponseEncoderEnvelop
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldComposeManyReplyToAddress() throws Exception {
replyTo = mockManyAddresses();
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
exactly(2).of(composer).nil(); inSequence(composition);
@@ -369,11 +384,12 @@ public class FetchResponseEncoderEnvelop
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldComposeOneToAddress() throws Exception {
to = mockOneAddress();
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
exactly(3).of(composer).nil(); inSequence(composition);
@@ -391,11 +407,12 @@ public class FetchResponseEncoderEnvelop
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldComposeManyToAddress() throws Exception {
to = mockManyAddresses();
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
exactly(3).of(composer).nil(); inSequence(composition);
@@ -418,11 +435,12 @@ public class FetchResponseEncoderEnvelop
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldComposeOneCcAddress() throws Exception {
cc = mockOneAddress();
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
exactly(4).of(composer).nil(); inSequence(composition);
@@ -440,11 +458,12 @@ public class FetchResponseEncoderEnvelop
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldComposeManyCcAddress() throws Exception {
cc = mockManyAddresses();
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
exactly(4).of(composer).nil(); inSequence(composition);
@@ -466,12 +485,13 @@ public class FetchResponseEncoderEnvelop
}});
encoder.doEncode(message, composer, new FakeImapSession());
}
-
+
+ @Test
public void testShouldComposeOneBccAddress() throws Exception {
bcc = mockOneAddress();
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
exactly(5).of(composer).nil(); inSequence(composition);
@@ -488,11 +508,12 @@ public class FetchResponseEncoderEnvelop
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldComposeManyBccAddress() throws Exception {
bcc = mockManyAddresses();
envelopExpects();
- checking(new Expectations() {{
- final Sequence composition = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence composition = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal((long) MSN))); inSequence(composition);
oneOf(composer).startEnvelope(with(aNull(String.class)), with(aNull(String.class)), with(equal(true))); inSequence(composition);
exactly(5).of(composer).nil(); inSequence(composition);
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.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.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -33,10 +35,16 @@ import org.apache.james.imap.encode.Imap
import org.apache.james.imap.encode.ImapResponseComposer;
import org.apache.james.imap.message.response.FetchResponse;
import org.jmock.Expectations;
+import org.jmock.Mockery;
import org.jmock.Sequence;
-import org.jmock.integration.junit3.MockObjectTestCase;
+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 FetchResponseEncoderNoExtensionsTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class FetchResponseEncoderNoExtensionsTest {
Flags flags;
@@ -50,34 +58,36 @@ public class FetchResponseEncoderNoExten
ImapCommand stubCommand;
+ private Mockery context = new JUnit4Mockery();
+
+ @Before
protected void setUp() throws Exception {
- super.setUp();
- composer = mock(ImapResponseComposer.class);
- mockNextEncoder = mock(ImapEncoder.class);
+ composer = context.mock(ImapResponseComposer.class);
+ mockNextEncoder = context.mock(ImapEncoder.class);
encoder = new FetchResponseEncoder(mockNextEncoder, true);
stubCommand = ImapCommand.anyStateCommand("COMMAND");
flags = new Flags(Flags.Flag.DELETED);
- stubStructure = mock(FetchResponse.Structure.class);
+ stubStructure = context.mock(FetchResponse.Structure.class);
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
+ @Test
public void testShouldNotAcceptUnknownResponse() throws Exception {
- assertFalse(encoder.isAcceptable(mock(ImapMessage.class)));
+ assertFalse(encoder.isAcceptable(context.mock(ImapMessage.class)));
}
+ @Test
public void testShouldAcceptFetchResponse() throws Exception {
assertTrue(encoder.isAcceptable(new FetchResponse(11, null, null, null,
null, null, null, null, null)));
}
+ @Test
public void testShouldEncodeFlagsResponse() throws Exception {
FetchResponse message = new FetchResponse(100, flags, null, null, null,
null, null, null, null);
- checking(new Expectations() {{
- final Sequence sequence = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence sequence = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal(100L))); inSequence(sequence);
oneOf(composer).flags(with(equal(flags))); inSequence(sequence);
oneOf(composer).closeFetchResponse(); inSequence(sequence);
@@ -85,11 +95,12 @@ public class FetchResponseEncoderNoExten
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldEncodeUidResponse() throws Exception {
FetchResponse message = new FetchResponse(100, null, new Long(72),
null, null, null, null, null, null);
- checking(new Expectations() {{
- final Sequence sequence = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence sequence = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal(100L))); inSequence(sequence);
oneOf(composer).message(with(equal("UID"))); inSequence(sequence);
oneOf(composer).message(with(equal(72L))); inSequence(sequence);
@@ -98,11 +109,12 @@ public class FetchResponseEncoderNoExten
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldEncodeAllResponse() throws Exception {
FetchResponse message = new FetchResponse(100, flags, new Long(72),
null, null, null, null, null, null);
- checking(new Expectations() {{
- final Sequence sequence = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence sequence = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal(100L))); inSequence(sequence);
oneOf(composer).flags(with(equal(flags))); inSequence(sequence);
oneOf(composer).message(with(equal("UID"))); inSequence(sequence);
@@ -112,6 +124,7 @@ public class FetchResponseEncoderNoExten
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldNotAddExtensionsWithEncodingBodyStructure() throws Exception {
FetchResponse message = new FetchResponse(100, flags, new Long(72),
null, null, null, null, stubStructure, null);
@@ -121,7 +134,7 @@ public class FetchResponseEncoderNoExten
parameterList.add("CHARSET");
parameterList.add("US-ASCII");
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
final long octets = 2279L;
final long lines = 48L;
allowing(stubStructure).getMediaType(); will(returnValue("TEXT"));
@@ -132,7 +145,7 @@ public class FetchResponseEncoderNoExten
allowing(stubStructure).getEncoding(); will(returnValue("7BIT"));
ignoring(stubStructure);
- final Sequence sequence = sequence("composition");
+ final Sequence sequence = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal(100L))); inSequence(sequence);
oneOf(composer).flags(with(equal(flags))); inSequence(sequence);
oneOf(composer).message(with(equal("BODYSTRUCTURE")));inSequence(sequence);
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java Tue Mar 16 17:55:28 2010
@@ -20,6 +20,7 @@
package org.apache.james.imap.encode;
import javax.mail.Flags;
+import static org.junit.Assert.*;
import org.apache.james.imap.api.ImapCommand;
import org.apache.james.imap.api.ImapMessage;
@@ -28,10 +29,16 @@ import org.apache.james.imap.encode.Imap
import org.apache.james.imap.encode.ImapResponseComposer;
import org.apache.james.imap.message.response.FetchResponse;
import org.jmock.Expectations;
+import org.jmock.Mockery;
import org.jmock.Sequence;
-import org.jmock.integration.junit3.MockObjectTestCase;
+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 FetchResponseEncoderTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class FetchResponseEncoderTest {
Flags flags;
@@ -44,33 +51,34 @@ public class FetchResponseEncoderTest ex
ImapCommand stubCommand;
+ private Mockery context = new JUnit4Mockery();
+
+ @Before
protected void setUp() throws Exception {
- super.setUp();
- composer = mock(ImapResponseComposer.class);
- mockNextEncoder = mock(ImapEncoder.class);
+ composer = context.mock(ImapResponseComposer.class);
+ mockNextEncoder = context.mock(ImapEncoder.class);
encoder = new FetchResponseEncoder(mockNextEncoder, false);
stubCommand = ImapCommand.anyStateCommand("COMMAND");
flags = new Flags(Flags.Flag.DELETED);
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testShouldNotAcceptUnknownResponse() throws Exception {
- assertFalse(encoder.isAcceptable(mock(ImapMessage.class)));
+ assertFalse(encoder.isAcceptable(context.mock(ImapMessage.class)));
}
+ @Test
public void testShouldAcceptFetchResponse() throws Exception {
assertTrue(encoder.isAcceptable(new FetchResponse(11, null, null, null,
null, null, null, null, null)));
}
+ @Test
public void testShouldEncodeFlagsResponse() throws Exception {
FetchResponse message = new FetchResponse(100, flags, null, null, null,
null, null, null, null);
- checking(new Expectations() {{
- final Sequence sequence = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence sequence = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal(100L))); inSequence(sequence);
oneOf(composer).flags(with(equal(flags))); inSequence(sequence);
oneOf(composer).closeFetchResponse(); inSequence(sequence);
@@ -78,11 +86,12 @@ public class FetchResponseEncoderTest ex
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldEncodeUidResponse() throws Exception {
FetchResponse message = new FetchResponse(100, null, new Long(72),
null, null, null, null, null, null);
- checking(new Expectations() {{
- final Sequence sequence = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence sequence = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal(100L))); inSequence(sequence);
oneOf(composer).message(with(equal("UID"))); inSequence(sequence);
oneOf(composer).message(with(equal(72L))); inSequence(sequence);
@@ -91,11 +100,12 @@ public class FetchResponseEncoderTest ex
encoder.doEncode(message, composer, new FakeImapSession());
}
+ @Test
public void testShouldEncodeAllResponse() throws Exception {
FetchResponse message = new FetchResponse(100, flags, new Long(72),
null, null, null, null, null, null);
- checking(new Expectations() {{
- final Sequence sequence = sequence("composition");
+ context.checking(new Expectations() {{
+ final Sequence sequence = context.sequence("composition");
oneOf(composer).openFetchResponse(with(equal(100L))); inSequence(sequence);
oneOf(composer).flags(with(equal(flags))); inSequence(sequence);
oneOf(composer).message(with(equal("UID"))); inSequence(sequence);
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ImapResponseTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ImapResponseTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ImapResponseTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ImapResponseTest.java Tue Mar 16 17:55:28 2010
@@ -19,12 +19,14 @@
package org.apache.james.imap.encode;
+import static org.junit.Assert.*;
+
import javax.mail.Flags;
import org.apache.james.imap.encode.base.ImapResponseComposerImpl;
-import org.jmock.integration.junit3.MockObjectTestCase;
+import org.junit.Test;
-public class ImapResponseTest extends MockObjectTestCase {
+public class ImapResponseTest {
private static final String TAG = "TAG";
@@ -33,15 +35,13 @@ public class ImapResponseTest extends Mo
MockImapResponseWriter writer;
protected void setUp() throws Exception {
- super.setUp();
writer = new MockImapResponseWriter();
response = new ImapResponseComposerImpl(writer);
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
+
+ @Test
public void testFlagsResponse() throws Exception {
Flags flags = new Flags();
response.flagsResponse(flags);
@@ -58,6 +58,7 @@ public class ImapResponseTest extends Mo
writer.operations.get(4));
}
+ @Test
public void testExistsResponse() throws Exception {
int count = 5;
response.existsResponse(count);
@@ -72,6 +73,7 @@ public class ImapResponseTest extends Mo
writer.operations.get(3));
}
+ @Test
public void testRecentResponse() throws Exception {
int count = 5;
response.recentResponse(count);
@@ -86,6 +88,7 @@ public class ImapResponseTest extends Mo
writer.operations.get(3));
}
+ @Test
public void testExpungeResponse() throws Exception {
int count = 5;
response.expungeResponse(count);
@@ -100,6 +103,7 @@ public class ImapResponseTest extends Mo
writer.operations.get(3));
}
+ @Test
public void testTaggedResponse() throws Exception {
String message = "A message";
response.taggedResponse(message, TAG);
@@ -112,6 +116,7 @@ public class ImapResponseTest extends Mo
writer.operations.get(2));
}
+ @Test
public void testUntaggedResponse() throws Exception {
String message = "A message";
response.untaggedResponse(message);
@@ -124,6 +129,7 @@ public class ImapResponseTest extends Mo
writer.operations.get(2));
}
+ @Test
public void testByeResponse() throws Exception {
String message = "A message";
response.byeResponse(message);
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.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.LSub
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 LSubResponseEncoderTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class LSubResponseEncoderTest {
LSubResponseEncoder encoder;
@@ -40,52 +48,54 @@ public class LSubResponseEncoderTest ext
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 LSubResponseEncoder(mockNextEncoder);
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testIsAcceptable() {
assertFalse(encoder.isAcceptable(new ListResponse(true, true, true,
true, false, false, ".", "name")));
assertTrue(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("LSUB")),with(aNull(List.class)), with(same(".")), with(same("INBOX.name")));
}});
encoder.encode(new LSubResponse("INBOX.name", ".", false), composer, new FakeImapSession());
}
+ @Test
@SuppressWarnings("unchecked")
public void testDelimiter() throws Exception {
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
oneOf(composer).listResponse(with(same("LSUB")),with(aNull(List.class)), with(same("@")), with(same("INBOX.name")));
}});
encoder.encode(new LSubResponse("INBOX.name", "@", false), composer, new FakeImapSession());
}
+ @Test
@SuppressWarnings("unchecked")
public void testNoDelimiter() throws Exception {
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
oneOf(composer).listResponse(with(same("LSUB")),with(aNull(List.class)), with(aNull(String.class)), with(same("INBOX.name")));
}});
encoder.encode(new LSubResponse("INBOX.name", null, false), 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("LSUB")),with(equal(Arrays.asList(values))), with(equal(".")), with(same("INBOX.name")));
}});
encoder.encode(new LSubResponse("INBOX.name", ".", true), composer, new FakeImapSession());
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java Tue Mar 16 17:55:28 2010
@@ -19,15 +19,23 @@
package org.apache.james.imap.encode;
+import static org.junit.Assert.*;
+
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.encode.ImapEncoder;
import org.apache.james.imap.encode.ImapResponseComposer;
import org.apache.james.imap.encode.SearchResponseEncoder;
import org.apache.james.imap.message.response.SearchResponse;
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 ListResponseEncoderTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class ListResponseEncoderTest {
private static final long[] IDS = { 1, 4, 9, 16 };
@@ -39,26 +47,26 @@ public class ListResponseEncoderTest ext
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);
response = new SearchResponse(IDS);
encoder = new SearchResponseEncoder(mockNextEncoder);
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testIsAcceptable() {
assertTrue(encoder.isAcceptable(response));
- assertFalse(encoder.isAcceptable(mock(ImapMessage.class)));
+ assertFalse(encoder.isAcceptable(context.mock(ImapMessage.class)));
assertFalse(encoder.isAcceptable(null));
}
+ @Test
public void testEncode() throws Exception {
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
oneOf(composer).searchResponse(with(same(IDS)));
}});
encoder.encode(response, composer, new FakeImapSession());
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java Tue Mar 16 17:55:28 2010
@@ -23,9 +23,15 @@ import java.util.List;
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 ListingEncodingUtilsTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class ListingEncodingUtilsTest {
final String deliminatorParameter = ".";
final String nameParameter = "LIST";
@@ -35,21 +41,20 @@ public class ListingEncodingUtilsTest ex
ImapResponseComposer mock;
+ private Mockery context = new JUnit4Mockery();
+
+ @Before
protected void setUp() throws Exception {
- super.setUp();
- mock = mock(ImapResponseComposer.class);
+ mock = context.mock(ImapResponseComposer.class);
attributesOutput = new ArrayList<String>();
- checking (new Expectations() {{
+ context.checking (new Expectations() {{
oneOf(mock).listResponse(with(equal(typeNameParameters)), with(equal(attributesOutput)),
with(equal(deliminatorParameter)), with(equal(nameParameter)));
}});
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testShouldAddHasChildrenToAttributes() throws Exception {
// Setup
attributesOutput.add("\\HasChildren");
@@ -59,6 +64,7 @@ public class ListingEncodingUtilsTest ex
ListingEncodingUtils.encodeListingResponse(typeNameParameters, mock, input);
}
+ @Test
public void testShouldAddHasNoChildrenToAttributes() throws Exception {
// Setup
attributesOutput.add("\\HasNoChildren");
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java Tue Mar 16 17:55:28 2010
@@ -19,15 +19,23 @@
package org.apache.james.imap.encode;
+import static org.junit.Assert.*;
+
import org.apache.james.imap.api.ImapMessage;
import org.apache.james.imap.encode.ImapEncoder;
import org.apache.james.imap.encode.ImapResponseComposer;
import org.apache.james.imap.encode.MailboxStatusResponseEncoder;
import org.apache.james.imap.message.response.MailboxStatusResponse;
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 MailboxStatusResponseEncoderTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class MailboxStatusResponseEncoderTest {
MailboxStatusResponseEncoder encoder;
@@ -35,24 +43,25 @@ public class MailboxStatusResponseEncode
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 MailboxStatusResponseEncoder(mockNextEncoder);
}
+
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testIsAcceptable() throws Exception {
assertTrue(encoder.isAcceptable(new MailboxStatusResponse(null, null, null,
null, null, "mailbox")));
- assertFalse(encoder.isAcceptable(mock(ImapMessage.class)));
+ assertFalse(encoder.isAcceptable(context.mock(ImapMessage.class)));
assertFalse(encoder.isAcceptable(null));
}
+ @Test
public void testDoEncode() throws Exception {
final Long messages = new Long(2);
final Long recent = new Long(3);
@@ -60,7 +69,7 @@ public class MailboxStatusResponseEncode
final Long uidValidity = new Long(7);
final Long unseen = new Long(11);
final String mailbox = "A mailbox named desire";
- checking(new Expectations() {{
+ context.checking(new Expectations() {{
oneOf(composer).statusResponse(
with(same(messages)),
with(same(recent)),
Modified: james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java?rev=923904&r1=923903&r2=923904&view=diff
==============================================================================
--- james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java (original)
+++ james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java Tue Mar 16 17:55:28 2010
@@ -18,6 +18,8 @@
****************************************************************/
package org.apache.james.imap.encode;
+import static org.junit.Assert.*;
+
import java.util.ArrayList;
import java.util.List;
@@ -26,10 +28,16 @@ import org.apache.james.imap.api.ImapMes
import org.apache.james.imap.api.process.ImapSession;
import org.apache.james.imap.message.response.NamespaceResponse;
import org.jmock.Expectations;
+import org.jmock.Mockery;
import org.jmock.Sequence;
-import org.jmock.integration.junit3.MockObjectTestCase;
+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 NamespaceResponseEncoderTest extends MockObjectTestCase {
+@RunWith(JMock.class)
+public class NamespaceResponseEncoderTest {
ImapSession dummySession;
@@ -37,25 +45,24 @@ public class NamespaceResponseEncoderTes
NamespaceResponseEncoder subject;
+ private Mockery context = new JUnit4Mockery();
+
+ @Before
protected void setUp() throws Exception {
- super.setUp();
- dummySession = mock(ImapSession.class);
- final ImapEncoder stubNextEncoderInChain = mock(ImapEncoder.class);
+ dummySession = context.mock(ImapSession.class);
+ final ImapEncoder stubNextEncoderInChain = context.mock(ImapEncoder.class);
subject = new NamespaceResponseEncoder(stubNextEncoderInChain);
- mockComposer = mock(ImapResponseComposer.class);
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
+ mockComposer = context.mock(ImapResponseComposer.class);
}
+ @Test
public void testOneSharedNamespaceShouldWriteNilThenPrefixThenDeliminatorThenNil()
throws Exception {
final String aPrefix = "A Prefix";
final String aDeliminator = "@";
- checking(new Expectations() {
+ context.checking(new Expectations() {
{
- final Sequence sequence = sequence("Composition order");
+ final Sequence sequence = context.sequence("Composition order");
oneOf(mockComposer).untagged(); inSequence(sequence);
oneOf(mockComposer).commandName(ImapConstants.NAMESPACE_COMMAND_NAME);
oneOf(mockComposer).nil(); inSequence(sequence);
@@ -76,13 +83,14 @@ public class NamespaceResponseEncoderTes
mockComposer, dummySession);
}
+ @Test
public void testOneUsersNamespaceShouldWriteNilThenPrefixThenDeliminatorThenNil()
throws Exception {
final String aPrefix = "A Prefix";
final String aDeliminator = "@";
- checking(new Expectations() {
+ context.checking(new Expectations() {
{
- final Sequence sequence = sequence("Composition order");
+ final Sequence sequence = context.sequence("Composition order");
oneOf(mockComposer).untagged(); inSequence(sequence);
oneOf(mockComposer).commandName(ImapConstants.NAMESPACE_COMMAND_NAME);
oneOf(mockComposer).nil(); inSequence(sequence);
@@ -103,13 +111,14 @@ public class NamespaceResponseEncoderTes
mockComposer, dummySession);
}
+ @Test
public void testOnePersonalNamespaceShouldWritePrefixThenDeliminatorThenNilNil()
throws Exception {
final String aPrefix = "A Prefix";
final String aDeliminator = "@";
- checking(new Expectations() {
+ context.checking(new Expectations() {
{
- final Sequence sequence = sequence("Composition order");
+ final Sequence sequence = context.sequence("Composition order");
oneOf(mockComposer).untagged(); inSequence(sequence);
oneOf(mockComposer).commandName(ImapConstants.NAMESPACE_COMMAND_NAME);
oneOf(mockComposer).openParen(); inSequence(sequence);
@@ -130,15 +139,16 @@ public class NamespaceResponseEncoderTes
mockComposer, dummySession);
}
+ @Test
public void testTwoPersonalNamespaceShouldWritePrefixThenDeliminatorThenNilNil()
throws Exception {
final String aPrefix = "A Prefix";
final String aDeliminator = "@";
final String anotherPrefix = "Another Prefix";
final String anotherDeliminator = "^";
- checking(new Expectations() {
+ context.checking(new Expectations() {
{
- final Sequence sequence = sequence("Composition order");
+ final Sequence sequence = context.sequence("Composition order");
oneOf(mockComposer).untagged(); inSequence(sequence);
oneOf(mockComposer).commandName(ImapConstants.NAMESPACE_COMMAND_NAME);
oneOf(mockComposer).openParen(); inSequence(sequence);
@@ -165,10 +175,11 @@ public class NamespaceResponseEncoderTes
mockComposer, dummySession);
}
+ @Test
public void testAllNullShouldWriteAllNIL() throws Exception {
- checking(new Expectations() {
+ context.checking(new Expectations() {
{
- final Sequence sequence = sequence("Composition order");
+ final Sequence sequence = context.sequence("Composition order");
oneOf(mockComposer).untagged(); inSequence(sequence);
oneOf(mockComposer).commandName(ImapConstants.NAMESPACE_COMMAND_NAME);
oneOf(mockComposer).nil(); inSequence(sequence);
@@ -181,8 +192,9 @@ public class NamespaceResponseEncoderTes
dummySession);
}
+ @Test
public void testNamespaceResponseIsAcceptable() throws Exception {
- assertFalse(subject.isAcceptable(mock(ImapMessage.class)));
+ assertFalse(subject.isAcceptable(context.mock(ImapMessage.class)));
assertTrue(subject
.isAcceptable(new NamespaceResponse(null, null, null)));
}
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org