You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@directory.apache.org by el...@apache.org on 2010/04/23 22:58:39 UTC
svn commit: r937513 - in /directory/apacheds/trunk/core-integ/src:
main/java/org/apache/directory/server/core/integ/
test/java/org/apache/directory/server/core/authn/
test/java/org/apache/directory/server/core/authz/
test/java/org/apache/directory/serv...
Author: elecharny
Date: Fri Apr 23 20:58:38 2010
New Revision: 937513
URL: http://svn.apache.org/viewvc?rev=937513&view=rev
Log:
o Fixed a typo in a method name
o Set the AccessControlEnabled to true for Authz test
o Added the grantRename for the rename tests
Modified:
directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
Modified: directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java?rev=937513&r1=937512&r2=937513&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/main/java/org/apache/directory/server/core/integ/IntegrationUtils.java Fri Apr 23 20:58:38 2010
@@ -393,7 +393,7 @@ public class IntegrationUtils
}
- public static void closeConections()
+ public static void closeConnections()
{
for( LdapConnection con : openConnections )
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java?rev=937513&r1=937512&r2=937513&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authn/SimpleAuthenticationIT.java Fri Apr 23 20:58:38 2010
@@ -74,7 +74,7 @@ public class SimpleAuthenticationIT exte
@After
public void closeConnections()
{
- IntegrationUtils.closeConections();
+ IntegrationUtils.closeConnections();
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java?rev=937513&r1=937512&r2=937513&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AddAuthorizationIT.java Fri Apr 23 20:58:38 2010
@@ -64,7 +64,7 @@ public class AddAuthorizationIT extends
@After
public void closeConnections()
{
- IntegrationUtils.closeConections();
+ IntegrationUtils.closeConnections();
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java?rev=937513&r1=937512&r2=937513&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AdministratorsGroupIT.java Fri Apr 23 20:58:38 2010
@@ -60,7 +60,7 @@ public class AdministratorsGroupIT exten
@After
public void closeConnections()
{
- IntegrationUtils.closeConections();
+ IntegrationUtils.closeConnections();
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java?rev=937513&r1=937512&r2=937513&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthzAuthnIT.java Fri Apr 23 20:58:38 2010
@@ -55,13 +55,14 @@ public class AuthzAuthnIT extends Abstra
public void setService()
{
AutzIntegUtils.service = service;
+ service.setAccessControlEnabled( true );
}
@After
public void closeConnections()
{
- IntegrationUtils.closeConections();
+ IntegrationUtils.closeConnections();
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java?rev=937513&r1=937512&r2=937513&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/CompareAuthorizationIT.java Fri Apr 23 20:58:38 2010
@@ -65,7 +65,7 @@ public class CompareAuthorizationIT exte
@After
public void closeConnections()
{
- IntegrationUtils.closeConections();
+ IntegrationUtils.closeConnections();
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java?rev=937513&r1=937512&r2=937513&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/DeleteAuthorizationIT.java Fri Apr 23 20:58:38 2010
@@ -63,7 +63,7 @@ public class DeleteAuthorizationIT exten
@After
public void closeConnections()
{
- IntegrationUtils.closeConections();
+ IntegrationUtils.closeConnections();
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java?rev=937513&r1=937512&r2=937513&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/GeneralAuthorizationIT.java Fri Apr 23 20:58:38 2010
@@ -52,7 +52,7 @@ public class GeneralAuthorizationIT exte
@After
public void closeConnections()
{
- IntegrationUtils.closeConections();
+ IntegrationUtils.closeConnections();
}
/**
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java?rev=937513&r1=937512&r2=937513&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/ModifyAuthorizationIT.java Fri Apr 23 20:58:38 2010
@@ -73,7 +73,7 @@ public class ModifyAuthorizationIT exten
@After
public void closeConnections()
{
- IntegrationUtils.closeConections();
+ IntegrationUtils.closeConnections();
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java?rev=937513&r1=937512&r2=937513&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/MoveRenameAuthorizationIT.java Fri Apr 23 20:58:38 2010
@@ -60,12 +60,13 @@ public class MoveRenameAuthorizationIT e
public void setService()
{
AutzIntegUtils.service = service;
+ service.setAccessControlEnabled( true );
}
@After
public void closeConnections()
{
- IntegrationUtils.closeConections();
+ IntegrationUtils.closeConnections();
}
@@ -140,7 +141,8 @@ public class MoveRenameAuthorizationIT e
boolean isMoved = false;
ModifyDnResponse moveResp = userConnection.move( entryDN.getName(), newParentRdn + ",ou=system" );
- if( moveResp.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS )
+
+ if ( moveResp.getLdapResult().getResultCode() == ResultCodeEnum.SUCCESS )
{
isMoved = true;
}
@@ -153,7 +155,8 @@ public class MoveRenameAuthorizationIT e
ModifyDnResponse resp = userConnection.rename( entryRdn + "," + newParentRdn + ",ou=system", newNameRdn );
ResultCodeEnum code = resp.getLdapResult().getResultCode();
- if( code == ResultCodeEnum.SUCCESS || code == ResultCodeEnum.ENTRY_ALREADY_EXISTS )
+
+ if ( ( code == ResultCodeEnum.SUCCESS ) || ( code == ResultCodeEnum.ENTRY_ALREADY_EXISTS ) )
{
userConnection.delete( newNameRdn + "," + newParentRdn + ",ou=system" );
result = true;
@@ -350,7 +353,7 @@ public class MoveRenameAuthorizationIT e
createAccessControlSubentry( "grantMoveByName", "{ " + "identificationTag \"addAci\", " + "precedence 14, "
+ "authenticationLevel none, " + "itemOrUserFirst userFirst: { "
+ "userClasses { name { \"uid=billyd,ou=users,ou=system\" } }, " + "userPermissions { { "
- + "protectedItems {entry}, " + "grantsAndDenials { grantExport, grantImport, grantBrowse } } } } }" );
+ + "protectedItems {entry}, " + "grantsAndDenials { grantExport, grantImport, grantRename, grantBrowse } } } } }" );
// try move operation which should succeed with ACI
assertTrue( checkCanMoveAndRenameAs( "billyd", "billyd", "ou=testou", "ou=testou", "ou=groups" ) );
@@ -431,7 +434,7 @@ public class MoveRenameAuthorizationIT e
createAccessControlSubentry( "grantMoveByTree", "{ " + "identificationTag \"addAci\", " + "precedence 14, "
+ "authenticationLevel none, " + "itemOrUserFirst userFirst: { "
+ "userClasses { subtree { { base \"ou=users,ou=system\" } } }, " + "userPermissions { { "
- + "protectedItems {entry}, " + "grantsAndDenials { grantExport, grantImport, grantBrowse } } } } }" );
+ + "protectedItems {entry}, " + "grantsAndDenials { grantExport, grantImport, grantRename, grantBrowse } } } } }" );
// try move operation which should succeed with ACI
assertTrue( checkCanMoveAndRenameAs( "billyd", "billyd", "ou=testou", "ou=testou", "ou=groups" ) );
@@ -511,7 +514,7 @@ public class MoveRenameAuthorizationIT e
createAccessControlSubentry( "grantMoveByAny", "{ " + "identificationTag \"addAci\", " + "precedence 14, "
+ "authenticationLevel none, " + "itemOrUserFirst userFirst: { " + "userClasses { allUsers }, "
+ "userPermissions { { " + "protectedItems {entry}, "
- + "grantsAndDenials { grantExport, grantImport, grantBrowse } } } } }" );
+ + "grantsAndDenials { grantExport, grantImport, grantRename, grantBrowse } } } } }" );
// try move operation which should succeed with ACI
assertTrue( checkCanMoveAndRenameAs( "billyd", "billyd", "ou=testou", "ou=testou", "ou=groups" ) );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java?rev=937513&r1=937512&r2=937513&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/SearchAuthorizationIT.java Fri Apr 23 20:58:38 2010
@@ -80,7 +80,7 @@ public class SearchAuthorizationIT exten
@After
public void closeConnections()
{
- IntegrationUtils.closeConections();
+ IntegrationUtils.closeConnections();
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java?rev=937513&r1=937512&r2=937513&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/changelog/DefaultChangeLogIT.java Fri Apr 23 20:58:38 2010
@@ -66,7 +66,7 @@ public class DefaultChangeLogIT extends
@After
public void closeConnections()
{
- IntegrationUtils.closeConections();
+ IntegrationUtils.closeConnections();
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java?rev=937513&r1=937512&r2=937513&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java Fri Apr 23 20:58:38 2010
@@ -90,7 +90,7 @@ public class ExceptionServiceIT extends
@After
public void closeConnections()
{
- IntegrationUtils.closeConections();
+ IntegrationUtils.closeConnections();
}