directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From akaras...@apache.org
Subject svn commit: r365584 [5/5] - in /directory/trunk: apacheds-server-main/ apacheds/xdocs/users/ ldap-common/src/main/java/org/apache/asn1new/ldap/ ldap-common/src/main/java/org/apache/asn1new/ldap/codec/ ldap-common/src/main/java/org/apache/asn1new/ldap/c...
Date Tue, 03 Jan 2006 09:04:21 GMT
Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareRequestTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/CompareRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/CompareRequestTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/CompareRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareRequestTest.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 
@@ -22,10 +22,10 @@
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.pojo.CompareRequest;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.pojo.CompareRequest;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareResponseTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/CompareResponseTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareResponseTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareResponseTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/CompareResponseTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/CompareResponseTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareResponseTest.java Tue Jan  3 01:02:13 2006
@@ -14,16 +14,16 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.pojo.CompareResponse;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.pojo.CompareResponse;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/CompareResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelRequestTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/DelRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/DelRequestTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/DelRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelRequestTest.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 
@@ -22,10 +22,10 @@
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.pojo.DelRequest;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.pojo.DelRequest;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelResponseTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/DelResponseTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelResponseTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelResponseTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/DelResponseTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/DelResponseTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelResponseTest.java Tue Jan  3 01:02:13 2006
@@ -14,16 +14,16 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.pojo.DelResponse;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.pojo.DelResponse;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/DelResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedRequestTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ExtendedRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ExtendedRequestTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ExtendedRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedRequestTest.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 
@@ -22,10 +22,10 @@
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.pojo.ExtendedRequest;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.pojo.ExtendedRequest;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedResponseTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ExtendedResponseTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedResponseTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedResponseTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ExtendedResponseTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ExtendedResponseTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedResponseTest.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 
@@ -22,10 +22,10 @@
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.pojo.ExtendedResponse;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.pojo.ExtendedResponse;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ExtendedResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/LdapDecoderTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/LdapDecoderTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/LdapDecoderTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/LdapDecoderTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/LdapDecoderTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/LdapDecoderTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/LdapDecoderTest.java Tue Jan  3 01:02:13 2006
@@ -14,19 +14,19 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
 import org.apache.asn1.codec.DecoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ber.tlv.TLVStateEnum;
-import org.apache.asn1new.ldap.pojo.BindRequest;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.SimpleAuthentication;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.asn1.ber.tlv.TLVStateEnum;
+import org.apache.ldap.common.asn1.pojo.SimpleAuthentication;
 import org.apache.ldap.common.util.StringTools;
+import org.apache.ldap.common.asn1.pojo.BindRequest;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
 
 import java.nio.ByteBuffer;
 

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/LdapDecoderTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNRequestTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ModifyDNRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ModifyDNRequestTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ModifyDNRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNRequestTest.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 
@@ -22,10 +22,10 @@
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.ModifyDNRequest;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.asn1.pojo.ModifyDNRequest;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNResponseTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ModifyDNResponseTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNResponseTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNResponseTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ModifyDNResponseTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ModifyDNResponseTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNResponseTest.java Tue Jan  3 01:02:13 2006
@@ -14,16 +14,16 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.ModifyDNResponse;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.asn1.pojo.ModifyDNResponse;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyDNResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyRequestTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ModifyRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ModifyRequestTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ModifyRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyRequestTest.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -28,10 +28,10 @@
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.ModifyRequest;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.asn1.pojo.ModifyRequest;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyResponseTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ModifyResponseTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyResponseTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyResponseTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ModifyResponseTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/ModifyResponseTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyResponseTest.java Tue Jan  3 01:02:13 2006
@@ -14,16 +14,16 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.ModifyResponse;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.asn1.pojo.ModifyResponse;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/ModifyResponseTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchRequestTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/SearchRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/SearchRequestTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/SearchRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchRequestTest.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 import java.util.ArrayList;
@@ -23,20 +23,20 @@
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.codec.primitives.LdapString;
-import org.apache.asn1new.ldap.pojo.AttributeValueAssertion;
-import org.apache.asn1new.ldap.pojo.Control;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.SearchRequest;
-import org.apache.asn1new.ldap.pojo.filters.AndFilter;
-import org.apache.asn1new.ldap.pojo.filters.AttributeValueAssertionFilter;
-import org.apache.asn1new.ldap.pojo.filters.NotFilter;
-import org.apache.asn1new.ldap.pojo.filters.OrFilter;
-import org.apache.asn1new.ldap.pojo.filters.PresentFilter;
-import org.apache.asn1new.ldap.pojo.filters.SubstringFilter;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.codec.primitives.LdapString;
+import org.apache.ldap.common.asn1.pojo.SearchRequest;
+import org.apache.ldap.common.asn1.pojo.filters.AttributeValueAssertionFilter;
+import org.apache.ldap.common.asn1.pojo.filters.NotFilter;
+import org.apache.ldap.common.asn1.pojo.filters.*;
+import org.apache.ldap.common.asn1.pojo.filters.OrFilter;
+import org.apache.ldap.common.asn1.pojo.filters.PresentFilter;
+import org.apache.ldap.common.asn1.pojo.filters.SubstringFilter;
 import org.apache.ldap.common.util.StringTools;
+import org.apache.ldap.common.asn1.pojo.AttributeValueAssertion;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.asn1.pojo.*;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
@@ -171,7 +171,7 @@
         Assert.assertEquals("contacts", assertion.getAssertionValue().toString());
         
         // (& (| (objectclass=top) (ou=contacts) ) (! ...
-        NotFilter notFilter = (NotFilter)andFilters.get(1);
+        NotFilter notFilter = ( NotFilter )andFilters.get(1);
         Assert.assertNotNull(notFilter);
         
         // (& (| (objectclass=top) (ou=contacts) ) (! (objectclass=ttt) ) )
@@ -1520,7 +1520,7 @@
         Assert.assertEquals(null, substringFilter.getInitialSubstrings());
         Assert.assertEquals("t", ((LdapString)substringFilter.getAnySubstrings().get(0)).getString());
         Assert.assertEquals("t", ((LdapString)substringFilter.getAnySubstrings().get(1)).getString());
-        Assert.assertEquals("t", ((LdapString)substringFilter.getAnySubstrings().get(2)).getString());
+        Assert.assertEquals("t", (( LdapString )substringFilter.getAnySubstrings().get(2)).getString());
         Assert.assertEquals(null, substringFilter.getFinalSubstrings());
 
         // The attributes
@@ -1650,7 +1650,7 @@
         Assert.assertEquals("Santa Clara", assertion.getAssertionValue().toString());
 
         // cn=abok
