Author: bago
Date: Fri Aug 1 03:48:06 2008
New Revision: 681645
URL: http://svn.apache.org/viewvc?rev=681645&view=rev
Log:
Moved vut tests from phoenix-deployment to the appropriate user modules
(user-library / avalon-user-function / basic-user-function)
Added:
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
(contents, props changed)
- copied, changed from r681642,
james/server/trunk/phoenix-deployment/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java
james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/
james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
(contents, props changed)
- copied, changed from r681642,
james/server/trunk/phoenix-deployment/src/test/org/apache/james/vut/XMLVirtualUserTableTest.java
james/server/trunk/user-library/src/test/java/org/apache/james/vut/
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
(contents, props changed)
- copied, changed from r681644,
james/server/trunk/phoenix-deployment/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java
Removed:
james/server/trunk/phoenix-deployment/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java
james/server/trunk/phoenix-deployment/src/test/org/apache/james/vut/XMLVirtualUserTableTest.java
Modified:
james/server/trunk/basic-user-function/pom.xml
Copied:
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
(from r681642,
james/server/trunk/phoenix-deployment/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java?p2=james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java&p1=james/server/trunk/phoenix-deployment/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java&r1=681642&r2=681645&rev=681645&view=diff
==============================================================================
(empty)
Propchange:
james/server/trunk/avalon-user-function/src/test/java/org/apache/james/vut/JDBCVirtualUserTableTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Modified: james/server/trunk/basic-user-function/pom.xml
URL:
http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/pom.xml?rev=681645&r1=681644&r2=681645&view=diff
==============================================================================
--- james/server/trunk/basic-user-function/pom.xml (original)
+++ james/server/trunk/basic-user-function/pom.xml Fri Aug 1 03:48:06 2008
@@ -49,6 +49,28 @@
</dependency>
<dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-user-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-library</artifactId>
+ <type>test-jar</type>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.james</groupId>
+ <artifactId>james-server-core-library</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.avalon.framework</groupId>
+ <artifactId>avalon-framework-impl</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Copied:
james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
(from r681642,
james/server/trunk/phoenix-deployment/src/test/org/apache/james/vut/XMLVirtualUserTableTest.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java?p2=james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java&p1=james/server/trunk/phoenix-deployment/src/test/org/apache/james/vut/XMLVirtualUserTableTest.java&r1=681642&r2=681645&rev=681645&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/vut/XMLVirtualUserTableTest.java
(original)
+++
james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
Fri Aug 1 03:48:06 2008
@@ -24,7 +24,6 @@
import java.util.Collection;
-import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
import org.apache.avalon.framework.configuration.Configuration;
import org.apache.avalon.framework.configuration.ConfigurationException;
import org.apache.avalon.framework.configuration.DefaultConfiguration;
@@ -40,7 +39,6 @@
import org.apache.james.test.mock.james.MockFileSystem;
import org.apache.james.test.mock.util.AttrValConfiguration;
-import org.apache.james.test.util.Util;
import org.apache.james.util.VirtualUserTableUtil;
public class XMLVirtualUserTableTest extends AbstractVirtualUserTableTest {
@@ -49,7 +47,6 @@
protected AbstractVirtualUserTable getVirtalUserTable() throws Exception {
DefaultServiceManager serviceManager = new DefaultServiceManager();
serviceManager.put(FileSystem.ROLE, new MockFileSystem());
- serviceManager.put(DataSourceSelector.ROLE,
Util.getDataSourceSelector());
serviceManager.put(DNSServer.ROLE, setUpDNSServer());
XMLVirtualUserTable mr = new XMLVirtualUserTable();
ContainerUtil.enableLogging(mr, new MockLogger());
@@ -90,7 +87,7 @@
}
try {
- ContainerUtil.configure(((XMLVirtualUserTable)
virtualUserTable),defaultConfiguration);
+ ContainerUtil.configure(virtualUserTable,defaultConfiguration);
} catch (ConfigurationException e) {
if (mappings.size() > 0) {
return false;
Propchange:
james/server/trunk/basic-user-function/src/test/java/org/apache/james/vut/XMLVirtualUserTableTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied:
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
(from r681644,
james/server/trunk/phoenix-deployment/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java)
URL:
http://svn.apache.org/viewvc/james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java?p2=james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java&p1=james/server/trunk/phoenix-deployment/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java&r1=681644&r2=681645&rev=681645&view=diff
==============================================================================
---
james/server/trunk/phoenix-deployment/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java
(original)
+++
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
Fri Aug 1 03:48:06 2008
@@ -175,8 +175,6 @@
String domain = "localhost";
String address = "[EMAIL PROTECTED]";
String address2 = "[EMAIL PROTECTED]";
- String invalidAddress= "[EMAIL PROTECTED]:";
- boolean catched = false;
try {
@@ -190,6 +188,9 @@
assertTrue("remove virtual mapping", removeMapping(user, domain,
address, ADDRESS_TYPE));
+ /* TEMPORARILY REMOVE JDBC specific test
+ String invalidAddress= "[EMAIL PROTECTED]:";
+ boolean catched = false;
if (virtualUserTable instanceof JDBCVirtualUserTable) {
try {
assertTrue("Added virtual mapping", addMapping(user,
domain, invalidAddress, ADDRESS_TYPE));
@@ -198,6 +199,7 @@
}
assertTrue("Invalid Mapping throw exception" , catched);
}
+ */
assertTrue("remove virtual mapping", removeMapping(user, domain,
address2, ADDRESS_TYPE));
Propchange:
james/server/trunk/user-library/src/test/java/org/apache/james/vut/AbstractVirtualUserTableTest.java
------------------------------------------------------------------------------
svn:eol-style = native
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
