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.

MergeMessageFormatterTest.java 6.0KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169
  1. /*
  2. * Copyright (C) 2010, Robin Stocker <robin@nibor.org>
  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.merge;
  44. import static org.junit.Assert.assertEquals;
  45. import java.io.IOException;
  46. import java.util.Arrays;
  47. import org.eclipse.jgit.lib.ObjectId;
  48. import org.eclipse.jgit.lib.ObjectIdRef;
  49. import org.eclipse.jgit.lib.Ref;
  50. import org.eclipse.jgit.lib.Ref.Storage;
  51. import org.eclipse.jgit.lib.RefUpdate;
  52. import org.eclipse.jgit.lib.SampleDataRepositoryTestCase;
  53. import org.junit.Before;
  54. import org.junit.Test;
  55. /**
  56. * Test construction of merge message by {@link MergeMessageFormatter}.
  57. */
  58. public class MergeMessageFormatterTest extends SampleDataRepositoryTestCase {
  59. private MergeMessageFormatter formatter;
  60. @Override
  61. @Before
  62. public void setUp() throws Exception {
  63. super.setUp();
  64. RefUpdate createRemoteRefA = db
  65. .updateRef("refs/remotes/origin/remote-a");
  66. createRemoteRefA.setNewObjectId(db.resolve("refs/heads/a"));
  67. createRemoteRefA.update();
  68. RefUpdate createRemoteRefB = db
  69. .updateRef("refs/remotes/origin/remote-b");
  70. createRemoteRefB.setNewObjectId(db.resolve("refs/heads/b"));
  71. createRemoteRefB.update();
  72. formatter = new MergeMessageFormatter();
  73. }
  74. @Test
  75. public void testOneBranch() throws IOException {
  76. Ref a = db.getRef("refs/heads/a");
  77. Ref master = db.getRef("refs/heads/master");
  78. String message = formatter.format(Arrays.asList(a), master);
  79. assertEquals("Merge branch 'a'", message);
  80. }
  81. @Test
  82. public void testTwoBranches() throws IOException {
  83. Ref a = db.getRef("refs/heads/a");
  84. Ref b = db.getRef("refs/heads/b");
  85. Ref master = db.getRef("refs/heads/master");
  86. String message = formatter.format(Arrays.asList(a, b), master);
  87. assertEquals("Merge branches 'a' and 'b'", message);
  88. }
  89. @Test
  90. public void testThreeBranches() throws IOException {
  91. Ref c = db.getRef("refs/heads/c");
  92. Ref b = db.getRef("refs/heads/b");
  93. Ref a = db.getRef("refs/heads/a");
  94. Ref master = db.getRef("refs/heads/master");
  95. String message = formatter.format(Arrays.asList(c, b, a), master);
  96. assertEquals("Merge branches 'c', 'b' and 'a'", message);
  97. }
  98. @Test
  99. public void testRemoteBranch() throws Exception {
  100. Ref remoteA = db.getRef("refs/remotes/origin/remote-a");
  101. Ref master = db.getRef("refs/heads/master");
  102. String message = formatter.format(Arrays.asList(remoteA), master);
  103. assertEquals("Merge remote branch 'origin/remote-a'", message);
  104. }
  105. @Test
  106. public void testMixed() throws IOException {
  107. Ref c = db.getRef("refs/heads/c");
  108. Ref remoteA = db.getRef("refs/remotes/origin/remote-a");
  109. Ref master = db.getRef("refs/heads/master");
  110. String message = formatter.format(Arrays.asList(c, remoteA), master);
  111. assertEquals("Merge branch 'c', remote branch 'origin/remote-a'",
  112. message);
  113. }
  114. @Test
  115. public void testTag() throws IOException {
  116. Ref tagA = db.getRef("refs/tags/A");
  117. Ref master = db.getRef("refs/heads/master");
  118. String message = formatter.format(Arrays.asList(tagA), master);
  119. assertEquals("Merge tag 'A'", message);
  120. }
  121. @Test
  122. public void testCommit() throws IOException {
  123. ObjectId objectId = ObjectId
  124. .fromString("6db9c2ebf75590eef973081736730a9ea169a0c4");
  125. Ref commit = new ObjectIdRef.Unpeeled(Storage.LOOSE,
  126. objectId.getName(), objectId);
  127. Ref master = db.getRef("refs/heads/master");
  128. String message = formatter.format(Arrays.asList(commit), master);
  129. assertEquals("Merge commit '6db9c2ebf75590eef973081736730a9ea169a0c4'",
  130. message);
  131. }
  132. @Test
  133. public void testPullWithUri() throws IOException {
  134. String name = "branch 'test' of http://egit.eclipse.org/jgit.git";
  135. ObjectId objectId = ObjectId
  136. .fromString("6db9c2ebf75590eef973081736730a9ea169a0c4");
  137. Ref remoteBranch = new ObjectIdRef.Unpeeled(Storage.LOOSE, name,
  138. objectId);
  139. Ref master = db.getRef("refs/heads/master");
  140. String message = formatter.format(Arrays.asList(remoteBranch), master);
  141. assertEquals("Merge branch 'test' of http://egit.eclipse.org/jgit.git",
  142. message);
  143. }
  144. @Test
  145. public void testIntoOtherThanMaster() throws IOException {
  146. Ref a = db.getRef("refs/heads/a");
  147. Ref b = db.getRef("refs/heads/b");
  148. String message = formatter.format(Arrays.asList(a), b);
  149. assertEquals("Merge branch 'a' into b", message);
  150. }
  151. }