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 rd...@apache.org on 2008/11/01 13:02:17 UTC
svn commit: r709681 - in /james/protocols/imap/trunk:
deployment/src/test/java/org/apache/james/imap/functional/
seda/src/test/java/org/apache/james/test/functional/
seda/src/test/java/org/apache/james/test/functional/imap/
seda/src/test/java/org/apach...
Author: rdonkin
Date: Sat Nov 1 05:02:16 2008
New Revision: 709681
URL: http://svn.apache.org/viewvc?rev=709681&view=rev
Log:
Reorganise packaging. Separate IMAP specific classes under imap package.
Added:
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractProtocolTest.java (contents, props changed)
- copied, changed from r709661, james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractProtocolTest.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java (contents, props changed)
- copied, changed from r709661, james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractSimpleScriptedTestProtocol.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/FileProtocolSessionBuilder.java (contents, props changed)
- copied, changed from r709661, james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/FileProtocolSessionBuilder.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/HostSystem.java (contents, props changed)
- copied, changed from r709661, james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/HostSystem.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/ProtocolSession.java (contents, props changed)
- copied, changed from r709661, james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/ProtocolSession.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractImapProtocolTestFramework.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/builder/
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/builder/CreateScript.java (contents, props changed)
- copied, changed from r709661, james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/CreateScript.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/builder/ScriptBuilder.java (contents, props changed)
- copied, changed from r709661, james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/ScriptBuilder.java
Removed:
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/CreateScript.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/ScriptBuilder.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractProtocolTest.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractSimpleScriptedTestProtocol.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/FileProtocolSessionBuilder.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/HostSystem.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/ProtocolSession.java
Modified:
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ExperimentalHostSystem.java
james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/HostSystemFactory.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractAuthenticatedStateTestSuite.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractBaseTestSelectedInbox.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestConcurrentSessions.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestEvents.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetch.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchBodySection.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchBodyStructure.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchHeaders.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestForAuthenticatedState.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestForNonAuthenticatedState.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestListing.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestNonAuthenticatedState.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestPartialFetch.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestRename.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSearch.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSecurity.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelect.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedInbox.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedState.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedStateBase.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestUidSearch.java
james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/manual/ExternalHostSystem.java
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ExperimentalHostSystem.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ExperimentalHostSystem.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ExperimentalHostSystem.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/ExperimentalHostSystem.java Sat Nov 1 05:02:16 2008
@@ -35,7 +35,7 @@
import org.apache.james.imap.main.ImapRequestHandler;
import org.apache.james.imap.main.ImapSessionImpl;
import org.apache.james.mailboxmanager.mock.TorqueMailboxManagerProviderSingleton;
-import org.apache.james.test.functional.imap.HostSystem;
+import org.apache.james.test.functional.HostSystem;
public class ExperimentalHostSystem implements HostSystem {
Modified: james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/HostSystemFactory.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/HostSystemFactory.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/HostSystemFactory.java (original)
+++ james/protocols/imap/trunk/deployment/src/test/java/org/apache/james/imap/functional/HostSystemFactory.java Sat Nov 1 05:02:16 2008
@@ -27,7 +27,7 @@
import org.apache.james.imap.mock.MailboxManagerProviderSingleton;
import org.apache.james.imap.processor.main.DefaultImapProcessorFactory;
import org.apache.james.mailboxmanager.mock.TorqueMailboxManagerProviderSingleton;
-import org.apache.james.test.functional.imap.HostSystem;
+import org.apache.james.test.functional.HostSystem;
public class HostSystemFactory {
Copied: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractProtocolTest.java (from r709661, james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractProtocolTest.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractProtocolTest.java?p2=james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractProtocolTest.java&p1=james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractProtocolTest.java&r1=709661&r2=709681&rev=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractProtocolTest.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractProtocolTest.java Sat Nov 1 05:02:16 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.test.functional.imap;
+package org.apache.james.test.functional;
import junit.framework.TestCase;
@@ -31,8 +31,7 @@
* @author Darrell DeBoer
* @author Andrew C. Oliver
*/
-public abstract class AbstractProtocolTest extends TestCase implements
- ImapTestConstants {
+public abstract class AbstractProtocolTest extends TestCase {
/** The Protocol session which is run before the testElements */
protected ProtocolSession preElements = new ProtocolSession();
@@ -43,9 +42,14 @@
protected ProtocolSession postElements = new ProtocolSession();
private final HostSystem hostSystem;
+
+ private final String userName;
+ private final String password;
- public AbstractProtocolTest(HostSystem hostSystem) {
+ public AbstractProtocolTest(HostSystem hostSystem, String userName, String password) {
this.hostSystem = hostSystem;
+ this.userName = userName;
+ this.password = password;
}
protected void setUp() throws Exception {
@@ -110,6 +114,6 @@
*/
private void setUpEnvironment() throws Exception {
hostSystem.reset();
- hostSystem.addUser(USER, PASSWORD);
+ hostSystem.addUser(userName, password);
}
}
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractProtocolTest.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.11
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractProtocolTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractProtocolTest.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractProtocolTest.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java (from r709661, james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractSimpleScriptedTestProtocol.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java?p2=james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java&p1=james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractSimpleScriptedTestProtocol.java&r1=709661&r2=709681&rev=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractSimpleScriptedTestProtocol.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java Sat Nov 1 05:02:16 2008
@@ -17,11 +17,12 @@
* under the License. *
****************************************************************/
-package org.apache.james.test.functional.imap;
+package org.apache.james.test.functional;
import java.io.InputStream;
import java.util.Locale;
+
/**
* A Protocol test which reads the test protocol session from a file. The file
* read is taken as "<test-name>.test", where <test-name> is the value passed
@@ -43,8 +44,8 @@
* @param fileName
* The name of the file to read protocol elements from.
*/
- public AbstractSimpleScriptedTestProtocol(HostSystem hostSystem) {
- super(hostSystem);
+ public AbstractSimpleScriptedTestProtocol(HostSystem hostSystem, String userName, String password) {
+ super(hostSystem, userName, password);
}
protected void tearDown() throws Exception {
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.6
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/AbstractSimpleScriptedTestProtocol.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/FileProtocolSessionBuilder.java (from r709661, james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/FileProtocolSessionBuilder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/FileProtocolSessionBuilder.java?p2=james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/FileProtocolSessionBuilder.java&p1=james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/FileProtocolSessionBuilder.java&r1=709661&r2=709681&rev=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/FileProtocolSessionBuilder.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/FileProtocolSessionBuilder.java Sat Nov 1 05:02:16 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.test.functional.imap;
+package org.apache.james.test.functional;
import java.io.BufferedReader;
import java.io.InputStream;
@@ -25,6 +25,7 @@
import java.util.ArrayList;
import java.util.List;
+
/**
* A builder which generates a ProtocolSession from a test file.
*
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/FileProtocolSessionBuilder.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.8
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/FileProtocolSessionBuilder.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/FileProtocolSessionBuilder.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/FileProtocolSessionBuilder.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/HostSystem.java (from r709661, james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/HostSystem.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/HostSystem.java?p2=james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/HostSystem.java&p1=james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/HostSystem.java&r1=709661&r2=709681&rev=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/HostSystem.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/HostSystem.java Sat Nov 1 05:02:16 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.test.functional.imap;
+package org.apache.james.test.functional;
/**
* Host system under test.
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/HostSystem.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/ProtocolSession.java (from r709661, james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/ProtocolSession.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/ProtocolSession.java?p2=james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/ProtocolSession.java&p1=james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/ProtocolSession.java&r1=709661&r2=709681&rev=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/ProtocolSession.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/ProtocolSession.java Sat Nov 1 05:02:16 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.test.functional.imap;
+package org.apache.james.test.functional;
import java.io.IOException;
import java.util.ArrayList;
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.regex.Pattern;
-import org.apache.james.test.functional.imap.HostSystem.Session;
/**
* A protocol session which can be run against a reader and writer, which checks
@@ -457,7 +456,7 @@
this.sessionNumber = sessionNumber < 0 ? 0 : sessionNumber;
}
- public void testProtocol(Session[] sessions,
+ public void testProtocol(HostSystem.Session[] sessions,
boolean continueAfterFailure) throws Exception {
HostSystem.Session session = sessions[sessionNumber];
continuationExpected = true;
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/ProtocolSession.java
------------------------------------------------------------------------------
cvs2svn:cvs-rev = 1.9
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/ProtocolSession.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/ProtocolSession.java
------------------------------------------------------------------------------
svn:keywords = Author Date Id Revision
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/ProtocolSession.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractAuthenticatedStateTestSuite.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractAuthenticatedStateTestSuite.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractAuthenticatedStateTestSuite.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractAuthenticatedStateTestSuite.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
abstract public class AbstractAuthenticatedStateTestSuite extends
AbstractTestForAuthenticatedState {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractBaseTestSelectedInbox.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractBaseTestSelectedInbox.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractBaseTestSelectedInbox.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractBaseTestSelectedInbox.java Sat Nov 1 05:02:16 2008
@@ -19,6 +19,8 @@
package org.apache.james.test.functional.imap;
+import org.apache.james.test.functional.HostSystem;
+
/**
* <p>
* Tests commands which are valid in AUTHENTICATED and NONAUTHENTICATED by
Added: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractImapProtocolTestFramework.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractImapProtocolTestFramework.java?rev=709681&view=auto
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractImapProtocolTestFramework.java (added)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractImapProtocolTestFramework.java Sat Nov 1 05:02:16 2008
@@ -0,0 +1,34 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+package org.apache.james.test.functional.imap;
+
+import org.apache.james.test.functional.AbstractSimpleScriptedTestProtocol;
+import org.apache.james.test.functional.HostSystem;
+
+/**
+ * Specialise the protocol test framework for IMAP.
+ */
+public abstract class AbstractImapProtocolTestFramework extends
+ AbstractSimpleScriptedTestProtocol implements ImapTestConstants {
+
+ public AbstractImapProtocolTestFramework(final HostSystem hostSystem) {
+ super(hostSystem, USER, PASSWORD);
+ }
+
+}
\ No newline at end of file
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestConcurrentSessions.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestConcurrentSessions.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestConcurrentSessions.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestConcurrentSessions.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
public abstract class AbstractTestConcurrentSessions extends
AbstractTestForAuthenticatedState {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestEvents.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestEvents.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestEvents.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestEvents.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
public abstract class AbstractTestEvents extends AbstractTestSelectedStateBase {
public AbstractTestEvents(HostSystem system) {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetch.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetch.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetch.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetch.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
public abstract class AbstractTestFetch extends AbstractTestSelectedStateBase {
public AbstractTestFetch(HostSystem system) {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchBodySection.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchBodySection.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchBodySection.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchBodySection.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
public abstract class AbstractTestFetchBodySection extends
AbstractTestSelectedStateBase {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchBodyStructure.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchBodyStructure.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchBodyStructure.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchBodyStructure.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
public abstract class AbstractTestFetchBodyStructure extends
AbstractTestSelectedStateBase {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchHeaders.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchHeaders.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchHeaders.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestFetchHeaders.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
public abstract class AbstractTestFetchHeaders extends
AbstractTestSelectedStateBase {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestForAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestForAuthenticatedState.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestForAuthenticatedState.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestForAuthenticatedState.java Sat Nov 1 05:02:16 2008
@@ -19,6 +19,8 @@
package org.apache.james.test.functional.imap;
+import org.apache.james.test.functional.HostSystem;
+
/**
* <p>
* Runs tests for commands valid in the AUTHENTICATED state. A login session
@@ -55,7 +57,7 @@
* </p>
*/
public abstract class AbstractTestForAuthenticatedState extends
- AbstractSimpleScriptedTestProtocol implements ImapTestConstants {
+ AbstractImapProtocolTestFramework implements ImapTestConstants {
public AbstractTestForAuthenticatedState(HostSystem hostSystem) {
super(hostSystem);
}
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestForNonAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestForNonAuthenticatedState.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestForNonAuthenticatedState.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestForNonAuthenticatedState.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
public abstract class AbstractTestForNonAuthenticatedState extends
AbstractTestNonAuthenticatedState {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestListing.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestListing.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestListing.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestListing.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
abstract public class AbstractTestListing extends
AbstractTestForAuthenticatedState {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestNonAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestNonAuthenticatedState.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestNonAuthenticatedState.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestNonAuthenticatedState.java Sat Nov 1 05:02:16 2008
@@ -19,6 +19,8 @@
package org.apache.james.test.functional.imap;
+import org.apache.james.test.functional.HostSystem;
+
/**
* <p>
* Runs tests for commands valid in the NON_AUTHENTICATED state. A welcome
@@ -37,8 +39,7 @@
* <li>Login</li>
* </ul>
*/
-public abstract class AbstractTestNonAuthenticatedState extends
- AbstractSimpleScriptedTestProtocol {
+public abstract class AbstractTestNonAuthenticatedState extends AbstractImapProtocolTestFramework {
public AbstractTestNonAuthenticatedState(HostSystem system) {
super(system);
}
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestPartialFetch.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestPartialFetch.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestPartialFetch.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestPartialFetch.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
public abstract class AbstractTestPartialFetch extends
AbstractTestSelectedStateBase {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestRename.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestRename.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestRename.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestRename.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
public abstract class AbstractTestRename extends AbstractTestSelectedStateBase {
public AbstractTestRename(HostSystem system) {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSearch.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSearch.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSearch.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSearch.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
abstract public class AbstractTestSearch extends
AbstractTestForAuthenticatedState {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSecurity.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSecurity.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSecurity.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSecurity.java Sat Nov 1 05:02:16 2008
@@ -21,8 +21,9 @@
import java.util.Locale;
-public abstract class AbstractTestSecurity extends
- AbstractSimpleScriptedTestProtocol {
+import org.apache.james.test.functional.HostSystem;
+
+public abstract class AbstractTestSecurity extends AbstractImapProtocolTestFramework {
public AbstractTestSecurity(HostSystem system) {
super(system);
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelect.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelect.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelect.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelect.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
abstract public class AbstractTestSelect extends
AbstractTestForAuthenticatedState {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedInbox.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedInbox.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedInbox.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedInbox.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
public abstract class AbstractTestSelectedInbox extends
AbstractBaseTestSelectedInbox {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedState.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedState.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedState.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedState.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
public abstract class AbstractTestSelectedState extends
AbstractTestSelectedStateBase {
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedStateBase.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedStateBase.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedStateBase.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestSelectedStateBase.java Sat Nov 1 05:02:16 2008
@@ -19,6 +19,8 @@
package org.apache.james.test.functional.imap;
+import org.apache.james.test.functional.HostSystem;
+
/**
* <p>
* Runs tests for commands valid only in the SELECTED state. A login session and
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestUidSearch.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestUidSearch.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestUidSearch.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/AbstractTestUidSearch.java Sat Nov 1 05:02:16 2008
@@ -21,6 +21,8 @@
import java.util.Locale;
+import org.apache.james.test.functional.HostSystem;
+
abstract public class AbstractTestUidSearch extends
AbstractTestForAuthenticatedState {
Copied: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/builder/CreateScript.java (from r709661, james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/CreateScript.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/builder/CreateScript.java?p2=james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/builder/CreateScript.java&p1=james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/CreateScript.java&r1=709661&r2=709681&rev=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/CreateScript.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/builder/CreateScript.java Sat Nov 1 05:02:16 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.test.functional;
+package org.apache.james.test.functional.imap.builder;
public class CreateScript {
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/builder/CreateScript.java
------------------------------------------------------------------------------
svn:mergeinfo =
Copied: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/builder/ScriptBuilder.java (from r709661, james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/ScriptBuilder.java)
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/builder/ScriptBuilder.java?p2=james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/builder/ScriptBuilder.java&p1=james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/ScriptBuilder.java&r1=709661&r2=709681&rev=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/ScriptBuilder.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/builder/ScriptBuilder.java Sat Nov 1 05:02:16 2008
@@ -17,7 +17,7 @@
* under the License. *
****************************************************************/
-package org.apache.james.test.functional;
+package org.apache.james.test.functional.imap.builder;
import java.io.IOException;
import java.io.InputStream;
Propchange: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/builder/ScriptBuilder.java
------------------------------------------------------------------------------
svn:mergeinfo =
Modified: james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/manual/ExternalHostSystem.java
URL: http://svn.apache.org/viewvc/james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/manual/ExternalHostSystem.java?rev=709681&r1=709680&r2=709681&view=diff
==============================================================================
--- james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/manual/ExternalHostSystem.java (original)
+++ james/protocols/imap/trunk/seda/src/test/java/org/apache/james/test/functional/imap/manual/ExternalHostSystem.java Sat Nov 1 05:02:16 2008
@@ -24,7 +24,7 @@
import java.nio.channels.SocketChannel;
import java.nio.charset.Charset;
-import org.apache.james.test.functional.imap.HostSystem;
+import org.apache.james.test.functional.HostSystem;
public class ExternalHostSystem implements HostSystem {
---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org