azalea/kotlin-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor: clean warnings in folding tests

Browse Source
This commit is contained in:
Nikolay Krasko
2019-04-05 12:46:51 +03:00
parent aea33a3214
commit 53ab1e7c99
2 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java
-1
View File
@@ -10,7 +10,6 @@ import com.intellij.codeInsight.folding.impl.JavaCodeFoldingSettingsImpl;
import com.intellij.openapi.util.io.FileUtil; import com.intellij.openapi.util.io.FileUtil;
import com.intellij.openapi.util.text.StringUtil; import com.intellij.openapi.util.text.StringUtil;
import com.intellij.openapi.vfs.VirtualFile; import com.intellij.openapi.vfs.VirtualFile;
import com.intellij.testFramework.PlatformTestCase;
import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl; import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase; import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt
+9 -8
View File
@@ -44,27 +44,28 @@ class FoldingAfterOptimizeImportsTest : AbstractKotlinFoldingTest() {
) { KotlinImportOptimizer().processFile(fixture.file).run() } ) { KotlinImportOptimizer().processFile(fixture.file).run() }
getFoldingRegion(0).checkRegion(false, findStringWithPrefixes("// REGION AFTER: ")) getFoldingRegion(0).checkRegion(false, findStringWithPrefixes("// REGION AFTER: "))
null
} }
} }
private fun getFoldingRegion(number: Int): FoldRegion { private fun getFoldingRegion(@Suppress("SameParameterValue") number: Int): FoldRegion {
fixture.doHighlighting() fixture.doHighlighting()
val model = editor.foldingModel val model = editor.foldingModel
val foldingRegions = model.allFoldRegions val foldingRegions = model.allFoldRegions
assert(foldingRegions.size >= number) { "There is no enough folding regions in file: in file - ${foldingRegions.size} , expected = ${number}" } assert(foldingRegions.size >= number) {
"There is no enough folding regions in file: in file - ${foldingRegions.size} , expected = $number"
}
return foldingRegions[number] return foldingRegions[number]
} }
override fun getTestDataPath() = File(PluginTestCaseBase.getTestDataPathBase(), "/folding/afterOptimizeImports/").path + File.separator override fun getTestDataPath() = File(PluginTestCaseBase.getTestDataPathBase(), "/folding/afterOptimizeImports/").path + File.separator
private fun findStringWithPrefixes(prefix: String) = InTextDirectivesUtils.findStringWithPrefixes(fileText, prefix) private fun findStringWithPrefixes(prefix: String) =
?: throw AssertionError("Couldn't find line with prefix $prefix") InTextDirectivesUtils.findStringWithPrefixes(fileText, prefix)
?: throw AssertionError("Couldn't find line with prefix $prefix")
private fun FoldRegion.getPosition() = "${startOffset}:${endOffset}" private fun FoldRegion.getPosition() = "$startOffset:$endOffset"
private fun FoldRegion.checkRegion(isExpanded: Boolean, position: String): Unit { private fun FoldRegion.checkRegion(isExpanded: Boolean, position: String) {
assert(isValid) { "Region should be valid: $this" } assert(isValid) { "Region should be valid: $this" }
assert(isExpanded == isExpanded()) { "isExpanded should be $isExpanded. Actual = ${isExpanded()}" } assert(isExpanded == isExpanded()) { "isExpanded should be $isExpanded. Actual = ${isExpanded()}" }
assert(position == getPosition()) { "Region position is wrong: expected = $position, actual = ${getPosition()}" } assert(position == getPosition()) { "Region position is wrong: expected = $position, actual = ${getPosition()}" }