Merged #80 "Replace Dagger with Guice"

James Moger

2014-07-03 a40cbcfc4fab2ca16304c7393a68fe95a9322edc

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

@@ -68,7 +68,7 @@
   private static InMemoryDirectoryServer ds;

   private IUserManager userManager;
	

   private AuthenticationManager auth;

   private MemorySettings settings;
@@ -97,12 +97,12 @@

   private LdapAuthProvider newLdapAuthentication(IStoredSettings settings) {
      RuntimeManager runtime = new RuntimeManager(settings, GitBlitSuite.BASEFOLDER).start();
      userManager = new UserManager(runtime).start();
      userManager = new UserManager(runtime, null).start();
      LdapAuthProvider ldap = new LdapAuthProvider();
      ldap.setup(runtime, userManager);
      return ldap;
   }
	

   private AuthenticationManager newAuthenticationManager(IStoredSettings settings) {
      RuntimeManager runtime = new RuntimeManager(settings, GitBlitSuite.BASEFOLDER).start();
      AuthenticationManager auth = new AuthenticationManager(runtime, userManager);
@@ -259,6 +259,19 @@
      assertTrue(userThreeModel.canAdmin);
   }

   @Test
   public void testBindWithUser() {
      settings.put(Keys.realm.ldap.bindpattern, "CN=${username},OU=US,OU=Users,OU=UserControl,OU=MyOrganization,DC=MyDomain");
      settings.put(Keys.realm.ldap.username, "");
      settings.put(Keys.realm.ldap.password, "");

      UserModel userOneModel = auth.authenticate("UserOne", "userOnePassword".toCharArray());
      assertNotNull(userOneModel);

      UserModel userOneModelFailedAuth = auth.authenticate("UserOne", "userTwoPassword".toCharArray());
      assertNull(userOneModelFailedAuth);
   }

   private int countLdapUsersInUserManager() {
      int ldapAccountCount = 0;
      for (UserModel userModel : userManager.getAllUsers()) {