Move compiler/tests-common/{src -> tests}, adjust dependencies

plugins/android-extensions/android-extensions-idea/build.gradle.kts

@@ -12,11 +12,11 @@ dependencies {
     compile(project(":plugins:android-extensions-compiler"))
     compile(ideaPluginDeps("android", "android-common", "sdk-tools", "sdk-common", plugin = "android"))
     compile(ideaPluginDeps("Groovy", plugin = "Groovy"))
-    testCompile(project(":compiler:tests-common"))
     testCompile(project(":compiler:cli"))
     testCompile(project(":compiler:frontend.java"))
     testCompile(project(":idea:idea-test-framework")) { isTransitive = false }
     testCompile(project(":plugins:kapt3-idea"))
+    testCompile(projectTests(":compiler:tests-common"))
     testCompile(projectTests(":idea"))
     testCompile(projectTests(":idea:idea-android"))
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))

plugins/kapt3/build.gradle.kts

@@ -10,7 +10,8 @@ dependencies {
     compile(project(":compiler:frontend"))
     compile(project(":compiler:frontend.java"))
     compile(project(":compiler:plugin-api"))
-    testCompile(project(":compiler:tests-common"))
+    testCompile(projectTests(":compiler:tests-common"))
+    testCompile(ideaSdkDeps("idea", "idea_rt", "openapi"))
     testCompile(commonDep("junit:junit"))
 }
 

plugins/plugins-tests/build.gradle.kts

@@ -5,7 +5,6 @@ dependencies {
     testCompile(project(":compiler:util"))
     testCompile(project(":compiler:backend"))
     testCompile(project(":compiler:cli"))
-    testCompile(project(":compiler:tests-common"))
     testCompile(project(":plugins:android-extensions-compiler"))
     testCompile(project(":plugins:android-extensions-ide"))
     testCompile(project(":kotlin-android-extensions-runtime"))
@@ -20,16 +19,19 @@ dependencies {
     testCompile(project(":plugins:lint")) { isTransitive = false }
     testCompile(project(":plugins:uast-kotlin"))
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
+    testCompile(projectTests(":compiler:tests-common"))
     testCompile(projectTests(":jps-plugin"))
     testCompile(commonDep("junit:junit"))
     testCompileOnly(ideaSdkDeps("jps-builders"))
     testCompile(ideaSdkDeps("jps-build-test", subdir = "jps/test"))
     testCompile(ideaPluginDeps("*.jar", plugin = "android", subdir = "lib/jps"))
     testRuntime(project(":jps-plugin"))
+    testRuntime(projectTests(":compiler:tests-common-jvm6"))
     testRuntime(ideaSdkDeps("*.jar"))
     testRuntime(ideaPluginDeps("idea-junit", "resources_en", plugin = "junit"))
     testRuntime(ideaPluginDeps("*.jar", plugin = "gradle"))
     testRuntime(ideaPluginDeps("*.jar", plugin = "android"))
+    testRuntime(preloadedDeps("dx", subdir = "android-5.0/lib"))
 }
 
 sourceSets {
@@ -46,4 +48,3 @@ projectTest {
     dependsOnTaskIfExistsRec("dist", project = rootProject)
     workingDir = rootDir
 }
-

plugins/source-sections/source-sections-compiler/build.gradle.kts

@@ -10,13 +10,15 @@ dependencies {
     testCompile(project(":compiler:frontend"))
     testCompile(project(":compiler:frontend.script"))
     testCompile(project(":compiler:plugin-api"))
-    testCompile(project(":compiler:tests-common"))
     testCompile(project(":compiler:util"))
     testCompile(project(":compiler:cli"))
     testCompile(project(":compiler:cli-common"))
     testCompile(project(":compiler:frontend.java"))
     testCompile(project(":compiler:daemon-common"))
     testCompile(project(":kotlin-daemon-client"))
+    testCompile(projectTests(":compiler:tests-common"))
+    testCompile(ideaSdkDeps("idea", "idea_rt", "openapi"))
+    testCompile(commonDep("junit:junit"))
 }
 
 sourceSets {

plugins/uast-kotlin/build.gradle.kts

@@ -10,11 +10,12 @@ dependencies {
     compile(project(":compiler:light-classes"))
     compileOnly(ideaSdkDeps("openapi", "idea"))
     testCompile(projectDist(":kotlin-test:kotlin-test-jvm"))
-    testCompile(project(":compiler:tests-common"))
+    testCompile(projectTests(":compiler:tests-common"))
     testCompile(commonDep("junit:junit"))
     testCompile(project(":compiler:util"))
     testCompile(project(":compiler:cli"))
     testCompile(project(":idea:idea-test-framework"))
+    testCompileOnly(ideaSdkDeps("idea_rt"))
     testRuntime(ideaSdkDeps("*.jar"))
     testRuntime(ideaPluginDeps("*.jar", plugin = "junit"))
     testRuntime(ideaPluginDeps("*.jar", plugin = "gradle"))