From 9a8d326ccb6a0928c379df94031782032a978c1e Mon Sep 17 00:00:00 2001 From: Roman Shevchenko Date: Mon, 5 Dec 2016 16:24:08 +0100 Subject: [PATCH] Cleanup (wrong import; unified assertion style) --- .../testModelTests/TestFormattingModelBuilderTest.kt | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/platform/platform-tests/testSrc/com/intellij/formatting/engine/testModelTests/TestFormattingModelBuilderTest.kt b/platform/platform-tests/testSrc/com/intellij/formatting/engine/testModelTests/TestFormattingModelBuilderTest.kt index 43abcbf984f6..353d379e0bf5 100644 --- a/platform/platform-tests/testSrc/com/intellij/formatting/engine/testModelTests/TestFormattingModelBuilderTest.kt +++ b/platform/platform-tests/testSrc/com/intellij/formatting/engine/testModelTests/TestFormattingModelBuilderTest.kt @@ -20,9 +20,8 @@ import com.intellij.formatting.CompositeTestBlock import com.intellij.formatting.engine.testModel.getRoot import com.intellij.formatting.toFormattingBlock import com.intellij.openapi.util.TextRange -import com.intellij.testFramework.assertions.Assertions -import com.intellij.testFramework.assertions.Assertions.assertThat import com.intellij.util.containers.TreeTraversal +import org.assertj.core.api.Assertions.assertThat import org.junit.Test class TestFormattingModelBuilderTest { @@ -38,10 +37,10 @@ class TestFormattingModelBuilderTest { val rootFormattingBlock = root.toFormattingBlock(0) val subBlocks = rootFormattingBlock.subBlocks - Assertions.assertThat(subBlocks).hasSize(4) + assertThat(subBlocks).hasSize(4) - Assertions.assertThat(subBlocks.last().subBlocks).hasSize(3) - Assertions.assertThat(subBlocks.last().subBlocks.last().subBlocks).hasSize(2) + assertThat(subBlocks.last().subBlocks).hasSize(3) + assertThat(subBlocks.last().subBlocks.last().subBlocks).hasSize(2) assertLeafRanges(rootFormattingBlock, 0..3, 12..15, 30..33, 34..37, 50..53, 60..63, 64..67) } @@ -49,10 +48,9 @@ class TestFormattingModelBuilderTest { private fun assertLeafRanges(rootFormattingBlock: CompositeTestBlock, vararg ranges: IntRange) { val textRanges = ranges.map { TextRange(it.start, it.endInclusive) } val leafs = TreeTraversal.LEAVES_DFS.createIterator(rootFormattingBlock.subBlocks, { it.subBlocks }).toList() - Assertions.assertThat(textRanges).isEqualTo(leafs.map { it.textRange }) + assertThat(textRanges).isEqualTo(leafs.map { it.textRange }) } - @Test fun `test alignment parsing`() { val root = getRoot("[a0]foo [a1]goo [a0]hoo")