directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r655225 - /directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
Date Sun, 11 May 2008 02:23:46 GMT
Author: akarasulu
Date: Sat May 10 19:23:46 2008
New Revision: 655225

URL: http://svn.apache.org/viewvc?rev=655225&view=rev
Log:
fix merge errors in modify remove test case

Modified:
    directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java

Modified: directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java?rev=655225&r1=655224&r2=655225&view=diff
==============================================================================
--- directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
(original)
+++ directory/apacheds/branches/bigbang/jdbm-store/src/test/java/org/apache/directory/server/core/partition/impl/btree/jdbm/JdbmStoreTest.java
Sat May 10 19:23:46 2008
@@ -831,7 +831,7 @@
         assertNotNull( lookedup.get( "sn" ).get() );
         
         store.modify( dn, mods );
-        assertNull( lookedup.get( "sn" ).get() );
+        assertNull( lookedup.get( "sn" ) );
         
         // testing the store.modify( dn, mod, entry ) API
         ServerEntry entry = new DefaultServerEntry( registries, dn );
@@ -839,10 +839,10 @@
         // add an entry for the sake of testing the remove operation
         entry.add( "sn", "JWalker" );
         store.modify( dn, ModificationOperation.ADD_ATTRIBUTE, entry );
-        assertNotNull( lookedup.get( "sn" ).get() );
+        assertNotNull( lookedup.get( "sn" ) );
         
         store.modify( dn, ModificationOperation.REMOVE_ATTRIBUTE, entry );
-        assertNull( lookedup.get( "sn" ).get() );
+        assertNull( lookedup.get( "sn" ) );
     }
 
 }



Mime
View raw message