james-server-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject svn commit: r1460297 - in /james/mpt/trunk: core/src/main/java/org/apache/james/mpt/script/ impl/imap-mailbox/ impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/ impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/ imp...
Date Sun, 24 Mar 2013 09:47:49 GMT
Author: eric
Date: Sun Mar 24 09:47:48 2013
New Revision: 1460297

URL: http://svn.apache.org/r1460297
Log:
Create a test suite per implementation and use injection to get rid of the test class duplications (MPT-8)

Added:
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/AbstractMailboxTest.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTest.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTestModule.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTest.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTestModule.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTest.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTestModule.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTest.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTestModule.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTest.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTestModule.java
Removed:
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/imap/
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/imap/
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/imap/
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/imap/
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/imap/
Modified:
    james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractProtocolTestFramework.java
    james/mpt/trunk/impl/imap-mailbox/pom.xml
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/ConcurrentSessions.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Events.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Expunge.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Fetch.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodySection.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodyStructure.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchHeaders.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Listing.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/NonAuthenticatedState.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/PartialFetch.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Rename.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Search.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Security.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Select.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedState.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/UidSearch.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseAuthenticatedState.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseNonAuthenticatedState.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedInbox.java
    james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedState.java

Modified: james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractProtocolTestFramework.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractProtocolTestFramework.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractProtocolTestFramework.java (original)
+++ james/mpt/trunk/core/src/main/java/org/apache/james/mpt/script/AbstractProtocolTestFramework.java Sun Mar 24 09:47:48 2013
@@ -25,8 +25,6 @@ import org.apache.james.mpt.api.HostSyst
 import org.apache.james.mpt.api.Session;
 import org.apache.james.mpt.protocol.ProtocolSession;
 
-import junit.framework.TestCase;
-
 /**
  * Abstract Protocol Test is the root of all of the scripted test cases. It
  * provides basic functionality for running a protocol session as a JUnit test,
@@ -37,7 +35,7 @@ import junit.framework.TestCase;
  * @author Darrell DeBoer
  * @author Andrew C. Oliver
  */
