directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ersi...@apache.org
Subject svn commit: r414117 - /directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersTest.java
Date Wed, 14 Jun 2006 06:40:19 GMT
Author: ersiner
Date: Tue Jun 13 23:40:19 2006
New Revision: 414117

URL: http://svn.apache.org/viewvc?rev=414117&view=rev
Log:
Fixed test failures due to LdapDN refactoring.

Modified:
    directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersTest.java

Modified: directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersTest.java
URL: http://svn.apache.org/viewvc/directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersTest.java?rev=414117&r1=414116&r2=414117&view=diff
==============================================================================
--- directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersTest.java
(original)
+++ directory/trunks/apacheds/core-unit/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersTest.java
Tue Jun 13 23:40:19 2006
@@ -129,7 +129,7 @@
         Attributes marked = ( Attributes ) results.get( "cn=marked,ou=configuration,ou=system"
);
         Attribute triggerSubentries = marked.get( SubentryService.TRIGGER_SUBENTRIES );
         assertNotNull( "cn=marked,ou=configuration,ou=system should be marked", triggerSubentries
);
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         // --------------------------------------------------------------------
@@ -164,13 +164,13 @@
         Attributes configuration = ( Attributes ) results.get( "ou=configuration,ou=system"
);
         Attribute triggerSubentries = configuration.get( SubentryService.TRIGGER_SUBENTRIES
);
         assertNotNull( "ou=configuration,ou=system should be marked", triggerSubentries );
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         Attributes interceptors = ( Attributes ) results.get( "ou=interceptors,ou=configuration,ou=system"
);
         triggerSubentries = interceptors.get( SubentryService.TRIGGER_SUBENTRIES );
         assertNotNull( "ou=interceptors,ou=configuration,ou=system should be marked", triggerSubentries
);
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         // --------------------------------------------------------------------
@@ -198,13 +198,13 @@
         Attributes configuration = ( Attributes ) results.get( "ou=configuration,ou=system"
);
         Attribute triggerSubentries = configuration.get( SubentryService.TRIGGER_SUBENTRIES
);
         assertNotNull( "ou=configuration,ou=system should be marked", triggerSubentries );
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         Attributes interceptors = ( Attributes ) results.get( "ou=interceptors,ou=configuration,ou=system"
);
         triggerSubentries = interceptors.get( SubentryService.TRIGGER_SUBENTRIES );
         assertNotNull( "ou=interceptors,ou=configuration,ou=system should be marked", triggerSubentries
);
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         // --------------------------------------------------------------------
@@ -234,7 +234,7 @@
         configuration = ( Attributes ) results.get( "ou=configuration,ou=system" );
         triggerSubentries = configuration.get( SubentryService.TRIGGER_SUBENTRIES );
         assertNotNull( "ou=configuration,ou=system should be marked", triggerSubentries );
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         // --------------------------------------------------------------------
@@ -303,13 +303,13 @@
         Attributes configuration = ( Attributes ) results.get( "ou=configuration,ou=system"
);
         Attribute triggerSubentries = configuration.get( SubentryService.TRIGGER_SUBENTRIES
);
         assertNotNull( "ou=configuration,ou=system should be marked", triggerSubentries );
