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 2011/01/28 02:17:49 UTC
svn commit: r1064409 - in
/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2:
extendedRequest/ExtendedRequestTest.java
extendedResponse/ExtendedResponseTest.java
Author: elecharny
Date: Fri Jan 28 01:17:48 2011
New Revision: 1064409
URL: http://svn.apache.org/viewvc?rev=1064409&view=rev
Log:
Fixed DSML extendedRequest/Response tests
Modified:
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/ExtendedRequestTest.java
directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/ExtendedResponseTest.java
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=1064409&r1=1064408&r2=1064409&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 Fri Jan 28 01:17:48 2011
@@ -23,10 +23,13 @@ package org.apache.directory.shared.dsml
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
+import java.util.Map;
+
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
import org.apache.directory.shared.dsmlv2.AbstractTest;
@@ -106,9 +109,13 @@ public class ExtendedRequestTest extends
}
ExtendedRequest extendedRequest = ( ExtendedRequest ) parser.getBatchRequest().getCurrentRequest();
- Control control = extendedRequest.getCurrentControl();
+ Map<String, Control> controls = extendedRequest.getControls();
assertEquals( 1, extendedRequest.getControls().size() );
+
+ Control control = controls.get( "1.2.840.113556.1.4.643" );
+
+ assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
@@ -137,9 +144,13 @@ public class ExtendedRequestTest extends
}
ExtendedRequest extendedRequest = ( ExtendedRequest ) parser.getBatchRequest().getCurrentRequest();
- Control control = extendedRequest.getCurrentControl();
+ Map<String, Control> controls = extendedRequest.getControls();
assertEquals( 1, extendedRequest.getControls().size() );
+
+ Control control = controls.get( "1.2.840.113556.1.4.643" );
+
+ assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString((byte[]) control.getValue()) );
@@ -168,9 +179,13 @@ public class ExtendedRequestTest extends
}
ExtendedRequest extendedRequest = ( ExtendedRequest ) parser.getBatchRequest().getCurrentRequest();
- Control control = extendedRequest.getCurrentControl();
+ Map<String, Control> controls = extendedRequest.getControls();
assertEquals( 1, extendedRequest.getControls().size() );
+
+ Control control = controls.get( "1.2.840.113556.1.4.643" );
+
+ assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
assertFalse( control.hasValue() );
@@ -199,9 +214,13 @@ public class ExtendedRequestTest extends
}
ExtendedRequest extendedRequest = ( ExtendedRequest ) parser.getBatchRequest().getCurrentRequest();
- Control control = extendedRequest.getCurrentControl();
+ Map<String, Control> controls = extendedRequest.getControls();
assertEquals( 2, extendedRequest.getControls().size() );
+
+ Control control = controls.get( "1.2.840.113556.1.4.789" );
+
+ assertNotNull( control );
assertFalse( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
@@ -230,9 +249,13 @@ public class ExtendedRequestTest extends
}
ExtendedRequest extendedRequest = ( ExtendedRequest ) parser.getBatchRequest().getCurrentRequest();
- Control control = extendedRequest.getCurrentControl();
+ Map<String, Control> controls = extendedRequest.getControls();
assertEquals( 3, extendedRequest.getControls().size() );
+
+ Control control = controls.get( "1.2.840.113556.1.4.456" );
+
+ assertNotNull( control );
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=1064409&r1=1064408&r2=1064409&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 Fri Jan 28 01:17:48 2011
@@ -23,11 +23,13 @@ package org.apache.directory.shared.dsml
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.util.Collection;
+import java.util.Map;
import org.apache.directory.junit.tools.Concurrent;
import org.apache.directory.junit.tools.ConcurrentJunitRunner;
@@ -115,15 +117,15 @@ public class ExtendedResponseTest extend
}
ExtendedResponse extendedResponse = ( ExtendedResponse ) parser.getBatchResponse().getCurrentResponse();
+ Map<String, Control> controls = extendedResponse.getControls();
assertEquals( 1, extendedResponse.getControls().size() );
- Control control = extendedResponse.getCurrentControl();
+ Control control = controls.get( "1.2.840.113556.1.4.643" );
+ assertNotNull( control );
assertTrue( control.isCritical() );
-
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
-
assertEquals( "Some text", Strings.utf8ToString((byte[]) control.getValue()) );
}
@@ -150,9 +152,13 @@ public class ExtendedResponseTest extend
}
ExtendedResponse extendedResponse = ( ExtendedResponse ) parser.getBatchResponse().getCurrentResponse();
- Control control = extendedResponse.getCurrentControl();
+ Map<String, Control> controls = extendedResponse.getControls();
assertEquals( 1, extendedResponse.getControls().size() );
+
+ Control control = controls.get( "1.2.840.113556.1.4.643" );
+
+ assertNotNull( control );
assertTrue( control.isCritical() );
assertEquals( "1.2.840.113556.1.4.643", control.getOid() );
assertFalse( control.hasValue() );
@@ -181,15 +187,15 @@ public class ExtendedResponseTest extend
}
ExtendedResponse extendedResponse = ( ExtendedResponse ) parser.getBatchResponse().getCurrentResponse();
+ Map<String, Control> controls = extendedResponse.getControls();
assertEquals( 2, extendedResponse.getControls().size() );
- Control control = extendedResponse.getCurrentControl();
+ Control control = controls.get( "1.2.840.113556.1.4.789" );
+ assertNotNull( control );
assertFalse( control.isCritical() );
-
assertEquals( "1.2.840.113556.1.4.789", control.getOid() );
-
assertEquals( "Some other text", Strings.utf8ToString((byte[]) control.getValue()) );
}
@@ -216,15 +222,15 @@ public class ExtendedResponseTest extend
}
ExtendedResponse extendedResponse = ( ExtendedResponse ) parser.getBatchResponse().getCurrentResponse();
+ Map<String, Control> controls = extendedResponse.getControls();
assertEquals( 3, extendedResponse.getControls().size() );
- Control control = extendedResponse.getCurrentControl();
+ Control control = controls.get( "1.2.840.113556.1.4.456" );
+ assertNotNull( control );
assertTrue( control.isCritical() );
-
assertEquals( "1.2.840.113556.1.4.456", control.getOid() );
-
assertFalse( control.hasValue() );
}