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 20:47:59 UTC
svn commit: r923950 [1/2] - in /james/imap/trunk:
api/src/test/java/org/apache/james/imap/api/message/response/
decode/src/test/java/org/apache/james/imap/decode/
decode/src/test/java/org/apache/james/imap/decode/parser/
mailbox/src/test/java/org/apach...
Author: norman
Date: Tue Mar 16 19:47:58 2010
New Revision: 923950
URL: http://svn.apache.org/viewvc?rev=923950&view=rev
Log:
More fixes for JUnit 4 (IMAP-117)
Modified:
james/imap/trunk/api/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsLocaleDateTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MailboxExpressionTest.java
james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/util/MailboxEventDispatcherFlagsTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/AbstractTestImapResponseComposer.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/EncoderUtilsDateTimeLocaleTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/EncoderUtilsTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderEnvelopeTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderNoExtensionsTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/FetchResponseEncoderTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ImapResponseTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/LSubResponseEncoderTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListResponseEncoderTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/ListingEncodingUtilsTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/MailboxStatusResponseEncoderTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/NamespaceResponseEncoderTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/SearchResponseEncoderTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/StatusResponseEncoderTest.java
james/imap/trunk/message/src/test/java/org/apache/james/imap/encode/base/ImapResponseComposerImplTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/LSubProcessorTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/NamespaceProcessorTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/base/MailboxEventAnalyserTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/PartialFetchBodyElementTest.java
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/PartialWritableByteChannelTest.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForSelectedStateBase.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/AbstractTestOutputStreamImapResponseWriter.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/OutputStreamImapResponseWriterQuoteTest.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/OutputStreamImapResponseWriterTest.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderMultipartAlternativeTest.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsMultipartMixedTest.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsRFC822Test.java
james/imap/trunk/store/src/test/java/org/apache/james/imap/store/SearchUtilsTest.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/MessageRowUtilsTest.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/MessageUtilsCountUnnormalLinesTest.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/MessageUtilsNormalisedWriteToTest.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderMultipartAlternativeTest.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsMultipartMixedTest.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsRFC822Test.java
james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/SearchUtilsTest.java
Modified: james/imap/trunk/api/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/api/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/api/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java (original)
+++ james/imap/trunk/api/src/test/java/org/apache/james/imap/api/message/response/AbstractTestForStatusResponseFactory.java Tue Mar 16 19:47:58 2010
@@ -27,12 +27,9 @@ import org.apache.james.imap.api.ImapCom
import org.apache.james.imap.api.display.HumanReadableText;
import org.apache.james.imap.api.message.response.StatusResponse;
import org.apache.james.imap.api.message.response.StatusResponseFactory;
-import org.jmock.integration.junit4.JMock;
import org.junit.Before;
import org.junit.Test;
-import org.junit.runner.RunWith;
-@RunWith(JMock.class)
abstract public class AbstractTestForStatusResponseFactory {
private static final String TAG = "ATAG";
@@ -50,7 +47,7 @@ abstract public class AbstractTestForSta
abstract protected StatusResponseFactory createInstance();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
factory = createInstance();
command = ImapCommand.anyStateCommand("Command");
}
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsLocaleDateTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsLocaleDateTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsLocaleDateTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsLocaleDateTest.java Tue Mar 16 19:47:58 2010
@@ -20,62 +20,72 @@
package org.apache.james.imap.decode;
import java.util.Locale;
+import static org.junit.Assert.*;
-import junit.framework.TestCase;
+import org.junit.After;
+import org.junit.Test;
-public class DecoderUtilsLocaleDateTest extends TestCase {
+public class DecoderUtilsLocaleDateTest {
private static final Locale BASE_DEFAULT_LOCALE = Locale.getDefault();
- protected void setUp() throws Exception {
- super.setUp();
- }
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
Locale.setDefault(BASE_DEFAULT_LOCALE);
- super.tearDown();
}
+ @Test
public void testUS() throws Exception {
runTests(Locale.US);
}
+ @Test
public void testITALY() throws Exception {
runTests(Locale.ITALY);
}
+ @Test
public void testTAIWAN() throws Exception {
runTests(Locale.TAIWAN);
}
+ @Test
public void testCHINA() throws Exception {
runTests(Locale.CHINA);
}
+ @Test
public void testKOREA() throws Exception {
runTests(Locale.KOREA);
}
+ @Test
public void testJAPAN() throws Exception {
runTests(Locale.JAPAN);
}
+ @Test
public void testUK() throws Exception {
runTests(Locale.UK);
}
+ @Test
public void testCANADA() throws Exception {
runTests(Locale.CANADA);
}
+ @Test
public void testGERMANY() throws Exception {
runTests(Locale.GERMANY);
}
+ @Test
public void testFRANCH() throws Exception {
runTests(Locale.FRANCE);
}
+
private void runTests(Locale locale) throws Exception {
Locale.setDefault(locale);
decodeDateTime();
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/DecoderUtilsTest.java Tue Mar 16 19:47:58 2010
@@ -19,6 +19,8 @@
package org.apache.james.imap.decode;
+import static org.junit.Assert.*;
+
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
@@ -26,11 +28,10 @@ import java.util.TimeZone;
import javax.mail.Flags;
-import junit.framework.TestCase;
-
import org.apache.commons.lang.time.FastDateFormat;
+import org.junit.Test;
-public class DecoderUtilsTest extends TestCase {
+public class DecoderUtilsTest {
private static final String EXTENSION_FLAG = "\\Extension";
@@ -38,14 +39,9 @@ public class DecoderUtilsTest extends Te
private static final String FLAG_MESSAGE = "RFC3501 specifies that \\Recent flag cannot be set by the client but accept liberally for better compatibility.";
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
+
+ @Test
public void testSetRecentFlag() throws Exception {
Flags flags = new Flags();
DecoderUtils.setFlag("\\Recent", flags);
@@ -53,6 +49,7 @@ public class DecoderUtilsTest extends Te
assertFalse(FLAG_MESSAGE, flags.contains(Flags.Flag.RECENT));
}
+ @Test
public void testSetOtherFlag() throws Exception {
Flags flags = new Flags();
DecoderUtils.setFlag(A_CUSTOM_FLAG, flags);
@@ -60,6 +57,7 @@ public class DecoderUtilsTest extends Te
.contains(A_CUSTOM_FLAG));
}
+ @Test
public void testExtensionFlag() throws Exception {
Flags flags = new Flags();
DecoderUtils.setFlag(EXTENSION_FLAG, flags);
@@ -67,6 +65,7 @@ public class DecoderUtilsTest extends Te
.contains(EXTENSION_FLAG));
}
+ @Test
public void testBadDateTime() throws Exception {
checkDateTime(null);
checkDateTime("");
@@ -109,6 +108,7 @@ public class DecoderUtilsTest extends Te
}
}
+ @Test
@SuppressWarnings("deprecation")
public void testSimpleDecodeDateTime() throws Exception {
assertEquals("21 Oct 1972 20:00:00 GMT", DecoderUtils.decodeDateTime(
@@ -174,12 +174,14 @@ public class DecoderUtilsTest extends Te
"21-Oct-1972 06:00:00 -1000").toGMTString());
}
+ @Test
@SuppressWarnings("deprecation")
public void testAppleMailPrependsZeroNotSpace() throws Exception {
assertEquals("9 Apr 2008 13:17:51 GMT", DecoderUtils.decodeDateTime(
"09-Apr-2008 15:17:51 +0200").toGMTString());
}
+ @Test
public void testDecodeDateTime() throws Exception {
runTimeZoneTest(TimeZone.getTimeZone("GMT+0"));
runTimeZoneTest(TimeZone.getTimeZone("GMT+1"));
@@ -258,6 +260,7 @@ public class DecoderUtilsTest extends Te
return out;
}
+ @Test
public void testDecodeDigit() throws Exception {
assertEquals(0, DecoderUtils.decodeDigit('0'));
assertEquals(1, DecoderUtils.decodeDigit('1'));
@@ -285,6 +288,7 @@ public class DecoderUtilsTest extends Te
}
}
+ @Test
public void testDecodeMonth() throws Exception {
assertEquals(Calendar.JANUARY, DecoderUtils.decodeMonth('J', 'A', 'N'));
assertEquals(Calendar.JANUARY, DecoderUtils.decodeMonth('j', 'a', 'n'));
@@ -314,6 +318,7 @@ public class DecoderUtilsTest extends Te
assertEquals(Calendar.DECEMBER, DecoderUtils.decodeMonth('d', 'e', 'c'));
}
+ @Test
public void testRejectBogusMonths() throws Exception {
checkReject('N', 'O', 'C');
checkReject('A', 'N', 'T');
@@ -331,6 +336,7 @@ public class DecoderUtilsTest extends Te
}
}
+ @Test
public void testDecodeYear() throws Exception {
assertEquals(1999, DecoderUtils.decodeYear('1', '9', '9', '9'));
assertEquals(747, DecoderUtils.decodeYear('0', '7', '4', '7'));
@@ -344,6 +350,7 @@ public class DecoderUtilsTest extends Te
assertEquals(2020, DecoderUtils.decodeYear('2', '0', '2', '0'));
}
+ @Test
public void testRejectBogusYear() throws Exception {
checkRejectYear('D', '0', '2', '3');
checkRejectYear('1', 'A', '2', '3');
@@ -361,6 +368,7 @@ public class DecoderUtilsTest extends Te
}
}
+ @Test
public void testDecodeZone() throws Exception {
assertEquals(0, DecoderUtils.decodeZone('+', '0', '0', '0', '0'));
assertEquals(100, DecoderUtils.decodeZone('+', '0', '1', '0', '0'));
@@ -417,6 +425,7 @@ public class DecoderUtilsTest extends Te
}
+ @Test
public void testBogusZones() throws Exception {
checkRejectZone(" 0000");
checkRejectZone(" GMT ");
@@ -441,6 +450,7 @@ public class DecoderUtilsTest extends Te
}
}
+ @Test
public void testIsSimpleDigit() throws Exception {
assertTrue(DecoderUtils.isSimpleDigit('0'));
assertTrue(DecoderUtils.isSimpleDigit('1'));
@@ -468,6 +478,7 @@ public class DecoderUtilsTest extends Te
assertFalse(DecoderUtils.isSimpleDigit('B'));
}
+ @Test
public void testDecodeNumber() throws Exception {
assertEquals(1, DecoderUtils.decodeNumber('0', '1'));
assertEquals(2, DecoderUtils.decodeNumber('0', '2'));
@@ -489,6 +500,7 @@ public class DecoderUtilsTest extends Te
assertEquals(91, DecoderUtils.decodeNumber('9', '1'));
}
+ @Test
public void testRejectNumber() throws Exception {
checkRejectNumber("A1");
checkRejectNumber("1A");
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/FetchPartPathDecoderTest.java Tue Mar 16 19:47:58 2010
@@ -19,24 +19,25 @@
package org.apache.james.imap.decode;
+import static org.junit.Assert.*;
+
import java.util.Collection;
import java.util.Iterator;
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+
-public class FetchPartPathDecoderTest extends TestCase {
+public class FetchPartPathDecoderTest {
FetchPartPathDecoder decoder;
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
decoder = new FetchPartPathDecoder();
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testShouldDetectText() throws Exception {
assertEquals(FetchPartPathDecoder.TEXT, decoder.decode("TEXT"));
assertEquals(FetchPartPathDecoder.TEXT, decoder.decode("3.TEXT"));
@@ -45,6 +46,7 @@ public class FetchPartPathDecoderTest ex
.decode("3.2.5.7.8.TEXT"));
}
+ @Test
public void testShouldDetectHeader() throws Exception {
assertEquals(FetchPartPathDecoder.HEADER, decoder.decode("HEADER"));
assertEquals(FetchPartPathDecoder.HEADER, decoder.decode("4.HEADER"));
@@ -53,6 +55,7 @@ public class FetchPartPathDecoderTest ex
.decode("8.3.5.11.HEADER"));
}
+ @Test
public void testShouldDetectHeaderFields() throws Exception {
assertEquals(FetchPartPathDecoder.HEADER_FIELDS, decoder
.decode("HEADER.FIELDS ()"));
@@ -64,6 +67,7 @@ public class FetchPartPathDecoderTest ex
.decode("8.3.5.11.HEADER.FIELDS ()"));
}
+ @Test
public void testShouldDetectHeaderFieldsNot() throws Exception {
assertEquals(FetchPartPathDecoder.HEADER_NOT_FIELDS, decoder
.decode("HEADER.FIELDS.NOT ()"));
@@ -75,6 +79,7 @@ public class FetchPartPathDecoderTest ex
.decode("8.3.5.11.HEADER.FIELDS.NOT ()"));
}
+ @Test
public void testShouldDetectMime() throws Exception {
assertEquals(FetchPartPathDecoder.MIME, decoder.decode("MIME"));
assertEquals(FetchPartPathDecoder.MIME, decoder.decode("6.MIME"));
@@ -83,6 +88,7 @@ public class FetchPartPathDecoderTest ex
.decode("32.3.15.11.MIME"));
}
+ @Test
public void testShouldDetectContent() throws Exception {
assertEquals(FetchPartPathDecoder.CONTENT, decoder.decode("34"));
assertEquals(FetchPartPathDecoder.CONTENT, decoder.decode("6"));
@@ -90,6 +96,7 @@ public class FetchPartPathDecoderTest ex
assertEquals(FetchPartPathDecoder.CONTENT, decoder.decode("17.3.15.11"));
}
+ @Test
public void testShouldIgnoreCase() throws Exception {
assertEquals(FetchPartPathDecoder.MIME, decoder.decode("6.MIME"));
assertEquals(FetchPartPathDecoder.MIME, decoder.decode("6.mime"));
@@ -105,16 +112,19 @@ public class FetchPartPathDecoderTest ex
assertEquals(FetchPartPathDecoder.TEXT, decoder.decode("6.teXT"));
}
+ @Test
public void testMimimalPath() throws Exception {
int[] values = { 6 };
checkEndingPermutations(values);
}
+ @Test
public void testLongPath() throws Exception {
int[] values = { 3, 11, 345, 231, 11, 3, 1, 1, 1, 3, 8, 8 };
checkEndingPermutations(values);
}
+ @Test
public void testShouldThrowProtocolExceptionWhenSpecifierBogus()
throws Exception {
try {
@@ -125,6 +135,7 @@ public class FetchPartPathDecoderTest ex
}
}
+ @Test
public void testShouldThrowProtocolExceptionWhenPathBogus()
throws Exception {
try {
@@ -135,31 +146,37 @@ public class FetchPartPathDecoderTest ex
}
}
+ @Test
public void testShouldReadShortFieldNames() throws Exception {
String[] names = { "A", "B", "C", "D", "E", "F" };
checkReadNames("1.8.HEADER.FIELDS", names);
}
+ @Test
public void testShouldReadShortFieldNotNames() throws Exception {
String[] names = { "A", "B", "C", "D", "E", "F" };
checkReadNames("1.8.9.HEADER.FIELDS.NOT", names);
}
+ @Test
public void testShouldReadOneFieldNames() throws Exception {
String[] names = { "AFieldName" };
checkReadNames("1.8.HEADER.FIELDS", names);
}
+ @Test
public void testShouldReadOneFieldNotNames() throws Exception {
String[] names = { "AFieldName" };
checkReadNames("1.8.9.HEADER.FIELDS.NOT", names);
}
+ @Test
public void testShouldReadManyFieldNames() throws Exception {
String[] names = { "ONE", "TWO", "THREE", "FOUR", "FIVE", "345345" };
checkReadNames("1.8.HEADER.FIELDS", names);
}
+ @Test
public void testShouldReadManyFieldNotNames() throws Exception {
String[] names = { "ONE", "TWO", "THREE", "FOUR", "FIVE", "345345" };
checkReadNames("1.8.HEADER.FIELDS.NOT", names);
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/FetchCommandParserPartialFetchTest.java Tue Mar 16 19:47:58 2010
@@ -52,7 +52,7 @@ public class FetchCommandParserPartialFe
ImapMessage message;
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
parser = new FetchCommandParser();
mockMessageFactory = context.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserAndParenthesesTest.java Tue Mar 16 19:47:58 2010
@@ -156,7 +156,7 @@ public class SearchCommandParserAndParen
ImapMessage message;
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
parser = new SearchCommandParser();
mockMessageFactory = context.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserCharsetTest.java Tue Mar 16 19:47:58 2010
@@ -81,7 +81,7 @@ public class SearchCommandParserCharsetT
ImapMessage message;
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
parser = new SearchCommandParser();
mockMessageFactory = context.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserNotTest.java Tue Mar 16 19:47:58 2010
@@ -51,7 +51,7 @@ public class SearchCommandParserNotTest
private Mockery context = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
parser = new SearchCommandParser();
mockMessageFactory = context.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserOrTest.java Tue Mar 16 19:47:58 2010
@@ -51,7 +51,7 @@ public class SearchCommandParserOrTest {
private Mockery context = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
parser = new SearchCommandParser();
mockMessageFactory = context.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserQuotedCharsetTest.java Tue Mar 16 19:47:58 2010
@@ -145,7 +145,7 @@ public class SearchCommandParserQuotedCh
private Mockery mockery = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
parser = new SearchCommandParser();
mockMessageFactory = mockery.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeySequenceSetTest.java Tue Mar 16 19:47:58 2010
@@ -51,7 +51,7 @@ public class SearchCommandParserSearchKe
private Mockery mockery = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
parser = new SearchCommandParser();
mockMessageFactory = mockery.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserSearchKeyTest.java Tue Mar 16 19:47:58 2010
@@ -55,7 +55,7 @@ public class SearchCommandParserSearchKe
private Mockery mockery = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
parser = new SearchCommandParser();
mockMessageFactory = mockery.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
@@ -384,7 +384,7 @@ public class SearchCommandParserSearchKe
checkInvalid("header field \r\n", key);
}
- @Test
+
private void checkValid(String input, final SearchKey key) throws Exception {
ImapRequestLineReader reader = new ImapRequestLineReader(
new ByteArrayInputStream(input.getBytes("US-ASCII")),
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/SearchCommandParserTopLevelAndTest.java Tue Mar 16 19:47:58 2010
@@ -38,6 +38,7 @@ import org.apache.james.imap.decode.Deco
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;
@@ -140,7 +141,8 @@ public class SearchCommandParserTopLevel
private Mockery mockery = new JUnit4Mockery();
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
parser = new SearchCommandParser();
mockMessageFactory = mockery.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
Modified: james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java (original)
+++ james/imap/trunk/decode/src/test/java/org/apache/james/imap/decode/parser/StoreCommandParserTest.java Tue Mar 16 19:47:58 2010
@@ -52,7 +52,7 @@ public class StoreCommandParserTest {
private Mockery mockery = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
parser = new StoreCommandParser();
mockMessageFactory = mockery.mock(ImapMessageFactory.class);
command = ImapCommand.anyStateCommand("Command");
Modified: james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MailboxExpressionTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MailboxExpressionTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MailboxExpressionTest.java (original)
+++ james/imap/trunk/mailbox/src/test/java/org/apache/james/imap/mailbox/MailboxExpressionTest.java Tue Mar 16 19:47:58 2010
@@ -19,9 +19,11 @@
package org.apache.james.imap.mailbox;
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
-public class MailboxExpressionTest extends TestCase {
+import org.junit.Test;
+
+public class MailboxExpressionTest {
private static final String PART = "mailbox";
@@ -29,18 +31,12 @@ public class MailboxExpressionTest exten
private static final String BASE = "BASE";
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
private MailboxQuery create(String expression) {
return new MailboxQuery(BASE, expression, '*', '%');
}
+ @Test
public void testIsWild() throws Exception {
assertTrue(create("*").isWild());
assertTrue(create("%").isWild());
@@ -55,12 +51,14 @@ public class MailboxExpressionTest exten
assertFalse(create("ONE").isWild());
}
+ @Test
public void testCombinedNameEmptyPart() throws Exception {
MailboxQuery expression = new MailboxQuery(BASE, "", '*', '%');
assertEquals(BASE, expression.getCombinedName('.'));
}
+ @Test
public void testNullCombinedName() throws Exception {
MailboxQuery expression = new MailboxQuery(null, null, '*',
'%');
@@ -68,18 +66,21 @@ public class MailboxExpressionTest exten
}
+ @Test
public void testSimpleCombinedName() throws Exception {
MailboxQuery expression = create(PART);
assertEquals(BASE + "." + PART, expression.getCombinedName('.'));
assertEquals(BASE + "/" + PART, expression.getCombinedName('/'));
}
+ @Test
public void testCombinedNamePartStartsWithDelimiter() throws Exception {
MailboxQuery expression = create("." + PART);
assertEquals(BASE + "." + PART, expression.getCombinedName('.'));
assertEquals(BASE + "/." + PART, expression.getCombinedName('/'));
}
+ @Test
public void testCombinedNameBaseEndsWithDelimiter() throws Exception {
MailboxQuery expression = new MailboxQuery(BASE + '.', PART,
'*', '%');
@@ -87,6 +88,7 @@ public class MailboxExpressionTest exten
assertEquals(BASE + "./" + PART, expression.getCombinedName('/'));
}
+ @Test
public void testCombinedNameBaseEndsWithDelimiterPartStarts()
throws Exception {
MailboxQuery expression = new MailboxQuery(BASE + '.',
@@ -95,6 +97,7 @@ public class MailboxExpressionTest exten
assertEquals(BASE + "./." + PART, expression.getCombinedName('/'));
}
+ @Test
public void testSimpleExpression() throws Exception {
MailboxQuery expression = create(PART);
assertTrue(expression.isExpressionMatch(PART, '.'));
@@ -104,6 +107,7 @@ public class MailboxExpressionTest exten
assertFalse(expression.isExpressionMatch(SECOND_PART, '.'));
}
+ @Test
public void testEmptyExpression() throws Exception {
MailboxQuery expression = create("");
assertTrue(expression.isExpressionMatch("", '.'));
@@ -113,6 +117,7 @@ public class MailboxExpressionTest exten
assertFalse(expression.isExpressionMatch(BASE + "whatever", '.'));
}
+ @Test
public void testOnlyLocalWildcard() throws Exception {
MailboxQuery expression = create("%");
assertTrue(expression.isExpressionMatch("", '.'));
@@ -123,6 +128,7 @@ public class MailboxExpressionTest exten
assertTrue(expression.isExpressionMatch(PART + '/' + SECOND_PART, '.'));
}
+ @Test
public void testOnlyFreeWildcard() throws Exception {
MailboxQuery expression = create("*");
assertTrue(expression.isExpressionMatch("", '.'));
@@ -134,6 +140,7 @@ public class MailboxExpressionTest exten
assertTrue(expression.isExpressionMatch(PART + '.' + SECOND_PART, '.'));
}
+ @Test
public void testEndsWithLocalWildcard() throws Exception {
MailboxQuery expression = create(PART + '%');
assertFalse(expression.isExpressionMatch("", '.'));
@@ -145,6 +152,7 @@ public class MailboxExpressionTest exten
assertFalse(expression.isExpressionMatch(PART + '.' + SECOND_PART, '.'));
}
+ @Test
public void testStartsWithLocalWildcard() throws Exception {
MailboxQuery expression = create('%' + PART);
assertFalse(expression.isExpressionMatch("", '.'));
@@ -157,6 +165,7 @@ public class MailboxExpressionTest exten
assertFalse(expression.isExpressionMatch(SECOND_PART, '.'));
}
+ @Test
public void testContainsLocalWildcard() throws Exception {
MailboxQuery expression = create(SECOND_PART + '%' + PART);
assertFalse(expression.isExpressionMatch("", '.'));
@@ -169,6 +178,7 @@ public class MailboxExpressionTest exten
+ PART, '.'));
}
+ @Test
public void testEndsWithFreeWildcard() throws Exception {
MailboxQuery expression = create(PART + '*');
assertFalse(expression.isExpressionMatch("", '.'));
@@ -180,6 +190,7 @@ public class MailboxExpressionTest exten
assertTrue(expression.isExpressionMatch(PART + '.' + SECOND_PART, '.'));
}
+ @Test
public void testStartsWithFreeWildcard() throws Exception {
MailboxQuery expression = create('*' + PART);
assertFalse(expression.isExpressionMatch("", '.'));
@@ -190,6 +201,7 @@ public class MailboxExpressionTest exten
assertFalse(expression.isExpressionMatch(SECOND_PART, '.'));
}
+ @Test
public void testContainsFreeWildcard() throws Exception {
MailboxQuery expression = create(SECOND_PART + '*' + PART);
assertFalse(expression.isExpressionMatch("", '.'));
@@ -202,6 +214,7 @@ public class MailboxExpressionTest exten
+ PART, '.'));
}
+ @Test
public void testDoubleFreeWildcard() throws Exception {
MailboxQuery expression = create(SECOND_PART + "**" + PART);
assertFalse(expression.isExpressionMatch("", '.'));
@@ -214,6 +227,7 @@ public class MailboxExpressionTest exten
+ PART, '.'));
}
+ @Test
public void testFreeLocalWildcard() throws Exception {
MailboxQuery expression = create(SECOND_PART + "*%" + PART);
assertFalse(expression.isExpressionMatch("", '.'));
@@ -226,6 +240,7 @@ public class MailboxExpressionTest exten
+ PART, '.'));
}
+ @Test
public void testLocalFreeWildcard() throws Exception {
MailboxQuery expression = create(SECOND_PART + "%*" + PART);
assertFalse(expression.isExpressionMatch("", '.'));
@@ -238,6 +253,7 @@ public class MailboxExpressionTest exten
+ PART, '.'));
}
+ @Test
public void testMultipleFreeWildcards() throws Exception {
MailboxQuery expression = create(SECOND_PART + '*' + PART + '*'
+ SECOND_PART + "**");
@@ -264,6 +280,7 @@ public class MailboxExpressionTest exten
+ SECOND_PART.substring(1), '.'));
}
+ @Test
public void testSimpleMixedWildcards() throws Exception {
MailboxQuery expression = create(SECOND_PART + '%' + PART + '*'
+ SECOND_PART);
@@ -279,6 +296,7 @@ public class MailboxExpressionTest exten
+ SECOND_PART + ".Whatever.", '.'));
}
+ @Test
public void testFreeLocalMixedWildcards() throws Exception {
MailboxQuery expression = create(SECOND_PART + '*' + PART + '%'
+ SECOND_PART);
@@ -300,6 +318,7 @@ public class MailboxExpressionTest exten
+ SECOND_PART + PART + SECOND_PART, '.'));
}
+ @Test
public void testTwoLocalWildcardsShouldMatchMailboxs() throws Exception {
MailboxQuery expression = create("%.%");
assertFalse(expression.isExpressionMatch(PART, '.'));
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -49,7 +49,7 @@ public class MailboxEventDispatcherFlags
private Mockery mockery = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
dispatcher = new MailboxEventDispatcher();
collector = new EventCollector();
dispatcher.addMailboxListener(collector);
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -26,12 +26,9 @@ import java.util.List;
import javax.mail.Flags;
import org.apache.james.imap.api.ImapCommand;
-import org.jmock.integration.junit4.JMock;
import org.junit.Test;
-import org.junit.runner.RunWith;
import static org.junit.Assert.assertEquals;
-@RunWith(JMock.class)
public abstract class AbstractTestImapResponseComposer {
private static final long[] ONE_TWO_THREE = { 1, 2, 3 };
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -32,7 +32,7 @@ public class EncoderUtilsDateTimeLocaleT
private static final Locale BASE_DEFAULT_LOCALE = Locale.getDefault();
@After
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
Locale.setDefault(BASE_DEFAULT_LOCALE);
}
@@ -86,13 +86,13 @@ public class EncoderUtilsDateTimeLocaleT
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -25,7 +25,6 @@ import java.util.Date;
import org.junit.Test;
-import junit.framework.TestCase;
public class EncoderUtilsTest {
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -94,7 +94,7 @@ public class FetchResponseEncoderEnvelop
Address[] to;
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
envelope = context.mock(FetchResponse.Envelope.class);
bcc = null;
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -61,7 +61,7 @@ public class FetchResponseEncoderNoExten
private Mockery context = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
composer = context.mock(ImapResponseComposer.class);
mockNextEncoder = context.mock(ImapEncoder.class);
encoder = new FetchResponseEncoder(mockNextEncoder, true);
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -54,7 +54,7 @@ public class FetchResponseEncoderTest {
private Mockery context = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
composer = context.mock(ImapResponseComposer.class);
mockNextEncoder = context.mock(ImapEncoder.class);
encoder = new FetchResponseEncoder(mockNextEncoder, false);
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -24,6 +24,7 @@ import static org.junit.Assert.*;
import javax.mail.Flags;
import org.apache.james.imap.encode.base.ImapResponseComposerImpl;
+import org.junit.Before;
import org.junit.Test;
public class ImapResponseTest {
@@ -34,7 +35,8 @@ public class ImapResponseTest {
MockImapResponseWriter writer;
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
writer = new MockImapResponseWriter();
response = new ImapResponseComposerImpl(writer);
}
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -49,8 +49,9 @@ public class LSubResponseEncoderTest {
ImapResponseComposer composer;
private Mockery context = new JUnit4Mockery();
+
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
mockNextEncoder = context.mock(ImapEncoder.class);
composer = context.mock(ImapResponseComposer.class);
encoder = new LSubResponseEncoder(mockNextEncoder);
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -50,7 +50,7 @@ public class ListResponseEncoderTest {
private Mockery context = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
mockNextEncoder = context.mock(ImapEncoder.class);
composer = context.mock(ImapResponseComposer.class);
response = new SearchResponse(IDS);
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -44,7 +44,7 @@ public class ListingEncodingUtilsTest {
private Mockery context = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
mock = context.mock(ImapResponseComposer.class);
attributesOutput = new ArrayList<String>();
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -46,7 +46,7 @@ public class MailboxStatusResponseEncode
private Mockery context = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
mockNextEncoder = context.mock(ImapEncoder.class);
composer = context.mock(ImapResponseComposer.class);
encoder = new MailboxStatusResponseEncoder(mockNextEncoder);
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -48,7 +48,7 @@ public class NamespaceResponseEncoderTes
private Mockery context = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
dummySession = context.mock(ImapSession.class);
final ImapEncoder stubNextEncoderInChain = context.mock(ImapEncoder.class);
subject = new NamespaceResponseEncoder(stubNextEncoderInChain);
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -51,7 +51,7 @@ public class SearchResponseEncoderTest {
private Mockery context = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
mockNextEncoder = context.mock(ImapEncoder.class);
composer = context.mock(ImapResponseComposer.class);
encoder = new ListResponseEncoder(mockNextEncoder);
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -63,7 +63,7 @@ public class StatusResponseEncoderTest {
private Mockery context = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
writer = new MockImapResponseWriter();
response = new ImapResponseComposerImpl(writer);
mockNextEncoder = context.mock(ImapEncoder.class);
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -36,7 +36,7 @@ public class ImapResponseComposerImplTes
ByteImapResponseWriter writer;
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
writer = new ByteImapResponseWriter();
composer = new ImapResponseComposerImpl(writer);
}
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -92,7 +92,7 @@ public class LSubProcessorTest {
private Mockery mockery = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
subscriptions = new ArrayList<String>();
serverResponseFactory = mockery.mock(StatusResponseFactory.class);
session = mockery.mock(ImapSession.class);
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/ListProcessorTest.java?rev=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -56,7 +56,7 @@ public class ListProcessorTest {
private Mockery mockery = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
serverResponseFactory = mockery.mock(StatusResponseFactory.class);
session = mockery.mock(ImapSession.class);
command = ImapCommand.anyStateCommand("Command");
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -71,7 +71,7 @@ public class NamespaceProcessorTest {
Mockery mockery = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
sharedSpaces = new ArrayList<MailboxSession.Namespace>();
statusResponseStub = mockery.mock(StatusResponseFactory.class);
final MailboxManager mailboxManagerStub = mockery.mock(MailboxManager.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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -107,7 +107,7 @@ public class SearchProcessorTest {
private Mockery mockery = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
serverResponseFactory = mockery.mock(StatusResponseFactory.class);
session = mockery.mock(ImapSession.class);
command = ImapCommand.anyStateCommand("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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -44,7 +44,7 @@ public class MailboxEventAnalyserTest {
private Mockery mockery = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
analyser = new MailboxEventAnalyser(BASE_SESSION_ID, "Mailbox Name");
}
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/MessageResultUtilsTest.java Tue Mar 16 19:47:58 2010
@@ -19,6 +19,8 @@
package org.apache.james.imap.processor.fetch;
+import static org.junit.Assert.*;
+
import java.io.IOException;
import java.nio.channels.WritableByteChannel;
import java.util.ArrayList;
@@ -28,8 +30,10 @@ import junit.framework.TestCase;
import org.apache.james.imap.mailbox.MessageResult;
import org.apache.james.imap.processor.fetch.MessageResultUtils;
+import org.junit.Before;
+import org.junit.Test;
-public class MessageResultUtilsTest extends TestCase {
+public class MessageResultUtilsTest {
private static final String[] NAMES = { "One", "Three" };
@@ -70,8 +74,8 @@ public class MessageResultUtilsTest exte
}
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
headerOne = new Header("One");
headerTwo = new Header("Two");
headerThree = new Header("Three");
@@ -81,10 +85,7 @@ public class MessageResultUtilsTest exte
headers.add(headerThree);
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testGetAllContent() throws Exception {
List<MessageResult.Header> results = MessageResultUtils.getAll(headers.iterator());
assertEquals(3, results.size());
@@ -93,6 +94,7 @@ public class MessageResultUtilsTest exte
assertEquals(headerThree, results.get(2));
}
+ @Test
public void testGetMatching() throws Exception {
List<MessageResult.Header> results = MessageResultUtils
@@ -102,6 +104,7 @@ public class MessageResultUtilsTest exte
assertEquals(headerThree, results.get(1));
}
+ @Test
public void testGetNotMatching() throws Exception {
List results = MessageResultUtils.getNotMatching(NAMES, headers
@@ -110,6 +113,7 @@ public class MessageResultUtilsTest exte
assertEquals(headerTwo, results.get(0));
}
+ @Test
public void testGetMatchingSingle() throws Exception {
assertEquals(headerOne, MessageResultUtils.getMatching("One", headers
.iterator()));
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=923950&r1=923949&r2=923950&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 19:47:58 2010
@@ -41,7 +41,7 @@ public class PartialFetchBodyElementTest
private Mockery mockery = new JUnit4Mockery();
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
mockBodyElement = mockery.mock(BodyElement.class);
mockery.checking(new Expectations() {{
oneOf(mockBodyElement).getName();will(returnValue("Name"));
Modified: james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/PartialWritableByteChannelTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/PartialWritableByteChannelTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/PartialWritableByteChannelTest.java (original)
+++ james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/fetch/PartialWritableByteChannelTest.java Tue Mar 16 19:47:58 2010
@@ -19,30 +19,31 @@
package org.apache.james.imap.processor.fetch;
+import static org.junit.Assert.*;
+
import java.io.IOException;
import java.nio.ByteBuffer;
import java.nio.channels.WritableByteChannel;
import org.apache.james.imap.processor.fetch.PartialWritableByteChannel;
+import org.junit.Before;
+import org.junit.Test;
-import junit.framework.TestCase;
-public class PartialWritableByteChannelTest extends TestCase implements
+public class PartialWritableByteChannelTest implements
WritableByteChannel {
private static final int CAPACITY = 2048;
ByteBuffer sink;
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
sink = ByteBuffer.allocate(CAPACITY);
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+
+ @Test
public void testShouldPassFullBufferWhenStartZeroSizeLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -57,6 +58,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testShouldIgnoreBytesAfterLimit() throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
ByteBuffer src = ByteBuffer.wrap(bytes);
@@ -70,6 +72,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testShouldIgnoreBytesBeforeStart() throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
ByteBuffer src = ByteBuffer.wrap(bytes);
@@ -83,6 +86,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testShouldIgnoreBytesBeforeStartAndAfterLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -97,6 +101,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferShouldPassFullBufferWhenStartZeroSizeLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -116,6 +121,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferOnBoundaryShouldIgnoreBytesAfterLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -135,6 +141,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferBeforeBoundaryShouldIgnoreBytesAfterLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -157,6 +164,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferAfterBoundaryShouldIgnoreBytesAfterLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -177,6 +185,7 @@ public class PartialWritableByteChannelT
assertEquals(0, sink.get());
}
+ @Test
public void testMultiBufferOnBoundaryOctetsOverBufferShouldIgnoreBytesBeforeStart()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -197,6 +206,7 @@ public class PartialWritableByteChannelT
assertEquals(0, sink.get());
}
+ @Test
public void testMultiBufferAfterBoundaryOctetsOverBufferShouldIgnoreBytesBeforeStart()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -217,6 +227,7 @@ public class PartialWritableByteChannelT
assertEquals(1, sink.get());
}
+ @Test
public void testMultiBufferBeforeBoundaryOctetsOverBufferShouldIgnoreBytesBeforeStart()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -237,6 +248,7 @@ public class PartialWritableByteChannelT
assertEquals(9, sink.get());
}
+ @Test
public void testMultiBufferOnBoundaryOctetsOnBufferShouldIgnoreBytesBeforeStart()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -256,6 +268,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferAfterBoundaryOctetsObBufferShouldIgnoreBytesBeforeStart()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -275,6 +288,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferBeforeBoundaryOctetsOnBufferShouldIgnoreBytesBeforeStart()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -294,6 +308,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferOnBoundaryOctetsUnderBufferShouldIgnoreBytesBeforeStart()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -315,6 +330,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferAfterBoundaryOctetsUnderBufferShouldIgnoreBytesBeforeStart()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -336,6 +352,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferBeforeBoundaryOctetsUnderBufferShouldIgnoreBytesBeforeStart()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -357,6 +374,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferShouldIgnoreBytesBeforeStartAndAfterLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -371,6 +389,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferOnBoundaryOnBufferShouldIgnoreBytesBeforeStartAndAfterLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -388,6 +407,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferBeforeBoundaryOnBufferShouldIgnoreBytesBeforeStartAndAfterLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -405,6 +425,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferAfterBoundaryOnBufferShouldIgnoreBytesBeforeStartAndAfterLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -422,6 +443,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferOnBoundaryAfterBufferShouldIgnoreBytesBeforeStartAndAfterLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -439,6 +461,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferBeforeBoundaryAfterBufferShouldIgnoreBytesBeforeStartAndAfterLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -473,6 +496,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferOnBoundaryBeforeBufferShouldIgnoreBytesBeforeStartAndAfterLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -490,6 +514,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferBeforeBoundaryBeforeBufferShouldIgnoreBytesBeforeStartAndAfterLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
@@ -507,6 +532,7 @@ public class PartialWritableByteChannelT
}
}
+ @Test
public void testMultiBufferAfterBoundaryBeforeBufferShouldIgnoreBytesBeforeStartAndAfterLimit()
throws Exception {
byte[] bytes = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 };
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForSelectedStateBase.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForSelectedStateBase.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForSelectedStateBase.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForSelectedStateBase.java Tue Mar 16 19:47:58 2010
@@ -20,6 +20,7 @@
package org.apache.james.imap.functional;
import org.apache.james.test.functional.HostSystem;
+import org.junit.Before;
/**
* <p>
@@ -54,6 +55,7 @@ public abstract class FrameworkForSelect
*
* @throws Exception
*/
+ @Before
public void setUp() throws Exception {
super.setUp();
addTestFile("SelectedStateSetup.test", preElements);
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/AbstractTestOutputStreamImapResponseWriter.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/AbstractTestOutputStreamImapResponseWriter.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/AbstractTestOutputStreamImapResponseWriter.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/AbstractTestOutputStreamImapResponseWriter.java Tue Mar 16 19:47:58 2010
@@ -19,12 +19,13 @@
package org.apache.james.imap.main;
+import static org.junit.Assert.*;
+
import java.io.ByteArrayOutputStream;
-import junit.framework.TestCase;
+import org.junit.Before;
-public abstract class AbstractTestOutputStreamImapResponseWriter extends
- TestCase {
+public abstract class AbstractTestOutputStreamImapResponseWriter {
OutputStreamImapResponseWriter writer;
@@ -34,7 +35,8 @@ public abstract class AbstractTestOutput
super();
}
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
out = new ByteArrayOutputStream();
writer = new OutputStreamImapResponseWriter(out);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/ImapRequestHandlerAdandonConnectionTest.java Tue Mar 16 19:47:58 2010
@@ -55,7 +55,7 @@ public class ImapRequestHandlerAdandonCo
@Before
- protected void setUp() throws Exception {
+ public void setUp() throws Exception {
// Fakes
fakeOutput = new ByteArrayOutputStream();
// Stubs
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/OutputStreamImapResponseWriterQuoteTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/OutputStreamImapResponseWriterQuoteTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/OutputStreamImapResponseWriterQuoteTest.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/OutputStreamImapResponseWriterQuoteTest.java Tue Mar 16 19:47:58 2010
@@ -19,38 +19,43 @@
package org.apache.james.imap.main;
+import org.junit.Test;
+
public class OutputStreamImapResponseWriterQuoteTest extends
AbstractTestOutputStreamImapResponseWriter {
- protected void tearDown() throws Exception {
- super.tearDown();
- }
+ @Test
public void testEmpty() throws Exception {
writer.quote("");
checkExpected(" \"\"");
}
+ @Test
public void testStartSlash() throws Exception {
writer.quote("\\");
checkExpected(" \"\\\\\"");
}
+ @Test
public void testSimpleQuote() throws Exception {
writer.quote("Simple");
checkExpected(" \"Simple\"");
}
+ @Test
public void testComplexQuote() throws Exception {
writer.quote("Complex Quote With Spaces");
checkExpected(" \"Complex Quote With Spaces\"");
}
+ @Test
public void testDQuoteQuote() throws Exception {
writer.quote("Complex\"Quote With Spaces");
checkExpected(" \"Complex\\\"Quote With Spaces\"");
}
+ @Test
public void testFSlashQuote() throws Exception {
writer.quote("Complex Quote \\With Spaces");
checkExpected(" \"Complex Quote \\\\With Spaces\"");
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/OutputStreamImapResponseWriterTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/OutputStreamImapResponseWriterTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/OutputStreamImapResponseWriterTest.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/main/OutputStreamImapResponseWriterTest.java Tue Mar 16 19:47:58 2010
@@ -19,27 +19,24 @@
package org.apache.james.imap.main;
+import org.junit.Test;
+
public class OutputStreamImapResponseWriterTest extends
AbstractTestOutputStreamImapResponseWriter {
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testCloseParen() throws Exception {
writer.closeParen();
checkExpected(")");
}
+ @Test
public void testOpenParen() throws Exception {
writer.openParen();
checkExpected(" (");
}
+ @Test
public void testOpenParenMessageCloseParen() throws Exception {
writer.openParen();
writer.message("Hello");
@@ -47,6 +44,7 @@ public class OutputStreamImapResponseWri
checkExpected(" (Hello)");
}
+ @Test
public void testOpenParenQuoteCloseParen() throws Exception {
writer.openParen();
writer.quote("Hello");
@@ -54,6 +52,7 @@ public class OutputStreamImapResponseWri
checkExpected(" (\"Hello\")");
}
+ @Test
public void testOpenParenOpenParenMessageCloseParenCloseParen()
throws Exception {
writer.openParen();
@@ -64,6 +63,7 @@ public class OutputStreamImapResponseWri
checkExpected(" ((\"Hello\"))");
}
+ @Test
public void testOpenParenCloseParenMessage() throws Exception {
writer.openParen();
writer.closeParen();
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/MessageRowUtilsTest.java Tue Mar 16 19:47:58 2010
@@ -19,20 +19,14 @@
package org.apache.james.imap.store;
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
import org.apache.james.imap.store.mail.model.MailboxMembership;
+import org.junit.Test;
-public class MessageRowUtilsTest extends TestCase {
+public class MessageRowUtilsTest {
- protected void setUp() throws Exception {
- super.setUp();
- }
-
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testShouldReturnPositiveWhenFirstGreaterThanSecond()
throws Exception {
MailboxMembership one = buildMessage(100);
@@ -46,6 +40,7 @@ public class MessageRowUtilsTest extends
return builder.build();
}
+ @Test
public void testShouldReturnNegativeWhenFirstLessThanSecond()
throws Exception {
MailboxMembership one = buildMessage(98);
@@ -53,6 +48,7 @@ public class MessageRowUtilsTest extends
assertTrue(ResultUtils.getUidComparator().compare(one, two) < 0);
}
+ @Test
public void testShouldReturnZeroWhenFirstEqualsSecond() throws Exception {
MailboxMembership one = buildMessage(90);
MailboxMembership two = buildMessage(90);
Modified: james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java?rev=923950&r1=923949&r2=923950&view=diff
==============================================================================
--- james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java (original)
+++ james/imap/trunk/store/src/test/java/org/apache/james/imap/store/PartContentBuilderComplexMultipartTest.java Tue Mar 16 19:47:58 2010
@@ -19,6 +19,9 @@
package org.apache.james.imap.store;
+import static org.junit.Assert.*;
+
+
import java.io.ByteArrayInputStream;
import java.io.InputStream;
import java.nio.charset.Charset;
@@ -28,8 +31,10 @@ import junit.framework.TestCase;
import org.apache.james.imap.mailbox.MessageResult.Header;
import org.apache.james.imap.store.PartContentBuilder.PartNotFoundException;
+import org.junit.Before;
+import org.junit.Test;
-public class PartContentBuilderComplexMultipartTest extends TestCase {
+public class PartContentBuilderComplexMultipartTest {
private static final String PREAMBLE = "This is the preamble";
@@ -107,15 +112,12 @@ public class PartContentBuilderComplexMu
PartContentBuilder builder;
- protected void setUp() throws Exception {
- super.setUp();
+ @Before
+ public void setUp() throws Exception {
builder = new PartContentBuilder();
}
- protected void tearDown() throws Exception {
- super.tearDown();
- }
-
+ @Test
public void testShouldNotFoundSubPartOfNonMultiPartTopLevel()
throws Exception {
int[] path = { 1, 1 };
@@ -125,6 +127,7 @@ public class PartContentBuilderComplexMu
}
}
+ @Test
public void testShouldNotFoundSubPartOfNonMultiInnerPart() throws Exception {
int[] path = { 2, 2, 1 };
for (int i = 1; i < 10; i++) {
@@ -133,32 +136,38 @@ public class PartContentBuilderComplexMu
}
}
+ @Test
public void testShouldLocateOuterHtml() throws Exception {
int[] path = { 1 };
check(FULL_OUTER_HTML, OUTER_HTML_BODY, CONTENT_TYPE_HTML, path);
}
+ @Test
public void testShouldLocateOuterMail() throws Exception {
int[] path = { 2 };
check(FULL_INNER_MAIL, INNER_MAIL, CONTENT_TYPE_RFC822, path);
}
+ @Test
public void testShouldLocateOuterPlain() throws Exception {
int[] path = { 3 };
check(FULL_OUTER_PLAIN, OUTER_PLAIN_BODY, CONTENT_TYPE_PLAIN, path);
}
+ @Test
public void testShouldLocateInnerHtml() throws Exception {
int[] path = { 2, 2 };
check(FULL_INNER_HTML, INNER_HTML_BODY, CONTENT_TYPE_HTML, path);
}
+ @Test
public void testShouldLocateInnerMail() throws Exception {
int[] path = { 2, 3 };
check(FULL_INNERMOST_EMAIL, RFC822_PLAIN_MAIL, CONTENT_TYPE_RFC822,
path);
}
+ @Test
public void testShouldLocateInnerPlain() throws Exception {
int[] path = { 2, 1 };
check(FULL_INNER_TXT, INNER_PLAIN_BODY, CONTENT_TYPE_PLAIN, path);
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org