directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From elecha...@apache.org
Subject svn commit: r1235334 [1/6] - in /directory/apacheds/trunk: ldap-client-test/src/test/java/org/apache/directory/shared/client/api/ ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ ldap-client-test/src/test/java/org/apach...
Date Tue, 24 Jan 2012 16:27:22 GMT
Author: elecharny
Date: Tue Jan 24 16:27:18 2012
New Revision: 1235334

URL: http://svn.apache.org/viewvc?rev=1235334&view=rev
Log:
Formatted the code using Directory formatter

Modified:
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapApiISuite.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/GetRootDseTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java
    directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/utils/SASLPrep.java
    directory/apacheds/trunk/service-builder/src/main/java/org/apache/directory/server/config/builder/ServiceBuilder.java
    directory/apacheds/trunk/service-osgi/src/main/java/org/apache/directory/server/ApacheDsService.java
    directory/apacheds/trunk/service-osgi/src/main/java/org/apache/directory/server/InstallationLayout.java
    directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/AbstractLdapTestUnit.java
    directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkRunner.java
    directory/apacheds/trunk/test-framework/src/main/java/org/apache/directory/server/core/integ/FrameworkSuite.java
    directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassA.java
    directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassB.java
    directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassC.java
    directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestClassServer.java
    directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestMultiLevelDS.java
    directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuite.java
    directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteServer.java
    directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestSuiteWithoutFactory.java
    directory/apacheds/trunk/test-framework/src/test/java/org/apache/directory/server/core/integ/TestWithClassLevelLdapServer.java
    directory/apacheds/trunk/wrapper/src/main/java/org/apache/directory/server/wrapper/ApacheDsTanukiWrapper.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/avl/AvlPartition.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/AbstractBTreePartition.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/IndexCursorAdaptor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/core/partition/impl/btree/LongComparator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/InvalidLogException.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/Log.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/LogAnchor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/LogAnchorComparator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/LogScanner.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/UserLogRecord.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/DefaultLogFileManager.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/DefaultLogScanner.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFileManager.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFileRecords.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogFlushManager.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/log/impl/LogManager.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndex.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractIndexEntry.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/AbstractTable.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/EmptyIndexCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ForwardIndexEntry.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/GenericIndex.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Index.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/IndexEntry.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/MasterTable.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdn.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ParentIdAndRdnComparator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/ReverseIndexEntry.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/SingletonIndexCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/Store.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlIndex.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlMasterTable.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTable.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/impl/avl/AvlTableDupsCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AllEntriesCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/AndEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ApproximateEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/CursorBuilder.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultOptimizer.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/DefaultSearchEngine.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EqualityEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/EvaluatorBuilder.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/GreaterEqEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LeafEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/LessEqEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/NotCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/OrCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/PresenceCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/ScanCountComparator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubstringEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeCursor.java
    directory/apacheds/trunk/xdbm-partition/src/main/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeEvaluator.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/GenericIndexTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/PartitionTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/StoreUtils.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlPartitionTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlRdnIndexTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/AvlTableTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/impl/avl/TableData.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/AndCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/FilterNormalizingVisitor.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/GreaterEqTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/LessEqTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NestedFilterTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/NotCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OneLevelScopeTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/OrCursorTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/PresenceTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubstringTest.java
    directory/apacheds/trunk/xdbm-partition/src/test/java/org/apache/directory/server/xdbm/search/impl/SubtreeScopeTest.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/ASTNode.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AboutDialog.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AddEntryDialog.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AnnotatedFilterTreeDialog.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/AttributesTableModel.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/EntryNode.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/FilterDialog.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionFrame.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/PartitionViewer.java
    directory/apacheds/trunk/xdbm-tools/src/main/java/org/apache/directory/server/core/partition/impl/btree/gui/SearchResultDialog.java

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapApiISuite.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapApiISuite.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapApiISuite.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapApiISuite.java Tue Jan 24 16:27:18 2012
@@ -63,17 +63,17 @@ import org.junit.runners.Suite;
         ClientSearchRequestTest.class,
         SearchRequestReturningAttributesTest.class
 
-    })
+})
 @CreateDS(
-    name = "SuiteDS",
-    allowAnonAccess = true)
+name = "SuiteDS",
+allowAnonAccess = true)
 @CreateLdapServer(
-    allowAnonymousAccess = true,
-    transports =
+allowAnonymousAccess = true,
+transports =
     {
         @CreateTransport(protocol = "LDAP"),
         @CreateTransport(protocol = "LDAPS")
-    })
+})
 public class LdapApiISuite
 {
 }

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapConnectionTest.java Tue Jan 24 16:27:18 2012
@@ -114,17 +114,18 @@ public class LdapConnectionTest extends 
     }
 
 
