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 2010/02/01 16:04:20 UTC
svn commit: r905297 [2/7] - in /directory:
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/event/
apacheds/trunk/core-api/src/main/java/org/apache/directory/server/core/interceptor/context/
apacheds/trunk/core-api/src/main/java/o...
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/Dsmlv2Engine.java Mon Feb 1 15:04:10 2010
@@ -56,7 +56,6 @@
import org.apache.directory.shared.dsmlv2.request.BatchRequest.OnError;
import org.apache.directory.shared.dsmlv2.request.BatchRequest.Processing;
import org.apache.directory.shared.dsmlv2.request.BatchRequest.ResponseOrder;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.LdapConstants;
import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
import org.apache.directory.shared.ldap.codec.LdapMessageContainer;
@@ -67,6 +66,7 @@
import org.apache.directory.shared.ldap.codec.bind.LdapAuthentication;
import org.apache.directory.shared.ldap.codec.bind.SimpleAuthentication;
import org.apache.directory.shared.ldap.codec.compare.CompareResponseCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.del.DelResponseCodec;
import org.apache.directory.shared.ldap.codec.extended.ExtendedResponseCodec;
import org.apache.directory.shared.ldap.codec.modify.ModifyResponseCodec;
@@ -464,7 +464,8 @@
private void copyMessageIdAndControls( LdapMessageCodec from, LdapMessageCodec to )
{
to.setMessageId( from.getMessageId() );
- for ( ControlCodec control : from.getControls() )
+
+ for ( CodecControl control : from.getControls() )
{
to.addControl( control );
}
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/Dsmlv2ResponseGrammar.java Mon Feb 1 15:04:10 2010
@@ -40,13 +40,14 @@
import org.apache.directory.shared.dsmlv2.ParserUtils;
import org.apache.directory.shared.dsmlv2.Tag;
import org.apache.directory.shared.dsmlv2.reponse.ErrorResponse.ErrorResponseType;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.LdapMessageCodec;
import org.apache.directory.shared.ldap.codec.LdapResponseCodec;
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
import org.apache.directory.shared.ldap.codec.add.AddResponseCodec;
import org.apache.directory.shared.ldap.codec.bind.BindResponseCodec;
import org.apache.directory.shared.ldap.codec.compare.CompareResponseCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
+import org.apache.directory.shared.ldap.codec.controls.CodecControlImpl;
import org.apache.directory.shared.ldap.codec.del.DelResponseCodec;
import org.apache.directory.shared.ldap.codec.extended.ExtendedResponseCodec;
import org.apache.directory.shared.ldap.codec.modify.ModifyResponseCodec;
@@ -54,11 +55,11 @@
import org.apache.directory.shared.ldap.codec.search.SearchResultDoneCodec;
import org.apache.directory.shared.ldap.codec.search.SearchResultEntryCodec;
import org.apache.directory.shared.ldap.codec.search.SearchResultReferenceCodec;
-import org.apache.directory.shared.ldap.util.LdapURL;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.name.LdapDN;
import org.apache.directory.shared.ldap.util.Base64;
+import org.apache.directory.shared.ldap.util.LdapURL;
import org.xmlpull.v1.XmlPullParser;
import org.xmlpull.v1.XmlPullParserException;
@@ -1167,9 +1168,7 @@
*/
private void createAndAddControl( Dsmlv2Container container, LdapMessageCodec parent ) throws XmlPullParserException
{
- ControlCodec control = new ControlCodec();
-
- parent.addControl( control );
+ CodecControl control = null;
XmlPullParser xpp = container.getParser();
@@ -1177,13 +1176,16 @@
String attributeValue;
// TYPE
attributeValue = xpp.getAttributeValue( "", "type" );
+
if ( attributeValue != null )
{
if ( !OID.isOID( attributeValue ) )
{
throw new XmlPullParserException( "Incorrect value for 'type' attribute. This is not an OID.", xpp, null );
}
- control.setControlType( attributeValue );
+
+ control = new CodecControlImpl( attributeValue );
+ parent.addControl( control );
}
else
{
@@ -1191,15 +1193,16 @@
}
// CRITICALITY
attributeValue = xpp.getAttributeValue( "", "criticality" );
+
if ( attributeValue != null )
{
if ( attributeValue.equals( "true" ) )
{
- control.setCriticality( true );
+ control.setCritical( true );
}
else if ( attributeValue.equals( "false" ) )
{
- control.setCriticality( false );
+ control.setCritical( false );
}
else
{
@@ -1264,7 +1267,7 @@
private void createAndAddControlValue( Dsmlv2Container container, LdapMessageCodec parent )
throws XmlPullParserException
{
- ControlCodec control = parent.getCurrentControl();
+ CodecControl control = parent.getCurrentControl();
XmlPullParser xpp = container.getParser();
try
@@ -1274,15 +1277,16 @@
// Getting the value
String nextText = xpp.nextText();
+
if ( !nextText.equals( "" ) )
{
if ( ParserUtils.isBase64BinaryValue( xpp, typeValue ) )
{
- control.setControlValue( Base64.decode( nextText.trim().toCharArray() ) );
+ control.setValue( Base64.decode( nextText.trim().toCharArray() ) );
}
else
{
- control.setControlValue( nextText.trim() );
+ control.setValue( nextText.trim().getBytes() );
}
}
}
Modified: directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java (original)
+++ directory/shared/trunk/dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/request/Dsmlv2Grammar.java Mon Feb 1 15:04:10 2010
@@ -43,13 +43,14 @@
import org.apache.directory.shared.dsmlv2.request.BatchRequest.Processing;
import org.apache.directory.shared.dsmlv2.request.BatchRequest.ResponseOrder;
import org.apache.directory.shared.ldap.codec.AttributeValueAssertion;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.LdapConstants;
import org.apache.directory.shared.ldap.codec.abandon.AbandonRequestCodec;
import org.apache.directory.shared.ldap.codec.add.AddRequestCodec;
import org.apache.directory.shared.ldap.codec.bind.BindRequestCodec;
import org.apache.directory.shared.ldap.codec.bind.SimpleAuthentication;
import org.apache.directory.shared.ldap.codec.compare.CompareRequestCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
+import org.apache.directory.shared.ldap.codec.controls.CodecControlImpl;
import org.apache.directory.shared.ldap.codec.del.DelRequestCodec;
import org.apache.directory.shared.ldap.codec.extended.ExtendedRequestCodec;
import org.apache.directory.shared.ldap.codec.modify.ModifyRequestCodec;
@@ -2644,8 +2645,7 @@
{
public void action( Dsmlv2Container container ) throws XmlPullParserException
{
- ControlCodec control = new ControlCodec();
- container.getBatchRequest().getCurrentRequest().addControl( control );
+ CodecControl control = null;
XmlPullParser xpp = container.getParser();
@@ -2653,6 +2653,7 @@
String attributeValue;
// TYPE
attributeValue = xpp.getAttributeValue( "", "type" );
+
if ( attributeValue != null )
{
if ( !OID.isOID( attributeValue ) )
@@ -2660,23 +2661,27 @@
throw new XmlPullParserException( "Incorrect value for 'type' attribute. This is not an OID.", xpp,
null );
}
- control.setControlType( attributeValue );
+
+ control = new CodecControlImpl( attributeValue );
+ container.getBatchRequest().getCurrentRequest().addControl( control );
}
else
{
throw new XmlPullParserException( "type attribute is required", xpp, null );
}
+
// CRITICALITY
attributeValue = xpp.getAttributeValue( "", "criticality" );
+
if ( attributeValue != null )
{
if ( attributeValue.equals( "true" ) )
{
- control.setCriticality( true );
+ control.setCritical( true );
}
else if ( attributeValue.equals( "false" ) )
{
- control.setCriticality( false );
+ control.setCritical( false );
}
else
{
@@ -2693,7 +2698,7 @@
{
public void action( Dsmlv2Container container ) throws XmlPullParserException
{
- ControlCodec control = container.getBatchRequest().getCurrentRequest().getCurrentControl();
+ CodecControl control = container.getBatchRequest().getCurrentRequest().getCurrentControl();
XmlPullParser xpp = container.getParser();
try
@@ -2703,15 +2708,16 @@
// Getting the value
String nextText = xpp.nextText();
+
if ( !nextText.equals( "" ) )
{
if ( ParserUtils.isBase64BinaryValue( xpp, typeValue ) )
{
- control.setControlValue( Base64.decode( nextText.trim().toCharArray() ) );
+ control.setValue( Base64.decode( nextText.trim().toCharArray() ) );
}
else
{
- control.setControlValue( nextText.trim() );
+ control.setValue( nextText.trim().getBytes() );
}
}
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java Mon Feb 1 15:04:10 2010
@@ -21,18 +21,18 @@
package org.apache.directory.shared.dsmlv2.abandonRequest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import org.apache.directory.shared.dsmlv2.AbstractTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.abandon.AbandonRequestCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
-
/**
* Tests for the Abandon Request parsing
*
@@ -138,12 +138,12 @@
}
AbandonRequestCodec abandonRequest = ( AbandonRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = abandonRequest.getCurrentControl();
+ CodecControl control = abandonRequest.getCurrentControl();
assertEquals( 1, abandonRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -170,12 +170,12 @@
}
AbandonRequestCodec abandonRequest = ( AbandonRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = abandonRequest.getCurrentControl();
+ CodecControl control = abandonRequest.getCurrentControl();
assertEquals( 1, abandonRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -202,12 +202,12 @@
}
AbandonRequestCodec abandonRequest = ( AbandonRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = abandonRequest.getCurrentControl();
+ CodecControl control = abandonRequest.getCurrentControl();
assertEquals( 1, abandonRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -234,12 +234,12 @@
}
AbandonRequestCodec abandonRequest = ( AbandonRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = abandonRequest.getCurrentControl();
+ CodecControl control = abandonRequest.getCurrentControl();
assertEquals( 2, abandonRequest.getControls().size() );
- assertFalse( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertFalse( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -266,12 +266,12 @@
}
AbandonRequestCodec abandonRequest = ( AbandonRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = abandonRequest.getCurrentControl();
+ CodecControl control = abandonRequest.getCurrentControl();
assertEquals( 3, abandonRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java Mon Feb 1 15:04:10 2010
@@ -21,21 +21,22 @@
package org.apache.directory.shared.dsmlv2.addRequest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.util.Iterator;
import org.apache.directory.shared.dsmlv2.AbstractTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.add.AddRequestCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.entry.Entry;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Value;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
/**
* Tests for the Add Request parsing
@@ -142,13 +143,13 @@
assertEquals( 1, addRequest.getControls().size() );
- ControlCodec control = addRequest.getCurrentControl();
+ CodecControl control = addRequest.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -174,12 +175,12 @@
}
AddRequestCodec addRequest = ( AddRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = addRequest.getCurrentControl();
+ CodecControl control = addRequest.getCurrentControl();
assertEquals( 1, addRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -205,12 +206,12 @@
}
AddRequestCodec addRequest = ( AddRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = addRequest.getCurrentControl();
+ CodecControl control = addRequest.getCurrentControl();
assertEquals( 1, addRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -235,12 +236,12 @@
}
AddRequestCodec addRequest = ( AddRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = addRequest.getCurrentControl();
+ CodecControl control = addRequest.getCurrentControl();
assertEquals( 2, addRequest.getControls().size() );
- assertFalse( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertFalse( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -266,12 +267,12 @@
}
AddRequestCodec addRequest = ( AddRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = addRequest.getCurrentControl();
+ CodecControl control = addRequest.getCurrentControl();
assertEquals( 3, addRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java Mon Feb 1 15:04:10 2010
@@ -31,9 +31,9 @@
import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
import org.apache.directory.shared.ldap.codec.add.AddResponseCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.util.LdapURL;
@@ -111,13 +111,13 @@
assertEquals( 1, addResponse.getControls().size() );
- ControlCodec control = addResponse.getCurrentControl();
+ CodecControl control = addResponse.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -143,12 +143,12 @@
}
AddResponseCodec addResponse = ( AddResponseCodec ) parser.getBatchResponse().getCurrentResponse();
- ControlCodec control = addResponse.getCurrentControl();
+ CodecControl control = addResponse.getCurrentControl();
assertEquals( 1, addResponse.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, ( byte[] ) control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -176,13 +176,13 @@
assertEquals( 2, addResponse.getControls().size() );
- ControlCodec control = addResponse.getCurrentControl();
+ CodecControl control = addResponse.getCurrentControl();
- assertFalse( control.getCriticality() );
+ assertFalse( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -211,13 +211,13 @@
assertEquals( 3, addResponse.getControls().size() );
- ControlCodec control = addResponse.getCurrentControl();
+ CodecControl control = addResponse.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java Mon Feb 1 15:04:10 2010
@@ -21,16 +21,17 @@
package org.apache.directory.shared.dsmlv2.authRequest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import org.apache.directory.shared.dsmlv2.AbstractTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.bind.BindRequestCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
/**
* Tests for the Auth Request parsing
@@ -135,12 +136,12 @@
}
BindRequestCodec abandonRequest = ( BindRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = abandonRequest.getCurrentControl();
+ CodecControl control = abandonRequest.getCurrentControl();
assertEquals( 1, abandonRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -166,12 +167,12 @@
}
BindRequestCodec abandonRequest = ( BindRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = abandonRequest.getCurrentControl();
+ CodecControl control = abandonRequest.getCurrentControl();
assertEquals( 1, abandonRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -197,12 +198,12 @@
}
BindRequestCodec abandonRequest = ( BindRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = abandonRequest.getCurrentControl();
+ CodecControl control = abandonRequest.getCurrentControl();
assertEquals( 1, abandonRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -227,12 +228,12 @@
}
BindRequestCodec abandonRequest = ( BindRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = abandonRequest.getCurrentControl();
+ CodecControl control = abandonRequest.getCurrentControl();
assertEquals( 2, abandonRequest.getControls().size() );
- assertFalse( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertFalse( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -258,12 +259,12 @@
}
BindRequestCodec abandonRequest = ( BindRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = abandonRequest.getCurrentControl();
+ CodecControl control = abandonRequest.getCurrentControl();
assertEquals( 3, abandonRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java Mon Feb 1 15:04:10 2010
@@ -31,9 +31,9 @@
import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
import org.apache.directory.shared.ldap.codec.bind.BindResponseCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.util.LdapURL;
@@ -111,13 +111,13 @@
assertEquals( 1, bindResponse.getControls().size() );
- ControlCodec control = bindResponse.getCurrentControl();
+ CodecControl control = bindResponse.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -143,12 +143,12 @@
}
BindResponseCodec bindResponse = ( BindResponseCodec ) parser.getBatchResponse().getCurrentResponse();
- ControlCodec control = bindResponse.getCurrentControl();
+ CodecControl control = bindResponse.getCurrentControl();
assertEquals( 1, bindResponse.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, ( byte[] ) control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -177,13 +177,13 @@
assertEquals( 2, bindResponse.getControls().size() );
- ControlCodec control = bindResponse.getCurrentControl();
+ CodecControl control = bindResponse.getCurrentControl();
- assertFalse( control.getCriticality() );
+ assertFalse( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -212,13 +212,13 @@
assertEquals( 3, bindResponse.getControls().size() );
- ControlCodec control = bindResponse.getCurrentControl();
+ CodecControl control = bindResponse.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java Mon Feb 1 15:04:10 2010
@@ -21,17 +21,18 @@
package org.apache.directory.shared.dsmlv2.compareRequest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import org.apache.directory.shared.dsmlv2.AbstractTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.compare.CompareRequestCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
/**
* Tests for the Compare Request parsing
@@ -140,13 +141,13 @@
assertEquals( 1, compareRequest.getControls().size() );
- ControlCodec control = compareRequest.getCurrentControl();
+ CodecControl control = compareRequest.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -175,13 +176,13 @@
assertEquals( 1, compareRequest.getControls().size() );
- ControlCodec control = compareRequest.getCurrentControl();
+ CodecControl control = compareRequest.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -210,13 +211,13 @@
assertEquals( 1, compareRequest.getControls().size() );
- ControlCodec control = compareRequest.getCurrentControl();
+ CodecControl control = compareRequest.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertFalse( control.hasValue() );
}
@@ -245,13 +246,13 @@
assertEquals( 2, compareRequest.getControls().size() );
- ControlCodec control = compareRequest.getCurrentControl();
+ CodecControl control = compareRequest.getCurrentControl();
- assertFalse( control.getCriticality() );
+ assertFalse( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -280,13 +281,13 @@
assertEquals( 3, compareRequest.getControls().size() );
- ControlCodec control = compareRequest.getCurrentControl();
+ CodecControl control = compareRequest.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java Mon Feb 1 15:04:10 2010
@@ -31,9 +31,9 @@
import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
import org.apache.directory.shared.ldap.codec.compare.CompareResponseCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
import org.apache.directory.shared.ldap.util.LdapURL;
@@ -112,13 +112,13 @@
assertEquals( 1, compareResponse.getControls().size() );
- ControlCodec control = compareResponse.getCurrentControl();
+ CodecControl control = compareResponse.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -144,12 +144,12 @@
}
CompareResponseCodec compareResponse = ( CompareResponseCodec ) parser.getBatchResponse().getCurrentResponse();
- ControlCodec control = compareResponse.getCurrentControl();
+ CodecControl control = compareResponse.getCurrentControl();
assertEquals( 1, compareResponse.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, ( byte[] ) control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -178,13 +178,13 @@
assertEquals( 2, compareResponse.getControls().size() );
- ControlCodec control = compareResponse.getCurrentControl();
+ CodecControl control = compareResponse.getCurrentControl();
- assertFalse( control.getCriticality() );
+ assertFalse( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -213,13 +213,13 @@
assertEquals( 3, compareResponse.getControls().size() );
- ControlCodec control = compareResponse.getCurrentControl();
+ CodecControl control = compareResponse.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java Mon Feb 1 15:04:10 2010
@@ -21,16 +21,17 @@
package org.apache.directory.shared.dsmlv2.delRequest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import org.apache.directory.shared.dsmlv2.AbstractTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.del.DelRequestCodec;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
/**
@@ -135,12 +136,12 @@
}
DelRequestCodec delRequest = ( DelRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = delRequest.getCurrentControl();
+ CodecControl control = delRequest.getCurrentControl();
assertEquals( 1, delRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -166,12 +167,12 @@
}
DelRequestCodec delRequest = ( DelRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = delRequest.getCurrentControl();
+ CodecControl control = delRequest.getCurrentControl();
assertEquals( 1, delRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -197,12 +198,12 @@
}
DelRequestCodec delRequest = ( DelRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = delRequest.getCurrentControl();
+ CodecControl control = delRequest.getCurrentControl();
assertEquals( 1, delRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -227,12 +228,12 @@
}
DelRequestCodec delRequest = ( DelRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = delRequest.getCurrentControl();
+ CodecControl control = delRequest.getCurrentControl();
assertEquals( 2, delRequest.getControls().size() );
- assertFalse( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertFalse( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -258,12 +259,12 @@
}
DelRequestCodec delRequest = ( DelRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = delRequest.getCurrentControl();
+ CodecControl control = delRequest.getCurrentControl();
assertEquals( 3, delRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java Mon Feb 1 15:04:10 2010
@@ -31,8 +31,8 @@
import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.del.DelResponseCodec;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -112,13 +112,13 @@
assertEquals( 1, delResponse.getControls().size() );
- ControlCodec control = delResponse.getCurrentControl();
+ CodecControl control = delResponse.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -144,12 +144,12 @@
}
DelResponseCodec delResponse = ( DelResponseCodec ) parser.getBatchResponse().getCurrentResponse();
- ControlCodec control = delResponse.getCurrentControl();
+ CodecControl control = delResponse.getCurrentControl();
assertEquals( 1, delResponse.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, ( byte[] ) control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -177,13 +177,13 @@
assertEquals( 2, delResponse.getControls().size() );
- ControlCodec control = delResponse.getCurrentControl();
+ CodecControl control = delResponse.getCurrentControl();
- assertFalse( control.getCriticality() );
+ assertFalse( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -212,13 +212,13 @@
assertEquals( 3, delResponse.getControls().size() );
- ControlCodec control = delResponse.getCurrentControl();
+ CodecControl control = delResponse.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java Mon Feb 1 15:04:10 2010
@@ -21,17 +21,18 @@
package org.apache.directory.shared.dsmlv2.extendedRequest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import org.apache.directory.shared.dsmlv2.AbstractTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.extended.ExtendedRequestCodec;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
/**
* Tests for the Extended Request parsing
@@ -100,12 +101,12 @@
}
ExtendedRequestCodec extendedRequest = ( ExtendedRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = extendedRequest.getCurrentControl();
+ CodecControl control = extendedRequest.getCurrentControl();
assertEquals( 1, extendedRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -131,12 +132,12 @@
}
ExtendedRequestCodec extendedRequest = ( ExtendedRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = extendedRequest.getCurrentControl();
+ CodecControl control = extendedRequest.getCurrentControl();
assertEquals( 1, extendedRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -162,12 +163,12 @@
}
ExtendedRequestCodec extendedRequest = ( ExtendedRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = extendedRequest.getCurrentControl();
+ CodecControl control = extendedRequest.getCurrentControl();
assertEquals( 1, extendedRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -193,12 +194,12 @@
}
ExtendedRequestCodec extendedRequest = ( ExtendedRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = extendedRequest.getCurrentControl();
+ CodecControl control = extendedRequest.getCurrentControl();
assertEquals( 2, extendedRequest.getControls().size() );
- assertFalse( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertFalse( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -224,12 +225,12 @@
}
ExtendedRequestCodec extendedRequest = ( ExtendedRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = extendedRequest.getCurrentControl();
+ CodecControl control = extendedRequest.getCurrentControl();
assertEquals( 3, extendedRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java Mon Feb 1 15:04:10 2010
@@ -33,8 +33,8 @@
import org.apache.directory.shared.asn1.primitives.OID;
import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.extended.ExtendedResponseCodec;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -114,13 +114,13 @@
assertEquals( 1, extendedResponse.getControls().size() );
- ControlCodec control = extendedResponse.getCurrentControl();
+ CodecControl control = extendedResponse.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -146,12 +146,12 @@
}
ExtendedResponseCodec extendedResponse = ( ExtendedResponseCodec ) parser.getBatchResponse().getCurrentResponse();
- ControlCodec control = extendedResponse.getCurrentControl();
+ CodecControl control = extendedResponse.getCurrentControl();
assertEquals( 1, extendedResponse.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, ( byte[] ) control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -180,13 +180,13 @@
assertEquals( 2, extendedResponse.getControls().size() );
- ControlCodec control = extendedResponse.getCurrentControl();
+ CodecControl control = extendedResponse.getCurrentControl();
- assertFalse( control.getCriticality() );
+ assertFalse( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -215,13 +215,13 @@
assertEquals( 3, extendedResponse.getControls().size() );
- ControlCodec control = extendedResponse.getCurrentControl();
+ CodecControl control = extendedResponse.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java Mon Feb 1 15:04:10 2010
@@ -21,16 +21,17 @@
package org.apache.directory.shared.dsmlv2.modDNRequest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import org.apache.directory.shared.dsmlv2.AbstractTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNRequestCodec;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
/**
* Tests for the Modify DN Request parsing
@@ -99,12 +100,12 @@
}
ModifyDNRequestCodec modifyDNRequest = ( ModifyDNRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = modifyDNRequest.getCurrentControl();
+ CodecControl control = modifyDNRequest.getCurrentControl();
assertEquals( 1, modifyDNRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -130,12 +131,12 @@
}
ModifyDNRequestCodec modifyDNRequest = ( ModifyDNRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = modifyDNRequest.getCurrentControl();
+ CodecControl control = modifyDNRequest.getCurrentControl();
assertEquals( 1, modifyDNRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -161,12 +162,12 @@
}
ModifyDNRequestCodec modifyDNRequest = ( ModifyDNRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = modifyDNRequest.getCurrentControl();
+ CodecControl control = modifyDNRequest.getCurrentControl();
assertEquals( 1, modifyDNRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -192,12 +193,12 @@
}
ModifyDNRequestCodec modifyDNRequest = ( ModifyDNRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = modifyDNRequest.getCurrentControl();
+ CodecControl control = modifyDNRequest.getCurrentControl();
assertEquals( 2, modifyDNRequest.getControls().size() );
- assertFalse( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertFalse( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -223,12 +224,12 @@
}
ModifyDNRequestCodec modifyDNRequest = ( ModifyDNRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = modifyDNRequest.getCurrentControl();
+ CodecControl control = modifyDNRequest.getCurrentControl();
assertEquals( 3, modifyDNRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java Mon Feb 1 15:04:10 2010
@@ -31,8 +31,8 @@
import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNResponseCodec;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -112,13 +112,13 @@
assertEquals( 1, modifyDNResponse.getControls().size() );
- ControlCodec control = modifyDNResponse.getCurrentControl();
+ CodecControl control = modifyDNResponse.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -144,12 +144,12 @@
}
ModifyDNResponseCodec modifyDNResponse = ( ModifyDNResponseCodec ) parser.getBatchResponse().getCurrentResponse();
- ControlCodec control = modifyDNResponse.getCurrentControl();
+ CodecControl control = modifyDNResponse.getCurrentControl();
assertEquals( 1, modifyDNResponse.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, ( byte[] ) control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -178,13 +178,13 @@
assertEquals( 2, modifyDNResponse.getControls().size() );
- ControlCodec control = modifyDNResponse.getCurrentControl();
+ CodecControl control = modifyDNResponse.getCurrentControl();
- assertFalse( control.getCriticality() );
+ assertFalse( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -213,13 +213,13 @@
assertEquals( 3, modifyDNResponse.getControls().size() );
- ControlCodec control = modifyDNResponse.getCurrentControl();
+ CodecControl control = modifyDNResponse.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java Mon Feb 1 15:04:10 2010
@@ -21,6 +21,11 @@
package org.apache.directory.shared.dsmlv2.modifyRequest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.io.UnsupportedEncodingException;
import java.util.List;
@@ -28,17 +33,13 @@
import org.apache.directory.shared.dsmlv2.AbstractTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.LdapConstants;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.modify.ModifyRequestCodec;
import org.apache.directory.shared.ldap.entry.EntryAttribute;
import org.apache.directory.shared.ldap.entry.Modification;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
/**
* Tests for the Modify Request parsing
@@ -106,12 +107,12 @@
}
ModifyRequestCodec modifyRequest = ( ModifyRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = modifyRequest.getCurrentControl();
+ CodecControl control = modifyRequest.getCurrentControl();
assertEquals( 1, modifyRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -137,12 +138,12 @@
}
ModifyRequestCodec modifyRequest = ( ModifyRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = modifyRequest.getCurrentControl();
+ CodecControl control = modifyRequest.getCurrentControl();
assertEquals( 1, modifyRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -168,12 +169,12 @@
}
ModifyRequestCodec modifyRequest = ( ModifyRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = modifyRequest.getCurrentControl();
+ CodecControl control = modifyRequest.getCurrentControl();
assertEquals( 1, modifyRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -199,12 +200,12 @@
}
ModifyRequestCodec modifyRequest = ( ModifyRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = modifyRequest.getCurrentControl();
+ CodecControl control = modifyRequest.getCurrentControl();
assertEquals( 2, modifyRequest.getControls().size() );
- assertFalse( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertFalse( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -230,12 +231,12 @@
}
ModifyRequestCodec modifyRequest = ( ModifyRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = modifyRequest.getCurrentControl();
+ CodecControl control = modifyRequest.getCurrentControl();
assertEquals( 3, modifyRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java Mon Feb 1 15:04:10 2010
@@ -31,8 +31,8 @@
import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.LdapResultCodec;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.modify.ModifyResponseCodec;
import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
import org.apache.directory.shared.ldap.message.ResultCodeEnum;
@@ -112,13 +112,13 @@
assertEquals( 1, modifyResponse.getControls().size() );
- ControlCodec control = modifyResponse.getCurrentControl();
+ CodecControl control = modifyResponse.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -144,12 +144,12 @@
}
ModifyResponseCodec modifyResponse = ( ModifyResponseCodec ) parser.getBatchResponse().getCurrentResponse();
- ControlCodec control = modifyResponse.getCurrentControl();
+ CodecControl control = modifyResponse.getCurrentControl();
assertEquals( 1, modifyResponse.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, ( byte[] ) control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -178,13 +178,13 @@
assertEquals( 2, modifyResponse.getControls().size() );
- ControlCodec control = modifyResponse.getCurrentControl();
+ CodecControl control = modifyResponse.getCurrentControl();
- assertFalse( control.getCriticality() );
+ assertFalse( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -213,13 +213,13 @@
assertEquals( 3, modifyResponse.getControls().size() );
- ControlCodec control = modifyResponse.getCurrentControl();
+ CodecControl control = modifyResponse.getCurrentControl();
- assertTrue( control.getCriticality() );
+ assertTrue( control.isCritical() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertFalse( control.hasValue() );
}
Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java?rev=905297&r1=905296&r2=905297&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java Mon Feb 1 15:04:10 2010
@@ -21,6 +21,12 @@
package org.apache.directory.shared.dsmlv2.searchRequest;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
+
import java.util.List;
import javax.naming.NamingException;
@@ -28,8 +34,8 @@
import org.apache.directory.shared.dsmlv2.AbstractTest;
import org.apache.directory.shared.dsmlv2.Dsmlv2Parser;
import org.apache.directory.shared.ldap.codec.AttributeValueAssertion;
-import org.apache.directory.shared.ldap.codec.ControlCodec;
import org.apache.directory.shared.ldap.codec.LdapConstants;
+import org.apache.directory.shared.ldap.codec.controls.CodecControl;
import org.apache.directory.shared.ldap.codec.search.AndFilter;
import org.apache.directory.shared.ldap.codec.search.AttributeValueAssertionFilter;
import org.apache.directory.shared.ldap.codec.search.ExtensibleMatchFilter;
@@ -43,11 +49,6 @@
import org.apache.directory.shared.ldap.filter.SearchScope;
import org.apache.directory.shared.ldap.util.StringTools;
import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
/**
* Tests for the Del Request parsing
@@ -152,12 +153,12 @@
}
SearchRequestCodec searchRequest = ( SearchRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = searchRequest.getCurrentControl();
+ CodecControl control = searchRequest.getCurrentControl();
assertEquals( 1, searchRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "Some text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -183,12 +184,12 @@
}
SearchRequestCodec searchRequest = ( SearchRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = searchRequest.getCurrentControl();
+ CodecControl control = searchRequest.getCurrentControl();
assertEquals( 1, searchRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertEquals( "DSMLv2.0 rocks!!", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -214,12 +215,12 @@
}
SearchRequestCodec searchRequest = ( SearchRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = searchRequest.getCurrentControl();
+ CodecControl control = searchRequest.getCurrentControl();
assertEquals( 1, searchRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.643", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
+ assertFalse( control.hasValue() );
}
@@ -245,12 +246,12 @@
}
SearchRequestCodec searchRequest = ( SearchRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = searchRequest.getCurrentControl();
+ CodecControl control = searchRequest.getCurrentControl();
assertEquals( 2, searchRequest.getControls().size() );
- assertFalse( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.789", control.getControlType() );
- assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getControlValue() ) );
+ assertFalse( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
+ assertEquals( "Some other text", StringTools.utf8ToString( ( byte[] ) control.getValue() ) );
}
@@ -276,12 +277,12 @@
}
SearchRequestCodec searchRequest = ( SearchRequestCodec ) parser.getBatchRequest().getCurrentRequest();
- ControlCodec control = searchRequest.getCurrentControl();
+ CodecControl control = searchRequest.getCurrentControl();
assertEquals( 3, searchRequest.getControls().size() );
- assertTrue( control.getCriticality() );
- assertEquals( "1.2.840.113556.1.4.456", control.getControlType() );
- assertEquals( StringTools.EMPTY_BYTES, control.getControlValue() );
+ assertTrue( control.isCritical() );
+ assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
+ assertFalse( control.hasValue() );
}