-        assertion = ((AttributeValueAssertionFilter)orFilter.getOrFilter().get(4)).getAssertion();
+        assertion = (( AttributeValueAssertionFilter )orFilter.getOrFilter().get(4)).getAssertion();
         
         Assert.assertEquals("cn", assertion.getAttributeDesc().toString());
         Assert.assertEquals("abok", assertion.getAssertionValue().toString());

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultDoneTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/SearchResultDoneTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultDoneTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultDoneTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/SearchResultDoneTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/SearchResultDoneTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultDoneTest.java Tue Jan  3 01:02:13 2006
@@ -14,16 +14,16 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.SearchResultDone;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.asn1.pojo.SearchResultDone;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultDoneTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultEntryTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/SearchResultEntryTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultEntryTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultEntryTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/SearchResultEntryTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/SearchResultEntryTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultEntryTest.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 import java.util.HashSet;
@@ -26,10 +26,10 @@
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.SearchResultEntry;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.asn1.pojo.SearchResultEntry;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultEntryTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultReferenceTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/SearchResultReferenceTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultReferenceTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultReferenceTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/SearchResultReferenceTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/SearchResultReferenceTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultReferenceTest.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 import java.util.HashSet;
@@ -24,12 +24,12 @@
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.codec.primitives.LdapURL;
-import org.apache.asn1new.ldap.codec.primitives.LdapURLEncodingException;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
-import org.apache.asn1new.ldap.pojo.SearchResultReference;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.codec.primitives.LdapURL;
+import org.apache.ldap.common.asn1.codec.primitives.LdapURLEncodingException;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
+import org.apache.ldap.common.asn1.pojo.SearchResultReference;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;
@@ -128,7 +128,7 @@
 	        {
 	            ldapUrlsSet.add( new LdapURL( ldapUrls[i].getBytes() ).toString() );
 	        }
-        } catch (LdapURLEncodingException luee)
+        } catch ( LdapURLEncodingException luee)
         {
             Assert.fail();
         }

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/SearchResultReferenceTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/UnBindRequestTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/UnBindRequestTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/UnBindRequestTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/UnBindRequestTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/UnBindRequestTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/UnBindRequestTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/UnBindRequestTest.java Tue Jan  3 01:02:13 2006
@@ -14,15 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec;
+package org.apache.ldap.common.asn1.codec;
 
 import java.nio.ByteBuffer;
 
 import org.apache.asn1.codec.DecoderException;
 import org.apache.asn1.codec.EncoderException;
-import org.apache.asn1new.ber.Asn1Decoder;
-import org.apache.asn1new.ber.containers.IAsn1Container;
-import org.apache.asn1new.ldap.pojo.LdapMessage;
+import org.apache.asn1.ber.Asn1Decoder;
+import org.apache.asn1.ber.IAsn1Container;
+import org.apache.ldap.common.asn1.pojo.LdapMessage;
 import org.apache.ldap.common.util.StringTools;
 
 import junit.framework.Assert;

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/UnBindRequestTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/DNParserTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/DNParserTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/DNParserTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/DNParserTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/DNParserTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/DNParserTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/DNParserTest.java Tue Jan  3 01:02:13 2006
@@ -14,14 +14,16 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.primitives;
+package org.apache.ldap.common.asn1.codec.primitives;
 
 import javax.naming.InvalidNameException;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
+import org.apache.ldap.common.asn1.codec.primitives.LdapDN;
+import org.apache.ldap.common.asn1.codec.primitives.DNParser;
+
 
 /**
  * Test the class LdapDN
@@ -40,14 +42,14 @@
     }
 
     // CONSTRUCTOR functions --------------------------------------------------
-    
+
     /**
      * test an empty DN
      */
     public void testLdapDNEmpty() throws InvalidNameException
     {
-    	DNParser dnParser = new DNParser();
-    	
+        DNParser dnParser = new DNParser();
+
         Assert.assertEquals( "", (( LdapDN )dnParser.parse( "" )).getName() );
     }
 
@@ -56,9 +58,9 @@
      */
     public void testLdapDNSimple() throws InvalidNameException
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
 
-    	Assert.assertEquals( "a = b", (( LdapDN )dnParser.parse( "a = b" )).getName() );
+        Assert.assertEquals( "a = b", (( LdapDN )dnParser.parse( "a = b" )).getName() );
         Assert.assertEquals( "a=b", (( LdapDN )dnParser.parse( "a = b" )).getString() );
     }
 
@@ -67,7 +69,7 @@
      */
     public void testLdapDNComposite() throws InvalidNameException
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
         LdapDN dn = ( LdapDN )dnParser.parse( "a = b, c = d" );
         Assert.assertEquals( "a=b,c=d", dn.toString() );
         Assert.assertEquals( "a = b, c = d", dn.getName() );
@@ -78,7 +80,7 @@
      */
     public void testLdapDNCompositeWithSpace() throws InvalidNameException
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
         LdapDN dn = ( LdapDN )dnParser.parse( "a=b, a =b, a= b, a = b, a  =  b" );
         Assert.assertEquals( "a=b,a=b,a=b,a=b,a=b", dn.toString() );
         Assert.assertEquals( "a=b, a =b, a= b, a = b, a  =  b", dn.getName() );
@@ -90,8 +92,8 @@
      */
     public void testLdapDNCompositeSepators() throws InvalidNameException
     {
-    	DNParser dnParser = new DNParser();
-    	LdapDN dn = ( LdapDN )dnParser.parse( "a=b;c=d,e=f" );
+        DNParser dnParser = new DNParser();
+        LdapDN dn = ( LdapDN )dnParser.parse( "a=b;c=d,e=f" );
         Assert.assertEquals( "a=b,c=d,e=f", dn.toString() );
         Assert.assertEquals( "a=b;c=d,e=f", dn.getName() );
     }
@@ -101,7 +103,7 @@
      */
     public void testLdapDNSimpleMultivaluedAttribute() throws InvalidNameException
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
         LdapDN dn = ( LdapDN )dnParser.parse( "a = b + c = d" );
         Assert.assertEquals( "a=b+c=d", dn.toString() );
         Assert.assertEquals( "a = b + c = d", dn.getName() );
@@ -112,7 +114,7 @@
      */
     public void testLdapDNCompositeMultivaluedAttribute() throws InvalidNameException
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
         LdapDN dn = ( LdapDN )dnParser.parse( "a=b+c=d, e=f + g=h + i=j" );
         Assert.assertEquals( "a=b+c=d,e=f+g=h+i=j", dn.toString() );
         Assert.assertEquals( "a=b+c=d, e=f + g=h + i=j", dn.getName() );
@@ -123,7 +125,7 @@
      */
     public void testLdapDNOidUpper() throws InvalidNameException
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
         LdapDN dn = ( LdapDN )dnParser.parse( "OID.12.34.56 = azerty" );
         Assert.assertEquals( "oid.12.34.56=azerty", dn.toString() );
         Assert.assertEquals( "OID.12.34.56 = azerty", dn.getName() );
