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
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
|
/*
* Copyright (C) 2022, Thomas Wolf <thomas.wolf@paranor.ch> and others
*
* This program and the accompanying materials are made available under the
* terms of the Eclipse Distribution License v. 1.0 which is available at
* https://www.eclipse.org/org/documents/edl-v10.php.
*
* SPDX-License-Identifier: BSD-3-Clause
*/
package org.eclipse.jgit.lib;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNotEquals;
import static org.junit.Assert.assertThrows;
import static org.junit.Assert.assertTrue;
import org.eclipse.jgit.errors.ConfigInvalidException;
import org.eclipse.jgit.lib.CommitConfig.CleanupMode;
import org.junit.Test;
public class CommitConfigTest {
@Test
public void testDefaults() throws Exception {
CommitConfig cfg = parse("");
assertEquals("Unexpected clean-up mode", CleanupMode.DEFAULT,
cfg.getCleanupMode());
}
@Test
public void testCommitCleanup() throws Exception {
String[] values = { "strip", "whitespace", "verbatim", "scissors",
"default" };
CleanupMode[] expected = { CleanupMode.STRIP, CleanupMode.WHITESPACE,
CleanupMode.VERBATIM, CleanupMode.SCISSORS,
CleanupMode.DEFAULT };
for (int i = 0; i < values.length; i++) {
CommitConfig cfg = parse("[commit]\n\tcleanup = " + values[i]);
assertEquals("Unexpected clean-up mode", expected[i],
cfg.getCleanupMode());
}
}
@Test
public void testResolve() throws Exception {
String[] values = { "strip", "whitespace", "verbatim", "scissors",
"default" };
CleanupMode[] expected = { CleanupMode.STRIP, CleanupMode.WHITESPACE,
CleanupMode.VERBATIM, CleanupMode.SCISSORS,
CleanupMode.DEFAULT };
for (int i = 0; i < values.length; i++) {
CommitConfig cfg = parse("[commit]\n\tcleanup = " + values[i]);
for (CleanupMode mode : CleanupMode.values()) {
for (int j = 0; j < 2; j++) {
CleanupMode resolved = cfg.resolve(mode, j == 0);
if (mode != CleanupMode.DEFAULT) {
assertEquals("Clean-up mode should be unchanged", mode,
resolved);
} else if (i + 1 < values.length) {
assertEquals("Unexpected clean-up mode", expected[i],
resolved);
} else {
assertEquals("Unexpected clean-up mode",
j == 0 ? CleanupMode.STRIP
: CleanupMode.WHITESPACE,
resolved);
}
}
}
}
}
@Test
public void testCleanDefaultThrows() throws Exception {
assertThrows(IllegalArgumentException.class, () -> CommitConfig
.cleanText("Whatever", CleanupMode.DEFAULT, '#'));
}
@Test
public void testCleanVerbatim() throws Exception {
String message = "\n \nWhatever \n\n\n# A comment\n\nMore\t \n\n\n";
assertEquals("Unexpected message change", message,
CommitConfig.cleanText(message, CleanupMode.VERBATIM, '#'));
}
@Test
public void testCleanWhitespace() throws Exception {
String message = "\n \nWhatever \n\n\n# A comment\n\nMore\t \n\n\n";
assertEquals("Unexpected message change",
"Whatever\n\n# A comment\n\nMore\n",
CommitConfig.cleanText(message, CleanupMode.WHITESPACE, '#'));
}
@Test
public void testCleanStrip() throws Exception {
String message = "\n \nWhatever \n\n\n# A comment\n\nMore\t \n\n\n";
assertEquals("Unexpected message change", "Whatever\n\nMore\n",
CommitConfig.cleanText(message, CleanupMode.STRIP, '#'));
}
@Test
public void testCleanStripCustomChar() throws Exception {
String message = "\n \nWhatever \n\n\n# Not a comment\n\n <A comment\nMore\t \n\n\n";
assertEquals("Unexpected message change",
"Whatever\n\n# Not a comment\n\nMore\n",
CommitConfig.cleanText(message, CleanupMode.STRIP, '<'));
}
@Test
public void testCleanScissors() throws Exception {
String message = "\n \nWhatever \n\n\n# Not a comment\n\n <A comment\nMore\t \n\n\n"
+ "# ------------------------ >8 ------------------------\n"
+ "More\nMore\n";
assertEquals("Unexpected message change",
"Whatever\n\n# Not a comment\n\n <A comment\nMore\n",
CommitConfig.cleanText(message, CleanupMode.SCISSORS, '#'));
}
@Test
public void testCleanScissorsCustomChar() throws Exception {
String message = "\n \nWhatever \n\n\n# Not a comment\n\n <A comment\nMore\t \n\n\n"
+ "< ------------------------ >8 ------------------------\n"
+ "More\nMore\n";
assertEquals("Unexpected message change",
"Whatever\n\n# Not a comment\n\n <A comment\nMore\n",
CommitConfig.cleanText(message, CleanupMode.SCISSORS, '<'));
}
@Test
public void testCleanScissorsAtTop() throws Exception {
String message = "# ------------------------ >8 ------------------------\n"
+ "\n \nWhatever \n\n\n# Not a comment\n\n <A comment\nMore\t \n\n\n"
+ "More\nMore\n";
assertEquals("Unexpected message change", "",
CommitConfig.cleanText(message, CleanupMode.SCISSORS, '#'));
}
@Test
public void testCleanScissorsNoScissor() throws Exception {
String message = "\n \nWhatever \n\n\n# A comment\n\nMore\t \n\n\n";
assertEquals("Unexpected message change",
"Whatever\n\n# A comment\n\nMore\n",
CommitConfig.cleanText(message, CleanupMode.SCISSORS, '#'));
}
@Test
public void testCleanScissorsNoScissor2() throws Exception {
String message = "Text\n"
+ "## ------------------------ >8 ------------------------\n"
+ "More\nMore\n";
assertEquals("Unexpected message change", message,
CommitConfig.cleanText(message, CleanupMode.SCISSORS, '#'));
}
@Test
public void testCleanScissorsNoScissor3() throws Exception {
String message = "Text\n"
// Wrong number of dashes
+ "# ----------------------- >8 ------------------------\n"
+ "More\nMore\n";
assertEquals("Unexpected message change", message,
CommitConfig.cleanText(message, CleanupMode.SCISSORS, '#'));
}
@Test
public void testCleanScissorsAtEnd() throws Exception {
String message = "Text\n"
+ "# ------------------------ >8 ------------------------\n";
assertEquals("Unexpected message change", "Text\n",
CommitConfig.cleanText(message, CleanupMode.SCISSORS, '#'));
}
@Test
public void testCommentCharDefault() throws Exception {
CommitConfig cfg = parse("");
assertEquals('#', cfg.getCommentChar());
assertFalse(cfg.isAutoCommentChar());
}
@Test
public void testCommentCharAuto() throws Exception {
CommitConfig cfg = parse("[core]\n\tcommentChar = auto\n");
assertEquals('#', cfg.getCommentChar());
assertTrue(cfg.isAutoCommentChar());
}
@Test
public void testCommentCharEmpty() throws Exception {
CommitConfig cfg = parse("[core]\n\tcommentChar =\n");
assertEquals('#', cfg.getCommentChar());
}
@Test
public void testCommentCharInvalid() throws Exception {
CommitConfig cfg = parse("[core]\n\tcommentChar = \" \"\n");
assertEquals('#', cfg.getCommentChar());
}
@Test
public void testCommentCharNonAscii() throws Exception {
CommitConfig cfg = parse("[core]\n\tcommentChar = ö\n");
assertEquals('#', cfg.getCommentChar());
}
@Test
public void testCommentChar() throws Exception {
CommitConfig cfg = parse("[core]\n\tcommentChar = _\n");
assertEquals('_', cfg.getCommentChar());
}
@Test
public void testDetermineCommentChar() throws Exception {
String text = "A commit message\n\nBody\n";
assertEquals('#', CommitConfig.determineCommentChar(text));
}
@Test
public void testDetermineCommentChar2() throws Exception {
String text = "A commit message\n\nBody\n\n# Conflicts:\n#\tfoo.txt\n";
char ch = CommitConfig.determineCommentChar(text);
assertNotEquals('#', ch);
assertTrue(ch > ' ' && ch < 127);
}
@Test
public void testDetermineCommentChar3() throws Exception {
String text = "A commit message\n\n;Body\n\n# Conflicts:\n#\tfoo.txt\n";
char ch = CommitConfig.determineCommentChar(text);
assertNotEquals('#', ch);
assertNotEquals(';', ch);
assertTrue(ch > ' ' && ch < 127);
}
@Test
public void testDetermineCommentChar4() throws Exception {
String text = "A commit message\n\nBody\n\n # Conflicts:\n\t #\tfoo.txt\n";
char ch = CommitConfig.determineCommentChar(text);
assertNotEquals('#', ch);
assertTrue(ch > ' ' && ch < 127);
}
@Test
public void testDetermineCommentChar5() throws Exception {
String text = "A commit message\n\nBody\n\n#a\n;b\n@c\n!d\n$\n%\n^\n&\n|\n:";
char ch = CommitConfig.determineCommentChar(text);
assertEquals(0, ch);
}
private static CommitConfig parse(String content)
throws ConfigInvalidException {
Config c = new Config();
c.fromText(content);
return c.get(CommitConfig.KEY);
}
}
|
