From 81298e57f2408ef9396b2a69641f651cde0e93af Mon Sep 17 00:00:00 2001
From: Alexey Sedunov <alexey.sedunov@jetbrains.com>
Date: Fri, 25 Mar 2016 16:08:29 +0300
Subject: [PATCH] [RESTORED] Misc: Fetch Spring libraries to dependencies
 directory

---
 .../kotlin/idea/spring/tests/SpringTestFixtureExtension.kt   | 5 +++--
 update_dependencies.xml                                      | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt b/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
index e210bad5e32..4b8a02a3f87 100644
--- a/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
+++ b/idea/idea-ultimate/tests/org/jetbrains/kotlin/idea/spring/tests/SpringTestFixtureExtension.kt
@@ -24,6 +24,7 @@ import com.intellij.testFramework.fixtures.CodeInsightTestFixture
 import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase
 import org.jetbrains.kotlin.idea.test.TestFixtureExtension
+import org.jetbrains.kotlin.test.KotlinTestUtils
 import java.util.*
 
 @Suppress("unused")
@@ -37,12 +38,12 @@ class SpringTestFixtureExtension() : TestFixtureExtension {
         )
     }
 
-    val SPRING_LIBRARY_ROOT = "${PluginTestCaseBase.getTestDataPathBase()}/spring/_lib"
+    val SPRING_LIBRARY_ROOT = "${KotlinTestUtils.getHomeDirectory()}/dependencies/spring"
 
     override fun setUp(module: Module) {
         this.module = module
         val library = SpringFramework.FRAMEWORK_4_2_0
-        val libraryPath = "$SPRING_LIBRARY_ROOT/spring/${library.version}/"
+        val libraryPath = "$SPRING_LIBRARY_ROOT/${library.version}/"
         val jarNames = HashSet<String>(library.artifactIds.size)
         for (id in library.artifactIds) {
             jarNames.add("spring-$id-${library.version}.jar")
diff --git a/update_dependencies.xml b/update_dependencies.xml
index 46389730de1..9270b47fc1a 100644
--- a/update_dependencies.xml
+++ b/update_dependencies.xml
@@ -147,7 +147,7 @@
                 lib="@{lib}"
                 version="@{version}"
                 src="false"
-                dependencies="idea/testData/spring/_lib/spring/@{version}"/>
+                dependencies="dependencies/spring/@{version}"/>
         </sequential>
     </macrodef>