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.

PatchIdDiffFormatterTest.java 4.7KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124
  1. /*
  2. * Copyright (C) 2011, Stefan Lay <stefan.lay@.com>
  3. * and other copyright owners as documented in the project's IP log.
  4. *
  5. * This program and the accompanying materials are made available
  6. * under the terms of the Eclipse Distribution License v1.0 which
  7. * accompanies this distribution, is reproduced below, and is
  8. * available at http://www.eclipse.org/org/documents/edl-v10.php
  9. *
  10. * All rights reserved.
  11. *
  12. * Redistribution and use in source and binary forms, with or
  13. * without modification, are permitted provided that the following
  14. * conditions are met:
  15. *
  16. * - Redistributions of source code must retain the above copyright
  17. * notice, this list of conditions and the following disclaimer.
  18. *
  19. * - Redistributions in binary form must reproduce the above
  20. * copyright notice, this list of conditions and the following
  21. * disclaimer in the documentation and/or other materials provided
  22. * with the distribution.
  23. *
  24. * - Neither the name of the Eclipse Foundation, Inc. nor the
  25. * names of its contributors may be used to endorse or promote
  26. * products derived from this software without specific prior
  27. * written permission.
  28. *
  29. * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  30. * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  31. * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  32. * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  33. * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  34. * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  35. * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  36. * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  37. * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  38. * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  39. * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  40. * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  41. * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  42. */
  43. package org.eclipse.jgit.diff;
  44. import static org.junit.Assert.assertEquals;
  45. import java.io.File;
  46. import org.eclipse.jgit.api.Git;
  47. import org.eclipse.jgit.dircache.DirCacheIterator;
  48. import org.eclipse.jgit.junit.RepositoryTestCase;
  49. import org.eclipse.jgit.treewalk.FileTreeIterator;
  50. import org.eclipse.jgit.treewalk.filter.PathFilter;
  51. import org.junit.Test;
  52. public class PatchIdDiffFormatterTest extends RepositoryTestCase {
  53. @Test
  54. public void testDiff() throws Exception {
  55. write(new File(db.getDirectory().getParent(), "test.txt"), "test");
  56. File folder = new File(db.getDirectory().getParent(), "folder");
  57. folder.mkdir();
  58. write(new File(folder, "folder.txt"), "folder");
  59. try (Git git = new Git(db);
  60. PatchIdDiffFormatter df = new PatchIdDiffFormatter()) {
  61. git.add().addFilepattern(".").call();
  62. git.commit().setMessage("Initial commit").call();
  63. write(new File(folder, "folder.txt"), "folder change");
  64. df.setRepository(db);
  65. df.setPathFilter(PathFilter.create("folder"));
  66. DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache());
  67. FileTreeIterator newTree = new FileTreeIterator(db);
  68. df.format(oldTree, newTree);
  69. df.flush();
  70. assertEquals("1ff64e0f9333e9b81967c3e8d7a81362b14d5441", df
  71. .getCalulatedPatchId().name());
  72. }
  73. }
  74. @Test
  75. public void testSameDiff() throws Exception {
  76. write(new File(db.getDirectory().getParent(), "test.txt"), "test");
  77. File folder = new File(db.getDirectory().getParent(), "folder");
  78. folder.mkdir();
  79. write(new File(folder, "folder.txt"), "\n\n\n\nfolder");
  80. try (Git git = new Git(db)) {
  81. git.add().addFilepattern(".").call();
  82. git.commit().setMessage("Initial commit").call();
  83. write(new File(folder, "folder.txt"), "\n\n\n\nfolder change");
  84. try (PatchIdDiffFormatter df = new PatchIdDiffFormatter()) {
  85. df.setRepository(db);
  86. df.setPathFilter(PathFilter.create("folder"));
  87. DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache());
  88. FileTreeIterator newTree = new FileTreeIterator(db);
  89. df.format(oldTree, newTree);
  90. df.flush();
  91. assertEquals("08fca5ac531383eb1da8bf6b6f7cf44411281407", df
  92. .getCalulatedPatchId().name());
  93. }
  94. write(new File(folder, "folder.txt"), "a\n\n\n\nfolder");
  95. git.add().addFilepattern(".").call();
  96. git.commit().setMessage("Initial commit").call();
  97. write(new File(folder, "folder.txt"), "a\n\n\n\nfolder change");
  98. try (PatchIdDiffFormatter df = new PatchIdDiffFormatter()) {
  99. df.setRepository(db);
  100. df.setPathFilter(PathFilter.create("folder"));
  101. DirCacheIterator oldTree = new DirCacheIterator(db.readDirCache());
  102. FileTreeIterator newTree = new FileTreeIterator(db);
  103. df.format(oldTree, newTree);
  104. df.flush();
  105. assertEquals("08fca5ac531383eb1da8bf6b6f7cf44411281407", df
  106. .getCalulatedPatchId().name());
  107. }
  108. }
  109. }
  110. }