Author: eric
Date: Sat Jan 8 08:46:54 2011
New Revision: 1056661
URL: http://svn.apache.org/viewvc?rev=1056661&view=rev
Log:
Add imap version to mailbox-integration-tester pom - Replace the mailbox unit
tests in the respective project - remove emtpy folder (MAILBOX-28)
Added:
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/
james/mailbox/trunk/jcr/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java
- copied unchanged from r1056656,
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java
james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/
james/mailbox/trunk/jpa/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java
- copied unchanged from r1056656,
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java
- copied, changed from r1056656,
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirMailboxManagerTest.java
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/OsDetector.java
james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/
james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
- copied, changed from r1056656,
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
Removed:
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirMailboxManagerTest.java
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jcr/JCRMailboxManagerTest.java
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/jpa/JPAMailboxManagerTest.java
james/mailbox/trunk/torque/src/test/java/org/apache/james/mailbox/functional/
Modified:
james/mailbox-integration-tester/trunk/pom.xml
james/mailbox/trunk/memory/pom.xml
Modified: james/mailbox-integration-tester/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailbox-integration-tester/trunk/pom.xml?rev=1056661&r1=1056660&r2=1056661&view=diff
==============================================================================
--- james/mailbox-integration-tester/trunk/pom.xml (original)
+++ james/mailbox-integration-tester/trunk/pom.xml Sat Jan 8 08:46:54 2011
@@ -32,14 +32,17 @@
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-api</artifactId>
+ <version>${version.james-imap}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-message</artifactId>
+ <version>${version.james-imap}</version>
</dependency>
<dependency>
<groupId>org.apache.james</groupId>
<artifactId>apache-james-imap-processor</artifactId>
+ <version>${version.james-imap}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -108,5 +111,8 @@
<scope>compile</scope>
</dependency>
</dependencies>
+ <properties>
+ <version.james-imap>0.2-M2-SNAPSHOT</version.james-imap>
+ </properties>
</project>
Copied:
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java
(from r1056656,
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirMailboxManagerTest.java)
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java?p2=james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java&p1=james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirMailboxManagerTest.java&r1=1056656&r2=1056661&rev=1056661&view=diff
==============================================================================
---
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/functional/maildir/MaildirMailboxManagerTest.java
(original)
+++
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/MaildirMailboxManagerTest.java
Sat Jan 8 08:46:54 2011
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations *
* under the License. *
****************************************************************/
-package org.apache.james.mailbox.functional.maildir;
+package org.apache.james.mailbox.maildir;
import java.io.File;
import java.io.IOException;
@@ -27,9 +27,6 @@ import junit.framework.Assert;
import org.apache.commons.io.FileUtils;
import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManagerTest;
-import org.apache.james.mailbox.maildir.MaildirMailboxManager;
-import org.apache.james.mailbox.maildir.MaildirMailboxSessionMapperFactory;
-import org.apache.james.mailbox.maildir.MaildirStore;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
Added:
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/OsDetector.java
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/OsDetector.java?rev=1056661&view=auto
==============================================================================
---
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/OsDetector.java
(added)
+++
james/mailbox/trunk/maildir/src/test/java/org/apache/james/mailbox/maildir/OsDetector.java
Sat Jan 8 08:46:54 2011
@@ -0,0 +1,35 @@
+/****************************************************************
+ * 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.mailbox.maildir;
+
+public class OsDetector {
+
+ /**
+ * Return if the Test is run on windows
+ *
+ * @return windows
+ */
+ public static boolean isWindows() {
+ String os = System.getProperty("os.name").toLowerCase();
+ return (os.indexOf( "win" ) >= 0);
+ }
+
+
+}
Modified: james/mailbox/trunk/memory/pom.xml
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/memory/pom.xml?rev=1056661&r1=1056660&r2=1056661&view=diff
==============================================================================
--- james/mailbox/trunk/memory/pom.xml (original)
+++ james/mailbox/trunk/memory/pom.xml Sat Jan 8 08:46:54 2011
@@ -47,5 +47,9 @@
<scope>test</scope>
<type>test-jar</type>
</dependency>
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </dependency>
</dependencies>
</project>
Copied:
james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
(from r1056656,
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java)
URL:
http://svn.apache.org/viewvc/james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java?p2=james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java&p1=james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java&r1=1056656&r2=1056661&rev=1056661&view=diff
==============================================================================
---
james/mailbox-integration-tester/trunk/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
(original)
+++
james/mailbox/trunk/memory/src/test/java/org/apache/james/mailbox/inmemory/InMemoryMailboxManagerTest.java
Sat Jan 8 08:46:54 2011
@@ -19,7 +19,6 @@
package org.apache.james.mailbox.inmemory;
import org.apache.commons.logging.impl.SimpleLog;
-import org.apache.james.imap.functional.InMemoryUserManager;
import org.apache.james.mailbox.BadCredentialsException;
import org.apache.james.mailbox.MailboxException;
import org.apache.james.mailbox.MailboxManagerTest;
@@ -62,7 +61,6 @@ public class InMemoryMailboxManagerTest
@Override
protected void createMailboxManager() throws MailboxException {
- InMemoryUserManager userManager = new InMemoryUserManager();
InMemoryMailboxSessionMapperFactory factory = new
InMemoryMailboxSessionMapperFactory();
InMemoryCachingUidProvider uidProvider = new
InMemoryCachingUidProvider();
InMemoryMailboxManager mailboxManager = new
InMemoryMailboxManager(factory, new MockAuthenticator(), uidProvider);
@@ -73,4 +71,3 @@ public class InMemoryMailboxManagerTest
}
}
-
\ No newline at end of file
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
