From 2c616775b21ab4cd76ff170dfd5e818c9c3b79fb Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 02 Jul 2013 15:08:28 -0400
Subject: [PATCH] Fixed git servlet unit test
---
src/test/java/com/gitblit/tests/GitServletTest.java | 53 +++++++++++++++++++++++++++++++----------------------
1 files changed, 31 insertions(+), 22 deletions(-)
diff --git a/src/test/java/com/gitblit/tests/GitServletTest.java b/src/test/java/com/gitblit/tests/GitServletTest.java
index 2402ab3..8513c83 100644
--- a/src/test/java/com/gitblit/tests/GitServletTest.java
+++ b/src/test/java/com/gitblit/tests/GitServletTest.java
@@ -19,8 +19,9 @@
import org.eclipse.jgit.api.ResetCommand.ResetType;
import org.eclipse.jgit.api.errors.GitAPIException;
import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.storage.file.FileRepository;
+import org.eclipse.jgit.storage.file.FileRepositoryBuilder;
import org.eclipse.jgit.transport.CredentialsProvider;
import org.eclipse.jgit.transport.PushResult;
import org.eclipse.jgit.transport.RefSpec;
@@ -37,12 +38,12 @@
import com.gitblit.Constants.AuthorizationControl;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
-import com.gitblit.models.PushLogEntry;
+import com.gitblit.models.RefLogEntry;
import com.gitblit.models.RepositoryModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.ArrayUtils;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.utils.PushLogUtils;
+import com.gitblit.utils.RefLogUtils;
public class GitServletTest {
@@ -59,10 +60,24 @@
String password = GitBlitSuite.password;
private static final AtomicBoolean started = new AtomicBoolean(false);
+
+ private static UserModel getUser() {
+ UserModel user = new UserModel("james");
+ user.password = "james";
+ return user;
+ }
+
+ private static void delete(UserModel user) {
+ if (GitBlit.self().getUserModel(user.username) != null) {
+ GitBlit.self().deleteUser(user.username);
+ }
+ }
@BeforeClass
public static void startGitblit() throws Exception {
started.set(GitBlitSuite.startGitblit());
+
+ delete(getUser());
}
@AfterClass
@@ -71,6 +86,8 @@
GitBlitSuite.stopGitblit();
deleteWorkingFolders();
}
+
+ delete(getUser());
}
public static void deleteWorkingFolders() throws Exception {
@@ -193,7 +210,8 @@
model.accessRestriction = AccessRestrictionType.NONE;
model.authorizationControl = AuthorizationControl.NAMED;
GitBlit.self().updateRepositoryModel(model.name, model, false);
- GitBlit.self().deleteUser(user.username);
+
+ delete(user);
}
@Test
@@ -346,8 +364,7 @@
@Test
public void testCommitterVerification() throws Exception {
- UserModel user = new UserModel("james");
- user.password = "james";
+ UserModel user = getUser();
// account only uses account name to verify
testCommitterVerification(user, user.username, null, true);
@@ -374,9 +391,7 @@
private void testCommitterVerification(UserModel user, String displayName, String emailAddress, boolean expectedSuccess) throws Exception {
- if (GitBlit.self().getUserModel(user.username) != null) {
- GitBlit.self().deleteUser(user.username);
- }
+ delete(user);
CredentialsProvider cp = new UsernamePasswordCredentialsProvider(user.username, user.password);
@@ -482,12 +497,8 @@
private void testRefChange(AccessPermission permission, Status expectedCreate, Status expectedDelete, Status expectedRewind) throws Exception {
- UserModel user = new UserModel("james");
- user.password = "james";
-
- if (GitBlit.self().getUserModel(user.username) != null) {
- GitBlit.self().deleteUser(user.username);
- }
+ UserModel user = getUser();
+ delete(user);
CredentialsProvider cp = new UsernamePasswordCredentialsProvider(user.username, user.password);
@@ -671,7 +682,7 @@
// close serving repository
GitBlitSuite.close(refChecks);
- GitBlit.self().deleteUser(user.username);
+ delete(user);
}
@Test
@@ -686,9 +697,7 @@
UserModel user = new UserModel("sampleuser");
user.password = user.username;
- if (GitBlit.self().getUserModel(user.username) != null) {
- GitBlit.self().deleteUser(user.username);
- }
+ delete(user);
user.canCreate = canCreate;
user.canAdmin = canAdmin;
@@ -779,15 +788,15 @@
}
GitBlitSuite.close(git);
- GitBlit.self().deleteUser(user.username);
+ delete(user);
}
@Test
public void testPushLog() throws IOException {
String name = "refchecks/ticgit.git";
File refChecks = new File(GitBlitSuite.REPOSITORIES, name);
- FileRepository repository = new FileRepository(refChecks);
- List<PushLogEntry> pushes = PushLogUtils.getPushLog(name, repository);
+ Repository repository = new FileRepositoryBuilder().setGitDir(refChecks).build();
+ List<RefLogEntry> pushes = RefLogUtils.getRefLog(name, repository);
GitBlitSuite.close(repository);
assertTrue("Repository has an empty push log!", pushes.size() > 0);
}
--
Gitblit v1.9.1