diff options
| author | James Moger <james.moger@gitblit.com> | 2013-11-19 08:01:23 -0500 |
|---|---|---|
| committer | James Moger <james.moger@gitblit.com> | 2013-11-29 11:05:50 -0500 |
| commit | 5200b359257c2ab5e29781c2b05c6092fc8338f8 (patch) | |
| tree | 7d0a02b17ce9897576845d8376ce67fe3f7e9532 /src/test/java/com/gitblit/tests/LdapUserServiceTest.java | |
| parent | cacf8bff097fbb66a7be1bfe267b5da2605145f8 (diff) | |
| download | gitblit-5200b359257c2ab5e29781c2b05c6092fc8338f8.tar.gz gitblit-5200b359257c2ab5e29781c2b05c6092fc8338f8.zip | |
Eliminate static singleton calls from user services
Change-Id: Ieec34483822f033b19d3ff3259d071c9bc091ed1
Diffstat (limited to 'src/test/java/com/gitblit/tests/LdapUserServiceTest.java')
| -rw-r--r-- | src/test/java/com/gitblit/tests/LdapUserServiceTest.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/test/java/com/gitblit/tests/LdapUserServiceTest.java b/src/test/java/com/gitblit/tests/LdapUserServiceTest.java index 86d1f3ca..8bd90147 100644 --- a/src/test/java/com/gitblit/tests/LdapUserServiceTest.java +++ b/src/test/java/com/gitblit/tests/LdapUserServiceTest.java @@ -26,6 +26,7 @@ import org.junit.Test; import com.gitblit.LdapUserService; import com.gitblit.models.UserModel; import com.gitblit.tests.mock.MemorySettings; +import com.gitblit.tests.mock.MockRuntimeManager; import com.gitblit.utils.StringUtils; import com.unboundid.ldap.listener.InMemoryDirectoryServer; import com.unboundid.ldap.listener.InMemoryDirectoryServerConfig; @@ -60,7 +61,7 @@ public class LdapUserServiceTest extends GitblitUnitTest { @Before public void createLdapUserService() { ldapUserService = new LdapUserService(); - ldapUserService.setup(getSettings()); + ldapUserService.setup(new MockRuntimeManager(getSettings())); } private MemorySettings getSettings() { @@ -118,7 +119,7 @@ public class LdapUserServiceTest extends GitblitUnitTest { MemorySettings ms = getSettings(); ms.put("realm.ldap.displayName", "${personalTitle}. ${givenName} ${surname}"); ldapUserService = new LdapUserService(); - ldapUserService.setup(ms); + ldapUserService.setup(new MockRuntimeManager(ms)); userOneModel = ldapUserService.authenticate("UserOne", "userOnePassword".toCharArray()); assertNotNull(userOneModel); @@ -135,7 +136,7 @@ public class LdapUserServiceTest extends GitblitUnitTest { MemorySettings ms = getSettings(); ms.put("realm.ldap.email", "${givenName}.${surname}@gitblit.com"); ldapUserService = new LdapUserService(); - ldapUserService.setup(ms); + ldapUserService.setup(new MockRuntimeManager(ms)); userOneModel = ldapUserService.authenticate("UserOne", "userOnePassword".toCharArray()); assertNotNull(userOneModel); |