-        assertEquals( "cn=newname,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=newname,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         Attributes interceptors = ( Attributes ) results.get( "ou=interceptors,ou=configuration,ou=system"
);
         triggerSubentries = interceptors.get( SubentryService.TRIGGER_SUBENTRIES );
         assertNotNull( "ou=interceptors,ou=configuration,ou=system should be marked", triggerSubentries
);
-        assertEquals( "cn=newname,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=newname,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         // --------------------------------------------------------------------
@@ -339,19 +339,19 @@
         Attributes configuration = ( Attributes ) results.get( "ou=configuration,ou=system"
);
         Attribute triggerSubentries = configuration.get( SubentryService.TRIGGER_SUBENTRIES
);
         assertNotNull( "ou=configuration,ou=system should be marked", triggerSubentries );
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         Attributes interceptors = ( Attributes ) results.get( "ou=interceptors,ou=configuration,ou=system"
);
         triggerSubentries = interceptors.get( SubentryService.TRIGGER_SUBENTRIES );
         assertNotNull( "ou=interceptors,ou=configuration,ou=system should be marked", triggerSubentries
);
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         Attributes marked = ( Attributes ) results.get( "cn=marked,ou=configuration,ou=system"
);
         triggerSubentries = marked.get( SubentryService.TRIGGER_SUBENTRIES );
         assertNotNull( "cn=marked,ou=configuration,ou=system should be marked", triggerSubentries
);
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         // --------------------------------------------------------------------
@@ -392,7 +392,7 @@
         assertNotNull( marked );
         triggerSubentries = marked.get( SubentryService.TRIGGER_SUBENTRIES );
         assertNotNull( "cn=marked,ou=configuration,ou=system should be marked", triggerSubentries
);
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
     }
 
@@ -412,19 +412,19 @@
         Attributes configuration = ( Attributes ) results.get( "ou=configuration,ou=system"
);
         Attribute triggerSubentries = configuration.get( SubentryService.TRIGGER_SUBENTRIES
);
         assertNotNull( "ou=configuration,ou=system should be marked", triggerSubentries );
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         Attributes interceptors = ( Attributes ) results.get( "ou=interceptors,ou=configuration,ou=system"
);
         triggerSubentries = interceptors.get( SubentryService.TRIGGER_SUBENTRIES );
         assertNotNull( "ou=interceptors,ou=configuration,ou=system should be marked", triggerSubentries
);
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         Attributes marked = ( Attributes ) results.get( "cn=marked,ou=configuration,ou=system"
);
         triggerSubentries = marked.get( SubentryService.TRIGGER_SUBENTRIES );
         assertNotNull( "cn=marked,ou=configuration,ou=system should be marked", triggerSubentries
);
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         // --------------------------------------------------------------------
@@ -465,7 +465,7 @@
         assertNotNull( marked );
         triggerSubentries = marked.get( SubentryService.TRIGGER_SUBENTRIES );
         assertNotNull( "cn=marked,ou=configuration,ou=system should be marked", triggerSubentries
);
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
     }
 
@@ -485,19 +485,19 @@
         Attributes configuration = ( Attributes ) results.get( "ou=configuration,ou=system"
);
         Attribute triggerSubentries = configuration.get( SubentryService.TRIGGER_SUBENTRIES
);
         assertNotNull( "ou=configuration,ou=system should be marked", triggerSubentries );
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         Attributes interceptors = ( Attributes ) results.get( "ou=interceptors,ou=configuration,ou=system"
);
         triggerSubentries = interceptors.get( SubentryService.TRIGGER_SUBENTRIES );
         assertNotNull( "ou=interceptors,ou=configuration,ou=system should be marked", triggerSubentries
);
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         Attributes marked = ( Attributes ) results.get( "cn=marked,ou=configuration,ou=system"
);
         triggerSubentries = marked.get( SubentryService.TRIGGER_SUBENTRIES );
         assertNotNull( "cn=marked,ou=configuration,ou=system should be marked", triggerSubentries
);
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
 
         // --------------------------------------------------------------------
@@ -530,7 +530,7 @@
         assertNotNull( marked );
         triggerSubentries = marked.get( SubentryService.TRIGGER_SUBENTRIES );
         assertNotNull( "cn=marked,ou=interceptors,ou=configuration should be marked", triggerSubentries
);
-        assertEquals( "cn=testsubentry,ou=system", triggerSubentries.get() );
+        assertEquals( "2.5.4.3=testsubentry,2.5.4.11=system", triggerSubentries.get() );
         assertEquals( 1, triggerSubentries.size() );
     }
 



Mime
View raw message