Skip to content

Commit 631db18

Browse files
committed
Now tests Diff using an array.
1 parent 4dabe71 commit 631db18

File tree

2 files changed

+24
-13
lines changed

2 files changed

+24
-13
lines changed

src/test/java/org/gitlab4j/api/TestGitLabApiBeans.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,8 +127,8 @@ public void testCompareResults() throws Exception {
127127

128128
@Test
129129
public void testDiff() throws Exception {
130-
Diff diff = unmarshalResource(Diff.class, "diff.json");
131-
assertTrue(compareJson(diff, "diff.json"));
130+
List<Diff> diffs = unmarshalResourceList(Diff.class, "diff.json");
131+
assertTrue(compareJson(diffs, "diff.json"));
132132
}
133133

134134
@Test
Lines changed: 22 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,22 @@
1-
{
2-
"diff": "--- a/doc/update/5.4-to-6.0.html\n+++ b/doc/update/5.4-to-6.0.html\n@@ -71,6 +71,8 @@\n sudo -u git -H bundle exec rake migrate_keys RAILS_ENV=production\n sudo -u git -H bundle exec rake migrate_inline_notes RAILS_ENV=production\n \n+sudo -u git -H bundle exec rake assets:precompile RAILS_ENV=production\n+\n ```\n \n ### 6. Update config files",
3-
"new_path": "doc/update/5.4-to-6.0.html",
4-
"old_path": "doc/update/5.4-to-6.0.html",
5-
"a_mode": null,
6-
"b_mode": "100644",
7-
"new_file": false,
8-
"renamed_file": false,
9-
"deleted_file": false
10-
}
11-
1+
[
2+
{
3+
"old_path":"core/src/main/java/codereview/service/data/XxxDAO.java",
4+
"new_path":"core/src/main/java/codereview/service/data/XxxDAO.java",
5+
"a_mode":"100644",
6+
"b_mode":"100644",
7+
"new_file":false,
8+
"renamed_file":false,
9+
"deleted_file":false,
10+
"diff":"@@ -114,5 +114,13 @@ diff content here \n"
11+
},
12+
13+
{ "old_path":"core/src/main/java/codereview/service/data/XxxService.java",
14+
"new_path":"core/src/main/java/codereview/service/data/XxxService.java",
15+
"a_mode":"100644",
16+
"b_mode":"100644",
17+
"new_file":false,
18+
"renamed_file":false,
19+
"deleted_file":false,
20+
"diff":"@@ -5,6 +5,7 @@ diff content here\n"
21+
}
22+
]

0 commit comments

Comments
 (0)