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.

RenameDetectorTest.java 17KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384385386387388389390391392393394395396397398399400401402403404405406407408409410411412413414415416417418419420421422423424425426427428429430431432433434435436437438439440441442443444445446447448449450451452453454455456457458459460461462463464465466467468469470471472473474475476477478479480481482483484485486487488489490491492493494495496497498499500501502503504505506507508509510511512513514515516517518519520521522523524525526527528529530531532533534535536537538539540541542543544545546547548549550551552553554555556557558559560561562563564565566567568569570571572573574575576577578579580581582583584585586587588589590591592593594595596597598599600601
  1. /*
  2. * Copyright (C) 2010, 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.diff;
  44. import java.util.List;
  45. import org.eclipse.jgit.diff.DiffEntry.ChangeType;
  46. import org.eclipse.jgit.junit.TestRepository;
  47. import org.eclipse.jgit.lib.AbbreviatedObjectId;
  48. import org.eclipse.jgit.lib.FileMode;
  49. import org.eclipse.jgit.lib.ObjectId;
  50. import org.eclipse.jgit.lib.RepositoryTestCase;
  51. public class RenameDetectorTest extends RepositoryTestCase {
  52. private static final String PATH_A = "src/A";
  53. private static final String PATH_B = "src/B";
  54. private static final String PATH_H = "src/H";
  55. private static final String PATH_Q = "src/Q";
  56. private RenameDetector rd;
  57. private TestRepository testDb;
  58. @Override
  59. public void setUp() throws Exception {
  60. super.setUp();
  61. testDb = new TestRepository(db);
  62. rd = new RenameDetector(db);
  63. }
  64. public void testExactRename_OneRename() throws Exception {
  65. ObjectId foo = blob("foo");
  66. DiffEntry a = DiffEntry.add(PATH_A, foo);
  67. DiffEntry b = DiffEntry.delete(PATH_Q, foo);
  68. rd.add(a);
  69. rd.add(b);
  70. List<DiffEntry> entries = rd.compute();
  71. assertEquals(1, entries.size());
  72. assertRename(b, a, 100, entries.get(0));
  73. }
  74. public void testExactRename_DifferentObjects() throws Exception {
  75. ObjectId foo = blob("foo");
  76. ObjectId bar = blob("bar");
  77. DiffEntry a = DiffEntry.add(PATH_A, foo);
  78. DiffEntry h = DiffEntry.add(PATH_H, foo);
  79. DiffEntry q = DiffEntry.delete(PATH_Q, bar);
  80. rd.add(a);
  81. rd.add(h);
  82. rd.add(q);
  83. List<DiffEntry> entries = rd.compute();
  84. assertEquals(3, entries.size());
  85. assertSame(a, entries.get(0));
  86. assertSame(h, entries.get(1));
  87. assertSame(q, entries.get(2));
  88. }
  89. public void testExactRename_OneRenameOneModify() throws Exception {
  90. ObjectId foo = blob("foo");
  91. ObjectId bar = blob("bar");
  92. DiffEntry a = DiffEntry.add(PATH_A, foo);
  93. DiffEntry b = DiffEntry.delete(PATH_Q, foo);
  94. DiffEntry c = DiffEntry.modify(PATH_H);
  95. c.newId = c.oldId = AbbreviatedObjectId.fromObjectId(bar);
  96. rd.add(a);
  97. rd.add(b);
  98. rd.add(c);
  99. List<DiffEntry> entries = rd.compute();
  100. assertEquals(2, entries.size());
  101. assertRename(b, a, 100, entries.get(0));
  102. assertSame(c, entries.get(1));
  103. }
  104. public void testExactRename_ManyRenames() throws Exception {
  105. ObjectId foo = blob("foo");
  106. ObjectId bar = blob("bar");
  107. DiffEntry a = DiffEntry.add(PATH_A, foo);
  108. DiffEntry b = DiffEntry.delete(PATH_Q, foo);
  109. DiffEntry c = DiffEntry.add(PATH_H, bar);
  110. DiffEntry d = DiffEntry.delete(PATH_B, bar);
  111. rd.add(a);
  112. rd.add(b);
  113. rd.add(c);
  114. rd.add(d);
  115. List<DiffEntry> entries = rd.compute();
  116. assertEquals(2, entries.size());
  117. assertRename(b, a, 100, entries.get(0));
  118. assertRename(d, c, 100, entries.get(1));
  119. }
  120. public void testExactRename_MultipleIdenticalDeletes() throws Exception {
  121. ObjectId foo = blob("foo");
  122. DiffEntry a = DiffEntry.delete(PATH_A, foo);
  123. DiffEntry b = DiffEntry.delete(PATH_B, foo);
  124. DiffEntry c = DiffEntry.delete(PATH_H, foo);
  125. DiffEntry d = DiffEntry.add(PATH_Q, foo);
  126. rd.add(a);
  127. rd.add(b);
  128. rd.add(c);
  129. rd.add(d);
  130. // Pairs the add with the first delete added
  131. List<DiffEntry> entries = rd.compute();
  132. assertEquals(3, entries.size());
  133. assertEquals(b, entries.get(0));
  134. assertEquals(c, entries.get(1));
  135. assertRename(a, d, 100, entries.get(2));
  136. }
  137. public void testExactRename_PathBreaksTie() throws Exception {
  138. ObjectId foo = blob("foo");
  139. DiffEntry a = DiffEntry.add("src/com/foo/a.java", foo);
  140. DiffEntry b = DiffEntry.delete("src/com/foo/b.java", foo);
  141. DiffEntry c = DiffEntry.add("c.txt", foo);
  142. DiffEntry d = DiffEntry.delete("d.txt", foo);
  143. // Add out of order to avoid first-match succeeding
  144. rd.add(a);
  145. rd.add(d);
  146. rd.add(b);
  147. rd.add(c);
  148. List<DiffEntry> entries = rd.compute();
  149. assertEquals(2, entries.size());
  150. assertRename(d, c, 100, entries.get(0));
  151. assertRename(b, a, 100, entries.get(1));
  152. }
  153. public void testExactRename_OneDeleteManyAdds() throws Exception {
  154. ObjectId foo = blob("foo");
  155. DiffEntry a = DiffEntry.add("src/com/foo/a.java", foo);
  156. DiffEntry b = DiffEntry.add("src/com/foo/b.java", foo);
  157. DiffEntry c = DiffEntry.add("c.txt", foo);
  158. DiffEntry d = DiffEntry.delete("d.txt", foo);
  159. rd.add(a);
  160. rd.add(b);
  161. rd.add(c);
  162. rd.add(d);
  163. List<DiffEntry> entries = rd.compute();
  164. assertEquals(3, entries.size());
  165. assertRename(d, c, 100, entries.get(0));
  166. assertCopy(d, a, 100, entries.get(1));
  167. assertCopy(d, b, 100, entries.get(2));
  168. }
  169. public void testInexactRename_OnePair() throws Exception {
  170. ObjectId aId = blob("foo\nbar\nbaz\nblarg\n");
  171. ObjectId bId = blob("foo\nbar\nbaz\nblah\n");
  172. DiffEntry a = DiffEntry.add(PATH_A, aId);
  173. DiffEntry b = DiffEntry.delete(PATH_Q, bId);
  174. rd.add(a);
  175. rd.add(b);
  176. List<DiffEntry> entries = rd.compute();
  177. assertEquals(1, entries.size());
  178. assertRename(b, a, 66, entries.get(0));
  179. }
  180. public void testInexactRename_OneRenameTwoUnrelatedFiles() throws Exception {
  181. ObjectId aId = blob("foo\nbar\nbaz\nblarg\n");
  182. ObjectId bId = blob("foo\nbar\nbaz\nblah\n");
  183. DiffEntry a = DiffEntry.add(PATH_A, aId);
  184. DiffEntry b = DiffEntry.delete(PATH_Q, bId);
  185. ObjectId cId = blob("some\nsort\nof\ntext\n");
  186. ObjectId dId = blob("completely\nunrelated\ntext\n");
  187. DiffEntry c = DiffEntry.add(PATH_B, cId);
  188. DiffEntry d = DiffEntry.delete(PATH_H, dId);
  189. rd.add(a);
  190. rd.add(b);
  191. rd.add(c);
  192. rd.add(d);
  193. List<DiffEntry> entries = rd.compute();
  194. assertEquals(3, entries.size());
  195. assertRename(b, a, 66, entries.get(0));
  196. assertSame(c, entries.get(1));
  197. assertSame(d, entries.get(2));
  198. }
  199. public void testInexactRename_LastByteDifferent() throws Exception {
  200. ObjectId aId = blob("foo\nbar\na");
  201. ObjectId bId = blob("foo\nbar\nb");
  202. DiffEntry a = DiffEntry.add(PATH_A, aId);
  203. DiffEntry b = DiffEntry.delete(PATH_Q, bId);
  204. rd.add(a);
  205. rd.add(b);
  206. List<DiffEntry> entries = rd.compute();
  207. assertEquals(1, entries.size());
  208. assertRename(b, a, 88, entries.get(0));
  209. }
  210. public void testInexactRename_NewlinesOnly() throws Exception {
  211. ObjectId aId = blob("\n\n\n");
  212. ObjectId bId = blob("\n\n\n\n");
  213. DiffEntry a = DiffEntry.add(PATH_A, aId);
  214. DiffEntry b = DiffEntry.delete(PATH_Q, bId);
  215. rd.add(a);
  216. rd.add(b);
  217. List<DiffEntry> entries = rd.compute();
  218. assertEquals(1, entries.size());
  219. assertRename(b, a, 74, entries.get(0));
  220. }
  221. public void testInexactRename_SameContentMultipleTimes() throws Exception {
  222. ObjectId aId = blob("a\na\na\na\n");
  223. ObjectId bId = blob("a\na\na\n");
  224. DiffEntry a = DiffEntry.add(PATH_A, aId);
  225. DiffEntry b = DiffEntry.delete(PATH_Q, bId);
  226. rd.add(a);
  227. rd.add(b);
  228. List<DiffEntry> entries = rd.compute();
  229. assertEquals(1, entries.size());
  230. assertRename(b, a, 74, entries.get(0));
  231. }
  232. public void testInexactRenames_OnePair2() throws Exception {
  233. ObjectId aId = blob("ab\nab\nab\nac\nad\nae\n");
  234. ObjectId bId = blob("ac\nab\nab\nab\naa\na0\na1\n");
  235. DiffEntry a = DiffEntry.add(PATH_A, aId);
  236. DiffEntry b = DiffEntry.delete(PATH_Q, bId);
  237. rd.add(a);
  238. rd.add(b);
  239. rd.setRenameScore(50);
  240. List<DiffEntry> entries = rd.compute();
  241. assertEquals(1, entries.size());
  242. assertRename(b, a, 57, entries.get(0));
  243. }
  244. public void testNoRenames_SingleByteFiles() throws Exception {
  245. ObjectId aId = blob("a");
  246. ObjectId bId = blob("b");
  247. DiffEntry a = DiffEntry.add(PATH_A, aId);
  248. DiffEntry b = DiffEntry.delete(PATH_Q, bId);
  249. rd.add(a);
  250. rd.add(b);
  251. List<DiffEntry> entries = rd.compute();
  252. assertEquals(2, entries.size());
  253. assertSame(a, entries.get(0));
  254. assertSame(b, entries.get(1));
  255. }
  256. public void testNoRenames_EmptyFile1() throws Exception {
  257. ObjectId aId = blob("");
  258. DiffEntry a = DiffEntry.add(PATH_A, aId);
  259. rd.add(a);
  260. List<DiffEntry> entries = rd.compute();
  261. assertEquals(1, entries.size());
  262. assertSame(a, entries.get(0));
  263. }
  264. public void testNoRenames_EmptyFile2() throws Exception {
  265. ObjectId aId = blob("");
  266. ObjectId bId = blob("blah");
  267. DiffEntry a = DiffEntry.add(PATH_A, aId);
  268. DiffEntry b = DiffEntry.delete(PATH_Q, bId);
  269. rd.add(a);
  270. rd.add(b);
  271. List<DiffEntry> entries = rd.compute();
  272. assertEquals(2, entries.size());
  273. assertSame(a, entries.get(0));
  274. assertSame(b, entries.get(1));
  275. }
  276. public void testNoRenames_SymlinkAndFile() throws Exception {
  277. ObjectId aId = blob("src/dest");
  278. DiffEntry a = DiffEntry.add(PATH_A, aId);
  279. DiffEntry b = DiffEntry.delete(PATH_Q, aId);
  280. b.oldMode = FileMode.SYMLINK;
  281. rd.add(a);
  282. rd.add(b);
  283. List<DiffEntry> entries = rd.compute();
  284. assertEquals(2, entries.size());
  285. assertSame(a, entries.get(0));
  286. assertSame(b, entries.get(1));
  287. }
  288. public void testNoRenames_GitlinkAndFile() throws Exception {
  289. ObjectId aId = blob("src/dest");
  290. DiffEntry a = DiffEntry.add(PATH_A, aId);
  291. DiffEntry b = DiffEntry.delete(PATH_Q, aId);
  292. b.oldMode = FileMode.GITLINK;
  293. rd.add(a);
  294. rd.add(b);
  295. List<DiffEntry> entries = rd.compute();
  296. assertEquals(2, entries.size());
  297. assertSame(a, entries.get(0));
  298. assertSame(b, entries.get(1));
  299. }
  300. public void testNoRenames_SymlinkAndFileSamePath() throws Exception {
  301. ObjectId aId = blob("src/dest");
  302. DiffEntry a = DiffEntry.delete(PATH_A, aId);
  303. DiffEntry b = DiffEntry.add(PATH_A, aId);
  304. a.oldMode = FileMode.SYMLINK;
  305. rd.add(a);
  306. rd.add(b);
  307. // Deletes should be first
  308. List<DiffEntry> entries = rd.compute();
  309. assertEquals(2, entries.size());
  310. assertSame(a, entries.get(0));
  311. assertSame(b, entries.get(1));
  312. }
  313. public void testBreakModify_BreakAll() throws Exception {
  314. ObjectId aId = blob("foo");
  315. ObjectId bId = blob("bar");
  316. DiffEntry m = DiffEntry.modify(PATH_A);
  317. m.oldId = AbbreviatedObjectId.fromObjectId(aId);
  318. m.newId = AbbreviatedObjectId.fromObjectId(bId);
  319. DiffEntry a = DiffEntry.add(PATH_B, aId);
  320. rd.add(a);
  321. rd.add(m);
  322. rd.setBreakScore(101);
  323. List<DiffEntry> entries = rd.compute();
  324. assertEquals(2, entries.size());
  325. assertAdd(PATH_A, bId, FileMode.REGULAR_FILE, entries.get(0));
  326. assertRename(DiffEntry.breakModify(m).get(0), a, 100, entries.get(1));
  327. }
  328. public void testBreakModify_BreakNone() throws Exception {
  329. ObjectId aId = blob("foo");
  330. ObjectId bId = blob("bar");
  331. DiffEntry m = DiffEntry.modify(PATH_A);
  332. m.oldId = AbbreviatedObjectId.fromObjectId(aId);
  333. m.newId = AbbreviatedObjectId.fromObjectId(bId);
  334. DiffEntry a = DiffEntry.add(PATH_B, aId);
  335. rd.add(a);
  336. rd.add(m);
  337. rd.setBreakScore(-1);
  338. List<DiffEntry> entries = rd.compute();
  339. assertEquals(2, entries.size());
  340. assertSame(m, entries.get(0));
  341. assertSame(a, entries.get(1));
  342. }
  343. public void testBreakModify_BreakBelowScore() throws Exception {
  344. ObjectId aId = blob("foo");
  345. ObjectId bId = blob("bar");
  346. DiffEntry m = DiffEntry.modify(PATH_A);
  347. m.oldId = AbbreviatedObjectId.fromObjectId(aId);
  348. m.newId = AbbreviatedObjectId.fromObjectId(bId);
  349. DiffEntry a = DiffEntry.add(PATH_B, aId);
  350. rd.add(a);
  351. rd.add(m);
  352. rd.setBreakScore(20); // Should break the modify
  353. List<DiffEntry> entries = rd.compute();
  354. assertEquals(2, entries.size());
  355. assertAdd(PATH_A, bId, FileMode.REGULAR_FILE, entries.get(0));
  356. assertRename(DiffEntry.breakModify(m).get(0), a, 100, entries.get(1));
  357. }
  358. public void testBreakModify_DontBreakAboveScore() throws Exception {
  359. ObjectId aId = blob("blah\nblah\nfoo");
  360. ObjectId bId = blob("blah\nblah\nbar");
  361. DiffEntry m = DiffEntry.modify(PATH_A);
  362. m.oldId = AbbreviatedObjectId.fromObjectId(aId);
  363. m.newId = AbbreviatedObjectId.fromObjectId(bId);
  364. DiffEntry a = DiffEntry.add(PATH_B, aId);
  365. rd.add(a);
  366. rd.add(m);
  367. rd.setBreakScore(20); // Should not break the modify
  368. List<DiffEntry> entries = rd.compute();
  369. assertEquals(2, entries.size());
  370. assertSame(m, entries.get(0));
  371. assertSame(a, entries.get(1));
  372. }
  373. public void testBreakModify_RejoinIfUnpaired() throws Exception {
  374. ObjectId aId = blob("foo");
  375. ObjectId bId = blob("bar");
  376. DiffEntry m = DiffEntry.modify(PATH_A);
  377. m.oldId = AbbreviatedObjectId.fromObjectId(aId);
  378. m.newId = AbbreviatedObjectId.fromObjectId(bId);
  379. rd.add(m);
  380. rd.setBreakScore(101); // Ensure m is broken apart
  381. List<DiffEntry> entries = rd.compute();
  382. assertEquals(1, entries.size());
  383. DiffEntry modify = entries.get(0);
  384. assertEquals(m.oldPath, modify.oldPath);
  385. assertEquals(m.oldId, modify.oldId);
  386. assertEquals(m.oldMode, modify.oldMode);
  387. assertEquals(m.newPath, modify.newPath);
  388. assertEquals(m.newId, modify.newId);
  389. assertEquals(m.newMode, modify.newMode);
  390. assertEquals(m.changeType, modify.changeType);
  391. assertEquals(0, modify.score);
  392. }
  393. public void testSetRenameScore_IllegalArgs() throws Exception {
  394. try {
  395. rd.setRenameScore(-1);
  396. fail();
  397. } catch (IllegalArgumentException e) {
  398. // pass
  399. }
  400. try {
  401. rd.setRenameScore(101);
  402. fail();
  403. } catch (IllegalArgumentException e) {
  404. // pass
  405. }
  406. }
  407. public void testRenameLimit() throws Exception {
  408. ObjectId aId = blob("foo\nbar\nbaz\nblarg\n");
  409. ObjectId bId = blob("foo\nbar\nbaz\nblah\n");
  410. DiffEntry a = DiffEntry.add(PATH_A, aId);
  411. DiffEntry b = DiffEntry.delete(PATH_B, bId);
  412. ObjectId cId = blob("a\nb\nc\nd\n");
  413. ObjectId dId = blob("a\nb\nc\n");
  414. DiffEntry c = DiffEntry.add(PATH_H, cId);
  415. DiffEntry d = DiffEntry.delete(PATH_Q, dId);
  416. rd.add(a);
  417. rd.add(b);
  418. rd.add(c);
  419. rd.add(d);
  420. rd.setRenameLimit(1);
  421. assertTrue(rd.isOverRenameLimit());
  422. List<DiffEntry> entries = rd.compute();
  423. assertEquals(4, entries.size());
  424. assertSame(a, entries.get(0));
  425. assertSame(b, entries.get(1));
  426. assertSame(c, entries.get(2));
  427. assertSame(d, entries.get(3));
  428. }
  429. private ObjectId blob(String content) throws Exception {
  430. return testDb.blob(content).copy();
  431. }
  432. private static void assertRename(DiffEntry o, DiffEntry n, int score,
  433. DiffEntry rename) {
  434. assertEquals(ChangeType.RENAME, rename.getChangeType());
  435. assertEquals(o.getOldPath(), rename.getOldPath());
  436. assertEquals(n.getNewPath(), rename.getNewPath());
  437. assertEquals(o.getOldMode(), rename.getOldMode());
  438. assertEquals(n.getNewMode(), rename.getNewMode());
  439. assertEquals(o.getOldId(), rename.getOldId());
  440. assertEquals(n.getNewId(), rename.getNewId());
  441. assertEquals(score, rename.getScore());
  442. }
  443. private static void assertCopy(DiffEntry o, DiffEntry n, int score,
  444. DiffEntry copy) {
  445. assertEquals(ChangeType.COPY, copy.getChangeType());
  446. assertEquals(o.getOldPath(), copy.getOldPath());
  447. assertEquals(n.getNewPath(), copy.getNewPath());
  448. assertEquals(o.getOldMode(), copy.getOldMode());
  449. assertEquals(n.getNewMode(), copy.getNewMode());
  450. assertEquals(o.getOldId(), copy.getOldId());
  451. assertEquals(n.getNewId(), copy.getNewId());
  452. assertEquals(score, copy.getScore());
  453. }
  454. private static void assertAdd(String newName, ObjectId newId,
  455. FileMode newMode, DiffEntry add) {
  456. assertEquals(DiffEntry.DEV_NULL, add.oldPath);
  457. assertEquals(DiffEntry.A_ZERO, add.oldId);
  458. assertEquals(FileMode.MISSING, add.oldMode);
  459. assertEquals(ChangeType.ADD, add.changeType);
  460. assertEquals(newName, add.newPath);
  461. assertEquals(AbbreviatedObjectId.fromObjectId(newId), add.newId);
  462. assertEquals(newMode, add.newMode);
  463. }
  464. }