1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
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 }