View Javadoc
1   /*
2    * Copyright (C) 2009, Google Inc.
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  
44  package org.eclipse.jgit.revwalk;
45  
46  import static org.junit.Assert.assertNull;
47  import static org.junit.Assert.fail;
48  
49  import org.eclipse.jgit.revwalk.filter.RevFilter;
50  import org.eclipse.jgit.treewalk.filter.TreeFilter;
51  import org.junit.Test;
52  
53  public class RevWalkMergeBaseTest extends RevWalkTestCase {
54  	@Test
55  	public void testNone() throws Exception {
56  		final RevCommit c1 = commit(commit(commit()));
57  		final RevCommit c2 = commit(commit(commit()));
58  
59  		rw.setRevFilter(RevFilter.MERGE_BASE);
60  		markStart(c1);
61  		markStart(c2);
62  		assertNull(rw.next());
63  	}
64  
65  	@Test
66  	public void testDisallowTreeFilter() throws Exception {
67  		final RevCommit c1 = commit();
68  		final RevCommit c2 = commit();
69  
70  		rw.setRevFilter(RevFilter.MERGE_BASE);
71  		rw.setTreeFilter(TreeFilter.ANY_DIFF);
72  		markStart(c1);
73  		markStart(c2);
74  		try {
75  			assertNull(rw.next());
76  			fail("did not throw IllegalStateException");
77  		} catch (IllegalStateException ise) {
78  			// expected result
79  		}
80  	}
81  
82  	@Test
83  	public void testSimple() throws Exception {
84  		final RevCommit a = commit();
85  		final RevCommit b = commit(a);
86  		final RevCommit c1 = commit(commit(commit(commit(commit(b)))));
87  		final RevCommit c2 = commit(commit(commit(commit(commit(b)))));
88  
89  		rw.setRevFilter(RevFilter.MERGE_BASE);
90  		markStart(c1);
91  		markStart(c2);
92  		assertCommit(b, rw.next());
93  		assertNull(rw.next());
94  	}
95  
96  	@Test
97  	public void testMultipleHeads_SameBase1() throws Exception {
98  		final RevCommit a = commit();
99  		final RevCommit b = commit(a);
100 		final RevCommit c1 = commit(commit(commit(commit(commit(b)))));
101 		final RevCommit c2 = commit(commit(commit(commit(commit(b)))));
102 		final RevCommit c3 = commit(commit(commit(b)));
103 
104 		rw.setRevFilter(RevFilter.MERGE_BASE);
105 		markStart(c1);
106 		markStart(c2);
107 		markStart(c3);
108 		assertCommit(b, rw.next());
109 		assertNull(rw.next());
110 	}
111 
112 	@Test
113 	public void testMultipleHeads_SameBase2() throws Exception {
114 		final RevCommit a = commit();
115 		final RevCommit b = commit(a);
116 		final RevCommit c = commit(b);
117 		final RevCommit d1 = commit(commit(commit(commit(commit(b)))));
118 		final RevCommit d2 = commit(commit(commit(commit(commit(c)))));
119 		final RevCommit d3 = commit(commit(commit(c)));
120 
121 		rw.setRevFilter(RevFilter.MERGE_BASE);
122 		markStart(d1);
123 		markStart(d2);
124 		markStart(d3);
125 		assertCommit(b, rw.next());
126 		assertNull(rw.next());
127 	}
128 
129 	@Test
130 	public void testCrissCross() throws Exception {
131 		// See http://marc.info/?l=git&m=111463358500362&w=2 for a nice
132 		// description of what this test is creating. We don't have a
133 		// clean merge base for d,e as they each merged the parents b,c
134 		// in different orders.
135 		//
136 		final RevCommit a = commit();
137 		final RevCommit b = commit(a);
138 		final RevCommit c = commit(a);
139 		final RevCommit d = commit(b, c);
140 		final RevCommit e = commit(c, b);
141 
142 		rw.setRevFilter(RevFilter.MERGE_BASE);
143 		markStart(d);
144 		markStart(e);
145 		assertCommit(c, rw.next());
146 		assertCommit(b, rw.next());
147 		assertNull(rw.next());
148 	}
149 }