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.

TestRepositoryTest.java 13KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278279280281282283284285286287288289290291292293294295296297298299300301302303304305306307308309310311312313314315316317318319320321322323324325326327328329330331332333334335336337338339340341342343344345346347348349350351352353354355356357358359360361362363364365366367368369370371372373374375376377378379380381382383384
  1. /*
  2. * Copyright (C) 2015, 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.junit;
  44. import static java.nio.charset.StandardCharsets.UTF_8;
  45. import static org.junit.Assert.assertEquals;
  46. import static org.junit.Assert.assertFalse;
  47. import static org.junit.Assert.assertNotEquals;
  48. import static org.junit.Assert.assertNull;
  49. import static org.junit.Assert.assertSame;
  50. import static org.junit.Assert.assertTrue;
  51. import java.util.Date;
  52. import java.util.regex.Pattern;
  53. import org.eclipse.jgit.internal.storage.dfs.DfsRepositoryDescription;
  54. import org.eclipse.jgit.internal.storage.dfs.InMemoryRepository;
  55. import org.eclipse.jgit.lib.AnyObjectId;
  56. import org.eclipse.jgit.lib.Constants;
  57. import org.eclipse.jgit.lib.ObjectId;
  58. import org.eclipse.jgit.lib.ObjectLoader;
  59. import org.eclipse.jgit.lib.PersonIdent;
  60. import org.eclipse.jgit.lib.Ref;
  61. import org.eclipse.jgit.revwalk.RevBlob;
  62. import org.eclipse.jgit.revwalk.RevCommit;
  63. import org.eclipse.jgit.revwalk.RevObject;
  64. import org.eclipse.jgit.revwalk.RevWalk;
  65. import org.eclipse.jgit.treewalk.TreeWalk;
  66. import org.junit.After;
  67. import org.junit.Before;
  68. import org.junit.Test;
  69. public class TestRepositoryTest {
  70. private TestRepository<InMemoryRepository> tr;
  71. private InMemoryRepository repo;
  72. private RevWalk rw;
  73. @Before
  74. public void setUp() throws Exception {
  75. tr = new TestRepository<>(new InMemoryRepository(
  76. new DfsRepositoryDescription("test")));
  77. repo = tr.getRepository();
  78. rw = tr.getRevWalk();
  79. }
  80. @After
  81. public void tearDown() {
  82. rw.close();
  83. repo.close();
  84. }
  85. @Test
  86. public void insertChangeId() throws Exception {
  87. RevCommit c1 = tr.commit().message("message").insertChangeId().create();
  88. rw.parseBody(c1);
  89. assertTrue(Pattern.matches(
  90. "^message\n\nChange-Id: I[0-9a-f]{40}\n$", c1.getFullMessage()));
  91. RevCommit c2 = tr.commit().message("").insertChangeId().create();
  92. rw.parseBody(c2);
  93. assertEquals("\n\nChange-Id: I0000000000000000000000000000000000000000\n",
  94. c2.getFullMessage());
  95. }
  96. @Test
  97. public void insertChangeIdIgnoresExisting() throws Exception {
  98. String msg = "message\n"
  99. + "\n"
  100. + "Change-Id: Ideadbeefdeadbeefdeadbeefdeadbeefdeadbeef\n";
  101. RevCommit c = tr.commit().message(msg).insertChangeId().create();
  102. rw.parseBody(c);
  103. assertEquals(msg, c.getFullMessage());
  104. }
  105. @Test
  106. public void insertExplicitChangeId() throws Exception {
  107. RevCommit c = tr.commit().message("message")
  108. .insertChangeId("deadbeefdeadbeefdeadbeefdeadbeefdeadbeef")
  109. .create();
  110. rw.parseBody(c);
  111. assertEquals("message\n\n"
  112. + "Change-Id: Ideadbeefdeadbeefdeadbeefdeadbeefdeadbeef\n"
  113. , c.getFullMessage());
  114. }
  115. @Test
  116. public void resetFromSymref() throws Exception {
  117. repo.updateRef("HEAD").link("refs/heads/master");
  118. Ref head = repo.exactRef("HEAD");
  119. RevCommit master = tr.branch("master").commit().create();
  120. RevCommit branch = tr.branch("branch").commit().create();
  121. RevCommit detached = tr.commit().create();
  122. assertTrue(head.isSymbolic());
  123. assertEquals("refs/heads/master", head.getTarget().getName());
  124. assertEquals(master, repo.exactRef("refs/heads/master").getObjectId());
  125. assertEquals(branch, repo.exactRef("refs/heads/branch").getObjectId());
  126. // Reset to branches preserves symref.
  127. tr.reset("master");
  128. head = repo.exactRef("HEAD");
  129. assertEquals(master, head.getObjectId());
  130. assertTrue(head.isSymbolic());
  131. assertEquals("refs/heads/master", head.getTarget().getName());
  132. tr.reset("branch");
  133. head = repo.exactRef("HEAD");
  134. assertEquals(branch, head.getObjectId());
  135. assertTrue(head.isSymbolic());
  136. assertEquals("refs/heads/master", head.getTarget().getName());
  137. ObjectId lastHeadBeforeDetach = head.getObjectId().copy();
  138. // Reset to a SHA-1 detaches.
  139. tr.reset(detached);
  140. head = repo.exactRef("HEAD");
  141. assertEquals(detached, head.getObjectId());
  142. assertFalse(head.isSymbolic());
  143. tr.reset(detached.name());
  144. head = repo.exactRef("HEAD");
  145. assertEquals(detached, head.getObjectId());
  146. assertFalse(head.isSymbolic());
  147. // Reset back to a branch remains detached.
  148. tr.reset("master");
  149. head = repo.exactRef("HEAD");
  150. assertEquals(lastHeadBeforeDetach, head.getObjectId());
  151. assertFalse(head.isSymbolic());
  152. }
  153. @Test
  154. public void resetFromDetachedHead() throws Exception {
  155. Ref head = repo.exactRef("HEAD");
  156. RevCommit master = tr.branch("master").commit().create();
  157. RevCommit branch = tr.branch("branch").commit().create();
  158. RevCommit detached = tr.commit().create();
  159. assertNull(head);
  160. assertEquals(master, repo.exactRef("refs/heads/master").getObjectId());
  161. assertEquals(branch, repo.exactRef("refs/heads/branch").getObjectId());
  162. tr.reset("master");
  163. head = repo.exactRef("HEAD");
  164. assertEquals(master, head.getObjectId());
  165. assertFalse(head.isSymbolic());
  166. tr.reset("branch");
  167. head = repo.exactRef("HEAD");
  168. assertEquals(branch, head.getObjectId());
  169. assertFalse(head.isSymbolic());
  170. tr.reset(detached);
  171. head = repo.exactRef("HEAD");
  172. assertEquals(detached, head.getObjectId());
  173. assertFalse(head.isSymbolic());
  174. tr.reset(detached.name());
  175. head = repo.exactRef("HEAD");
  176. assertEquals(detached, head.getObjectId());
  177. assertFalse(head.isSymbolic());
  178. }
  179. @Test
  180. public void amendRef() throws Exception {
  181. RevCommit root = tr.commit()
  182. .add("todelete", "to be deleted")
  183. .create();
  184. RevCommit orig = tr.commit().parent(root)
  185. .rm("todelete")
  186. .add("foo", "foo contents")
  187. .add("bar", "bar contents")
  188. .add("dir/baz", "baz contents")
  189. .create();
  190. rw.parseBody(orig);
  191. tr.branch("master").update(orig);
  192. assertEquals("foo contents", blobAsString(orig, "foo"));
  193. assertEquals("bar contents", blobAsString(orig, "bar"));
  194. assertEquals("baz contents", blobAsString(orig, "dir/baz"));
  195. RevCommit amended = tr.amendRef("master")
  196. .tick(3)
  197. .add("bar", "fixed bar contents")
  198. .create();
  199. assertEquals(amended, repo.exactRef("refs/heads/master").getObjectId());
  200. rw.parseBody(amended);
  201. assertEquals(1, amended.getParentCount());
  202. assertEquals(root, amended.getParent(0));
  203. assertEquals(orig.getFullMessage(), amended.getFullMessage());
  204. assertEquals(orig.getAuthorIdent(), amended.getAuthorIdent());
  205. // Committer name/email is the same, but time was incremented.
  206. assertEquals(new PersonIdent(orig.getCommitterIdent(), new Date(0)),
  207. new PersonIdent(amended.getCommitterIdent(), new Date(0)));
  208. assertTrue(orig.getCommitTime() < amended.getCommitTime());
  209. assertEquals("foo contents", blobAsString(amended, "foo"));
  210. assertEquals("fixed bar contents", blobAsString(amended, "bar"));
  211. assertEquals("baz contents", blobAsString(amended, "dir/baz"));
  212. assertNull(TreeWalk.forPath(repo, "todelete", amended.getTree()));
  213. }
  214. @Test
  215. public void amendHead() throws Exception {
  216. repo.updateRef("HEAD").link("refs/heads/master");
  217. RevCommit root = tr.commit()
  218. .add("foo", "foo contents")
  219. .create();
  220. RevCommit orig = tr.commit().parent(root)
  221. .message("original message")
  222. .add("bar", "bar contents")
  223. .create();
  224. tr.branch("master").update(orig);
  225. RevCommit amended = tr.amendRef("HEAD")
  226. .add("foo", "fixed foo contents")
  227. .create();
  228. Ref head = repo.exactRef(Constants.HEAD);
  229. assertEquals(amended, head.getObjectId());
  230. assertTrue(head.isSymbolic());
  231. assertEquals("refs/heads/master", head.getTarget().getName());
  232. rw.parseBody(amended);
  233. assertEquals("original message", amended.getFullMessage());
  234. assertEquals("fixed foo contents", blobAsString(amended, "foo"));
  235. assertEquals("bar contents", blobAsString(amended, "bar"));
  236. }
  237. @Test
  238. public void amendCommit() throws Exception {
  239. RevCommit root = tr.commit()
  240. .add("foo", "foo contents")
  241. .create();
  242. RevCommit orig = tr.commit().parent(root)
  243. .message("original message")
  244. .add("bar", "bar contents")
  245. .create();
  246. RevCommit amended = tr.amend(orig.copy())
  247. .add("foo", "fixed foo contents")
  248. .create();
  249. rw.parseBody(amended);
  250. assertEquals("original message", amended.getFullMessage());
  251. assertEquals("fixed foo contents", blobAsString(amended, "foo"));
  252. assertEquals("bar contents", blobAsString(amended, "bar"));
  253. }
  254. @Test
  255. public void commitToUnbornHead() throws Exception {
  256. repo.updateRef("HEAD").link("refs/heads/master");
  257. RevCommit root = tr.branch("HEAD").commit().create();
  258. Ref ref = repo.exactRef(Constants.HEAD);
  259. assertEquals(root, ref.getObjectId());
  260. assertTrue(ref.isSymbolic());
  261. assertEquals("refs/heads/master", ref.getTarget().getName());
  262. }
  263. @Test
  264. public void cherryPick() throws Exception {
  265. repo.updateRef("HEAD").link("refs/heads/master");
  266. RevCommit head = tr.branch("master").commit()
  267. .add("foo", "foo contents\n")
  268. .create();
  269. rw.parseBody(head);
  270. RevCommit toPick = tr.commit()
  271. .parent(tr.commit().create()) // Can't cherry-pick root.
  272. .author(new PersonIdent("Cherrypick Author", "cpa@example.com",
  273. tr.getDate(), tr.getTimeZone()))
  274. .author(new PersonIdent("Cherrypick Committer", "cpc@example.com",
  275. tr.getDate(), tr.getTimeZone()))
  276. .message("message to cherry-pick")
  277. .add("bar", "bar contents\n")
  278. .create();
  279. RevCommit result = tr.cherryPick(toPick);
  280. rw.parseBody(result);
  281. Ref headRef = tr.getRepository().exactRef("HEAD");
  282. assertEquals(result, headRef.getObjectId());
  283. assertTrue(headRef.isSymbolic());
  284. assertEquals("refs/heads/master", headRef.getLeaf().getName());
  285. assertEquals(1, result.getParentCount());
  286. assertEquals(head, result.getParent(0));
  287. assertEquals(toPick.getAuthorIdent(), result.getAuthorIdent());
  288. // Committer name/email matches default, and time was incremented.
  289. assertEquals(new PersonIdent(head.getCommitterIdent(), new Date(0)),
  290. new PersonIdent(result.getCommitterIdent(), new Date(0)));
  291. assertTrue(toPick.getCommitTime() < result.getCommitTime());
  292. assertEquals("message to cherry-pick", result.getFullMessage());
  293. assertEquals("foo contents\n", blobAsString(result, "foo"));
  294. assertEquals("bar contents\n", blobAsString(result, "bar"));
  295. }
  296. @Test
  297. public void cherryPickWithContentMerge() throws Exception {
  298. RevCommit base = tr.branch("HEAD").commit()
  299. .add("foo", "foo contents\n\n")
  300. .create();
  301. tr.branch("HEAD").commit()
  302. .add("foo", "foo contents\n\nlast line\n")
  303. .create();
  304. RevCommit toPick = tr.commit()
  305. .message("message to cherry-pick")
  306. .parent(base)
  307. .add("foo", "changed foo contents\n\n")
  308. .create();
  309. RevCommit result = tr.cherryPick(toPick);
  310. rw.parseBody(result);
  311. assertEquals("message to cherry-pick", result.getFullMessage());
  312. assertEquals("changed foo contents\n\nlast line\n",
  313. blobAsString(result, "foo"));
  314. }
  315. @Test
  316. public void cherryPickWithIdenticalContents() throws Exception {
  317. RevCommit base = tr.branch("HEAD").commit().add("foo", "foo contents\n")
  318. .create();
  319. RevCommit head = tr.branch("HEAD").commit()
  320. .parent(base)
  321. .add("bar", "bar contents\n")
  322. .create();
  323. RevCommit toPick = tr.commit()
  324. .parent(base)
  325. .message("message to cherry-pick")
  326. .add("bar", "bar contents\n")
  327. .create();
  328. assertNotEquals(head, toPick);
  329. assertNull(tr.cherryPick(toPick));
  330. assertEquals(head, repo.exactRef("HEAD").getObjectId());
  331. }
  332. private String blobAsString(AnyObjectId treeish, String path)
  333. throws Exception {
  334. RevObject obj = tr.get(rw.parseTree(treeish), path);
  335. assertSame(RevBlob.class, obj.getClass());
  336. ObjectLoader loader = rw.getObjectReader().open(obj);
  337. return new String(loader.getCachedBytes(), UTF_8);
  338. }
  339. }