directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r896514 [2/4] - in /directory/shared/trunk: convert/ cursor/ dsml-parser/ dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/ dsml-parser/src/main/java/org/apach...
Date Wed, 06 Jan 2010 16:33:33 GMT
Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/compareRequest:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest:806622-896441

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=896514&r1=896513&r2=896514&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 Wed Jan  6 16:33:29 2010
@@ -26,7 +26,12 @@
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 import org.apache.directory.shared.ldap.codec.compare.CompareRequestCodec;
 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
@@ -39,6 +44,7 @@
     /**
      * Test parsing of a request without the dn attribute
      */
+    @Test
     public void testRequestWithoutDn()
     {
         testParsingFail( CompareRequestTest.class, "request_without_dn_attribute.xml" );
@@ -48,6 +54,7 @@
     /**
      * Test parsing of a request with the dn attribute
      */
+    @Test
     public void testRequestWithDn()
     {
         Dsmlv2Parser parser = null;
@@ -74,6 +81,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute
      */
+    @Test
     public void testRequestWithRequestId()
     {
         Dsmlv2Parser parser = null;
@@ -100,6 +108,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute equals to 0
      */
+    @Test
     public void testRequestWithRequestIdEquals0()
     {
         testParsingFail( CompareRequestTest.class, "request_with_requestID_equals_0.xml" );
@@ -109,6 +118,7 @@
     /**
      * Test parsing of a request with a (optional) Control element
      */
+    @Test
     public void testRequestWith1Control()
     {
         Dsmlv2Parser parser = null;
@@ -143,6 +153,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with Base64 value
      */
+    @Test
     public void testRequestWith1ControlBase64Value()
     {
         Dsmlv2Parser parser = null;
@@ -177,6 +188,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with empty value
      */
+    @Test
     public void testRequestWith1ControlEmptyValue()
     {
         Dsmlv2Parser parser = null;
@@ -211,6 +223,7 @@
     /**
      * Test parsing of a request with 2 (optional) Control elements
      */
+    @Test
     public void testRequestWith2Controls()
     {
         Dsmlv2Parser parser = null;
@@ -245,6 +258,7 @@
     /**
      * Test parsing of a request with 3 (optional) Control elements without value
      */
+    @Test
     public void testRequestWith3ControlsWithoutValue()
     {
         Dsmlv2Parser parser = null;
@@ -279,6 +293,7 @@
     /**
      * Test parsing of a request with an Attr elements with value
      */
+    @Test
     public void testRequestWith1CompleteAssertion()
     {
         Dsmlv2Parser parser = null;
@@ -309,6 +324,7 @@
     /**
      * Test parsing of a request with a complete assertion with base64 value
      */
+    @Test
     public void testRequestWith1CompleteAssertionBase64Value()
     {
         Dsmlv2Parser parser = null;
@@ -339,6 +355,7 @@
     /**
      * Test parsing of a request with an Attr elements with empty value
      */
+    @Test
     public void testRequestWith1AssertionEmptyValue()
     {
         Dsmlv2Parser parser = null;
@@ -369,6 +386,7 @@
     /**
      * Test parsing of a request without the Assertion element
      */
+    @Test
     public void testRequestWithoutAssertion()
     {
         testParsingFail( CompareRequestTest.class, "request_without_assertion.xml" );
@@ -378,6 +396,7 @@
     /**
      * Test parsing of a request with 2 complete Assertion element
      */
+    @Test
     public void testRequestWith2CompleteAssertions()
     {
         testParsingFail( CompareRequestTest.class, "request_with_2_complete_assertions.xml" );
@@ -387,6 +406,7 @@
     /**
      * Test parsing of a request with 1 Assertion element without the name attribute
      */
+    @Test
     public void testRequestWith1AssertionWithoutNameAttribute()
     {
         testParsingFail( CompareRequestTest.class, "request_with_1_assertion_without_name_attribute.xml" );
@@ -396,6 +416,7 @@
     /**
      * Test parsing of a request with 1 Assertion element without the Value element
      */
+    @Test
     public void testRequestWith1AssertionWithoutValue()
     {
         testParsingFail( CompareRequestTest.class, "request_with_1_assertion_without_value.xml" );
@@ -405,6 +426,7 @@
     /**
      * Test parsing of a request with 1 Assertion element with 2 Value elements
      */
+    @Test
     public void testRequestWith1AssertionWith2Value()
     {
         testParsingFail( CompareRequestTest.class, "request_with_1_assertion_with_2_values.xml" );
@@ -416,6 +438,7 @@
      * 
      * DIRSTUDIO-1
      */
+    @Test
     public void testRequestWithNeededRequestId()
     {
         testParsingFail( CompareRequestTest.class, "request_with_needed_requestID.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/compareResponse:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse:806622-896441

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=896514&r1=896513&r2=896514&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 Wed Jan  6 16:33:29 2010
@@ -32,6 +32,12 @@
 import org.apache.directory.shared.ldap.codec.compare.CompareResponseCodec;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 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;
 
 import com.sun.jndi.ldap.LdapURL;
 
@@ -48,6 +54,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute
      */
+    @Test
     public void testResponseWithRequestId()
     {
         Dsmlv2ResponseParser parser = null;
@@ -74,6 +81,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute equals 0
      */
+    @Test
     public void testResponseWithRequestIdEquals0()
     {
         testParsingFail( CompareResponseTest.class, "response_with_requestID_equals_0.xml" );
@@ -83,6 +91,7 @@
     /**
      * Test parsing of a response with a (optional) Control element
      */
+    @Test
     public void testResponseWith1Control()
     {
         Dsmlv2ResponseParser parser = null;
@@ -117,6 +126,7 @@
     /**
      * Test parsing of a response with a (optional) Control element with empty value
      */
+    @Test
     public void testResponseWith1ControlEmptyValue()
     {
         Dsmlv2ResponseParser parser = null;
@@ -147,6 +157,7 @@
     /**
      * Test parsing of a response with 2 (optional) Control elements
      */
+    @Test
     public void testResponseWith2Controls()
     {
         Dsmlv2ResponseParser parser = null;
@@ -181,6 +192,7 @@
     /**
      * Test parsing of a response with 3 (optional) Control elements without value
      */
+    @Test
     public void testResponseWith3ControlsWithoutValue()
     {
         Dsmlv2ResponseParser parser = null;
@@ -215,6 +227,7 @@
     /**
      * Test parsing of a response without Result Code element
      */
+    @Test
     public void testResponseWithoutResultCode()
     {
         testParsingFail( CompareResponseTest.class, "response_without_result_code.xml" );
@@ -224,6 +237,7 @@
     /**
      * Test parsing of a response with Result Code element but a not integer value
      */
+    @Test
     public void testResponseWithResultCodeNotInteger()
     {
         testParsingFail( CompareResponseTest.class, "response_with_result_code_not_integer.xml" );
@@ -233,6 +247,7 @@
     /**
      * Test parsing of a response with Result Code 
      */
+    @Test
     public void testResponseWithResultCode()
     {
         Dsmlv2ResponseParser parser = null;
@@ -261,6 +276,7 @@
     /**
      * Test parsing of a response with Error Message
      */
+    @Test
     public void testResponseWithErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -290,6 +306,7 @@
     /**
      * Test parsing of a response with empty Error Message
      */
+    @Test
     public void testResponseWithEmptyErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -318,6 +335,7 @@
     /**
      * Test parsing of a response with a Referral
      */
+    @Test
     public void testResponseWith1Referral()
     {
         Dsmlv2ResponseParser parser = null;
@@ -339,7 +357,7 @@
 
         LdapResultCodec ldapResult = compareResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 1, referrals.size() );
 
@@ -359,6 +377,7 @@
     /**
      * Test parsing of a response with an empty Referral
      */
+    @Test
     public void testResponseWith1EmptyReferral()
     {
         Dsmlv2ResponseParser parser = null;
@@ -380,7 +399,7 @@
 
         LdapResultCodec ldapResult = compareResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 0, referrals.size() );
     }
@@ -389,6 +408,7 @@
     /**
      * Test parsing of a response with 2 Referral elements
      */
+    @Test
     public void testResponseWith2Referrals()
     {
         Dsmlv2ResponseParser parser = null;
@@ -410,7 +430,7 @@
 
         LdapResultCodec ldapResult = compareResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 2, referrals.size() );
 
@@ -441,6 +461,7 @@
     /**
      * Test parsing of a response with a Referral and an Error Message
      */
+    @Test
     public void testResponseWith1ReferralAndAnErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -462,7 +483,7 @@
 
         LdapResultCodec ldapResult = compareResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 1, referrals.size() );
 
@@ -482,6 +503,7 @@
     /**
      * Test parsing of a response with MatchedDN attribute
      */
+    @Test
     public void testResponseWithMatchedDNAttribute()
     {
         Dsmlv2ResponseParser parser = null;
@@ -510,6 +532,7 @@
     /**
      * Test parsing of a response with wrong matched DN
      */
+    @Test
     public void testResponseWithWrongMatchedDN()
     {
         testParsingFail( CompareResponseTest.class, "response_with_wrong_matchedDN_attribute.xml" );
@@ -519,6 +542,7 @@
     /**
      * Test parsing of a response with wrong Descr attribute
      */
+    @Test
     public void testResponseWithWrongDescr()
     {
         testParsingFail( CompareResponseTest.class, "response_with_wrong_descr.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/delRequest:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest:806622-896441

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=896514&r1=896513&r2=896514&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 Wed Jan  6 16:33:29 2010
@@ -26,6 +26,11 @@
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 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;
 
 
 /**
@@ -39,6 +44,7 @@
     /**
      * Test parsing of a request without the dn attribute
      */
+    @Test
     public void testRequestWithoutDn()
     {
         testParsingFail( DelRequestTest.class, "request_without_dn_attribute.xml" );
@@ -48,6 +54,7 @@
     /**
      * Test parsing of a request with the dn attribute
      */
+    @Test
     public void testRequestWithDn()
     {
         Dsmlv2Parser parser = null;
@@ -73,6 +80,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute
      */
+    @Test
     public void testRequestWithRequestId()
     {
         Dsmlv2Parser parser = null;
@@ -99,6 +107,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute equals to 0
      */
+    @Test
     public void testRequestWithRequestIdEquals0()
     {
         testParsingFail( DelRequestTest.class, "request_with_requestID_equals_0.xml" );
@@ -108,6 +117,7 @@
     /**
      * Test parsing of a request with a (optional) Control element
      */
+    @Test
     public void testRequestWith1Control()
     {
         Dsmlv2Parser parser = null;
@@ -137,6 +147,7 @@
     /**
      * Test parsing of a request with a (optional) Control element
      */
+    @Test
     public void testRequestWith1ControlBase64Value()
     {
         Dsmlv2Parser parser = null;
@@ -167,6 +178,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with empty value
      */
+    @Test
     public void testRequestWith1ControlEmptyValue()
     {
         Dsmlv2Parser parser = null;
@@ -197,6 +209,7 @@
     /**
      * Test parsing of a request with 2 (optional) Control elements
      */
+    @Test
     public void testRequestWith2Controls()
     {
         Dsmlv2Parser parser = null;
@@ -226,6 +239,7 @@
     /**
      * Test parsing of a request with 3 (optional) Control elements without value
      */
+    @Test
     public void testRequestWith3ControlsWithoutValue()
     {
         Dsmlv2Parser parser = null;
@@ -258,6 +272,7 @@
      * 
      * DIRSTUDIO-1
      */
+    @Test
     public void testRequestWithNeededRequestId()
     {
         testParsingFail( DelRequestTest.class, "request_with_needed_requestID.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/delResponse:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse:806622-896441

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=896514&r1=896513&r2=896514&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 Wed Jan  6 16:33:29 2010
@@ -32,6 +32,12 @@
 import org.apache.directory.shared.ldap.codec.del.DelResponseCodec;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 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;
 
 import com.sun.jndi.ldap.LdapURL;
 
@@ -48,6 +54,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute
      */
+    @Test
     public void testResponseWithRequestId()
     {
         Dsmlv2ResponseParser parser = null;
@@ -74,6 +81,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute equals 0
      */
+    @Test
     public void testResponseWithRequestIdEquals0()
     {
         testParsingFail( DelResponseTest.class, "response_with_requestID_equals_0.xml" );
@@ -83,6 +91,7 @@
     /**
      * Test parsing of a response with a (optional) Control element
      */
+    @Test
     public void testResponseWith1Control()
     {
         Dsmlv2ResponseParser parser = null;
@@ -116,6 +125,7 @@
     /**
      * Test parsing of a response with a (optional) Control element with empty value
      */
+    @Test
     public void testResponseWith1ControlemptyValue()
     {
         Dsmlv2ResponseParser parser = null;
@@ -146,6 +156,7 @@
     /**
      * Test parsing of a response with 2 (optional) Control elements
      */
+    @Test
     public void testResponseWith2Controls()
     {
         Dsmlv2ResponseParser parser = null;
@@ -179,6 +190,7 @@
     /**
      * Test parsing of a response with 3 (optional) Control elements without value
      */
+    @Test
     public void testResponseWith3ControlsWithoutValue()
     {
         Dsmlv2ResponseParser parser = null;
@@ -213,6 +225,7 @@
     /**
      * Test parsing of a response without Result Code element
      */
+    @Test
     public void testResponseWithoutResultCode()
     {
         testParsingFail( DelResponseTest.class, "response_without_result_code.xml" );
@@ -222,6 +235,7 @@
     /**
      * Test parsing of a response with Result Code element but a not integer value
      */
+    @Test
     public void testResponseWithResultCodeNotInteger()
     {
         testParsingFail( DelResponseTest.class, "response_with_result_code_not_integer.xml" );
@@ -231,6 +245,7 @@
     /**
      * Test parsing of a response with Result Code 
      */
+    @Test
     public void testResponseWithResultCode()
     {
         Dsmlv2ResponseParser parser = null;
@@ -259,6 +274,7 @@
     /**
      * Test parsing of a response with Error Message
      */
+    @Test
     public void testResponseWithErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -288,6 +304,7 @@
     /**
      * Test parsing of a response with empty Error Message
      */
+    @Test
     public void testResponseWithEmptyErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -316,6 +333,7 @@
     /**
      * Test parsing of a response with a Referral
      */
+    @Test
     public void testResponseWith1Referral()
     {
         Dsmlv2ResponseParser parser = null;
@@ -336,7 +354,7 @@
 
         LdapResultCodec ldapResult = delResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 1, referrals.size() );
 
@@ -356,6 +374,7 @@
     /**
      * Test parsing of a response with an empty Referral
      */
+    @Test
     public void testResponseWith1EmptyReferral()
     {
         Dsmlv2ResponseParser parser = null;
@@ -377,7 +396,7 @@
 
         LdapResultCodec ldapResult = delResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 0, referrals.size() );
     }
@@ -386,6 +405,7 @@
     /**
      * Test parsing of a response with 2 Referral elements
      */
+    @Test
     public void testResponseWith2Referrals()
     {
         Dsmlv2ResponseParser parser = null;
@@ -407,7 +427,7 @@
 
         LdapResultCodec ldapResult = delResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 2, referrals.size() );
 
@@ -438,6 +458,7 @@
     /**
      * Test parsing of a response with a Referral and an Error Message
      */
+    @Test
     public void testResponseWith1ReferralAndAnErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -459,7 +480,7 @@
 
         LdapResultCodec ldapResult = delResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 1, referrals.size() );
 
@@ -479,6 +500,7 @@
     /**
      * Test parsing of a response with MatchedDN attribute
      */
+    @Test
     public void testResponseWithMatchedDNAttribute()
     {
         Dsmlv2ResponseParser parser = null;
@@ -507,6 +529,7 @@
     /**
      * Test parsing of a response with wrong matched DN
      */
+    @Test
     public void testResponseWithWrongMatchedDN()
     {
         testParsingFail( DelResponseTest.class, "response_with_wrong_matchedDN_attribute.xml" );
@@ -516,6 +539,7 @@
     /**
      * Test parsing of a response with wrong Descr attribute
      */
+    @Test
     public void testResponseWithWrongDescr()
     {
         testParsingFail( DelResponseTest.class, "response_with_wrong_descr.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/errorResponse:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse:806622-896441

Modified: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/ErrorResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/ErrorResponseTest.java?rev=896514&r1=896513&r2=896514&view=diff
==============================================================================
--- directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/ErrorResponseTest.java (original)
+++ directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/ErrorResponseTest.java Wed Jan  6 16:33:29 2010
@@ -25,7 +25,10 @@
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.dsmlv2.reponse.ErrorResponse;
 import org.apache.directory.shared.dsmlv2.reponse.ErrorResponse.ErrorResponseType;
-
+import org.junit.Test;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.fail;
+import static org.junit.Assert.assertNull;
 
 /**
  * Tests for the Error Response parsing
@@ -39,6 +42,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute
      */
+    @Test
     public void testResponseWithRequestId()
     {
         Dsmlv2ResponseParser parser = null;
@@ -65,6 +69,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute equals 0
      */
+    @Test
     public void testResponseWithRequestIdEquals0()
     {
         testParsingFail( ErrorResponseTest.class, "response_with_requestID_equals_0.xml" );
@@ -74,6 +79,7 @@
     /**
      * Test parsing of a response without Type attribute
      */
+    @Test
     public void testResponseWithoutType()
     {
         testParsingFail( ErrorResponseTest.class, "response_without_type.xml" );
@@ -83,6 +89,7 @@
     /**
      * Test parsing of a response with type == notAttempted
      */
+    @Test
     public void testResponseWithTypeNotAttempted()
     {
         Dsmlv2ResponseParser parser = null;
@@ -109,6 +116,7 @@
     /**
      * Test parsing of a response with type == couldNotConnect
      */
+    @Test
     public void testResponseWithTypeCouldNotConnect()
     {
         Dsmlv2ResponseParser parser = null;
@@ -135,6 +143,7 @@
     /**
      * Test parsing of a response with type == connectionClosed
      */
+    @Test
     public void testResponseWithTypeConnectionClosed()
     {
         Dsmlv2ResponseParser parser = null;
@@ -161,6 +170,7 @@
     /**
      * Test parsing of a response with type == malformedRequest
      */
+    @Test
     public void testResponseWithTypeMalformedRequest()
     {
         Dsmlv2ResponseParser parser = null;
@@ -187,6 +197,7 @@
     /**
      * Test parsing of a response with type == gatewayInternalError
      */
+    @Test
     public void testResponseWithTypeGatewayInternalError()
     {
         Dsmlv2ResponseParser parser = null;
@@ -213,6 +224,7 @@
     /**
      * Test parsing of a response with type == authenticationFailed
      */
+    @Test
     public void testResponseWithTypeAuthenticationFailed()
     {
         Dsmlv2ResponseParser parser = null;
@@ -239,6 +251,7 @@
     /**
      * Test parsing of a response with type == unresolvableURI
      */
+    @Test
     public void testResponseWithTypeUnresolvableURI()
     {
         Dsmlv2ResponseParser parser = null;
@@ -265,6 +278,7 @@
     /**
      * Test parsing of a response with type == other
      */
+    @Test
     public void testResponseWithTypeOther()
     {
         Dsmlv2ResponseParser parser = null;
@@ -291,6 +305,7 @@
     /**
      * Test parsing of a response with type in error
      */
+    @Test
     public void testResponseWithTypeError()
     {
         testParsingFail( ErrorResponseTest.class, "response_with_type_inError.xml" );
@@ -300,6 +315,7 @@
     /**
      * Test parsing of a response with Message
      */
+    @Test
     public void testResponseWithMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -325,6 +341,7 @@
     /**
      * Test parsing of a response with empty Message
      */
+    @Test
     public void testResponseWithEmptyMessage()
     {
         Dsmlv2ResponseParser parser = null;

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/extendedRequest:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedRequest:806622-896441

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=896514&r1=896513&r2=896514&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 Wed Jan  6 16:33:29 2010
@@ -26,7 +26,12 @@
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 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
@@ -39,6 +44,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute
      */
+    @Test
     public void testRequestWithRequestId()
     {
         Dsmlv2Parser parser = null;
@@ -65,6 +71,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute equals to 0
      */
+    @Test
     public void testRequestWithRequestIdEquals0()
     {
         testParsingFail( ExtendedRequestTest.class, "request_with_requestID_equals_0.xml" );
@@ -74,6 +81,7 @@
     /**
      * Test parsing of a request with a (optional) Control element
      */
+    @Test
     public void testRequestWith1Control()
     {
         Dsmlv2Parser parser = null;
@@ -104,6 +112,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with Base64 value
      */
+    @Test
     public void testRequestWith1ControlBase64Value()
     {
         Dsmlv2Parser parser = null;
@@ -134,6 +143,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with empty value
      */
+    @Test
     public void testRequestWith1ControlEmptyValue()
     {
         Dsmlv2Parser parser = null;
@@ -164,6 +174,7 @@
     /**
      * Test parsing of a request with 2 (optional) Control elements
      */
+    @Test
     public void testRequestWith2Controls()
     {
         Dsmlv2Parser parser = null;
@@ -194,6 +205,7 @@
     /**
      * Test parsing of a request with 3 (optional) Control elements without value
      */
+    @Test
     public void testRequestWith3ControlsWithoutValue()
     {
         Dsmlv2Parser parser = null;
@@ -224,6 +236,7 @@
     /**
      * Test parsing of a request with a RequestValue element
      */
+    @Test
     public void testRequestWithRequestValue()
     {
         Dsmlv2Parser parser = null;
@@ -250,6 +263,7 @@
     /**
      * Test parsing of a request with a RequestValue element with Base64 value
      */
+    @Test
     public void testRequestWithBase64RequestValue()
     {
         Dsmlv2Parser parser = null;
@@ -276,6 +290,7 @@
     /**
      * Test parsing of a request with 2 requestValue Elements
      */
+    @Test
     public void testRequestWith2RequestValue()
     {
         testParsingFail( ExtendedRequestTest.class, "request_with_2_requestValue.xml" );
@@ -285,6 +300,7 @@
     /**
      * Test parsing of a request with 2 requestName Elements
      */
+    @Test
     public void testRequestWith2RequestName()
     {
         testParsingFail( ExtendedRequestTest.class, "request_with_2_requestName.xml" );
@@ -294,6 +310,7 @@
     /**
      * Test parsing of a request with an empty requestName
      */
+    @Test
     public void testRequestWithEmptyRequestName()
     {
         testParsingFail( ExtendedRequestTest.class, "request_with_empty_requestName.xml" );
@@ -303,6 +320,7 @@
     /**
      * Test parsing of a request with an empty RequestValue
      */
+    @Test
     public void testRequestWithEmptyRequestValue()
     {
         Dsmlv2Parser parser = null;
@@ -330,6 +348,7 @@
      * 
      * DIRSTUDIO-1
      */
+    @Test
     public void testRequestWithNeededRequestId()
     {
         testParsingFail( ExtendedRequestTest.class, "request_with_needed_requestID.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/extendedResponse:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/extendedResponse:806622-896441

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=896514&r1=896513&r2=896514&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 Wed Jan  6 16:33:29 2010
@@ -34,6 +34,12 @@
 import org.apache.directory.shared.ldap.codec.extended.ExtendedResponseCodec;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 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;
 
 import com.sun.jndi.ldap.LdapURL;
 
@@ -50,6 +56,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute
      */
+    @Test
     public void testResponseWithRequestId()
     {
         Dsmlv2ResponseParser parser = null;
@@ -76,6 +83,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute equals 0
      */
+    @Test
     public void testResponseWithRequestIdEquals0()
     {
         testParsingFail( ExtendedResponseTest.class, "response_with_requestID_equals_0.xml" );
@@ -85,6 +93,7 @@
     /**
      * Test parsing of a response with a (optional) Control element
      */
+    @Test
     public void testResponseWith1Control()
     {
         Dsmlv2ResponseParser parser = null;
@@ -119,6 +128,7 @@
     /**
      * Test parsing of a response with a (optional) Control element with empty value
      */
+    @Test
     public void testResponseWith1ControlEmptyValue()
     {
         Dsmlv2ResponseParser parser = null;
@@ -149,6 +159,7 @@
     /**
      * Test parsing of a response with 2 (optional) Control elements
      */
+    @Test
     public void testResponseWith2Controls()
     {
         Dsmlv2ResponseParser parser = null;
@@ -183,6 +194,7 @@
     /**
      * Test parsing of a response with 3 (optional) Control elements without value
      */
+    @Test
     public void testResponseWith3ControlsWithoutValue()
     {
         Dsmlv2ResponseParser parser = null;
@@ -217,6 +229,7 @@
     /**
      * Test parsing of a response without Result Code element
      */
+    @Test
     public void testResponseWithoutResultCode()
     {
         testParsingFail( ExtendedResponseTest.class, "response_without_result_code.xml" );
@@ -226,6 +239,7 @@
     /**
      * Test parsing of a response with Result Code element but a not integer value
      */
+    @Test
     public void testResponseWithResultCodeNotInteger()
     {
         testParsingFail( ExtendedResponseTest.class, "response_with_result_code_not_integer.xml" );
@@ -235,6 +249,7 @@
     /**
      * Test parsing of a response with Result Code 
      */
+    @Test
     public void testResponseWithResultCode()
     {
         Dsmlv2ResponseParser parser = null;
@@ -263,6 +278,7 @@
     /**
      * Test parsing of a response with Error Message
      */
+    @Test
     public void testResponseWithErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -292,6 +308,7 @@
     /**
      * Test parsing of a response with empty Error Message
      */
+    @Test
     public void testResponseWithEmptyErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -320,6 +337,7 @@
     /**
      * Test parsing of a response with a Referral
      */
+    @Test
     public void testResponseWith1Referral()
     {
         Dsmlv2ResponseParser parser = null;
@@ -341,7 +359,7 @@
 
         LdapResultCodec ldapResult = extendedResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 1, referrals.size() );
 
@@ -361,6 +379,7 @@
     /**
      * Test parsing of a response with a empty Referral
      */
+    @Test
     public void testResponseWith1EmptyReferral()
     {
         Dsmlv2ResponseParser parser = null;
@@ -382,7 +401,7 @@
 
         LdapResultCodec ldapResult = extendedResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 0, referrals.size() );
     }
@@ -391,6 +410,7 @@
     /**
      * Test parsing of a response with 2 Referral elements
      */
+    @Test
     public void testResponseWith2Referrals()
     {
         Dsmlv2ResponseParser parser = null;
@@ -412,7 +432,7 @@
 
         LdapResultCodec ldapResult = extendedResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 2, referrals.size() );
 
@@ -443,6 +463,7 @@
     /**
      * Test parsing of a response with a Referral and an Error Message
      */
+    @Test
     public void testResponseWith1ReferralAndAnErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -464,7 +485,7 @@
 
         LdapResultCodec ldapResult = extendedResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 1, referrals.size() );
 
@@ -484,6 +505,7 @@
     /**
      * Test parsing of a response with MatchedDN attribute
      */
+    @Test
     public void testResponseWithMatchedDNAttribute()
     {
         Dsmlv2ResponseParser parser = null;
@@ -512,6 +534,7 @@
     /**
      * Test parsing of a response with wrong matched DN
      */
+    @Test
     public void testResponseWithWrongMatchedDN()
     {
         testParsingFail( ExtendedResponseTest.class, "response_with_wrong_matchedDN_attribute.xml" );
@@ -521,6 +544,7 @@
     /**
      * Test parsing of a response with Response Name
      */
+    @Test
     public void testResponseWithResponseName()
     {
         Dsmlv2ResponseParser parser = null;
@@ -554,6 +578,7 @@
     /**
      * Test parsing of a response with empty Response Name
      */
+    @Test
     public void testResponseWithEmptyResponseName()
     {
         Dsmlv2ResponseParser parser = null;
@@ -580,6 +605,7 @@
     /**
      * Test parsing of a response with wrong Response Name
      */
+    @Test
     public void testResponseWithWrongResponseName()
     {
         testParsingFail( ExtendedResponseTest.class, "response_with_wrong_responseName.xml" );
@@ -589,6 +615,7 @@
     /**
      * Test parsing of a response with Response
      */
+    @Test
     public void testResponseWithResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -615,6 +642,7 @@
     /**
      * Test parsing of a response with Base64 Response
      */
+    @Test
     public void testResponseWithBase64Response()
     {
         Dsmlv2ResponseParser parser = null;
@@ -641,6 +669,7 @@
     /**
      * Test parsing of a response with empty Response
      */
+    @Test
     public void testResponseWithEmptyResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -667,6 +696,7 @@
     /**
      * Test parsing of a response with Response Name and Response
      */
+    @Test
     public void testResponseWithResponseNameAndResponse()
     {
         Dsmlv2ResponseParser parser = null;
@@ -702,6 +732,7 @@
     /**
      * Test parsing of a response with wrong Descr attribute
      */
+    @Test
     public void testResponseWithWrongDescr()
     {
         testParsingFail( ExtendedResponseTest.class, "response_with_wrong_descr.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/modDNRequest:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest:806622-896441

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=896514&r1=896513&r2=896514&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 Wed Jan  6 16:33:29 2010
@@ -26,7 +26,11 @@
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 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
@@ -39,6 +43,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute
      */
+    @Test
     public void testRequestWithRequestId()
     {
         Dsmlv2Parser parser = null;
@@ -65,6 +70,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute equals to 0
      */
+    @Test
     public void testRequestWithRequestIdEquals0()
     {
         testParsingFail( ModifyDNRequestTest.class, "request_with_requestID_equals_0.xml" );
@@ -74,6 +80,7 @@
     /**
      * Test parsing of a request with a (optional) Control element
      */
+    @Test
     public void testRequestWith1Control()
     {
         Dsmlv2Parser parser = null;
@@ -104,6 +111,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with Base64 Value
      */
+    @Test
     public void testRequestWith1ControlBase64Value()
     {
         Dsmlv2Parser parser = null;
@@ -134,6 +142,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with empty value
      */
+    @Test
     public void testRequestWith1ControlEmptyValue()
     {
         Dsmlv2Parser parser = null;
@@ -164,6 +173,7 @@
     /**
      * Test parsing of a request with 2 (optional) Control elements
      */
+    @Test
     public void testRequestWith2Controls()
     {
         Dsmlv2Parser parser = null;
@@ -194,6 +204,7 @@
     /**
      * Test parsing of a request with 3 (optional) Control elements without value
      */
+    @Test
     public void testRequestWith3ControlsWithoutValue()
     {
         Dsmlv2Parser parser = null;
@@ -224,6 +235,7 @@
     /**
      * Test parsing of a request without dn attribute
      */
+    @Test
     public void testRequestWithoutDnAttribute()
     {
         testParsingFail( ModifyDNRequestTest.class, "request_without_dn_attribute.xml" );
@@ -233,6 +245,7 @@
     /**
      * Test parsing of a request without newrdn attribute
      */
+    @Test
     public void testRequestWithoutNewRdnAttribute()
     {
         testParsingFail( ModifyDNRequestTest.class, "request_without_newrdn_attribute.xml" );
@@ -242,6 +255,7 @@
     /**
      * Test parsing of a request without dn and newrdn attributes
      */
+    @Test
     public void testRequestWithDnAndNewRdnAttributes()
     {
         Dsmlv2Parser parser = null;
@@ -270,6 +284,7 @@
     /**
      * Test parsing of a request with deleteoldrdn to true
      */
+    @Test
     public void testRequestWithDeleteOldRdnTrue()
     {
         Dsmlv2Parser parser = null;
@@ -296,6 +311,7 @@
     /**
      * Test parsing of a request with deleteoldrdn to 1
      */
+    @Test
     public void testRequestWithDeleteOldRdn1()
     {
         Dsmlv2Parser parser = null;
@@ -322,6 +338,7 @@
     /**
      * Test parsing of a request with deleteoldrdn to false
      */
+    @Test
     public void testRequestWithDeleteOldRdnFalse()
     {
         Dsmlv2Parser parser = null;
@@ -348,6 +365,7 @@
     /**
      * Test parsing of a request with deleteoldrdn to 0
      */
+    @Test
     public void testRequestWithDeleteOldRdn0()
     {
         Dsmlv2Parser parser = null;
@@ -374,6 +392,7 @@
     /**
      * Test parsing of a request with deleteoldrdn to an error value
      */
+    @Test
     public void testRequestWithDeleteOldRdnError()
     {
         testParsingFail( ModifyDNRequestTest.class, "request_with_deleteoldrdn_error.xml" );
@@ -383,6 +402,7 @@
     /**
      * Test parsing of a request with newSuperior attribute
      */
+    @Test
     public void testRequestWithNewSuperior()
     {
         Dsmlv2Parser parser = null;
@@ -411,6 +431,7 @@
      * 
      * DIRSTUDIO-1
      */
+    @Test
     public void testRequestWithNeededRequestId()
     {
         testParsingFail( ModifyDNRequestTest.class, "request_with_needed_requestID.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/modDNResponse:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse:806622-896441

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=896514&r1=896513&r2=896514&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 Wed Jan  6 16:33:29 2010
@@ -32,6 +32,12 @@
 import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNResponseCodec;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 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;
 
 import com.sun.jndi.ldap.LdapURL;
 
@@ -48,6 +54,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute
      */
+    @Test
     public void testResponseWithRequestId()
     {
         Dsmlv2ResponseParser parser = null;
@@ -74,6 +81,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute equals 0
      */
+    @Test
     public void testResponseWithRequestIdEquals0()
     {
         testParsingFail( ModifyDNResponseTest.class, "response_with_requestID_equals_0.xml" );
@@ -83,6 +91,7 @@
     /**
      * Test parsing of a response with a (optional) Control element
      */
+    @Test
     public void testResponseWith1Control()
     {
         Dsmlv2ResponseParser parser = null;
@@ -117,6 +126,7 @@
     /**
      * Test parsing of a response with a (optional) Control element with empty value
      */
+    @Test
     public void testResponseWith1ControlEmptyValue()
     {
         Dsmlv2ResponseParser parser = null;
@@ -147,6 +157,7 @@
     /**
      * Test parsing of a response with 2 (optional) Control elements
      */
+    @Test
     public void testResponseWith2Controls()
     {
         Dsmlv2ResponseParser parser = null;
@@ -181,6 +192,7 @@
     /**
      * Test parsing of a response with 3 (optional) Control elements without value
      */
+    @Test
     public void testResponseWith3ControlsWithoutValue()
     {
         Dsmlv2ResponseParser parser = null;
@@ -215,6 +227,7 @@
     /**
      * Test parsing of a response without Result Code element
      */
+    @Test
     public void testResponseWithoutResultCode()
     {
         testParsingFail( ModifyDNResponseTest.class, "response_without_result_code.xml" );
@@ -224,6 +237,7 @@
     /**
      * Test parsing of a response with Result Code element but a not integer value
      */
+    @Test
     public void testResponseWithResultCodeNotInteger()
     {
         testParsingFail( ModifyDNResponseTest.class, "response_with_result_code_not_integer.xml" );
@@ -233,6 +247,7 @@
     /**
      * Test parsing of a response with Result Code 
      */
+    @Test
     public void testResponseWithResultCode()
     {
         Dsmlv2ResponseParser parser = null;
@@ -261,6 +276,7 @@
     /**
      * Test parsing of a response with Error Message
      */
+    @Test
     public void testResponseWithErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -290,6 +306,7 @@
     /**
      * Test parsing of a response with empty Error Message
      */
+    @Test
     public void testResponseWithEmptyErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -318,6 +335,7 @@
     /**
      * Test parsing of a response with a Referral
      */
+    @Test
     public void testResponseWith1Referral()
     {
         Dsmlv2ResponseParser parser = null;
@@ -339,7 +357,7 @@
 
         LdapResultCodec ldapResult = modifyDNResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 1, referrals.size() );
 
@@ -359,6 +377,7 @@
     /**
      * Test parsing of a response with an empty Referral
      */
+    @Test
     public void testResponseWith1EmptyReferral()
     {
         Dsmlv2ResponseParser parser = null;
@@ -380,7 +399,7 @@
 
         LdapResultCodec ldapResult = modifyDNResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 0, referrals.size() );
     }
@@ -389,6 +408,7 @@
     /**
      * Test parsing of a response with 2 Referral elements
      */
+    @Test
     public void testResponseWith2Referrals()
     {
         Dsmlv2ResponseParser parser = null;
@@ -410,7 +430,7 @@
 
         LdapResultCodec ldapResult = modifyDNResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 2, referrals.size() );
 
@@ -441,6 +461,7 @@
     /**
      * Test parsing of a response with a Referral and an Error Message
      */
+    @Test
     public void testResponseWith1ReferralAndAnErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -462,7 +483,7 @@
 
         LdapResultCodec ldapResult = modifyDNResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 1, referrals.size() );
 
@@ -482,6 +503,7 @@
     /**
      * Test parsing of a response with MatchedDN attribute
      */
+    @Test
     public void testResponseWithMatchedDNAttribute()
     {
         Dsmlv2ResponseParser parser = null;
@@ -510,6 +532,7 @@
     /**
      * Test parsing of a response with wrong matched DN
      */
+    @Test
     public void testResponseWithWrongMatchedDN()
     {
         testParsingFail( ModifyDNResponseTest.class, "response_with_wrong_matchedDN_attribute.xml" );
@@ -519,6 +542,7 @@
     /**
      * Test parsing of a response with wrong Descr attribute
      */
+    @Test
     public void testResponseWithWrongDescr()
     {
         testParsingFail( ModifyDNResponseTest.class, "response_with_wrong_descr.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/modifyRequest:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest:806622-896441

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=896514&r1=896513&r2=896514&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 Wed Jan  6 16:33:29 2010
@@ -34,7 +34,11 @@
 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
@@ -47,6 +51,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute
      */
+    @Test
     public void testRequestWithRequestId()
     {
         Dsmlv2Parser parser = null;
@@ -73,6 +78,7 @@
     /**
      * Test parsing of a request with the (optional) requestID attribute equals to 0
      */
+    @Test
     public void testRequestWithRequestIdEquals0()
     {
         testParsingFail( ModifyRequestTest.class, "request_with_requestID_equals_0.xml" );
@@ -82,6 +88,7 @@
     /**
      * Test parsing of a request with a (optional) Control element
      */
+    @Test
     public void testRequestWith1Control()
     {
         Dsmlv2Parser parser = null;
@@ -111,6 +118,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with Base64 Value
      */
+    @Test
     public void testRequestWith1ControlBase64Value()
     {
         Dsmlv2Parser parser = null;
@@ -141,6 +149,7 @@
     /**
      * Test parsing of a request with a (optional) Control element with empty value
      */
+    @Test
     public void testRequestWith1ControlEmptyValue()
     {
         Dsmlv2Parser parser = null;
@@ -171,6 +180,7 @@
     /**
      * Test parsing of a request with 2 (optional) Control elements
      */
+    @Test
     public void testRequestWith2Controls()
     {
         Dsmlv2Parser parser = null;
@@ -201,6 +211,7 @@
     /**
      * Test parsing of a request with 3 (optional) Control elements without value
      */
+    @Test
     public void testRequestWith3ControlsWithoutValue()
     {
         Dsmlv2Parser parser = null;
@@ -231,6 +242,7 @@
     /**
      * Test parsing of a request without dn attribute
      */
+    @Test
     public void testRequestWithoutDnAttribute()
     {
         testParsingFail( ModifyRequestTest.class, "request_without_dn_attribute.xml" );
@@ -241,6 +253,7 @@
      * Test parsing of a request with a Modification element
      * @throws NamingException 
      */
+    @Test
     public void testRequestWith1Modification() throws NamingException
     {
         Dsmlv2Parser parser = null;
@@ -281,6 +294,7 @@
      * @throws NamingException 
      * @throws UnsupportedEncodingException 
      */
+    @Test
     public void testRequestWith1ModificationBase64Value() throws NamingException, UnsupportedEncodingException
     {
         Dsmlv2Parser parser = null;
@@ -325,6 +339,7 @@
      * Test parsing of a request with 2 Modification elements
      * @throws NamingException 
      */
+    @Test
     public void testRequestWith2Modifications() throws NamingException
     {
         Dsmlv2Parser parser = null;
@@ -363,6 +378,7 @@
     /**
      * Test parsing of a request without name attribute to the Modification element
      */
+    @Test
     public void testRequestWithoutNameAttribute()
     {
         testParsingFail( ModifyRequestTest.class, "request_without_name_attribute.xml" );
@@ -372,6 +388,7 @@
     /**
      * Test parsing of a request without operation attribute to the Modification element
      */
+    @Test
     public void testRequestWithoutOperationAttribute()
     {
         testParsingFail( ModifyRequestTest.class, "request_without_operation_attribute.xml" );
@@ -382,6 +399,7 @@
      * Test parsing of a request with operation attribute to Add value
      * @throws NamingException 
      */
+    @Test
     public void testRequestWithOperationAdd() throws NamingException
     {
         Dsmlv2Parser parser = null;
@@ -409,6 +427,7 @@
      * Test parsing of a request with operation attribute to Delete value
      * @throws NamingException 
      */
+    @Test
     public void testRequestWithOperationDelete() throws NamingException
     {
         Dsmlv2Parser parser = null;
@@ -436,6 +455,7 @@
      * Test parsing of a request with operation attribute to Replace value
      * @throws NamingException 
      */
+    @Test
     public void testRequestWithOperationReplace() throws NamingException
     {
         Dsmlv2Parser parser = null;
@@ -462,6 +482,7 @@
     /**
      * Test parsing of a request without operation attribute to the Modification element
      */
+    @Test
     public void testRequestWithOperationError()
     {
         testParsingFail( ModifyRequestTest.class, "request_with_operation_error.xml" );
@@ -472,6 +493,7 @@
      * Test parsing of a request with a Modification element without Value element
      * @throws NamingException 
      */
+    @Test
     public void testRequestWithModificationWithoutValue() throws NamingException
     {
         Dsmlv2Parser parser = null;
@@ -509,6 +531,7 @@
      * Test parsing of a request with a Modification element
      * @throws NamingException 
      */
+    @Test
     public void testRequestWithModificationWith2Values() throws NamingException
     {
         Dsmlv2Parser parser = null;
@@ -550,6 +573,7 @@
      * Test parsing of a request with a Modification element with an empty value
      * @throws NamingException 
      */
+    @Test
     public void testRequestWithModificationWithEmptyValue() throws NamingException
     {
         Dsmlv2Parser parser = null;
@@ -591,6 +615,7 @@
      * 
      * DIRSTUDIO-1
      */
+    @Test
     public void testRequestWithNeededRequestId()
     {
         testParsingFail( ModifyRequestTest.class, "request_with_needed_requestID.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/modifyResponse:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse:806622-896441

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=896514&r1=896513&r2=896514&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 Wed Jan  6 16:33:29 2010
@@ -32,6 +32,12 @@
 import org.apache.directory.shared.ldap.codec.modify.ModifyResponseCodec;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 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;
 
 import com.sun.jndi.ldap.LdapURL;
 
@@ -48,6 +54,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute
      */
+    @Test
     public void testResponseWithRequestId()
     {
         Dsmlv2ResponseParser parser = null;
@@ -74,6 +81,7 @@
     /**
      * Test parsing of a Response with the (optional) requestID attribute equals 0
      */
+    @Test
     public void testResponseWithRequestIdEquals0()
     {
         testParsingFail( ModifyResponseTest.class, "response_with_requestID_equals_0.xml" );
@@ -83,6 +91,7 @@
     /**
      * Test parsing of a response with a (optional) Control element
      */
+    @Test
     public void testResponseWith1Control()
     {
         Dsmlv2ResponseParser parser = null;
@@ -117,6 +126,7 @@
     /**
      * Test parsing of a response with a (optional) Control element with empty value
      */
+    @Test
     public void testResponseWith1ControlEmptyValue()
     {
         Dsmlv2ResponseParser parser = null;
@@ -147,6 +157,7 @@
     /**
      * Test parsing of a response with 2 (optional) Control elements
      */
+    @Test
     public void testResponseWith2Controls()
     {
         Dsmlv2ResponseParser parser = null;
@@ -181,6 +192,7 @@
     /**
      * Test parsing of a response with 3 (optional) Control elements without value
      */
+    @Test
     public void testResponseWith3ControlsWithoutValue()
     {
         Dsmlv2ResponseParser parser = null;
@@ -215,6 +227,7 @@
     /**
      * Test parsing of a response without Result Code element
      */
+    @Test
     public void testResponseWithoutResultCode()
     {
         testParsingFail( ModifyResponseTest.class, "response_without_result_code.xml" );
@@ -224,6 +237,7 @@
     /**
      * Test parsing of a response with Result Code element but a not integer value
      */
+    @Test
     public void testResponseWithResultCodeNotInteger()
     {
         testParsingFail( ModifyResponseTest.class, "response_with_result_code_not_integer.xml" );
@@ -233,6 +247,7 @@
     /**
      * Test parsing of a response with Result Code 
      */
+    @Test
     public void testResponseWithResultCode()
     {
         Dsmlv2ResponseParser parser = null;
@@ -261,6 +276,7 @@
     /**
      * Test parsing of a response with Error Message
      */
+    @Test
     public void testResponseWithErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -290,6 +306,7 @@
     /**
      * Test parsing of a response with empty Error Message
      */
+    @Test
     public void testResponseWithEmptyErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -318,6 +335,7 @@
     /**
      * Test parsing of a response with a Referral
      */
+    @Test
     public void testResponseWith1Referral()
     {
         Dsmlv2ResponseParser parser = null;
@@ -339,7 +357,7 @@
 
         LdapResultCodec ldapResult = modifyResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 1, referrals.size() );
 
@@ -359,6 +377,7 @@
     /**
      * Test parsing of a response with an empty Referral
      */
+    @Test
     public void testResponseWith1EmptyReferral()
     {
         Dsmlv2ResponseParser parser = null;
@@ -380,7 +399,7 @@
 
         LdapResultCodec ldapResult = modifyResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 0, referrals.size() );
     }
@@ -389,6 +408,7 @@
     /**
      * Test parsing of a response with 2 Referral elements
      */
+    @Test
     public void testResponseWith2Referrals()
     {
         Dsmlv2ResponseParser parser = null;
@@ -410,7 +430,7 @@
 
         LdapResultCodec ldapResult = modifyResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 2, referrals.size() );
 
@@ -441,6 +461,7 @@
     /**
      * Test parsing of a response with a Referral and an Error Message
      */
+    @Test
     public void testResponseWith1ReferralAndAnErrorMessage()
     {
         Dsmlv2ResponseParser parser = null;
@@ -462,7 +483,7 @@
 
         LdapResultCodec ldapResult = modifyResponse.getLdapResult();
 
-        List referrals = ldapResult.getReferrals();
+        List<org.apache.directory.shared.ldap.util.LdapURL> referrals = ldapResult.getReferrals();
 
         assertEquals( 1, referrals.size() );
 
@@ -482,6 +503,7 @@
     /**
      * Test parsing of a response with MatchedDN attribute
      */
+    @Test
     public void testResponseWithMatchedDNAttribute()
     {
         Dsmlv2ResponseParser parser = null;
@@ -510,6 +532,7 @@
     /**
      * Test parsing of a response with wrong matched DN
      */
+    @Test
     public void testResponseWithWrongMatchedDN()
     {
         testParsingFail( ModifyResponseTest.class, "response_with_wrong_matchedDN_attribute.xml" );
@@ -519,6 +542,7 @@
     /**
      * Test parsing of a response with wrong Descr attribute
      */
+    @Test
     public void testResponseWithWrongDescr()
     {
         testParsingFail( ModifyResponseTest.class, "response_with_wrong_descr.xml" );

Propchange: directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan  6 16:33:29 2010
@@ -1 +1,2 @@
 /directory/shared/branches/shared-replication/dsml-parser/src/test/java/org/apache/directory/studio/dsmlv2/searchRequest:749791-764113
+/directory/shared/branches/shared-schema/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest:806622-896441



Mime
View raw message