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

Minor: Extract SpringTestFixtureExtension.loadConfigByMainFilePath() function

Browse Source
This commit is contained in:
Alexey Sedunov
2016-04-07 13:50:24 +03:00
parent afecb09b6f
commit a553f67744
2 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
+10
View File
@@ -18,9 +18,12 @@ package org.jetbrains.kotlin.idea.spring.tests
import com.intellij.facet.impl.FacetUtil import com.intellij.facet.impl.FacetUtil
import com.intellij.openapi.module.Module import com.intellij.openapi.module.Module
import com.intellij.openapi.util.io.FileUtil
import com.intellij.spring.facet.SpringFacet import com.intellij.spring.facet.SpringFacet
import com.intellij.spring.facet.SpringFileSet import com.intellij.spring.facet.SpringFileSet
import com.intellij.testFramework.fixtures.CodeInsightTestFixture 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.ConfigLibraryUtil
import org.jetbrains.kotlin.idea.test.TestFixtureExtension import org.jetbrains.kotlin.idea.test.TestFixtureExtension
import org.jetbrains.kotlin.tests.ULTIMATE_TEST_ROOT import org.jetbrains.kotlin.tests.ULTIMATE_TEST_ROOT
@@ -80,3 +83,10 @@ class SpringTestFixtureExtension() : TestFixtureExtension {
} }
} }
} }
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")))
}
ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/references/AbstractSpringReferenceCompletionTest.kt
+2 -10
View File
@@ -16,27 +16,19 @@
package org.jetbrains.kotlin.idea.spring.tests.references 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.completion.test.AbstractJvmBasicCompletionTest
import org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension import org.jetbrains.kotlin.idea.spring.tests.SpringTestFixtureExtension
import org.jetbrains.kotlin.idea.spring.tests.loadConfigByMainFilePath
import org.jetbrains.kotlin.idea.test.TestFixtureExtension import org.jetbrains.kotlin.idea.test.TestFixtureExtension
abstract class AbstractSpringReferenceCompletionTest : AbstractJvmBasicCompletionTest() { abstract class AbstractSpringReferenceCompletionTest : AbstractJvmBasicCompletionTest() {
override fun setUpFixture(testPath: String) { override fun setUpFixture(testPath: String) {
val mainFileName = PathUtil.getFileName(testPath) TestFixtureExtension.loadFixture<SpringTestFixtureExtension>(myModule).loadConfigByMainFilePath(testPath, myFixture)
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")))
super.setUpFixture(testPath) super.setUpFixture(testPath)
} }
override fun tearDownFixture() { override fun tearDownFixture() {
TestFixtureExtension.unloadFixture<SpringTestFixtureExtension>() TestFixtureExtension.unloadFixture<SpringTestFixtureExtension>()
super.tearDownFixture() super.tearDownFixture()
} }
} }