Move common test parts to tests-common. Minify test jar dependencies

compiler/build.gradle.kts

@@ -81,8 +81,6 @@ jar.apply {
     }
 }
 
-testsJar {}
-
 projectTest {
     dependsOn(*testDistProjects.map { "$it:dist" }.toTypedArray())
     workingDir = rootDir

compiler/tests-common/build.gradle.kts

@@ -7,6 +7,7 @@ dependencies {
     testCompile(project(":core:deserialization"))
     testCompile(project(":compiler:util"))
     testCompile(project(":compiler:backend"))
+    testCompile(project(":compiler:ir.ir2cfg"))
     testCompile(project(":compiler:frontend"))
     testCompile(project(":compiler:frontend.java"))
     testCompile(project(":compiler:util"))

compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractClosureAnnotatorTestCase.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrCfgTestCase.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrGeneratorTestCase.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractIrTextTestCase.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrBoxTestCase.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/tests-common/tests/org/jetbrains/kotlin/ir/AbstractPsi2IrDiagnosticsTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractCompileJavaAgainstKotlinTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractLoadKotlinWithTypeTableTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2015 JetBrains s.r.o.
+ * Copyright 2010-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/tests-common/tests/org/jetbrains/kotlin/jvm/compiler/AbstractWriteSignatureTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -214,9 +214,9 @@ abstract class AbstractWriteSignatureTest : TestCaseWithTmpdir() {
                     throw AssertionError("$ktFile:${lineNo+1}: use $className\$$memberName to denote inner class")
                 }
 
-                val jvmSignatureMatch = jvmSignatureRegex.matchExact(lines[lineNo+1])
-                val genericSignatureMatch = genericSignatureRegex.matchExact(lines[lineNo+1])
-                                            ?: genericSignatureRegex.matchExact(lines[lineNo+2])
+                val jvmSignatureMatch = jvmSignatureRegex.matchExact(lines[lineNo + 1])
+                val genericSignatureMatch = genericSignatureRegex.matchExact(lines[lineNo + 1])
+                                            ?: genericSignatureRegex.matchExact(lines[lineNo + 2])
 
                 if (genericSignatureMatch != null) {
                     val jvmSignature = jvmSignatureMatch?.group(1)

compiler/tests-common/tests/org/jetbrains/kotlin/serialization/builtins/AbstractBuiltInsWithJDKMembersTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2010-2016 JetBrains s.r.o.
+ * Copyright 2010-2017 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

compiler/tests-ir-jvm/build.gradle.kts

@@ -3,7 +3,6 @@ apply { plugin("kotlin") }
 
 dependencies {
     testCompile(projectTests(":compiler:tests-common"))
-    testRuntime(projectTests(":compiler"))
 }
 
 sourceSets {

compiler/tests-java8/build.gradle.kts

@@ -4,7 +4,7 @@ apply { plugin("kotlin") }
 
 dependencies {
     testCompile(projectTests(":compiler:tests-common"))
-    testCompile(projectTests(":compiler"))
+    testCompile(projectTests(":generators:test-generator"))
 }
 
 sourceSets {
@@ -17,8 +17,6 @@ tasks.withType<KotlinCompile> {
     kotlinOptions.jvmTarget = "1.8"
 }
 
-testsJar {}
-
 projectTest {
     executable = "${rootProject.extra["JDK_18"]!!}/bin/java"
     dependsOnTaskIfExistsRec("dist", project = rootProject)

generators/build.gradle.kts

@@ -16,8 +16,7 @@ dependencies {
     compile(project(":idea:idea-test-framework"))
     compile(projectDist(":kotlin-test:kotlin-test-jvm"))
     compile(projectTests(":kotlin-build-common"))
-    compile(projectTests(":compiler"))
-    compile(projectTests(":compiler:tests-java8"))
+    compile(projectTests(":compiler:tests-common"))
     compile(projectTests(":compiler:container"))
     compile(projectTests(":compiler:incremental-compilation-impl"))
     compile(projectTests(":idea"))