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.

TreeWalkBasicDiffTest.java 4.9KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132
  1. /*
  2. * Copyright (C) 2008, Google Inc.
  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.treewalk;
  44. import static org.eclipse.jgit.lib.Constants.OBJ_BLOB;
  45. import static org.eclipse.jgit.lib.Constants.encode;
  46. import static org.junit.Assert.assertEquals;
  47. import static org.junit.Assert.assertFalse;
  48. import static org.junit.Assert.assertTrue;
  49. import org.eclipse.jgit.junit.RepositoryTestCase;
  50. import org.eclipse.jgit.lib.FileMode;
  51. import org.eclipse.jgit.lib.ObjectId;
  52. import org.eclipse.jgit.lib.ObjectInserter;
  53. import org.eclipse.jgit.lib.TreeFormatter;
  54. import org.eclipse.jgit.treewalk.filter.TreeFilter;
  55. import org.junit.Test;
  56. public class TreeWalkBasicDiffTest extends RepositoryTestCase {
  57. @Test
  58. public void testMissingSubtree_DetectFileAdded_FileModified()
  59. throws Exception {
  60. final ObjectId oldTree, newTree, bFileId, cFileId1, cFileId2;
  61. try (ObjectInserter inserter = db.newObjectInserter()) {
  62. final ObjectId aFileId = inserter.insert(OBJ_BLOB, encode("a"));
  63. bFileId = inserter.insert(OBJ_BLOB, encode("b"));
  64. cFileId1 = inserter.insert(OBJ_BLOB, encode("c-1"));
  65. cFileId2 = inserter.insert(OBJ_BLOB, encode("c-2"));
  66. // Create sub-a/empty, sub-c/empty = hello.
  67. {
  68. TreeFormatter root = new TreeFormatter();
  69. {
  70. TreeFormatter subA = new TreeFormatter();
  71. subA.append("empty", FileMode.REGULAR_FILE, aFileId);
  72. root.append("sub-a", FileMode.TREE, inserter.insert(subA));
  73. }
  74. {
  75. TreeFormatter subC = new TreeFormatter();
  76. subC.append("empty", FileMode.REGULAR_FILE, cFileId1);
  77. root.append("sub-c", FileMode.TREE, inserter.insert(subC));
  78. }
  79. oldTree = inserter.insert(root);
  80. }
  81. // Create sub-a/empty, sub-b/empty, sub-c/empty.
  82. {
  83. TreeFormatter root = new TreeFormatter();
  84. {
  85. TreeFormatter subA = new TreeFormatter();
  86. subA.append("empty", FileMode.REGULAR_FILE, aFileId);
  87. root.append("sub-a", FileMode.TREE, inserter.insert(subA));
  88. }
  89. {
  90. TreeFormatter subB = new TreeFormatter();
  91. subB.append("empty", FileMode.REGULAR_FILE, bFileId);
  92. root.append("sub-b", FileMode.TREE, inserter.insert(subB));
  93. }
  94. {
  95. TreeFormatter subC = new TreeFormatter();
  96. subC.append("empty", FileMode.REGULAR_FILE, cFileId2);
  97. root.append("sub-c", FileMode.TREE, inserter.insert(subC));
  98. }
  99. newTree = inserter.insert(root);
  100. }
  101. inserter.flush();
  102. }
  103. try (TreeWalk tw = new TreeWalk(db)) {
  104. tw.reset(oldTree, newTree);
  105. tw.setRecursive(true);
  106. tw.setFilter(TreeFilter.ANY_DIFF);
  107. assertTrue(tw.next());
  108. assertEquals("sub-b/empty", tw.getPathString());
  109. assertEquals(FileMode.MISSING, tw.getFileMode(0));
  110. assertEquals(FileMode.REGULAR_FILE, tw.getFileMode(1));
  111. assertEquals(ObjectId.zeroId(), tw.getObjectId(0));
  112. assertEquals(bFileId, tw.getObjectId(1));
  113. assertTrue(tw.next());
  114. assertEquals("sub-c/empty", tw.getPathString());
  115. assertEquals(FileMode.REGULAR_FILE, tw.getFileMode(0));
  116. assertEquals(FileMode.REGULAR_FILE, tw.getFileMode(1));
  117. assertEquals(cFileId1, tw.getObjectId(0));
  118. assertEquals(cFileId2, tw.getObjectId(1));
  119. assertFalse(tw.next());
  120. }
  121. }
  122. }