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 2012/01/24 17:42:46 UTC
svn commit: r1235347 [1/5] - in /directory/apacheds/trunk/core-integ/src:
main/java/org/apache/directory/server/core/integ/
test/java/org/apache/directory/server/core/admin/
test/java/org/apache/directory/server/core/authn/
test/java/org/apache/directo...
Author: elecharny
Date: Tue Jan 24 16:42:44 2012
New Revision: 1235347
URL: http://svn.apache.org/viewvc?rev=1235347&view=rev
Log:
Formatted the code using Directory formatter
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/admin/AdministrativePointServiceIT.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/AuthorizationServiceAsAdminIT.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/AutzIntegUtils.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/LookupAuthorizationIT.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/authz/support/MaxImmSubFilterTest.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/collective/CollectiveAttributeServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/configuration/PartitionConfigurationIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/event/EventServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/exception/ExceptionServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/AddIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/CreateContextIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER169IT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER783IT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DIRSERVER791IT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/DestroyContextIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ExtensibleObjectIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ListIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/MixedCaseIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ModifyContextIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ObjStateFactoryIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RFC2713IT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/ReferralIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/RootDSEIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/jndi/UniqueMemberIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/normalization/NormalizationServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/operational/OperationalAttributeServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/partition/PartitionIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/prefs/PreferencesIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/AbstractMetaSchemaObjectHandler.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaAttributeTypeHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaComparatorHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaMatchingRuleHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaNormalizerHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaObjectClassHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSchemaHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxCheckerHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/MetaSyntaxHandlerIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/ObjectClassCreateIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/PartitionSchemaLoaderTest.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaPersistenceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SchemaServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/schema/SubschemaSubentryIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/sp/LdapClassLoaderIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/BadSubentryServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceEntryModificationHandlingIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/subtree/SubentryServiceObjectClassChangeHandlingIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/MigratedStockCoreISuite.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/suites/StockCoreISuite.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/BackupUtilities.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/BackupUtilitiesSP.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/ListUtilsSP.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/LoggingUtilities.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/SubentryServiceForTriggersIT.java
directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/trigger/TriggerInterceptorIT.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=1235347&r1=1235346&r2=1235347&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 Tue Jan 24 16:42:44 2012
@@ -71,6 +71,7 @@ public class IntegrationUtils
private static final List<LdapConnection> openConnections = new ArrayList<LdapConnection>();
+
/**
* Deletes the working directory.
*
@@ -142,7 +143,7 @@ public class IntegrationUtils
public static LdapContext getContext( String principalDn, DirectoryService service, String dn )
- throws Exception
+ throws Exception
{
if ( principalDn == null )
{
@@ -207,19 +208,19 @@ public class IntegrationUtils
Dn dn = entry.getDn();
CoreSession session = service.getAdminSession();
- switch( entry.getChangeType().getChangeType() )
+ switch ( entry.getChangeType().getChangeType() )
{
- case( ChangeType.ADD_ORDINAL ):
+ case ( ChangeType.ADD_ORDINAL ):
session.add(
new DefaultEntry( service.getSchemaManager(), entry.getEntry() ) );
break;
- case( ChangeType.DELETE_ORDINAL ):
+ case ( ChangeType.DELETE_ORDINAL ):
session.delete( dn );
break;
- case( ChangeType.MODDN_ORDINAL ):
- case( ChangeType.MODRDN_ORDINAL ):
+ case ( ChangeType.MODDN_ORDINAL ):
+ case ( ChangeType.MODRDN_ORDINAL ):
Rdn newRdn = new Rdn( entry.getNewRdn() );
if ( entry.getNewSuperior() != null )
@@ -252,7 +253,7 @@ public class IntegrationUtils
break;
- case( ChangeType.MODIFY_ORDINAL ):
+ case ( ChangeType.MODIFY_ORDINAL ):
session.modify( dn, entry.getModifications() );
break;
@@ -263,7 +264,7 @@ public class IntegrationUtils
public static LdifEntry getUserAddLdif( String dnstr, byte[] password, String cn, String sn )
- throws LdapException
+ throws LdapException
{
Dn dn = new Dn( dnstr );
LdifEntry ldif = new LdifEntry();
@@ -294,11 +295,11 @@ public class IntegrationUtils
return ldif;
}
+
// -----------------------------------------------------------------------
// Enable/Disable Schema Tests
// -----------------------------------------------------------------------
-
public static void enableSchema( DirectoryService service, String schemaName ) throws Exception
{
LdapConnection connection = getAdminConnection( service );
@@ -317,7 +318,7 @@ public class IntegrationUtils
// now enable the test schema
Modification mod = new DefaultModification(
ModificationOperation.REPLACE_ATTRIBUTE, "m-disabled", "TRUE" );
-
+
connection.modify( "cn=" + schemaName + ",ou=schema", mod );
}
@@ -365,13 +366,15 @@ public class IntegrationUtils
}
- public static LdapConnection getConnectionAs( DirectoryService dirService, String dn, String password ) throws Exception
+ public static LdapConnection getConnectionAs( DirectoryService dirService, String dn, String password )
+ throws Exception
{
return getConnectionAs( dirService, new Dn( dn ), password );
}
- public static LdapConnection getConnectionAs( DirectoryService dirService, Dn dn, String password ) throws Exception
+ public static LdapConnection getConnectionAs( DirectoryService dirService, Dn dn, String password )
+ throws Exception
{
Object connectionObj = LdapConnectionFactory.getCoreSessionConnection();
@@ -384,7 +387,8 @@ public class IntegrationUtils
}
- public static LdapConnection getNetworkConnectionAs( String host, int port, String dn, String password ) throws Exception
+ public static LdapConnection getNetworkConnectionAs( String host, int port, String dn, String password )
+ throws Exception
{
LdapConnection connection = LdapConnectionFactory.getNetworkConnection( host, port );
@@ -407,7 +411,8 @@ public class IntegrationUtils
}
- public static LdapConnection getNetworkConnectionAs( LdapServer ldapServer, String userDn, String password ) throws Exception
+ public static LdapConnection getNetworkConnectionAs( LdapServer ldapServer, String userDn, String password )
+ throws Exception
{
return getNetworkConnectionAs( "localhost", ldapServer.getPort(), userDn, password );
}
@@ -416,21 +421,21 @@ public class IntegrationUtils
public static void closeConnections()
{
- for( LdapConnection con : openConnections )
+ for ( LdapConnection con : openConnections )
{
- if( con == null )
+ if ( con == null )
{
continue;
}
try
{
- if( con.isConnected() )
+ if ( con.isConnected() )
{
con.close();
}
}
- catch( Exception e )
+ catch ( Exception e )
{
// shouldn't happen, but print the stacktrace so that less pain during development to find the cause
e.printStackTrace();
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java?rev=1235347&r1=1235346&r2=1235347&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/admin/AdministrativePointServiceIT.java Tue Jan 24 16:42:44 2012
@@ -94,11 +94,11 @@ public class AdministrativePointServiceI
@Test
public void testAddAutonomousArea() throws Exception
{
- Entry autonomousArea = new DefaultEntry(
- "ou=autonomousArea, ou=system",
+ Entry autonomousArea = new DefaultEntry(
+ "ou=autonomousArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: autonomousArea",
+ "ObjectClass: organizationalUnit",
+ "ou: autonomousArea",
"administrativeRole: autonomousArea" );
// It should succeed
@@ -115,13 +115,13 @@ public class AdministrativePointServiceI
assertFalse( entry.contains( "administrativeRole", "2.5.23.4" ) );
assertFalse( entry.contains( "administrativeRole", "triggerExecutionSpecificArea" ) );
- autonomousArea = new DefaultEntry(
- "ou=autonomousArea2, ou=system",
+ autonomousArea = new DefaultEntry(
+ "ou=autonomousArea2, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: autonomousArea2",
+ "ObjectClass: organizationalUnit",
+ "ou: autonomousArea2",
"administrativeRole: autonomousArea",
- "administrativeRole: accessControlSpecificArea",
+ "administrativeRole: accessControlSpecificArea",
"administrativeRole: collectiveAttributeInnerArea",
"administrativeRole: 2.5.23.4", // This is the subSchemaSpecificArea OID
"administrativeRole: TRIGGEREXECUTIONSPECIFICAREA" );
@@ -146,11 +146,11 @@ public class AdministrativePointServiceI
@Test
public void testAddSpecificAreas() throws Exception
{
- Entry autonomousArea = new DefaultEntry(
- "ou=autonomousArea, ou=system",
+ Entry autonomousArea = new DefaultEntry(
+ "ou=autonomousArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: autonomousArea",
+ "ObjectClass: organizationalUnit",
+ "ou: autonomousArea",
"administrativeRole: accessControlSpecificArea",
"administrativeRole: TRIGGEREXECUTIONSPECIFICAREA" );
@@ -176,11 +176,11 @@ public class AdministrativePointServiceI
@Test
public void testAddInnerAreas() throws Exception
{
- Entry autonomousArea = new DefaultEntry(
- "ou=autonomousArea, ou=system",
+ Entry autonomousArea = new DefaultEntry(
+ "ou=autonomousArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: autonomousArea",
+ "ObjectClass: organizationalUnit",
+ "ou: autonomousArea",
"administrativeRole: accessControlINNERArea",
"administrativeRole: TRIGGEREXECUTIONINNERAREA" );
@@ -204,11 +204,11 @@ public class AdministrativePointServiceI
@Test
public void testAddInvalidRole() throws Exception
{
- Entry autonomousArea = new DefaultEntry(
- "ou=autonomousArea, ou=system",
+ Entry autonomousArea = new DefaultEntry(
+ "ou=autonomousArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: autonomousArea",
+ "ObjectClass: organizationalUnit",
+ "ou: autonomousArea",
"administrativeRole: accessControlBadArea",
"administrativeRole: TRIGGEREXECUTIONINNERAREA" );
@@ -231,11 +231,11 @@ public class AdministrativePointServiceI
@Test
public void testAddInnerAndSpecificRole() throws Exception
{
- Entry autonomousArea = new DefaultEntry(
- "ou=autonomousArea, ou=system",
+ Entry autonomousArea = new DefaultEntry(
+ "ou=autonomousArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: autonomousArea",
+ "ObjectClass: organizationalUnit",
+ "ou: autonomousArea",
"administrativeRole: accessControlSpecificArea",
"administrativeRole: accessControlInnerArea" );
@@ -249,8 +249,8 @@ public class AdministrativePointServiceI
assertTrue( true );
}
}
-
-
+
+
/**
* Test the addition of some roles more than once
* @throws Exception
@@ -258,11 +258,11 @@ public class AdministrativePointServiceI
@Test
public void testAddRoleMorehanOnce() throws Exception
{
- Entry autonomousArea = new DefaultEntry(
- "ou=autonomousArea, ou=system",
+ Entry autonomousArea = new DefaultEntry(
+ "ou=autonomousArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: autonomousArea",
+ "ObjectClass: organizationalUnit",
+ "ou: autonomousArea",
"administrativeRole: autonomousArea",
"administrativeRole: 2.5.23.1" );
@@ -290,11 +290,11 @@ public class AdministrativePointServiceI
public void testModifyAddSpecificArea() throws Exception
{
// Inject an CASA
- Entry caArea = new DefaultEntry(
- "ou=caArea, ou=system",
+ Entry caArea = new DefaultEntry(
+ "ou=caArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: caArea",
+ "ObjectClass: organizationalUnit",
+ "ou: caArea",
"administrativeRole: collectiveAttributeSpecificArea" );
connection.add( caArea );
@@ -320,11 +320,11 @@ public class AdministrativePointServiceI
{
// Inject an CASA
Entry caArea = new DefaultEntry(
- "ou=caArea, ou=system",
- "ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: caArea",
- "administrativeRole: collectiveAttributeSpecificArea");
+ "ou=caArea, ou=system",
+ "ObjectClass: top",
+ "ObjectClass: organizationalUnit",
+ "ou: caArea",
+ "administrativeRole: collectiveAttributeSpecificArea" );
connection.add( caArea );
@@ -348,11 +348,11 @@ public class AdministrativePointServiceI
public void testModifyAddInnerAreaToSameSpecificArea() throws Exception
{
// Inject an CASA
- Entry caArea = new DefaultEntry(
- "ou=caArea, ou=system",
+ Entry caArea = new DefaultEntry(
+ "ou=caArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: caArea",
+ "ObjectClass: organizationalUnit",
+ "ou: caArea",
"administrativeRole: collectiveAttributeSpecificArea" );
connection.add( caArea );
@@ -360,7 +360,7 @@ public class AdministrativePointServiceI
// Add another specific area
Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
new DefaultAttribute( "administrativeRole", "collectiveAttributeInnerArea" ) );
-
+
try
{
connection.modify( "ou=caArea, ou=system", modification );
@@ -381,11 +381,11 @@ public class AdministrativePointServiceI
public void testModifyAddSameSpecificArea() throws Exception
{
// Inject an CASA
- Entry caArea = new DefaultEntry(
- "ou=caArea, ou=system",
+ Entry caArea = new DefaultEntry(
+ "ou=caArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: caArea",
+ "ObjectClass: organizationalUnit",
+ "ou: caArea",
"administrativeRole: collectiveAttributeSpecificArea" );
connection.add( caArea );
@@ -393,7 +393,7 @@ public class AdministrativePointServiceI
// Add another specific area
Modification modification = new DefaultModification( ModificationOperation.ADD_ATTRIBUTE,
new DefaultAttribute( "administrativeRole", "collectiveAttributeSpecificArea" ) );
-
+
try
{
connection.modify( "ou=caArea, ou=system", modification );
@@ -414,11 +414,11 @@ public class AdministrativePointServiceI
public void testModifyDeleteAll() throws Exception
{
// Inject an CASA
- Entry caArea = new DefaultEntry(
- "ou=caArea, ou=system",
+ Entry caArea = new DefaultEntry(
+ "ou=caArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: caArea",
+ "ObjectClass: organizationalUnit",
+ "ou: caArea",
"administrativeRole: collectiveAttributeSpecificArea",
"administrativeRole: accessControlSpecificArea" );
@@ -443,11 +443,11 @@ public class AdministrativePointServiceI
public void testModifyDeleteAll2() throws Exception
{
// Inject an CASA
- Entry caArea = new DefaultEntry(
- "ou=caArea, ou=system",
+ Entry caArea = new DefaultEntry(
+ "ou=caArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: caArea",
+ "ObjectClass: organizationalUnit",
+ "ou: caArea",
"administrativeRole: collectiveAttributeSpecificArea",
"administrativeRole: accessControlSpecificArea" );
@@ -473,11 +473,11 @@ public class AdministrativePointServiceI
public void testModifyDeleteSomeRole() throws Exception
{
// Inject an CASA
- Entry caArea = new DefaultEntry(
- "ou=caArea, ou=system",
+ Entry caArea = new DefaultEntry(
+ "ou=caArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: caArea",
+ "ObjectClass: organizationalUnit",
+ "ou: caArea",
"administrativeRole: collectiveAttributeSpecificArea",
"administrativeRole: accessControlSpecificArea" );
@@ -504,11 +504,11 @@ public class AdministrativePointServiceI
public void testModifyDeleteSomeInexistingRole() throws Exception
{
// Inject an CASA
- Entry caArea = new DefaultEntry(
- "ou=caArea, ou=system",
+ Entry caArea = new DefaultEntry(
+ "ou=caArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: caArea",
+ "ObjectClass: organizationalUnit",
+ "ou: caArea",
"administrativeRole: collectiveAttributeSpecificArea",
"administrativeRole: accessControlSpecificArea" );
@@ -517,7 +517,7 @@ public class AdministrativePointServiceI
// Add another specific area
Modification modification = new DefaultModification( ModificationOperation.REMOVE_ATTRIBUTE,
new DefaultAttribute( "administrativeRole", "triggerExecutionSpecificArea" ) );
-
+
try
{
connection.modify( "ou=caArea, ou=system", modification );
@@ -538,11 +538,11 @@ public class AdministrativePointServiceI
public void testModifyCombined() throws Exception
{
// Inject an CASA
- Entry caArea = new DefaultEntry(
- "ou=caArea, ou=system",
+ Entry caArea = new DefaultEntry(
+ "ou=caArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: caArea",
+ "ObjectClass: organizationalUnit",
+ "ou: caArea",
"administrativeRole: collectiveAttributeSpecificArea",
"administrativeRole: accessControlSpecificArea" );
@@ -573,11 +573,11 @@ public class AdministrativePointServiceI
public void testModifyReplace() throws Exception
{
// Inject an CASA
- Entry caArea = new DefaultEntry(
- "ou=caArea, ou=system",
+ Entry caArea = new DefaultEntry(
+ "ou=caArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: caArea",
+ "ObjectClass: organizationalUnit",
+ "ou: caArea",
"administrativeRole: collectiveAttributeSpecificArea" );
connection.add( caArea );
@@ -585,7 +585,7 @@ public class AdministrativePointServiceI
// Try to modify it to an InnerArea
Modification modification = new DefaultModification( ModificationOperation.REPLACE_ATTRIBUTE,
new DefaultAttribute( "administrativeRole", "collectiveAttributeSpecificArea" ) );
-
+
try
{
connection.modify( "ou=caArea, ou=system", modification );
@@ -609,11 +609,11 @@ public class AdministrativePointServiceI
public void testMoveAutonomousArea() throws Exception
{
// Inject an AAA
- Entry autonomousArea = new DefaultEntry(
- "ou=autonomousArea, ou=system",
+ Entry autonomousArea = new DefaultEntry(
+ "ou=autonomousArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: autonomousArea",
+ "ObjectClass: organizationalUnit",
+ "ou: autonomousArea",
"administrativeRole: autonomousArea" );
connection.add( autonomousArea );
@@ -642,11 +642,11 @@ public class AdministrativePointServiceI
public void testMoveAndRenameAutonomousArea() throws Exception
{
// Inject an AAA
- Entry autonomousArea = new DefaultEntry(
- "ou=autonomousArea, ou=system",
+ Entry autonomousArea = new DefaultEntry(
+ "ou=autonomousArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: autonomousArea",
+ "ObjectClass: organizationalUnit",
+ "ou: autonomousArea",
"administrativeRole: autonomousArea" );
connection.add( autonomousArea );
@@ -675,11 +675,11 @@ public class AdministrativePointServiceI
public void testRenameAutonomousArea() throws Exception
{
// Inject an AAA
- Entry autonomousArea = new DefaultEntry(
- "ou=autonomousArea, ou=system",
+ Entry autonomousArea = new DefaultEntry(
+ "ou=autonomousArea, ou=system",
"ObjectClass: top",
- "ObjectClass: organizationalUnit",
- "ou: autonomousArea",
+ "ObjectClass: organizationalUnit",
+ "ou: autonomousArea",
"administrativeRole: autonomousArea" );
connection.add( autonomousArea );
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=1235347&r1=1235346&r2=1235347&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 Tue Jan 24 16:42:44 2012
@@ -92,7 +92,7 @@ public class SimpleAuthenticationIT exte
Entry entry = connection.lookup( userDn );
performAdminAccountChecks( entry );
assertTrue( ArrayUtils.isEquals( entry.get( "userPassword" ).get().getBytes(), Strings
- .getBytesUtf8("secret") ) );
+ .getBytesUtf8( "secret" ) ) );
connection.close();
getService().shutdown();
@@ -102,7 +102,7 @@ public class SimpleAuthenticationIT exte
entry = connection.lookup( userDn );
performAdminAccountChecks( entry );
assertTrue( ArrayUtils.isEquals( entry.get( "userPassword" ).get().getBytes(), Strings
- .getBytesUtf8("secret") ) );
+ .getBytesUtf8( "secret" ) ) );
connection.close();
}
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=1235347&r1=1235346&r2=1235347&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 Tue Jan 24 16:42:44 2012
@@ -188,21 +188,21 @@ public class AddAuthorizationIT extends
// now add a subentry that enables user billyd to add an entry below ou=system
createAccessControlSubentry( "billydAdd",
"{ " +
- " identificationTag \"addAci\", " +
- " precedence 14, " +
- " authenticationLevel none, " +
- " itemOrUserFirst userFirst: " +
- " { " +
- " userClasses { name { \"uid=billyd,ou=users,ou=system\" } }, " +
- " userPermissions " +
- " { " +
- " { " +
- " protectedItems {entry, allUserAttributeTypesAndValues}, " +
- " grantsAndDenials { grantAdd, grantBrowse } " +
- " } " +
- " } " +
- " } " +
- "}" );
+ " identificationTag \"addAci\", " +
+ " precedence 14, " +
+ " authenticationLevel none, " +
+ " itemOrUserFirst userFirst: " +
+ " { " +
+ " userClasses { name { \"uid=billyd,ou=users,ou=system\" } }, " +
+ " userPermissions " +
+ " { " +
+ " { " +
+ " protectedItems {entry, allUserAttributeTypesAndValues}, " +
+ " grantsAndDenials { grantAdd, grantBrowse } " +
+ " } " +
+ " } " +
+ " } " +
+ "}" );
// should work now that billyd is authorized by name
assertTrue( checkCanAddEntryAs( "billyd", "billyd", "ou=testou" ) );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java?rev=1235347&r1=1235346&r2=1235347&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AuthorizationServiceAsAdminIT.java Tue Jan 24 16:42:44 2012
@@ -79,7 +79,7 @@ public class AuthorizationServiceAsAdmin
*
* @throws Exception if there are problems
*/
- @Test( expected=LdapNoPermissionException.class )
+ @Test(expected = LdapNoPermissionException.class)
public void testNoDeleteOnAdminByAdmin() throws Exception
{
getAdminConnection().delete( "uid=admin,ou=system" );
@@ -91,7 +91,7 @@ public class AuthorizationServiceAsAdmin
*
* @throws Exception if there are problems
*/
- @Test( expected=LdapNoPermissionException.class )
+ @Test(expected = LdapNoPermissionException.class)
public void testNoRdnChangesOnAdminByAdmin() throws Exception
{
getAdminConnection().rename( new Dn( "uid=admin,ou=system" ), new Rdn( "uid=alex" ) );
@@ -117,7 +117,7 @@ public class AuthorizationServiceAsAdmin
connection = getConnectionAs( adminDn, newPwd );
Entry entry = connection.lookup( adminDn.getName() );
- assertTrue( ArrayUtils.isEquals( Strings.getBytesUtf8(newPwd), entry.get( "userPassword" ).get()
+ assertTrue( ArrayUtils.isEquals( Strings.getBytesUtf8( newPwd ), entry.get( "userPassword" ).get()
.getBytes() ) );
}
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=1235347&r1=1235346&r2=1235347&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 Tue Jan 24 16:42:44 2012
@@ -123,21 +123,21 @@ public class AuthzAuthnIT extends Abstra
// user will need appropriate Read permissions.
createAccessControlSubentry( "grantBrowseForTheWholeNamingContext", "{ maximum 0 }", // !!!!! Replace this with "{ minimum 1 }" for practicing !
"{ " +
- " identificationTag \"browseACI\", " +
- " precedence 14, " +
- " authenticationLevel none, " +
- " itemOrUserFirst userFirst: " +
- " { " +
- " userClasses { name { \"uid=billyd,ou=users,ou=system\" } }, " +
- " userPermissions " +
- " { " +
- " { " +
- " protectedItems { entry }, " +
- " grantsAndDenials { grantBrowse } " +
- " } " +
- " } " +
- " } " +
- "}" );
+ " identificationTag \"browseACI\", " +
+ " precedence 14, " +
+ " authenticationLevel none, " +
+ " itemOrUserFirst userFirst: " +
+ " { " +
+ " userClasses { name { \"uid=billyd,ou=users,ou=system\" } }, " +
+ " userPermissions " +
+ " { " +
+ " { " +
+ " protectedItems { entry }, " +
+ " grantsAndDenials { grantBrowse } " +
+ " } " +
+ " } " +
+ " } " +
+ "}" );
Dn userName = new Dn( "uid=billyd,ou=users,ou=system" );
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java?rev=1235347&r1=1235346&r2=1235347&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/AutzIntegUtils.java Tue Jan 24 16:42:44 2012
@@ -86,10 +86,10 @@ public class AutzIntegUtils
public static Dn createGroup( String cn, String firstMemberDn ) throws Exception
{
Dn groupDn = new Dn( "cn=" + cn + ",ou=groups,ou=system" );
- Entry entry = new DefaultEntry(
+ Entry entry = new DefaultEntry(
service.getSchemaManager(),
- "cn=" + cn + ",ou=groups,ou=system",
- "ObjectClass: top",
+ "cn=" + cn + ",ou=groups,ou=system",
+ "ObjectClass: top",
"ObjectClass: groupOfUniqueNames",
"uniqueMember:", firstMemberDn,
"cn:", cn );
@@ -127,20 +127,20 @@ public class AutzIntegUtils
{
LdapConnection connection = getAdminConnection();
- Entry entry = new DefaultEntry(
+ Entry entry = new DefaultEntry(
service.getSchemaManager(),
"uid=" + uid + ",ou=users,ou=system",
"uid", uid,
- "objectClass: top",
- "objectClass: person",
- "objectClass: organizationalPerson",
+ "objectClass: top",
+ "objectClass: person",
+ "objectClass: organizationalPerson",
"objectClass: inetOrgPerson",
"sn", uid,
"cn", uid,
"userPassword", password );
connection.add( entry );
- assertTrue( connection.exists( entry.getDn() ) );
+ assertTrue( connection.exists( entry.getDn() ) );
return entry.getDn();
}
@@ -159,10 +159,10 @@ public class AutzIntegUtils
{
Dn groupDn = new Dn( "cn=" + groupName + ",ou=groups,ou=system" );
- Entry entry = new DefaultEntry(
+ Entry entry = new DefaultEntry(
service.getSchemaManager(),
"cn=" + groupName + ",ou=groups,ou=system",
- "objectClass: top",
+ "objectClass: top",
"objectClass: groupOfUniqueNames",
"uniqueMember: uid=admin, ou=system",
"cn", groupName );
@@ -257,10 +257,10 @@ public class AutzIntegUtils
}
// now add the A/C subentry below ou=system
- Entry subEntry = new DefaultEntry(
+ Entry subEntry = new DefaultEntry(
"cn=" + cn + ",ou=system",
- "objectClass: top",
- "objectClass: subentry",
+ "objectClass: top",
+ "objectClass: subentry",
"objectClass: accessControlSubentry",
"subtreeSpecification", subtree,
"prescriptiveACI", aciItem );
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=1235347&r1=1235346&r2=1235347&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 Tue Jan 24 16:42:44 2012
@@ -93,7 +93,7 @@ public class CompareAuthorizationIT exte
Dn entryDn = new Dn( service.getSchemaManager(), entryRdn + ",ou=system" );
// create the entry with the telephoneNumber attribute to compare
- Entry testEntry = new DefaultEntry(
+ Entry testEntry = new DefaultEntry(
service.getSchemaManager(),
entryDn.toString(),
"ObjectClass: top",
@@ -110,9 +110,9 @@ public class CompareAuthorizationIT exte
// compare the telephone numbers
LdapConnection userConnection = getConnectionAs( userName, password );
boolean result = true;
-
+
try
- {
+ {
// don't set based on compare result success/failure but based on whether the op was permitted or not
result = userConnection.compare( entryDn, "telephoneNumber", number );
}
@@ -144,24 +144,24 @@ public class CompareAuthorizationIT exte
// Gives grantCompare, and grantRead perm to all users in the Administrators group for
// entries and all attribute types and values
- createAccessControlSubentry(
- "administratorAdd",
- "{ " +
- " identificationTag \"addAci\", " +
- " precedence 14, " +
- " authenticationLevel none, " +
- " itemOrUserFirst userFirst: " +
- " { " +
- " userClasses { userGroup { \"cn=Administrators,ou=groups,ou=system\" } }," +
- " userPermissions " +
- " { " +
- " { " +
- " protectedItems { entry, allUserAttributeTypesAndValues }, " +
- " grantsAndDenials { grantCompare, grantRead, grantBrowse } " +
- " } " +
- " } " +
- " } " +
- "}" );
+ createAccessControlSubentry(
+ "administratorAdd",
+ "{ " +
+ " identificationTag \"addAci\", " +
+ " precedence 14, " +
+ " authenticationLevel none, " +
+ " itemOrUserFirst userFirst: " +
+ " { " +
+ " userClasses { userGroup { \"cn=Administrators,ou=groups,ou=system\" } }," +
+ " userPermissions " +
+ " { " +
+ " { " +
+ " protectedItems { entry, allUserAttributeTypesAndValues }, " +
+ " grantsAndDenials { grantCompare, grantRead, grantBrowse } " +
+ " } " +
+ " } " +
+ " } " +
+ "}" );
// see if we can now add that test entry which we could not before
// add op should still fail since billd is not in the admin group
@@ -269,9 +269,9 @@ public class CompareAuthorizationIT exte
"uid=bob,ou=users,ou=system",
"uid: bob",
"userPassword: bobspassword",
- "ObjectClass: top",
- "ObjectClass: person",
- "ObjectClass: organizationalPerson",
+ "ObjectClass: top",
+ "ObjectClass: person",
+ "ObjectClass: organizationalPerson",
"ObjectClass: inetOrgPerson",
"sn: bob",
"cn: bob" );
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=1235347&r1=1235346&r2=1235347&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 Tue Jan 24 16:42:44 2012
@@ -92,7 +92,7 @@ public class DeleteAuthorizationIT exten
Dn entryDn = new Dn( entryRdn + ",ou=system" );
// create the entry with the telephoneNumber attribute to compare
- Entry testEntry = new DefaultEntry(entryDn);
+ Entry testEntry = new DefaultEntry( entryDn );
testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
testEntry.add( SchemaConstants.OU_AT, "testou" );
@@ -105,14 +105,14 @@ public class DeleteAuthorizationIT exten
// delete the newly created context as the user
LdapConnection userConnection = getConnectionAs( userName, password );
-
+
try
{
userConnection.delete( entryDn );
}
catch ( LdapNoPermissionException lnpe )
{
- adminConnection.delete(entryDn);
+ adminConnection.delete( entryDn );
return false;
}
@@ -136,23 +136,23 @@ public class DeleteAuthorizationIT exten
// Gives grantRemove perm to all users in the Administrators group for
// entries and all attribute types and values
- createAccessControlSubentry( "administratorAdd",
- "{ " +
- " identificationTag \"addAci\", " +
- " precedence 14, " +
- " authenticationLevel none, " +
- " itemOrUserFirst userFirst: " +
- " { " +
- " userClasses { userGroup { \"cn=Administrators,ou=groups,ou=system\" } }, " +
- " userPermissions " +
- " { " +
- " { " +
- " protectedItems {entry}, " +
- " grantsAndDenials { grantRemove, grantBrowse } " +
- " } " +
- " } " +
- " } " +
- "}" );
+ createAccessControlSubentry( "administratorAdd",
+ "{ " +
+ " identificationTag \"addAci\", " +
+ " precedence 14, " +
+ " authenticationLevel none, " +
+ " itemOrUserFirst userFirst: " +
+ " { " +
+ " userClasses { userGroup { \"cn=Administrators,ou=groups,ou=system\" } }, " +
+ " userPermissions " +
+ " { " +
+ " { " +
+ " protectedItems {entry}, " +
+ " grantsAndDenials { grantRemove, grantBrowse } " +
+ " } " +
+ " } " +
+ " } " +
+ "}" );
// see if we can now delete that test entry which we could not before
// delete op should still fail since billd is not in the admin group
@@ -181,22 +181,22 @@ public class DeleteAuthorizationIT exten
assertFalse( checkCanDeleteEntryAs( "billyd", "billyd", "ou=testou" ) );
// now add a subentry that enables user billyd to delete an entry below ou=system
- createAccessControlSubentry( "billydAdd",
- "{ " +
- " identificationTag \"addAci\", " +
- " precedence 14, " +
- " authenticationLevel none, " +
- " itemOrUserFirst userFirst: " +
- " { " +
- " userClasses { name { \"uid=billyd,ou=users,ou=system\" } }, " +
- " userPermissions " +
- " { " +
- " { " + " protectedItems {entry}, " +
- " grantsAndDenials { grantRemove, grantBrowse } " +
- " } " +
- " } " +
- " } " +
- "}" );
+ createAccessControlSubentry( "billydAdd",
+ "{ " +
+ " identificationTag \"addAci\", " +
+ " precedence 14, " +
+ " authenticationLevel none, " +
+ " itemOrUserFirst userFirst: " +
+ " { " +
+ " userClasses { name { \"uid=billyd,ou=users,ou=system\" } }, " +
+ " userPermissions " +
+ " { " +
+ " { " + " protectedItems {entry}, " +
+ " grantsAndDenials { grantRemove, grantBrowse } " +
+ " } " +
+ " } " +
+ " } " +
+ "}" );
// should work now that billyd is authorized by name
assertTrue( checkCanDeleteEntryAs( "billyd", "billyd", "ou=testou" ) );
@@ -218,24 +218,24 @@ public class DeleteAuthorizationIT exten
assertFalse( checkCanDeleteEntryAs( "billyd", "billyd", "ou=testou" ) );
// now add a subentry that enables user billyd to delte an entry below ou=system
- createAccessControlSubentry( "billyAddBySubtree",
- "{ " +
- " identificationTag \"addAci\", " +
- " precedence 14, " +
- " authenticationLevel none, " + " itemOrUserFirst userFirst: " +
- " { " +
- " userClasses " +
- " { " + " subtree { { base \"ou=users,ou=system\" } } " +
- " }, " +
- " userPermissions " +
- " { " +
- " { " +
- " protectedItems {entry}, " +
- " grantsAndDenials { grantRemove, grantBrowse } " +
- " } " +
- " } " +
- " } " +
- "}" );
+ createAccessControlSubentry( "billyAddBySubtree",
+ "{ " +
+ " identificationTag \"addAci\", " +
+ " precedence 14, " +
+ " authenticationLevel none, " + " itemOrUserFirst userFirst: " +
+ " { " +
+ " userClasses " +
+ " { " + " subtree { { base \"ou=users,ou=system\" } } " +
+ " }, " +
+ " userPermissions " +
+ " { " +
+ " { " +
+ " protectedItems {entry}, " +
+ " grantsAndDenials { grantRemove, grantBrowse } " +
+ " } " +
+ " } " +
+ " } " +
+ "}" );
// should work now that billyd is authorized by the subtree userClass
assertTrue( checkCanDeleteEntryAs( "billyd", "billyd", "ou=testou" ) );
@@ -257,23 +257,23 @@ public class DeleteAuthorizationIT exten
assertFalse( checkCanDeleteEntryAs( "billyd", "billyd", "ou=testou" ) );
// now add a subentry that enables anyone to add an entry below ou=system
- createAccessControlSubentry( "anybodyAdd",
- "{ " +
- " identificationTag \"addAci\", " +
- " precedence 14, " +
- " authenticationLevel none, " +
- " itemOrUserFirst userFirst: " +
- " { " +
- " userClasses { allUsers }, " +
- " userPermissions " +
- " { " +
- " { " +
- " protectedItems {entry}, " +
- " grantsAndDenials { grantRemove, grantBrowse } " +
- " } " +
- " } " +
- " } " +
- "}" );
+ createAccessControlSubentry( "anybodyAdd",
+ "{ " +
+ " identificationTag \"addAci\", " +
+ " precedence 14, " +
+ " authenticationLevel none, " +
+ " itemOrUserFirst userFirst: " +
+ " { " +
+ " userClasses { allUsers }, " +
+ " userPermissions " +
+ " { " +
+ " { " +
+ " protectedItems {entry}, " +
+ " grantsAndDenials { grantRemove, grantBrowse } " +
+ " } " +
+ " } " +
+ " } " +
+ "}" );
// see if we can now delete that test entry which we could not before
// should work now with billyd now that all users are authorized
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=1235347&r1=1235346&r2=1235347&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 Tue Jan 24 16:42:44 2012
@@ -41,7 +41,7 @@ import org.junit.runner.RunWith;
*/
@RunWith(FrameworkRunner.class)
@CreateDS(name = "GeneralAuthorizationIT")
-public class GeneralAuthorizationIT extends AbstractLdapTestUnit
+public class GeneralAuthorizationIT extends AbstractLdapTestUnit
{
@Before
@@ -49,14 +49,15 @@ public class GeneralAuthorizationIT exte
{
AutzIntegUtils.service = getService();
}
-
+
+
@After
public void closeConnections()
{
IntegrationUtils.closeConnections();
}
-
-
+
+
/**
* Checks to make sure we cannot create a malformed ACI missing two
* last brackets.
@@ -67,23 +68,23 @@ public class GeneralAuthorizationIT exte
public void testFailureToAddBadACI() throws Exception
{
// add a subentry with malformed ACI
- ResultCodeEnum result = createAccessControlSubentry(
- "anybodyAdd",
- "{ " +
- " identificationTag \"addAci\", " +
- " precedence 14, " +
- " authenticationLevel none, " +
- " itemOrUserFirst userFirst: " +
- " { " +
- " userClasses { allUsers }, " +
- " userPermissions " +
- " { " +
- " { " +
- " protectedItems {entry, allUserAttributeTypesAndValues}, " +
- " grantsAndDenials { grantAdd, grantBrowse } " +
- " } " +
- " }" );
-
+ ResultCodeEnum result = createAccessControlSubentry(
+ "anybodyAdd",
+ "{ " +
+ " identificationTag \"addAci\", " +
+ " precedence 14, " +
+ " authenticationLevel none, " +
+ " itemOrUserFirst userFirst: " +
+ " { " +
+ " userClasses { allUsers }, " +
+ " userPermissions " +
+ " { " +
+ " { " +
+ " protectedItems {entry, allUserAttributeTypesAndValues}, " +
+ " grantsAndDenials { grantAdd, grantBrowse } " +
+ " } " +
+ " }" );
+
assertEquals( ResultCodeEnum.INVALID_ATTRIBUTE_SYNTAX, result );
}
}
Modified: directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java?rev=1235347&r1=1235346&r2=1235347&view=diff
==============================================================================
--- directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java (original)
+++ directory/apacheds/trunk/core-integ/src/test/java/org/apache/directory/server/core/authz/LookupAuthorizationIT.java Tue Jan 24 16:42:44 2012
@@ -19,6 +19,7 @@
*/
package org.apache.directory.server.core.authz;
+
import static org.apache.directory.server.core.authz.AutzIntegUtils.createAccessControlSubentry;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
@@ -42,71 +43,72 @@ import org.junit.runner.RunWith;
*
* @author <a href="mailto:dev@directory.apache.org">Apache Directory Project</a>
*/
-@RunWith ( FrameworkRunner.class )
+@RunWith(FrameworkRunner.class)
@CreateDS(allowAnonAccess = true, name = "LookupAuthorizationIT")
-@ApplyLdifs( {
- // Entry # 1
- "dn: cn=test,ou=system",
- "objectClass: person",
- "cn: test",
- "sn: sn_test"
+@ApplyLdifs(
+ {
+ // Entry # 1
+ "dn: cn=test,ou=system",
+ "objectClass: person",
+ "cn: test",
+ "sn: sn_test"
})
public class LookupAuthorizationIT extends AbstractLdapTestUnit
{
- @Before
- public void init()
+@Before
+public void init()
+{
+ AutzIntegUtils.service = getService();
+}
+
+
+/**
+ * Test a lookup( Dn ) operation with the ACI subsystem enabled
+ */
+@Test
+public void testLookupACIEnabled() throws Exception
+{
+ getService().setAccessControlEnabled( true );
+ Dn dn = new Dn( "cn=test,ou=system" );
+
+ try
{
- AutzIntegUtils.service = getService();
+ Entry entry = getService().getSession().lookup( dn );
+ fail();
}
-
-
- /**
- * Test a lookup( Dn ) operation with the ACI subsystem enabled
- */
- @Test
- public void testLookupACIEnabled() throws Exception
+ catch ( LdapNoPermissionException lnpe )
{
- getService().setAccessControlEnabled( true );
- Dn dn = new Dn( "cn=test,ou=system" );
-
- try
- {
- Entry entry = getService().getSession().lookup( dn );
- fail();
- }
- catch ( LdapNoPermissionException lnpe )
- {
- }
-
- createAccessControlSubentry(
- "anybodySearch",
- "{ " +
- " identificationTag \"searchAci\", " +
+ }
+
+ createAccessControlSubentry(
+ "anybodySearch",
+ "{ " +
+ " identificationTag \"searchAci\", " +
" precedence 14, " +
- " authenticationLevel none, " +
+ " authenticationLevel none, " +
" itemOrUserFirst userFirst: " +
- " { " +
+ " { " +
" userClasses { allUsers }, " +
" userPermissions " +
" { " +
- " { " +
+ " { " +
" protectedItems {entry, allUserAttributeTypesAndValues}, " +
" grantsAndDenials { grantRead, grantReturnDN, grantBrowse } " +
" } " +
" } " +
" } " +
"}" );
-
- Entry entry = getService().getSession().lookup( dn );
-
- assertNotNull( entry );
-
- // We should have 3 attributes
- assertEquals( 3, entry.size() );
-
- // Check that all the user attributes are present
- assertEquals( "test", entry.get( "cn" ).getString() );
- assertEquals( "sn_test", entry.get( "sn" ).getString() );
- assertTrue( entry.contains( "objectClass", "top", "person" ) );
- }
+
+ Entry entry = getService().getSession().lookup( dn );
+
+ assertNotNull( entry );
+
+ // We should have 3 attributes
+ assertEquals( 3, entry.size() );
+
+ // Check that all the user attributes are present
+ assertEquals( "test", entry.get( "cn" ).getString() );
+ assertEquals( "sn_test", entry.get( "sn" ).getString() );
+ assertTrue( entry.contains( "objectClass", "top", "person" ) );
+}
}
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=1235347&r1=1235346&r2=1235347&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 Tue Jan 24 16:42:44 2012
@@ -104,7 +104,7 @@ public class ModifyAuthorizationIT exten
boolean result;
// create the entry with the telephoneNumber attribute to compare
- Entry testEntry = new DefaultEntry(entryDn);
+ Entry testEntry = new DefaultEntry( entryDn );
testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
testEntry.add( SchemaConstants.OU_AT, "testou" );
testEntry.add( "telephoneNumber", "867-5309" ); // jenny don't change your number
@@ -120,7 +120,7 @@ public class ModifyAuthorizationIT exten
// modify the entry as the user
ModifyRequest modReq = new ModifyRequestImpl();
- modReq.setName(entryDn);
+ modReq.setName( entryDn );
for ( Modification modification : mods )
{
@@ -139,7 +139,7 @@ public class ModifyAuthorizationIT exten
}
// let's clean up
- adminConnection.delete(entryDn);
+ adminConnection.delete( entryDn );
return result;
}
@@ -171,7 +171,7 @@ public class ModifyAuthorizationIT exten
boolean result;
// create the entry with the telephoneNumber attribute to compare
- Entry testEntry = new DefaultEntry(entryDn);
+ Entry testEntry = new DefaultEntry( entryDn );
testEntry.add( SchemaConstants.OBJECT_CLASS_AT, "organizationalUnit" );
testEntry.add( SchemaConstants.OU_AT, "testou" );
testEntry.add( "telephoneNumber", "867-5309" ); // jenny don't change your number
@@ -185,7 +185,7 @@ public class ModifyAuthorizationIT exten
// modify the entry as the user
LdapConnection userConnection = getConnectionAs( userName, password );
ModifyRequest modReq = new ModifyRequestImpl();
- modReq.setName(entryDn);
+ modReq.setName( entryDn );
modReq.addModification( attr, modOp );
ModifyResponse resp = userConnection.modify( modReq );
@@ -200,7 +200,7 @@ public class ModifyAuthorizationIT exten
}
// let's clean up
- adminConnection.delete(entryDn);
+ adminConnection.delete( entryDn );
return result;
}
@@ -222,10 +222,10 @@ public class ModifyAuthorizationIT exten
{
// modify the entry as the user
Dn userDn = new Dn( "uid=" + uid + ",ou=users,ou=system" );
- LdapConnection connection = getConnectionAs(userDn, password );
+ LdapConnection connection = getConnectionAs( userDn, password );
ModifyRequest modReq = new ModifyRequestImpl();
- modReq.setName(userDn);
+ modReq.setName( userDn );
for ( Modification modification : mods )
{