From a553f67744ba1963f5fb9657f37aeab450fa214a Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Thu, 7 Apr 2016 13:50:24 +0300
Subject: [PATCH] Minor: Extract
 SpringTestFixtureExtension.loadConfigByMainFilePath() function

---
 .../idea/spring/tests/SpringTestFixtureExtension.kt  | 10 ++++++++++
 .../AbstractSpringReferenceCompletionTest.kt         | 12 ++----------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
index ba1d96cf48a..aa2f5ec7321 100644
--- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
@@ -18,9 +18,12 @@ package org.jetbrains.kotlin.idea.spring.tests
 
 import com.intellij.facet.impl.FacetUtil
 import com.intellij.openapi.module.Module
+import com.intellij.openapi.util.io.FileUtil
 import com.intellij.spring.facet.SpringFacet
 import com.intellij.spring.facet.SpringFileSet
 import com.intellij.testFramework.fixtures.CodeInsightTestFixture
+import com.intellij.testFramework.fixtures.JavaCodeInsightTestFixture
+import com.intellij.util.PathUtil
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
 import org.jetbrains.kotlin.idea.test.TestFixtureExtension
 import org.jetbrains.kotlin.tests.ULTIMATE_TEST_ROOT
@@ -79,4 +82,11 @@ class SpringTestFixtureExtension() : TestFixtureExtension {
             module = null
         }
     }
+}
+
+fun SpringTestFixtureExtension.loadConfigByMainFilePath(testPath: String, fixture: JavaCodeInsightTestFixture) {
+    val mainFileName = PathUtil.getFileName(testPath)
+    val baseName = FileUtil.getNameWithoutExtension(mainFileName)
+    val configFileName = if (baseName.endsWith("Xml")) "$baseName-config.xml" else mainFileName
+    configureFileSet(fixture, listOf(PathUtil.toSystemIndependentName("${PathUtil.getParentPath(testPath)}/$configFileName")))
 }
\ No newline at end of file
diff --git a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt
index aa20d14a8cb..ae71e583b0f 100644
--- a/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt
+++ b/ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt
@@ -16,27 +16,19 @@
 
 package org.jetbrains.kotlin.idea.spring.tests.references
 
-import com.intellij.openapi.util.io.FileUtil
-import com.intellij.util.PathUtil
 import org.jetbrains.kotlin.idea.completion.test.AbstractJvmBasicCompletionTest
 import org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension
+import org.jetbrains.kotlin.idea.spring.tests.loadConfigByMainFilePath
 import org.jetbrains.kotlin.idea.test.TestFixtureExtension
 
 abstract class AbstractSpringReferenceCompletionTest : AbstractJvmBasicCompletionTest() {
     override fun setUpFixture(testPath: String) {
-        val mainFileName = PathUtil.getFileName(testPath)
-        val baseName = FileUtil.getNameWithoutExtension(mainFileName)
-        val configFileName = if (baseName.endsWith("Xml")) "$baseName-config.xml" else mainFileName
-        TestFixtureExtension
-                .loadFixture<SpringTestFixtureExtension>(myModule)
-                .configureFileSet(myFixture, listOf(PathUtil.toSystemIndependentName("${PathUtil.getParentPath(testPath)}/$configFileName")))
-
+        TestFixtureExtension.loadFixture<SpringTestFixtureExtension>(myModule).loadConfigByMainFilePath(testPath, myFixture)
         super.setUpFixture(testPath)
     }
 
     override fun tearDownFixture() {
         TestFixtureExtension.unloadFixture<SpringTestFixtureExtension>()
-
         super.tearDownFixture()
     }
 }
\ No newline at end of file