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.

CheckoutTest.java 4.9KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144
  1. /*
  2. * Copyright (C) 2012, IBM Corporation
  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.pgm;
  44. import java.io.File;
  45. import org.eclipse.jgit.api.Git;
  46. import org.eclipse.jgit.lib.CLIRepositoryTestCase;
  47. import org.eclipse.jgit.util.FileUtils;
  48. import org.junit.Assert;
  49. import org.junit.Test;
  50. public class CheckoutTest extends CLIRepositoryTestCase {
  51. @Test
  52. public void testCheckoutSelf() throws Exception {
  53. new Git(db).commit().setMessage("initial commit").call();
  54. assertEquals("Already on 'master'", execute("git checkout master"));
  55. }
  56. @Test
  57. public void testCheckoutBranch() throws Exception {
  58. new Git(db).commit().setMessage("initial commit").call();
  59. new Git(db).branchCreate().setName("side").call();
  60. assertEquals("Switched to branch 'side'", execute("git checkout side"));
  61. }
  62. @Test
  63. public void testCheckoutNewBranch() throws Exception {
  64. new Git(db).commit().setMessage("initial commit").call();
  65. assertEquals("Switched to a new branch 'side'",
  66. execute("git checkout -b side"));
  67. }
  68. @Test
  69. public void testCheckoutNonExistingBranch() throws Exception {
  70. assertEquals(
  71. "error: pathspec 'side' did not match any file(s) known to git.",
  72. execute("git checkout side"));
  73. }
  74. @Test
  75. public void testCheckoutNewBranchThatAlreadyExists() throws Exception {
  76. new Git(db).commit().setMessage("initial commit").call();
  77. assertEquals("fatal: A branch named 'master' already exists.",
  78. execute("git checkout -b master"));
  79. }
  80. @Test
  81. public void testCheckoutNewBranchOnBranchToBeBorn() throws Exception {
  82. assertEquals("fatal: You are on a branch yet to be born",
  83. execute("git checkout -b side"));
  84. }
  85. @Test
  86. public void testCheckoutUnresolvedHead() throws Exception {
  87. assertEquals(
  88. "error: pathspec 'HEAD' did not match any file(s) known to git.",
  89. execute("git checkout HEAD"));
  90. }
  91. @Test
  92. public void testCheckoutHead() throws Exception {
  93. new Git(db).commit().setMessage("initial commit").call();
  94. assertEquals("", execute("git checkout HEAD"));
  95. }
  96. @Test
  97. public void testCheckoutExistingBranchWithConflict() throws Exception {
  98. Git git = new Git(db);
  99. writeTrashFile("a", "Hello world a");
  100. git.add().addFilepattern(".").call();
  101. git.commit().setMessage("commit file a").call();
  102. git.branchCreate().setName("branch_1").call();
  103. git.rm().addFilepattern("a").call();
  104. FileUtils.mkdirs(new File(db.getWorkTree(), "a"));
  105. writeTrashFile("a/b", "Hello world b");
  106. git.add().addFilepattern("a/b").call();
  107. git.commit().setMessage("commit folder a").call();
  108. git.rm().addFilepattern("a").call();
  109. writeTrashFile("a", "New Hello world a");
  110. git.add().addFilepattern(".").call();
  111. String[] execute = execute("git checkout branch_1");
  112. Assert.assertEquals(
  113. "error: Your local changes to the following files would be overwritten by checkout:",
  114. execute[0]);
  115. Assert.assertEquals("\ta", execute[1]);
  116. }
  117. static private void assertEquals(String expected, String[] actual) {
  118. // if there is more than one line, ignore last one if empty
  119. Assert.assertEquals(
  120. 1,
  121. actual.length > 1 && actual[actual.length - 1].equals("") ? actual.length - 1
  122. : actual.length);
  123. Assert.assertEquals(expected, actual[0]);
  124. }
  125. }