directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From seelm...@apache.org
Subject svn commit: r897469 - in /directory/shared/trunk/dsml-parser/src/test/java/org/apache/directory/shared/dsmlv2: addResponse/ authResponse/ compareResponse/ delResponse/ extendedResponse/ modDNResponse/ modifyResponse/ searchResponse/searchResultDone/
Date Sat, 09 Jan 2010 15:06:14 GMT
Author: seelmann
Date: Sat Jan  9 15:06:14 2010
New Revision: 897469

URL: http://svn.apache.org/viewvc?rev=897469&view=rev
Log:
Removed usage of com.sun.jndi.ldap.LdapURL

Modified:
    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/authResponse/AuthResponseTest.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/delResponse/DelResponseTest.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/modDNResponse/ModifyDNResponseTest.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/searchResponse/searchResultDone/SearchResultDoneTest.java

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=897469&r1=897468&r2=897469&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
Sat Jan  9 15:06:14 2010
@@ -21,27 +21,25 @@
 package org.apache.directory.shared.dsmlv2.addResponse;
 
 
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import javax.naming.NamingException;
+import java.util.List;
 
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
 import org.apache.directory.shared.ldap.codec.add.AddResponseCodec;
+import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
 
-import com.sun.jndi.ldap.LdapURL;
-
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-
 
 /**
  * Tests for the Add Response parsing
@@ -365,7 +363,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -438,7 +436,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -449,7 +447,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apple.com/" ).toString(), referral2.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -491,7 +489,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }

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=897469&r1=897468&r2=897469&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
Sat Jan  9 15:06:14 2010
@@ -21,25 +21,24 @@
 package org.apache.directory.shared.dsmlv2.authResponse;
 
 
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import javax.naming.NamingException;
+import java.util.List;
 
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
 import org.apache.directory.shared.ldap.codec.bind.BindResponseCodec;
+import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-
-import com.sun.jndi.ldap.LdapURL;
 
 
 /**
@@ -366,7 +365,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -439,7 +438,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -450,7 +449,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apple.com/" ).toString(), referral2.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -492,7 +491,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }

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=897469&r1=897468&r2=897469&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
Sat Jan  9 15:06:14 2010
@@ -21,25 +21,24 @@
 package org.apache.directory.shared.dsmlv2.compareResponse;
 
 
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import javax.naming.NamingException;
+import java.util.List;
 
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
 import org.apache.directory.shared.ldap.codec.compare.CompareResponseCodec;
+import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-
-import com.sun.jndi.ldap.LdapURL;
 
 
 /**
@@ -367,7 +366,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -440,7 +439,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -451,7 +450,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apple.com/" ).toString(), referral2.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -493,7 +492,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }

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=897469&r1=897468&r2=897469&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
Sat Jan  9 15:06:14 2010
@@ -21,25 +21,25 @@
 package org.apache.directory.shared.dsmlv2.delResponse;
 
 
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import javax.naming.NamingException;
+import java.util.List;
 
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
 import org.apache.directory.shared.ldap.codec.del.DelResponseCodec;
+import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
 
-import com.sun.jndi.ldap.LdapURL;
 
 
 /**
@@ -364,7 +364,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -437,7 +437,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -448,7 +448,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apple.com/" ).toString(), referral2.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -490,7 +490,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }

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=897469&r1=897468&r2=897469&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
Sat Jan  9 15:06:14 2010
@@ -21,9 +21,13 @@
 package org.apache.directory.shared.dsmlv2.extendedResponse;
 
 
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import javax.naming.NamingException;
+import java.util.List;
 
 import org.apache.directory.shared.asn1.codec.DecoderException;
 import org.apache.directory.shared.asn1.primitives.OID;
@@ -32,16 +36,11 @@
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
 import org.apache.directory.shared.ldap.codec.extended.ExtendedResponseCodec;
+import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-
-import com.sun.jndi.ldap.LdapURL;
 
 
 /**
@@ -369,7 +368,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -442,7 +441,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -453,7 +452,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apple.com/" ).toString(), referral2.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -495,7 +494,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }

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=897469&r1=897468&r2=897469&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
Sat Jan  9 15:06:14 2010
@@ -21,25 +21,24 @@
 package org.apache.directory.shared.dsmlv2.modDNResponse;
 
 
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import javax.naming.NamingException;
+import java.util.List;
 
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
 import org.apache.directory.shared.ldap.codec.modifyDn.ModifyDNResponseCodec;
+import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-
-import com.sun.jndi.ldap.LdapURL;
 
 
 /**
@@ -367,7 +366,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -440,7 +439,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -451,7 +450,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apple.com/" ).toString(), referral2.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -493,7 +492,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }

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=897469&r1=897468&r2=897469&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
Sat Jan  9 15:06:14 2010
@@ -21,25 +21,24 @@
 package org.apache.directory.shared.dsmlv2.modifyResponse;
 
 
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import javax.naming.NamingException;
+import java.util.List;
 
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
 import org.apache.directory.shared.ldap.codec.modify.ModifyResponseCodec;
+import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-
-import com.sun.jndi.ldap.LdapURL;
 
 
 /**
@@ -367,7 +366,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -440,7 +439,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -451,7 +450,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apple.com/" ).toString(), referral2.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -493,7 +492,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }

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=897469&r1=897468&r2=897469&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
Sat Jan  9 15:06:14 2010
@@ -21,9 +21,13 @@
 package org.apache.directory.shared.dsmlv2.searchResponse.searchResultDone;
 
 
-import java.util.List;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
-import javax.naming.NamingException;
+import java.util.List;
 
 import org.apache.directory.shared.dsmlv2.AbstractResponseTest;
 import org.apache.directory.shared.dsmlv2.Dsmlv2ResponseParser;
@@ -31,16 +35,11 @@
 import org.apache.directory.shared.ldap.codec.ControlCodec;
 import org.apache.directory.shared.ldap.codec.LdapResultCodec;
 import org.apache.directory.shared.ldap.codec.search.SearchResultDoneCodec;
+import org.apache.directory.shared.ldap.codec.util.LdapURLEncodingException;
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
+import org.apache.directory.shared.ldap.util.LdapURL;
 import org.apache.directory.shared.ldap.util.StringTools;
 import org.junit.Test;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
-
-import com.sun.jndi.ldap.LdapURL;
 
 
 /**
@@ -376,7 +375,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -451,7 +450,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -462,7 +461,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apple.com/" ).toString(), referral2.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }
@@ -505,7 +504,7 @@
         {
             assertEquals( new LdapURL( "ldap://www.apache.org/" ).toString(), referral.toString()
);
         }
-        catch ( NamingException e )
+        catch ( LdapURLEncodingException e )
         {
             fail();
         }



Mime
View raw message