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
|
/*
* Copyright (C) 2008-2009, Google Inc. 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.patch;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
import java.io.IOException;
import java.io.InputStream;
import org.eclipse.jgit.junit.JGitTestUtil;
import org.junit.Test;
public class PatchErrorTest {
@Test
public void testError_DisconnectedHunk() throws IOException {
final Patch p = parseTestPatchFile();
assertEquals(1, p.getFiles().size());
{
final FileHeader fh = p.getFiles().get(0);
assertEquals(
"org.eclipse.jgit/src/org/spearce/jgit/lib/RepositoryConfig.java",
fh.getNewPath());
assertEquals(1, fh.getHunks().size());
}
assertEquals(1, p.getErrors().size());
final FormatError e = p.getErrors().get(0);
assertSame(FormatError.Severity.ERROR, e.getSeverity());
assertEquals("Hunk disconnected from file", e.getMessage());
assertEquals(18, e.getOffset());
assertTrue(e.getLineText().startsWith("@@ -109,4 +109,11 @@ assert"));
}
@Test
public void testError_TruncatedOld() throws IOException {
final Patch p = parseTestPatchFile();
assertEquals(1, p.getFiles().size());
assertEquals(1, p.getErrors().size());
final FormatError e = p.getErrors().get(0);
assertSame(FormatError.Severity.ERROR, e.getSeverity());
assertEquals("Truncated hunk, at least 1 old lines is missing", e
.getMessage());
assertEquals(313, e.getOffset());
assertTrue(e.getLineText().startsWith("@@ -236,9 +236,9 @@ protected "));
}
@Test
public void testError_TruncatedNew() throws IOException {
final Patch p = parseTestPatchFile();
assertEquals(1, p.getFiles().size());
assertEquals(1, p.getErrors().size());
final FormatError e = p.getErrors().get(0);
assertSame(FormatError.Severity.ERROR, e.getSeverity());
assertEquals("Truncated hunk, at least 1 new lines is missing", e
.getMessage());
assertEquals(313, e.getOffset());
assertTrue(e.getLineText().startsWith("@@ -236,9 +236,9 @@ protected "));
}
@Test
public void testError_BodyTooLong() throws IOException {
final Patch p = parseTestPatchFile();
assertEquals(1, p.getFiles().size());
assertEquals(1, p.getErrors().size());
final FormatError e = p.getErrors().get(0);
assertSame(FormatError.Severity.WARNING, e.getSeverity());
assertEquals("Hunk header 4:11 does not match body line count of 4:12",
e.getMessage());
assertEquals(349, e.getOffset());
assertTrue(e.getLineText().startsWith("@@ -109,4 +109,11 @@ assert"));
}
@Test
public void testError_GarbageBetweenFiles() throws IOException {
final Patch p = parseTestPatchFile();
assertEquals(2, p.getFiles().size());
{
final FileHeader fh = p.getFiles().get(0);
assertEquals(
"org.eclipse.jgit.test/tst/org/spearce/jgit/lib/RepositoryConfigTest.java",
fh.getNewPath());
assertEquals(1, fh.getHunks().size());
}
{
final FileHeader fh = p.getFiles().get(1);
assertEquals(
"org.eclipse.jgit/src/org/spearce/jgit/lib/RepositoryConfig.java",
fh.getNewPath());
assertEquals(1, fh.getHunks().size());
}
assertEquals(1, p.getErrors().size());
final FormatError e = p.getErrors().get(0);
assertSame(FormatError.Severity.WARNING, e.getSeverity());
assertEquals("Unexpected hunk trailer", e.getMessage());
assertEquals(926, e.getOffset());
assertEquals("I AM NOT HERE\n", e.getLineText());
}
@Test
public void testError_GitBinaryNoForwardHunk() throws IOException {
final Patch p = parseTestPatchFile();
assertEquals(2, p.getFiles().size());
{
final FileHeader fh = p.getFiles().get(0);
assertEquals("org.spearce.egit.ui/icons/toolbar/fetchd.png", fh
.getNewPath());
assertSame(FileHeader.PatchType.GIT_BINARY, fh.getPatchType());
assertTrue(fh.getHunks().isEmpty());
assertNull(fh.getForwardBinaryHunk());
}
{
final FileHeader fh = p.getFiles().get(1);
assertEquals("org.spearce.egit.ui/icons/toolbar/fetche.png", fh
.getNewPath());
assertSame(FileHeader.PatchType.UNIFIED, fh.getPatchType());
assertTrue(fh.getHunks().isEmpty());
assertNull(fh.getForwardBinaryHunk());
}
assertEquals(1, p.getErrors().size());
final FormatError e = p.getErrors().get(0);
assertSame(FormatError.Severity.ERROR, e.getSeverity());
assertEquals("Missing forward-image in GIT binary patch", e
.getMessage());
assertEquals(297, e.getOffset());
assertEquals("\n", e.getLineText());
}
private Patch parseTestPatchFile() throws IOException {
final String patchFile = JGitTestUtil.getName() + ".patch";
try (InputStream in = getClass().getResourceAsStream(patchFile)) {
if (in == null) {
fail("No " + patchFile + " test vector");
return null; // Never happens
}
final Patch p = new Patch();
p.parse(in);
return p;
}
}
}
|