@@ -134,7 +136,7 @@
      */
     public void testLdapDNOidLower() throws InvalidNameException
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
         LdapDN dn = ( LdapDN )dnParser.parse( "oid.12.34.56 = azerty" );
         Assert.assertEquals( "oid.12.34.56=azerty", dn.toString() );
         Assert.assertEquals( "oid.12.34.56 = azerty", dn.getName() );
@@ -145,7 +147,7 @@
      */
     public void testLdapDNOidWithoutPrefix() throws InvalidNameException
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
         LdapDN dn = ( LdapDN )dnParser.parse( "12.34.56 = azerty" );
         Assert.assertEquals( "12.34.56=azerty", dn.toString() );
         Assert.assertEquals( "12.34.56 = azerty", dn.getName() );
@@ -156,7 +158,7 @@
      */
     public void testLdapDNCompositeOidWithoutPrefix() throws InvalidNameException
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
         LdapDN dn = ( LdapDN )dnParser.parse( "12.34.56 = azerty; 7.8 = test" );
         Assert.assertEquals( "12.34.56=azerty,7.8=test", dn.toString() );
         Assert.assertEquals( "12.34.56 = azerty; 7.8 = test", dn.getName() );
@@ -167,7 +169,7 @@
      */
     public void testLdapDNPairCharAttributeValue() throws InvalidNameException
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
         LdapDN dn = ( LdapDN )dnParser.parse( "a = \\,\\=\\+\\<\\>\\#\\;\\\\\\\"\\A0\\00" );
         Assert.assertEquals( "a=\\,\\=\\+\\<\\>\\#\\;\\\\\\\"\\A0\\00", dn.toString() );
         Assert.assertEquals( "a = \\,\\=\\+\\<\\>\\#\\;\\\\\\\"\\A0\\00", dn.getName() );
@@ -178,7 +180,7 @@
      */
     public void testLdapDNHexStringAttributeValue() throws InvalidNameException
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
         LdapDN dn = ( LdapDN )dnParser.parse( "a = #0010A0AAFF" );
         Assert.assertEquals( "a=#0010A0AAFF", dn.toString() );
         Assert.assertEquals( "a = #0010A0AAFF", dn.getName() );
@@ -189,7 +191,7 @@
      */
     public void testLdapDNQuotedAttributeValue() throws InvalidNameException
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
         LdapDN dn = ( LdapDN )dnParser.parse( "a = quoted \\\"value" );
         Assert.assertEquals( "a=quoted \\\"value", dn.toString() );
         Assert.assertEquals( "a = quoted \\\"value", dn.getName() );
@@ -201,29 +203,29 @@
      */
     public void testNameToBytes() throws Exception
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
         LdapDN dn = ( LdapDN )dnParser.parse( "cn = John, ou = People, OU = Marketing" );
-        
+
         byte[] bytes = dn.getBytes();
-        
+
         Assert.assertEquals( 30, dn.getNbBytes() );
         Assert.assertEquals("cn=John,ou=People,ou=Marketing", new String( bytes, "UTF-8" ) );
     }
-    
+
     public void testStringParser() throws Exception
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
         LdapDN name = ( LdapDN )dnParser.parse( "CN = Emmanuel  Lécharny" );
-        
+
         Assert.assertEquals( "CN = Emmanuel  Lécharny", name.getName() );
         Assert.assertEquals( "cn=Emmanuel  Lécharny", name.toString() );
     }
 
     public void testVsldapExtras() throws Exception
     {
-    	DNParser dnParser = new DNParser();
+        DNParser dnParser = new DNParser();
         LdapDN name = ( LdapDN )dnParser.parse( "cn=Billy Bakers, OID.2.5.4.11=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Search, o=IMC, c=US" );
-        
+
         Assert.assertEquals( "cn=Billy Bakers, OID.2.5.4.11=Corporate Tax, ou=Fin-Accounting, ou=Americas, ou=Search, o=IMC, c=US", name.getName() );
         Assert.assertEquals( "cn=Billy Bakers,oid.2.5.4.11=Corporate Tax,ou=Fin-Accounting,ou=Americas,ou=Search,o=IMC,c=US", name.toString() );
     }

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapDNTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/LdapDNTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapDNTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapDNTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/LdapDNTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/LdapDNTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapDNTest.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.primitives;
+package org.apache.ldap.common.asn1.codec.primitives;
 
 import java.util.Enumeration;
 
@@ -25,7 +25,9 @@
 import junit.framework.TestCase;
 
 import org.apache.asn1.codec.DecoderException;
-import org.apache.asn1new.ldap.codec.primitives.LdapDN;
+import org.apache.ldap.common.asn1.codec.primitives.LdapDN;
+import org.apache.ldap.common.asn1.codec.primitives.DNParser;
+
 
 /**
  * Test the class LdapDN
@@ -44,7 +46,7 @@
     }
 
     // CONSTRUCTOR functions --------------------------------------------------
-    
+
     /**
      * Test a null DN
      */
@@ -193,7 +195,7 @@
     }
 
     // REMOVE operation -------------------------------------------------------
-    
+
     /**
      * test a remove from position 0
      */
@@ -214,7 +216,7 @@
         Assert.assertEquals( "c=d", dn.remove( 1 ).toString() );
         Assert.assertEquals( "a=b,e=f", dn.getName() );
     }
-    
+
     /**
      * test a remove from position 2
      */
@@ -241,7 +243,7 @@
     public void testLdapDNRemoveOutOfBound() throws InvalidNameException
     {
         LdapDN dn = new LdapDN( "a=b, c=d; e=f" );
-        
+
         try
         {
             dn.remove( 4 );
@@ -253,7 +255,7 @@
             Assert.assertTrue( true );
         }
     }
