From a125cf6876e0edc5a2498df57a9df06d60b1f572 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Thu, 02 Jun 2011 22:40:23 -0400
Subject: [PATCH] Unit testing. Start of git-notes display feature.
---
tests/com/gitblit/tests/JGitUtilsTest.java | 202 ++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 171 insertions(+), 31 deletions(-)
diff --git a/tests/com/gitblit/tests/JGitUtilsTest.java b/tests/com/gitblit/tests/JGitUtilsTest.java
index f1dcaac..6afa38b 100644
--- a/tests/com/gitblit/tests/JGitUtilsTest.java
+++ b/tests/com/gitblit/tests/JGitUtilsTest.java
@@ -17,24 +17,40 @@
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.revwalk.RevCommit;
-import org.eclipse.jgit.revwalk.RevObject;
-import org.eclipse.jgit.revwalk.RevTree;
import com.gitblit.GitBlit;
+import com.gitblit.Keys;
+import com.gitblit.models.PathModel;
import com.gitblit.models.PathModel.PathChangeModel;
import com.gitblit.models.RefModel;
import com.gitblit.utils.JGitUtils;
+import com.gitblit.utils.JGitUtils.SearchType;
public class JGitUtilsTest extends TestCase {
+
+ 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 = JGitUtils.getRepositoryList(null, true, true);
@@ -53,7 +69,7 @@
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);
@@ -63,18 +79,16 @@
commit.getName().equals("f554664a346629dc2b839f7292d06bad2db4aece"));
assertTrue(firstChange.equals(new Date(commit.getCommitTime() * 1000L)));
}
-
+
public void testLastCommit() throws Exception {
assertTrue(JGitUtils.getLastChange(null).equals(new Date(0)));
-
+
Repository repository = GitBlitSuite.getHelloworldRepository();
assertTrue(JGitUtils.getCommit(repository, null) != null);
Date date = JGitUtils.getLastChange(repository);
repository.close();
assertTrue("Could not get last repository change date!", date != null);
}
-
-
public void testCreateRepository() throws Exception {
String[] repositories = { "NewTestRepository.git", "NewTestRepository" };
@@ -84,17 +98,16 @@
repositoryName, isBare);
File folder;
if (isBare) {
- folder = new File(GitBlitSuite.REPOSITORIES, repositoryName);
+ folder = new File(GitBlitSuite.REPOSITORIES, repositoryName);
} else {
folder = new File(GitBlitSuite.REPOSITORIES, repositoryName + "/.git");
- }
+ }
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).getTime() == folder.lastModified());
assertTrue(JGitUtils.getCommit(repository, null) == null);
repository.close();
assertTrue(GitBlit.self().deleteRepository(repositoryName));
@@ -102,6 +115,13 @@
}
public void testRefs() throws Exception {
+ Repository repository = GitBlitSuite.getTicgitRepository();
+ Map<ObjectId, List<String>> map = JGitUtils.getAllRefs(repository);
+ repository.close();
+ assertTrue(map.size() > 0);
+ }
+
+ public void testBranches() throws Exception {
Repository repository = GitBlitSuite.getTicgitRepository();
for (RefModel model : JGitUtils.getLocalBranches(repository, -1)) {
assertTrue(model.getName().startsWith(Constants.R_HEADS));
@@ -119,6 +139,12 @@
+ model.getName().hashCode());
assertTrue(model.getShortLog().equals(model.commit.getShortMessage()));
}
+ assertTrue(JGitUtils.getRemoteBranches(repository, 10).size() == 10);
+ repository.close();
+ }
+
+ public void testTags() throws Exception {
+ Repository repository = GitBlitSuite.getTicgitRepository();
for (RefModel model : JGitUtils.getTags(repository, -1)) {
if (model.getObjectId().getName().equals("283035e4848054ff1803cb0e690270787dc92399")) {
assertTrue("Not an annotated tag!", model.isAnnotatedTag());
@@ -133,23 +159,26 @@
repository.close();
}
- public void testRetrieveRevObject() throws Exception {
- Repository repository = GitBlitSuite.getHelloworldRepository();
- RevCommit commit = JGitUtils.getCommit(repository, Constants.HEAD);
- RevTree tree = commit.getTree();
- RevObject object = JGitUtils.getRevObject(repository, tree, "java.java");
- repository.close();
- assertTrue("Object is null!", object != null);
+ public void testCommitNotes() throws Exception {
+// Repository repository = new FileRepository(new File("c:/projects/git/jgit.git/.git"));
+// RevCommit commit = JGitUtils.getCommit(repository,
+// "ada903085d1b4ef8c79e3e2d91f49fee7e188f53");
+// List<GitNote> list = JGitUtils.getNotesOnCommit(repository, commit);
+// repository.close();
+// assertTrue(list.size() > 0);
}
- public void testRetrieveStringContent() throws Exception {
+ public void testStringContent() throws Exception {
Repository repository = GitBlitSuite.getHelloworldRepository();
+ String contentA = JGitUtils.getRawContentAsString(repository, null, "java.java");
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);
+ String contentB = JGitUtils.getRawContentAsString(repository, commit, "java.java");
+ String contentC = JGitUtils.getRawContentAsString(repository, commit, "missing.txt");
repository.close();
- assertTrue("Content is null!", content != null && content.length() > 0);
+ 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);
}
public void testFilesInCommit() throws Exception {
@@ -157,6 +186,15 @@
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) {
@@ -165,17 +203,119 @@
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 testFilesInPath() throws Exception {
+ assertTrue(JGitUtils.getFilesInPath(null, null, null).size() == 0);
+ Repository repository = GitBlitSuite.getHelloworldRepository();
+ List<PathModel> files = JGitUtils.getFilesInPath(repository, null, null);
+ repository.close();
+ 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 {
+ 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 {
+ 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();
}
}
\ No newline at end of file
--
Gitblit v1.9.1