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

[norman]

Author: norman
Date: Wed Oct 18 00:59:31 2006
New Revision: 465170

URL: http://svn.apache.org/viewvc?view=rev&rev=465170
Log:
Fix VUT

Modified:
    
james/server/trunk/src/java/org/apache/james/vut/AbstractVirtualUserTable.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/java/org/apache/james/vut/AbstractVirtualUserTable.java
URL: 
http://svn.apache.org/viewvc/james/server/trunk/src/java/org/apache/james/vut/AbstractVirtualUserTable.java?view=diff&rev=465170&r1=465169&r2=465170
==============================================================================
--- 
james/server/trunk/src/java/org/apache/james/vut/AbstractVirtualUserTable.java 
(original)
+++ 
james/server/trunk/src/java/org/apache/james/vut/AbstractVirtualUserTable.java 
Wed Oct 18 00:59:31 2006
@@ -91,7 +91,8 @@
                     getLogger().debug(buf.toString());
 
                  }
-             }
+            }
+            return mappings;
         }
         return null;
     }

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=465170&r1=465169&r2=465170
==============================================================================
--- 
james/server/trunk/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java
 (original)
+++ 
james/server/trunk/src/test/org/apache/james/vut/AbstractVirtualUserTableTest.java
 Wed Oct 18 00:59:31 2006
@@ -53,7 +53,7 @@
         boolean catched = false;
         try {
         
-            assertTrue("No mapping",virtualUserTable.getMappings(user, 
domain).isEmpty());
+            assertNull("No mapping",virtualUserTable.getMappings(user, 
domain));
         
             assertTrue("Added virtual mapping", 
virtualUserTable.addRegexMapping(user, domain, regex));
             assertTrue("Added virtual mapping", 
virtualUserTable.addRegexMapping(user, domain, regex2));
@@ -70,7 +70,7 @@
             assertTrue("Invalid Mapping throw exception" , catched);
 
             assertTrue("remove virtual mapping", 
virtualUserTable.removeRegexMapping(user, domain, regex2));
-            assertTrue("No mapping",virtualUserTable.getMappings(user, 
domain).isEmpty());
+            assertNull("No mapping",virtualUserTable.getMappings(user, 
domain));
         } catch (InvalidMappingException e) {
             fail("Storing failed");
         }
@@ -87,7 +87,7 @@
         boolean catched = false;
         try {
         
-            assertTrue("No mapping",virtualUserTable.getMappings(user, 
domain).isEmpty());
+            assertNull("No mapping",virtualUserTable.getMappings(user, 
domain));
         
             assertTrue("Added virtual mapping", 
virtualUserTable.addAddressMapping(user, domain, address));
             assertTrue("Added virtual mapping", 
virtualUserTable.addAddressMapping(user, domain, address2));
@@ -104,7 +104,7 @@
             assertTrue("Invalid Mapping throw exception" , catched);
 
             assertTrue("remove virtual mapping", 
virtualUserTable.removeAddressMapping(user, domain, address2));
-            assertTrue("No mapping",virtualUserTable.getMappings(user, 
domain).isEmpty());
+            assertNull("No mapping",virtualUserTable.getMappings(user, 
domain));
         } catch (InvalidMappingException e) {
             fail("Storing failed");
         }
@@ -119,7 +119,7 @@
         boolean catched = false;
         try {
         
-            assertTrue("No mapping",virtualUserTable.getMappings(user, 
domain).isEmpty());
+            assertNull("No mapping",virtualUserTable.getMappings(user, 
domain));
         
             assertTrue("Added virtual mapping", 
virtualUserTable.addErrorMapping(user, domain, error));
 
@@ -131,7 +131,7 @@
             assertTrue("Error Mapping throw exception" , catched);
 
             assertTrue("remove virtual mapping", 
virtualUserTable.removeErrorMapping(user, domain, error));
-            assertTrue("No mapping",virtualUserTable.getMappings(user, 
domain).isEmpty());
+            assertNull("No mapping",virtualUserTable.getMappings(user, 
domain));
         } catch (InvalidMappingException e) {
              fail("Storing failed");
         }

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=465170&r1=465169&r2=465170
==============================================================================
--- 
james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java 
(original)
+++ 
james/server/trunk/src/test/org/apache/james/vut/JDBCVirtualUserTableTest.java 
Wed Oct 18 00:59:31 2006
@@ -45,7 +45,7 @@
 
        try {
                  
-            assertTrue("No mapping",virtualUserTable.getMappings(user, 
domain).isEmpty());
+            assertNull("No mapping",virtualUserTable.getMappings(user, 
domain));
         
             assertTrue("Added virtual mapping", 
virtualUserTable.addAddressMapping(null, domain, address));
             assertTrue("Added virtual mapping", 
virtualUserTable.addAddressMapping(user, domain, address2));
@@ -56,8 +56,8 @@
            
             assertTrue("remove virtual mapping", 
virtualUserTable.removeAddressMapping(user, domain, address2));
             assertTrue("remove virtual mapping", 
virtualUserTable.removeAddressMapping(null, domain, address));
-            assertTrue("No mapping",virtualUserTable.getMappings(user, 
domain).isEmpty());
-            assertTrue("No mapping",virtualUserTable.getMappings(user2, 
domain).isEmpty());
+            assertNull("No mapping",virtualUserTable.getMappings(user, 
domain));
+            assertNull("No mapping",virtualUserTable.getMappings(user2, 
domain));
       
         } catch (InvalidMappingException e) {
            fail("Storing failed");



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