-    
+
     // SIZE operations
     /**
      * test a 0 size 
@@ -298,20 +300,20 @@
     {
         LdapDN dn = new LdapDN();
         Assert.assertEquals( 0, dn.size() );
-        
+
         dn.add( "e = f" );
         Assert.assertEquals( 1, dn.size() );
-        
+
         dn.add( "c = d" );
         Assert.assertEquals( 2, dn.size() );
 
         dn.remove( 0 );
         Assert.assertEquals( 1, dn.size() );
-        
+
         dn.remove( 0 );
         Assert.assertEquals( 0, dn.size() );
     }
-    
+
     // ADD Operations
     /**
      * test Add on a new LdapDN
@@ -319,20 +321,20 @@
     public void testLdapEmptyAdd() throws InvalidNameException
     {
         LdapDN dn = new LdapDN();
-        
+
         dn.add( "e = f" );
         Assert.assertEquals( "e=f" , dn.toString() );
         Assert.assertEquals( "e=f" , dn.getName() );
         Assert.assertEquals( 1, dn.size() );
     }
-    
+
     /**
      * test Add to an existing LdapDN
      */
     public void testLdapDNAdd() throws InvalidNameException
     {
         LdapDN dn = new LdapDN( "a=b, c=d");
-        
+
         dn.add( "e = f" );
         Assert.assertEquals( "e=f,a=b,c=d" , dn.toString() );
         Assert.assertEquals( "e=f,a=b,c=d" , dn.getName() );
@@ -345,23 +347,23 @@
     public void testLdapDNAddComposite() throws InvalidNameException
     {
         LdapDN dn = new LdapDN( "a=b, c=d");
-        
+
         dn.add( "e = f + g = h" );
-        
+
         // Warning ! The order of AVAs has changed during the parsing
         // This has no impact on the correctness of the DN, but the
         // String used to do the comparizon should be inverted.
         Assert.assertEquals( "g=h+e=f,a=b,c=d" , dn.toString() );
         Assert.assertEquals( 3, dn.size() );
     }
-    
+
     /**
      * test Add at the end of an existing LdapDN
      */
     public void testLdapDNAddEnd() throws InvalidNameException
     {
         LdapDN dn = new LdapDN( "a=b, c=d");
-        
+
         dn.add( dn.size(), "e = f" );
         Assert.assertEquals( "e=f,a=b,c=d" , dn.getName() );
         Assert.assertEquals( 3, dn.size() );
@@ -373,7 +375,7 @@
     public void testLdapDNAddStart() throws InvalidNameException
     {
         LdapDN dn = new LdapDN( "a=b, c=d");
-        
+
         dn.add( 0, "e = f" );
         Assert.assertEquals( "a=b,c=d,e=f" , dn.getName() );
         Assert.assertEquals( 3, dn.size() );
@@ -385,7 +387,7 @@
     public void testLdapDNAddMiddle() throws InvalidNameException
     {
         LdapDN dn = new LdapDN( "a=b, c=d");
-        
+
         dn.add( 1, "e = f" );
         Assert.assertEquals( "a=b,e=f,c=d" , dn.getName() );
         Assert.assertEquals( 3, dn.size() );
@@ -403,7 +405,7 @@
         dn.addAll( dn2 );
         Assert.assertEquals( "c=d,a=b", dn.getName() );
     }
-    
+
     /**
      * Test AddAll with an empty added name
      * @throws InvalidNameException
@@ -428,7 +430,7 @@
         dn.addAll( dn2 );
         Assert.assertEquals( "a=b", dn.getName() );
     }
-    
+
     /**
      * Test AddAll at position 0
      * @throws InvalidNameException
@@ -440,7 +442,7 @@
         dn.addAll( 0, dn2 );
         Assert.assertEquals( "a=b,c=d", dn.getName() );
     }
-    
+
     /**
      * Test AddAll at position 1
      * @throws InvalidNameException
@@ -452,7 +454,7 @@
         dn.addAll( 1, dn2 );
         Assert.assertEquals( "c=d,a=b", dn.getName() );
     }
-    
+
     /**
      * Test AddAll at the middle
      * @throws InvalidNameException
@@ -464,7 +466,7 @@
         dn.addAll( 1, dn2 );
         Assert.assertEquals( "a=b,e=f,c=d", dn.getName() );
     }
-    
+
     /**
      * Test AddAll with an empty added name at position 0
      * @throws InvalidNameException
@@ -489,7 +491,7 @@
         dn.addAll( 0, dn2 );
         Assert.assertEquals( "a=b", dn.getName() );
     }
-    
+
     // GET PREFIX actions
     /**
      * Get the prefix at pos 0 
@@ -510,7 +512,7 @@
         LdapDN newDn = ((LdapDN)dn.getPrefix( 1 ));
         Assert.assertEquals( "e=f", newDn.getName() );
     }
-    
+
     /**
      * Get the prefix at pos 2 
      */
@@ -520,7 +522,7 @@
         LdapDN newDn = ((LdapDN)dn.getPrefix( 2 ));
         Assert.assertEquals( "c=d,e=f", newDn.getName() );
     }
-    
+
     /**
      * Get the prefix at pos 3 
      */
@@ -537,7 +539,7 @@
     public void testLdapDNGetPrefixPos4() throws InvalidNameException
     {
         LdapDN dn = new LdapDN( "a=b, c=d,e = f" );
-        
+
         try
         {
             dn.getPrefix( 4 );
@@ -559,7 +561,7 @@
         LdapDN newDn = ((LdapDN)dn.getPrefix( 0 ));
         Assert.assertEquals( "", newDn.getName() );
     }
-    
+
     // GET SUFFIX operations 
     /**
      * Get the suffix at pos 0 
@@ -580,7 +582,7 @@
         LdapDN newDn = ((LdapDN)dn.getSuffix( 1 ));
         Assert.assertEquals( "a=b,c=d", newDn.getName() );
     }
-    
+
     /**
      * Get the suffix at pos 2 
      */
@@ -590,7 +592,7 @@
         LdapDN newDn = ((LdapDN)dn.getSuffix( 2 ));
         Assert.assertEquals( "a=b", newDn.getName() );
     }
-    
+
     /**
      * Get the suffix at pos 3 
      */
@@ -607,7 +609,7 @@
     public void testLdapDNGetSuffixPos4() throws InvalidNameException
     {
         LdapDN dn = new LdapDN( "a=b, c=d,e = f" );
-        
+
         try
         {
             dn.getSuffix( 4 );
@@ -629,7 +631,7 @@
         LdapDN newDn = ((LdapDN)dn.getSuffix( 0 ));
         Assert.assertEquals( "", newDn.getName() );
     }
-    
+
     // IS EMPTY operations
     /**
      * Test that a LdapDN is empty
@@ -639,7 +641,7 @@
         LdapDN dn = new LdapDN();
         Assert.assertEquals( true, dn.isEmpty() );
     }
-    
+
     /**
      * Test that a LdapDN is empty
      */
@@ -657,10 +659,10 @@
         LdapDN dn = new LdapDN( "a=b, c=d" );
         dn.remove(0);
         dn.remove(0);
-        
+
         Assert.assertEquals( true, dn.isEmpty() );
     }
-    
+
     // STARTS WITH operations
     /**
      * Test a startsWith a null LdapDN
@@ -670,7 +672,7 @@
         LdapDN dn = new LdapDN( "a=b, c=d,e = f" );
         Assert.assertEquals( true, dn.startsWith( null ) );
     }
-    
+
     /**
      * Test a startsWith an empty LdapDN
      */
@@ -679,7 +681,7 @@
         LdapDN dn = new LdapDN( "a=b, c=d,e = f" );
         Assert.assertEquals( true, dn.startsWith( new LdapDN() ) );
     }
-    
+
     /**
      * Test a startsWith an simple LdapDN
      */
@@ -688,7 +690,7 @@
         LdapDN dn = new LdapDN( "a=b, c=d,e = f" );
         Assert.assertEquals( true, dn.startsWith( new LdapDN( "e=f" ) ) );
     }
-    
+
     /**
      * Test a startsWith a complex LdapDN
      */
