directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r918756 [4/6] - in /directory/shared/trunk: dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/engine/ dsml-parser/src/main/java/org/apache/directory/shared/dsmlv2/reponse/ dsml-parser/src/main/java/org/apache/directory/shared/dsm...
Date Wed, 03 Mar 2010 23:05:32 GMT
Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/LdapResultImplTest.java
Wed Mar  3 23:05:29 2010
@@ -27,7 +27,7 @@
 import org.apache.directory.shared.ldap.message.ResultCodeEnum;
 import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.internal.InternalReferral;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -101,13 +101,13 @@
             }
 
 
-            public LdapDN getMatchedDn()
+            public DN getMatchedDn()
             {
                 return null;
             }
 
 
-            public void setMatchedDn( LdapDN dn )
+            public void setMatchedDn( DN dn )
             {
             }
 
@@ -157,8 +157,8 @@
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah blah blah" );
 
-        r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
+        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new DN( "dc=example,dc=com" ) );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
@@ -188,8 +188,8 @@
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah" );
 
-        r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
+        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new DN( "dc=example,dc=com" ) );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
@@ -219,8 +219,8 @@
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah blah blah" );
 
-        r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new LdapDN( "dc=apache,dc=org")  );
+        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new DN( "dc=apache,dc=org")  );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
@@ -250,8 +250,8 @@
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah blah blah" );
 
-        r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
+        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new DN( "dc=example,dc=com" ) );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.SIZE_LIMIT_EXCEEDED );
@@ -281,8 +281,8 @@
         r0.setErrorMessage( "blah blah blah" );
         r1.setErrorMessage( "blah blah blah" );
 
-        r0.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
-        r1.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
+        r0.setMatchedDn( new DN( "dc=example,dc=com" ) );
+        r1.setMatchedDn( new DN( "dc=example,dc=com" ) );
 
         r0.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );
         r1.setResultCode( ResultCodeEnum.TIME_LIMIT_EXCEEDED );

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyDnRequestImplTest.java
Wed Mar  3 23:05:29 2010
@@ -32,7 +32,7 @@
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.message.internal.InternalModifyDnRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.apache.directory.shared.ldap.name.RDN;
 import org.junit.Test;
 