-public abstract class AbstractProtocolTestFramework extends TestCase {
+public abstract class AbstractProtocolTestFramework {
 
     /** The Protocol session which is run before the testElements */
     protected ProtocolSession preElements = new ProtocolSession();
@@ -62,10 +60,12 @@ public abstract class AbstractProtocolTe
     }
 
     protected void setUp() throws Exception {
-        super.setUp();
         setUpEnvironment();
     }
 
+    protected void tearDown() throws Exception {
+    }
+
     /**
      * <p>
      * Runs the pre,test and post protocol sessions against a local copy of the

Modified: james/mpt/trunk/impl/imap-mailbox/pom.xml
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/pom.xml?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/pom.xml (original)
+++ james/mpt/trunk/impl/imap-mailbox/pom.xml Sun Mar 24 09:47:48 2013
@@ -31,37 +31,38 @@
     <artifactId>apache-james-mpt-imapmailbox</artifactId>
     <name>Apache James MPT Imap Mailbox</name>
     <properties>
-        <hbase.version>0.92.0</hbase.version>
-        <hadoop.version>1.0.1</hadoop.version>
         <commons-io.version>2.4</commons-io.version>
         <commons-lang.version>2.6</commons-lang.version>
-        <junit.version>4.11</junit.version>
-        <log4j.version>1.2.16</log4j.version>
-        <slf4j.version>1.6.6</slf4j.version>
+        <derby.version>10.9.1.0</derby.version>
+        <guice.version>3.0</guice.version>
+        <h2.version>1.3.170</h2.version>
+        <hadoop.version>1.0.1</hadoop.version>
+        <hbase.version>0.92.0</hbase.version>
+        <jackrabbit-core.version>2.5.2</jackrabbit-core.version>
+        <james-protocols.version>1.6.3-SNAPSHOT</james-protocols.version>
+        <james-mailbox.mailbox>0.6-SNAPSHOT</james-mailbox.mailbox>
         <javax.mail.groupId>javax.mail</javax.mail.groupId>
         <javax.mail.artifactId>mail</javax.mail.artifactId>
         <javax.mail.version>1.8.3</javax.mail.version>
-
-        <james-protocols.version>1.6.3-SNAPSHOT</james-protocols.version>
-
-        <james-mailbox.mailbox>0.6-SNAPSHOT</james-mailbox.mailbox>
-        <lucene-core.version>3.6.0</lucene-core.version>
-        <jackrabbit-core.version>2.5.2</jackrabbit-core.version>
-        <h2.version>1.3.170</h2.version>
-        <derby.version>10.9.1.0</derby.version>
         <jmock.version>2.6.0</jmock.version>
+        <junit.version>4.11</junit.version>
+        <log4j.version>1.2.16</log4j.version>
+        <lucene-core.version>3.6.0</lucene-core.version>
+        <onami.version>1.4.1-incubating-SNAPSHOT</onami.version>
+        <slf4j.version>1.6.6</slf4j.version>
     </properties>
 
     <dependencies>
         <dependency>
             <groupId>org.apache.james</groupId>
             <artifactId>apache-james-mpt-core</artifactId>
-            <version>${project.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.james.protocols</groupId>
             <artifactId>protocols-imap</artifactId>
             <version>${james-protocols.version}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.james.protocols</groupId>
@@ -74,6 +75,7 @@
             <groupId>org.apache.james</groupId>
             <artifactId>apache-james-mailbox-api</artifactId>
             <version>${james-mailbox.mailbox}</version>
+            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.apache.james</groupId>
@@ -83,6 +85,18 @@
             <scope>test</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.onami</groupId>
+            <artifactId>org.apache.onami.test</artifactId>
+            <version>${onami.version}</version>
+            <scope>test</scope>
+        </dependency>
+	    <dependency>
+  	        <groupId>com.google.inject</groupId>
+	        <artifactId>guice</artifactId>
+            <version>${guice.version}</version>
+            <scope>test</scope>
+	    </dependency>
+        <dependency>
             <groupId>commons-io</groupId>
             <artifactId>commons-io</artifactId>
             <version>${commons-io.version}</version>
@@ -162,7 +176,6 @@
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
-            <version>${junit.version}</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -207,7 +220,20 @@
             <scope>test</scope>
         </dependency>
     </dependencies>
-
+    <build>
+      <plugins>
+        <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <excludes>
+                 <exclude>**/suite/*.java</exclude>
+                 <exclude>**/suite/**/*.java</exclude>
+               </excludes>
+            </configuration>
+        </plugin>
+      </plugins>
+    </build>
     <profiles>
         <profile>
             <id>geronimo</id>
@@ -231,6 +257,10 @@
                             <includes>
                                 <include>**/hbase/**/*.java</include>
                             </includes>
+                           <excludes>
+                             <exclude>**/suite/*.java</exclude>
+                             <exclude>**/suite/**/*.java</exclude>
+                           </excludes>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -247,6 +277,10 @@
                             <includes>
                                 <include>**/inmemory/**/*.java</include>
                             </includes>
+                           <excludes>
+                             <exclude>**/suite/*.java</exclude>
+                             <exclude>**/suite/**/*.java</exclude>
+                           </excludes>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -263,6 +297,10 @@
                             <includes>
                                 <include>**/jcr/**/*.java</include>
                             </includes>
+                           <excludes>
+                             <exclude>**/suite/*.java</exclude>
+                             <exclude>**/suite/**/*.java</exclude>
+                           </excludes>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -279,6 +317,10 @@
                             <includes>
                                 <include>**/jpa/**/*.java</include>
                             </includes>
+                           <excludes>
+                             <exclude>**/suite/*.java</exclude>
+                             <exclude>**/suite/**/*.java</exclude>
+                           </excludes>
                         </configuration>
                     </plugin>
                 </plugins>
@@ -295,6 +337,10 @@
                             <includes>
                                 <include>**/maildir/**/*.java</include>
                             </includes>
+                           <excludes>
+                             <exclude>**/suite/*.java</exclude>
+                             <exclude>**/suite/**/*.java</exclude>
+                           </excludes>
                         </configuration>
                     </plugin>
                 </plugins>

Added: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/AbstractMailboxTest.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/AbstractMailboxTest.java?rev=1460297&view=auto
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/AbstractMailboxTest.java (added)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/AbstractMailboxTest.java Sun Mar 24 09:47:48 2013
@@ -0,0 +1,66 @@
+/****************************************************************
+ * 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.mpt.imapmailbox;
+
+import org.apache.james.mpt.imapmailbox.suite.AuthenticatedState;
+import org.apache.james.mpt.imapmailbox.suite.ConcurrentSessions;
+import org.apache.james.mpt.imapmailbox.suite.Events;
+import org.apache.james.mpt.imapmailbox.suite.Expunge;
+import org.apache.james.mpt.imapmailbox.suite.Fetch;
+import org.apache.james.mpt.imapmailbox.suite.FetchBodySection;
+import org.apache.james.mpt.imapmailbox.suite.FetchBodyStructure;
+import org.apache.james.mpt.imapmailbox.suite.FetchHeaders;
+import org.apache.james.mpt.imapmailbox.suite.Listing;
+import org.apache.james.mpt.imapmailbox.suite.NonAuthenticatedState;
+import org.apache.james.mpt.imapmailbox.suite.PartialFetch;
+import org.apache.james.mpt.imapmailbox.suite.Rename;
+import org.apache.james.mpt.imapmailbox.suite.Search;
+import org.apache.james.mpt.imapmailbox.suite.Security;
+import org.apache.james.mpt.imapmailbox.suite.Select;
+import org.apache.james.mpt.imapmailbox.suite.SelectedInbox;
+import org.apache.james.mpt.imapmailbox.suite.SelectedState;
+import org.apache.james.mpt.imapmailbox.suite.UidSearch;
+import org.apache.onami.test.OnamiSuite;
+import org.junit.runner.RunWith;
+import org.junit.runners.Suite.SuiteClasses;
+
+@RunWith(OnamiSuite.class)
+@SuiteClasses({ 
+    AuthenticatedState.class,
+    ConcurrentSessions.class,
+    Events.class,
+    Expunge.class,
+    Fetch.class,
+    FetchBodySection.class,
+    FetchBodyStructure.class,
+    FetchHeaders.class,
+    Listing.class,
+    NonAuthenticatedState.class,
+    PartialFetch.class,
+    Rename.class,
+    Search.class,
+    Security.class,
+    Select.class,
+    SelectedInbox.class,
+    SelectedState.class,
+    UidSearch.class
+})
+public class AbstractMailboxTest {
+
+}

Added: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTest.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTest.java?rev=1460297&view=auto
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTest.java (added)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTest.java Sun Mar 24 09:47:48 2013
@@ -0,0 +1,9 @@
+package org.apache.james.mpt.imapmailbox.hbase;
+
+import org.apache.james.mpt.imapmailbox.AbstractMailboxTest;
+import org.apache.onami.test.annotation.GuiceModules;
+
+@GuiceModules({ HBaseMailboxTestModule.class })
+public class HBaseMailboxTest extends AbstractMailboxTest {
+
+}

Added: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTestModule.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTestModule.java?rev=1460297&view=auto
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTestModule.java (added)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/hbase/HBaseMailboxTestModule.java Sun Mar 24 09:47:48 2013
@@ -0,0 +1,22 @@
+package org.apache.james.mpt.imapmailbox.hbase;
+
+import org.apache.james.mpt.api.HostSystem;
+import org.apache.james.mpt.imapmailbox.hbase.host.HBaseHostSystem;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+
+public class HBaseMailboxTestModule extends AbstractModule {
+
+    @Override
+    protected void configure() {
+    }
+
+    @Provides
+    @Singleton
+    public HostSystem provideHostSystem() throws Exception {
+        return HBaseHostSystem.build();
+    }
+
+}

Added: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTest.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTest.java?rev=1460297&view=auto
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTest.java (added)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTest.java Sun Mar 24 09:47:48 2013
@@ -0,0 +1,27 @@
+/****************************************************************
+ * 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.mpt.imapmailbox.inmemory;
+
+import org.apache.james.mpt.imapmailbox.AbstractMailboxTest;
+import org.apache.onami.test.annotation.GuiceModules;
+
+@GuiceModules({ InMemoryMailboxTestModule.class })
+public class InMemoryMailboxTest extends AbstractMailboxTest {
+
+}

Added: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTestModule.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTestModule.java?rev=1460297&view=auto
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTestModule.java (added)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/inmemory/InMemoryMailboxTestModule.java Sun Mar 24 09:47:48 2013
@@ -0,0 +1,40 @@
+/****************************************************************
+ * 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.mpt.imapmailbox.inmemory;
+
+import org.apache.james.mpt.api.HostSystem;
+import org.apache.james.mpt.imapmailbox.inmemory.host.InMemoryHostSystem;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+
+public class InMemoryMailboxTestModule extends AbstractModule {
+
+    @Override
+    protected void configure() {
+    }
+
+    @Provides
+    @Singleton
+    public HostSystem provideHostSystem() throws Exception {
+        return InMemoryHostSystem.build();
+    }
+
+}

Added: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTest.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTest.java?rev=1460297&view=auto
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTest.java (added)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTest.java Sun Mar 24 09:47:48 2013
@@ -0,0 +1,29 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one   *
+ * or more contributor license agreements.  See the NOTICE file *
+ * distributed with this work for additional information        *
+ * regarding copyright ownership.  The ASF licenses this file   *
+ * to you under the Apache License, Version 2.0 (the            *
+ * "License"); you may not use this file except in compliance   *
+ * with the License.  You may obtain a copy of the License at   *
+ *                                                              *
+ *   http://www.apache.org/licenses/LICENSE-2.0                 *
+ *                                                              *
+ * Unless required by applicable law or agreed to in writing,   *
+ * software distributed under the License is distributed on an  *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY       *
+ * KIND, either express or implied.  See the License for the    *
+ * specific language governing permissions and limitations      *
+ * under the License.                                           *
+ ****************************************************************/
+package org.apache.james.mpt.imapmailbox.jcr;
+
+import org.apache.james.mpt.imapmailbox.AbstractMailboxTest;
+import org.apache.onami.test.annotation.GuiceModules;
+import org.junit.Ignore;
+
+@Ignore
+@GuiceModules({ JcrMailboxTestModule.class })
+public class JcrMailboxTest extends AbstractMailboxTest {
+
+}

Added: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTestModule.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTestModule.java?rev=1460297&view=auto
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTestModule.java (added)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jcr/JcrMailboxTestModule.java Sun Mar 24 09:47:48 2013
@@ -0,0 +1,40 @@
+/****************************************************************
+ * 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.mpt.imapmailbox.jcr;
+
+import org.apache.james.mpt.api.HostSystem;
+import org.apache.james.mpt.imapmailbox.jcr.host.JCRHostSystem;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+
+public class JcrMailboxTestModule extends AbstractModule {
+
+    @Override
+    protected void configure() {
+    }
+
+    @Provides
+    @Singleton
+    public HostSystem provideHostSystem() throws Exception {
+        return JCRHostSystem.build();
+    }
+
+}

Added: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTest.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTest.java?rev=1460297&view=auto
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTest.java (added)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTest.java Sun Mar 24 09:47:48 2013
@@ -0,0 +1,27 @@
+/****************************************************************
+ * 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.mpt.imapmailbox.jpa;
+
+import org.apache.james.mpt.imapmailbox.AbstractMailboxTest;
+import org.apache.onami.test.annotation.GuiceModules;
+
+@GuiceModules({ JpaMailboxTestModule.class })
+public class JpaMailboxTest extends AbstractMailboxTest {
+
+}

Added: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTestModule.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTestModule.java?rev=1460297&view=auto
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTestModule.java (added)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/jpa/JpaMailboxTestModule.java Sun Mar 24 09:47:48 2013
@@ -0,0 +1,40 @@
+/****************************************************************
+ * 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.mpt.imapmailbox.jpa;
+
+import org.apache.james.mpt.api.HostSystem;
+import org.apache.james.mpt.imapmailbox.jpa.host.JPAHostSystem;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+
+public class JpaMailboxTestModule extends AbstractModule {
+
+    @Override
+    protected void configure() {
+    }
+
+    @Provides
+    @Singleton
+    public HostSystem provideHostSystem() throws Exception {
+        return JPAHostSystem.build();
+    }
+
+}

Added: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTest.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTest.java?rev=1460297&view=auto
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTest.java (added)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTest.java Sun Mar 24 09:47:48 2013
@@ -0,0 +1,27 @@
+/****************************************************************
+ * 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.mpt.imapmailbox.maildir;
+
+import org.apache.james.mpt.imapmailbox.AbstractMailboxTest;
+import org.apache.onami.test.annotation.GuiceModules;
+
+@GuiceModules({ MaildirMailboxTestModule.class })
+public class MaildirMailboxTest extends AbstractMailboxTest {
+
+}

Added: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTestModule.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTestModule.java?rev=1460297&view=auto
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTestModule.java (added)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/maildir/MaildirMailboxTestModule.java Sun Mar 24 09:47:48 2013
@@ -0,0 +1,40 @@
+/****************************************************************
+ * 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.mpt.imapmailbox.maildir;
+
+import org.apache.james.mpt.api.HostSystem;
+import org.apache.james.mpt.imapmailbox.maildir.host.MaildirHostSystem;
+
+import com.google.inject.AbstractModule;
+import com.google.inject.Provides;
+import com.google.inject.Singleton;
+
+public class MaildirMailboxTestModule extends AbstractModule {
+
+    @Override
+    protected void configure() {
+    }
+
+    @Provides
+    @Singleton
+    public HostSystem provideHostSystem() throws Exception {
+        return MaildirHostSystem.build();
+    }
+
+}

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/AuthenticatedState.java Sun Mar 24 09:47:48 2013
@@ -21,14 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseAuthenticatedState;
 import org.junit.Test;
 
-public abstract class AuthenticatedState extends BaseAuthenticatedState {
-
-    public AuthenticatedState(HostSystem system)
-            throws Exception {
+public class AuthenticatedState extends BaseAuthenticatedState {
+    
+    @Inject
+    private static HostSystem system;
+    
+    public AuthenticatedState() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/ConcurrentSessions.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/ConcurrentSessions.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/ConcurrentSessions.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/ConcurrentSessions.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseAuthenticatedState;
 import org.junit.Test;
 
-public abstract class ConcurrentSessions extends BaseAuthenticatedState {
+public class ConcurrentSessions extends BaseAuthenticatedState {
 
-    public ConcurrentSessions(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public ConcurrentSessions() throws Exception {
         super(system);
     }
     

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Events.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Events.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Events.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Events.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
 import org.junit.Test;
 
-public abstract class Events extends BaseSelectedState {
+public class Events extends BaseSelectedState {
 
-    public Events(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public Events() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Expunge.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Expunge.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Expunge.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Expunge.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
 import org.junit.Test;
 
-public abstract class Expunge extends BaseSelectedState {
+public class Expunge extends BaseSelectedState {
 
-    public Expunge(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public Expunge() throws Exception {
         super(system);
     }
     

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Fetch.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Fetch.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Fetch.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Fetch.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
 import org.junit.Test;
 
-public abstract class Fetch extends BaseSelectedState {
+public class Fetch extends BaseSelectedState {
 
-    public Fetch(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public Fetch() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodySection.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodySection.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodySection.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodySection.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
 import org.junit.Test;
 
-public abstract class FetchBodySection extends BaseSelectedState {
+public class FetchBodySection extends BaseSelectedState {
 
-    public FetchBodySection(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public FetchBodySection() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodyStructure.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodyStructure.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodyStructure.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchBodyStructure.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
 import org.junit.Test;
 
-public abstract class FetchBodyStructure extends BaseSelectedState {
+public class FetchBodyStructure extends BaseSelectedState {
 
-    public FetchBodyStructure(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public FetchBodyStructure() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchHeaders.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchHeaders.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchHeaders.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/FetchHeaders.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
 import org.junit.Test;
 
-public abstract class FetchHeaders extends BaseSelectedState {
+public class FetchHeaders extends BaseSelectedState {
 
-    public FetchHeaders(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public FetchHeaders() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Listing.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Listing.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Listing.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Listing.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseAuthenticatedState;
 import org.junit.Test;
 
-public abstract class Listing extends BaseAuthenticatedState {
+public class Listing extends BaseAuthenticatedState {
 
-    public Listing(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public Listing() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/NonAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/NonAuthenticatedState.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/NonAuthenticatedState.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/NonAuthenticatedState.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseNonAuthenticatedState;
 import org.junit.Test;
 
-public abstract class NonAuthenticatedState extends BaseNonAuthenticatedState {
+public class NonAuthenticatedState extends BaseNonAuthenticatedState {
 
-    public NonAuthenticatedState(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public NonAuthenticatedState() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/PartialFetch.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/PartialFetch.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/PartialFetch.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/PartialFetch.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
 import org.junit.Test;
 
-public abstract class PartialFetch extends BaseSelectedState {
+public class PartialFetch extends BaseSelectedState {
 
-    public PartialFetch(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public PartialFetch() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Rename.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Rename.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Rename.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Rename.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
 import org.junit.Test;
 
-public abstract class Rename extends BaseSelectedState {
+public class Rename extends BaseSelectedState {
 
-    public Rename(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public Rename() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Search.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Search.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Search.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Search.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseAuthenticatedState;
 import org.junit.Test;
 
-public abstract class Search extends BaseAuthenticatedState {
+public class Search extends BaseAuthenticatedState {
 
-    public Search(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public Search() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Security.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Security.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Security.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Security.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseImapProtocol;
 import org.junit.Test;
 
-public abstract class Security extends BaseImapProtocol {
+public class Security extends BaseImapProtocol {
 
-    public Security(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public Security() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Select.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Select.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Select.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/Select.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseAuthenticatedState;
 import org.junit.Test;
 
-public abstract class Select extends BaseAuthenticatedState {
+public class Select extends BaseAuthenticatedState {
 
-    public Select(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public Select() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedInbox.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedInbox;
 import org.junit.Test;
 
-public abstract class SelectedInbox extends BaseSelectedInbox {
+public class SelectedInbox extends BaseSelectedInbox {
 
-    public SelectedInbox(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public SelectedInbox() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedState.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedState.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/SelectedState.java Sun Mar 24 09:47:48 2013
@@ -21,13 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseSelectedState;
 import org.junit.Test;
 
-public abstract class SelectedState extends BaseSelectedState {
+public class SelectedState extends BaseSelectedState {
 
-    public SelectedState(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public SelectedState() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/UidSearch.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/UidSearch.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/UidSearch.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/UidSearch.java Sun Mar 24 09:47:48 2013
@@ -21,14 +21,18 @@ package org.apache.james.mpt.imapmailbox
 
 import java.util.Locale;
 
+import javax.inject.Inject;
+
 import org.apache.james.mpt.api.HostSystem;
 import org.apache.james.mpt.imapmailbox.suite.base.BaseAuthenticatedState;
 import org.junit.Test;
 
-public abstract class UidSearch extends
-        BaseAuthenticatedState {
+public class UidSearch extends BaseAuthenticatedState {
 
-    public UidSearch(HostSystem system) throws Exception {
+    @Inject
+    private static HostSystem system;
+    
+    public UidSearch() throws Exception {
         super(system);
     }
 

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseAuthenticatedState.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseAuthenticatedState.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseAuthenticatedState.java Sun Mar 24 09:47:48 2013
@@ -58,7 +58,7 @@ import org.junit.Before;
  * </ul>
  * </p>
  */
-public abstract class BaseAuthenticatedState extends
+public class BaseAuthenticatedState extends
         BaseImapProtocol implements ImapTestConstants {
     public BaseAuthenticatedState(HostSystem hostSystem) throws Exception {
         super(hostSystem);

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseImapProtocol.java Sun Mar 24 09:47:48 2013
@@ -25,7 +25,7 @@ import org.apache.james.mpt.script.Abstr
 /**
  * Specialise the protocol test framework for IMAP.
  */
-public abstract class BaseImapProtocol extends AbstractSimpleScriptedTestProtocol implements ImapTestConstants {
+public class BaseImapProtocol extends AbstractSimpleScriptedTestProtocol implements ImapTestConstants {
 
     public BaseImapProtocol(final HostSystem hostSystem) throws Exception {
         super(hostSystem, USER, PASSWORD, "/org/apache/james/imap/scripts/");

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseNonAuthenticatedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseNonAuthenticatedState.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseNonAuthenticatedState.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseNonAuthenticatedState.java Sun Mar 24 09:47:48 2013
@@ -40,7 +40,7 @@ import org.junit.Before;
  * <li>Login</li>
  * </ul>
  */
-public abstract class BaseNonAuthenticatedState extends BaseImapProtocol {
+public class BaseNonAuthenticatedState extends BaseImapProtocol {
     public BaseNonAuthenticatedState(HostSystem system) throws Exception {
         super(system);
     }

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedInbox.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedInbox.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedInbox.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedInbox.java Sun Mar 24 09:47:48 2013
@@ -51,7 +51,7 @@ import org.apache.james.mpt.api.HostSyst
  * 
  * @version $Revision: 560719 $
  */
-public abstract class BaseSelectedInbox extends BaseAuthenticatedState {
+public class BaseSelectedInbox extends BaseAuthenticatedState {
     public BaseSelectedInbox(HostSystem system) throws Exception {
         super(system);
     }

Modified: james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedState.java
URL: http://svn.apache.org/viewvc/james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedState.java?rev=1460297&r1=1460296&r2=1460297&view=diff
==============================================================================
--- james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedState.java (original)
+++ james/mpt/trunk/impl/imap-mailbox/src/test/java/org/apache/james/mpt/imapmailbox/suite/base/BaseSelectedState.java Sun Mar 24 09:47:48 2013
@@ -42,7 +42,7 @@ import org.junit.Before;
  * <li>Uid"</li>
  * </ul>
  */
-public abstract class BaseSelectedState extends BaseAuthenticatedState {
+public class BaseSelectedState extends BaseAuthenticatedState {
     
     public BaseSelectedState(HostSystem system) throws Exception {
         super(system);



---------------------------------------------------------------------
To unsubscribe, e-mail: server-dev-unsubscribe@james.apache.org
For additional commands, e-mail: server-dev-help@james.apache.org


Mime
View raw message