From 20165d234037cb62640e4d9a3fe285260a6a2444 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Wed, 20 Jul 2011 16:01:58 -0400
Subject: [PATCH] Change password feature (issue 1)
---
tests/com/gitblit/tests/JGitUtilsTest.java | 50 +++++++++++++++++++++++++++-----------------------
1 files changed, 27 insertions(+), 23 deletions(-)
diff --git a/tests/com/gitblit/tests/JGitUtilsTest.java b/tests/com/gitblit/tests/JGitUtilsTest.java
index 7196afd..0841da3 100644
--- a/tests/com/gitblit/tests/JGitUtilsTest.java
+++ b/tests/com/gitblit/tests/JGitUtilsTest.java
@@ -30,7 +30,9 @@
import org.eclipse.jgit.lib.ObjectId;
import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Repository;
+import org.eclipse.jgit.lib.RepositoryCache.FileKey;
import org.eclipse.jgit.revwalk.RevCommit;
+import org.eclipse.jgit.util.FS;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
@@ -83,11 +85,11 @@
}
public void testLastCommit() throws Exception {
- assertTrue(JGitUtils.getLastChange(null).equals(new Date(0)));
+ assertTrue(JGitUtils.getLastChange(null, null).equals(new Date(0)));
Repository repository = GitBlitSuite.getHelloworldRepository();
assertTrue(JGitUtils.getCommit(repository, null) != null);
- Date date = JGitUtils.getLastChange(repository);
+ Date date = JGitUtils.getLastChange(repository, null);
repository.close();
assertTrue("Could not get last repository change date!", date != null);
}
@@ -95,21 +97,16 @@
public void testCreateRepository() throws Exception {
String[] repositories = { "NewTestRepository.git", "NewTestRepository" };
for (String repositoryName : repositories) {
- boolean isBare = repositoryName.endsWith(".git");
Repository repository = JGitUtils.createRepository(GitBlitSuite.REPOSITORIES,
- repositoryName, isBare);
- File folder;
- if (isBare) {
- folder = new File(GitBlitSuite.REPOSITORIES, repositoryName);
- } else {
- folder = new File(GitBlitSuite.REPOSITORIES, repositoryName + "/.git");
- }
+ repositoryName);
+ File folder = FileKey.resolve(new File(GitBlitSuite.REPOSITORIES, repositoryName),
+ FS.DETECTED);
assertTrue(repository != null);
assertFalse(JGitUtils.hasCommits(repository));
assertTrue(JGitUtils.getFirstCommit(repository, null) == null);
assertTrue(JGitUtils.getFirstChange(repository, null).getTime() == folder
.lastModified());
- assertTrue(JGitUtils.getLastChange(repository).getTime() == folder.lastModified());
+ assertTrue(JGitUtils.getLastChange(repository, null).getTime() == folder.lastModified());
assertTrue(JGitUtils.getCommit(repository, null) == null);
repository.close();
assertTrue(GitBlit.self().deleteRepository(repositoryName));
@@ -125,10 +122,12 @@
List<RefModel> list = entry.getValue();
for (RefModel ref : list) {
if (ref.displayName.equals("refs/tags/spearce-gpg-pub")) {
- assertTrue(ref.getObjectId().getName().equals("8bbde7aacf771a9afb6992434f1ae413e010c6d8"));
+ assertTrue(ref.toString().equals("refs/tags/spearce-gpg-pub"));
+ assertTrue(ref.getObjectId().getName()
+ .equals("8bbde7aacf771a9afb6992434f1ae413e010c6d8"));
assertTrue(ref.getAuthorIdent().getEmailAddress().equals("spearce@spearce.org"));
assertTrue(ref.getShortMessage().startsWith("GPG key"));
- assertTrue(ref.getFullMessage().startsWith("GPG key"));
+ assertTrue(ref.getFullMessage().startsWith("GPG key"));
assertTrue(ref.getReferencedObjectType() == Constants.OBJ_BLOB);
} else if (ref.displayName.equals("refs/tags/v0.12.1")) {
assertTrue(ref.isAnnotatedTag());
@@ -138,8 +137,9 @@
}
public void testBranches() throws Exception {
- Repository repository = GitBlitSuite.getTicgitRepository();
- for (RefModel model : JGitUtils.getLocalBranches(repository, -1)) {
+ Repository repository = GitBlitSuite.getJGitRepository();
+ assertTrue(JGitUtils.getLocalBranches(repository, true, 0).size() == 0);
+ for (RefModel model : JGitUtils.getLocalBranches(repository, true, -1)) {
assertTrue(model.getName().startsWith(Constants.R_HEADS));
assertTrue(model.equals(model));
assertFalse(model.equals(""));
@@ -147,7 +147,7 @@
+ model.getName().hashCode());
assertTrue(model.getShortMessage().equals(model.getShortMessage()));
}
- for (RefModel model : JGitUtils.getRemoteBranches(repository, -1)) {
+ for (RefModel model : JGitUtils.getRemoteBranches(repository, true, -1)) {
assertTrue(model.getName().startsWith(Constants.R_REMOTES));
assertTrue(model.equals(model));
assertFalse(model.equals(""));
@@ -155,14 +155,15 @@
+ model.getName().hashCode());
assertTrue(model.getShortMessage().equals(model.getShortMessage()));
}
- assertTrue(JGitUtils.getRemoteBranches(repository, 10).size() == 10);
+ assertTrue(JGitUtils.getRemoteBranches(repository, true, 8).size() == 8);
repository.close();
}
public void testTags() throws Exception {
- Repository repository = GitBlitSuite.getTicgitRepository();
- for (RefModel model : JGitUtils.getTags(repository, -1)) {
- if (model.getObjectId().getName().equals("283035e4848054ff1803cb0e690270787dc92399")) {
+ Repository repository = GitBlitSuite.getJGitRepository();
+ assertTrue(JGitUtils.getTags(repository, true, 5).size() == 5);
+ for (RefModel model : JGitUtils.getTags(repository, true, -1)) {
+ if (model.getObjectId().getName().equals("d28091fb2977077471138fe97da1440e0e8ae0da")) {
assertTrue("Not an annotated tag!", model.isAnnotatedTag());
}
assertTrue(model.getName().startsWith(Constants.R_TAGS));
@@ -172,13 +173,14 @@
+ model.getName().hashCode());
}
repository.close();
-
+
repository = GitBlitSuite.getBluezGnomeRepository();
- for (RefModel model : JGitUtils.getTags(repository, -1)) {
+ for (RefModel model : JGitUtils.getTags(repository, true, -1)) {
if (model.getObjectId().getName().equals("728643ec0c438c77e182898c2f2967dbfdc231c8")) {
assertFalse(model.isAnnotatedTag());
assertTrue(model.getAuthorIdent().getEmailAddress().equals("marcel@holtmann.org"));
- assertTrue(model.getFullMessage().equals("Update changelog and bump version number\n"));
+ assertTrue(model.getFullMessage().equals(
+ "Update changelog and bump version number\n"));
}
}
repository.close();
@@ -276,6 +278,7 @@
}
public void testRevlog() throws Exception {
+ assertTrue(JGitUtils.getRevLog(null, 0).size() == 0);
List<RevCommit> commits = JGitUtils.getRevLog(null, 10);
assertTrue(commits.size() == 0);
@@ -306,6 +309,7 @@
}
public void testSearchRevlogs() throws Exception {
+ assertTrue(JGitUtils.searchRevlogs(null, null, "java", SearchType.COMMIT, 0, 0).size() == 0);
List<RevCommit> results = JGitUtils.searchRevlogs(null, null, "java", SearchType.COMMIT, 0,
3);
assertTrue(results.size() == 0);
--
Gitblit v1.9.1