@@ -60,9 +60,9 @@
         
         try
         {
-            request.setName( new LdapDN( "dc=admins,dc=apache,dc=org" ) );
+            request.setName( new DN( "dc=admins,dc=apache,dc=org" ) );
             request.setNewRdn( new RDN( "dc=administrators" ) );
-            request.setNewSuperior( new LdapDN( "dc=groups,dc=apache,dc=org" ) );
+            request.setNewSuperior( new DN( "dc=groups,dc=apache,dc=org" ) );
         }
         catch ( InvalidNameException ine )
         {
@@ -132,10 +132,10 @@
     public void testNotEqualDiffName() throws InvalidNameException
     {
         ModifyDnRequestImpl req0 = getRequest();
-        req0.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+        req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
 
         ModifyDnRequestImpl req1 = getRequest();
-        req1.setName( new LdapDN( "cn=admin,dc=apache,dc=org" ) );
+        req1.setName( new DN( "cn=admin,dc=apache,dc=org" ) );
 
         assertFalse( req0.equals( req1 ) );
     }
@@ -148,10 +148,10 @@
     public void testNotEqualDiffNewSuperior() throws InvalidNameException
     {
         ModifyDnRequestImpl req0 = getRequest();
-        req0.setNewSuperior( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+        req0.setNewSuperior( new DN( "cn=admin,dc=example,dc=com" ) );
 
         ModifyDnRequestImpl req1 = getRequest();
-        req1.setNewSuperior( new LdapDN( "cn=admin,dc=apache,dc=org" ) );
+        req1.setNewSuperior( new DN( "cn=admin,dc=apache,dc=org" ) );
 
         assertFalse( req0.equals( req1 ) );
     }
@@ -198,11 +198,11 @@
     {
         InternalModifyDnRequest req0 = new InternalModifyDnRequest()
         {
-            public LdapDN getName()
+            public DN getName()
             {
                 try
                 {
-                    return new LdapDN( "dc=admins,dc=apache,dc=org" );
+                    return new DN( "dc=admins,dc=apache,dc=org" );
                 }
                 catch ( InvalidNameException ine )
                 {
@@ -212,7 +212,7 @@
             }
 
 
-            public void setName( LdapDN name )
+            public void setName( DN name )
             {
             }
 
@@ -247,11 +247,11 @@
             }
 
 
-            public LdapDN getNewSuperior()
+            public DN getNewSuperior()
             {
                 try
                 {
-                    return new LdapDN( "dc=groups,dc=apache,dc=org" );
+                    return new DN( "dc=groups,dc=apache,dc=org" );
                 }
                 catch ( InvalidNameException ine )
                 {
@@ -261,7 +261,7 @@
             }
 
 
-            public void setNewSuperior( LdapDN newSuperior )
+            public void setNewSuperior( DN newSuperior )
             {
             }
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/ModifyRequestImplTest.java
Wed Mar  3 23:05:29 2010
@@ -40,7 +40,7 @@
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.message.internal.InternalModifyRequest;
 import org.apache.directory.shared.ldap.message.internal.InternalResultResponse;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 
 
@@ -66,7 +66,7 @@
         
         try 
         {
-            req.setName( new LdapDN( "cn=admin,dc=apache,dc=org" ) );
+            req.setName( new DN( "cn=admin,dc=apache,dc=org" ) );
         }
         catch ( InvalidNameException ne )
         {
@@ -139,9 +139,9 @@
         try
         {
             ModifyRequestImpl req0 = getRequest();
-            req0.setName( new LdapDN( "cn=admin,dc=example,dc=com" ) );
+            req0.setName( new DN( "cn=admin,dc=example,dc=com" ) );
             ModifyRequestImpl req1 = getRequest();
-            req1.setName( new LdapDN( "cn=admin,dc=apache,dc=org" ) );
+            req1.setName( new DN( "cn=admin,dc=apache,dc=org" ) );
 
             assertFalse( req0.equals( req1 ) );
         }
@@ -298,11 +298,11 @@
             }
 
 
-            public LdapDN getName()
+            public DN getName()
             {
                 try
                 {
-                    return new LdapDN( "cn=admin,dc=apache,dc=org" );
+                    return new DN( "cn=admin,dc=apache,dc=org" );
                 }
                 catch ( Exception e )
                 {
@@ -312,7 +312,7 @@
             }
 
 
-            public void setName( LdapDN name )
+            public void setName( DN name )
             {
             }
 

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseDoneImplTest.java
Wed Mar  3 23:05:29 2010
@@ -32,7 +32,7 @@
 import org.apache.directory.shared.ldap.message.control.Control;
 import org.apache.directory.shared.ldap.message.internal.InternalLdapResult;
 import org.apache.directory.shared.ldap.message.internal.InternalSearchResponseDone;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 
 
@@ -59,7 +59,7 @@
         
         try
         {
-            result.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
+            result.setMatchedDn( new DN( "dc=example,dc=com" ) );
         }
         catch ( InvalidNameException ine )
         {
@@ -115,7 +115,7 @@
                 
                 try
                 {
-                    result.setMatchedDn( new LdapDN( "dc=example,dc=com" ) );
+                    result.setMatchedDn( new DN( "dc=example,dc=com" ) );
                 }
                 catch ( Exception e ) 
                 {

Modified: directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
URL: http://svn.apache.org/viewvc/directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java?rev=918756&r1=918755&r2=918756&view=diff
==============================================================================
--- directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
(original)
+++ directory/shared/trunk/ldap/src/test/java/org/apache/directory/shared/ldap/message/SearchResponseEntryImplTest.java
Wed Mar  3 23:05:29 2010
@@ -28,7 +28,7 @@
 import org.apache.directory.shared.ldap.entry.client.DefaultClientAttribute;
 import org.apache.directory.shared.ldap.entry.client.DefaultClientEntry;
 import org.apache.directory.shared.ldap.message.SearchResponseEntryImpl;
-import org.apache.directory.shared.ldap.name.LdapDN;
+import org.apache.directory.shared.ldap.name.DN;
 import org.junit.Test;
 import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
@@ -92,11 +92,11 @@
     {
         SearchResponseEntryImpl resp0 = new SearchResponseEntryImpl( 5 );
         resp0.setEntry( getEntry() );
-        resp0.setObjectName( new LdapDN( "dc=example,dc=com" ) );
+        resp0.setObjectName( new DN( "dc=example,dc=com" ) );
 
         SearchResponseEntryImpl resp1 = new SearchResponseEntryImpl( 5 );
         resp1.setEntry( getEntry() );
-        resp1.setObjectName( new LdapDN( "dc=example,dc=com" ) );
+        resp1.setObjectName( new DN( "dc=example,dc=com" ) );
 
         assertTrue( "exact copies should be equal", resp0.equals( resp1 ) );
         assertTrue( "exact copies should be equal", resp1.equals( resp0 ) );
@@ -111,11 +111,11 @@
     {
         SearchResponseEntryImpl resp0 = new SearchResponseEntryImpl( 5 );
         resp0.setEntry( getEntry() );
-        resp0.setObjectName( new LdapDN( "dc=apache,dc=org" ) );
+        resp0.setObjectName( new DN( "dc=apache,dc=org" ) );
 
         SearchResponseEntryImpl resp1 = new SearchResponseEntryImpl( 5 );
         resp1.setEntry( getEntry() );
-        resp1.setObjectName( new LdapDN( "dc=example,dc=com" ) );
+        resp1.setObjectName( new DN( "dc=example,dc=com" ) );
 
         assertFalse( "different object names should not be equal", resp1.equals( resp0 )
);
         assertFalse( "different object names should not be equal", resp0.equals( resp1 )
);
@@ -131,11 +131,11 @@
         SearchResponseEntryImpl resp0 = new SearchResponseEntryImpl( 5 );
         resp0.setEntry( getEntry() );
         resp0.getEntry().put( "abc", "123" );
-        resp0.setObjectName( new LdapDN( "dc=apache,dc=org" ) );
+        resp0.setObjectName( new DN( "dc=apache,dc=org" ) );
 
         SearchResponseEntryImpl resp1 = new SearchResponseEntryImpl( 5 );
         resp1.setEntry( getEntry() );
-        resp1.setObjectName( new LdapDN( "dc=apache,dc=org" ) );
+        resp1.setObjectName( new DN( "dc=apache,dc=org" ) );
 
         assertFalse( "different attributes should not be equal", resp1.equals( resp0 ) );
         assertFalse( "different attributes should not be equal", resp0.equals( resp1 ) );



Mime
View raw message