@@ -715,7 +717,7 @@
         LdapDN dn = new LdapDN( "a=b, c=d,e = f" );
         Assert.assertEquals( true, dn.startsWith( new LdapDN( "a=  b; c =  d, e =  f" ) ) );
     }
-    
+
     /**
      * Test a startsWith which returns false
      */
@@ -724,7 +726,7 @@
         LdapDN dn = new LdapDN( "a=b, c=d,e = f" );
         Assert.assertEquals( false, dn.startsWith( new LdapDN( "c =  t, e =  f" ) ) );
     }
-    
+
     // ENDS WITH operations
     /**
      * Test a endsWith a null LdapDN
@@ -734,7 +736,7 @@
         LdapDN dn = new LdapDN( "a=b, c=d,e = f" );
         Assert.assertEquals( true, dn.endsWith( null ) );
     }
-    
+
     /**
      * Test a endsWith an empty LdapDN
      */
@@ -743,7 +745,7 @@
         LdapDN dn = new LdapDN( "a=b, c=d,e = f" );
         Assert.assertEquals( true, dn.endsWith( new LdapDN() ) );
     }
-    
+
     /**
      * Test a endsWith an simple LdapDN
      */
@@ -752,7 +754,7 @@
         LdapDN dn = new LdapDN( "a=b, c=d,e = f" );
         Assert.assertEquals( true, dn.endsWith( new LdapDN( "a=b" ) ) );
     }
-    
+
     /**
      * Test a endsWith a complex LdapDN
      */
@@ -779,7 +781,7 @@
         LdapDN dn = new LdapDN( "a=b, c=d,e = f" );
         Assert.assertEquals( true, dn.endsWith( new LdapDN( "a=  b; c =  d, e =  f" ) ) );
     }
-    
+
     /**
      * Test a endsWith which returns false
      */
@@ -788,7 +790,7 @@
         LdapDN dn = new LdapDN( "a=b, c=d,e = f" );
         Assert.assertEquals( false, dn.endsWith( new LdapDN( "a =  b, e =  f" ) ) );
     }
-    
+
     // GET ALL operations
     /**
      * test a getAll operation on a null DN
@@ -797,7 +799,7 @@
     {
         LdapDN dn = new LdapDN();
         Enumeration nc = dn.getAll();
-        
+
         Assert.assertEquals( false, nc.hasMoreElements() );
     }
 
@@ -808,10 +810,10 @@
     {
         LdapDN dn = new LdapDN("");
         Enumeration nc = dn.getAll();
-        
+
         Assert.assertEquals( false, nc.hasMoreElements() );
     }
-    
+
     /**
      * test a getAll operation on a simple DN
      */
@@ -819,12 +821,12 @@
     {
         LdapDN dn = new LdapDN("a=b");
         Enumeration nc = dn.getAll();
-        
+
         Assert.assertEquals( true, nc.hasMoreElements() );
         Assert.assertEquals( "a=b", nc.nextElement() );
         Assert.assertEquals( false, nc.hasMoreElements() );
     }
-    
+
     /**
      * test a getAll operation on a complex DN
      */
@@ -832,7 +834,7 @@
     {
         LdapDN dn = new LdapDN( "e=f+g=h,a=b,c=d" );
         Enumeration nc = dn.getAll();
-        
+
         Assert.assertEquals( true, nc.hasMoreElements() );
         Assert.assertEquals( "c=d", nc.nextElement() );
         Assert.assertEquals( true, nc.hasMoreElements() );
@@ -841,7 +843,7 @@
         Assert.assertEquals( "e=f+g=h", nc.nextElement() );
         Assert.assertEquals( false, nc.hasMoreElements() );
     }
-    
+
     // CLONE Operation
     /**
      * test a clone operation on a empty DN
@@ -850,10 +852,10 @@
     {
         LdapDN dn = new LdapDN();
         LdapDN clone = (LdapDN)dn.clone();
-        
+
         Assert.assertEquals( "", clone.getName() );
     }
-    
+
     /**
      * test a clone operation on a simple DN
      */
@@ -861,12 +863,12 @@
     {
         LdapDN dn = new LdapDN( "a=b" );
         LdapDN clone = (LdapDN)dn.clone();
-        
+
         Assert.assertEquals( "a=b", clone.getName() );
         dn.remove( 0 );
         Assert.assertEquals( "a=b", clone.getName() );
     }
-    
+
     /**
      * test a clone operation on a complex DN
      */
@@ -874,12 +876,12 @@
     {
         LdapDN dn = new LdapDN( "e=f+g=h,a=b,c=d" );
         LdapDN clone = (LdapDN)dn.clone();
-        
+
         Assert.assertEquals( "e=f+g=h,a=b,c=d", clone.getName() );
         dn.remove( 2 );
         Assert.assertEquals( "e=f+g=h,a=b,c=d", clone.getName() );
     }
-    
+
     // GET operations
     /**
      * test a get in a null DN
@@ -898,7 +900,7 @@
         LdapDN dn = new LdapDN( "" );
         Assert.assertEquals( "", dn.get( 0 ) );
     }
-    
+
     /**
      * test a get in a simple DN
      */
@@ -907,7 +909,7 @@
         LdapDN dn = new LdapDN( "a = b" );
         Assert.assertEquals( "a=b", dn.get( 0 ) );
     }
-    
+
     /**
      * test a get in a complex DN
      */
@@ -918,14 +920,14 @@
         Assert.assertEquals( "e=f", dn.get( 1 ) );
         Assert.assertEquals( "a=b+c=d", dn.get( 2 ) );
     }
-    
+
     /**
      * test a get out of bound
      */
     public void testLdapDNGetOutOfBound() throws InvalidNameException
     {
         LdapDN dn = new LdapDN( "a = b + c= d, e= f; g =h" );
-        
+
         try
         {
             dn.get( 4 );
@@ -936,7 +938,7 @@
             Assert.assertTrue( true );
         }
     }
