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.

CommitAndLogCommandTests.java 6.0KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154
  1. /*
  2. * Copyright (C) 2010, Christian Halstrick <christian.halstrick@sap.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.api;
  44. import java.io.File;
  45. import java.io.FileWriter;
  46. import java.io.IOException;
  47. import org.eclipse.jgit.errors.UnmergedPathException;
  48. import org.eclipse.jgit.lib.Constants;
  49. import org.eclipse.jgit.lib.ObjectId;
  50. import org.eclipse.jgit.lib.PersonIdent;
  51. import org.eclipse.jgit.lib.RefUpdate;
  52. import org.eclipse.jgit.lib.RepositoryTestCase;
  53. import org.eclipse.jgit.revwalk.RevCommit;
  54. public class CommitAndLogCommandTests extends RepositoryTestCase {
  55. public void testSomeCommits() throws NoHeadException, NoMessageException,
  56. UnmergedPathException, ConcurrentRefUpdateException,
  57. JGitInternalException, WrongRepositoryStateException {
  58. // do 4 commits
  59. Git git = new Git(db);
  60. git.commit().setMessage("initial commit").call();
  61. git.commit().setMessage("second commit").setCommitter(committer).call();
  62. git.commit().setMessage("third commit").setAuthor(author).call();
  63. git.commit().setMessage("fourth commit").setAuthor(author)
  64. .setCommitter(committer).call();
  65. Iterable<RevCommit> commits = git.log().call();
  66. // check that all commits came in correctly
  67. PersonIdent defaultCommitter = new PersonIdent(db);
  68. PersonIdent expectedAuthors[] = new PersonIdent[] { defaultCommitter,
  69. committer, author, author };
  70. PersonIdent expectedCommitters[] = new PersonIdent[] {
  71. defaultCommitter, committer, defaultCommitter, committer };
  72. String expectedMessages[] = new String[] { "initial commit",
  73. "second commit", "third commit", "fourth commit" };
  74. int l = expectedAuthors.length - 1;
  75. for (RevCommit c : commits) {
  76. assertEquals(expectedAuthors[l].getName(), c.getAuthorIdent()
  77. .getName());
  78. assertEquals(expectedCommitters[l].getName(), c.getCommitterIdent()
  79. .getName());
  80. assertEquals(c.getFullMessage(), expectedMessages[l]);
  81. l--;
  82. }
  83. assertEquals(l, -1);
  84. }
  85. // try to do a commit without specifying a message. Should fail!
  86. public void testWrongParams() throws UnmergedPathException,
  87. NoHeadException, ConcurrentRefUpdateException,
  88. JGitInternalException, WrongRepositoryStateException {
  89. Git git = new Git(db);
  90. try {
  91. git.commit().setAuthor(author).call();
  92. fail("Didn't get the expected exception");
  93. } catch (NoMessageException e) {
  94. }
  95. }
  96. // try to work with Commands after command has been invoked. Should throw
  97. // exceptions
  98. public void testMultipleInvocations() throws NoHeadException,
  99. ConcurrentRefUpdateException, NoMessageException,
  100. UnmergedPathException, JGitInternalException,
  101. WrongRepositoryStateException {
  102. Git git = new Git(db);
  103. CommitCommand commitCmd = git.commit();
  104. commitCmd.setMessage("initial commit").call();
  105. try {
  106. // check that setters can't be called after invocation
  107. commitCmd.setAuthor(author);
  108. fail("didn't catch the expected exception");
  109. } catch (IllegalStateException e) {
  110. }
  111. LogCommand logCmd = git.log();
  112. logCmd.call();
  113. try {
  114. // check that call can't be called twice
  115. logCmd.call();
  116. fail("didn't catch the expected exception");
  117. } catch (IllegalStateException e) {
  118. }
  119. }
  120. public void testMergeEmptyBranches() throws IOException, NoHeadException,
  121. NoMessageException, ConcurrentRefUpdateException,
  122. JGitInternalException, WrongRepositoryStateException {
  123. Git git = new Git(db);
  124. git.commit().setMessage("initial commit").call();
  125. RefUpdate r = db.updateRef("refs/heads/side");
  126. r.setNewObjectId(db.resolve(Constants.HEAD));
  127. assertEquals(r.forceUpdate(), RefUpdate.Result.NEW);
  128. RevCommit second = git.commit().setMessage("second commit").setCommitter(committer).call();
  129. db.updateRef(Constants.HEAD).link("refs/heads/side");
  130. RevCommit firstSide = git.commit().setMessage("first side commit").setAuthor(author).call();
  131. FileWriter wr = new FileWriter(new File(db.getDirectory(),
  132. Constants.MERGE_HEAD));
  133. wr.write(ObjectId.toString(db.resolve("refs/heads/master")));
  134. wr.close();
  135. wr = new FileWriter(new File(db.getDirectory(), Constants.MERGE_MSG));
  136. wr.write("merging");
  137. wr.close();
  138. RevCommit commit = git.commit().call();
  139. RevCommit[] parents = commit.getParents();
  140. assertEquals(parents[0], firstSide);
  141. assertEquals(parents[1], second);
  142. assertTrue(parents.length==2);
  143. }
  144. }