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
|
/*
* Copyright (C) 2022, Matthias Sohn <matthias.sohn@sap.com> 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.pgm;
import static org.junit.Assert.assertEquals;
import org.eclipse.jgit.lib.CLIRepositoryTestCase;
import org.junit.Before;
import org.junit.Test;
public class DiffTest extends CLIRepositoryTestCase {
private static final String NO_NEWLINE = "\\ No newline at end of file";
@Before
public void setup() throws Exception {
writeTrashFile("a", "a");
execute("git add a");
execute("git commit -m added");
}
@Test
public void testDiffCommitNewFile() throws Exception {
writeTrashFile("a1", "a");
String result = toString(execute("git diff"));
assertEquals(
toString("diff --git a/a1 b/a1", "new file mode 100644",
"index 0000000..2e65efe", "--- /dev/null", "+++ b/a1",
"@@ -0,0 +1 @@", "+a", NO_NEWLINE),
result);
}
@Test
public void testDiffCommitModifiedFile() throws Exception {
writeTrashFile("a", "a1");
String result = toString(execute("git diff"));
assertEquals(
toString("diff --git a/a b/a", "index 2e65efe..59ef8d1 100644",
"--- a/a", "+++ b/a", "@@ -1 +1 @@",
"-a", NO_NEWLINE, "+a1", NO_NEWLINE),
result);
}
@Test
public void testDiffCommitModifiedFileNameOnly() throws Exception {
writeTrashFile("a", "a1");
writeTrashFile("b", "b");
String result = toString(execute("git diff --name-only"));
assertEquals(toString("a", "b"), result);
}
@Test
public void testDiffCommitModifiedFileNameStatus() throws Exception {
writeTrashFile("a", "a1");
writeTrashFile("b", "b");
String result = toString(execute("git diff --name-status"));
assertEquals(toString("M\ta", "A\tb"), result);
}
}
|
