You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

DiffUtilsTest.java 5.2KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119
  1. /*
  2. * Copyright 2011 gitblit.com.
  3. *
  4. * Licensed under the Apache License, Version 2.0 (the "License");
  5. * you may not use this file except in compliance with the License.
  6. * You may obtain a copy of the License at
  7. *
  8. * http://www.apache.org/licenses/LICENSE-2.0
  9. *
  10. * Unless required by applicable law or agreed to in writing, software
  11. * distributed under the License is distributed on an "AS IS" BASIS,
  12. * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
  13. * See the License for the specific language governing permissions and
  14. * limitations under the License.
  15. */
  16. package com.gitblit.tests;
  17. import java.util.List;
  18. import junit.framework.TestCase;
  19. import org.eclipse.jgit.lib.Repository;
  20. import org.eclipse.jgit.revwalk.RevCommit;
  21. import com.gitblit.models.AnnotatedLine;
  22. import com.gitblit.utils.DiffUtils;
  23. import com.gitblit.utils.DiffUtils.DiffOutputType;
  24. import com.gitblit.utils.JGitUtils;
  25. public class DiffUtilsTest extends TestCase {
  26. public void testDiffOutputTypes() throws Exception {
  27. assertTrue(DiffOutputType.forName("plain").equals(DiffOutputType.PLAIN));
  28. assertTrue(DiffOutputType.forName("gitweb").equals(DiffOutputType.GITWEB));
  29. assertTrue(DiffOutputType.forName("gitblit").equals(DiffOutputType.GITBLIT));
  30. assertTrue(DiffOutputType.forName(null) == null);
  31. }
  32. public void testParentCommitDiff() throws Exception {
  33. Repository repository = GitBlitSuite.getHelloworldRepository();
  34. RevCommit commit = JGitUtils.getCommit(repository,
  35. "1d0c2933a4ae69c362f76797d42d6bd182d05176");
  36. String diff = DiffUtils.getCommitDiff(repository, commit, DiffOutputType.PLAIN);
  37. repository.close();
  38. assertTrue(diff != null && diff.length() > 0);
  39. String expected = "- system.out.println(\"Hello World\");\n+ System.out.println(\"Hello World\"";
  40. assertTrue(diff.indexOf(expected) > -1);
  41. }
  42. public void testArbitraryCommitDiff() throws Exception {
  43. Repository repository = GitBlitSuite.getHelloworldRepository();
  44. RevCommit baseCommit = JGitUtils.getCommit(repository,
  45. "8baf6a833b5579384d9b9ceb8a16b5d0ea2ec4ca");
  46. RevCommit commit = JGitUtils.getCommit(repository,
  47. "1d0c2933a4ae69c362f76797d42d6bd182d05176");
  48. String diff = DiffUtils.getDiff(repository, baseCommit, commit, DiffOutputType.PLAIN);
  49. repository.close();
  50. assertTrue(diff != null && diff.length() > 0);
  51. String expected = "- system.out.println(\"Hello World\");\n+ System.out.println(\"Hello World\"";
  52. assertTrue(diff.indexOf(expected) > -1);
  53. }
  54. public void testPlainFileDiff() throws Exception {
  55. Repository repository = GitBlitSuite.getHelloworldRepository();
  56. RevCommit commit = JGitUtils.getCommit(repository,
  57. "1d0c2933a4ae69c362f76797d42d6bd182d05176");
  58. String diff = DiffUtils.getDiff(repository, commit, "java.java", DiffOutputType.PLAIN);
  59. repository.close();
  60. assertTrue(diff != null && diff.length() > 0);
  61. String expected = "- system.out.println(\"Hello World\");\n+ System.out.println(\"Hello World\"";
  62. assertTrue(diff.indexOf(expected) > -1);
  63. }
  64. public void testFilePatch() throws Exception {
  65. Repository repository = GitBlitSuite.getHelloworldRepository();
  66. RevCommit commit = JGitUtils.getCommit(repository,
  67. "1d0c2933a4ae69c362f76797d42d6bd182d05176");
  68. String patch = DiffUtils.getCommitPatch(repository, null, commit, "java.java");
  69. repository.close();
  70. assertTrue(patch != null && patch.length() > 0);
  71. String expected = "- system.out.println(\"Hello World\");\n+ System.out.println(\"Hello World\"";
  72. assertTrue(patch.indexOf(expected) > -1);
  73. }
  74. public void testArbitraryFilePatch() throws Exception {
  75. Repository repository = GitBlitSuite.getHelloworldRepository();
  76. RevCommit baseCommit = JGitUtils.getCommit(repository,
  77. "8baf6a833b5579384d9b9ceb8a16b5d0ea2ec4ca");
  78. RevCommit commit = JGitUtils.getCommit(repository,
  79. "1d0c2933a4ae69c362f76797d42d6bd182d05176");
  80. String patch = DiffUtils.getCommitPatch(repository, baseCommit, commit, "java.java");
  81. repository.close();
  82. assertTrue(patch != null && patch.length() > 0);
  83. String expected = "- system.out.println(\"Hello World\");\n+ System.out.println(\"Hello World\"";
  84. assertTrue(patch.indexOf(expected) > -1);
  85. }
  86. public void testArbitraryCommitPatch() throws Exception {
  87. Repository repository = GitBlitSuite.getHelloworldRepository();
  88. RevCommit baseCommit = JGitUtils.getCommit(repository,
  89. "8baf6a833b5579384d9b9ceb8a16b5d0ea2ec4ca");
  90. RevCommit commit = JGitUtils.getCommit(repository,
  91. "1d0c2933a4ae69c362f76797d42d6bd182d05176");
  92. String patch = DiffUtils.getCommitPatch(repository, baseCommit, commit, null);
  93. repository.close();
  94. assertTrue(patch != null && patch.length() > 0);
  95. String expected = "- system.out.println(\"Hello World\");\n+ System.out.println(\"Hello World\"";
  96. assertTrue(patch.indexOf(expected) > -1);
  97. }
  98. public void testBlame() throws Exception {
  99. Repository repository = GitBlitSuite.getHelloworldRepository();
  100. List<AnnotatedLine> lines = DiffUtils.blame(repository, "java.java",
  101. "1d0c2933a4ae69c362f76797d42d6bd182d05176");
  102. repository.close();
  103. assertTrue(lines.size() > 0);
  104. assertTrue(lines.get(0).commitId.equals("c6d31dccf5cc75e8e46299fc62d38f60ec6d41e0"));
  105. }
  106. }