directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r1065076 - /directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlTest.java
Date Sat, 29 Jan 2011 17:13:01 GMT
Author: akarasulu
Date: Sat Jan 29 17:13:01 2011
New Revision: 1065076

URL: http://svn.apache.org/viewvc?rev=1065076&view=rev
Log:
more test fixes

Modified:
    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/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=1065076&r1=1065075&r2=1065076&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
Sat Jan 29 17:13:01 2011
@@ -31,9 +31,7 @@ import org.apache.directory.junit.tools.
 import org.apache.directory.junit.tools.ConcurrentJunitRunner;
 import org.apache.directory.shared.asn1.DecoderException;
 import org.apache.directory.shared.asn1.EncoderException;
-import org.apache.directory.shared.asn1.ber.Asn1Decoder;
 import org.apache.directory.shared.ldap.model.message.controls.Subentries;
-import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesDecoder;
 import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesDecorator;
 import org.apache.directory.shared.ldap.codec.search.controls.subentries.SubentriesContainer;
 import org.apache.directory.shared.util.Strings;
@@ -56,7 +54,6 @@ public class SubEntryControlTest
     @Test
     public void testDecodeSubEntryVisibilityTrue()
     {
-        Asn1Decoder decoder = new SubentriesDecoder();
         ByteBuffer bb = ByteBuffer.allocate( 0x03 );
         bb.put( new byte[]
             { 
@@ -65,11 +62,11 @@ public class SubEntryControlTest
         bb.flip();
 
         SubentriesContainer container = new SubentriesContainer();
-        container.setSubentriesDecorator( new SubentriesDecorator() );
+        SubentriesDecorator decorator = container.getSubentriesControl();
         
         try
         {
-            decoder.decode( bb, container );
+            decorator.decode( bb.array() );
         }
         catch ( DecoderException de )
         {
@@ -77,7 +74,6 @@ public class SubEntryControlTest
             fail( de.getMessage() );
         }
 
-        SubentriesDecorator decorator = container.getSubentriesControl();
         assertTrue( ( ( Subentries ) decorator.getDecorated() ).isVisible() );
         // test encoding
         try
@@ -114,7 +110,6 @@ public class SubEntryControlTest
     @Test
     public void testDecodeSubEntryVisibilityFalse()
     {
-        Asn1Decoder decoder = new SubentriesDecoder();
         ByteBuffer bb = ByteBuffer.allocate( 0x03 );
         bb.put( new byte[]
             { 
@@ -123,11 +118,11 @@ public class SubEntryControlTest
         bb.flip();
 
         SubentriesContainer container = new SubentriesContainer();
-        container.setSubentriesDecorator( new SubentriesDecorator() );
-
+        SubentriesDecorator decorator = container.getSubentriesControl();
+        
         try
         {
-            decoder.decode( bb, container );
+            decorator.decode( bb.array() );
         }
         catch ( DecoderException de )
         {
@@ -135,7 +130,6 @@ public class SubEntryControlTest
             fail( de.getMessage() );
         }
 
-        SubentriesDecorator decorator = container.getSubentriesControl();
         assertFalse( ( ( Subentries ) decorator.getDecorated() ).isVisible() );
         
         // test encoding
@@ -173,7 +167,6 @@ public class SubEntryControlTest
     @Test
     public void testDecodeSubEntryEmptyVisibility()
     {
-        Asn1Decoder decoder = new SubentriesDecoder();
         ByteBuffer bb = ByteBuffer.allocate( 0x02 );
 
         bb.put( new byte[]
@@ -185,12 +178,11 @@ public class SubEntryControlTest
 
         // Allocate a LdapMessage Container
         SubentriesContainer container = new SubentriesContainer();
-        container.setSubentriesDecorator( new SubentriesDecorator() );
-
-        // Decode a SubEntryControl PDU
+        SubentriesDecorator decorator = container.getSubentriesControl();
+        
         try
         {
-            decoder.decode( bb, container );
+            decorator.decode( bb.array() );
             fail( "We should never reach this point !!!" );
         }
         catch ( DecoderException de )
@@ -206,7 +198,6 @@ public class SubEntryControlTest
     @Test
     public void testDecodeSubEntryBad()
     {
-        Asn1Decoder decoder = new SubentriesDecoder();
         ByteBuffer bb = ByteBuffer.allocate( 0x03 );
 
         bb.put( new byte[]
@@ -218,12 +209,11 @@ public class SubEntryControlTest
 
         // Allocate a LdapMessage Container
         SubentriesContainer container = new SubentriesContainer();
-        container.setSubentriesDecorator( new SubentriesDecorator() );
-
-        // Decode a SubEntryControl PDU
+        SubentriesDecorator decorator = container.getSubentriesControl();
+        
         try
         {
-            decoder.decode( bb, container );
+            decorator.decode( bb.array() );
             fail( "We should never reach this point !!!" );
         }
         catch ( DecoderException de )



Mime
View raw message