Author: elecharny
Date: Thu Aug 23 08:04:11 2007
New Revision: 569030
URL: http://svn.apache.org/viewvc?rev=569030&view=rev
Log:
Remove a useless NamingException which was incorrectly thrown by the decoder.
Modified:
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlDecoder.java
directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchResultDoneTest.java
directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/unbind/UnBindRequestTest.java
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/ControlDecoder.java Thu Aug 23 08:04:11 2007
@@ -20,8 +20,6 @@
package org.apache.directory.shared.ldap.codec;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.Asn1Object;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -48,5 +46,5 @@
* @return the decoded Asn1Object for the control
* @throws DecoderException if anything goes wrong
*/
- Asn1Object decode( byte[] controlBytes ) throws DecoderException, NamingException;
+ Asn1Object decode( byte[] controlBytes ) throws DecoderException;
}
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/LdapMessageGrammar.java Thu Aug 23 08:04:11 2007
@@ -21,7 +21,6 @@
import javax.naming.InvalidNameException;
-import javax.naming.NamingException;
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.ber.grammar.AbstractGrammar;
@@ -577,7 +576,7 @@
new GrammarTransition( LdapStatesEnum.VERSION_STATE, LdapStatesEnum.NAME_STATE, UniversalTag.OCTET_STRING_TAG,
new GrammarAction( "Store Bind Name value" )
{
- public void action( IAsn1Container container ) throws DecoderException, InvalidNameException
+ public void action( IAsn1Container container ) throws DecoderException
{
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
LdapMessage ldapMessage = ldapMessageContainer.getLdapMessage();
@@ -1861,7 +1860,7 @@
new GrammarTransition( LdapStatesEnum.MESSAGE_ID_STATE, LdapStatesEnum.ADD_REQUEST_STATE, LdapConstants.ADD_REQUEST_TAG,
new GrammarAction( "Init addRequest" )
{
- public void action( IAsn1Container container ) throws DecoderException, NamingException
+ public void action( IAsn1Container container ) throws DecoderException
{
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
@@ -1993,7 +1992,7 @@
new GrammarTransition( LdapStatesEnum.ATTRIBUTE_STATE, LdapStatesEnum.TYPE_STATE, UniversalTag.OCTET_STRING_TAG,
new GrammarAction( "Store attribute type" )
{
- public void action( IAsn1Container container ) throws DecoderException, NamingException
+ public void action( IAsn1Container container ) throws DecoderException
{
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
@@ -2654,7 +2653,7 @@
new GrammarTransition( LdapStatesEnum.AVA_STATE, LdapStatesEnum.ATTRIBUTE_DESC_STATE, UniversalTag.OCTET_STRING_TAG,
new GrammarAction( "Store attribute desc" )
{
- public void action( IAsn1Container container ) throws DecoderException, NamingException
+ public void action( IAsn1Container container ) throws DecoderException
{
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/TwixDecoder.java Thu Aug 23 08:04:11 2007
@@ -24,8 +24,6 @@
import java.nio.ByteBuffer;
import java.util.Set;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.ber.tlv.TLVStateEnum;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -168,10 +166,6 @@
}
}
- }
- catch ( NamingException lne )
- {
- // TODO : remove this useless catch
}
catch ( DecoderException de )
{
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/actions/ControlValueAction.java Thu Aug 23 08:04:11 2007
@@ -23,8 +23,6 @@
import java.util.HashMap;
import java.util.Map;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.ber.grammar.GrammarAction;
import org.apache.directory.shared.asn1.ber.tlv.TLV;
@@ -77,7 +75,7 @@
}
- public void action( IAsn1Container container ) throws DecoderException, NamingException
+ public void action( IAsn1Container container ) throws DecoderException
{
LdapMessageContainer ldapMessageContainer = ( LdapMessageContainer ) container;
TLV tlv = ldapMessageContainer.getCurrentTLV();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectDecoder.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/extended/operations/GracefulDisconnectDecoder.java Thu Aug 23 08:04:11 2007
@@ -22,8 +22,6 @@
import java.nio.ByteBuffer;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.Asn1Object;
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -48,7 +46,7 @@
* @return An GracefulDisconnect object
* @throws DecoderException If the decoding failed
*/
- public Asn1Object decode( byte[] stream ) throws DecoderException, NamingException
+ public Asn1Object decode( byte[] stream ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( stream );
GracefulDisconnectContainer container = new GracefulDisconnectContainer();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlDecoder.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/EntryChangeControlDecoder.java Thu Aug 23 08:04:11 2007
@@ -22,8 +22,6 @@
import java.nio.ByteBuffer;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.Asn1Object;
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -62,7 +60,7 @@
* @throws NamingException It will never be throw by this method
*/
- public Asn1Object decode( byte[] controlBytes ) throws DecoderException, NamingException
+ public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
EntryChangeControlContainer container = new EntryChangeControlContainer();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlDecoder.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/PSearchControlDecoder.java Thu Aug 23 08:04:11 2007
@@ -22,8 +22,6 @@
import java.nio.ByteBuffer;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.Asn1Object;
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -63,7 +61,7 @@
* @throws DecoderException If the decoding found an error
* @throws NamingException It will never be throw by this method
*/
- public Asn1Object decode( byte[] controlBytes ) throws DecoderException, NamingException
+ public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
PSearchControlContainer container = new PSearchControlContainer();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlDecoder.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlDecoder.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlDecoder.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/codec/search/controls/SubEntryControlDecoder.java Thu Aug 23 08:04:11 2007
@@ -22,8 +22,6 @@
import java.nio.ByteBuffer;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.Asn1Object;
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -61,7 +59,7 @@
* @throws DecoderException If the decoding found an error
* @throws NamingException It will never be throw by this method
*/
- public Asn1Object decode( byte[] controlBytes ) throws DecoderException, NamingException
+ public Asn1Object decode( byte[] controlBytes ) throws DecoderException
{
ByteBuffer bb = ByteBuffer.wrap( controlBytes );
SubEntryControlContainer container = new SubEntryControlContainer();
Modified: directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java (original)
+++ directory/shared/trunk/ldap/src/main/java/org/apache/directory/shared/ldap/message/extended/GracefulDisconnect.java Thu Aug 23 08:04:11 2007
@@ -24,8 +24,6 @@
import java.util.Iterator;
import java.util.List;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.codec.DecoderException;
import org.apache.directory.shared.asn1.codec.EncoderException;
@@ -70,7 +68,7 @@
private Referral replicatedContexts = new ReferralImpl();
- public GracefulDisconnect(byte[] value) throws NamingException
+ public GracefulDisconnect(byte[] value) throws DecoderException
{
super( 0, EXTENSION_OID );
this.value = value;
@@ -97,10 +95,11 @@
}
- private void decodeValue() throws NamingException
+ private void decodeValue() throws DecoderException
{
GracefulDisconnectDecoder decoder = new GracefulDisconnectDecoder();
org.apache.directory.shared.ldap.codec.extended.operations.GracefulDisconnect codec = null;
+
try
{
codec = ( org.apache.directory.shared.ldap.codec.extended.operations.GracefulDisconnect ) decoder
@@ -117,7 +116,7 @@
catch ( DecoderException e )
{
log.error( "Failed to decode response value", e );
- throw new RuntimeException( e );
+ throw e;
}
}
@@ -191,10 +190,6 @@
decoder.decode( bb, container );
}
catch ( DecoderException e )
- {
- log.error( "Failed while decoding response", e );
- }
- catch ( NamingException e )
{
log.error( "Failed while decoding response", e );
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapControlTest.java Thu Aug 23 08:04:11 2007
@@ -22,8 +22,6 @@
import java.nio.ByteBuffer;
import java.util.List;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -92,11 +90,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check that everything is OK
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -188,11 +181,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -236,11 +224,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -284,11 +267,6 @@
{
assertTrue( true );
return;
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
fail( "We should not reach this point" );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapDecoderTest.java Thu Aug 23 08:04:11 2007
@@ -36,8 +36,6 @@
import java.nio.ByteBuffer;
-import javax.naming.NamingException;
-
/**
* A global Ldap Decoder test
@@ -87,11 +85,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded PDU
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -139,11 +132,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
Assert.assertEquals( TLVStateEnum.VALUE_STATE_PENDING, ldapMessageContainer.getState() );
@@ -191,11 +179,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
assertEquals( TLVStateEnum.VALUE_STATE_PENDING, ldapMessageContainer.getState() );
@@ -221,11 +204,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
assertEquals( ldapMessageContainer.getState(), TLVStateEnum.PDU_DECODED );
@@ -283,11 +261,6 @@
assertEquals( "The current Value length is above the expected length", de.getMessage() );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "Should never reach this point.." );
}
@@ -334,11 +307,6 @@
assertEquals( "Bad transition !", de.getMessage() );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "Should never reach this point." );
}
@@ -384,11 +352,6 @@
assertEquals( "Bad transition !", de.getMessage() );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "Should never reach this point." );
}
@@ -425,11 +388,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
assertEquals( TLVStateEnum.LENGTH_STATE_PENDING, ldapMessageContainer.getState() );
@@ -451,11 +409,6 @@
{
de.printStackTrace();
fail( de.getMessage() );
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
assertEquals( TLVStateEnum.TAG_STATE_START, ldapMessageContainer.getState() );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapMessageTest.java Thu Aug 23 08:04:11 2007
@@ -33,9 +33,6 @@
import java.nio.ByteBuffer;
-import javax.naming.NamingException;
-
-
/**
* A global Ldap Decoder test
*
@@ -75,11 +72,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point !" );
}
@@ -115,11 +107,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point !" );
}
@@ -155,11 +142,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point !" );
}
@@ -196,11 +178,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point !" );
}
@@ -281,11 +258,6 @@
break;
}
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
stream.clear();
}
@@ -324,11 +296,6 @@
{
de.printStackTrace();
fail( de.getMessage() );
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/LdapResultTest.java Thu Aug 23 08:04:11 2007
@@ -36,8 +36,6 @@
import java.nio.ByteBuffer;
-import javax.naming.NamingException;
-
/**
* A test for LdapResults. We will use a AddResponse message to test the
@@ -81,11 +79,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -122,11 +115,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -168,11 +156,6 @@
{
fail( "We should never reach this point" );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
stream.clear();
}
@@ -212,11 +195,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -254,11 +232,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -298,11 +271,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded AddResponse
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -366,11 +334,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded AddResponse
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -441,11 +404,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded AddResponse
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -520,11 +478,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded AddResponse
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -597,11 +550,6 @@
{
assertTrue( true );
return;
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
fail( "We should not reach this point" );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/abandon/AbandonRequestTest.java Thu Aug 23 08:04:11 2007
@@ -23,8 +23,6 @@
import java.nio.ByteBuffer;
import java.util.List;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -101,11 +99,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check that everything is OK
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -193,11 +186,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check that everything is OK
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -257,11 +245,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -296,11 +279,6 @@
{
assertTrue( true );
return;
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
fail( "We should not reach this point" );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/add/AddResponseTest.java Thu Aug 23 08:04:11 2007
@@ -23,8 +23,6 @@
import java.nio.ByteBuffer;
import java.util.List;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -85,11 +83,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded AddResponse
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -149,11 +142,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -200,11 +188,6 @@
{
de.printStackTrace();
fail( de.getMessage() );
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
// Check the decoded AddResponse
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestPerfTest.java Thu Aug 23 08:04:11 2007
@@ -23,8 +23,6 @@
import java.nio.ByteBuffer;
import java.util.List;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -104,11 +102,6 @@
{
de.printStackTrace();
fail( de.getMessage() );
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
// Check the decoded BindRequest
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindRequestTest.java Thu Aug 23 08:04:11 2007
@@ -23,8 +23,6 @@
import java.nio.ByteBuffer;
import java.util.List;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -107,11 +105,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded BindRequest
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -194,11 +187,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded BindRequest
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -273,11 +261,6 @@
assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ((BindResponseImpl)response).getLdapResult().getResultCode() );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -320,11 +303,6 @@
assertEquals( "Bad transition !", de.getMessage() );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "Should never reach this point." );
}
@@ -370,11 +348,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded BindRequest
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -452,11 +425,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded BindRequest
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -540,11 +508,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded BindRequest
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -608,11 +571,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -649,11 +607,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -690,11 +643,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -731,11 +679,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -773,11 +716,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -814,11 +752,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -855,11 +788,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -897,11 +825,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded BindRequest
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -969,11 +892,6 @@
assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, ((BindResponseImpl)response).getLdapResult().getResultCode() );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -1014,11 +932,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded BindRequest
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -1088,11 +1001,6 @@
assertEquals( ResultCodeEnum.INAPPROPRIATEAUTHENTICATION, ((BindResponseImpl)response).getLdapResult().getResultCode() );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -1133,11 +1041,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded BindRequest
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -1210,11 +1113,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded BindRequest
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -1293,11 +1191,6 @@
{
de.printStackTrace();
fail( de.getMessage() );
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
// Check the decoded BindRequest
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/bind/BindResponseTest.java Thu Aug 23 08:04:11 2007
@@ -23,8 +23,6 @@
import java.nio.ByteBuffer;
import java.util.List;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -86,11 +84,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded BindResponse
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -168,11 +161,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded BindResponse
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -255,11 +243,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded BindResponse
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -336,11 +319,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded BindResponse
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -423,11 +401,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded BindResponse
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -488,11 +461,6 @@
{
assertTrue( true );
return;
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
fail( "We should not reach this point" );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/compare/CompareResponseTest.java Thu Aug 23 08:04:11 2007
@@ -23,8 +23,6 @@
import java.nio.ByteBuffer;
import java.util.List;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -88,11 +86,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded CompareResponse PDU
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -166,11 +159,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded CompareResponse PDU
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -240,11 +228,6 @@
{
assertTrue( true );
return;
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
fail( "We should not reach this point" );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/del/DelResponseTest.java Thu Aug 23 08:04:11 2007
@@ -23,8 +23,6 @@
import java.nio.ByteBuffer;
import java.util.List;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -89,11 +87,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded DelResponse PDU
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -154,11 +147,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -209,11 +197,6 @@
{
de.printStackTrace();
fail( de.getMessage() );
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
// Check the decoded DelResponse PDU
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyRequestTest.java Thu Aug 23 08:04:11 2007
@@ -221,11 +221,6 @@
assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ((ModifyResponseImpl)response).getLdapResult().getResultCode() );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -981,11 +976,6 @@
assertTrue( response instanceof ModifyResponseImpl );
assertEquals( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, ((ModifyResponseImpl)response).getLdapResult().getResultCode() );
return;
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
}
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modify/ModifyResponseTest.java Thu Aug 23 08:04:11 2007
@@ -23,8 +23,6 @@
import java.nio.ByteBuffer;
import java.util.List;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -87,11 +85,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded ModifyResponse PDU
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -164,11 +157,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded ModifyResponse PDU
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -237,11 +225,6 @@
{
assertTrue( true );
return;
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
fail( "We should not reach this point" );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNRequestTest.java Thu Aug 23 08:04:11 2007
@@ -23,8 +23,6 @@
import java.nio.ByteBuffer;
import java.util.List;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -53,7 +51,7 @@
/**
* Test the decoding of a full ModifyDNRequest
*/
- public void testDecodeModifyDNRequestSuccess() throws NamingException
+ public void testDecodeModifyDNRequestSuccess()
{
Asn1Decoder ldapDecoder = new LdapDecoder();
@@ -126,7 +124,7 @@
/**
* Test the decoding of a bad DN ModifyDNRequest
*/
- public void testDecodeModifyDNRequestBadDN() throws NamingException
+ public void testDecodeModifyDNRequestBadDN()
{
Asn1Decoder ldapDecoder = new LdapDecoder();
@@ -169,11 +167,6 @@
assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ((ModifyDnResponseImpl)response).getLdapResult().getResultCode() );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -181,7 +174,7 @@
/**
* Test the decoding of a bad RDN ModifyDNRequest
*/
- public void testDecodeModifyDNRequestBadRDN() throws NamingException
+ public void testDecodeModifyDNRequestBadRDN()
{
Asn1Decoder ldapDecoder = new LdapDecoder();
@@ -224,11 +217,6 @@
assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ((ModifyDnResponseImpl)response).getLdapResult().getResultCode() );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -236,7 +224,7 @@
/**
* Test the decoding of a bad RDN ModifyDNRequest
*/
- public void testDecodeModifyDNRequestBadNewSuperior() throws NamingException
+ public void testDecodeModifyDNRequestBadNewSuperior()
{
Asn1Decoder ldapDecoder = new LdapDecoder();
@@ -279,11 +267,6 @@
assertEquals( ResultCodeEnum.INVALID_DN_SYNTAX, ((ModifyDnResponseImpl)response).getLdapResult().getResultCode() );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -291,7 +274,7 @@
/**
* Test the decoding of a full ModifyDNRequest with controls
*/
- public void testDecodeModifyDNRequestSuccessWithControls() throws NamingException
+ public void testDecodeModifyDNRequestSuccessWithControls()
{
Asn1Decoder ldapDecoder = new LdapDecoder();
@@ -377,7 +360,7 @@
/**
* Test the decoding of a ModifyDNRequest without a superior
*/
- public void testDecodeModifyDNRequestWithoutSuperior() throws NamingException
+ public void testDecodeModifyDNRequestWithoutSuperior()
{
Asn1Decoder ldapDecoder = new LdapDecoder();
@@ -448,7 +431,7 @@
/**
* Test the decoding of a ModifyDNRequest without a superior with controls
*/
- public void testDecodeModifyDNRequestWithoutSuperiorWithControls() throws NamingException
+ public void testDecodeModifyDNRequestWithoutSuperiorWithControls()
{
Asn1Decoder ldapDecoder = new LdapDecoder();
@@ -533,7 +516,7 @@
/**
* Test the decoding of a ModifyDNRequest with an empty body
*/
- public void testDecodeModifyDNRequestEmptyBody() throws NamingException
+ public void testDecodeModifyDNRequestEmptyBody()
{
Asn1Decoder ldapDecoder = new LdapDecoder();
@@ -568,7 +551,7 @@
/**
* Test the decoding of a ModifyDNRequest with an empty entry
*/
- public void testDecodeModifyDNRequestEmptyEntry() throws NamingException
+ public void testDecodeModifyDNRequestEmptyEntry()
{
Asn1Decoder ldapDecoder = new LdapDecoder();
@@ -603,7 +586,7 @@
/**
* Test the decoding of a ModifyDNRequest with an empty newRdn
*/
- public void testDecodeModifyDNRequestEmptyNewRdn() throws NamingException
+ public void testDecodeModifyDNRequestEmptyNewRdn()
{
Asn1Decoder ldapDecoder = new LdapDecoder();
@@ -642,7 +625,7 @@
/**
* Test the decoding of a ModifyDNRequest with an empty deleteOldRdn
*/
- public void testDecodeModifyDNRequestEmptyDeleteOldRdnn() throws NamingException
+ public void testDecodeModifyDNRequestEmptyDeleteOldRdnn()
{
Asn1Decoder ldapDecoder = new LdapDecoder();
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/modifyDn/ModifyDNResponseTest.java Thu Aug 23 08:04:11 2007
@@ -23,8 +23,6 @@
import java.nio.ByteBuffer;
import java.util.List;
-import javax.naming.NamingException;
-
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
import org.apache.directory.shared.asn1.ber.IAsn1Container;
import org.apache.directory.shared.asn1.codec.DecoderException;
@@ -88,11 +86,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded ModifyDNResponse PDU
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -166,11 +159,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
// Check the decoded ModifyDNResponse PDU
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
@@ -240,11 +228,6 @@
{
assertTrue( true );
return;
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
fail( "We should not reach this point" );
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestMatchingRuleAssertionTest.java Thu Aug 23 08:04:11 2007
@@ -24,7 +24,6 @@
import java.util.HashMap;
import java.util.Map;
-import javax.naming.NamingException;
import javax.naming.directory.Attributes;
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
@@ -129,11 +128,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
SearchRequest sr = message.getSearchRequest();
@@ -218,11 +212,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -272,11 +261,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -326,11 +310,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -381,11 +360,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
SearchRequest sr = message.getSearchRequest();
@@ -463,11 +437,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -534,11 +503,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -587,11 +551,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -640,11 +599,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -692,11 +646,6 @@
catch ( DecoderException de )
{
fail( de.getMessage() );
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java?rev=569030&r1=569029&r2=569030&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java (original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/codec/search/SearchRequestSubstringTest.java Thu Aug 23 08:04:11 2007
@@ -25,7 +25,6 @@
import java.util.List;
import java.util.Map;
-import javax.naming.NamingException;
import javax.naming.directory.Attributes;
import org.apache.directory.shared.asn1.ber.Asn1Decoder;
@@ -138,11 +137,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
SearchRequest sr = message.getSearchRequest();
@@ -259,11 +253,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
SearchRequest sr = message.getSearchRequest();
@@ -387,11 +376,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
SearchRequest sr = message.getSearchRequest();
@@ -509,11 +493,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
SearchRequest sr = message.getSearchRequest();
@@ -632,11 +611,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
SearchRequest sr = message.getSearchRequest();
@@ -754,11 +728,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
SearchRequest sr = message.getSearchRequest();
@@ -870,11 +839,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
SearchRequest sr = message.getSearchRequest();
@@ -993,11 +957,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
SearchRequest sr = message.getSearchRequest();
@@ -1115,11 +1074,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
SearchRequest sr = message.getSearchRequest();
@@ -1239,11 +1193,6 @@
de.printStackTrace();
fail( de.getMessage() );
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
LdapMessage message = ( ( LdapMessageContainer ) ldapMessageContainer ).getLdapMessage();
SearchRequest sr = message.getSearchRequest();
@@ -1337,11 +1286,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -1391,11 +1335,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -1445,11 +1384,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -1500,11 +1434,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -1556,11 +1485,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -1612,11 +1536,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -1668,11 +1587,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -1716,11 +1630,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -1764,11 +1673,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -1812,11 +1716,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -1859,11 +1758,6 @@
assertTrue( true );
return;
}
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
- }
fail( "We should not reach this point" );
}
@@ -1905,11 +1799,6 @@
{
assertTrue( true );
return;
- }
- catch ( NamingException ne )
- {
- ne.printStackTrace();
- fail( ne.getMessage() );
}
fail( "We should not reach this point" );
|