-    
+
     /**
      * Tests the examples from the JNDI tutorials to make sure LdapName behaves
      * appropriately.  The example can be found online 
@@ -949,24 +951,24 @@
     {
         // Parse the name
         Name name = new LdapDN( "cn=John,ou=People,ou=Marketing" );
-        
+
         // Remove the second component from the head: ou=People
         String out = name.remove( 1 ).toString() ;
-        
+
         // System.out.println( l_out ) ;
         assertEquals( "ou=People", out ) ;
 
         // Add to the head (first): cn=John,ou=Marketing,ou=East
         out = name.add( 0, "ou=East" ).toString() ;
-        
+
         assertEquals( "cn=John,ou=Marketing,ou=East", out ) ;
-        
+
         // Add to the tail (last): cn=HomeDir,cn=John,ou=Marketing,ou=East
         out = name.add( "cn=HomeDir" ).toString() ;
-        
+
         assertEquals( "cn=HomeDir,cn=John,ou=Marketing,ou=East", out ) ;
     }
-    
+
     public void testAttributeEqualsIsCaseInSensitive() throws Exception
     {
         Name name1 = new LdapDN( "cn=HomeDir" );
@@ -1021,7 +1023,7 @@
 
         assertEquals( 0, name1.compareTo( name2 ) );
     }
-    
+
     public void testNameComparisonIsInsensitiveToAttributesOrderFailure() throws Exception
     {
 
@@ -1030,7 +1032,7 @@
 
         assertEquals( -1, name1.compareTo( name2 ) );
     }
-    
+
     /**
      * Test the encoding of a LdanDN
      *
@@ -1038,17 +1040,17 @@
     public void testNameToBytes() throws Exception
     {
         LdapDN dn = new LdapDN( "cn = John, ou = People, OU = Marketing" );
-        
+
         byte[] bytes = dn.getBytes();
-        
-        Assert.assertEquals( 30, dn.getNbBytes() );
+
+        assertEquals( 30, dn.getNbBytes() );
         Assert.assertEquals("cn=John,ou=People,ou=Marketing", new String( bytes, "UTF-8" ) );
     }
-    
+
     public void testStringParser() throws Exception
     {
         Name name = new DNParser().parse( "CN = Emmanuel  Lécharny" );
-        
+
         Assert.assertEquals( "CN = Emmanuel  Lécharny", ((LdapDN)name).getName() );
         Assert.assertEquals( "cn=Emmanuel  Lécharny", name.toString() );
     }

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapRDNTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/LdapRDNTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapRDNTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapRDNTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/LdapRDNTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/LdapRDNTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapRDNTest.java Tue Jan  3 01:02:13 2006
@@ -14,14 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.primitives;
+package org.apache.ldap.common.asn1.codec.primitives;
 
 import javax.naming.InvalidNameException;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.asn1new.ldap.codec.primitives.LdapRDN;
+import org.apache.ldap.common.asn1.codec.primitives.LdapRDN;
+
 
 /**
  * Test the class LdapRDN
@@ -99,7 +100,7 @@
      */
     public void testLdapRDNSimpleMultivaluedAttribute() throws InvalidNameException
     {
-        String result = new LdapRDN( "a = b + c = d" ).toString(); 
+        String result = new LdapRDN( "a = b + c = d" ).toString();
         Assert.assertEquals( "a=b+c=d", result );
     }
 
@@ -109,7 +110,7 @@
     public void testLdapRDNCompositeMultivaluedAttribute() throws InvalidNameException
     {
         LdapRDN rdn = new LdapRDN( "a =b+c=d + e=f + g  =h + i =j " );
-        
+
         // NameComponent are not ordered
         Assert.assertEquals( "b", rdn.getValue("a") );
         Assert.assertEquals( "d", rdn.getValue("c") );
@@ -150,7 +151,7 @@
      */
     public void testLdapRDNCompositeOidWithoutPrefix() throws InvalidNameException
     {
-        String result = new LdapRDN( "12.34.56 = azerty + 7.8 = test" ).toString(); 
+        String result = new LdapRDN( "12.34.56 = azerty + 7.8 = test" ).toString();
         Assert.assertEquals( "12.34.56=azerty+7.8=test", result );
     }
 
@@ -180,20 +181,20 @@
         Assert.assertEquals( "a=quoted \\\"value",
                 new LdapRDN( "a = quoted \\\"value" ).toString() );
     }
-    
+
     /**
      * Test the clone method for a RDN.
      */
     public void testRDNCloningOneNameComponent()  throws InvalidNameException
     {
         LdapRDN rdn = new LdapRDN( "a", "b" );
-        
+
         LdapRDN rdnClone = (LdapRDN)rdn.clone();
-        
+
         rdn.removeAttributeTypeAndValue( "a" );
-        
+
         RDNParser.parse( "c=d", rdn );
-        
+
         Assert.assertEquals( "b" , rdnClone.getValue( "a" ) );
     }
 
@@ -204,18 +205,18 @@
     {
         LdapRDN rdn = new LdapRDN( "a", "b" );
         rdn.addAttributeTypeAndValue( "aa", "bb" );
-        
+
         LdapRDN rdnClone = (LdapRDN)rdn.clone();
-        
+
         rdn.removeAttributeTypeAndValue( "aa" );
         rdn.clear();
         RDNParser.parse( "c=d", rdn );
-        
+
         Assert.assertEquals( "b" , rdnClone.getValue( "a" ) );
         Assert.assertEquals( "bb" , rdnClone.getValue( "aa" ) );
         Assert.assertEquals( "" , rdnClone.getValue( "c" ) );
     }
-    
+
     /**
      * Test the clone method for a RDN.
      */
@@ -245,7 +246,7 @@
         LdapRDN rdn2 = new LdapRDN( " a = b " );
         Assert.assertEquals( LdapRDN.NOT_EQUALS, rdn1.compareTo( rdn2 ) );
     }
-    
+
     /**
      * Compares a composite NC to a single NC.
      */

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapStringTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/LdapStringTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapStringTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapStringTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/LdapStringTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/LdapStringTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapStringTest.java Tue Jan  3 01:02:13 2006
@@ -14,12 +14,15 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.primitives;
+package org.apache.ldap.common.asn1.codec.primitives;
 
 import java.io.UnsupportedEncodingException;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
+import org.apache.ldap.common.asn1.codec.primitives.LdapString;
+import org.apache.ldap.common.asn1.codec.primitives.LdapStringEncodingException;
+
 
 /**
  * Test the class LdapString
@@ -38,44 +41,44 @@
     }
 
     // CONSTRUCTOR functions --------------------------------------------------
-    
+
     /**
      * Test a null LdapString
      */
     public void testLdapStringNull() throws LdapStringEncodingException
     {
         LdapString ls = new LdapString();
-        
+
         Assert.assertEquals( "", ls.getString() );
     }
-    
+
     /**
      * Test an empty LdapString
      */
     public void testLdapStringEmpty() throws LdapStringEncodingException, UnsupportedEncodingException
     {
         LdapString ls = new LdapString( "".getBytes( "UTF-8" ) );
-        
+
         Assert.assertEquals( "", ls.getString() );
     }
-    
+
     /**
      * Test an ASCII LdapString
      */
     public void testLdapStringASCII() throws LdapStringEncodingException, UnsupportedEncodingException
     {
         LdapString ls = new LdapString( "azerty".getBytes( "UTF-8" ) );
-        
+
         Assert.assertEquals( "azerty", ls.getString() );
     }
