1 /*
2 * #%L
3 * JavaHg
4 * %%
5 * Copyright (C) 2011 aragost Trifork ag
6 * %%
7 * Permission is hereby granted, free of charge, to any person obtaining a copy
8 * of this software and associated documentation files (the "Software"), to deal
9 * in the Software without restriction, including without limitation the rights
10 * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
11 * copies of the Software, and to permit persons to whom the Software is
12 * furnished to do so, subject to the following conditions:
13 *
14 * The above copyright notice and this permission notice shall be included in
15 * all copies or substantial portions of the Software.
16 *
17 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
18 * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
19 * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
20 * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
21 * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
22 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
23 * THE SOFTWARE.
24 * #L%
25 */
26 package com.aragost.javahg.commands;
27
28 import java.io.IOException;
29 import java.util.List;
30
31 import org.junit.Assert;
32 import org.junit.Test;
33
34 import com.aragost.javahg.Changeset;
35 import com.aragost.javahg.Repository;
36 import com.aragost.javahg.test.AbstractTestCase;
37
38 public class ResolveCommandTest extends AbstractTestCase {
39
40 @Test
41 public void test() throws IOException {
42 Repository repo = getTestRepository();
43 writeFile("a", "a");
44 writeFile("b", "b");
45 writeFile("c", "c");
46 Changeset csBase = commit();
47 writeFile("a", "A");
48 writeFile("b", "B");
49 commit();
50 update(csBase);
51 writeFile("a", "1");
52 writeFile("b", "2");
53 commit();
54
55 MergeCommand.on(repo).execute(new ManifestMergeOracle());
56 ResolveCommand resolveCommand = ResolveCommand.on(repo);
57
58 List<ResolveStatusLine> list = resolveCommand.list();
59 Assert.assertEquals(2, list.size());
60
61 resolveCommand.mark("b");
62 list = resolveCommand.list();
63 Assert.assertEquals(2, list.size());
64 Assert.assertEquals("a", list.get(0).getFileName());
65 Assert.assertEquals("b", list.get(1).getFileName());
66 Assert.assertEquals(ResolveStatusLine.Type.UNRESOLVED, list.get(0).getType());
67 Assert.assertEquals(ResolveStatusLine.Type.RESOLVED, list.get(1).getType());
68
69 }
70 }