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.8KB

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