directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1065422 - in /directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls: EntryChangeControlTest.java PSearchControlTest.java PagedSearchControlTest.java SubEntryControlTest.java
Date Sun, 30 Jan 2011 23:16:07 GMT
Author: elecharny
Date: Sun Jan 30 23:16:06 2011
New Revision: 1065422

URL: http://svn.apache.org/viewvc?rev=1065422&view=rev
Log:
Fixed tha tests

Modified:
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java
    directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java?rev=1065422&r1=1065421&r2=1065422&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlTest.java
Sun Jan 30 23:16:06 2011
@@ -30,7 +30,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
 import org.apache.directory.shared.ldap.codec.ILdapCodecService;
-import org.apache.directory.shared.ldap.codec.search.controls.entryChange.*;
+import org.apache.directory.shared.ldap.codec.search.controls.entryChange.EntryChangeDecorator;
 import org.apache.directory.shared.ldap.model.message.controls.ChangeType;
 import org.apache.directory.shared.ldap.model.message.controls.EntryChange;
 import org.apache.directory.shared.ldap.model.name.Dn;
@@ -49,8 +49,7 @@ import org.junit.runner.RunWith;
 public class EntryChangeControlTest
 {
     private ILdapCodecService codec = new DefaultLdapCodecService();
-    
-    
+
     /**
      * Test the decoding of a EntryChangeControl
      */
@@ -69,8 +68,7 @@ public class EntryChangeControlTest
             } );
         bb.flip();
 
-        EntryChangeContainer container = new EntryChangeContainer( codec );
-        EntryChangeDecorator decorator = container.getEntryChangeDecorator();
+        EntryChangeDecorator decorator = new EntryChangeDecorator( codec );
         
         EntryChange entryChange = (EntryChange)decorator.decode( bb.array() );
 
@@ -99,8 +97,7 @@ public class EntryChangeControlTest
             } );
         bb.flip();
 
-        EntryChangeContainer container = new EntryChangeContainer( codec );
-        EntryChangeDecorator decorator = container.getEntryChangeDecorator();
+        EntryChangeDecorator decorator = new EntryChangeDecorator( codec );
         
         EntryChange entryChange = (EntryChange)decorator.decode( bb.array() );
 
@@ -128,8 +125,7 @@ public class EntryChangeControlTest
             } );
         bb.flip();
 
-        EntryChangeContainer container = new EntryChangeContainer( codec );
-        EntryChangeDecorator decorator = container.getEntryChangeDecorator();
+        EntryChangeDecorator decorator = new EntryChangeDecorator( codec );
         
         EntryChange entryChange = (EntryChange)decorator.decode( bb.array() );
 
@@ -160,8 +156,7 @@ public class EntryChangeControlTest
             } );
         bb.flip();
 
-        EntryChangeContainer container = new EntryChangeContainer( codec );
-        EntryChangeDecorator decorator = container.getEntryChangeDecorator();
+        EntryChangeDecorator decorator = new EntryChangeDecorator( codec );
         
         decorator.decode( bb.array() );
     }
@@ -184,8 +179,7 @@ public class EntryChangeControlTest
             } );
         bb.flip();
 
-        EntryChangeContainer container = new EntryChangeContainer( codec );
-        EntryChangeDecorator decorator = container.getEntryChangeDecorator();
+        EntryChangeDecorator decorator = new EntryChangeDecorator( codec );
         
         EntryChange entryChange = (EntryChange)decorator.decode( bb.array() );
 
@@ -213,8 +207,7 @@ public class EntryChangeControlTest
             } );
         bb.flip();
 
-        EntryChangeContainer container = new EntryChangeContainer( codec );
-        EntryChangeDecorator decorator = container.getEntryChangeDecorator();
+        EntryChangeDecorator decorator = new EntryChangeDecorator( codec );
         
         decorator.decode( bb.array() );
     }
@@ -240,8 +233,7 @@ public class EntryChangeControlTest
             } );
         bb.flip();
 
