MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2026-09-27 10:03:11 +07:00
Code Issues Packages Projects Releases Wiki Activity

diff: add block processing tests

Browse Source
This commit is contained in:
Aleksey Pivovarov
2015-09-02 16:18:24 +03:00
parent 837044711c
commit ec27e75da8
2 changed files with 114 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
platform/diff-impl/tests/com/intellij/diff/comparison/ComparisonUtilTestBase.kt
+29 -4
View File
@@ -16,6 +16,7 @@
package com.intellij.diff.comparison
import com.intellij.diff.assertEquals
import com.intellij.diff.assertNull
import com.intellij.diff.assertOrderedEquals
import com.intellij.diff.assertTrue
import com.intellij.diff.fragments.DiffFragment
@@ -70,9 +71,16 @@ public abstract class ComparisonUtilTestBase : UsefulTestCase() {
if (expected != null) checkDiffChanges(fragments, expected)
}
private fun doSplitterTest(before: Document, after: Document, expected: List<Change>?, policy: ComparisonPolicy) {
val fragments = MANAGER.compareLinesInner(before.getCharsSequence(), after.getCharsSequence(), policy, INDICATOR)
private fun doSplitterTest(before: Document, after: Document, squash: Boolean, trim: Boolean, expected: List<Change>?, policy: ComparisonPolicy) {
val text1 = before.getCharsSequence()
val text2 = after.getCharsSequence()
var fragments = MANAGER.compareLinesInner(text1, text2, policy, INDICATOR)
checkConsistency(fragments, before, after)
fragments = MANAGER.processBlocks(fragments, text1, text2, policy, squash, trim)
checkConsistency(fragments, before, after)
if (expected != null) checkLineChanges(fragments, expected)
}
@@ -192,6 +200,9 @@ public abstract class ComparisonUtilTestBase : UsefulTestCase() {
private var trimMatching: Couple<BitSet>? = null
private var ignoreMatching: Couple<BitSet>? = null
private var shouldSquash: Boolean = false;
private var shouldTrim: Boolean = false;
private fun changes(policy: ComparisonPolicy): List<Change>? = when (policy) {
ComparisonPolicy.IGNORE_WHITESPACES -> ignoreChanges ?: trimChanges ?: defaultChanges;
ComparisonPolicy.TRIM_WHITESPACES -> trimChanges ?: defaultChanges;
@@ -220,7 +231,10 @@ public abstract class ComparisonUtilTestBase : UsefulTestCase() {
TestType.LINE -> doLineTest(before!!, after!!, change, policy)
TestType.WORD -> doWordTest(before!!, after!!, matchings, change, policy)
TestType.CHAR -> doCharTest(before!!, after!!, matchings, change, policy)
TestType.SPLITTER -> doSplitterTest(before!!, after!!, change, policy)
TestType.SPLITTER -> {
assertNull(matchings)
doSplitterTest(before!!, after!!, shouldSquash, shouldTrim, change, policy)
}
}
}
catch (e: Throwable) {
@@ -322,6 +336,12 @@ public abstract class ComparisonUtilTestBase : UsefulTestCase() {
assert(count2 != 0)
return Change(line1, line1, line2, line2 + count2)
}
public fun postprocess(squash: Boolean, trim: Boolean): Unit {
shouldSquash = squash;
shouldTrim = trim;
}
}
public fun lines(f: TestBuilder.() -> Unit): Unit = doTest(TestType.LINE, f)
@@ -330,7 +350,12 @@ public abstract class ComparisonUtilTestBase : UsefulTestCase() {
public fun chars(f: TestBuilder.() -> Unit): Unit = doTest(TestType.CHAR, f)
public fun split(f: TestBuilder.() -> Unit): Unit = doTest(TestType.SPLITTER, f)
public fun splitter(squash: Boolean = false, trim: Boolean = false, f: TestBuilder.() -> Unit): Unit {
doTest(TestType.SPLITTER, {
postprocess(squash, trim)
f()
})
}
private fun doTest(type: TestType, f: TestBuilder.() -> Unit) {
val builder = TestBuilder(type)
platform/diff-impl/tests/com/intellij/diff/comparison/SplitComparisonUtilTest.kt
+85 -5
View File
@@ -18,31 +18,111 @@ package com.intellij.diff.comparison
// TODO
public class SplitComparisonUtilTest : ComparisonUtilTestBase() {
public fun testSplitter() {
split {
splitter {
("x" - "z")
default(mod(0, 0, 1, 1))
testAll()
}
split {
splitter {
("x_y" - "a_b")
default(mod(0, 0, 2, 2))
testAll()
}
split {
splitter {
("x_y" - "a_b y")
default(mod(0, 0, 1, 1), mod(1, 1, 1, 1))
testAll()
}
split {
splitter {
("a_x_b_" - " x_")
default(del(0, 0, 1), mod(1, 0, 1, 1), del(2, 1, 1))
testDefault()
}
split {
splitter {
("a_x_b_" - "!x_")
default(del(0, 0, 1), mod(1, 0, 1, 1), del(2, 1, 1))
testAll()
}
}
public fun testSquash() {
splitter(squash = true) {
("x" - "z")
default(mod(0, 0, 1, 1))
testAll()
}
splitter(squash = true) {
("x_y" - "a_b")
default(mod(0, 0, 2, 2))
testAll()
}
splitter(squash = true) {
("x_y" - "a_b y")
default(mod(0, 0, 2, 2))
testAll()
}
splitter(squash = true) {
("a_x_b_" - " x_")
default(mod(0, 0, 3, 1))
testDefault()
}
splitter(squash = true) {
("a_x_b_" - "!x_")
default(mod(0, 0, 3, 1))
testAll()
}
}
public fun testTrim() {
splitter(trim = true) {
("_" - " _ ")
default(mod(0, 0, 2, 2))
trim()
testAll()
}
splitter(trim = true) {
("" - " _ ")
default(mod(0, 0, 1, 2))
trim(ins(1, 1, 1))
ignore()
testAll()
}
splitter(trim = true) {
(" _ " - "")
default(mod(0, 0, 2, 1))
trim(del(1, 1, 1))
ignore()
testAll()
}
splitter(trim = true) {
("x_y" - "z_ ")
default(mod(0, 0, 2, 2))
testAll()
}
splitter(trim = true) {
("z" - "z_ ")
default(ins(1, 1, 1))
ignore()
testAll()
}
splitter(trim = true) {
("z_ x" - "z_ w")
default(mod(1, 1, 1, 1))
testAll()
}
splitter(trim = true) {
("__z__" - "z")
default(del(0, 0, 2), del(3, 1, 2))
ignore()
testAll()
}
}
}