Eliminate static singleton calls from user services

James Moger

2013-11-19 5200b359257c2ab5e29781c2b05c6092fc8338f8

 src/test/java/com/gitblit/tests/LdapUserServiceTest.java

@@ -16,11 +16,6 @@
 */
package com.gitblit.tests;

import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;

import java.util.HashMap;
import java.util.Map;

@@ -31,6 +26,7 @@
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;
@@ -44,7 +40,7 @@
 * @author jcrygier
 *
 */
public class LdapUserServiceTest {
public class LdapUserServiceTest extends GitblitUnitTest {

   private LdapUserService ldapUserService;

@@ -65,7 +61,7 @@
   @Before
   public void createLdapUserService() {
      ldapUserService = new LdapUserService();
      ldapUserService.setup(getSettings());
      ldapUserService.setup(new MockRuntimeManager(getSettings()));
   }

   private MemorySettings getSettings() {
@@ -123,7 +119,7 @@
      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);
@@ -140,7 +136,7 @@
      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);