Add links to commit diff and blob diff pages to toggle whitespace setting

James Moger

2015-03-07 5d59b9ba3206894198a24807690fba00844c98f7

 src/test/java/com/gitblit/tests/DiffUtilsTest.java

@@ -15,9 +15,6 @@
 */

package com.gitblit.tests;



import static org.junit.Assert.assertEquals;

import static org.junit.Assert.assertTrue;



import java.util.List;



import org.eclipse.jgit.lib.Repository;

@@ -26,16 +23,16 @@


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;



public class DiffUtilsTest {

public class DiffUtilsTest extends GitblitUnitTest {



   @Test

   public void testDiffOutputTypes() throws Exception {

      assertEquals(DiffOutputType.PLAIN, DiffOutputType.forName("plain"));

      assertEquals(DiffOutputType.GITWEB, DiffOutputType.forName("gitweb"));

      assertEquals(DiffOutputType.GITBLIT, DiffOutputType.forName("gitblit"));

      assertEquals(DiffOutputType.HTML, DiffOutputType.forName("html"));

      assertEquals(null, DiffOutputType.forName(null));

   }



@@ -44,7 +41,7 @@
      Repository repository = GitBlitSuite.getHelloworldRepository();

      RevCommit commit = JGitUtils.getCommit(repository,

            "1d0c2933a4ae69c362f76797d42d6bd182d05176");

      String diff = DiffUtils.getCommitDiff(repository, commit, DiffOutputType.PLAIN);

      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\"";

@@ -58,7 +55,7 @@
            "8baf6a833b5579384d9b9ceb8a16b5d0ea2ec4ca");

      RevCommit commit = JGitUtils.getCommit(repository,

            "1d0c2933a4ae69c362f76797d42d6bd182d05176");

      String diff = DiffUtils.getDiff(repository, baseCommit, commit, DiffOutputType.PLAIN);

      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\"";

@@ -70,7 +67,7 @@
      Repository repository = GitBlitSuite.getHelloworldRepository();

      RevCommit commit = JGitUtils.getCommit(repository,

            "1d0c2933a4ae69c362f76797d42d6bd182d05176");

      String diff = DiffUtils.getDiff(repository, commit, "java.java", DiffOutputType.PLAIN);

      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\"";