-        EntryChangeContainer container = new EntryChangeContainer( codec );
-        EntryChangeDecorator decorator = container.getEntryChangeDecorator();
+        EntryChangeDecorator decorator = new EntryChangeDecorator( codec );
         
         decorator.decode( bb.array() );
     }

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java?rev=1065422&r1=1065421&r2=1065422&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlTest.java
Sun Jan 30 23:16:06 2011
@@ -28,10 +28,8 @@ import java.nio.ByteBuffer;
 import org.apache.directory.junit.tools.Concurrent;
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.asn1.DecoderException;
-import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch;
 import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
 import org.apache.directory.shared.ldap.codec.ILdapCodecService;
-import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchContainer;
 import org.apache.directory.shared.ldap.codec.search.controls.persistentSearch.PersistentSearchDecorator;
 import org.apache.directory.shared.ldap.model.message.controls.ChangeType;
 import org.apache.directory.shared.ldap.model.message.controls.PersistentSearch;
@@ -50,8 +48,7 @@ import org.junit.runner.RunWith;
 public class PSearchControlTest
 {
     private ILdapCodecService codec = new DefaultLdapCodecService();
-    
-    
+
     /**
      * Test encoding of a PSearchControl.
      * @throws Exception on error
@@ -77,7 +74,7 @@ public class PSearchControlTest
         String expected = Strings.dumpBytes(bb.array());
         bb.flip();
 
-        PersistentSearchDecorator decorator = new PersistentSearchDecorator(  codec );
+        PersistentSearchDecorator decorator = new PersistentSearchDecorator( codec );
         PersistentSearch ctrl = ( PersistentSearch ) decorator.getDecorated();
         ctrl.setChangesOnly( false );
         ctrl.setReturnECs( false );
@@ -103,8 +100,7 @@ public class PSearchControlTest
             } );
         bb.flip();
 
-        PersistentSearchContainer container = new PersistentSearchContainer( codec );
-        PersistentSearchDecorator decorator = container.getPersistentSearchDecorator();
+        PersistentSearchDecorator decorator = new PersistentSearchDecorator( codec );
 
         PersistentSearch ctrl = ( PersistentSearch )decorator.decode( bb.array() );
 
@@ -133,8 +129,7 @@ public class PSearchControlTest
             } );
         bb.flip();
 
-        PersistentSearchContainer container = new PersistentSearchContainer( codec );
-        PersistentSearchDecorator decorator = container.getPersistentSearchDecorator();
+        PersistentSearchDecorator decorator = new PersistentSearchDecorator( codec );
 
         decorator.decode( bb.array() );
     }
@@ -156,8 +151,7 @@ public class PSearchControlTest
             } );
         bb.flip();
 
-        PersistentSearchContainer container = new PersistentSearchContainer( codec );
-        PersistentSearchDecorator decorator = container.getPersistentSearchDecorator();
+        PersistentSearchDecorator decorator = new PersistentSearchDecorator( codec );
 
         decorator.decode( bb.array() );
     }
@@ -176,8 +170,7 @@ public class PSearchControlTest
             } );
         bb.flip();
 
-        PersistentSearchContainer container = new PersistentSearchContainer( codec );
-        PersistentSearchDecorator decorator = container.getPersistentSearchDecorator();
+        PersistentSearchDecorator decorator = new PersistentSearchDecorator( codec );
 
         decorator.decode( bb.array() );
     }
@@ -198,8 +191,7 @@ public class PSearchControlTest
             } );
         bb.flip();
 
-        PersistentSearchContainer container = new PersistentSearchContainer( codec );
-        PersistentSearchDecorator decorator = container.getPersistentSearchDecorator();
+        PersistentSearchDecorator decorator = new PersistentSearchDecorator( codec );
 
         decorator.decode( bb.array() );
     }
@@ -220,8 +212,7 @@ public class PSearchControlTest
             } );
         bb.flip();
 
-        PersistentSearchContainer container = new PersistentSearchContainer( codec );
-        PersistentSearchDecorator decorator = container.getPersistentSearchDecorator();
+        PersistentSearchDecorator decorator = new PersistentSearchDecorator( codec );
 
         decorator.decode( bb.array() );
     }
@@ -242,8 +233,7 @@ public class PSearchControlTest
             } );
         bb.flip();
 
-        PersistentSearchContainer container = new PersistentSearchContainer( codec );
-        PersistentSearchDecorator decorator = container.getPersistentSearchDecorator();
+        PersistentSearchDecorator decorator = new PersistentSearchDecorator( codec );
 
         decorator.decode( bb.array() );
     }

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java?rev=1065422&r1=1065421&r2=1065422&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/PagedSearchControlTest.java
Sun Jan 30 23:16:06 2011
@@ -32,7 +32,6 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.ldap.codec.DefaultLdapCodecService;
 import org.apache.directory.shared.ldap.codec.ILdapCodecService;
-import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsContainer;
 import org.apache.directory.shared.ldap.codec.search.controls.pagedSearch.PagedResultsDecorator;
 import org.apache.directory.shared.ldap.model.message.controls.PagedResults;
 import org.apache.directory.shared.util.Strings;
@@ -50,8 +49,7 @@ import org.junit.runner.RunWith;
 public class PagedSearchControlTest
 {
     private ILdapCodecService codec = new DefaultLdapCodecService();
-    
-    
+
     /**
      * Test encoding of a PagedSearchControl.
      */
@@ -67,8 +65,7 @@ public class PagedSearchControlTest
             } );
         bb.flip();
 
