Skip to content

Commit e96f135

Browse files
committedJul 2, 2019
add tests
1 parent 9c0a001 commit e96f135

29 files changed

+764
-1297
lines changed
 

‎build.gradle.kts

+6
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,12 @@ kotlin {
5050
implementation(kotlin("stdlib-jdk8"))
5151
}
5252
}
53+
val jvmTest by getting {
54+
dependencies {
55+
implementation("junit:junit:4.12")
56+
implementation("org.assertj:assertj-core:3.11.1")
57+
}
58+
}
5359
}
5460
}
5561

‎src/test/java/com/github/difflib/GenerateUnifiedDiffTest.kt ‎src/jvmTest/kotlin/com/github/difflib/GenerateUnifiedDiffTest.kt

+2-2
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ class GenerateUnifiedDiffTest {
108108
val unifiedDiff = UnifiedDiffUtils.generateUnifiedDiff(originalFile, revisedFile,
109109
origLines, patch, 10)
110110

111-
println(unifiedDiff.stream().collect<String, *>(joining("\n")))
111+
println(unifiedDiff.stream().collect(joining("\n")))
112112

113113
val fromUnifiedPatch = UnifiedDiffUtils.parseUnifiedDiff(unifiedDiff)
114114
val patchedLines: List<String>
@@ -135,7 +135,7 @@ class GenerateUnifiedDiffTest {
135135
val lines = ArrayList<String>()
136136
var line = ""
137137
BufferedReader(FileReader(filename)).use { `in` ->
138-
while ((line = `in`.readLine()) != null) {
138+
while (`in`.readLine().also { line = it } != null) {
139139
lines.add(line)
140140
}
141141
}

‎src/test/java/com/github/difflib/text/DiffRowGeneratorTest.kt ‎src/jvmTest/kotlin/com/github/difflib/text/DiffRowGeneratorTest.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -297,7 +297,7 @@ class DiffRowGeneratorTest {
297297
val generator = DiffRowGenerator.create()
298298
.showInlineDiffs(true)
299299
.mergeOriginalRevised(true)
300-
.inlineDiffBySplitter { line -> DiffRowGenerator.splitStringPreserveDelimiter(line, Pattern.compile(",")) }
300+
.inlineDiffBySplitter { line -> DiffRowGenerator.splitStringPreserveDelimiter(line, Regex(",")) }
301301
.oldTag { f -> "~" }
302302
.newTag { f -> "**" }
303303
.build()
@@ -323,10 +323,10 @@ class DiffRowGeneratorTest {
323323
.build()
324324

325325
val listOne = Files.lines(File("target/test-classes/mocks/issue15_1.txt").toPath())
326-
.collect<List<String>, Any>(toList())
326+
.collect(toList())
327327

328328
val listTwo = Files.lines(File("target/test-classes/mocks/issue15_2.txt").toPath())
329-
.collect<List<String>, Any>(toList())
329+
.collect(toList())
330330

331331
val rows = generator.generateDiffRows(listOne, listTwo)
332332

0 commit comments

Comments
 (0)