Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit4c1a0bc

Browse files
committed
1 parent61a21cb commit4c1a0bc

File tree

3 files changed

+43
-45
lines changed

3 files changed

+43
-45
lines changed

‎src/main/java/com/github/difflib/unifieddiff/UnifiedDiffWriter.java‎

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
*/
1616
packagecom.github.difflib.unifieddiff;
1717

18+
importjava.io.IOException;
1819
importjava.io.Writer;
1920

2021
/**
@@ -23,7 +24,29 @@
2324
*/
2425
publicclassUnifiedDiffWriter {
2526

26-
publicstaticvoidwrite(UnifiedDiffdiff,Writerwriter) {
27+
publicstaticvoidwrite(UnifiedDiffdiff,Writerwriter)throwsIOException {
28+
writer.write(diff.getHeader());
2729

30+
for (UnifiedDiffFilefile :diff.getFiles()) {
31+
writeOrNothing(writer,file.getDiffCommand());
32+
if (file.getIndex() !=null) {
33+
writer.write("index " +file.getIndex() +"\n");
34+
}
35+
if (file.getFromFile() !=null) {
36+
writer.write("--- " +file.getFromFile() +"\n");
37+
}
38+
if (file.getToFile() !=null) {
39+
writer.write("+++ " +file.getToFile() +"\n");
40+
}
41+
42+
}
43+
44+
writer.write(diff.getTail());
45+
}
46+
47+
privatestaticvoidwriteOrNothing(Writerwriter,Stringstr)throwsIOException {
48+
if (str !=null) {
49+
writer.append(str).append("\n");
50+
}
2851
}
2952
}

‎src/test/java/com/github/difflib/unifieddiff/UnifiedDiffReaderTest.java‎

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,8 @@
1919
importjava.util.regex.Matcher;
2020
importjava.util.regex.Pattern;
2121
importstaticorg.assertj.core.api.Java6Assertions.assertThat;
22-
importorg.junit.After;
23-
importorg.junit.AfterClass;
2422
importstaticorg.junit.Assert.assertEquals;
2523
importstaticorg.junit.Assert.assertTrue;
26-
importorg.junit.Before;
27-
importorg.junit.BeforeClass;
2824
importorg.junit.Test;
2925

3026
/**
@@ -33,25 +29,6 @@
3329
*/
3430
publicclassUnifiedDiffReaderTest {
3531

36-
publicUnifiedDiffReaderTest() {
37-
}
38-
39-
@BeforeClass
40-
publicstaticvoidsetUpClass() {
41-
}
42-
43-
@AfterClass
44-
publicstaticvoidtearDownClass() {
45-
}
46-
47-
@Before
48-
publicvoidsetUp() {
49-
}
50-
51-
@After
52-
publicvoidtearDown() {
53-
}
54-
5532
@Test
5633
publicvoidtestSimpleParse()throwsIOException {
5734
UnifiedDiffdiff =UnifiedDiffReader.parseUnifiedDiff(UnifiedDiffReaderTest.class.getResourceAsStream("jsqlparser_patch_1.diff"));

‎src/test/java/com/github/difflib/unifieddiff/UnifiedDiffWriterTest.java‎

Lines changed: 19 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,14 @@
1515
*/
1616
packagecom.github.difflib.unifieddiff;
1717

18-
importorg.junit.After;
19-
importorg.junit.AfterClass;
20-
importorg.junit.Before;
21-
importorg.junit.BeforeClass;
18+
importjava.io.ByteArrayInputStream;
19+
importjava.io.IOException;
20+
importjava.io.StringWriter;
21+
importjava.net.URI;
22+
importjava.net.URISyntaxException;
23+
importjava.nio.charset.Charset;
24+
importjava.nio.file.Files;
25+
importjava.nio.file.Paths;
2226
importorg.junit.Test;
2327

2428
/**
@@ -30,25 +34,19 @@ public class UnifiedDiffWriterTest {
3034
publicUnifiedDiffWriterTest() {
3135
}
3236

33-
@BeforeClass
34-
publicstaticvoidsetUpClass() {
35-
}
36-
37-
@AfterClass
38-
publicstaticvoidtearDownClass() {
39-
}
40-
41-
@Before
42-
publicvoidsetUp() {
43-
}
44-
45-
@After
46-
publicvoidtearDown() {
47-
}
48-
4937
@Test
50-
publicvoidtestWrite() {
38+
publicvoidtestWrite()throwsURISyntaxException,IOException {
39+
Stringstr =readFile(UnifiedDiffReaderTest.class.getResource("jsqlparser_patch_1.diff").toURI(),Charset.defaultCharset());
40+
UnifiedDiffdiff =UnifiedDiffReader.parseUnifiedDiff(newByteArrayInputStream(str.getBytes()));
5141

42+
StringWriterwriter =newStringWriter();
43+
UnifiedDiffWriter.write(diff,writer);
44+
System.out.println(writer.toString());
5245
}
5346

47+
staticStringreadFile(URIpath,Charsetencoding)
48+
throwsIOException {
49+
byte[]encoded =Files.readAllBytes(Paths.get(path));
50+
returnnewString(encoded,encoding);
51+
}
5452
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp