From 047bfc941c88b71fb31a9a3f0fccd3d936abe760 Mon Sep 17 00:00:00 2001 From: Aleksey Pivovarov Date: Tue, 27 Oct 2015 16:15:42 +0300 Subject: [PATCH] diff: cleanup tests --- .../intellij/diff/comparison/LineComparisonUtilTest.kt | 8 ++++---- .../intellij/diff/comparison/WordComparisonUtilTest.kt | 6 +----- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/LineComparisonUtilTest.kt b/platform/diff-impl/tests/com/intellij/diff/comparison/LineComparisonUtilTest.kt index a1f222f22bb3..36ea91d8e855 100644 --- a/platform/diff-impl/tests/com/intellij/diff/comparison/LineComparisonUtilTest.kt +++ b/platform/diff-impl/tests/com/intellij/diff/comparison/LineComparisonUtilTest.kt @@ -254,7 +254,7 @@ public class LineComparisonUtilTest : ComparisonUtilTestBase() { } } - public fun testBigBlockShiftRegression() { + public fun `test regression - shifted similar lines should be matched as a single change, not insertion-deletion`() { lines { (" X_ X" - " X_ X") default(mod(0, 0, 2, 2)) @@ -262,7 +262,7 @@ public class LineComparisonUtilTest : ComparisonUtilTestBase() { } } - public fun testPreferBoundedBlocks() { + public fun `test prefer chunks bounded by empty line`() { lines { ("A_B_o_o_Y_Z_ _A_B_z_z_Y_Z" - "A_B_o_o_Y_Z_ _A_B_u_u_Y_Z_ _A_B_z_z_Y_Z") default(ins(7, 7, 7)) @@ -282,7 +282,7 @@ public class LineComparisonUtilTest : ComparisonUtilTestBase() { } } - public fun testPreferLessBlocks() { + public fun `test prefer smaller amount of chunks`() { lines() { ("X_A_X_Y_" - "X_Y_") default(del(0, 0, 2)) @@ -303,7 +303,7 @@ public class LineComparisonUtilTest : ComparisonUtilTestBase() { } } - public fun testTwoStepCanTrimRegression() { + public fun `test regression - can trim chunks after 'compareTwoSteps'`() { lines { ("q__7_ 6_ 7" - "_7") default(del(0, 0, 1), del(3, 2, 2)) diff --git a/platform/diff-impl/tests/com/intellij/diff/comparison/WordComparisonUtilTest.kt b/platform/diff-impl/tests/com/intellij/diff/comparison/WordComparisonUtilTest.kt index cc679071f64f..b2dc60b32ebe 100644 --- a/platform/diff-impl/tests/com/intellij/diff/comparison/WordComparisonUtilTest.kt +++ b/platform/diff-impl/tests/com/intellij/diff/comparison/WordComparisonUtilTest.kt @@ -248,10 +248,6 @@ public class WordComparisonUtilTest : ComparisonUtilTestBase() { } } - public fun testEmptyRangePositions() { - // TODO - } - public fun testAlgorithmSpecific() { // prefer words over punctuation words { @@ -305,7 +301,7 @@ public class WordComparisonUtilTest : ComparisonUtilTestBase() { } } - public fun testLegacy() { + public fun `test legacy cases from ByWordTest`() { words { ("abc def, 123" - "ab def, 12") ("--- ---" - "-- --").default()