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 21:58:59 UTC
svn commit: r923977 - in /james/imap/trunk:
processor/src/test/java/org/apache/james/imap/processor/
protocol-tester/src/main/java/org/apache/james/test/functional/
seda/src/test/java/org/apache/james/imap/functional/
seda/src/test/java/org/apache/jame...
Author: norman
Date: Tue Mar 16 20:58:59 2010
New Revision: 923977
URL: http://svn.apache.org/viewvc?rev=923977&view=rev
Log:
More fixes for JUnit 4 (IMAP-117)
Modified:
james/imap/trunk/processor/src/test/java/org/apache/james/imap/processor/SearchProcessorTest.java
james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractProtocolTestFramework.java
james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForAuthenticatedState.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForNonAuthenticatedState.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForSelectedInbox.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/functional/ImapProtocolFramework.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/external/ExternalFetchRunner.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/ConcurrentSessions.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Events.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Expunge.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Fetch.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchBodySection.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchBodyStructure.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchHeaders.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/NonAuthenticatedState.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/PartialFetch.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Rename.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Security.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/SelectedInbox.java
james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/SelectedState.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
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=923977&r1=923976&r2=923977&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 20:58:59 2010
@@ -444,7 +444,7 @@ public class SearchProcessorTest {
check(SearchKey.buildUnseen(), SearchQuery.flagIsUnSet(Flag.SEEN));
}
- @Test
+
private void check(SearchKey key, SearchQuery.Criterion criterion)
throws Exception {
SearchQuery query = new SearchQuery();
Modified: james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractProtocolTestFramework.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractProtocolTestFramework.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractProtocolTestFramework.java (original)
+++ james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractProtocolTestFramework.java Tue Mar 16 20:58:59 2010
@@ -21,7 +21,6 @@ package org.apache.james.test.functional
import org.junit.AfterClass;
import org.junit.Before;
-import org.junit.BeforeClass;
/**
* Abstract Protocol Test is the root of all of the James Imap Server test
@@ -43,15 +42,17 @@ public abstract class AbstractProtocolTe
/** The Protocol session which is run after the testElements. */
protected ProtocolSession postElements = new ProtocolSession();
- private final HostSystem hostSystem;
+ private static HostSystem hostSystem;
private final String userName;
private final String password;
- public AbstractProtocolTestFramework(HostSystem hostSystem, String userName, String password) {
- this.hostSystem = hostSystem;
+ public AbstractProtocolTestFramework(HostSystem hostSystem, String userName, String password) throws Exception {
+ AbstractProtocolTestFramework.hostSystem = hostSystem;
this.userName = userName;
this.password = password;
+ hostSystem.beforeTests();
+
}
@@ -118,12 +119,7 @@ public abstract class AbstractProtocolTe
@AfterClass
- public void afterTests() throws Exception {
+ public static void afterTests() throws Exception {
hostSystem.afterTests();
}
-
- @BeforeClass
- public void beforeTests() throws Exception {
- hostSystem.beforeTests();
- }
}
Modified: james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java (original)
+++ james/imap/trunk/protocol-tester/src/main/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java Tue Mar 16 20:58:59 2010
@@ -47,14 +47,15 @@ public abstract class AbstractSimpleScri
* @param scriptDirectory name of the directory containing the scripts to be run
* @param fileName
* The name of the file to read protocol elements from.
+ * @throws Exception
*/
- public AbstractSimpleScriptedTestProtocol(HostSystem hostSystem, String userName, String password, String scriptDirectory) {
+ public AbstractSimpleScriptedTestProtocol(HostSystem hostSystem, String userName, String password, String scriptDirectory) throws Exception {
super(hostSystem, userName, password);
this.scriptDirectory = scriptDirectory;
}
@After
- protected void tearDown() throws Exception {
+ public void tearDown() throws Exception {
Locale.setDefault(BASE_DEFAULT_LOCALE);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForAuthenticatedState.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForAuthenticatedState.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForAuthenticatedState.java Tue Mar 16 20:58:59 2010
@@ -59,7 +59,7 @@ import org.junit.Before;
*/
public abstract class FrameworkForAuthenticatedState extends
ImapProtocolFramework implements ImapTestConstants {
- public FrameworkForAuthenticatedState(HostSystem hostSystem) {
+ public FrameworkForAuthenticatedState(HostSystem hostSystem) throws Exception {
super(hostSystem);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForNonAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForNonAuthenticatedState.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForNonAuthenticatedState.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForNonAuthenticatedState.java Tue Mar 16 20:58:59 2010
@@ -41,7 +41,7 @@ import org.junit.Before;
* </ul>
*/
public abstract class FrameworkForNonAuthenticatedState extends ImapProtocolFramework {
- public FrameworkForNonAuthenticatedState(HostSystem system) {
+ public FrameworkForNonAuthenticatedState(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForSelectedInbox.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForSelectedInbox.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForSelectedInbox.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/FrameworkForSelectedInbox.java Tue Mar 16 20:58:59 2010
@@ -52,7 +52,7 @@ import org.apache.james.test.functional.
* @version $Revision: 560719 $
*/
public abstract class FrameworkForSelectedInbox extends FrameworkForAuthenticatedState {
- public FrameworkForSelectedInbox(HostSystem system) {
+ public FrameworkForSelectedInbox(HostSystem system) throws Exception {
super(system);
}
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=923977&r1=923976&r2=923977&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 20:58:59 2010
@@ -44,7 +44,7 @@ import org.junit.Before;
*/
public abstract class FrameworkForSelectedStateBase extends FrameworkForAuthenticatedState {
- public FrameworkForSelectedStateBase(HostSystem system) {
+ public FrameworkForSelectedStateBase(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/ImapProtocolFramework.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/ImapProtocolFramework.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/ImapProtocolFramework.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/ImapProtocolFramework.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.apache.james.test.functional.
public abstract class ImapProtocolFramework extends
AbstractSimpleScriptedTestProtocol implements ImapTestConstants {
- public ImapProtocolFramework(final HostSystem hostSystem) {
+ public ImapProtocolFramework(final HostSystem hostSystem) throws Exception {
super(hostSystem, USER, PASSWORD, "/org/apache/james/imap/scripts/");
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/external/ExternalFetchRunner.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/external/ExternalFetchRunner.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/external/ExternalFetchRunner.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/external/ExternalFetchRunner.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.apache.james.imap.functional.
*/
public class ExternalFetchRunner extends Fetch {
- public ExternalFetchRunner() {
+ public ExternalFetchRunner() throws Exception {
super(ExternalHostSystem.createLocalImap());
continueAfterFailure();
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/ConcurrentSessions.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/ConcurrentSessions.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/ConcurrentSessions.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/ConcurrentSessions.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.junit.Test;
public class ConcurrentSessions extends FrameworkForAuthenticatedState {
- public ConcurrentSessions(HostSystem system) {
+ public ConcurrentSessions(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Events.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Events.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Events.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Events.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.junit.Test;
public class Events extends FrameworkForSelectedStateBase {
- public Events(HostSystem system) {
+ public Events(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Expunge.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Expunge.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Expunge.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Expunge.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.junit.Test;
public class Expunge extends FrameworkForSelectedStateBase {
- public Expunge(HostSystem system) {
+ public Expunge(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Fetch.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Fetch.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Fetch.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Fetch.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.junit.Test;
public class Fetch extends FrameworkForSelectedStateBase {
- public Fetch(HostSystem system) {
+ public Fetch(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchBodySection.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchBodySection.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchBodySection.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchBodySection.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.junit.Test;
public class FetchBodySection extends FrameworkForSelectedStateBase {
- public FetchBodySection(HostSystem system) {
+ public FetchBodySection(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchBodyStructure.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchBodyStructure.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchBodyStructure.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchBodyStructure.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.junit.Test;
public class FetchBodyStructure extends FrameworkForSelectedStateBase {
- public FetchBodyStructure(HostSystem system) {
+ public FetchBodyStructure(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchHeaders.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchHeaders.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchHeaders.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/FetchHeaders.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.junit.Test;
public class FetchHeaders extends FrameworkForSelectedStateBase {
- public FetchHeaders(HostSystem system) {
+ public FetchHeaders(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/NonAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/NonAuthenticatedState.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/NonAuthenticatedState.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/NonAuthenticatedState.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.junit.Test;
public class NonAuthenticatedState extends FrameworkForNonAuthenticatedState {
- public NonAuthenticatedState(HostSystem system) {
+ public NonAuthenticatedState(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/PartialFetch.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/PartialFetch.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/PartialFetch.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/PartialFetch.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.junit.Test;
public class PartialFetch extends FrameworkForSelectedStateBase {
- public PartialFetch(HostSystem system) {
+ public PartialFetch(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Rename.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Rename.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Rename.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Rename.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.junit.Test;
public class Rename extends FrameworkForSelectedStateBase {
- public Rename(HostSystem system) {
+ public Rename(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Security.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Security.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Security.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/Security.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.junit.Test;
public class Security extends ImapProtocolFramework {
- public Security(HostSystem system) {
+ public Security(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/SelectedInbox.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/SelectedInbox.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/SelectedInbox.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/SelectedInbox.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.junit.Test;
public class SelectedInbox extends FrameworkForSelectedInbox {
- public SelectedInbox(HostSystem system) {
+ public SelectedInbox(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/SelectedState.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/SelectedState.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/SelectedState.java (original)
+++ james/imap/trunk/seda/src/test/java/org/apache/james/imap/functional/suite/SelectedState.java Tue Mar 16 20:58:59 2010
@@ -27,7 +27,7 @@ import org.junit.Test;
public class SelectedState extends FrameworkForSelectedStateBase {
- public SelectedState(HostSystem system) {
+ public SelectedState(HostSystem system) throws Exception {
super(system);
}
Modified: james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/MessageUtilsNormalisedWriteToTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/MessageUtilsNormalisedWriteToTest.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/MessageUtilsNormalisedWriteToTest.java (original)
+++ james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/MessageUtilsNormalisedWriteToTest.java Tue Mar 16 20:58:59 2010
@@ -21,12 +21,17 @@ package org.apache.james.mailboxmanager.
import static org.junit.Assert.*;
+import org.junit.Before;
import org.junit.Test;
public class MessageUtilsNormalisedWriteToTest {
StringBuffer buffer;
+ @Before
+ public void setUp() {
+ buffer = new StringBuffer();
+ }
@Test
public void testEmpty() throws Exception {
Modified: james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java
URL: http://svn.apache.org/viewvc/james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java?rev=923977&r1=923976&r2=923977&view=diff
==============================================================================
--- james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java (original)
+++ james/imap/trunk/torque/src/test/java/org/apache/james/mailboxmanager/torque/PartContentBuilderComplexMultipartTest.java Tue Mar 16 20:58:59 2010
@@ -31,6 +31,7 @@ import org.apache.james.imap.store.PartC
import org.apache.james.imap.store.StringBuilderChannel;
import org.apache.james.imap.store.PartContentBuilder.PartNotFoundException;
import org.junit.Before;
+import org.junit.Test;
public class PartContentBuilderComplexMultipartTest {
@@ -115,7 +116,7 @@ public class PartContentBuilderComplexMu
builder = new PartContentBuilder();
}
- @Before
+ @Test
public void testShouldNotFoundSubPartOfNonMultiPartTopLevel()
throws Exception {
int[] path = { 1, 1 };
@@ -125,7 +126,7 @@ public class PartContentBuilderComplexMu
}
}
- @Before
+ @Test
public void testShouldNotFoundSubPartOfNonMultiInnerPart() throws Exception {
int[] path = { 2, 2, 1 };
for (int i = 1; i < 10; i++) {
@@ -134,38 +135,38 @@ public class PartContentBuilderComplexMu
}
}
- @Before
+ @Test
public void testShouldLocateOuterHtml() throws Exception {
int[] path = { 1 };
check(FULL_OUTER_HTML, OUTER_HTML_BODY, CONTENT_TYPE_HTML, path);
}
- @Before
+ @Test
public void testShouldLocateOuterMail() throws Exception {
int[] path = { 2 };
check(FULL_INNER_MAIL, INNER_MAIL, CONTENT_TYPE_RFC822, path);
}
- @Before
+ @Test
public void testShouldLocateOuterPlain() throws Exception {
int[] path = { 3 };
check(FULL_OUTER_PLAIN, OUTER_PLAIN_BODY, CONTENT_TYPE_PLAIN, path);
}
- @Before
+ @Test
public void testShouldLocateInnerHtml() throws Exception {
int[] path = { 2, 2 };
check(FULL_INNER_HTML, INNER_HTML_BODY, CONTENT_TYPE_HTML, path);
}
- @Before
+ @Test
public void testShouldLocateInnerMail() throws Exception {
int[] path = { 2, 3 };
check(FULL_INNERMOST_EMAIL, RFC822_PLAIN_MAIL, CONTENT_TYPE_RFC822,
path);
}
- @Before
+ @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