From 669686f6118544bf2122f1e7f3e39c5dbc9654f5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Sat, 18 Jun 2011 09:02:00 -0400
Subject: [PATCH] Improved web.xml builder. Now it includes the parameter comments.
---
tests/com/gitblit/tests/DiffUtilsTest.java | 20 +++++++++++++++++++-
1 files changed, 19 insertions(+), 1 deletions(-)
diff --git a/tests/com/gitblit/tests/DiffUtilsTest.java b/tests/com/gitblit/tests/DiffUtilsTest.java
index 34cb853..84353c1 100644
--- a/tests/com/gitblit/tests/DiffUtilsTest.java
+++ b/tests/com/gitblit/tests/DiffUtilsTest.java
@@ -15,17 +15,27 @@
*/
package com.gitblit.tests;
+import java.util.List;
+
import junit.framework.TestCase;
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
+import com.gitblit.models.AnnotatedLine;
import com.gitblit.utils.DiffUtils;
+import com.gitblit.utils.DiffUtils.DiffOutputType;
import com.gitblit.utils.JGitUtils;
-import com.gitblit.utils.JGitUtils.DiffOutputType;
public class DiffUtilsTest extends TestCase {
+ public void testDiffOutputTypes() throws Exception {
+ assertTrue(DiffOutputType.forName("plain").equals(DiffOutputType.PLAIN));
+ assertTrue(DiffOutputType.forName("gitweb").equals(DiffOutputType.GITWEB));
+ assertTrue(DiffOutputType.forName("gitblit").equals(DiffOutputType.GITBLIT));
+ assertTrue(DiffOutputType.forName(null) == null);
+ }
+
public void testParentCommitDiff() throws Exception {
Repository repository = GitBlitSuite.getHelloworldRepository();
RevCommit commit = JGitUtils.getCommit(repository,
@@ -97,4 +107,12 @@
String expected = "- system.out.println(\"Hello World\");\n+ System.out.println(\"Hello World\"";
assertTrue(patch.indexOf(expected) > -1);
}
+
+ public void testBlame() throws Exception {
+ Repository repository = GitBlitSuite.getHelloworldRepository();
+ List<AnnotatedLine> lines = DiffUtils.blame(repository, "java.java", "1d0c2933a4ae69c362f76797d42d6bd182d05176");
+ repository.close();
+ assertTrue(lines.size() > 0);
+ assertTrue(lines.get(0).commitId.equals("c6d31dccf5cc75e8e46299fc62d38f60ec6d41e0"));
+ }
}
--
Gitblit v1.9.1