From 53ab1e7c99e1c50c6ade1aa5708bd9aa2e25226a Mon Sep 17 00:00:00 2001
From: Nikolay Krasko <nikolay.krasko@jetbrains.com>
Date: Fri, 5 Apr 2019 12:46:51 +0300
Subject: [PATCH] Minor: clean warnings in folding tests

---
 .../idea/folding/AbstractKotlinFoldingTest.java |  1 -
 .../folding/FoldingAfterOptimizeImportsTest.kt  | 17 +++++++++--------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java b/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java
index f16d365e022..371ce096e2b 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java
+++ b/idea/tests/org/jetbrains/kotlin/idea/folding/AbstractKotlinFoldingTest.java
@@ -10,7 +10,6 @@ import com.intellij.codeInsight.folding.impl.JavaCodeFoldingSettingsImpl;
 import com.intellij.openapi.util.io.FileUtil;
 import com.intellij.openapi.util.text.StringUtil;
 import com.intellij.openapi.vfs.VirtualFile;
-import com.intellij.testFramework.PlatformTestCase;
 import com.intellij.testFramework.fixtures.impl.CodeInsightTestFixtureImpl;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.kotlin.idea.test.KotlinLightCodeInsightFixtureTestCase;
diff --git a/idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt b/idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt
index c8f6781cbf4..677350d6b89 100644
--- a/idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt
+++ b/idea/tests/org/jetbrains/kotlin/idea/folding/FoldingAfterOptimizeImportsTest.kt
@@ -44,27 +44,28 @@ class FoldingAfterOptimizeImportsTest : AbstractKotlinFoldingTest() {
             ) { KotlinImportOptimizer().processFile(fixture.file).run() }
 
             getFoldingRegion(0).checkRegion(false, findStringWithPrefixes("// REGION AFTER: "))
-
-            null
         }
     }
 
-    private fun getFoldingRegion(number: Int): FoldRegion {
+    private fun getFoldingRegion(@Suppress("SameParameterValue") number: Int): FoldRegion {
         fixture.doHighlighting()
         val model = editor.foldingModel
         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]
     }
 
     override fun getTestDataPath() = File(PluginTestCaseBase.getTestDataPathBase(), "/folding/afterOptimizeImports/").path + File.separator
 
-    private fun findStringWithPrefixes(prefix: String) = InTextDirectivesUtils.findStringWithPrefixes(fileText, prefix)
-                                                            ?: throw AssertionError("Couldn't find line with prefix $prefix")
+    private fun findStringWithPrefixes(prefix: String) =
+        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(isExpanded == isExpanded()) { "isExpanded should be $isExpanded. Actual = ${isExpanded()}" }
         assert(position == getPosition()) { "Region position is wrong: expected = $position, actual = ${getPosition()}" }