-    
+
     /**
      * Test a european LdapString
      */
     public void testLdapStringEuropean() throws LdapStringEncodingException, UnsupportedEncodingException
     {
         LdapString ls = new LdapString( "J\u00e9r\u00f4me".getBytes( "UTF-8" ) );
-        
+
         Assert.assertEquals( "J\u00e9r\u00f4me", ls.getString() );
         Assert.assertEquals( 8, ls.getNbBytes() );
         Assert.assertEquals( "J\u00e9r\u00f4me" , new String( ls.getBytes(), "UTF-8" ) );
@@ -87,7 +90,7 @@
     public void testLdapStringBytes() throws LdapStringEncodingException, UnsupportedEncodingException
     {
         LdapString ls = new LdapString( new byte[]{'J', (byte)0xc3, (byte)0xa9, 'r', (byte)0xc3, (byte)0xb4, 'm', 'e'} );
-        
+
         Assert.assertEquals( "J\u00e9r\u00f4me", ls.getString() );
         Assert.assertEquals( 8, ls.getNbBytes() );
         Assert.assertEquals( "J\u00e9r\u00f4me" , new String( ls.getBytes(), "UTF-8" ) );

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapUrlTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/LdapUrlTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapUrlTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapUrlTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/LdapUrlTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/primitives/LdapUrlTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapUrlTest.java Tue Jan  3 01:02:13 2006
@@ -14,12 +14,14 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.primitives;
+package org.apache.ldap.common.asn1.codec.primitives;
 
 import junit.framework.Assert;
 import junit.framework.TestCase;
 
-import org.apache.asn1new.ldap.codec.primitives.LdapURL;
+import org.apache.ldap.common.asn1.codec.primitives.LdapURL;
+import org.apache.ldap.common.asn1.codec.primitives.LdapURLEncodingException;
+
 
 /**
  * Test the class LdapURL
@@ -74,7 +76,7 @@
      */
     public void testLdapDNBadPort() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://directory.apache.org:/" );
         }
@@ -83,7 +85,7 @@
             Assert.assertTrue(true);
             return;
         }
-        
+
         Assert.fail();
     }
 
@@ -92,7 +94,7 @@
      */
     public void testLdapDNBadPort2() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://directory.apache.org:-1/" );
         }
@@ -101,7 +103,7 @@
             Assert.assertTrue(true);
             return;
         }
-        
+
         Assert.fail();
     }
 
@@ -110,7 +112,7 @@
      */
     public void testLdapDNBadPort3() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://directory.apache.org:abc/" );
         }
@@ -119,7 +121,7 @@
             Assert.assertTrue(true);
             return;
         }
-        
+
         Assert.fail();
     }
 
@@ -128,7 +130,7 @@
      */
     public void testLdapDNBadPort4() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://directory.apache.org:65536/" );
         }
@@ -137,7 +139,7 @@
             Assert.assertTrue(true);
             return;
         }
-        
+
         Assert.fail();
     }
 
@@ -154,7 +156,7 @@
      */
     public void testLdapDNBadHost2() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://./" );
         }
@@ -163,16 +165,16 @@
             Assert.assertTrue(true);
             return;
         }
-        
+
         Assert.fail();
     }
-    
+
     /**
      * test a LdapURL with a bad host 3
      */
     public void testLdapDNBadHost3() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://a..b/" );
         }
@@ -181,7 +183,7 @@
             Assert.assertTrue(true);
             return;
         }
-        
+
         Assert.fail();
     }
 
@@ -190,7 +192,7 @@
      */
     public void testLdapDNBadHost4() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://-/" );
         }
@@ -199,7 +201,7 @@
             Assert.assertTrue(true);
             return;
         }
-        
+
         Assert.fail();
     }
 
@@ -208,7 +210,7 @@
      */
     public void testLdapDNBadHost5() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://a.b.c-/" );
         }
@@ -217,7 +219,7 @@
             Assert.assertTrue(true);
             return;
         }
-        
+
         Assert.fail();
     }
 
@@ -226,7 +228,7 @@
      */
     public void testLdapDNBadHost6() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://a.b.-c/" );
         }
@@ -235,7 +237,7 @@
             Assert.assertTrue(true);
             return;
         }
-        
+
         Assert.fail();
     }
 
@@ -244,7 +246,7 @@
      */
     public void testLdapDNBadHost7() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://a.-.c/" );
         }
@@ -253,7 +255,7 @@
             Assert.assertTrue(true);
             return;
         }
-        
+
         Assert.fail();
     }
 
@@ -278,7 +280,7 @@
      */
     public void testLdapDNBadHostIP1() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://1.1.1/" );
         }
@@ -287,7 +289,7 @@
             Assert.assertTrue(true);
             return;
         }
-        
+
         Assert.fail();
     }
 
@@ -296,7 +298,7 @@
      */
     public void testLdapDNBadHostIP2() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://1.1.1./" );
         }
@@ -305,7 +307,7 @@
             Assert.assertTrue(true);
             return;
         }
-        
+
         Assert.fail();
     }
 
@@ -314,7 +316,7 @@
      */
     public void testLdapDNBadHostIP3() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://1.1.1.100000/" );
         }
@@ -323,7 +325,7 @@
             Assert.assertTrue(true);
             return;
         }
-        
+
         Assert.fail();
     }
 
@@ -332,7 +334,7 @@
      */
     public void testLdapDNBadHostIP4() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://1.1.1.1.1/" );
         }
@@ -341,7 +343,7 @@
             Assert.assertTrue(true);
             return;
         }
-        
+
         Assert.fail();
     }
 
