summaryrefslogtreecommitdiffstats
path: root/src/test
diff options
context:
space:
mode:
authorJames Moger <james.moger@gitblit.com>2014-02-19 09:57:44 -0500
committerJames Moger <james.moger@gitblit.com>2014-02-19 11:05:48 -0500
commit6659fa5151ebd5fb744b7b07f929e580ce6f5843 (patch)
treeace639938a62bf702045ed55ab6681fe52a15a63 /src/test
parent03c0191b65c68dc6be3da0e0056bcb3cbc6e9cef (diff)
downloadgitblit-6659fa5151ebd5fb744b7b07f929e580ce6f5843.tar.gz
gitblit-6659fa5151ebd5fb744b7b07f929e580ce6f5843.zip
API adjustments and elimination of duplicate config options
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/com/gitblit/tests/LdapAuthenticationTest.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/test/java/com/gitblit/tests/LdapAuthenticationTest.java b/src/test/java/com/gitblit/tests/LdapAuthenticationTest.java
index 670dde00..b4f7e6a1 100644
--- a/src/test/java/com/gitblit/tests/LdapAuthenticationTest.java
+++ b/src/test/java/com/gitblit/tests/LdapAuthenticationTest.java
@@ -58,7 +58,7 @@ public class LdapAuthenticationTest extends GitblitUnitTest {
private static final String RESOURCE_DIR = "src/test/resources/ldap/";
private File usersConf;
-
+
private LdapAuthProvider ldap;
static int ldapPort = 1389;
@@ -196,7 +196,7 @@ public class LdapAuthenticationTest extends GitblitUnitTest {
public void addingUserInLdapShouldNotUpdateGitBlitUsersAndGroups() throws Exception {
settings.put("realm.ldap.ldapCachePeriod", "0 MINUTES");
ds.addEntries(LDIFReader.readEntries(RESOURCE_DIR + "adduser.ldif"));
- ldap.synchronizeWithLdapService();
+ ldap.sync();
assertEquals("Number of ldap users in gitblit user model", 5, countLdapUsersInUserManager());
}
@@ -205,7 +205,7 @@ public class LdapAuthenticationTest extends GitblitUnitTest {
settings.put("realm.ldap.synchronizeUsers.enable", "true");
settings.put("realm.ldap.ldapCachePeriod", "0 MINUTES");
ds.addEntries(LDIFReader.readEntries(RESOURCE_DIR + "adduser.ldif"));
- ldap.synchronizeWithLdapService();
+ ldap.sync();
assertEquals("Number of ldap users in gitblit user model", 6, countLdapUsersInUserManager());
}
@@ -213,7 +213,7 @@ public class LdapAuthenticationTest extends GitblitUnitTest {
public void addingGroupsInLdapShouldNotUpdateGitBlitUsersAndGroups() throws Exception {
settings.put("realm.ldap.ldapCachePeriod", "0 MINUTES");
ds.addEntries(LDIFReader.readEntries(RESOURCE_DIR + "addgroup.ldif"));
- ldap.synchronizeWithLdapService();
+ ldap.sync();
assertEquals("Number of ldap groups in gitblit team model", 0, countLdapTeamsInUserManager());
}
@@ -222,7 +222,7 @@ public class LdapAuthenticationTest extends GitblitUnitTest {
settings.put("realm.ldap.synchronizeUsers.enable", "true");
settings.put("realm.ldap.ldapCachePeriod", "0 MINUTES");
ds.addEntries(LDIFReader.readEntries(RESOURCE_DIR + "addgroup.ldif"));
- ldap.synchronizeWithLdapService();
+ ldap.sync();
assertEquals("Number of ldap groups in gitblit team model", 1, countLdapTeamsInUserManager());
}