diff: cleanup tests

This commit is contained in:
Aleksey Pivovarov
2016-12-01 17:43:08 +03:00
parent 0a8f737882
commit 9b160c5f7e
2 changed files with 15 additions and 20 deletions
@@ -15,15 +15,14 @@
*/
package com.intellij.diff.tools.fragmented
import com.intellij.diff.comparison.ComparisonManagerImpl
import com.intellij.diff.DiffTestCase
import com.intellij.diff.comparison.ComparisonPolicy
import com.intellij.diff.util.LineRange
import com.intellij.diff.util.Side
import com.intellij.openapi.editor.impl.DocumentImpl
import com.intellij.openapi.progress.DumbProgressIndicator
import com.intellij.testFramework.UsefulTestCase
class UnifiedFragmentBuilderTest : UsefulTestCase() {
class UnifiedFragmentBuilderTest : DiffTestCase() {
fun testEquals() {
val document1 = DocumentImpl("A\nB\nC")
val document2 = DocumentImpl("A\nB\nC")
@@ -61,8 +60,4 @@ class UnifiedFragmentBuilderTest : UsefulTestCase() {
assertEquals(block.range2.start, 3)
assertEquals(block.range2.end, 3)
}
companion object {
private val MANAGER = ComparisonManagerImpl()
}
}
@@ -33,8 +33,19 @@ package com.intellij.diff.util
import com.intellij.diff.DiffTestCase
import com.intellij.util.containers.ContainerUtil
class `DiffUtil getSortedIndexes() Test` : DiffTestCase() {
fun testSmth() {
class DiffUtilTest : DiffTestCase() {
fun `test getSortedIndexes`() {
fun <T> doTest(vararg values: T, comparator: (T, T) -> Int) {
val list = values.toList()
val sortedIndexes = DiffUtil.getSortedIndexes(list, comparator)
val expected = ContainerUtil.sorted(list, comparator)
val actual = (0..values.size - 1).map { values[sortedIndexes[it]] }
assertOrderedEquals(actual, expected)
assertEquals(sortedIndexes.toSet().size, list.size)
}
doTest(1, 2, 3, 4, 5, 6, 7, 8) { v1, v2 -> v1 - v2 }
doTest(8, 7, 6, 5, 4, 3, 2, 1) { v1, v2 -> v1 - v2 }
@@ -47,15 +58,4 @@ class `DiffUtil getSortedIndexes() Test` : DiffTestCase() {
doTest(1, 3, 5, 7, 8, 6, 4, 2) { v1, v2 -> v2 - v1 }
}
private fun <T> doTest(vararg values: T, comparator: (T, T) -> Int) {
val list = values.toList()
val sortedIndexes = DiffUtil.getSortedIndexes(list, comparator)
val expected = ContainerUtil.sorted(list, comparator)
val actual = (0..values.size - 1).map { values[sortedIndexes[it]] }
assertOrderedEquals(actual, expected)
assertEquals(sortedIndexes.toSet().size, list.size)
}
}