-    @ApplyLdifs({
-        "dn: uid=kayyagari,ou=system",
-        "objectClass: extensibleObject",
-        "objectClass: uidObject",
-        "objectClass: referral",
-        "objectClass: top",
-        "uid: kayyagari",
-        "ref: ldap://ad.example.com/uid=kayyagari,ou=system"
+    @ApplyLdifs(
+        {
+            "dn: uid=kayyagari,ou=system",
+            "objectClass: extensibleObject",
+            "objectClass: uidObject",
+            "objectClass: referral",
+            "objectClass: top",
+            "uid: kayyagari",
+            "ref: ldap://ad.example.com/uid=kayyagari,ou=system"
     })
-    @Test
-    public void testLookup() throws Exception
+@Test
+public void testLookup() throws Exception
     {
         Entry entry = connection.lookup( ADMIN_DN );
         assertNull( entry.get( SchemaConstants.ENTRY_UUID_AT ) );
@@ -132,7 +133,7 @@ public class LdapConnectionTest extends 
         // perform lookup with operational attributes
         entry = connection.lookup( ADMIN_DN, "+", "*" );
         assertNotNull( entry.get( SchemaConstants.ENTRY_UUID_AT ) );
-        
+
         entry = connection.lookup( "uid=kayyagari,ou=system" );
         assertNull( entry );
     }
@@ -205,12 +206,12 @@ public class LdapConnectionTest extends 
         assertTrue( map.containsKey( "ou=schema" ) );
     }
 
-    
+
     @Test
     public void testAnonBind() throws Exception
     {
         LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
-        
+
         connection.bind();
         assertTrue( connection.isAuthenticated() );
         connection.close();

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/LdapSSLConnectionTest.java Tue Jan 24 16:27:18 2012
@@ -63,27 +63,28 @@ import org.junit.runner.RunWith;
     {
         @CreateTransport(protocol = "LDAP"),
         @CreateTransport(protocol = "LDAPS")
-    },
+},
     saslHost = "localhost",
     saslMechanisms =
-    {
-        @SaslMechanism(name = SupportedSaslMechanisms.PLAIN, implClass = PlainMechanismHandler.class),
-        @SaslMechanism(name = SupportedSaslMechanisms.CRAM_MD5, implClass = CramMd5MechanismHandler.class),
-        @SaslMechanism(name = SupportedSaslMechanisms.DIGEST_MD5, implClass = DigestMd5MechanismHandler.class),
-        @SaslMechanism(name = SupportedSaslMechanisms.GSSAPI, implClass = GssapiMechanismHandler.class),
-        @SaslMechanism(name = SupportedSaslMechanisms.NTLM, implClass = NtlmMechanismHandler.class),
-        @SaslMechanism(name = SupportedSaslMechanisms.GSS_SPNEGO, implClass = NtlmMechanismHandler.class)
+        {
+            @SaslMechanism(name = SupportedSaslMechanisms.PLAIN, implClass = PlainMechanismHandler.class),
+            @SaslMechanism(name = SupportedSaslMechanisms.CRAM_MD5, implClass = CramMd5MechanismHandler.class),
+            @SaslMechanism(name = SupportedSaslMechanisms.DIGEST_MD5, implClass = DigestMd5MechanismHandler.class),
+            @SaslMechanism(name = SupportedSaslMechanisms.GSSAPI, implClass = GssapiMechanismHandler.class),
+            @SaslMechanism(name = SupportedSaslMechanisms.NTLM, implClass = NtlmMechanismHandler.class),
+            @SaslMechanism(name = SupportedSaslMechanisms.GSS_SPNEGO, implClass = NtlmMechanismHandler.class)
     },
     extendedOpHandlers =
-    {
-        StartTlsHandler.class
+        {
+            StartTlsHandler.class
     })
 public class LdapSSLConnectionTest extends AbstractLdapTestUnit
 {
     private LdapConnectionConfig sslConfig;
-    
+
     private LdapConnectionConfig tlsConfig;
 
+
     @Before
     public void setup()
     {
@@ -92,7 +93,7 @@ public class LdapSSLConnectionTest exten
         sslConfig.setUseSsl( true );
         sslConfig.setLdapPort( getLdapServer().getPortSSL() );
         sslConfig.setTrustManagers( new NoVerificationTrustManager() );
-        
+
         tlsConfig = new LdapConnectionConfig();
         tlsConfig.setLdapHost( "localhost" );
         tlsConfig.setLdapPort( getLdapServer().getPort() );
@@ -140,8 +141,8 @@ public class LdapSSLConnectionTest exten
 
         connection.close();
     }
-    
-    
+
+
     /**
      * Test a successful bind request after setting up TLS
      *
@@ -188,9 +189,9 @@ public class LdapSSLConnectionTest exten
 
         connection.close();
     }
-    
-    
-    @Test( expected = LdapException.class)
+
+
+    @Test(expected = LdapException.class)
     public void testFailsStartTLSWhenSSLIsInUse() throws Exception
     {
         LdapNetworkConnection connection = new LdapNetworkConnection( tlsConfig );
@@ -200,7 +201,8 @@ public class LdapSSLConnectionTest exten
         connection.startTls();
     }
 
-    @Test( expected = InvalidConnectionException.class )
+
+    @Test(expected = InvalidConnectionException.class)
     public void testStallingSsl() throws Exception
     {
         LdapConnectionConfig sslConfig = new LdapConnectionConfig();

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/NetworkSchemaLoaderTest.java Tue Jan 24 16:27:18 2012
@@ -20,6 +20,7 @@
 
 package org.apache.directory.shared.client.api;
 
+
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
@@ -37,6 +38,7 @@ import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 
+
 /**
  * A test class for NetworkSchemaLoader.
  *
@@ -75,7 +77,7 @@ public class NetworkSchemaLoaderTest ext
 
         if ( !loaded )
         {
-            fail( "Schema load failed : " + Exceptions.printErrors(sm.getErrors()) );
+            fail( "Schema load failed : " + Exceptions.printErrors( sm.getErrors() ) );
         }
 
         assertTrue( sm.getRegistries().getAttributeTypeRegistry().contains( "cn" ) );

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientAddRequestTest.java Tue Jan 24 16:27:18 2012
@@ -107,14 +107,14 @@ public class ClientAddRequestTest extend
     {
         assertFalse( session.exists( "cn=testadd,ou=system" ) );
 
-        connection.add( 
-            new DefaultEntry( 
+        connection.add(
+            new DefaultEntry(
                 "cn=testadd,ou=system",
                 "ObjectClass : top",
                 "ObjectClass : person",
                 "cn: testadd_sn",
                 "sn: testadd_sn"
-                ) );
+            ) );
 
         assertTrue( session.exists( "cn=testadd,ou=system" ) );
     }
@@ -124,15 +124,15 @@ public class ClientAddRequestTest extend
     public void testAddWithControl() throws Exception
     {
         assertFalse( session.exists( "cn=testadd,ou=system" ) );
-        
-        Entry entry = new DefaultEntry( 
+
+        Entry entry = new DefaultEntry(
             "cn=testadd,ou=system",
             "ObjectClass : top",
             "ObjectClass : person",
             "cn: testadd_sn",
             "sn: testadd_sn"
             );
-        
+
         AddRequest addRequest = new AddRequestImpl();
         addRequest.setEntry( entry );
         addRequest.addControl( new ManageDsaITImpl() );
@@ -173,7 +173,7 @@ public class ClientAddRequestTest extend
     @Test
     public void testAddAsyncLdif() throws Exception
     {
-        Entry entry = new DefaultEntry( 
+        Entry entry = new DefaultEntry(
             "cn=testAsyncAdd,ou=system",
             "ObjectClass: top",
             "ObjectClass: person",
@@ -196,13 +196,13 @@ public class ClientAddRequestTest extend
 
 
     @ApplyLdifs(
-        { 
-            "dn: cn=kayyagari,ou=system", 
-            "objectClass: person", 
-            "objectClass: top", 
+        {
+            "dn: cn=kayyagari,ou=system",
+            "objectClass: person",
+            "objectClass: top",
             "cn: kayyagari",
-            "description: dbugger", 
-            "sn: dbugger", 
+            "description: dbugger",
+            "sn: dbugger",
             "userPassword: secret" })
     @Test
     /**

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientDeleteRequestTest.java Tue Jan 24 16:27:18 2012
@@ -68,17 +68,17 @@ import org.junit.runner.RunWith;
 @ApplyLdifs(
     { "dn: cn=parent,ou=system", "objectClass: person", "cn: parent_cn", "sn: parent_sn",
 
-    "",
+        "",
 
-    "dn: cn=child1,cn=parent,ou=system", "objectClass: person", "cn: child1_cn", "sn: child1_sn",
+        "dn: cn=child1,cn=parent,ou=system", "objectClass: person", "cn: child1_cn", "sn: child1_sn",
 
-    "",
+        "",
 
-    "dn: cn=child2,cn=parent,ou=system", "objectClass: person", "cn: child2_cn", "sn: child2_sn",
+        "dn: cn=child2,cn=parent,ou=system", "objectClass: person", "cn: child2_cn", "sn: child2_sn",
 
-    "",
+        "",
 
-    "dn: cn=grand_child11,cn=child1,cn=parent,ou=system", "objectClass: person", "cn: grand_child11_cn",
+        "dn: cn=grand_child11,cn=child1,cn=parent,ou=system", "objectClass: person", "cn: grand_child11_cn",
         "sn: grand_child11_sn",
 
         "",
@@ -236,9 +236,9 @@ public class ClientDeleteRequestTest ext
             deleteRequest.setName( new Dn( "cn=parent,ou=system" ) );
             Control deleteTreeControl = new OpaqueControl( "1.2.840.113556.1.4.805" );
             deleteRequest.addControl( deleteTreeControl );
-    
+
             DeleteResponse deleteResponse = connection.delete( deleteRequest );
-    
+
             assertNotNull( deleteResponse );
             assertEquals( ResultCodeEnum.SUCCESS, deleteResponse.getLdapResult().getResultCode() );
             assertFalse( session.exists( "cn=parent,ou=system" ) );

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientExtendedRequestTest.java Tue Jan 24 16:27:18 2012
@@ -53,11 +53,12 @@ import org.junit.runner.RunWith;
  */
 @RunWith(FrameworkRunner.class)
 @CreateLdapServer(transports =
-    { 
-      @CreateTransport(protocol = "LDAP"), 
-      @CreateTransport(protocol = "LDAPS") 
-    }, 
-    extendedOpHandlers = { StartTlsHandler.class })
+    {
+        @CreateTransport(protocol = "LDAP"),
+        @CreateTransport(protocol = "LDAPS")
+},
+    extendedOpHandlers =
+        { StartTlsHandler.class })
 public class ClientExtendedRequestTest extends AbstractLdapTestUnit
 {
     private LdapNetworkConnection connection;

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyDnRequestTest.java Tue Jan 24 16:27:18 2012
@@ -117,7 +117,7 @@ public class ClientModifyDnRequestTest e
         assertTrue( session.exists( new Dn( "cn=modDn,ou=users,ou=system" ) ) );
     }
 
-    
+
     @Test
     public void testMoveAndRename() throws Exception
     {
@@ -128,7 +128,7 @@ public class ClientModifyDnRequestTest e
         entry.add( SchemaConstants.SN_AT, "testadd_sn" );
 
         connection.add( entry );
-        
+
         Dn newDn = new Dn( "cn=testaddMovedAndRenamed,ou=system" );
         connection.moveAndRename( origDn, newDn );
 
@@ -140,7 +140,7 @@ public class ClientModifyDnRequestTest e
         assertTrue( entry.containsAttribute( SchemaConstants.MODIFY_TIMESTAMP_AT ) );
     }
 
-    
+
     @Test
     public void testModifyDnAsync() throws Exception
     {

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/ClientModifyRequestTest.java Tue Jan 24 16:27:18 2012
@@ -63,199 +63,200 @@ import org.junit.runner.RunWith;
 @RunWith(FrameworkRunner.class)
 @CreateLdapServer(transports =
     { @CreateTransport(protocol = "LDAP"), @CreateTransport(protocol = "LDAPS") })
-@ApplyLdifs({
-    "dn: uid=billyd,ou=users,ou=system",
-    "objectClass: person",
-    "objectClass: organizationalPerson",
-    "objectClass: inetOrgPerson",
-    "uid: billyd",
-    "userPassword: secret",
-    "sn: billyd",
-    "cn: billyd"
+@ApplyLdifs(
+    {
+        "dn: uid=billyd,ou=users,ou=system",
+        "objectClass: person",
+        "objectClass: organizationalPerson",
+        "objectClass: inetOrgPerson",
+        "uid: billyd",
+        "userPassword: secret",
+        "sn: billyd",
+        "cn: billyd"
 })
 public class ClientModifyRequestTest extends AbstractLdapTestUnit
 {
-    private LdapNetworkConnection connection;
-    private CoreSession session;
+private LdapNetworkConnection connection;
+private CoreSession session;
 
 
-    @Before
-    public void setup() throws Exception
-    {
-        connection = LdapApiIntegrationUtils.getPooledAdminConnection( getLdapServer() );
-        session = getLdapServer().getDirectoryService().getAdminSession();
-    }
+@Before
+public void setup() throws Exception
+{
+    connection = LdapApiIntegrationUtils.getPooledAdminConnection( getLdapServer() );
+    session = getLdapServer().getDirectoryService().getAdminSession();
+}
 
 
-    @After
-    public void shutdown() throws Exception
-    {
-        LdapApiIntegrationUtils.releasePooledAdminConnection( connection, getLdapServer() );
-    }
+@After
+public void shutdown() throws Exception
+{
+    LdapApiIntegrationUtils.releasePooledAdminConnection( connection, getLdapServer() );
+}
 
 
-    @Test
-    public void testModify() throws Exception
-    {
-        Dn dn = new Dn( "uid=admin,ou=system" );
+@Test
+public void testModify() throws Exception
+{
+    Dn dn = new Dn( "uid=admin,ou=system" );
 
-        String expected = String.valueOf( System.currentTimeMillis() );
-        ModifyRequest modRequest = new ModifyRequestImpl();
-        modRequest.setName( dn );
-        modRequest.replace( SchemaConstants.SN_AT, expected );
+    String expected = String.valueOf( System.currentTimeMillis() );
+    ModifyRequest modRequest = new ModifyRequestImpl();
+    modRequest.setName( dn );
+    modRequest.replace( SchemaConstants.SN_AT, expected );
 
-        connection.modify( modRequest );
+    connection.modify( modRequest );
 
-        Entry entry = session.lookup( dn );
+    Entry entry = session.lookup( dn );
 
-        String actual = entry.get( SchemaConstants.SN_AT ).getString();
+    String actual = entry.get( SchemaConstants.SN_AT ).getString();
 
-        assertEquals( expected, actual );
-    }
+    assertEquals( expected, actual );
+}
 
 
-    @Test
-    public void testModifyWithEntry() throws Exception
-    {
-        Dn dn = new Dn( "uid=admin,ou=system" );
+@Test
+public void testModifyWithEntry() throws Exception
+{
+    Dn dn = new Dn( "uid=admin,ou=system" );
 
-        Entry entry = new DefaultEntry( dn );
+    Entry entry = new DefaultEntry( dn );
 
-        String expectedSn = String.valueOf( System.currentTimeMillis() );
-        String expectedCn = String.valueOf( System.currentTimeMillis() );
+    String expectedSn = String.valueOf( System.currentTimeMillis() );
+    String expectedCn = String.valueOf( System.currentTimeMillis() );
 
-        entry.add( SchemaConstants.SN_AT, expectedSn );
+    entry.add( SchemaConstants.SN_AT, expectedSn );
 
-        entry.add( SchemaConstants.CN_AT, expectedCn );
+    entry.add( SchemaConstants.CN_AT, expectedCn );
 
-        connection.modify( entry, ModificationOperation.REPLACE_ATTRIBUTE );
+    connection.modify( entry, ModificationOperation.REPLACE_ATTRIBUTE );
 
-        Entry lookupEntry = session.lookup( dn );
+    Entry lookupEntry = session.lookup( dn );
 
-        String actualSn = lookupEntry.get( SchemaConstants.SN_AT ).getString();
-        assertEquals( expectedSn, actualSn );
+    String actualSn = lookupEntry.get( SchemaConstants.SN_AT ).getString();
+    assertEquals( expectedSn, actualSn );
 
-        String actualCn = lookupEntry.get( SchemaConstants.CN_AT ).getString();
-        assertEquals( expectedCn, actualCn );
-    }
+    String actualCn = lookupEntry.get( SchemaConstants.CN_AT ).getString();
+    assertEquals( expectedCn, actualCn );
+}
 
 
-    @Test
-    public void testModifyReplaceRemove() throws Exception
-    {
-        Dn dn = new Dn( "uid=admin,ou=system" );
+@Test
+public void testModifyReplaceRemove() throws Exception
+{
+    Dn dn = new Dn( "uid=admin,ou=system" );
 
-        Entry entry = new DefaultEntry( dn );
+    Entry entry = new DefaultEntry( dn );
 
-        entry.add( "givenName", "test" );
+    entry.add( "givenName", "test" );
 
-        connection.modify( entry, ModificationOperation.REPLACE_ATTRIBUTE );
+    connection.modify( entry, ModificationOperation.REPLACE_ATTRIBUTE );
 
-        Entry lookupEntry = session.lookup( dn );
+    Entry lookupEntry = session.lookup( dn );
 
-        String gn = lookupEntry.get( "givenName" ).getString();
-        assertEquals( "test", gn );
+    String gn = lookupEntry.get( "givenName" ).getString();
+    assertEquals( "test", gn );
 
-        // Now, replace the givenName
-        ModifyRequest modifyRequest = new ModifyRequestImpl();
-        modifyRequest.setName( dn );
-        modifyRequest.replace( "givenName" );
-        connection.modify( modifyRequest );
+    // Now, replace the givenName
+    ModifyRequest modifyRequest = new ModifyRequestImpl();
+    modifyRequest.setName( dn );
+    modifyRequest.replace( "givenName" );
+    connection.modify( modifyRequest );
 
-        lookupEntry = session.lookup( dn );
-        Attribute giveName = lookupEntry.get( "givenName" );
-        assertNull( giveName );
-    }
+    lookupEntry = session.lookup( dn );
+    Attribute giveName = lookupEntry.get( "givenName" );
+    assertNull( giveName );
+}
 
 
-    @Test
-    public void modifyAsync() throws Exception
-    {
-        Dn dn = new Dn( "uid=admin,ou=system" );
+@Test
+public void modifyAsync() throws Exception
+{
+    Dn dn = new Dn( "uid=admin,ou=system" );
 
-        String expected = String.valueOf( System.currentTimeMillis() );
-        ModifyRequest modifyRequest = new ModifyRequestImpl();
-        modifyRequest.setName( dn );
-        modifyRequest.replace( SchemaConstants.SN_AT, expected );
+    String expected = String.valueOf( System.currentTimeMillis() );
+    ModifyRequest modifyRequest = new ModifyRequestImpl();
+    modifyRequest.setName( dn );
+    modifyRequest.replace( SchemaConstants.SN_AT, expected );
 
-        assertTrue( session.exists( dn ) );
+    assertTrue( session.exists( dn ) );
 
-        ModifyFuture modifyFuture = connection.modifyAsync( modifyRequest );
+    ModifyFuture modifyFuture = connection.modifyAsync( modifyRequest );
 
-        ModifyResponse response = modifyFuture.get( 1000, TimeUnit.MILLISECONDS );
+    ModifyResponse response = modifyFuture.get( 1000, TimeUnit.MILLISECONDS );
 
-        assertNotNull( response );
+    assertNotNull( response );
 
-        Entry entry = session.lookup( dn );
+    Entry entry = session.lookup( dn );
 
-        String actual = entry.get( SchemaConstants.SN_AT ).getString();
+    String actual = entry.get( SchemaConstants.SN_AT ).getString();
 
-        assertEquals( expected, actual );
+    assertEquals( expected, actual );
 
-        assertTrue( connection.isAuthenticated() );
-        assertTrue( session.exists( dn ) );
-    }
+    assertTrue( connection.isAuthenticated() );
+    assertTrue( session.exists( dn ) );
+}
 
 
-    /**
-     * ApacheDS doesn't allow modifying entryUUID and entryCSN AT
-     */
-    @Test
-    public void testModifyEntryUUIDAndEntryCSN() throws Exception
-    {
-        Dn dn = new Dn( "uid=admin,ou=system" );
+/**
+ * ApacheDS doesn't allow modifying entryUUID and entryCSN AT
+ */
+@Test
+public void testModifyEntryUUIDAndEntryCSN() throws Exception
+{
+    Dn dn = new Dn( "uid=admin,ou=system" );
 
-        ModifyRequest modifyRequest = new ModifyRequestImpl();
-        modifyRequest.setName( dn );
-        modifyRequest.replace( SchemaConstants.ENTRY_UUID_AT, UUID.randomUUID().toString() );
-
-        ModifyResponse modResp = connection.modify( modifyRequest );
-        assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, modResp.getLdapResult().getResultCode() );
-
-        modifyRequest = new ModifyRequestImpl();
-        modifyRequest.setName( dn );
-        modifyRequest.replace( SchemaConstants.ENTRY_CSN_AT, new CsnFactory( 0 ).newInstance().toString() );
-
-        // admin can modify the entryCsn
-        modResp = connection.modify( modifyRequest );
-        assertEquals( ResultCodeEnum.SUCCESS, modResp.getLdapResult().getResultCode() );
-        
-        LdapNetworkConnection nonAdminConnection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
-
-        Dn bindDn = new Dn( "uid=billyd,ou=users,ou=system" );
-        nonAdminConnection.bind( bindDn.getName(), "secret" );
-        
-        // non-admin user cannot modify entryCSN
-        modResp = nonAdminConnection.modify( modifyRequest );
-        assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, modResp.getLdapResult().getResultCode() );
-        
-        nonAdminConnection.close();
-    }
-
-
-    /**
-     * ApacheDS allows modifying the modifiersName and modifyTimestamp operational AT
-     */
-    @Test
-    public void testModifyModifierNameAndModifyTimestamp() throws Exception
-    {
-        Dn dn = new Dn( "uid=admin,ou=system" );
+    ModifyRequest modifyRequest = new ModifyRequestImpl();
+    modifyRequest.setName( dn );
+    modifyRequest.replace( SchemaConstants.ENTRY_UUID_AT, UUID.randomUUID().toString() );
 
-        String modifierName = "uid=x,ou=system";
-        String modifiedTime = DateUtils.getGeneralizedTime();
+    ModifyResponse modResp = connection.modify( modifyRequest );
+    assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, modResp.getLdapResult().getResultCode() );
 
-        ModifyRequest modifyRequest = new ModifyRequestImpl();
-        modifyRequest.setName( dn );
-        modifyRequest.replace( SchemaConstants.MODIFIERS_NAME_AT, modifierName );
-        modifyRequest.replace( SchemaConstants.MODIFY_TIMESTAMP_AT, modifiedTime );
+    modifyRequest = new ModifyRequestImpl();
+    modifyRequest.setName( dn );
+    modifyRequest.replace( SchemaConstants.ENTRY_CSN_AT, new CsnFactory( 0 ).newInstance().toString() );
 
-        ModifyResponse modResp = connection.modify( modifyRequest );
-        assertEquals( ResultCodeEnum.SUCCESS, modResp.getLdapResult().getResultCode() );
+    // admin can modify the entryCsn
+    modResp = connection.modify( modifyRequest );
+    assertEquals( ResultCodeEnum.SUCCESS, modResp.getLdapResult().getResultCode() );
 
-        Entry loadedEntry = connection.lookup( dn.getName(), "+" );
+    LdapNetworkConnection nonAdminConnection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
+
+    Dn bindDn = new Dn( "uid=billyd,ou=users,ou=system" );
+    nonAdminConnection.bind( bindDn.getName(), "secret" );
+
+    // non-admin user cannot modify entryCSN
+    modResp = nonAdminConnection.modify( modifyRequest );
+    assertEquals( ResultCodeEnum.INSUFFICIENT_ACCESS_RIGHTS, modResp.getLdapResult().getResultCode() );
+
+    nonAdminConnection.close();
+}
 
-        assertEquals( modifierName, loadedEntry.get( SchemaConstants.MODIFIERS_NAME_AT ).getString() );
-        assertEquals( modifiedTime, loadedEntry.get( SchemaConstants.MODIFY_TIMESTAMP_AT ).getString() );
-    }
+
+/**
+ * ApacheDS allows modifying the modifiersName and modifyTimestamp operational AT
+ */
+@Test
+public void testModifyModifierNameAndModifyTimestamp() throws Exception
+{
+    Dn dn = new Dn( "uid=admin,ou=system" );
+
+    String modifierName = "uid=x,ou=system";
+    String modifiedTime = DateUtils.getGeneralizedTime();
+
+    ModifyRequest modifyRequest = new ModifyRequestImpl();
+    modifyRequest.setName( dn );
+    modifyRequest.replace( SchemaConstants.MODIFIERS_NAME_AT, modifierName );
+    modifyRequest.replace( SchemaConstants.MODIFY_TIMESTAMP_AT, modifiedTime );
+
+    ModifyResponse modResp = connection.modify( modifyRequest );
+    assertEquals( ResultCodeEnum.SUCCESS, modResp.getLdapResult().getResultCode() );
+
+    Entry loadedEntry = connection.lookup( dn.getName(), "+" );
+
+    assertEquals( modifierName, loadedEntry.get( SchemaConstants.MODIFIERS_NAME_AT ).getString() );
+    assertEquals( modifiedTime, loadedEntry.get( SchemaConstants.MODIFY_TIMESTAMP_AT ).getString() );
+}
 
 }

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/GetRootDseTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/GetRootDseTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/GetRootDseTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/GetRootDseTest.java Tue Jan 24 16:27:18 2012
@@ -67,7 +67,7 @@ public class GetRootDseTest extends Abst
 
     /**
      * Test a                     if ( attributeType.getUsage() != UsageEnum.USER_APPLICATIONS )
-lookup requesting all the attributes (* and +)
+    lookup requesting all the attributes (* and +)
      *
      * @throws Exception
      */
@@ -75,7 +75,7 @@ lookup requesting all the attributes (* 
     public void testGetRootDse() throws Exception
     {
         Entry rootDse = connection.getRootDse();
-        
+
         assertNotNull( rootDse );
 
         assertEquals( 1, rootDse.size() );
@@ -85,7 +85,7 @@ lookup requesting all the attributes (* 
 
     /**
      * Test a                     if ( attributeType.getUsage() != UsageEnum.USER_APPLICATIONS )
-lookup requesting all the user attributes (*)
+    lookup requesting all the user attributes (*)
      *
      * @throws Exception
      */
@@ -112,7 +112,7 @@ lookup requesting all the user attribute
         Entry rootDse = connection.getRootDse( "+" );
 
         assertNotNull( rootDse );
-        
+
         assertEquals( 10, rootDse.size() );
         assertTrue( rootDse.containsAttribute( "entryUUID" ) );
         assertTrue( rootDse.containsAttribute( "namingContexts" ) );
@@ -138,7 +138,7 @@ lookup requesting all the user attribute
         Entry rootDse = connection.getRootDse( "objectClass", "vendorName", "vendorVersion" );
 
         assertNotNull( rootDse );
-        
+
         assertEquals( 3, rootDse.size() );
         assertTrue( rootDse.containsAttribute( "objectClass" ) );
         assertTrue( rootDse.containsAttribute( "vendorName" ) );
@@ -158,7 +158,7 @@ lookup requesting all the user attribute
         Entry rootDse = connection.getRootDse( "*", "vendorName", "vendorVersion" );
 
         assertNotNull( rootDse );
-        
+
         assertEquals( 3, rootDse.size() );
         assertTrue( rootDse.containsAttribute( "objectClass" ) );
         assertTrue( rootDse.containsAttribute( "vendorName" ) );
@@ -178,7 +178,7 @@ lookup requesting all the user attribute
         Entry rootDse = connection.getRootDse( "+", "Objectclass" );
 
         assertNotNull( rootDse );
-        
+
         assertEquals( 11, rootDse.size() );
         assertTrue( rootDse.containsAttribute( "objectClass" ) );
         assertTrue( rootDse.containsAttribute( "entryUUID" ) );
@@ -196,7 +196,7 @@ lookup requesting all the user attribute
 
     /**
      * Test a                     if ( attributeType.getUsage() != UsageEnum.USER_APPLICATIONS )
-lookup requesting a all user attributes (*)
+    lookup requesting a all user attributes (*)
      * and all operational attributes (+)
      *
      * @throws Exception
@@ -207,7 +207,7 @@ lookup requesting a all user attributes 
         Entry rootDse = connection.getRootDse( "+", "*" );
 
         assertNotNull( rootDse );
-        
+
         assertEquals( 11, rootDse.size() );
         assertTrue( rootDse.containsAttribute( "objectClass" ) );
         assertTrue( rootDse.containsAttribute( "entryUUID" ) );
@@ -234,7 +234,7 @@ lookup requesting a all user attributes 
         Entry rootDse = connection.getRootDse( "1.1" );
 
         assertNotNull( rootDse );
-        
+
         assertEquals( 0, rootDse.size() );
     }
 
@@ -250,7 +250,7 @@ lookup requesting a all user attributes 
         Entry rootDse = connection.getRootDse( "1.1", "objectClass" );
 
         assertNotNull( rootDse );
-        
+
         assertEquals( 1, rootDse.size() );
         assertTrue( rootDse.containsAttribute( "objectClass" ) );
     }

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/bind/SimpleBindRequestTest.java Tue Jan 24 16:27:18 2012
@@ -474,7 +474,7 @@ public class SimpleBindRequestTest exten
                     next( bindContext );
                 }
             };
-            
+
             getService().addFirst( interceptor );
 
             // Send another BindRequest

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/ClientSearchRequestTest.java Tue Jan 24 16:27:18 2012
@@ -80,203 +80,204 @@ import org.junit.runner.RunWith;
         "sn:: RW1tYW51ZWwgTMOpY2hhcm55",
         "cn: elecharny"
 
-    })
+})
 public class ClientSearchRequestTest extends AbstractLdapTestUnit
 {
-    private LdapNetworkConnection connection;
+private LdapNetworkConnection connection;
 
 
-    @Before
-    public void setup() throws Exception
-    {
-        connection = LdapApiIntegrationUtils.getPooledAdminConnection( getLdapServer() );
-    }
+@Before
+public void setup() throws Exception
+{
+    connection = LdapApiIntegrationUtils.getPooledAdminConnection( getLdapServer() );
+}
 
 
-    @After
-    public void shutdown() throws Exception
-    {
-        LdapApiIntegrationUtils.releasePooledAdminConnection( connection, getLdapServer() );
-    }
+@After
+public void shutdown() throws Exception
+{
+    LdapApiIntegrationUtils.releasePooledAdminConnection( connection, getLdapServer() );
+}
 
 
-    @Test
-    public void testSimpleSearch() throws Exception
+@Test
+public void testSimpleSearch() throws Exception
+{
+    EntryCursor cursor = connection.search( "ou=system", "(objectclass=*)", SearchScope.ONELEVEL );
+    int count = 0;
+
+    while ( cursor.next() )
     {
-        EntryCursor cursor = connection.search( "ou=system", "(objectclass=*)", SearchScope.ONELEVEL );
-        int count = 0;
-        
-        while ( cursor.next() )
-        {
-            Entry entry = cursor.get();
-            assertNotNull( entry );
-            count++;
-        }
+        Entry entry = cursor.get();
+        assertNotNull( entry );
+        count++;
+    }
 
-        SearchResultDone done = cursor.getSearchResultDone();
+    SearchResultDone done = cursor.getSearchResultDone();
 
-        assertNotNull( done );
-        assertEquals( ResultCodeEnum.SUCCESS, done.getLdapResult().getResultCode() );
-        assertEquals( 5, count );
-        cursor.close();
-    }
+    assertNotNull( done );
+    assertEquals( ResultCodeEnum.SUCCESS, done.getLdapResult().getResultCode() );
+    assertEquals( 5, count );
+    cursor.close();
+}
 
 
-    @Test
-    public void testSimpleSearchWithControl() throws Exception
-    {
-        SearchRequest searchRequest = new SearchRequestImpl().setBase( new Dn( "ou=system" ) ).setFilter( "(objectclass=*)" )
+@Test
+public void testSimpleSearchWithControl() throws Exception
+{
+    SearchRequest searchRequest = new SearchRequestImpl().setBase( new Dn( "ou=system" ) )
+        .setFilter( "(objectclass=*)" )
         .setScope( SearchScope.ONELEVEL ).addControl( new ManageDsaITImpl() );
-        EntryCursor cursor = connection.search( "ou=system", "(objectclass=*)", SearchScope.ONELEVEL );
-        int count = 0;
-        
-        while ( cursor.next() )
-        {
-            Entry entry = cursor.get();
-            assertNotNull( entry );
-            count++;
-        }
-
-        SearchResultDone done = cursor.getSearchResultDone();
+    EntryCursor cursor = connection.search( "ou=system", "(objectclass=*)", SearchScope.ONELEVEL );
+    int count = 0;
 
-        assertNotNull( done );
-        assertEquals( ResultCodeEnum.SUCCESS, done.getLdapResult().getResultCode() );
-        assertEquals( 5, count );
-        cursor.close();
+    while ( cursor.next() )
+    {
+        Entry entry = cursor.get();
+        assertNotNull( entry );
+        count++;
     }
 
+    SearchResultDone done = cursor.getSearchResultDone();
 
-    @Test
-    public void testSearch() throws Exception
-    {
-        EntryCursor cursor = connection.search( "ou=system", "(objectclass=*)",
-            SearchScope.ONELEVEL,
-            "*", "+" );
-        int count = 0;
-        
-        while ( cursor.next() )
-        {
-            assertNotNull( cursor.get() );
-            count++;
-        }
+    assertNotNull( done );
+    assertEquals( ResultCodeEnum.SUCCESS, done.getLdapResult().getResultCode() );
+    assertEquals( 5, count );
+    cursor.close();
+}
 
-        SearchResultDone done = cursor.getSearchResultDone();
 
-        assertNotNull( done );
-        assertEquals( ResultCodeEnum.SUCCESS, done.getLdapResult().getResultCode() );
-        assertEquals( 5, count );
-        cursor.close();
+@Test
+public void testSearch() throws Exception
+{
+    EntryCursor cursor = connection.search( "ou=system", "(objectclass=*)",
+        SearchScope.ONELEVEL,
+        "*", "+" );
+    int count = 0;
+
+    while ( cursor.next() )
+    {
+        assertNotNull( cursor.get() );
+        count++;
     }
 
+    SearchResultDone done = cursor.getSearchResultDone();
 
-    @Test
-    public void testSearchEquality() throws Exception
-    {
-        EntryCursor cursor = connection.search( "ou=system", "(objectclass=organizationalUnit)",
-            SearchScope.ONELEVEL, "*", "+" );
-        int count = 0;
-        
-        while ( cursor.next() )
-        {
-            Entry entry = cursor.get();
-            assertNotNull( entry );
-            count++;
-        }
+    assertNotNull( done );
+    assertEquals( ResultCodeEnum.SUCCESS, done.getLdapResult().getResultCode() );
+    assertEquals( 5, count );
+    cursor.close();
+}
 
-        assertEquals( 4, count );
-        cursor.close();
-    }
 
+@Test
+public void testSearchEquality() throws Exception
+{
+    EntryCursor cursor = connection.search( "ou=system", "(objectclass=organizationalUnit)",
+        SearchScope.ONELEVEL, "*", "+" );
+    int count = 0;
 
-    @Test
-    public void testAsyncSearch() throws Exception
+    while ( cursor.next() )
     {
-        SearchFuture searchFuture = connection.searchAsync( "ou=system", "(objectclass=*)", SearchScope.ONELEVEL, "*",
-            "+" );
-        int count = 0;
-        Response searchResponse = null;
+        Entry entry = cursor.get();
+        assertNotNull( entry );
+        count++;
+    }
 
-        do
-        {
-            searchResponse = ( Response ) searchFuture.get( 1000, TimeUnit.MILLISECONDS );
-            assertNotNull( searchResponse );
-            if ( !( searchResponse instanceof SearchResultDone ) )
-            {
-                count++;
-            }
-        }
-        while ( !( searchResponse instanceof SearchResultDone ) );
+    assertEquals( 4, count );
+    cursor.close();
+}
 
-        assertEquals( 5, count );
-    }
 
+@Test
+public void testAsyncSearch() throws Exception
+{
+    SearchFuture searchFuture = connection.searchAsync( "ou=system", "(objectclass=*)", SearchScope.ONELEVEL, "*",
+        "+" );
+    int count = 0;
+    Response searchResponse = null;
 
-    /**
-     * Test a search with a Substring filter
-     * @throws Exception
-     */
-    @Test
-    public void testSearchPersonSubstring() throws Exception
+    do
     {
-        SearchFuture searchFuture = connection.searchAsync( "ou=system", "(objectclass=*ers*)", SearchScope.SUBTREE,
-            "*", "+" );
-        int count = 0;
-        Response searchResponse = null;
-
-        do
+        searchResponse = ( Response ) searchFuture.get( 1000, TimeUnit.MILLISECONDS );
+        assertNotNull( searchResponse );
+        if ( !( searchResponse instanceof SearchResultDone ) )
         {
-            searchResponse = ( Response ) searchFuture.get( 100000, TimeUnit.MILLISECONDS );
-            assertNotNull( searchResponse );
-
-            if ( !( searchResponse instanceof SearchResultDone ) )
-            {
-                count++;
-            }
+            count++;
         }
-        while ( !( searchResponse instanceof SearchResultDone ) );
-
-        assertEquals( 3, count );
     }
+    while ( !( searchResponse instanceof SearchResultDone ) );
+
+    assertEquals( 5, count );
+}
 
 
-    @Test
-    public void testSearchWithDerefAlias() throws Exception
-    {
-        SearchRequest searchRequest = new SearchRequestImpl();
-        searchRequest.setBase( new Dn( "ou=users,ou=system" ) );
-        searchRequest.setFilter( "(objectClass=*)" );
-        searchRequest.setScope( SearchScope.ONELEVEL );
-        searchRequest.addAttributes( "*" );
+/**
+ * Test a search with a Substring filter
+ * @throws Exception
+ */
+@Test
+public void testSearchPersonSubstring() throws Exception
+{
+    SearchFuture searchFuture = connection.searchAsync( "ou=system", "(objectclass=*ers*)", SearchScope.SUBTREE,
+        "*", "+" );
+    int count = 0;
+    Response searchResponse = null;
 
-        int count = 0;
-        Cursor<Response> cursor = connection.search( searchRequest );
+    do
+    {
+        searchResponse = ( Response ) searchFuture.get( 100000, TimeUnit.MILLISECONDS );
+        assertNotNull( searchResponse );
 
-        while ( cursor.next() )
+        if ( !( searchResponse instanceof SearchResultDone ) )
         {
             count++;
         }
-        cursor.close();
+    }
+    while ( !( searchResponse instanceof SearchResultDone ) );
 
-        // due to dereferencing of aliases we get only one entry
-        assertEquals( 2, count );
+    assertEquals( 3, count );
+}
 
-        count = 0;
-        searchRequest.setDerefAliases( AliasDerefMode.NEVER_DEREF_ALIASES );
-        cursor = connection.search( searchRequest );
 
-        while ( cursor.next() )
-        {
-            count++;
-        }
-        cursor.close();
+@Test
+public void testSearchWithDerefAlias() throws Exception
+{
+    SearchRequest searchRequest = new SearchRequestImpl();
+    searchRequest.setBase( new Dn( "ou=users,ou=system" ) );
+    searchRequest.setFilter( "(objectClass=*)" );
+    searchRequest.setScope( SearchScope.ONELEVEL );
+    searchRequest.addAttributes( "*" );
+
+    int count = 0;
+    Cursor<Response> cursor = connection.search( searchRequest );
 
-        assertEquals( 3, count );
+    while ( cursor.next() )
+    {
+        count++;
     }
+    cursor.close();
+
+    // due to dereferencing of aliases we get only one entry
+    assertEquals( 2, count );
 
+    count = 0;
+    searchRequest.setDerefAliases( AliasDerefMode.NEVER_DEREF_ALIASES );
+    cursor = connection.search( searchRequest );
 
-    @Test(expected = LdapException.class)
-    public void testSearchUTF8() throws Exception
+    while ( cursor.next() )
     {
-        connection.search( "ou=system", "(sn=Emmanuel L\u00e9charny)", SearchScope.ONELEVEL, "*", "+" );
+        count++;
     }
+    cursor.close();
+
+    assertEquals( 3, count );
+}
+
+
+@Test(expected = LdapException.class)
+public void testSearchUTF8() throws Exception
+{
+    connection.search( "ou=system", "(sn=Emmanuel L\u00e9charny)", SearchScope.ONELEVEL, "*", "+" );
+}
 }

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/operations/search/SearchRequestReturningAttributesTest.java Tue Jan 24 16:27:18 2012
@@ -61,8 +61,12 @@ import org.junit.runner.RunWith;
     { "dn: cn=user1,ou=users,ou=system", "objectClass: person", "objectClass: top", "sn: user1 sn", "cn: user1",
 
         // alias to the above entry
-        "dn: cn=user1-alias,ou=users,ou=system", "objectClass: alias", "objectClass: top",
-        "objectClass: extensibleObject", "aliasedObjectName: cn=user1,ou=users,ou=system", "cn: user1-alias" })
+        "dn: cn=user1-alias,ou=users,ou=system",
+        "objectClass: alias",
+        "objectClass: top",
+        "objectClass: extensibleObject",
+        "aliasedObjectName: cn=user1,ou=users,ou=system",
+        "cn: user1-alias" })
 public class SearchRequestReturningAttributesTest extends AbstractLdapTestUnit
 {
     private LdapNetworkConnection connection;
@@ -233,7 +237,7 @@ public class SearchRequestReturningAttri
             assertNotNull( entry );
             count++;
         }
-        
+
         cursor.close();
 
         assertEquals( 1, count );
@@ -468,8 +472,8 @@ public class SearchRequestReturningAttri
         assertTrue( entry.containsAttribute( "entryCSN" ) );
         assertTrue( entry.containsAttribute( "entryParentId" ) );
     }