@@ -358,7 +360,7 @@
      */
     public void testLdapDNSimpleDN() throws LdapURLEncodingException
     {
-        Assert.assertEquals("ldap://directory.apache.org:389/dc=example,dc=org/", 
+        Assert.assertEquals("ldap://directory.apache.org:389/dc=example,dc=org/",
                 new LdapURL( "ldap://directory.apache.org:389/dc=example,dc=org/" ).toString() );
     }
 
@@ -367,7 +369,7 @@
      */
     public void testLdapDNSimpleDN2() throws LdapURLEncodingException
     {
-        Assert.assertEquals("ldap://directory.apache.org:389/dc=example", 
+        Assert.assertEquals("ldap://directory.apache.org:389/dc=example",
                 new LdapURL( "ldap://directory.apache.org:389/dc=example" ).toString() );
     }
 
@@ -376,16 +378,16 @@
      */
     public void testLdapDNSimpleDNEncoded() throws LdapURLEncodingException
     {
-        Assert.assertEquals("ldap://directory.apache.org:389/dc=example%202,dc=org", 
+        Assert.assertEquals("ldap://directory.apache.org:389/dc=example%202,dc=org",
                 new LdapURL( "ldap://directory.apache.org:389/dc=example%202,dc=org" ).toString() );
     }
-    
+
     /**
      * test a LdapURL with an invalid DN
      */
     public void testLdapDNInvalidDN() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://directory.apache.org:389/dc=example%202,dc : org" );
         }
@@ -401,7 +403,7 @@
      */
     public void testLdapDNInvalidDN2() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://directory.apache.org:389/dc=example%202,dc = org," );
         }
@@ -426,7 +428,7 @@
      */
     public void testLdapDNAttributes() throws LdapURLEncodingException
     {
-        Assert.assertEquals("ldap://directory.apache.org:389/dc=example,dc=org?ou,objectclass,dc", 
+        Assert.assertEquals("ldap://directory.apache.org:389/dc=example,dc=org?ou,objectclass,dc",
                 new LdapURL( "ldap://directory.apache.org:389/dc=example,dc=org?ou,objectclass,dc" ).toString() );
     }
 
@@ -435,7 +437,7 @@
      */
     public void testLdapDNDuplicatedAttributes() throws LdapURLEncodingException
     {
-        Assert.assertEquals("ldap://directory.apache.org:389/dc=example,dc=org?ou,dc", 
+        Assert.assertEquals("ldap://directory.apache.org:389/dc=example,dc=org?ou,dc",
                 new LdapURL( "ldap://directory.apache.org:389/dc=example,dc=org?ou,dc,ou" ).toString() );
     }
 
@@ -444,7 +446,7 @@
      */
     public void testLdapInvalideAttributes() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://directory.apache.org:389/dc=example,dc=org?ou=,dc" );
         }
@@ -459,7 +461,7 @@
      */
     public void testLdapNoDNAttributes() throws LdapURLEncodingException
     {
-        try 
+        try
         {
             new LdapURL( "ldap://directory.apache.org:389/?ou,dc" );
         }
@@ -475,16 +477,16 @@
      */
     public void testLdapRFC2255_1() throws LdapURLEncodingException
     {
-        Assert.assertEquals("ldap:///o=University%20of%20Michigan,c=US", 
+        Assert.assertEquals("ldap:///o=University%20of%20Michigan,c=US",
                 new LdapURL( "ldap:///o=University%20of%20Michigan,c=US" ).toString() );
     }
-    
+
     /**
      * test 2 from RFC 2255 LdapURL 
      */
     public void testLdapRFC2255_2() throws LdapURLEncodingException
     {
-        Assert.assertEquals("ldap://ldap.itd.umich.edu/o=University%20of%20Michigan,c=US", 
+        Assert.assertEquals("ldap://ldap.itd.umich.edu/o=University%20of%20Michigan,c=US",
                 new LdapURL( "ldap://ldap.itd.umich.edu/o=University%20of%20Michigan,c=US" ).toString() );
     }
 
@@ -493,7 +495,7 @@
      */
     public void testLdapRFC2255_3() throws LdapURLEncodingException
     {
-        Assert.assertEquals("ldap://ldap.itd.umich.edu/o=University%20of%20Michigan,c=US?postalAddress", 
+        Assert.assertEquals("ldap://ldap.itd.umich.edu/o=University%20of%20Michigan,c=US?postalAddress",
                 new LdapURL( "ldap://ldap.itd.umich.edu/o=University%20of%20Michigan,c=US?postalAddress" ).toString() );
     }
 
@@ -502,7 +504,7 @@
      */
     public void testLdapRFC2255_4() throws LdapURLEncodingException
     {
-        Assert.assertEquals("ldap://host.com:6666/o=University%20of%20Michigan,c=US??sub?(cn=Babs%20Jensen)", 
+        Assert.assertEquals("ldap://host.com:6666/o=University%20of%20Michigan,c=US??sub?(cn=Babs%20Jensen)",
                 new LdapURL( "ldap://host.com:6666/o=University%20of%20Michigan,c=US??sub?(cn=Babs%20Jensen)" ).toString() );
     }
 
@@ -511,7 +513,7 @@
      */
     public void testLdapRFC2255_5() throws LdapURLEncodingException
     {
-        Assert.assertEquals("ldap://ldap.itd.umich.edu/c=GB?objectClass?one", 
+        Assert.assertEquals("ldap://ldap.itd.umich.edu/c=GB?objectClass?one",
                 new LdapURL( "ldap://ldap.itd.umich.edu/c=GB?objectClass?one" ).toString() );
     }
 
@@ -520,7 +522,7 @@
      */
     public void testLdapRFC2255_6() throws LdapURLEncodingException
     {
-        Assert.assertEquals("ldap://ldap.question.com/o=Question%3f,c=US?mail", 
+        Assert.assertEquals("ldap://ldap.question.com/o=Question%3f,c=US?mail",
                 new LdapURL( "ldap://ldap.question.com/o=Question%3f,c=US?mail" ).toString() );
     }
 
@@ -529,7 +531,7 @@
      */
     public void testLdapRFC2255_7() throws LdapURLEncodingException
     {
-        Assert.assertEquals("ldap://ldap.netscape.com/o=Babsco,c=US???(int=%5c00%5c00%5c00%5c04)", 
+        Assert.assertEquals("ldap://ldap.netscape.com/o=Babsco,c=US???(int=%5c00%5c00%5c00%5c04)",
                 new LdapURL( "ldap://ldap.netscape.com/o=Babsco,c=US???(int=%5c00%5c00%5c00%5c04)" ).toString() );
     }
 
@@ -538,7 +540,7 @@
      */
     public void testLdapRFC2255_8() throws LdapURLEncodingException
     {
-        Assert.assertEquals("ldap:///??sub??bindname=cn=Manager%2co=Foo", 
+        Assert.assertEquals("ldap:///??sub??bindname=cn=Manager%2co=Foo",
                 new LdapURL( "ldap:///??sub??bindname=cn=Manager%2co=Foo" ).toString() );
     }
 
@@ -547,7 +549,7 @@
      */
     public void testLdapRFC2255_9() throws LdapURLEncodingException
     {
-        Assert.assertEquals("ldap:///??sub??!bindname=cn=Manager%2co=Foo", 
+        Assert.assertEquals("ldap:///??sub??!bindname=cn=Manager%2co=Foo",
                 new LdapURL( "ldap:///??sub??!bindname=cn=Manager%2co=Foo" ).toString() );
     }
 }

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/primitives/LdapUrlTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/utils/DNUtilsTest.java (from r365566, directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/utils/DNUtilsTest.java)
URL: http://svn.apache.org/viewcvs/directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/utils/DNUtilsTest.java?p2=directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/utils/DNUtilsTest.java&p1=directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/utils/DNUtilsTest.java&r1=365566&r2=365584&rev=365584&view=diff
==============================================================================
--- directory/trunk/ldap-common/src/test/java/org/apache/asn1new/ldap/codec/utils/DNUtilsTest.java (original)
+++ directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/utils/DNUtilsTest.java Tue Jan  3 01:02:13 2006
@@ -14,7 +14,7 @@
  *   limitations under the License.
  *
  */
-package org.apache.asn1new.ldap.codec.utils;
+package org.apache.ldap.common.asn1.codec.utils;
 
 import org.apache.ldap.common.util.StringTools;
 

Propchange: directory/trunk/ldap-common/src/test/java/org/apache/ldap/common/asn1/codec/utils/DNUtilsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message