org.spearce.jgit.test/tst/org/spearce/jgit/merge/SimpleMergeTest.java

   1 /*
   2  * Copyright (C) 2008, Robin Rosenberg
   3  *
   4  * All rights reserved.
   5  *
   6  * Redistribution and use in source and binary forms, with or
   7  * without modification, are permitted provided that the following
   8  * conditions are met:
   9  *
  10  * - Redistributions of source code must retain the above copyright
  11  *   notice, this list of conditions and the following disclaimer.
  12  *
  13  * - Redistributions in binary form must reproduce the above
  14  *   copyright notice, this list of conditions and the following
  15  *   disclaimer in the documentation and/or other materials provided
  16  *   with the distribution.
  17  *
  18  * - Neither the name of the Git Development Community nor the
  19  *   names of its contributors may be used to endorse or promote
  20  *   products derived from this software without specific prior
  21  *   written permission.
  22  *
  23  * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND
  24  * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES,
  25  * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
  26  * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  27  * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR
  28  * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
  29  * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
  30  * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
  31  * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
  32  * CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
  33  * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  34  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
  35  * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  36  */
  37 package org.spearce.jgit.merge;
  38
  39 import java.io.IOException;
  40
  41 import org.spearce.jgit.lib.ObjectId;
  42 import org.spearce.jgit.lib.RepositoryTestCase;
  43
  44 public class SimpleMergeTest extends RepositoryTestCase {
  45
  46         public void testOurs() throws IOException {
  47                 Merger ourMerger = MergeStrategy.OURS.newMerger(db);
  48                 boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a"), db.resolve("c") });
  49                 assertTrue(merge);
  50                 assertEquals(db.mapTree("a").getId(), ourMerger.getResultTreeId());
  51         }
  52
  53         public void testTheirs() throws IOException {
  54                 Merger ourMerger = MergeStrategy.THEIRS.newMerger(db);
  55                 boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a"), db.resolve("c") });
  56                 assertTrue(merge);
  57                 assertEquals(db.mapTree("c").getId(), ourMerger.getResultTreeId());
  58         }
  59
  60         public void testTrivialTwoWay() throws IOException {
  61                 Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
  62                 boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a"), db.resolve("c") });
  63                 assertTrue(merge);
  64                 assertEquals("02ba32d3649e510002c21651936b7077aa75ffa9",ourMerger.getResultTreeId().name());
  65         }
  66
  67         public void testTrivialTwoWay_disjointhistories() throws IOException {
  68                 Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
  69                 boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a"), db.resolve("c~4") });
  70                 assertTrue(merge);
  71                 assertEquals("86265c33b19b2be71bdd7b8cb95823f2743d03a8",ourMerger.getResultTreeId().name());
  72         }
  73
  74         public void testTrivialTwoWay_ok() throws IOException {
  75                 Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
  76                 boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("a^0^0^0"), db.resolve("a^0^0^1") });
  77                 assertTrue(merge);
  78                 assertEquals(db.mapTree("a^0^0").getId(), ourMerger.getResultTreeId());
  79         }
  80
  81         public void testTrivialTwoWay_conflict() throws IOException {
  82                 Merger ourMerger = MergeStrategy.SIMPLE_TWO_WAY_IN_CORE.newMerger(db);
  83                 boolean merge = ourMerger.merge(new ObjectId[] { db.resolve("f"), db.resolve("g") });
  84                 assertFalse(merge);
  85         }
  86 }