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
|
/*
* Copyright (C) 2018, 2020 Salesforce. 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 java.nio.charset.StandardCharsets.US_ASCII;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertThrows;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.text.MessageFormat;
import org.eclipse.jgit.internal.JGitText;
import org.junit.Test;
public class CommitBuilderTest {
// @formatter:off
private static final String SIGNATURE = "-----BEGIN PGP SIGNATURE-----\n" +
"Version: BCPG v1.60\n" +
"\n" +
"iQEcBAABCAAGBQJb9cVhAAoJEKX+6Axg/6TZeFsH/0CY0WX/z7U8+7S5giFX4wH4\n" +
"opvBwqyt6OX8lgNwTwBGHFNt8LdmDCCmKoq/XwkNi3ARVjLhe3gBcKXNoavvPk2Z\n" +
"gIg5ChevGkU4afWCOMLVEYnkCBGw2+86XhrK1P7gTHEk1Rd+Yv1ZRDJBY+fFO7yz\n" +
"uSBuF5RpEY2sJiIvp27Gub/rY3B5NTR/feO/z+b9oiP/fMUhpRwG5KuWUsn9NPjw\n" +
"3tvbgawYpU/2UnS+xnavMY4t2fjRYjsoxndPLb2MUX8X7vC7FgWLBlmI/rquLZVM\n" +
"IQEKkjnA+lhejjK1rv+ulq4kGZJFKGYWYYhRDwFg5PTkzhudhN2SGUq5Wxq1Eg4=\n" +
"=b9OI\n" +
"-----END PGP SIGNATURE-----";
private static final String EXPECTED = "-----BEGIN PGP SIGNATURE-----\n" +
" Version: BCPG v1.60\n" +
" \n" +
" iQEcBAABCAAGBQJb9cVhAAoJEKX+6Axg/6TZeFsH/0CY0WX/z7U8+7S5giFX4wH4\n" +
" opvBwqyt6OX8lgNwTwBGHFNt8LdmDCCmKoq/XwkNi3ARVjLhe3gBcKXNoavvPk2Z\n" +
" gIg5ChevGkU4afWCOMLVEYnkCBGw2+86XhrK1P7gTHEk1Rd+Yv1ZRDJBY+fFO7yz\n" +
" uSBuF5RpEY2sJiIvp27Gub/rY3B5NTR/feO/z+b9oiP/fMUhpRwG5KuWUsn9NPjw\n" +
" 3tvbgawYpU/2UnS+xnavMY4t2fjRYjsoxndPLb2MUX8X7vC7FgWLBlmI/rquLZVM\n" +
" IQEKkjnA+lhejjK1rv+ulq4kGZJFKGYWYYhRDwFg5PTkzhudhN2SGUq5Wxq1Eg4=\n" +
" =b9OI\n" +
" -----END PGP SIGNATURE-----";
// @formatter:on
private void assertGpgSignatureStringOutcome(String signature,
String expectedOutcome) throws IOException {
ByteArrayOutputStream out = new ByteArrayOutputStream();
ObjectBuilder.writeMultiLineHeader(signature, out, true);
String formatted_signature = new String(out.toByteArray(), US_ASCII);
assertEquals(expectedOutcome, formatted_signature);
}
@Test
public void writeGpgSignatureString() throws Exception {
assertGpgSignatureStringOutcome(SIGNATURE, EXPECTED);
}
@Test
public void writeGpgSignatureStringTrailingLF() throws Exception {
assertGpgSignatureStringOutcome(SIGNATURE + '\n', EXPECTED);
}
@Test
public void writeGpgSignatureStringCRLF() throws Exception {
assertGpgSignatureStringOutcome(SIGNATURE.replaceAll("\n", "\r\n"),
EXPECTED);
}
@Test
public void writeGpgSignatureStringTrailingCRLF() throws Exception {
assertGpgSignatureStringOutcome(
SIGNATURE.replaceAll("\n", "\r\n") + "\r\n", EXPECTED);
}
@Test
public void writeGpgSignatureString_failsForNonAscii() throws Exception {
String signature = "Ü Ä";
IllegalArgumentException e = assertThrows(
IllegalArgumentException.class,
() -> ObjectBuilder.writeMultiLineHeader(signature,
new ByteArrayOutputStream(), true));
String message = MessageFormat.format(JGitText.get().notASCIIString,
signature);
assertEquals(message, e.getMessage());
}
@Test
public void writeGpgSignatureString_oneLineNotModified() throws Exception {
String signature = " A string ";
String expectedOutcome = signature;
assertGpgSignatureStringOutcome(signature, expectedOutcome);
}
@Test
public void writeGpgSignatureString_preservesRandomWhitespace()
throws Exception {
// @formatter:off
String signature = " String with \n"
+ "Line 2\n"
+ " Line 3\n"
+ "Line 4 \n"
+ " Line 5 ";
String expectedOutcome = " String with \n"
+ " Line 2\n"
+ " Line 3\n"
+ " Line 4 \n"
+ " Line 5 ";
// @formatter:on
assertGpgSignatureStringOutcome(signature, expectedOutcome);
}
@Test
public void writeGpgSignatureString_replaceCR() throws Exception {
// @formatter:off
String signature = "String with \r"
+ "Line 2\r"
+ "Line 3\r"
+ "Line 4\r"
+ "Line 5";
String expectedOutcome = "String with \n"
+ " Line 2\n"
+ " Line 3\n"
+ " Line 4\n"
+ " Line 5";
// @formatter:on
assertGpgSignatureStringOutcome(signature, expectedOutcome);
}
@Test
public void writeGpgSignatureString_replaceCRLF() throws Exception {
// @formatter:off
String signature = "String with \r\n"
+ "Line 2\r\n"
+ "Line 3\r\n"
+ "Line 4\r\n"
+ "Line 5";
String expectedOutcome = "String with \n"
+ " Line 2\n"
+ " Line 3\n"
+ " Line 4\n"
+ " Line 5";
// @formatter:on
assertGpgSignatureStringOutcome(signature, expectedOutcome);
}
@Test
public void writeGpgSignatureString_replaceCRLFMixed() throws Exception {
// @formatter:off
String signature = "String with \r"
+ "Line 2\r\n"
+ "Line 3\r"
+ "Line 4\r\n"
+ "Line 5";
String expectedOutcome = "String with \n"
+ " Line 2\n"
+ " Line 3\n"
+ " Line 4\n"
+ " Line 5";
// @formatter:on
assertGpgSignatureStringOutcome(signature, expectedOutcome);
}
@Test
public void setGpgSignature() throws Exception {
GpgSignature dummy = new GpgSignature(new byte[0]);
CommitBuilder builder = new CommitBuilder();
assertNull(builder.getGpgSignature());
builder.setGpgSignature(dummy);
assertSame(dummy, builder.getGpgSignature());
builder.setGpgSignature(null);
assertNull(builder.getGpgSignature());
}
}
|