-    
-    
+
+
     /**
      *  DIRSERVER-1600
      */
@@ -481,7 +485,7 @@ public class SearchRequestReturningAttri
         sr.setFilter( "(uid=admin)" );
         sr.setScope( SearchScope.OBJECT );
         sr.setTypesOnly( true );
-        
+
         Cursor<Response> cursor = connection.search( sr );
         int count = 0;
         Entry response = null;
@@ -496,5 +500,5 @@ public class SearchRequestReturningAttri
 
         assertEquals( 1, count );
         assertNull( response.get( SchemaConstants.UID_AT ).get() );
-    }    
+    }
 }

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/perf/TestClientApiPerf.java Tue Jan 24 16:27:18 2012
@@ -76,7 +76,7 @@ public class TestClientApiPerf extends A
         long t2 = System.currentTimeMillis();
 
         EntryCursor cursor = connection.search( "dc=example,dc=com", "(objectClass=*)", SearchScope.SUBTREE, "*" );
-        
+
         while ( cursor.next() )
         {
             cursor.get();

Modified: directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/utils/SASLPrep.java
URL: http://svn.apache.org/viewvc/directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/utils/SASLPrep.java?rev=1235334&r1=1235333&r2=1235334&view=diff
==============================================================================
--- directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/utils/SASLPrep.java (original)
+++ directory/apacheds/trunk/ldap-client-test/src/test/java/org/apache/directory/shared/client/api/utils/SASLPrep.java Tue Jan 24 16:27:18 2012
@@ -19,6 +19,7 @@
  */
 package org.apache.directory.shared.client.api.utils;
 
+
 /**
  * This class implement the RFC 4013. It contains methods to prepare
  * String passwords before the client API can send them to the server.



Mime
View raw message