svn commit: r466432 - in /james/server/trunk/src/test/org/apache/james: JamesTest.java vut/AbstractVirtualUserTableTest.java vut/JDBCVirtualUserTableTest.java

[norman]

Author: norman
Date: Sat Oct 21 11:26:41 2006
New Revision: 466432

URL: http://svn.apache.org/viewvc?view=rev&rev=466432
Log:
Fix junit tests and formatting

Modified:
    james/server/trunk/src/test/org/apache/james/JamesTest.java
    
james/server/trunk/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java
    
james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java

Modified: james/server/trunk/src/test/org/apache/james/JamesTest.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/JamesTest.java?view=diff&rev=466432&r1=466431&r2=466432
==============================================================================
--- james/server/trunk/src/test/org/apache/james/JamesTest.java (original)
+++ james/server/trunk/src/test/org/apache/james/JamesTest.java Sat Oct 21 
11:26:41 2006
@@ -123,12 +123,12 @@
     }
     
     private DNSServer setUpDNSServer() {
-    DNSServer dns = new AbstractDNSServer() {
-        public String getHostName(InetAddress addr) {
-        return "localhost";
-        }
-    };
-    return dns;
+        DNSServer dns = new AbstractDNSServer() {
+            public String getHostName(InetAddress addr) {
+                return "localhost";
+            }
+        };
+        return dns;
     }
 
     public boolean allowsPasswordlessUser() {

Modified: 
james/server/trunk/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java?view=diff&rev=466432&r1=466431&r2=466432
==============================================================================
--- 
james/server/trunk/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java
 (original)
+++ 
james/server/trunk/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java
 Sat Oct 21 11:26:41 2006
@@ -61,7 +61,7 @@
             assertTrue("Two mappings",virtualUserTable.getMappings(user, 
domain).size() == 2);
             
             // Test DomainList implementations!
-            assertEquals("One domain",virtualUserTable.getDomains().size(), 1);
+            assertEquals("Four domains",virtualUserTable.getDomains().size(), 
4);
             assertTrue("Contains 
Domain",virtualUserTable.containsDomain(domain));
             
             assertTrue("remove virtual mapping", 
virtualUserTable.removeRegexMapping(user, domain, regex));

Modified: 
james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java?view=diff&rev=466432&r1=466431&r2=466432
==============================================================================
--- 
james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java 
(original)
+++ 
james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java 
Sat Oct 21 11:26:41 2006
@@ -21,12 +21,17 @@
 
 package org.apache.james.vut;
 
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+
 import org.apache.avalon.cornerstone.services.datasources.DataSourceSelector;
 import org.apache.avalon.framework.configuration.ConfigurationException;
 import org.apache.avalon.framework.configuration.DefaultConfiguration;
 import org.apache.avalon.framework.service.DefaultServiceManager;
 import org.apache.avalon.framework.service.ServiceException;
 
+import org.apache.james.services.AbstractDNSServer;
+import org.apache.james.services.DNSServer;
 import org.apache.james.services.FileSystem;
 
 import org.apache.james.test.mock.avalon.MockLogger;
@@ -41,6 +46,7 @@
         DefaultServiceManager serviceManager = new DefaultServiceManager();
         serviceManager.put(FileSystem.ROLE, new MockFileSystem());
         serviceManager.put(DataSourceSelector.ROLE, 
Util.getDataSourceSelector());
+        serviceManager.put(DNSServer.ROLE, setUpDNSServer());
         JDBCVirtualUserTable mr = new JDBCVirtualUserTable();
         
 
@@ -52,6 +58,23 @@
         mr.configure(defaultConfiguration);
         mr.initialize();
         return mr;
+    }
+    
+    private DNSServer setUpDNSServer() {
+        DNSServer dns = new AbstractDNSServer() {
+            public String getHostName(InetAddress inet) {
+                return "test";
+            }
+            
+            public InetAddress[] getAllByName(String name) throws 
UnknownHostException {
+                return new InetAddress[] { 
InetAddress.getByName("127.0.0.1")};        
+            }
+            
+            public InetAddress getLocalHost() throws UnknownHostException {
+                return InetAddress.getLocalHost();
+            }
+        };
+        return dns;
     }
     
     public void testStoreAndRetrieveWildCardAddressMapping() throws 
ErrorMappingException {



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]