123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230 |
- /*
- * Copyright (C) 2010, Robin Stocker <robin@nibor.org>
- * and other copyright owners as documented in the project's IP log.
- *
- * This program and the accompanying materials are made available
- * under the terms of the Eclipse Distribution License v1.0 which
- * accompanies this distribution, is reproduced below, and is
- * available at http://www.eclipse.org/org/documents/edl-v10.php
- *
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or
- * without modification, are permitted provided that the following
- * conditions are met:
- *
- * - Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * - Redistributions in binary form must reproduce the above
- * copyright notice, this list of conditions and the following
- * disclaimer in the documentation and/or other materials provided
- * with the distribution.
- *
- * - Neither the name of the Eclipse Foundation, Inc. nor the
- * names of its contributors may be used to endorse or promote
- * products derived from this software without specific prior
- * written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
- * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
- * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
- * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
- * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
- * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
- * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
- * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
- */
- package org.eclipse.jgit.merge;
-
- import static org.junit.Assert.assertEquals;
-
- import java.io.IOException;
- import java.util.Arrays;
-
- import org.eclipse.jgit.lib.ObjectId;
- import org.eclipse.jgit.lib.ObjectIdRef;
- import org.eclipse.jgit.lib.Ref;
- import org.eclipse.jgit.lib.SymbolicRef;
- import org.eclipse.jgit.lib.Ref.Storage;
- import org.eclipse.jgit.lib.RefUpdate;
- import org.eclipse.jgit.test.resources.SampleDataRepositoryTestCase;
- import org.junit.Before;
- import org.junit.Test;
-
- /**
- * Test construction of merge message by {@link MergeMessageFormatter}.
- */
- public class MergeMessageFormatterTest extends SampleDataRepositoryTestCase {
-
- private MergeMessageFormatter formatter;
-
- @Override
- @Before
- public void setUp() throws Exception {
- super.setUp();
-
- RefUpdate createRemoteRefA = db
- .updateRef("refs/remotes/origin/remote-a");
- createRemoteRefA.setNewObjectId(db.resolve("refs/heads/a"));
- createRemoteRefA.update();
-
- RefUpdate createRemoteRefB = db
- .updateRef("refs/remotes/origin/remote-b");
- createRemoteRefB.setNewObjectId(db.resolve("refs/heads/b"));
- createRemoteRefB.update();
-
- formatter = new MergeMessageFormatter();
- }
-
- @Test
- public void testOneBranch() throws IOException {
- Ref a = db.exactRef("refs/heads/a");
- Ref master = db.exactRef("refs/heads/master");
- String message = formatter.format(Arrays.asList(a), master);
- assertEquals("Merge branch 'a'", message);
- }
-
- @Test
- public void testTwoBranches() throws IOException {
- Ref a = db.exactRef("refs/heads/a");
- Ref b = db.exactRef("refs/heads/b");
- Ref master = db.exactRef("refs/heads/master");
- String message = formatter.format(Arrays.asList(a, b), master);
- assertEquals("Merge branches 'a' and 'b'", message);
- }
-
- @Test
- public void testThreeBranches() throws IOException {
- Ref c = db.exactRef("refs/heads/c");
- Ref b = db.exactRef("refs/heads/b");
- Ref a = db.exactRef("refs/heads/a");
- Ref master = db.exactRef("refs/heads/master");
- String message = formatter.format(Arrays.asList(c, b, a), master);
- assertEquals("Merge branches 'c', 'b' and 'a'", message);
- }
-
- @Test
- public void testRemoteBranch() throws Exception {
- Ref remoteA = db.exactRef("refs/remotes/origin/remote-a");
- Ref master = db.exactRef("refs/heads/master");
- String message = formatter.format(Arrays.asList(remoteA), master);
- assertEquals("Merge remote-tracking branch 'origin/remote-a'", message);
- }
-
- @Test
- public void testMixed() throws IOException {
- Ref c = db.exactRef("refs/heads/c");
- Ref remoteA = db.exactRef("refs/remotes/origin/remote-a");
- Ref master = db.exactRef("refs/heads/master");
- String message = formatter.format(Arrays.asList(c, remoteA), master);
- assertEquals("Merge branch 'c', remote-tracking branch 'origin/remote-a'",
- message);
- }
-
- @Test
- public void testTag() throws IOException {
- Ref tagA = db.exactRef("refs/tags/A");
- Ref master = db.exactRef("refs/heads/master");
- String message = formatter.format(Arrays.asList(tagA), master);
- assertEquals("Merge tag 'A'", message);
- }
-
- @Test
- public void testCommit() throws IOException {
- ObjectId objectId = ObjectId
- .fromString("6db9c2ebf75590eef973081736730a9ea169a0c4");
- Ref commit = new ObjectIdRef.Unpeeled(Storage.LOOSE,
- objectId.getName(), objectId);
- Ref master = db.exactRef("refs/heads/master");
- String message = formatter.format(Arrays.asList(commit), master);
- assertEquals("Merge commit '6db9c2ebf75590eef973081736730a9ea169a0c4'",
- message);
- }
-
- @Test
- public void testPullWithUri() throws IOException {
- String name = "branch 'test' of http://egit.eclipse.org/jgit.git";
- ObjectId objectId = ObjectId
- .fromString("6db9c2ebf75590eef973081736730a9ea169a0c4");
- Ref remoteBranch = new ObjectIdRef.Unpeeled(Storage.LOOSE, name,
- objectId);
- Ref master = db.exactRef("refs/heads/master");
- String message = formatter.format(Arrays.asList(remoteBranch), master);
- assertEquals("Merge branch 'test' of http://egit.eclipse.org/jgit.git",
- message);
- }
-
- @Test
- public void testIntoOtherThanMaster() throws IOException {
- Ref a = db.exactRef("refs/heads/a");
- Ref b = db.exactRef("refs/heads/b");
- String message = formatter.format(Arrays.asList(a), b);
- assertEquals("Merge branch 'a' into b", message);
- }
-
- @Test
- public void testIntoHeadOtherThanMaster() throws IOException {
- Ref a = db.exactRef("refs/heads/a");
- Ref b = db.exactRef("refs/heads/b");
- SymbolicRef head = new SymbolicRef("HEAD", b);
- String message = formatter.format(Arrays.asList(a), head);
- assertEquals("Merge branch 'a' into b", message);
- }
-
- @Test
- public void testIntoSymbolicRefHeadPointingToMaster() throws IOException {
- Ref a = db.exactRef("refs/heads/a");
- Ref master = db.exactRef("refs/heads/master");
- SymbolicRef head = new SymbolicRef("HEAD", master);
- String message = formatter.format(Arrays.asList(a), head);
- assertEquals("Merge branch 'a'", message);
- }
-
- @Test
- public void testFormatWithConflictsNoFooter() {
- String originalMessage = "Header Line\n\nCommit body\n";
- String message = formatter.formatWithConflicts(originalMessage,
- Arrays.asList(new String[] { "path1" }));
- assertEquals("Header Line\n\nCommit body\n\nConflicts:\n\tpath1\n",
- message);
- }
-
- @Test
- public void testFormatWithConflictsNoFooterNoLineBreak() {
- String originalMessage = "Header Line\n\nCommit body";
- String message = formatter.formatWithConflicts(originalMessage,
- Arrays.asList(new String[] { "path1" }));
- assertEquals("Header Line\n\nCommit body\n\nConflicts:\n\tpath1\n",
- message);
- }
-
- @Test
- public void testFormatWithConflictsWithFooters() {
- String originalMessage = "Header Line\n\nCommit body\n\nChangeId:"
- + " I123456789123456789123456789123456789\nBug:1234567\n";
- String message = formatter.formatWithConflicts(originalMessage,
- Arrays.asList(new String[] { "path1" }));
- assertEquals(
- "Header Line\n\nCommit body\n\nConflicts:\n\tpath1\n\n"
- + "ChangeId: I123456789123456789123456789123456789\nBug:1234567\n",
- message);
- }
-
- @Test
- public void testFormatWithConflictsWithFooterlikeLineInBody() {
- String originalMessage = "Header Line\n\nCommit body\nBug:1234567\nMore Body\n\nChangeId:"
- + " I123456789123456789123456789123456789\nBug:1234567\n";
- String message = formatter.formatWithConflicts(originalMessage,
- Arrays.asList(new String[] { "path1" }));
- assertEquals(
- "Header Line\n\nCommit body\nBug:1234567\nMore Body\n\nConflicts:\n\tpath1\n\n"
- + "ChangeId: I123456789123456789123456789123456789\nBug:1234567\n",
- message);
- }
- }
|