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
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
|
package com.intellij.vcs.log.data;
import com.intellij.util.ArrayUtil;
import com.intellij.util.Function;
import com.intellij.util.containers.ContainerUtil;
import com.intellij.vcs.log.Hash;
import com.intellij.vcs.log.TimedCommitParser;
import com.intellij.vcs.log.TimedVcsCommit;
import com.intellij.vcs.log.impl.HashImpl;
import org.junit.Test;
import java.util.Collection;
import java.util.List;
import static java.util.Arrays.asList;
import static org.junit.Assert.assertEquals;
/**
* @author Kirill Likhodedov
*/
public class VcsLogJoinerTest {
public void runTest(List<String> initial, List<String> updateBlock, List<String> oldRefs, List<String> newRefs, String expected) {
List<TimedVcsCommit> savedLog = TimedCommitParser.log(ArrayUtil.toStringArray(initial));
List<? extends TimedVcsCommit> firstBlock = TimedCommitParser.log(ArrayUtil.toStringArray(updateBlock));
Collection<Hash> vcsOldRefs = ContainerUtil.map(oldRefs, new Function<String, Hash>() {
@Override
public Hash fun(String s) {
return HashImpl.build(s);
}
});
Collection<Hash> vcsNewRefs = ContainerUtil.map(newRefs, new Function<String, Hash>() {
@Override
public Hash fun(String s) {
return HashImpl.build(s);
}
});
List<? extends TimedVcsCommit> result = new VcsLogJoiner<Hash, TimedVcsCommit>().addCommits(savedLog, vcsOldRefs, firstBlock, vcsNewRefs).getFirst();
assertEquals(expected, toStr(result));
}
@Test
public void simpleTest() {
runTest(
asList("4|-a2|-a1", "3|-b1|-a", "2|-a1|-a", "1|-a|-"),
asList("5|-f|-b1", "6|-e|-a2"),
asList("a2", "b1"),
asList("f", "e"),
"e, f, a2, b1, a1, a"
);
}
@Test
public void oneNodeTest() {
runTest(
asList("3|-a1|-"),
asList("3|-a1|-"),
asList("a1"),
asList("a1"),
"a1"
);
}
@Test
public void oneNodeResetTest() {
runTest(
asList("3|-a1|-a2", "2|-a2|-"),
asList("2|-a2|-"),
asList("a2", "a1"),
asList("a2"),
"a2"
);
}
@Test
public void oneNodeReset2Test() {
runTest(
asList("3|-a1|-a2", "2|-a2|-"),
asList("2|-a2|-"),
asList("a1"),
asList("a2"),
"a2"
);
}
@Test
public void simpleRemoveCommitsTest() {
runTest(
asList("4|-a2|-a1", "3|-b1|-a", "2|-a1|-a", "1|-a|-"),
asList("5|-f|-b1", "6|-e|-a1"),
asList("a2"),
asList("f", "e"),
"e, f, b1, a1, a"
);
}
@Test
public void removeCommitsTest() {
runTest(
asList("5|-a5|-a4", "4|-a4|-a2 a3", "3|-a3|-a1", "2|-a2|-a1", "1|-a1|-"),
asList("6|-a6|-a3"),
asList("a5"),
asList("a6"),
"a6, a3, a1"
);
}
@Test
public void removeCommitsTest2() {
runTest(
asList("2|-a2|-a1", "1|-a1|-"),
asList("5|-a5|-a4", "3|-a3|-a2", "4|-a4|-a3"),
asList("a2"),
asList("a5"),
"a5, a4, a3, a2, a1"
);
}
@Test
public void removeCommitsTest3() {
runTest(
asList("3|-a3|-a2", "2|-a2|-a1", "1|-a1|-"),
asList("2|-a2|-a1"),
asList("a3"),
asList("a2"),
"a2, a1"
);
}
private static String toStr(List<? extends TimedVcsCommit> commits) {
StringBuilder s = new StringBuilder();
for (TimedVcsCommit commit : commits) {
if (s.length() != 0) {
s.append(", ");
}
s.append(commit.getId().asString());
}
return s.toString();
}
}
|
