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.

CommitTest.java 3.6KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100
  1. /*
  2. * Copyright (C) 2015, Andrey Loskutov <loskutov@gmx.de>
  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 static org.junit.Assert.assertEquals;
  45. import org.eclipse.jgit.lib.CLIRepositoryTestCase;
  46. import org.junit.Test;
  47. public class CommitTest extends CLIRepositoryTestCase {
  48. @Test
  49. public void testCommitPath() throws Exception {
  50. writeTrashFile("a", "a");
  51. writeTrashFile("b", "a");
  52. String result = toString(execute("git add a"));
  53. assertEquals("", result);
  54. result = toString(execute("git status -- a"));
  55. assertEquals(toString("On branch master", "Changes to be committed:",
  56. "new file: a"), result);
  57. result = toString(execute("git status -- b"));
  58. assertEquals(toString("On branch master", "Untracked files:", "b"),
  59. result);
  60. result = toString(execute("git commit a -m 'added a'"));
  61. assertEquals(
  62. "[master 8cb3ef7e5171aaee1792df6302a5a0cd30425f7a] added a",
  63. result);
  64. result = toString(execute("git status -- a"));
  65. assertEquals("On branch master", result);
  66. result = toString(execute("git status -- b"));
  67. assertEquals(toString("On branch master", "Untracked files:", "b"),
  68. result);
  69. }
  70. @Test
  71. public void testCommitAll() throws Exception {
  72. writeTrashFile("a", "a");
  73. writeTrashFile("b", "a");
  74. String result = toString(execute("git add a b"));
  75. assertEquals("", result);
  76. result = toString(execute("git status -- a b"));
  77. assertEquals(toString("On branch master", "Changes to be committed:",
  78. "new file: a", "new file: b"), result);
  79. result = toString(execute("git commit -m 'added a b'"));
  80. assertEquals(
  81. "[master 3c93fa8e3a28ee26690498be78016edcb3a38c73] added a b",
  82. result);
  83. result = toString(execute("git status -- a b"));
  84. assertEquals("On branch master", result);
  85. }
  86. }