From 62ff847f820fc69c308aeff4b317963cd4eadce0 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sat, 07 Mar 2015 12:26:23 -0500 Subject: [PATCH] Merged #233 "Ignore whitespace in diff viewer" --- src/test/java/com/gitblit/tests/DiffUtilsTest.java | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/test/java/com/gitblit/tests/DiffUtilsTest.java b/src/test/java/com/gitblit/tests/DiffUtilsTest.java index 9d627b8..c73e478 100644 --- a/src/test/java/com/gitblit/tests/DiffUtilsTest.java +++ b/src/test/java/com/gitblit/tests/DiffUtilsTest.java @@ -23,6 +23,7 @@ import com.gitblit.models.AnnotatedLine; import com.gitblit.utils.DiffUtils; +import com.gitblit.utils.DiffUtils.DiffComparator; import com.gitblit.utils.DiffUtils.DiffOutputType; import com.gitblit.utils.JGitUtils; @@ -40,7 +41,7 @@ Repository repository = GitBlitSuite.getHelloworldRepository(); RevCommit commit = JGitUtils.getCommit(repository, "1d0c2933a4ae69c362f76797d42d6bd182d05176"); - String diff = DiffUtils.getCommitDiff(repository, commit, DiffOutputType.PLAIN).content; + String diff = DiffUtils.getCommitDiff(repository, commit, DiffComparator.SHOW_WHITESPACE, DiffOutputType.PLAIN).content; repository.close(); assertTrue(diff != null && diff.length() > 0); String expected = "- system.out.println(\"Hello World\");\n+ System.out.println(\"Hello World\""; @@ -54,7 +55,7 @@ "8baf6a833b5579384d9b9ceb8a16b5d0ea2ec4ca"); RevCommit commit = JGitUtils.getCommit(repository, "1d0c2933a4ae69c362f76797d42d6bd182d05176"); - String diff = DiffUtils.getDiff(repository, baseCommit, commit, DiffOutputType.PLAIN).content; + String diff = DiffUtils.getDiff(repository, baseCommit, commit, DiffComparator.SHOW_WHITESPACE, DiffOutputType.PLAIN).content; repository.close(); assertTrue(diff != null && diff.length() > 0); String expected = "- system.out.println(\"Hello World\");\n+ System.out.println(\"Hello World\""; @@ -66,7 +67,7 @@ Repository repository = GitBlitSuite.getHelloworldRepository(); RevCommit commit = JGitUtils.getCommit(repository, "1d0c2933a4ae69c362f76797d42d6bd182d05176"); - String diff = DiffUtils.getDiff(repository, commit, "java.java", DiffOutputType.PLAIN).content; + String diff = DiffUtils.getDiff(repository, commit, "java.java", DiffComparator.SHOW_WHITESPACE, DiffOutputType.PLAIN).content; repository.close(); assertTrue(diff != null && diff.length() > 0); String expected = "- system.out.println(\"Hello World\");\n+ System.out.println(\"Hello World\""; -- Gitblit v1.9.1