From 316798ef9e3ec82cd9793ef5cabb7d7c37b4aa4b Mon Sep 17 00:00:00 2001 From: Luke Taylor Date: Sat, 20 May 2006 17:47:36 +0000 Subject: [PATCH] Made mock context factory a standalone class --- .../ldap/MockInitialDirContextFactory.java | 29 +++++++++++++++++++ ...swordComparisonAuthenticatorMockTests.java | 24 +-------------- 2 files changed, 30 insertions(+), 23 deletions(-) create mode 100644 core/src/test/java/org/acegisecurity/ldap/MockInitialDirContextFactory.java diff --git a/core/src/test/java/org/acegisecurity/ldap/MockInitialDirContextFactory.java b/core/src/test/java/org/acegisecurity/ldap/MockInitialDirContextFactory.java new file mode 100644 index 0000000000..805f731c0b --- /dev/null +++ b/core/src/test/java/org/acegisecurity/ldap/MockInitialDirContextFactory.java @@ -0,0 +1,29 @@ +package org.acegisecurity.ldap; + +import javax.naming.directory.DirContext; + +/** + * @author Luke Taylor + * @version $Id$ + */ +public class MockInitialDirContextFactory implements InitialDirContextFactory { + DirContext ctx; + String baseDn; + + public MockInitialDirContextFactory(DirContext ctx, String baseDn) { + this.baseDn = baseDn; + this.ctx = ctx; + } + + public DirContext newInitialDirContext() { + return ctx; + } + + public DirContext newInitialDirContext(String username, String password) { + return ctx; + } + + public String getRootDn() { + return baseDn; + } +} diff --git a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/PasswordComparisonAuthenticatorMockTests.java b/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/PasswordComparisonAuthenticatorMockTests.java index 0f4db7ea48..775b110834 100644 --- a/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/PasswordComparisonAuthenticatorMockTests.java +++ b/core/src/test/java/org/acegisecurity/providers/ldap/authenticator/PasswordComparisonAuthenticatorMockTests.java @@ -2,7 +2,7 @@ package org.acegisecurity.providers.ldap.authenticator; import org.jmock.Mock; import org.jmock.MockObjectTestCase; -import org.acegisecurity.ldap.InitialDirContextFactory; +import org.acegisecurity.ldap.MockInitialDirContextFactory; import javax.naming.directory.DirContext; import javax.naming.directory.BasicAttributes; @@ -36,26 +36,4 @@ public class PasswordComparisonAuthenticatorMockTests extends MockObjectTestCase mockCtx.expects(atLeastOnce()).method("close"); authenticator.authenticate("Bob", "bobspassword"); } - - class MockInitialDirContextFactory implements InitialDirContextFactory { - DirContext ctx; - String baseDn; - - public MockInitialDirContextFactory(DirContext ctx, String baseDn) { - this.baseDn = baseDn; - this.ctx = ctx; - } - - public DirContext newInitialDirContext() { - return ctx; - } - - public DirContext newInitialDirContext(String username, String password) { - return ctx; - } - - public String getRootDn() { - return baseDn; - } - } }