From c75304637f5535e634e57d4ed933c0fdb594d890 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Fri, 28 Oct 2011 08:08:00 -0400
Subject: [PATCH] Added a list branches rpc
---
tests/com/gitblit/tests/JGitUtilsTest.java | 338 ++++++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 288 insertions(+), 50 deletions(-)
diff --git a/tests/com/gitblit/tests/JGitUtilsTest.java b/tests/com/gitblit/tests/JGitUtilsTest.java
index 7fcf48d..0d7aa63 100644
--- a/tests/com/gitblit/tests/JGitUtilsTest.java
+++ b/tests/com/gitblit/tests/JGitUtilsTest.java
@@ -17,33 +17,52 @@
import java.io.File;
import java.io.FileOutputStream;
+import java.util.Arrays;
import java.util.Date;
import java.util.List;
+import java.util.Map;
import junit.framework.TestCase;
+import org.eclipse.jgit.diff.DiffEntry.ChangeType;
import org.eclipse.jgit.lib.Constants;
+import org.eclipse.jgit.lib.FileMode;
+import org.eclipse.jgit.lib.ObjectId;
+import org.eclipse.jgit.lib.PersonIdent;
import org.eclipse.jgit.lib.Repository;
-import org.eclipse.jgit.revwalk.RevBlob;
+import org.eclipse.jgit.lib.RepositoryCache.FileKey;
import org.eclipse.jgit.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevObject;
-import org.eclipse.jgit.revwalk.RevTree;
+import org.eclipse.jgit.util.FS;
+import org.eclipse.jgit.util.FileUtils;
+import com.gitblit.GitBlit;
+import com.gitblit.Keys;
+import com.gitblit.models.GitNote;
+import com.gitblit.models.PathModel;
import com.gitblit.models.PathModel.PathChangeModel;
import com.gitblit.models.RefModel;
-import com.gitblit.models.TicketModel;
-import com.gitblit.utils.DiffUtils;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.utils.JGitUtils.DiffOutputType;
+import com.gitblit.utils.JGitUtils.SearchType;
+import com.gitblit.utils.StringUtils;
public class JGitUtilsTest extends TestCase {
- private List<String> getRepositories() {
- return JGitUtils.getRepositoryList(GitBlitSuite.REPOSITORIES, true, true);
+ public void testDisplayName() throws Exception {
+ assertTrue(JGitUtils.getDisplayName(new PersonIdent("Napoleon Bonaparte", "")).equals(
+ "Napoleon Bonaparte"));
+ assertTrue(JGitUtils.getDisplayName(new PersonIdent("", "someone@somewhere.com")).equals(
+ "<someone@somewhere.com>"));
+ assertTrue(JGitUtils.getDisplayName(
+ new PersonIdent("Napoleon Bonaparte", "someone@somewhere.com")).equals(
+ "Napoleon Bonaparte <someone@somewhere.com>"));
}
public void testFindRepositories() {
- List<String> list = getRepositories();
+ List<String> list = JGitUtils.getRepositoryList(null, true, true);
+ assertTrue(list.size() == 0);
+ list.addAll(JGitUtils.getRepositoryList(new File("DoesNotExist"), true, true));
+ assertTrue(list.size() == 0);
+ list.addAll(JGitUtils.getRepositoryList(GitBlitSuite.REPOSITORIES, true, true));
assertTrue("No repositories found in " + GitBlitSuite.REPOSITORIES, list.size() > 0);
}
@@ -53,39 +72,158 @@
assertTrue("Could not find repository!", repository != null);
}
- public void testLastChangeRepository() throws Exception {
- Repository repository = GitBlitSuite.getHelloworldRepository();
- Date date = JGitUtils.getLastChange(repository);
- repository.close();
- assertTrue("Could not get last repository change date!", date != null);
- }
-
public void testFirstCommit() throws Exception {
+ assertTrue(JGitUtils.getFirstChange(null, null).equals(new Date(0)));
+
Repository repository = GitBlitSuite.getHelloworldRepository();
RevCommit commit = JGitUtils.getFirstCommit(repository, null);
+ Date firstChange = JGitUtils.getFirstChange(repository, null);
repository.close();
assertTrue("Could not get first commit!", commit != null);
assertTrue("Incorrect first commit!",
commit.getName().equals("f554664a346629dc2b839f7292d06bad2db4aece"));
+ assertTrue(firstChange.equals(new Date(commit.getCommitTime() * 1000L)));
}
- public void testRetrieveRevObject() throws Exception {
+ public void testLastCommit() throws Exception {
+ assertTrue(JGitUtils.getLastChange(null, null).equals(new Date(0)));
+
Repository repository = GitBlitSuite.getHelloworldRepository();
- RevCommit commit = JGitUtils.getCommit(repository, Constants.HEAD);
- RevTree tree = commit.getTree();
- RevObject object = JGitUtils.getRevObject(repository, tree, "java.java");
+ assertTrue(JGitUtils.getCommit(repository, null) != null);
+ Date date = JGitUtils.getLastChange(repository, null);
repository.close();
- assertTrue("Object is null!", object != null);
+ assertTrue("Could not get last repository change date!", date != null);
}
- public void testRetrieveStringContent() throws Exception {
- Repository repository = GitBlitSuite.getHelloworldRepository();
- RevCommit commit = JGitUtils.getCommit(repository, Constants.HEAD);
- RevTree tree = commit.getTree();
- RevBlob blob = (RevBlob) JGitUtils.getRevObject(repository, tree, "java.java");
- String content = JGitUtils.getRawContentAsString(repository, blob);
+ public void testCreateRepository() throws Exception {
+ String[] repositories = { "NewTestRepository.git", "NewTestRepository" };
+ for (String repositoryName : repositories) {
+ Repository repository = JGitUtils.createRepository(GitBlitSuite.REPOSITORIES,
+ 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, null).getTime() == folder.lastModified());
+ assertTrue(JGitUtils.getCommit(repository, null) == null);
+ repository.close();
+ assertTrue(GitBlit.self().deleteRepository(repositoryName));
+ }
+ }
+
+ public void testRefs() throws Exception {
+ Repository repository = GitBlitSuite.getJGitRepository();
+ Map<ObjectId, List<RefModel>> map = JGitUtils.getAllRefs(repository);
repository.close();
- assertTrue("Content is null!", content != null && content.length() > 0);
+ assertTrue(map.size() > 0);
+ for (Map.Entry<ObjectId, List<RefModel>> entry : map.entrySet()) {
+ List<RefModel> list = entry.getValue();
+ for (RefModel ref : list) {
+ if (ref.displayName.equals("refs/tags/spearce-gpg-pub")) {
+ 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.getReferencedObjectType() == Constants.OBJ_BLOB);
+ } else if (ref.displayName.equals("refs/tags/v0.12.1")) {
+ assertTrue(ref.isAnnotatedTag());
+ }
+ }
+ }
+ }
+
+ public void testBranches() throws Exception {
+ 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(""));
+ assertTrue(model.hashCode() == model.getReferencedObjectId().hashCode()
+ + model.getName().hashCode());
+ assertTrue(model.getShortMessage().equals(model.getShortMessage()));
+ }
+ for (RefModel model : JGitUtils.getRemoteBranches(repository, true, -1)) {
+ assertTrue(model.getName().startsWith(Constants.R_REMOTES));
+ assertTrue(model.equals(model));
+ assertFalse(model.equals(""));
+ assertTrue(model.hashCode() == model.getReferencedObjectId().hashCode()
+ + model.getName().hashCode());
+ assertTrue(model.getShortMessage().equals(model.getShortMessage()));
+ }
+ assertTrue(JGitUtils.getRemoteBranches(repository, true, 8).size() == 8);
+ repository.close();
+ }
+
+ public void testTags() throws Exception {
+ 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));
+ assertTrue(model.equals(model));
+ assertFalse(model.equals(""));
+ assertTrue(model.hashCode() == model.getReferencedObjectId().hashCode()
+ + model.getName().hashCode());
+ }
+ repository.close();
+
+ repository = GitBlitSuite.getBluezGnomeRepository();
+ 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"));
+ }
+ }
+ repository.close();
+ }
+
+ public void testCommitNotes() throws Exception {
+ Repository repository = GitBlitSuite.getJGitRepository();
+ RevCommit commit = JGitUtils.getCommit(repository,
+ "690c268c793bfc218982130fbfc25870f292295e");
+ List<GitNote> list = JGitUtils.getNotesOnCommit(repository, commit);
+ repository.close();
+ assertTrue(list.size() > 0);
+ assertTrue(list.get(0).notesRef.getReferencedObjectId().getName()
+ .equals("183474d554e6f68478a02d9d7888b67a9338cdff"));
+ }
+
+ public void testCreateOrphanedBranch() throws Exception {
+ Repository repository = JGitUtils.createRepository(GitBlitSuite.REPOSITORIES, "orphantest");
+ assertTrue(JGitUtils.createOrphanBranch(repository,
+ "x" + Long.toHexString(System.currentTimeMillis()).toUpperCase()));
+ FileUtils.delete(repository.getDirectory(), FileUtils.RECURSIVE);
+ }
+
+ public void testStringContent() throws Exception {
+ Repository repository = GitBlitSuite.getHelloworldRepository();
+ String contentA = JGitUtils.getStringContent(repository, null, "java.java");
+ RevCommit commit = JGitUtils.getCommit(repository, Constants.HEAD);
+ String contentB = JGitUtils.getStringContent(repository, commit.getTree(), "java.java");
+ String contentC = JGitUtils.getStringContent(repository, commit.getTree(), "missing.txt");
+
+ // manually construct a blob, calculate the hash, lookup the hash in git
+ StringBuilder sb = new StringBuilder();
+ sb.append("blob ").append(contentA.length()).append('\0');
+ sb.append(contentA);
+ String sha1 = StringUtils.getSHA1(sb.toString());
+ String contentD = JGitUtils.getStringContent(repository, sha1);
+ repository.close();
+ assertTrue("ContentA is null!", contentA != null && contentA.length() > 0);
+ assertTrue("ContentB is null!", contentB != null && contentB.length() > 0);
+ assertTrue(contentA.equals(contentB));
+ assertTrue(contentC == null);
+ assertTrue(contentA.equals(contentD));
}
public void testFilesInCommit() throws Exception {
@@ -93,39 +231,139 @@
RevCommit commit = JGitUtils.getCommit(repository,
"1d0c2933a4ae69c362f76797d42d6bd182d05176");
List<PathChangeModel> paths = JGitUtils.getFilesInCommit(repository, commit);
+
+ commit = JGitUtils.getCommit(repository, "af0e9b2891fda85afc119f04a69acf7348922830");
+ List<PathChangeModel> deletions = JGitUtils.getFilesInCommit(repository, commit);
+
+ commit = JGitUtils.getFirstCommit(repository, null);
+ List<PathChangeModel> additions = JGitUtils.getFilesInCommit(repository, commit);
+
+ List<PathChangeModel> latestChanges = JGitUtils.getFilesInCommit(repository, null);
+
repository.close();
assertTrue("No changed paths found!", paths.size() == 1);
+ for (PathChangeModel path : paths) {
+ assertTrue("PathChangeModel hashcode incorrect!",
+ path.hashCode() == (path.commitId.hashCode() + path.path.hashCode()));
+ assertTrue("PathChangeModel equals itself failed!", path.equals(path));
+ assertFalse("PathChangeModel equals string failed!", path.equals(""));
+ }
+ assertTrue(deletions.get(0).changeType.equals(ChangeType.DELETE));
+ assertTrue(additions.get(0).changeType.equals(ChangeType.ADD));
+ assertTrue(latestChanges.size() > 0);
}
- public void testCommitDiff() throws Exception {
+ public void testFilesInPath() throws Exception {
+ assertTrue(JGitUtils.getFilesInPath(null, null, null).size() == 0);
Repository repository = GitBlitSuite.getHelloworldRepository();
- RevCommit commit = JGitUtils.getCommit(repository,
- "1d0c2933a4ae69c362f76797d42d6bd182d05176");
- String diff = DiffUtils.getCommitDiff(repository, commit, DiffOutputType.PLAIN);
+ List<PathModel> files = JGitUtils.getFilesInPath(repository, null, null);
repository.close();
- assertTrue("Failed to generate diff!", diff != null && diff.length() > 0);
- String expected = "- system.out.println(\"Hello World\");\n+ System.out.println(\"Hello World\"";
- assertTrue("Diff content mismatch!", diff.indexOf(expected) > -1);
+ assertTrue(files.size() > 10);
+ }
+
+ public void testDocuments() throws Exception {
+ Repository repository = GitBlitSuite.getTicgitRepository();
+ List<String> extensions = GitBlit.getStrings(Keys.web.markdownExtensions);
+ List<PathModel> markdownDocs = JGitUtils.getDocuments(repository, extensions);
+ List<PathModel> markdownDocs2 = JGitUtils.getDocuments(repository,
+ Arrays.asList(new String[] { ".mkd", ".md" }));
+ List<PathModel> allFiles = JGitUtils.getDocuments(repository, null);
+ repository.close();
+ assertTrue(markdownDocs.size() > 0);
+ assertTrue(markdownDocs2.size() > 0);
+ assertTrue(allFiles.size() > markdownDocs.size());
+ }
+
+ public void testFileModes() throws Exception {
+ assertTrue(JGitUtils.getPermissionsFromMode(FileMode.TREE.getBits()).equals("drwxr-xr-x"));
+ assertTrue(JGitUtils.getPermissionsFromMode(FileMode.REGULAR_FILE.getBits()).equals(
+ "-rw-r--r--"));
+ assertTrue(JGitUtils.getPermissionsFromMode(FileMode.EXECUTABLE_FILE.getBits()).equals(
+ "-rwxr-xr-x"));
+ assertTrue(JGitUtils.getPermissionsFromMode(FileMode.SYMLINK.getBits()).equals("symlink"));
+ assertTrue(JGitUtils.getPermissionsFromMode(FileMode.GITLINK.getBits()).equals("gitlink"));
+ assertTrue(JGitUtils.getPermissionsFromMode(FileMode.MISSING.getBits()).equals("missing"));
+ }
+
+ public void testRevlog() throws Exception {
+ assertTrue(JGitUtils.getRevLog(null, 0).size() == 0);
+ List<RevCommit> commits = JGitUtils.getRevLog(null, 10);
+ assertTrue(commits.size() == 0);
+
+ Repository repository = GitBlitSuite.getHelloworldRepository();
+ // get most recent 10 commits
+ commits = JGitUtils.getRevLog(repository, 10);
+ assertTrue(commits.size() == 10);
+
+ // test paging and offset by getting the 10th most recent commit
+ RevCommit lastCommit = JGitUtils.getRevLog(repository, null, 9, 1).get(0);
+ assertTrue(commits.get(9).equals(lastCommit));
+
+ // grab the two most recent commits to java.java
+ commits = JGitUtils.getRevLog(repository, null, "java.java", 0, 2);
+ assertTrue(commits.size() == 2);
+ repository.close();
+ }
+
+ public void testSearchTypes() throws Exception {
+ assertTrue(SearchType.forName("commit").equals(SearchType.COMMIT));
+ assertTrue(SearchType.forName("committer").equals(SearchType.COMMITTER));
+ assertTrue(SearchType.forName("author").equals(SearchType.AUTHOR));
+ assertTrue(SearchType.forName("unknown").equals(SearchType.COMMIT));
+
+ assertTrue(SearchType.COMMIT.toString().equals("commit"));
+ assertTrue(SearchType.COMMITTER.toString().equals("committer"));
+ assertTrue(SearchType.AUTHOR.toString().equals("author"));
+ }
+
+ 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);
+
+ // test commit message search
+ Repository repository = GitBlitSuite.getHelloworldRepository();
+ results = JGitUtils.searchRevlogs(repository, null, "java", SearchType.COMMIT, 0, 3);
+ assertTrue(results.size() == 3);
+
+ // test author search
+ results = JGitUtils.searchRevlogs(repository, null, "timothy", SearchType.AUTHOR, 0, -1);
+ assertTrue(results.size() == 1);
+
+ // test committer search
+ results = JGitUtils.searchRevlogs(repository, null, "mike", SearchType.COMMITTER, 0, 10);
+ assertTrue(results.size() == 10);
+
+ // test paging and offset
+ RevCommit commit = JGitUtils.searchRevlogs(repository, null, "mike", SearchType.COMMITTER,
+ 9, 1).get(0);
+ assertTrue(results.get(9).equals(commit));
+
+ repository.close();
}
public void testZip() throws Exception {
+ assertFalse(JGitUtils.zip(null, null, null, null));
Repository repository = GitBlitSuite.getHelloworldRepository();
- File zipFile = new File(GitBlitSuite.REPOSITORIES, "helloworld.zip");
- FileOutputStream fos = new FileOutputStream(zipFile);
- boolean success = JGitUtils.zip(repository, null, Constants.HEAD, fos);
- assertTrue("Failed to generate zip file!", success);
- assertTrue(zipFile.length() > 0);
- fos.close();
- zipFile.delete();
+ File zipFileA = new File(GitBlitSuite.REPOSITORIES, "helloworld.zip");
+ FileOutputStream fosA = new FileOutputStream(zipFileA);
+ boolean successA = JGitUtils.zip(repository, null, Constants.HEAD, fosA);
+ fosA.close();
+
+ File zipFileB = new File(GitBlitSuite.REPOSITORIES, "helloworld-java.zip");
+ FileOutputStream fosB = new FileOutputStream(zipFileB);
+ boolean successB = JGitUtils.zip(repository, "java.java", Constants.HEAD, fosB);
+ fosB.close();
+
repository.close();
+ assertTrue("Failed to generate zip file!", successA);
+ assertTrue(zipFileA.length() > 0);
+ zipFileA.delete();
+
+ assertTrue("Failed to generate zip file!", successB);
+ assertTrue(zipFileB.length() > 0);
+ zipFileB.delete();
}
- public void testTicGit() throws Exception {
- Repository repository = GitBlitSuite.getTicgitRepository();
- RefModel branch = JGitUtils.getTicketsBranch(repository);
- assertTrue("Ticgit branch does not exist!", branch != null);
- List<TicketModel> tickets = JGitUtils.getTickets(repository);
- repository.close();
- assertTrue("No tickets found!", tickets.size() > 0);
- }
}
\ No newline at end of file
--
Gitblit v1.9.1