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.

RevertCommandTest.java 4.4KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114
  1. /*
  2. * Copyright (C) 2011, Robin Rosenberg
  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 static org.junit.Assert.*;
  45. import java.io.File;
  46. import java.io.IOException;
  47. import java.util.Iterator;
  48. import org.eclipse.jgit.api.errors.GitAPIException;
  49. import org.eclipse.jgit.api.errors.JGitInternalException;
  50. import org.eclipse.jgit.lib.Constants;
  51. import org.eclipse.jgit.lib.RepositoryTestCase;
  52. import org.eclipse.jgit.revwalk.RevCommit;
  53. import org.eclipse.jgit.storage.file.ReflogReader;
  54. import org.junit.Test;
  55. /**
  56. * Test revert command
  57. */
  58. public class RevertCommandTest extends RepositoryTestCase {
  59. @Test
  60. public void testRevert() throws IOException, JGitInternalException,
  61. GitAPIException {
  62. Git git = new Git(db);
  63. writeTrashFile("a", "first line\nsec. line\nthird line\n");
  64. git.add().addFilepattern("a").call();
  65. git.commit().setMessage("create a").call();
  66. writeTrashFile("b", "content\n");
  67. git.add().addFilepattern("b").call();
  68. git.commit().setMessage("create b").call();
  69. writeTrashFile("a", "first line\nsec. line\nthird line\nfourth line\n");
  70. git.add().addFilepattern("a").call();
  71. git.commit().setMessage("enlarged a").call();
  72. writeTrashFile("a",
  73. "first line\nsecond line\nthird line\nfourth line\n");
  74. git.add().addFilepattern("a").call();
  75. RevCommit fixingA = git.commit().setMessage("fixed a").call();
  76. writeTrashFile("b", "first line\n");
  77. git.add().addFilepattern("b").call();
  78. git.commit().setMessage("fixed b").call();
  79. git.revert().include(fixingA).call();
  80. assertTrue(new File(db.getWorkTree(), "b").exists());
  81. checkFile(new File(db.getWorkTree(), "a"),
  82. "first line\nsec. line\nthird line\nfourth line\n");
  83. Iterator<RevCommit> history = git.log().call().iterator();
  84. RevCommit revertCommit = history.next();
  85. String expectedMessage = "Revert \"fixed a\"\n\n"
  86. + "This reverts commit " + fixingA.getId().getName() + ".\n";
  87. assertEquals(expectedMessage, revertCommit.getFullMessage());
  88. assertEquals("fixed b", history.next().getFullMessage());
  89. assertEquals("fixed a", history.next().getFullMessage());
  90. assertEquals("enlarged a", history.next().getFullMessage());
  91. assertEquals("create b", history.next().getFullMessage());
  92. assertEquals("create a", history.next().getFullMessage());
  93. assertFalse(history.hasNext());
  94. ReflogReader reader = db.getReflogReader(Constants.HEAD);
  95. assertTrue(reader.getLastEntry().getComment()
  96. .startsWith("revert: Revert \""));
  97. reader = db.getReflogReader(db.getBranch());
  98. assertTrue(reader.getLastEntry().getComment()
  99. .startsWith("revert: Revert \""));
  100. }
  101. }