You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2006/01/28 16:31:37 UTC
svn commit: r373165 - in /directory/trunks/common/ldap/src:
main/java/org/apache/ldap/common/codec/search/SearchResultDoneGrammar.java
test/java/org/apache/ldap/common/codec/search/SearchResultDoneTest.java
Author: elecharny
Date: Sat Jan 28 07:31:29 2006
New Revision: 373165
URL: http://svn.apache.org/viewcvs?rev=373165&view=rev
Log:
- Added a pop transition
- Added a test
Modified:
directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/search/SearchResultDoneGrammar.java
directory/trunks/common/ldap/src/test/java/org/apache/ldap/common/codec/search/SearchResultDoneTest.java
Modified: directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/search/SearchResultDoneGrammar.java
URL: http://svn.apache.org/viewcvs/directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/search/SearchResultDoneGrammar.java?rev=373165&r1=373164&r2=373165&view=diff
==============================================================================
--- directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/search/SearchResultDoneGrammar.java (original)
+++ directory/trunks/common/ldap/src/main/java/org/apache/ldap/common/codec/search/SearchResultDoneGrammar.java Sat Jan 28 07:31:29 2006
@@ -22,6 +22,7 @@
import org.apache.asn1.ber.grammar.GrammarAction;
import org.apache.asn1.ber.IAsn1Container;
import org.apache.asn1.ber.tlv.UniversalTag;
+import org.apache.asn1.codec.DecoderException;
import org.apache.ldap.common.codec.LdapConstants;
import org.apache.ldap.common.codec.LdapMessage;
import org.apache.ldap.common.codec.LdapMessageContainer;
@@ -95,7 +96,14 @@
// SearchResultDone ::= [APPLICATION 5] LDAPResult (Value)
// Ok, we have a LDAPResult Tag (0x0A). So we have to switch the grammar.
super.transitions[LdapStatesEnum.SEARCH_RESULT_DONE_LDAP_RESULT][UniversalTag.ENUMERATED_TAG] = new GrammarTransition(
- LdapStatesEnum.SEARCH_RESULT_DONE_LDAP_RESULT, LdapStatesEnum.LDAP_RESULT_GRAMMAR_SWITCH, null );
+ LdapStatesEnum.SEARCH_RESULT_DONE_LDAP_RESULT, LdapStatesEnum.LDAP_RESULT_GRAMMAR_SWITCH,
+ new GrammarAction( "Pop allowed" )
+ {
+ public void action( IAsn1Container container ) throws DecoderException
+ {
+ container.grammarPopAllowed( true );
+ }
+ } );
}
//~ Methods ------------------------------------------------------------------------------------
Modified: directory/trunks/common/ldap/src/test/java/org/apache/ldap/common/codec/search/SearchResultDoneTest.java
URL: http://svn.apache.org/viewcvs/directory/trunks/common/ldap/src/test/java/org/apache/ldap/common/codec/search/SearchResultDoneTest.java?rev=373165&r1=373164&r2=373165&view=diff
==============================================================================
--- directory/trunks/common/ldap/src/test/java/org/apache/ldap/common/codec/search/SearchResultDoneTest.java (original)
+++ directory/trunks/common/ldap/src/test/java/org/apache/ldap/common/codec/search/SearchResultDoneTest.java Sat Jan 28 07:31:29 2006
@@ -17,11 +17,13 @@
package org.apache.ldap.common.codec.search;
import java.nio.ByteBuffer;
+import java.util.List;
import org.apache.asn1.codec.DecoderException;
import org.apache.asn1.codec.EncoderException;
import org.apache.asn1.ber.Asn1Decoder;
import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.codec.Control;
import org.apache.ldap.common.codec.LdapDecoder;
import org.apache.ldap.common.codec.LdapMessage;
import org.apache.ldap.common.codec.LdapMessageContainer;
@@ -89,6 +91,91 @@
// Check the length
assertEquals(0x0E, message.computeLength());
+
+ // Check the encoding
+ try
+ {
+ ByteBuffer bb = message.encode( null );
+
+ String encodedPdu = StringTools.dumpBytes( bb.array() );
+
+ assertEquals(encodedPdu, decodedPdu );
+ }
+ catch ( EncoderException ee )
+ {
+ ee.printStackTrace();
+ fail( ee.getMessage() );
+ }
+ }
+
+ /**
+ * Test the decoding of a SearchResultDone with controls
+ */
+ public void testDecodeSearchResultDoneSuccessWithControls()
+ {
+ Asn1Decoder ldapDecoder = new LdapDecoder();
+
+ ByteBuffer stream = ByteBuffer.allocate( 0x2B );
+
+ stream.put(
+ new byte[]
+ {
+ 0x30, 0x29, // LDAPMessage ::=SEQUENCE {
+ 0x02, 0x01, 0x01, // messageID MessageID
+ 0x65, 0x07, // CHOICE { ..., delResponse DelResponse, ...
+ // SearchResultDone ::= [APPLICATION 5] LDAPResult
+ 0x0A, 0x01, 0x00, // LDAPResult ::= SEQUENCE {
+ // resultCode ENUMERATED {
+ // success (0), ...
+ // },
+ 0x04, 0x00, // matchedDN LDAPDN,
+ 0x04, 0x00, // errorMessage LDAPString,
+ // referral [3] Referral OPTIONAL }
+ // }
+ (byte)0xA0, 0x1B, // A control
+ 0x30, 0x19,
+ 0x04, 0x17,
+ 0x32, 0x2E, 0x31, 0x36, 0x2E, 0x38, 0x34, 0x30,
+ 0x2E, 0x31, 0x2E, 0x31, 0x31, 0x33, 0x37, 0x33,
+ 0x30, 0x2E, 0x33, 0x2E, 0x34, 0x2E, 0x32
+
+ } );
+
+ String decodedPdu = StringTools.dumpBytes( stream.array() );
+ stream.flip();
+
+ // Allocate a BindRequest Container
+ IAsn1Container ldapMessageContainer = new LdapMessageContainer();
+
+ try
+ {
+ ldapDecoder.decode( stream, ldapMessageContainer );
+ }
+ catch ( DecoderException de )
+ {
+ de.printStackTrace();
+ fail( de.getMessage() );
+ }
+
+ LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
+ SearchResultDone searchResultDone = message.getSearchResultDone();
+
+ assertEquals( 1, message.getMessageId() );
+ assertEquals( 0, searchResultDone.getLdapResult().getResultCode() );
+ assertEquals( "", searchResultDone.getLdapResult().getMatchedDN() );
+ assertEquals( "", searchResultDone.getLdapResult().getErrorMessage() );
+
+ // Check the Control
+ List controls = message.getControls();
+
+ assertEquals( 1, controls.size() );
+
+ Control control = message.getControls( 0 );
+ assertEquals( "2.16.840.1.113730.3.4.2", control.getControlType() );
+ assertEquals( "", StringTools.dumpBytes( (byte[])control.getControlValue() ) );
+
+ // Check the length
+ assertEquals(0x2B, message.computeLength());
// Check the encoding
try