Return-Path: X-Original-To: apmail-directory-commits-archive@www.apache.org Delivered-To: apmail-directory-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 86DB498E3 for ; Tue, 28 Feb 2012 15:23:36 +0000 (UTC) Received: (qmail 60152 invoked by uid 500); 28 Feb 2012 15:23:36 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 60117 invoked by uid 500); 28 Feb 2012 15:23:36 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 60110 invoked by uid 99); 28 Feb 2012 15:23:36 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Feb 2012 15:23:36 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 28 Feb 2012 15:23:31 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 9D6C4238889B for ; Tue, 28 Feb 2012 15:23:11 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1294688 [1/2] - in /directory/shared/trunk: dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/ dsml/parser/src/test/java/org/apache/directory/shared/ds... Date: Tue, 28 Feb 2012 15:23:08 -0000 To: commits@directory.apache.org From: elecharny@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20120228152311.9D6C4238889B@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: elecharny Date: Tue Feb 28 15:23:06 2012 New Revision: 1294688 URL: http://svn.apache.org/viewvc?rev=1294688&view=rev Log: Fix for DIRSHARED-53 = we allow now every requestID equal or above 0. Added: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_0_abandonID_attribute.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/request_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/response_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/request_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/response_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/request_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/response_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/request_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/response_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/request_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/response_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/response_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/request_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/response_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/request_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/response_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/request_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/response_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/response_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/response_with_requestID_below_0.xml - copied, changed from r1294634, directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/response_with_requestID_equals_0.xml Removed: directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/abandonRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/addResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/authResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/batchResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/compareResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/delResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/errorResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/extendedResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modDNResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/modifyResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchRequest/request_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/response_with_requestID_equals_0.xml directory/shared/trunk/dsml/parser/src/test/resources/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/response_with_requestID_equals_0.xml Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/abandonRequest/AbandonRequestTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addRequest/AddRequestTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/addResponse/AddResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authRequest/AuthRequestTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/authResponse/AuthResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareRequest/CompareRequestTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/compareResponse/CompareResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delRequest/DelRequestTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/delResponse/DelResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/errorResponse/ErrorResponseTest.java 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 directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNRequest/ModifyDNRequestTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modDNResponse/ModifyDNResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyRequest/ModifyRequestTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/modifyResponse/ModifyResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchRequest/SearchRequestTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultEntry/SearchResultEntryTest.java directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultReference/SearchResultReferenceTest.java directory/shared/trunk/i18n/src/main/resources/org/apache/directory/shared/i18n/errors.properties Modified: directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java?rev=1294688&r1=1294687&r2=1294688&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java (original) +++ directory/shared/trunk/dsml/parser/src/main/java/org/apache/directory/shared/dsmlv2/ParserUtils.java Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2; @@ -89,9 +89,9 @@ public final class ParserUtils /** * Returns the value of the attribute 'type' of the "XMLSchema-instance' namespace if it exists * - * @param xpp + * @param xpp * the XPP parser to use - * @return + * @return * the value of the attribute 'type' of the "XMLSchema-instance' namespace if it exists */ public static String getXsiTypeAttributeValue( XmlPullParser xpp ) @@ -117,9 +117,9 @@ public final class ParserUtils * * @param parser * the XPP parser to use - * @param attrValue + * @param attrValue * the attribute value - * @return + * @return * true if the value of the current tag is Base64BinaryEncoded, false if not */ public static boolean isBase64BinaryValue( XmlPullParser parser, String attrValue ) @@ -139,9 +139,9 @@ public final class ParserUtils /** * Indicates if the value needs to be encoded as Base64 * - * @param value + * @param value * the value to check - * @return + * @return * true if the value needs to be encoded as Base64 */ public static boolean needsBase64Encoding( Object value ) @@ -161,10 +161,10 @@ public final class ParserUtils /** * Encodes the value as a Base64 String * - * @param value + * @param value * the value to encode - * @return - * the value encoded as a Base64 String + * @return + * the value encoded as a Base64 String */ public static String base64Encode( Object value ) { @@ -184,9 +184,9 @@ public final class ParserUtils /** * Parses and verify the parsed value of the requestID * - * @param attributeValue + * @param attributeValue * the value of the attribute - * @param xpp + * @param xpp * the XmlPullParser * @return * the int value of the resquestID @@ -199,9 +199,9 @@ public final class ParserUtils { int requestID = Integer.parseInt( attributeValue ); - if ( requestID == 0 ) + if ( requestID < 0 ) { - throw new XmlPullParserException( I18n.err( I18n.ERR_03038 ), xpp, null ); + throw new XmlPullParserException( I18n.err( I18n.ERR_03038, requestID ), xpp, null ); } return requestID; 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.abandonRequest; @@ -32,6 +32,7 @@ import java.util.Map; import org.apache.directory.shared.dsmlv2.AbstractTest; import org.apache.directory.shared.dsmlv2.DsmlControl; import org.apache.directory.shared.dsmlv2.Dsmlv2Parser; +import org.apache.directory.shared.dsmlv2.request.BatchRequestDsml; import org.apache.directory.shared.ldap.model.message.AbandonRequest; import org.apache.directory.shared.ldap.model.message.Control; import org.apache.directory.shared.util.Strings; @@ -89,12 +90,12 @@ public class AbandonRequestTest extends /** - * Test parsing of a request with the (optional) requestID attribute equals to 0 + * Test parsing of a request with the (optional) requestID attribute below 0 */ @Test - public void testRequestWithRequestIdEquals0() + public void testRequestWithRequestIdBelow0() { - testParsingFail( AbandonRequestTest.class, "request_with_requestID_equals_0.xml" ); + testParsingFail( AbandonRequestTest.class, "request_with_requestID_below_0.xml" ); } @@ -315,4 +316,32 @@ public class AbandonRequestTest extends { testParsingFail( AbandonRequestTest.class, "request_with_needed_requestID.xml" ); } + + + /** + * Test parsing of a request without the abandonID attribute with a value of 0 + */ + @Test + public void testRequestWithoutAbandonId0() + { + Dsmlv2Parser parser = null; + + try + { + parser = newParser(); + + parser.setInput( AbandonRequestTest.class.getResource( "request_with_0_abandonID_attribute.xml" ) + .openStream(), "UTF-8" ); + + parser.parse(); + } + catch ( Exception e ) + { + e.printStackTrace(); + fail( e.getMessage() ); + } + + BatchRequestDsml batchRequest = parser.getBatchRequest(); + assertEquals( 0, batchRequest.getRequestID() ); + } } 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.addRequest; @@ -120,12 +120,12 @@ public class AddRequestTest extends Abst /** - * Test parsing of a request with the (optional) requestID attribute equals to 0 + * Test parsing of a request with the (optional) requestID attribute below 0 */ @Test public void testRequestWithRequestIdEquals0() { - testParsingFail( AddRequestTest.class, "request_with_requestID_equals_0.xml" ); + testParsingFail( AddRequestTest.class, "request_with_requestID_below_0.xml" ); } @@ -328,7 +328,7 @@ public class AddRequestTest extends Abst Entry entry = addRequest.getEntry(); assertEquals( 1, entry.size() ); - // Getting the Attribute + // Getting the Attribute Iterator attributeIterator = entry.iterator(); Attribute attribute = attributeIterator.next(); assertEquals( "objectclass", attribute.getUpId() ); @@ -365,7 +365,7 @@ public class AddRequestTest extends Abst Entry entry = addRequest.getEntry(); assertEquals( 1, entry.size() ); - // Getting the Attribute + // Getting the Attribute Iterator attributeIterator = entry.iterator(); Attribute attribute = attributeIterator.next(); assertEquals( "objectclass", attribute.getUpId() ); @@ -402,7 +402,7 @@ public class AddRequestTest extends Abst Entry entry = addRequest.getEntry(); assertEquals( 1, entry.size() ); - // Getting the Attribute + // Getting the Attribute Iterator attributeIterator = entry.iterator(); Attribute attribute = attributeIterator.next(); assertEquals( "objectclass", attribute.getUpId() ); @@ -441,7 +441,7 @@ public class AddRequestTest extends Abst Entry entry = addRequest.getEntry(); assertEquals( 1, entry.size() ); - // Getting the Attribute + // Getting the Attribute Iterator attributeIterator = entry.iterator(); Attribute attribute = attributeIterator.next(); assertEquals( "objectclass", attribute.getUpId() ); @@ -481,7 +481,7 @@ public class AddRequestTest extends Abst Entry entry = addRequest.getEntry(); assertEquals( 1, entry.size() ); - // Getting the Attribute + // Getting the Attribute Iterator attributeIterator = entry.iterator(); Attribute attribute = attributeIterator.next(); assertEquals( "objectclass", attribute.getUpId() ); @@ -534,7 +534,7 @@ public class AddRequestTest extends Abst Entry entry = addRequest.getEntry(); assertEquals( 1, entry.size() ); - // Getting the Attribute + // Getting the Attribute Iterator attributeIterator = entry.iterator(); Attribute attribute = attributeIterator.next(); assertEquals( "objectclass", attribute.getUpId() ); 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.addResponse; @@ -86,12 +86,12 @@ public class AddResponseTest extends Abs /** - * Test parsing of a Response with the (optional) requestID attribute equals 0 + * Test parsing of a Response with the (optional) requestID attribute below 0 */ @Test - public void testResponseWithRequestIdEquals0() + public void testResponseWithRequestIdBelow0() { - testParsingFail( AddResponseTest.class, "response_with_requestID_equals_0.xml" ); + testParsingFail( AddResponseTest.class, "response_with_requestID_below_0.xml" ); } @@ -254,7 +254,7 @@ public class AddResponseTest extends Abs /** - * Test parsing of a response with Result Code + * Test parsing of a response with Result Code */ @Test public void testResponseWithResultCode() 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.authRequest; @@ -116,12 +116,12 @@ public class AuthRequestTest extends Abs /** - * Test parsing of a request with the (optional) requestID attribute equals to 0 + * Test parsing of a request with the (optional) requestID attribute below 0 */ @Test - public void testRequestWithRequestIdEquals0() + public void testRequestWithRequestIdBelow0() { - testParsingFail( AuthRequestTest.class, "request_with_requestID_equals_0.xml" ); + testParsingFail( AuthRequestTest.class, "request_with_requestID_below_0.xml" ); } @@ -155,7 +155,7 @@ public class AuthRequestTest extends Abs assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -190,7 +190,7 @@ public class AuthRequestTest extends Abs assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -259,7 +259,7 @@ public class AuthRequestTest extends Abs assertNotNull( control ); assertFalse( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.789", control.getOid() ); - assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.authResponse; @@ -86,12 +86,12 @@ public class AuthResponseTest extends Ab /** - * Test parsing of a Response with the (optional) requestID attribute equals 0 + * Test parsing of a Response with the (optional) requestID attribute below 0 */ @Test - public void testResponseWithRequestIdEquals0() + public void testResponseWithRequestIdBelow0() { - testParsingFail( AuthResponseTest.class, "response_with_requestID_equals_0.xml" ); + testParsingFail( AuthResponseTest.class, "response_with_requestID_below_0.xml" ); } @@ -125,7 +125,7 @@ public class AuthResponseTest extends Ab assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -195,7 +195,7 @@ public class AuthResponseTest extends Ab assertNotNull( control ); assertFalse( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.789", control.getOid() ); - assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -255,7 +255,7 @@ public class AuthResponseTest extends Ab /** - * Test parsing of a response with Result Code + * Test parsing of a response with Result Code */ @Test public void testResponseWithResultCode() Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java?rev=1294688&r1=1294687&r2=1294688&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java (original) +++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchRequest/BatchRequestTest.java Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.batchRequest; @@ -85,12 +85,12 @@ public class BatchRequestTest extends Ab /** - * Test parsing of a request with the (optional) requestID attribute equals to 0 + * Test parsing of a request with the (optional) requestID attribute below 0 */ @Test - public void testRequestWithRequestIdEquals0() + public void testRequestWithRequestIdBelow0() { - testParsingFail( BatchRequestTest.class, "request_with_requestID_equals_0.xml" ); + testParsingFail( BatchRequestTest.class, "request_with_requestID_below_0.xml" ); } Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java?rev=1294688&r1=1294687&r2=1294688&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java (original) +++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/batchResponse/BatchResponseTest.java Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.batchResponse; @@ -83,12 +83,12 @@ public class BatchResponseTest extends A /** - * Test parsing of a Response with the (optional) requestID attribute equals 0 + * Test parsing of a Response with the (optional) requestID attribute below 0 */ @Test - public void testResponseWithRequestIdEquals0() + public void testResponseWithRequestIdBelow0() { - testParsingFail( BatchResponseTest.class, "response_with_requestID_equals_0.xml" ); + testParsingFail( BatchResponseTest.class, "response_with_requestID_below_0.xml" ); } 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.compareRequest; @@ -117,12 +117,12 @@ public class CompareRequestTest extends /** - * Test parsing of a request with the (optional) requestID attribute equals to 0 + * Test parsing of a request with the (optional) requestID attribute below 0 */ @Test - public void testRequestWithRequestIdEquals0() + public void testRequestWithRequestIdBelow0() { - testParsingFail( CompareRequestTest.class, "request_with_requestID_equals_0.xml" ); + testParsingFail( CompareRequestTest.class, "request_with_requestID_below_0.xml" ); } @@ -157,7 +157,7 @@ public class CompareRequestTest extends assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -192,7 +192,7 @@ public class CompareRequestTest extends assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -262,7 +262,7 @@ public class CompareRequestTest extends assertNotNull( control ); assertFalse( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.789", control.getOid() ); - assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -357,7 +357,7 @@ public class CompareRequestTest extends assertEquals( "cn=Bob Rush,ou=Dev,dc=Example,dc=COM", compareRequest.getName().getNormName() ); - assertEquals( "sn", ( String ) compareRequest.getAttributeId() ); + assertEquals( "sn", compareRequest.getAttributeId() ); assertEquals( "DSMLv2.0 rocks!!", new String( compareRequest.getAssertionValue().getBytes() ) ); } 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.compareResponse; @@ -86,12 +86,12 @@ public class CompareResponseTest extends /** - * Test parsing of a Response with the (optional) requestID attribute equals 0 + * Test parsing of a Response with the (optional) requestID attribute below 0 */ @Test - public void testResponseWithRequestIdEquals0() + public void testResponseWithRequestIdbelow0() { - testParsingFail( CompareResponseTest.class, "response_with_requestID_equals_0.xml" ); + testParsingFail( CompareResponseTest.class, "response_with_requestID_below_0.xml" ); } @@ -126,7 +126,7 @@ public class CompareResponseTest extends assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -196,7 +196,7 @@ public class CompareResponseTest extends assertNotNull( control ); assertFalse( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.789", control.getOid() ); - assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -256,7 +256,7 @@ public class CompareResponseTest extends /** - * Test parsing of a response with Result Code + * Test parsing of a response with Result Code */ @Test public void testResponseWithResultCode() 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.delRequest; @@ -115,12 +115,12 @@ public class DelRequestTest extends Abst /** - * Test parsing of a request with the (optional) requestID attribute equals to 0 + * Test parsing of a request with the (optional) requestID attribute below 0 */ @Test - public void testRequestWithRequestIdEquals0() + public void testRequestWithRequestIdBelow0() { - testParsingFail( DelRequestTest.class, "request_with_requestID_equals_0.xml" ); + testParsingFail( DelRequestTest.class, "request_with_requestID_below_0.xml" ); } @@ -154,7 +154,7 @@ public class DelRequestTest extends Abst assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -189,7 +189,7 @@ public class DelRequestTest extends Abst assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -259,7 +259,7 @@ public class DelRequestTest extends Abst assertNotNull( control ); assertFalse( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.789", control.getOid() ); - assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.delResponse; @@ -86,12 +86,12 @@ public class DelResponseTest extends Abs /** - * Test parsing of a Response with the (optional) requestID attribute equals 0 + * Test parsing of a Response with the (optional) requestID attribute below 0 */ @Test - public void testResponseWithRequestIdEquals0() + public void testResponseWithRequestIdBelow0() { - testParsingFail( DelResponseTest.class, "response_with_requestID_equals_0.xml" ); + testParsingFail( DelResponseTest.class, "response_with_requestID_below_0.xml" ); } @@ -125,7 +125,7 @@ public class DelResponseTest extends Abs assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -194,7 +194,7 @@ public class DelResponseTest extends Abs assertNotNull( control ); assertFalse( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.789", control.getOid() ); - assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -254,7 +254,7 @@ public class DelResponseTest extends Abs /** - * Test parsing of a response with Result Code + * Test parsing of a response with Result Code */ @Test public void testResponseWithResultCode() 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.errorResponse; @@ -73,12 +73,12 @@ public class ErrorResponseTest extends A /** - * Test parsing of a Response with the (optional) requestID attribute equals 0 + * Test parsing of a Response with the (optional) requestID attribute below 0 */ @Test - public void testResponseWithRequestIdEquals0() + public void testResponseWithRequestIdBelow0() { - testParsingFail( ErrorResponseTest.class, "response_with_requestID_equals_0.xml" ); + testParsingFail( ErrorResponseTest.class, "response_with_requestID_below_0.xml" ); } 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.extendedRequest; @@ -80,12 +80,12 @@ public class ExtendedRequestTest extends /** - * Test parsing of a request with the (optional) requestID attribute equals to 0 + * Test parsing of a request with the (optional) requestID attribute below 0 */ @Test - public void testRequestWithRequestIdEquals0() + public void testRequestWithRequestIdBelow0() { - testParsingFail( ExtendedRequestTest.class, "request_with_requestID_equals_0.xml" ); + testParsingFail( ExtendedRequestTest.class, "request_with_requestID_below_0.xml" ); } @@ -121,7 +121,7 @@ public class ExtendedRequestTest extends assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -157,7 +157,7 @@ public class ExtendedRequestTest extends assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -229,7 +229,7 @@ public class ExtendedRequestTest extends assertNotNull( control ); assertFalse( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.789", control.getOid() ); - assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.extendedResponse; @@ -89,12 +89,12 @@ public class ExtendedResponseTest extend /** - * Test parsing of a Response with the (optional) requestID attribute equals 0 + * Test parsing of a Response with the (optional) requestID attribute below 0 */ @Test - public void testResponseWithRequestIdEquals0() + public void testResponseWithRequestIdBelow0() { - testParsingFail( ExtendedResponseTest.class, "response_with_requestID_equals_0.xml" ); + testParsingFail( ExtendedResponseTest.class, "response_with_requestID_below_0.xml" ); } @@ -129,7 +129,7 @@ public class ExtendedResponseTest extend assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -199,7 +199,7 @@ public class ExtendedResponseTest extend assertNotNull( control ); assertFalse( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.789", control.getOid() ); - assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -259,7 +259,7 @@ public class ExtendedResponseTest extend /** - * Test parsing of a response with Result Code + * Test parsing of a response with Result Code */ @Test public void testResponseWithResultCode() @@ -666,7 +666,7 @@ public class ExtendedResponseTest extend ExtendedResponseDsml extendedResponse = ( ExtendedResponseDsml ) parser.getBatchResponse().getCurrentResponse(); - assertEquals( "DSMLv2.0 rocks!!", new String( ( byte[] ) extendedResponse.getResponseValue() ) ); + assertEquals( "DSMLv2.0 rocks!!", new String( extendedResponse.getResponseValue() ) ); } 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -79,12 +79,12 @@ public class ModifyDNRequestTest extends /** - * Test parsing of a request with the (optional) requestID attribute equals to 0 + * Test parsing of a request with the (optional) requestID attribute below 0 */ @Test - public void testRequestWithRequestIdEquals0() + public void testRequestWithRequestIdbelowBelow0() { - testParsingFail( ModifyDNRequestTest.class, "request_with_requestID_equals_0.xml" ); + testParsingFail( ModifyDNRequestTest.class, "request_with_requestID_below_0.xml" ); } 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.modDNResponse; @@ -86,12 +86,12 @@ public class ModifyDNResponseTest extend /** - * Test parsing of a Response with the (optional) requestID attribute equals 0 + * Test parsing of a Response with the (optional) requestID attribute below 0 */ @Test - public void testResponseWithRequestIdEquals0() + public void testResponseWithRequestIdBelow0() { - testParsingFail( ModifyDNResponseTest.class, "response_with_requestID_equals_0.xml" ); + testParsingFail( ModifyDNResponseTest.class, "response_with_requestID_below_0.xml" ); } @@ -126,7 +126,7 @@ public class ModifyDNResponseTest extend assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -196,7 +196,7 @@ public class ModifyDNResponseTest extend assertNotNull( control ); assertFalse( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.789", control.getOid() ); - assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -256,7 +256,7 @@ public class ModifyDNResponseTest extend /** - * Test parsing of a response with Result Code + * Test parsing of a response with Result Code */ @Test public void testResponseWithResultCode() 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.modifyRequest; @@ -87,12 +87,12 @@ public class ModifyRequestTest extends A /** - * Test parsing of a request with the (optional) requestID attribute equals to 0 + * Test parsing of a request with the (optional) requestID attribute below 0 */ @Test - public void testRequestWithRequestIdEquals0() + public void testRequestWithRequestIdBelow0() { - testParsingFail( ModifyRequestTest.class, "request_with_requestID_equals_0.xml" ); + testParsingFail( ModifyRequestTest.class, "request_with_requestID_below_0.xml" ); } @@ -126,7 +126,7 @@ public class ModifyRequestTest extends A assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -161,7 +161,7 @@ public class ModifyRequestTest extends A assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -231,7 +231,7 @@ public class ModifyRequestTest extends A assertNotNull( control ); assertFalse( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.789", control.getOid() ); - assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -282,7 +282,7 @@ public class ModifyRequestTest extends A /** * Test parsing of a request with a Modification element - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWith1Modification() throws NamingException @@ -319,8 +319,8 @@ public class ModifyRequestTest extends A /** * Test parsing of a request with a Modification element with Base64 Value - * @throws NamingException - * @throws UnsupportedEncodingException + * @throws NamingException + * @throws UnsupportedEncodingException */ @Test public void testRequestWith1ModificationBase64Value() throws NamingException, UnsupportedEncodingException @@ -363,7 +363,7 @@ public class ModifyRequestTest extends A /** * Test parsing of a request with 2 Modification elements - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWith2Modifications() throws NamingException @@ -431,7 +431,7 @@ public class ModifyRequestTest extends A /** * Test parsing of a request with operation attribute to Add value - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithOperationAdd() throws NamingException @@ -464,7 +464,7 @@ public class ModifyRequestTest extends A /** * Test parsing of a request with operation attribute to Delete value - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithOperationDelete() throws NamingException @@ -497,7 +497,7 @@ public class ModifyRequestTest extends A /** * Test parsing of a request with operation attribute to Replace value - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithOperationReplace() throws NamingException @@ -540,7 +540,7 @@ public class ModifyRequestTest extends A /** * Test parsing of a request with a Modification element without Value element - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithModificationWithoutValue() throws NamingException @@ -577,7 +577,7 @@ public class ModifyRequestTest extends A /** * Test parsing of a request with a Modification element - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithModificationWith2Values() throws NamingException @@ -618,7 +618,7 @@ public class ModifyRequestTest extends A /** * Test parsing of a request with a Modification element with an empty value - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithModificationWithEmptyValue() throws NamingException 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.modifyResponse; @@ -86,12 +86,12 @@ public class ModifyResponseTest extends /** - * Test parsing of a Response with the (optional) requestID attribute equals 0 + * Test parsing of a Response with the (optional) requestID attribute below 0 */ @Test - public void testResponseWithRequestIdEquals0() + public void testResponseWithRequestIdBelow0() { - testParsingFail( ModifyResponseTest.class, "response_with_requestID_equals_0.xml" ); + testParsingFail( ModifyResponseTest.class, "response_with_requestID_below_0.xml" ); } @@ -126,7 +126,7 @@ public class ModifyResponseTest extends assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -196,7 +196,7 @@ public class ModifyResponseTest extends assertNotNull( control ); assertFalse( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.789", control.getOid() ); - assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -256,7 +256,7 @@ public class ModifyResponseTest extends /** - * Test parsing of a response with Result Code + * Test parsing of a response with Result Code */ @Test public void testResponseWithResultCode() 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=1294688&r1=1294687&r2=1294688&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 Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.searchRequest; @@ -132,12 +132,12 @@ public class SearchRequestTest extends A /** - * Test parsing of a request with the (optional) requestID attribute equals to 0 + * Test parsing of a request with the (optional) requestID attribute below 0 */ @Test - public void testRequestWithRequestIdEquals0() + public void testRequestWithRequestIdBelow0() { - testParsingFail( SearchRequestTest.class, "request_with_requestID_equals_0.xml" ); + testParsingFail( SearchRequestTest.class, "request_with_requestID_below_0.xml" ); } @@ -171,7 +171,7 @@ public class SearchRequestTest extends A assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -206,7 +206,7 @@ public class SearchRequestTest extends A assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "DSMLv2.0 rocks!!", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -276,7 +276,7 @@ public class SearchRequestTest extends A assertNotNull( control ); assertFalse( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.789", control.getOid() ); - assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -337,7 +337,7 @@ public class SearchRequestTest extends A /** * Test parsing of a request with scope attribute to BaseObject value - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithScopeBaseObject() @@ -365,7 +365,7 @@ public class SearchRequestTest extends A /** * Test parsing of a request with scope attribute to SingleLevel value - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithScopeSingleLevel() @@ -393,7 +393,7 @@ public class SearchRequestTest extends A /** * Test parsing of a request with scope attribute to WholeSubtree value - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithScopeWholeSubtree() @@ -441,7 +441,7 @@ public class SearchRequestTest extends A /** * Test parsing of a request with derefAliases attribute to derefAlways value - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithDerefAliasesDerefAlways() @@ -469,7 +469,7 @@ public class SearchRequestTest extends A /** * Test parsing of a request with derefAliases attribute to derefFindingBaseObj value - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithDerefAliasesDerefFindingBaseObj() @@ -497,7 +497,7 @@ public class SearchRequestTest extends A /** * Test parsing of a request with derefAliases attribute to derefinSearching value - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithDerefAliasesDerefinSearching() @@ -525,7 +525,7 @@ public class SearchRequestTest extends A /** * Test parsing of a request with derefAliases attribute to neverDerefAliases value - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithDerefAliasesNeverDerefAliases() @@ -553,7 +553,7 @@ public class SearchRequestTest extends A /** * Test parsing of a request with derefAliases attribute to Error value - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithDerefAliasesError() @@ -564,7 +564,7 @@ public class SearchRequestTest extends A /** * Test parsing of a request with the sizeLimit (optional) attribute - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithSizeLimitAttribute() @@ -592,7 +592,7 @@ public class SearchRequestTest extends A /** * Test parsing of a request with sizeLimit attribute to Error value - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithSizeLimitError() @@ -603,7 +603,7 @@ public class SearchRequestTest extends A /** * Test parsing of a request with the timeLimit (optional) attribute - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithTimeLimitAttribute() @@ -631,7 +631,7 @@ public class SearchRequestTest extends A /** * Test parsing of a request with timeLimit attribute to Error value - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithTimeLimitError() @@ -805,7 +805,7 @@ public class SearchRequestTest extends A /** * Test parsing of a request with an Attributes element with 1 Attribute element - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithAttributes1Attribute() throws NamingException @@ -837,7 +837,7 @@ public class SearchRequestTest extends A /** * Test parsing of a request with an Attributes element with 2 Attribute elements - * @throws NamingException + * @throws NamingException */ @Test public void testRequestWithAttributes2Attribute() throws NamingException Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java?rev=1294688&r1=1294687&r2=1294688&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java (original) +++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/SearchResponseTest.java Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.searchResponse; @@ -73,12 +73,12 @@ public class SearchResponseTest extends /** - * Test parsing of a Response with the (optional) requestID attribute equals 0 + * Test parsing of a Response with the (optional) requestID attribute below 0 */ @Test - public void testResponseWithRequestIdEquals0() + public void testResponseWithRequestIdBelow0() { - testParsingFail( SearchResponseTest.class, "response_with_requestID_equals_0.xml" ); + testParsingFail( SearchResponseTest.class, "response_with_requestID_below_0.xml" ); } Modified: directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java URL: http://svn.apache.org/viewvc/directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java?rev=1294688&r1=1294687&r2=1294688&view=diff ============================================================================== --- directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java (original) +++ directory/shared/trunk/dsml/parser/src/test/java/org/apache/directory/shared/dsmlv2/searchResponse/searchResultDone/SearchResultDoneTest.java Tue Feb 28 15:23:06 2012 @@ -6,16 +6,16 @@ * to you under the Apache License, Version 2.0 (the * "License"); you may not use this file except in compliance * with the License. You may obtain a copy of the License at - * + * * http://www.apache.org/licenses/LICENSE-2.0 - * + * * Unless required by applicable law or agreed to in writing, * software distributed under the License is distributed on an * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY * KIND, either express or implied. See the License for the * specific language governing permissions and limitations - * under the License. - * + * under the License. + * */ package org.apache.directory.shared.dsmlv2.searchResponse.searchResultDone; @@ -91,7 +91,7 @@ public class SearchResultDoneTest extend assertNotNull( control ); assertTrue( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.643", control.getOid() ); - assertEquals( "Some text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -165,7 +165,7 @@ public class SearchResultDoneTest extend assertNotNull( control ); assertFalse( control.isCritical() ); assertEquals( "1.2.840.113556.1.4.789", control.getOid() ); - assertEquals( "Some other text", Strings.utf8ToString( ( byte[] ) ( ( DsmlControl ) control ).getValue() ) ); + assertEquals( "Some other text", Strings.utf8ToString( ( ( DsmlControl ) control ).getValue() ) ); } @@ -236,12 +236,12 @@ public class SearchResultDoneTest extend /** - * Test parsing of a Response with the (optional) requestID attribute equals 0 + * Test parsing of a Response with the (optional) requestID attribute below 0 */ @Test - public void testResponseWithRequestIdEquals0() + public void testResponseWithRequestIdBelow0() { - testParsingFail( SearchResultDoneTest.class, "response_with_requestID_equals_0.xml" ); + testParsingFail( SearchResultDoneTest.class, "response_with_requestID_below_0.xml" ); } @@ -266,7 +266,7 @@ public class SearchResultDoneTest extend /** - * Test parsing of a response with Result Code + * Test parsing of a response with Result Code */ @Test public void testResponseWithResultCode()