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 2011/02/17 21:23:42 UTC
svn commit: r1071769 [2/4] - in /directory/apacheds/branches/m1:
core-integ/src/test/java/org/apache/directory/server/core/authn/ppolicy/
kerberos-test/src/test/java/org/apache/directory/server/kerberos/kdc/
ldap-client-test/src/test/java/org/apache/di...
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/SaslBindIT.java Thu Feb 17 20:23:38 2011
@@ -187,7 +187,7 @@ public class SaslBindIT extends Abstract
hostName = "localhost";
}
String servicePrincipal = "ldap/" + hostName + "@EXAMPLE.COM";
- ldapServer.setSaslPrincipal( servicePrincipal );
+ getLdapServer().setSaslPrincipal( servicePrincipal );
ModifyRequest modifyRequest = new ModifyRequestImpl();
modifyRequest.setName( new Dn( "uid=ldap,ou=users,dc=example,dc=com" ) );
@@ -205,12 +205,12 @@ public class SaslBindIT extends Abstract
{
// We have to tell the server that it should accept anonymous
// auth, because we are reading the rootDSE
- ldapServer.getDirectoryService().setAllowAnonymousAccess( true );
+ getLdapServer().getDirectoryService().setAllowAnonymousAccess( true );
// Point on rootDSE
DirContext context = new InitialDirContext();
- Attributes attrs = context.getAttributes( "ldap://localhost:" + ldapServer.getPort(), new String[]
+ Attributes attrs = context.getAttributes( "ldap://localhost:" + getLdapServer().getPort(), new String[]
{ "supportedSASLMechanisms" } );
// Thread.sleep( 10 * 60 * 1000 );
@@ -233,7 +233,7 @@ public class SaslBindIT extends Abstract
public void testSaslBindPLAIN() throws Exception
{
Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
- LdapConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
BindRequest bindReq = new BindRequestImpl();
bindReq.setCredentials( "secret" );
bindReq.setName( userDn );
@@ -257,7 +257,7 @@ public class SaslBindIT extends Abstract
public void testSaslBindNoMech() throws Exception
{
Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
- LdapConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
BindRequest bindReq = new BindRequestImpl();
bindReq.setCredentials( "secret" );
bindReq.setName( userDn );
@@ -285,7 +285,7 @@ public class SaslBindIT extends Abstract
public void testSaslCramMd5Bind() throws Exception
{
Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
- LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
CramMd5Request request = new CramMd5Request();
request.setUsername( userDn.getRdn().getUpValue().getString() );
@@ -308,7 +308,7 @@ public class SaslBindIT extends Abstract
public void testSaslCramMd5BindBadPassword() throws Exception
{
Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
- LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
CramMd5Request request = new CramMd5Request();
request.setUsername( userDn.getRdn().getUpValue().getString() );
@@ -327,12 +327,12 @@ public class SaslBindIT extends Abstract
public void testSaslDigestMd5Bind() throws Exception
{
Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
- LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
DigestMd5Request request = new DigestMd5Request();
request.setUsername( userDn.getRdn().getUpValue().getString() );
request.setCredentials( "secret" );
- request.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
+ request.setRealmName( getLdapServer().getSaslRealms().get( 0 ) );
BindResponse resp = connection.bind( request );
assertEquals( ResultCodeEnum.SUCCESS, resp.getLdapResult().getResultCode() );
@@ -350,7 +350,7 @@ public class SaslBindIT extends Abstract
public void testSaslDigestMd5BindBadRealm() throws Exception
{
Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
- LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
DigestMd5Request request = new DigestMd5Request();
request.setUsername( userDn.getRdn().getUpValue().getString() );
@@ -370,12 +370,12 @@ public class SaslBindIT extends Abstract
public void testSaslDigestMd5BindBadPassword() throws Exception
{
Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
- LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
DigestMd5Request request = new DigestMd5Request();
request.setUsername( userDn.getRdn().getUpValue().getString() );
request.setCredentials( "badsecret" );
- request.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
+ request.setRealmName( getLdapServer().getSaslRealms().get( 0 ) );
BindResponse resp = connection.bind( request );
assertEquals( ResultCodeEnum.INVALID_CREDENTIALS, resp.getLdapResult().getResultCode() );
@@ -390,12 +390,12 @@ public class SaslBindIT extends Abstract
public void testSaslGssApiBind() throws Exception
{
Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
- LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
GssApiRequest request = new GssApiRequest();
request.setUsername( userDn.getRdn().getUpValue().getString() );
request.setCredentials( "secret" );
- request.setRealmName( ldapServer.getSaslRealms().get( 0 ).toUpperCase() );
+ request.setRealmName( getLdapServer().getSaslRealms().get( 0 ).toUpperCase() );
request.setKdcHost( "localhost" );
request.setKdcPort( 6088 );
BindResponse resp = connection.bind( request );
@@ -415,7 +415,7 @@ public class SaslBindIT extends Abstract
public void testSaslGssApiBindBadRealm() throws Exception
{
Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
- LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
GssApiRequest request = new GssApiRequest();
request.setUsername( userDn.getRdn().getUpValue().getString() );
@@ -445,12 +445,12 @@ public class SaslBindIT extends Abstract
public void testSaslGssApiBindBadPassword() throws Exception
{
Dn userDn = new Dn( "uid=hnelson,ou=users,dc=example,dc=com" );
- LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapNetworkConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
GssApiRequest request = new GssApiRequest();
request.setUsername( userDn.getRdn().getUpValue().getString() );
request.setCredentials( "badsecret" );
- request.setRealmName( ldapServer.getSaslRealms().get( 0 ).toUpperCase() );
+ request.setRealmName( getLdapServer().getSaslRealms().get( 0 ).toUpperCase() );
request.setKdcHost( "localhost" );
request.setKdcPort( 6088 );
try
@@ -501,7 +501,7 @@ public class SaslBindIT extends Abstract
// the provider configured in @CreateLdapServer only sets for the NTLM mechanism
// but we use the same NtlmMechanismHandler class for GSS_SPNEGO too but this is a separate
// instance, so we need to set the provider in the NtlmMechanismHandler instance of GSS_SPNEGO mechanism
- NtlmMechanismHandler ntlmHandler = ( NtlmMechanismHandler ) ldapServer.getSaslMechanismHandlers().get(
+ NtlmMechanismHandler ntlmHandler = ( NtlmMechanismHandler ) getLdapServer().getSaslMechanismHandlers().get(
SupportedSaslMechanisms.GSS_SPNEGO );
ntlmHandler.setNtlmProvider( provider );
@@ -537,11 +537,11 @@ public class SaslBindIT extends Abstract
System.out.println( "try " + i );
// Digest-MD5
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
DigestMd5Request digetDigestMd5Request = new DigestMd5Request();
digetDigestMd5Request.setUsername( userDn.getRdn().getUpValue().getString() );
digetDigestMd5Request.setCredentials( "secret" );
- digetDigestMd5Request.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
+ digetDigestMd5Request.setRealmName( getLdapServer().getSaslRealms().get( 0 ) );
resp = connection.bind( digetDigestMd5Request );
assertEquals( ResultCodeEnum.SUCCESS, resp.getLdapResult().getResultCode() );
entry = connection.lookup( userDn );
@@ -549,7 +549,7 @@ public class SaslBindIT extends Abstract
connection.close();
// Cram-MD5
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
CramMd5Request cramMd5Request = new CramMd5Request();
cramMd5Request.setUsername( userDn.getRdn().getUpValue().getString() );
cramMd5Request.setCredentials( "secret" );
@@ -560,11 +560,11 @@ public class SaslBindIT extends Abstract
connection.close();
// GSSAPI
- connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
GssApiRequest gssApiRequest = new GssApiRequest();
gssApiRequest.setUsername( userDn.getRdn().getUpValue().getString() );
gssApiRequest.setCredentials( "secret" );
- gssApiRequest.setRealmName( ldapServer.getSaslRealms().get( 0 ) );
+ gssApiRequest.setRealmName( getLdapServer().getSaslRealms().get( 0 ) );
gssApiRequest.setKdcHost( "localhost" );
gssApiRequest.setKdcPort( 6088 );
resp = connection.bind( gssApiRequest );
@@ -588,8 +588,8 @@ public class SaslBindIT extends Abstract
NtlmSaslBindClient( String mechanism ) throws Exception
{
this.mechanism = mechanism;
- setDefaultPort( ldapServer.getPort() );
- connect( "localhost", ldapServer.getPort() );
+ setDefaultPort( getLdapServer().getPort() );
+ connect( "localhost", getLdapServer().getPort() );
setTcpNoDelay( false );
LOG.debug( "isConnected() = {}", isConnected() );
@@ -619,7 +619,7 @@ public class SaslBindIT extends Abstract
LdapDecoder decoder = new LdapDecoder();
// Send encoded request to server
- LdapEncoder encoder = new LdapEncoder( ldapServer.getDirectoryService().getLdapCodecService() );
+ LdapEncoder encoder = new LdapEncoder( getLdapServer().getDirectoryService().getLdapCodecService() );
ByteBuffer bb = encoder.encodeMessage( request );
bb.flip();
@@ -634,7 +634,7 @@ public class SaslBindIT extends Abstract
// Retrieve the response back from server to my last request.
LdapMessageContainer container = new LdapMessageContainer(
- ldapServer.getDirectoryService().getLdapCodecService() );
+ getLdapServer().getDirectoryService().getLdapCodecService() );
decoder.setLdapMessageContainer( container );
return ( BindResponse ) decoder.decode( null, _input_ );
}
@@ -659,7 +659,7 @@ public class SaslBindIT extends Abstract
LdapDecoder decoder = new LdapDecoder();
// Send encoded request to server
- LdapEncoder encoder = new LdapEncoder( ldapServer.getDirectoryService().getLdapCodecService() );
+ LdapEncoder encoder = new LdapEncoder( getLdapServer().getDirectoryService().getLdapCodecService() );
ByteBuffer bb = encoder.encodeMessage( request );
bb.flip();
@@ -673,7 +673,7 @@ public class SaslBindIT extends Abstract
// Retrieve the response back from server to my last request.
LdapMessageContainer container = new LdapMessageContainer(
- ldapServer.getDirectoryService().getLdapCodecService() );
+ getLdapServer().getDirectoryService().getLdapCodecService() );
decoder.setLdapMessageContainer( container );
return ( BindResponse ) decoder.decode( null, _input_ );
}
@@ -685,7 +685,7 @@ public class SaslBindIT extends Abstract
BogusNtlmProvider provider = null;
try
{
- NtlmMechanismHandler ntlmHandler = ( NtlmMechanismHandler ) ldapServer.getSaslMechanismHandlers().get(
+ NtlmMechanismHandler ntlmHandler = ( NtlmMechanismHandler ) getLdapServer().getSaslMechanismHandlers().get(
SupportedSaslMechanisms.NTLM );
// there is no getter for 'provider' field hence this hack
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/bind/SimpleBindIT.java Thu Feb 17 20:23:38 2011
@@ -129,7 +129,7 @@ public class SimpleBindIT extends Abstra
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapServer.getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "uid=hnelson," + BASE );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
@@ -167,7 +167,7 @@ public class SimpleBindIT extends Abstra
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapServer.getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "uid=hnelson," + BASE );
env.put( Context.SECURITY_CREDENTIALS, "badsecret" );
@@ -196,7 +196,7 @@ public class SimpleBindIT extends Abstra
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapServer.getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "hnelson" );
@@ -226,7 +226,7 @@ public class SimpleBindIT extends Abstra
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapServer.getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "uid=unknown,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "secret" );
@@ -252,12 +252,12 @@ public class SimpleBindIT extends Abstra
@Test
public void testSimpleBindNoPrincipalNoPassword()
{
- boolean oldValue = ldapServer.getDirectoryService().isAllowAnonymousAccess();
- ldapServer.getDirectoryService().setAllowAnonymousAccess( false );
+ boolean oldValue = getLdapServer().getDirectoryService().isAllowAnonymousAccess();
+ getLdapServer().getDirectoryService().setAllowAnonymousAccess( false );
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapServer.getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "" );
env.put( Context.SECURITY_CREDENTIALS, "" );
@@ -281,7 +281,7 @@ public class SimpleBindIT extends Abstra
{
// Use the netscape API as JNDI cannot be used to do a search without
// first binding.
- LDAPUrl url = new LDAPUrl( "localhost", ldapServer.getPort(), "", new String[]
+ LDAPUrl url = new LDAPUrl( "localhost", getLdapServer().getPort(), "", new String[]
{ "vendorName" }, 0, "(ObjectClass=*)" );
LDAPSearchResults results = LDAPConnection.search( url );
@@ -315,7 +315,7 @@ public class SimpleBindIT extends Abstra
{
// Use the netscape API as JNDI cannot be used to do a search without
// first binding.
- LDAPUrl url = new LDAPUrl( "localhost", ldapServer.getPort(), "uid=admin,ou=system", attrIDs, 0,
+ LDAPUrl url = new LDAPUrl( "localhost", getLdapServer().getPort(), "uid=admin,ou=system", attrIDs, 0,
"(ObjectClass=*)" );
LDAPConnection.search( url );
@@ -327,7 +327,7 @@ public class SimpleBindIT extends Abstra
assertTrue( true );
}
- ldapServer.getDirectoryService().setAllowAnonymousAccess( oldValue );
+ getLdapServer().getDirectoryService().setAllowAnonymousAccess( oldValue );
}
@@ -339,7 +339,7 @@ public class SimpleBindIT extends Abstra
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapServer.getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "uid=admin,ou=system" );
env.put( Context.SECURITY_CREDENTIALS, "" );
@@ -369,7 +369,7 @@ public class SimpleBindIT extends Abstra
{
Hashtable<String, String> env = new Hashtable<String, String>();
env.put( Context.INITIAL_CONTEXT_FACTORY, "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( Context.PROVIDER_URL, "ldap://localhost:" + ldapServer.getPort() );
+ env.put( Context.PROVIDER_URL, "ldap://localhost:" + getLdapServer().getPort() );
env.put( Context.SECURITY_AUTHENTICATION, "simple" );
env.put( Context.SECURITY_PRINCIPAL, "" );
@@ -398,14 +398,14 @@ public class SimpleBindIT extends Abstra
public void testAnonymousRootDSESearch()
{
- boolean oldValue = ldapServer.getDirectoryService().isAllowAnonymousAccess();
- ldapServer.getDirectoryService().setAllowAnonymousAccess( false );
+ boolean oldValue = getLdapServer().getDirectoryService().isAllowAnonymousAccess();
+ getLdapServer().getDirectoryService().setAllowAnonymousAccess( false );
try
{
// Use the netscape API as JNDI cannot be used to do a search without
// first binding.
- LDAPUrl url = new LDAPUrl( "localhost", ldapServer.getPort(), "", new String[]
+ LDAPUrl url = new LDAPUrl( "localhost", getLdapServer().getPort(), "", new String[]
{ "vendorName" }, 0, "(ObjectClass=*)" );
LDAPSearchResults results = LDAPConnection.search( url );
@@ -435,7 +435,7 @@ public class SimpleBindIT extends Abstra
}
finally
{
- ldapServer.getDirectoryService().setAllowAnonymousAccess( oldValue );
+ getLdapServer().getDirectoryService().setAllowAnonymousAccess( oldValue );
}
}
@@ -446,7 +446,7 @@ public class SimpleBindIT extends Abstra
@Test
public void testBindWithDoubleQuote() throws Exception
{
- LdapConnection connection = new LdapNetworkConnection( "localhost", ldapServer.getPort() );
+ LdapConnection connection = new LdapNetworkConnection( "localhost", getLdapServer().getPort() );
BindResponse response = connection.bind( "uid=\"admin\",ou=\"system\"", "secret" );
LdapResult ldapResult = response.getLdapResult();
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/compare/CompareIT.java Thu Feb 17 20:23:38 2011
@@ -94,7 +94,7 @@ public class CompareIT extends AbstractL
@Test
public void testNormalCompare() throws Exception
{
- LdapConnection conn = getClientApiConnection( ldapServer );
+ LdapConnection conn = getClientApiConnection( getLdapServer() );
// comparison success
CompareResponse resp = conn.compare( "uid=akarasulu,ou=users,ou=system", "sn", "karasulu" );
@@ -116,7 +116,7 @@ public class CompareIT extends AbstractL
@Test
public void testNormalCompareMissingAttribute() throws Exception
{
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
// comparison success
LDAPAttribute attribute = new LDAPAttribute( "sn", "karasulu" );
@@ -145,7 +145,7 @@ public class CompareIT extends AbstractL
@Test
public void testOnReferralWithManageDsaITControl() throws Exception
{
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPConstraints();
constraints.setClientControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
constraints.setServerControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
@@ -171,7 +171,7 @@ public class CompareIT extends AbstractL
@Test
public void testOnReferral() throws Exception
{
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPConstraints();
constraints.setReferrals( false );
conn.setConstraints( constraints );
@@ -205,7 +205,7 @@ public class CompareIT extends AbstractL
@Test
public void testThrowOnReferralWithJndi() throws Exception
{
- LdapContext ctx = getWiredContextThrowOnRefferal( ldapServer );
+ LdapContext ctx = getWiredContextThrowOnRefferal( getLdapServer() );
SearchControls controls = new SearchControls();
controls.setReturningAttributes( new String[0] );
controls.setSearchScope( SearchControls.OBJECT_SCOPE );
@@ -244,9 +244,9 @@ public class CompareIT extends AbstractL
@Test
public void testCompareWithoutAuthentication() throws LDAPException
{
- ldapServer.getDirectoryService().setAllowAnonymousAccess( false );
+ getLdapServer().getDirectoryService().setAllowAnonymousAccess( false );
LDAPConnection conn = new LDAPConnection();
- conn.connect( "localhost", ldapServer.getPort() );
+ conn.connect( "localhost", getLdapServer().getPort() );
LDAPAttribute attr = new LDAPAttribute( "uid", "admin" );
try
@@ -269,7 +269,7 @@ public class CompareIT extends AbstractL
{
LOG.debug( "" );
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPConstraints();
conn.setConstraints( constraints );
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/compare/MatchingRuleCompareIT.java Thu Feb 17 20:23:38 2011
@@ -87,7 +87,7 @@ public class MatchingRuleCompareIT exten
@Test
public void testCaseIgnoreMatch() throws Exception
{
- DirContext ctx = ( DirContext ) ServerIntegrationUtils.getWiredContext( ldapServer ).lookup( "ou=system" );
+ DirContext ctx = ( DirContext ) ServerIntegrationUtils.getWiredContext( getLdapServer() ).lookup( "ou=system" );
// Setting up search controls for compare op
SearchControls ctls = new SearchControls();
@@ -125,7 +125,7 @@ public class MatchingRuleCompareIT exten
@Test
public void testDistinguishedNameMatch() throws Exception
{
- DirContext ctx = ( DirContext ) ServerIntegrationUtils.getWiredContext( ldapServer ).lookup( "ou=system" );
+ DirContext ctx = ( DirContext ) ServerIntegrationUtils.getWiredContext( getLdapServer() ).lookup( "ou=system" );
// determine member Dn of person
DirContext member = ( DirContext ) ctx.lookup( PERSON_RDN );
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/delete/DeleteIT.java Thu Feb 17 20:23:38 2011
@@ -92,7 +92,7 @@ public class DeleteIT extends AbstractLd
@Test
public void testNormalDeleteFailContextNotEmpty() throws Exception
{
- LdapConnection conn = getClientApiConnection( ldapServer );
+ LdapConnection conn = getClientApiConnection( getLdapServer() );
// delete failure on non-leaf entry
DeleteResponse resp = conn.delete( "uid=akarasulu,ou=users,ou=system" );
@@ -109,7 +109,7 @@ public class DeleteIT extends AbstractLd
@Test
public void testNormalDelete() throws Exception
{
- LdapConnection conn = getClientApiConnection( ldapServer );
+ LdapConnection conn = getClientApiConnection( getLdapServer() );
// delete success
conn.delete( "ou=computers,uid=akarasulu,ou=users,ou=system" );
@@ -129,7 +129,7 @@ public class DeleteIT extends AbstractLd
@Test
public void testDeleteNonExistent() throws Exception
{
- LdapConnection conn = getClientApiConnection( ldapServer );
+ LdapConnection conn = getClientApiConnection( getLdapServer() );
// delete failure non-existent entry
DeleteResponse resp = conn.delete( "uid=elecharny,ou=users,ou=system" );
@@ -145,7 +145,7 @@ public class DeleteIT extends AbstractLd
@Test
public void testOnReferralWithManageDsaITControl() throws Exception
{
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPSearchConstraints();
constraints.setClientControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
constraints.setServerControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
@@ -176,7 +176,7 @@ public class DeleteIT extends AbstractLd
@Test
public void testOnReferral() throws Exception
{
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPConstraints();
constraints.setReferrals( false );
conn.setConstraints( constraints );
@@ -205,7 +205,7 @@ public class DeleteIT extends AbstractLd
@Test
public void testThrowOnReferralWithJndi() throws Exception
{
- LdapContext ctx = getWiredContextThrowOnRefferal( ldapServer );
+ LdapContext ctx = getWiredContextThrowOnRefferal( getLdapServer() );
// delete success
ctx.destroySubcontext( "ou=computers,uid=akarasulu,ou=users,ou=system" );
@@ -243,7 +243,7 @@ public class DeleteIT extends AbstractLd
{
LOG.debug( "" );
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPConstraints();
conn.setConstraints( constraints );
@@ -271,7 +271,7 @@ public class DeleteIT extends AbstractLd
@Test
public void testDeleteWithIllegalName() throws Exception
{
- LdapConnection conn = getClientApiConnection( ldapServer );
+ LdapConnection conn = getClientApiConnection( getLdapServer() );
try
{
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/extended/ExtendedIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/extended/ExtendedIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/extended/ExtendedIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/extended/ExtendedIT.java Thu Feb 17 20:23:38 2011
@@ -61,7 +61,7 @@ public class ExtendedIT extends Abstract
@Test
public void testUnknownExtendedOperation() throws Exception
{
- LdapContext ctx = ( LdapContext ) getWiredContext( ldapServer ).lookup( "ou=system" );
+ LdapContext ctx = ( LdapContext ) getWiredContext( getLdapServer() ).lookup( "ou=system" );
try
{
ctx.extendedOperation( new UnknownExtendedOperationRequest() );
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/extended/StoredProcedureIT.java Thu Feb 17 20:23:38 2011
@@ -77,7 +77,7 @@ public class StoredProcedureIT extends A
{
Hashtable<String, Object> env = new Hashtable<String, Object>();
env.put( "java.naming.factory.initial", "com.sun.jndi.ldap.LdapCtxFactory" );
- env.put( "java.naming.provider.url", "ldap://localhost:" + ldapServer.getPort() + "/ou=system" );
+ env.put( "java.naming.provider.url", "ldap://localhost:" + getLdapServer().getPort() + "/ou=system" );
env.put( "java.naming.security.principal", "uid=admin,ou=system" );
env.put( "java.naming.security.credentials", "secret" );
env.put( "java.naming.security.authentication", "simple" );
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/IllegalModificationIT.java Thu Feb 17 20:23:38 2011
@@ -82,7 +82,7 @@ public class IllegalModificationIT exten
@Test
public void testIllegalModification() throws Exception
{
- LdapConnection con = getClientApiConnection( ldapServer );
+ LdapConnection con = getClientApiConnection( getLdapServer() );
ModifyRequest modReq = new ModifyRequestImpl();
modReq.setName( new Dn( DN ) );
@@ -100,7 +100,7 @@ public class IllegalModificationIT exten
@Test
public void testIllegalModification2() throws Exception
{
- LDAPConnection con = getWiredConnection( ldapServer );
+ LDAPConnection con = getWiredConnection( getLdapServer() );
// first a valid attribute
LDAPAttribute attr = new LDAPAttribute( "description", "The description" );
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyAddIT.java Thu Feb 17 20:23:38 2011
@@ -121,7 +121,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testAddNewAttributeValue() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Add telephoneNumber attribute
String newValue = "1234567890";
@@ -146,7 +146,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testAddNewAttributeValues() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Add telephoneNumber attribute
String[] newValues =
@@ -177,7 +177,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testAddAdditionalAttributeValue() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// A new description attribute value
String newValue = "A new description for this person";
@@ -207,7 +207,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testAddExistingAttributeValue() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Change description attribute
Attributes attrs = new BasicAttributes( "description", PERSON_DESCRIPTION, true );
@@ -244,7 +244,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testAddExistingNthAttributesDirServer664() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Change description attribute
Attributes attrs = new BasicAttributes( true );
@@ -292,7 +292,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testTwoDescriptionDirServer643() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Change description attribute
Attributes attrs = new BasicAttributes( true );
@@ -321,7 +321,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testAddDuplicateValueToExistingAttribute() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// modify object classes, add a new value twice
Attribute ocls = new BasicAttribute( "objectClass", "organizationalPerson" );
@@ -354,7 +354,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testAddDuplicateValueToNewAttribute() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// add the same description value twice
Attribute desc = new BasicAttribute( "description", "another description value besides songwriter" );
@@ -382,7 +382,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testSearchBadAttribute() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Add a not existing attribute
String newValue = "unbelievable";
@@ -410,7 +410,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testAttributeValueMultiMofificationDIRSERVER_636() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create a person entry
Attributes attrs = getPersonAttributes("Bush", "Kate Bush");
@@ -464,7 +464,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testModifyOperationalAttributeAdd() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
ModificationItem modifyOp = new ModificationItem( DirContext.ADD_ATTRIBUTE, new BasicAttribute(
"subschemaSubentry", "cn=anotherSchema" ) );
@@ -496,7 +496,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testDNAttributeMemberModificationDIRSERVER_687() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create a person entry
Attributes attrs = getPersonAttributes("Bush", "Kate Bush");
@@ -537,7 +537,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testModifyAddWithInvalidNumberOfAttributeValues() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
Attributes attrs = new BasicAttributes( true );
Attribute ocls = new BasicAttribute( "objectClass" );
@@ -573,7 +573,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testAddNewBinaryAttributeValue() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Add a binary attribute
byte[] newValue = new byte[]{0x00, 0x01, 0x02, 0x03};
@@ -597,7 +597,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testAddNewBinaryAttributeValueAbove0x80() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Add a binary attribute
byte[] newValue = new byte[]{(byte)0x80, (byte)0x81, (byte)0x82, (byte)0x83};
@@ -621,7 +621,7 @@ public class ModifyAddIT extends Abstra
@Test
public void testRetrieveEntryWithBinaryAttributeValue() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Add a ;binary attribute
byte[] newValue = new byte[]{0x00, 0x01, 0x02, 0x03};
@@ -663,7 +663,7 @@ public class ModifyAddIT extends Abstra
*/
public void testAddNewBinaryAttributeValue0x80() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Add a ;binary attribute with high-bytes
byte[] newValue = new byte[]{(byte)0x80, (byte)0x81, (byte)0x82, (byte)0x83};
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyMultipleChangesIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyMultipleChangesIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyMultipleChangesIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyMultipleChangesIT.java Thu Feb 17 20:23:38 2011
@@ -106,7 +106,7 @@ public class ModifyMultipleChangesIT ex
@Test
public void testAddNewAttributeValues() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Add telephoneNumber attribute
String[] newValues =
@@ -138,7 +138,7 @@ public class ModifyMultipleChangesIT ex
@Test
public void testAttributeValueMultiMofificationDIRSERVER_636() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create a person entry
Attributes attrs = getPersonAttributes("Bush", "Kate Bush");
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReferralIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReferralIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReferralIT.java Thu Feb 17 20:23:38 2011
@@ -118,7 +118,7 @@ public class ModifyReferralIT extends Ab
@Test
public void testOnReferralWithManageDsaITControl() throws Exception
{
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPConstraints();
constraints.setClientControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
constraints.setServerControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
@@ -143,7 +143,7 @@ public class ModifyReferralIT extends Ab
@Test
public void testOnReferral() throws Exception
{
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPConstraints();
constraints.setReferrals( false );
conn.setConstraints( constraints );
@@ -173,7 +173,7 @@ public class ModifyReferralIT extends Ab
@Test
public void testThrowOnReferralWithJndi() throws Exception
{
- LdapContext ctx = getWiredContextThrowOnRefferal( ldapServer );
+ LdapContext ctx = getWiredContextThrowOnRefferal( getLdapServer() );
// modify failure
Attribute attr = new BasicAttribute( "description", "referral to akarasulu" );
@@ -201,7 +201,7 @@ public class ModifyReferralIT extends Ab
{
LOG.debug( "" );
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPConstraints();
conn.setConstraints( constraints );
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyRemoveIT.java Thu Feb 17 20:23:38 2011
@@ -86,7 +86,7 @@ public class ModifyRemoveIT extends Abst
@Before
public void setUp() throws Exception
{
- DirContext schemaRoot = ( DirContext ) getWiredContext( ldapServer ).lookup( "ou=schema" );
+ DirContext schemaRoot = ( DirContext ) getWiredContext( getLdapServer() ).lookup( "ou=schema" );
// -------------------------------------------------------------------
// Enable the krb5kdc schema
@@ -157,7 +157,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testRemoveAttemptWithoutChange() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Get the attributes and check the contents
Attributes tori = ctx.getAttributes( RDN );
@@ -209,7 +209,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testRemoveNotRequiredAttribute() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Remove description Attribute
Attribute attr = new BasicAttribute( "description" );
@@ -233,7 +233,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testRemoveTwoNotRequiredAttributes() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// add telephoneNumber to entry
Attributes tn = new BasicAttributes( "telephoneNumber", "12345678", true );
@@ -263,7 +263,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testRemoveRequiredAttribute() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Remove sn attribute
Attribute attr = new BasicAttribute( "sn" );
@@ -290,7 +290,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testRemovePartOfRdn() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Remove sn attribute
Attribute attr = new BasicAttribute( "cn" );
@@ -317,7 +317,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testRemovePartOfRdnNotRequired() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Change Rdn to another attribute
String newRdn = "description=an American singer-songwriter";
@@ -354,7 +354,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testRemoveAttributeNotPresent() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Remove telephoneNumber Attribute
Attribute attr = new BasicAttribute( "telephoneNumber" );
@@ -382,7 +382,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testRemoveAttributeValueNotPresent() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Remove telephoneNumber Attribute
Attribute attr = new BasicAttribute( "telephoneNumber", "12345" );
@@ -418,7 +418,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testRemoveAttributeNotValid() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Remove phantasy attribute
Attribute attr = new BasicAttribute( "XXX" );
@@ -447,7 +447,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testReplaceNonExistingAttribute() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create an entry
Attributes attrs = getInetOrgPersonAttributes( "Bush", "Kate Bush" );
@@ -493,7 +493,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testReplaceRdnByEmptyValueAttribute() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create an entry
Attributes attrs = getPersonAttributes( "Bush", "Kate Bush" );
@@ -525,7 +525,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testRemoveRdnAttribute() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create an entry
Attributes attrs = getPersonAttributes( "Bush", "Kate Bush" );
@@ -557,7 +557,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testRemoveRdnAttributeValue() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create an entry
Attributes attrs = getPersonAttributes( "Bush", "Kate Bush" );
@@ -589,7 +589,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testDeleteOclAttrWithTopPersonOrganizationalpersonInetorgperson() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create an entry
Attributes attrs = getInetOrgPersonAttributes("Bush", "Kate Bush");
@@ -622,7 +622,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testDeleteOclAttrWithTopPersonOrganizationalpersonInetorgpersonVariant() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create an entry
Attributes attrs = getInetOrgPersonAttributes("Bush", "Kate Bush");
@@ -651,7 +651,7 @@ public class ModifyRemoveIT extends Abst
@Test
public void testRemoveObjectClassAndMandatoryAttribute() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// add objectClass:krb5Principal and krb5PrincipalName:test to entry
Attributes tn = new BasicAttributes( true );
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modify/ModifyReplaceIT.java Thu Feb 17 20:23:38 2011
@@ -91,7 +91,7 @@ public class ModifyReplaceIT extends Abs
@Test
public void testReplaceToRemoveNotPresentAttribute() throws Exception
{
- DirContext sysRoot = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext sysRoot = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
String rdn = "cn=Kate Bush";
@@ -125,7 +125,7 @@ public class ModifyReplaceIT extends Abs
@Test
public void testReplaceToAddNotPresentAttribute() throws Exception
{
- DirContext sysRoot = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext sysRoot = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
String rdn = "cn=Kate Bush";
@@ -161,7 +161,7 @@ public class ModifyReplaceIT extends Abs
@Test
public void testReplaceNonExistingAttribute() throws Exception
{
- DirContext sysRoot = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext sysRoot = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
String rdn = "cn=Kate Bush";
@@ -201,7 +201,7 @@ public class ModifyReplaceIT extends Abs
@Test
public void testReplaceNonExistingAttributeManyMods() throws Exception
{
- DirContext sysRoot = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext sysRoot = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
String rdn = "cn=Kate Bush";
@@ -242,7 +242,7 @@ public class ModifyReplaceIT extends Abs
@Test
public void testReplaceNonExistingIndexedAttribute() throws Exception
{
- DirContext sysRoot = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext sysRoot = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
String rdn = "cn=Kim Wilde";
@@ -275,7 +275,7 @@ public class ModifyReplaceIT extends Abs
@Test
public void testReplaceCaseOfAttributeDescription() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
String rdn = "cn=Kate Bush";
// Replace telephoneNumber
@@ -301,7 +301,7 @@ public class ModifyReplaceIT extends Abs
@Test
public void testReplaceAttributeNotInOC() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
String rdn = "cn=Kate Bush";
// Replace ou
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyDnReferralIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyDnReferralIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyDnReferralIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyDnReferralIT.java Thu Feb 17 20:23:38 2011
@@ -110,7 +110,7 @@ public class ModifyDnReferralIT extends
@Test
public void testOnReferralWithManageDsaITControl() throws Exception
{
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPSearchConstraints();
constraints.setClientControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
constraints.setServerControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
@@ -133,7 +133,7 @@ public class ModifyDnReferralIT extends
@Test
public void testNewSuperiorOnReferralWithManageDsaITControl() throws Exception
{
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPSearchConstraints();
constraints.setClientControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
constraints.setServerControls( new LDAPControl( LDAPControl.MANAGEDSAIT, true, new byte[0] ) );
@@ -162,7 +162,7 @@ public class ModifyDnReferralIT extends
@Test
public void testOnReferral() throws Exception
{
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPConstraints();
constraints.setReferrals( false );
conn.setConstraints( constraints );
@@ -191,7 +191,7 @@ public class ModifyDnReferralIT extends
@Test
public void testNewSupierorOnReferral() throws Exception
{
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPConstraints();
constraints.setReferrals( false );
conn.setConstraints( constraints );
@@ -219,7 +219,7 @@ public class ModifyDnReferralIT extends
@Test
public void testThrowOnReferralWithJndi() throws Exception
{
- LdapContext ctx = getWiredContextThrowOnRefferal( ldapServer );
+ LdapContext ctx = getWiredContextThrowOnRefferal( getLdapServer() );
// ModifyDN referrals failure
try
@@ -245,7 +245,7 @@ public class ModifyDnReferralIT extends
{
LOG.debug( "" );
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPConstraints();
conn.setConstraints( constraints );
@@ -273,7 +273,7 @@ public class ModifyDnReferralIT extends
{
LOG.debug( "" );
- LDAPConnection conn = getWiredConnection( ldapServer );
+ LDAPConnection conn = getWiredConnection( getLdapServer() );
LDAPConstraints constraints = new LDAPConstraints();
conn.setConstraints( constraints );
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/ModifyRdnIT.java Thu Feb 17 20:23:38 2011
@@ -102,7 +102,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyRdnAndDeleteOld() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create a person, cn value is rdn
String oldCn = "Myra Ellen Amos";
@@ -151,7 +151,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyRdnAndDontDeleteOldFalse() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create a person, cn value is rdn
String oldCn = "Myra Ellen Amos";
@@ -198,7 +198,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyRdnAndKeepOld() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create a person, cn value is rdn
String oldCn = "Myra Ellen Amos";
@@ -246,7 +246,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyRdnAndDeleteOldVariant() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create a person, cn value is rdn
String oldCn = "Myra Ellen Amos";
@@ -301,7 +301,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyRdnDifferentAttribute() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create a person, cn value is rdn
String cnVal = "Tori Amos";
@@ -351,7 +351,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyRdnDifferentAttributeDeleteOldFails() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create a person, cn value is rdn
String cnVal = "Tori Amos";
@@ -386,7 +386,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyRdnAndDeleteOldWithChild() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create an organizational unit, ou value is rdn
String oldOu = "Writers";
@@ -456,7 +456,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyRdnWithEncodedNewRdn() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create a person "cn=Tori Amos", cn value is rdn
String cnVal = "Tori Amos";
@@ -509,7 +509,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyRdnWithEscapedPoundNewRdn() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// Create a person "cn=Tori Amos", cn value is rdn
String cnVal = "Tori Amos";
@@ -563,7 +563,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyMultiValuedRdnVariant1() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
Attributes attributes = createPerson( "cn" );
String oldRdn = getRdn( attributes, "cn" );
@@ -603,7 +603,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyMultiValuedRdnVariant2() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
Attributes attributes = createPerson( "cn" );
String oldRdn = getRdn( attributes, "cn" );
@@ -643,7 +643,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyMultiValuedRdnVariant3() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
Attributes attributes = createPerson( "description" );
String oldRdn = getRdn( attributes, "description" );
@@ -683,7 +683,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyMultiValuedRdnVariant4() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
Attributes attributes = createPerson( "description" );
String oldRdn = getRdn( attributes, "description" );
@@ -725,7 +725,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyMultiValuedRdnVariant5() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
Attributes attributes = createPerson( "cn" );
attributes.put( "telephoneNumber", "12345" );
@@ -771,7 +771,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyMultiValuedRdnVariant6() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
Attributes attributes = createPerson( "cn" );
attributes.put( "telephoneNumber", "12345" );
@@ -831,7 +831,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyMultiValuedRdnVariant7() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
Attributes attributes = createPerson( "cn", "sn" );
String oldRdn = getRdn( attributes, "cn", "sn" );
@@ -873,7 +873,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyMultiValuedRdnVariant8() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
Attributes attributes = createPerson( "cn", "sn" );
String oldRdn = getRdn( attributes, "cn", "sn" );
@@ -930,7 +930,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyRdnOperationalAttribute() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// create the entry
Attributes attributes = createPerson( "cn" );
@@ -975,7 +975,7 @@ public class ModifyRdnIT extends Abstrac
@Test
public void testModifyRdnObjectClassAttribute() throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
// create the entry
Attributes attributes = createPerson( "cn" );
@@ -1020,7 +1020,7 @@ public class ModifyRdnIT extends Abstrac
private Attributes createPerson( String... rdnTypes ) throws Exception
{
- DirContext ctx = ( DirContext ) getWiredContext( ldapServer ).lookup( BASE );
+ DirContext ctx = ( DirContext ) getWiredContext( getLdapServer() ).lookup( BASE );
Attributes attributes = LdifUtils.createAttributes(
"objectClass: top",
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/modifydn/MoveIT.java Thu Feb 17 20:23:38 2011
@@ -76,7 +76,7 @@ public class MoveIT extends AbstractLdap
@Test
public void testMoveNoRdnChange() throws Exception
{
- LdapContext ctx = getWiredContext( ldapServer );
+ LdapContext ctx = getWiredContext( getLdapServer() );
ctx.rename( DN, NEW_DN );
SearchControls controls = new SearchControls();
@@ -97,7 +97,7 @@ public class MoveIT extends AbstractLdap
@Test
public void testMoveAndRdnChange() throws Exception
{
- LdapContext ctx = getWiredContext( ldapServer );
+ LdapContext ctx = getWiredContext( getLdapServer() );
ctx.rename( DN, NEW_DN2 );
SearchControls controls = new SearchControls();
@@ -119,7 +119,7 @@ public class MoveIT extends AbstractLdap
public void testIllegalMove() throws Exception
{
- LdapConnection con = getClientApiConnection( ldapServer );
+ LdapConnection con = getClientApiConnection( getLdapServer() );
//now do something bad: make the parent a child of its own child
ModifyDnResponse resp = con.move( "ou=parent,ou=system", "ou=child,ou=parent,ou=system" );
@@ -131,7 +131,7 @@ public class MoveIT extends AbstractLdap
public void testIllegalMoveToSameDN() throws Exception
{
- LdapConnection con = getClientApiConnection( ldapServer );
+ LdapConnection con = getClientApiConnection( getLdapServer() );
//now do something bad: try to move the entry to the same Dn
ModifyDnResponse resp = con.move( "ou=parent,ou=system", "ou=parent,ou=system" );
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/IndexedNegationSearchIT.java Thu Feb 17 20:23:38 2011
@@ -224,7 +224,7 @@ public class IndexedNegationSearchIT ext
Set<SearchResult> getActorResults( String filter ) throws Exception
{
- DirContext ctx = getWiredContext( ldapServer );
+ DirContext ctx = getWiredContext( getLdapServer() );
Set<SearchResult> results = new HashSet<SearchResult>();
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );
@@ -243,7 +243,7 @@ public class IndexedNegationSearchIT ext
Set<SearchResult> getResults( String filter ) throws Exception
{
- DirContext ctx = getWiredContext( ldapServer );
+ DirContext ctx = getWiredContext( getLdapServer() );
Set<SearchResult> results = new HashSet<SearchResult>();
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.SUBTREE_SCOPE );
Modified: directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/NegationSearchIT.java
URL: http://svn.apache.org/viewvc/directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/NegationSearchIT.java?rev=1071769&r1=1071768&r2=1071769&view=diff
==============================================================================
--- directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/NegationSearchIT.java (original)
+++ directory/apacheds/branches/m1/server-integ/src/test/java/org/apache/directory/server/operations/search/NegationSearchIT.java Thu Feb 17 20:23:38 2011
@@ -164,7 +164,7 @@ public class NegationSearchIT extends Ab
Set<SearchResult> getResults( String filter ) throws Exception
{
- DirContext ctx = getWiredContext( ldapServer );
+ DirContext ctx = getWiredContext( getLdapServer() );
Set<SearchResult> results = new HashSet<SearchResult>();
SearchControls controls = new SearchControls();
controls.setSearchScope( SearchControls.ONELEVEL_SCOPE );