-        PagedResultsContainer container = new PagedResultsContainer( codec );
-        PagedResultsDecorator decorator = container.getDecorator();
+        PagedResultsDecorator decorator = new PagedResultsDecorator( codec );
         
         PagedResults pagedSearch = (PagedResults)decorator.decode( bb.array() );
 
@@ -118,8 +115,7 @@ public class PagedSearchControlTest
             } );
         bb.flip();
 
-        PagedResultsContainer container = new PagedResultsContainer( codec );
-        PagedResultsDecorator decorator = container.getDecorator();
+        PagedResultsDecorator decorator = new PagedResultsDecorator( codec );
         
         decorator.decode( bb.array() );
     }
@@ -139,8 +135,7 @@ public class PagedSearchControlTest
             } );
         bb.flip();
 
-        PagedResultsContainer container = new PagedResultsContainer( codec );
-        PagedResultsDecorator decorator = container.getDecorator();
+        PagedResultsDecorator decorator = new PagedResultsDecorator( codec );
         
         decorator.decode( bb.array() );
     }
@@ -159,8 +154,7 @@ public class PagedSearchControlTest
             } );
         bb.flip();
 
-        PagedResultsContainer container = new PagedResultsContainer( codec );
-        PagedResultsDecorator decorator = container.getDecorator();
+        PagedResultsDecorator decorator = new PagedResultsDecorator( codec );
         
         decorator.decode( bb.array() );
     }
@@ -181,8 +175,7 @@ public class PagedSearchControlTest
             } );
         bb.flip();
 
-        PagedResultsContainer container = new PagedResultsContainer( codec );
-        PagedResultsDecorator decorator = container.getDecorator();
+        PagedResultsDecorator decorator = new PagedResultsDecorator( codec );
         
         PagedResults pagedSearch = (PagedResults)decorator.decode( bb.array() );
 
@@ -234,8 +227,7 @@ public class PagedSearchControlTest
             } );
         bb.flip();
 
-        PagedResultsContainer container = new PagedResultsContainer( codec );
-        PagedResultsDecorator decorator = container.getDecorator();
+        PagedResultsDecorator decorator = new PagedResultsDecorator( codec );
         
         decorator.decode( bb.array() );
     }
@@ -256,8 +248,7 @@ public class PagedSearchControlTest
             } );
         bb.flip();
 
-        PagedResultsContainer container = new PagedResultsContainer( codec );
-        PagedResultsDecorator decorator = container.getDecorator();
+        PagedResultsDecorator decorator = new PagedResultsDecorator( codec );
         
         PagedResults pagedSearch = (PagedResults)decorator.decode( bb.array() );
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java?rev=1065422&r1=1065421&r2=1065422&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java
Sun Jan 30 23:16:06 2011
@@ -50,8 +50,7 @@ import org.junit.runner.RunWith;
 public class SubEntryControlTest
 {
     private ILdapCodecService codec = new DefaultLdapCodecService();
-    
-    
+
     /**
      * Test the decoding of a SubEntryControl with a true visibility
      */



Mime
View raw message