Change Signature: Run tests with Kotlin stdlib

idea/idea-test-framework/src/org/jetbrains/kotlin/idea/test/ConfigLibraryUtil.java

@@ -75,9 +75,13 @@ public class ConfigLibraryUtil {
                                              PathUtil.getKotlinPathsForDistDirectory().getJsStdLibJarPath()), module);
     }
 
+    public static void unConfigureKotlinRuntime(Module module) {
+        removeLibrary(module, DEFAULT_JAVA_RUNTIME_LIB_NAME);
+    }
+
     public static void unConfigureKotlinRuntimeAndSdk(Module module, Sdk sdk) {
         configureSdk(module, sdk);
-        removeLibrary(module, DEFAULT_JAVA_RUNTIME_LIB_NAME);
+        unConfigureKotlinRuntime(module);
     }
 
     public static void unConfigureKotlinJsRuntimeAndSdk(Module module, Sdk sdk) {

idea/testData/refactoring/changeSignature/AddNewReceiverForMemberAfter.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(A(3)) {
         X(0).foo("1", 2)

idea/testData/refactoring/changeSignature/AddNewReceiverForMemberBefore.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(A(3)) {
         foo("1", 2)

idea/testData/refactoring/changeSignature/AddNewReceiverForMemberConflictBefore.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     A(3).foo("1", 2)
     with(A(3)) {

idea/testData/refactoring/changeSignature/AddPropertyReceiverAfter.kt

@@ -1,5 +1,3 @@
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 open class A {
     open var String.p: Int = 1
 }

idea/testData/refactoring/changeSignature/AddPropertyReceiverBefore.kt

@@ -1,5 +1,3 @@
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 open class A {
     open var <caret>p: Int = 1
 }

idea/testData/refactoring/changeSignature/AddTopLevelPropertyReceiverAfter.kt

@@ -1,7 +1,5 @@
 package test
 
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 class A
 
 open var <caret>A.p: Int

idea/testData/refactoring/changeSignature/AddTopLevelPropertyReceiverBefore.kt

@@ -1,7 +1,5 @@
 package test
 
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 class A
 
 open var <caret>p: Int

idea/testData/refactoring/changeSignature/ChangePropertyAfter.kt

@@ -1,5 +1,3 @@
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 open class A {
     open var s: String = 1
 }

idea/testData/refactoring/changeSignature/ChangePropertyBefore.kt

@@ -1,5 +1,3 @@
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 open class A {
     open var <caret>p: Int = 1
 }

idea/testData/refactoring/changeSignature/ChangePropertyReceiverAfter.kt

@@ -1,5 +1,3 @@
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 open class A {
     open var Int.<caret>p: Int = 1
 }

idea/testData/refactoring/changeSignature/ChangePropertyReceiverBefore.kt

@@ -1,5 +1,3 @@
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 open class A {
     open var String.<caret>p: Int = 1
 }

idea/testData/refactoring/changeSignature/ChangeReceiverForMemberAfter.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(A(3)) {
         "1".foo(X(0), 2)

idea/testData/refactoring/changeSignature/ChangeReceiverForMemberBefore.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(A(3)) {
         X(0).foo("1", 2)

idea/testData/refactoring/changeSignature/ChangeTopLevelPropertyReceiverAfter.kt

@@ -1,7 +1,5 @@
 package test
 
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 class A
 
 open var String.<caret>p: Int

idea/testData/refactoring/changeSignature/ChangeTopLevelPropertyReceiverBefore.kt

@@ -1,7 +1,5 @@
 package test
 
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 class A
 
 open var A.<caret>p: Int

idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember1After.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(A(3)) {
         X(0).foo("1", 2)

idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember1Before.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(A(3)) {
         foo(X(0), "1", 2)

idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember2After.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(A(3)) {
         X(0).foo("1", 2)

idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMember2Before.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(A(3)) {
         foo("1", X(0), 2)

idea/testData/refactoring/changeSignature/ConvertParameterToReceiverForMemberConflictBefore.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     A(3).foo(X(0), "1", 2)
     with(A(3)) {

idea/testData/refactoring/changeSignature/ConvertReceiverToParameter1After.kt

@@ -4,8 +4,6 @@ fun <caret>foo(x: X, s: String, k: Int): Boolean {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     foo(X(0), "1", 2)
     with(X(0)) {

idea/testData/refactoring/changeSignature/ConvertReceiverToParameter1Before.kt

@@ -4,8 +4,6 @@ fun X.<caret>foo(s: String, k: Int): Boolean {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     X(0).foo("1", 2)
     with(X(0)) {

idea/testData/refactoring/changeSignature/ConvertReceiverToParameter2After.kt

@@ -4,8 +4,6 @@ fun <caret>foo(s: String, x: X, k: Int): Boolean {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     foo("1", X(0), 2)
     with(X(0)) {

idea/testData/refactoring/changeSignature/ConvertReceiverToParameter2Before.kt

@@ -4,8 +4,6 @@ fun X.<caret>foo(s: String, k: Int): Boolean {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     X(0).foo("1", 2)
     with(X(0)) {

idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember1After.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(A(3)) {
         foo(X(0), "1", 2)

idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember1Before.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(A(3)) {
         X(0).foo("1", 2)

idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember2After.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(A(3)) {
         foo("1", X(0), 2)

idea/testData/refactoring/changeSignature/ConvertReceiverToParameterForMember2Before.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(A(3)) {
         X(0).foo("1", 2)

idea/testData/refactoring/changeSignature/ParameterToReceiverImplicitReceiversAfter.kt

@@ -1,5 +1,3 @@
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 class C {
     fun String.foo() {
         with(1) {

idea/testData/refactoring/changeSignature/ParameterToReceiverImplicitReceiversBefore.kt

@@ -1,5 +1,3 @@
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 class C {
     fun <caret>foo(s: String) {
         with(1) {

idea/testData/refactoring/changeSignature/ReceiverToParameterImplicitReceiversAfter.kt

@@ -1,5 +1,3 @@
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 class C {
     fun foo(s: String) {
         with(1) {

idea/testData/refactoring/changeSignature/ReceiverToParameterImplicitReceiversBefore.kt

@@ -1,5 +1,3 @@
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 class C {
     fun String.<caret>foo() {
         with(1) {

idea/testData/refactoring/changeSignature/RemovePropertyReceiverAfter.kt

@@ -1,5 +1,3 @@
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 open class A {
     open var p: Int = 1
 }

idea/testData/refactoring/changeSignature/RemovePropertyReceiverBefore.kt

@@ -1,5 +1,3 @@
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 open class A {
     open var String.<caret>p: Int = 1
 }

idea/testData/refactoring/changeSignature/RemoveReceiverAfter.kt

@@ -4,8 +4,6 @@ fun foo(s: String, k: Int): Boolean {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(X(0)) {
         foo("1", 2)

idea/testData/refactoring/changeSignature/RemoveReceiverBefore.kt

@@ -4,8 +4,6 @@ fun X.<caret>foo(s: String, k: Int): Boolean {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(X(0)) {
         foo("1", 2)

idea/testData/refactoring/changeSignature/RemoveReceiverForMemberAfter.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(A(3)) {
         foo("1", 2)

idea/testData/refactoring/changeSignature/RemoveReceiverForMemberBefore.kt

@@ -10,8 +10,6 @@ class A(val k: Int) {
 
 class X(val k: Int)
 
-fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 fun test() {
     with(A(3)) {
         X(0).foo("1", 2)

idea/testData/refactoring/changeSignature/RemoveTopLevelPropertyReceiverAfter.kt

@@ -1,7 +1,5 @@
 package test
 
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 class A
 
 open var <caret>p: Int

idea/testData/refactoring/changeSignature/RemoveTopLevelPropertyReceiverBefore.kt

@@ -1,7 +1,5 @@
 package test
 
-public inline fun <T, R> with(receiver: T, f: T.() -> R): R = receiver.f()
-
 class A
 
 open var A.<caret>p: Int

idea/tests/org/jetbrains/kotlin/idea/refactoring/changeSignature/JetChangeSignatureTest.java

@@ -47,6 +47,7 @@ import org.jetbrains.kotlin.idea.refactoring.JetRefactoringBundle;
 import org.jetbrains.kotlin.idea.refactoring.changeSignature.ui.KotlinMethodNode;
 import org.jetbrains.kotlin.idea.stubindex.JetFullClassNameIndex;
 import org.jetbrains.kotlin.idea.stubindex.JetTopLevelFunctionFqnNameIndex;
+import org.jetbrains.kotlin.idea.test.ConfigLibraryUtil;
 import org.jetbrains.kotlin.idea.test.DirectiveBasedActionUtils;
 import org.jetbrains.kotlin.idea.test.KotlinCodeInsightTestCase;
 import org.jetbrains.kotlin.idea.test.PluginTestCaseBase;
@@ -1348,13 +1349,15 @@ public class JetChangeSignatureTest extends KotlinCodeInsightTestCase {
     protected void setUp() throws Exception {
         super.setUp();
         editors = new ArrayList<Editor>();
+        ConfigLibraryUtil.configureKotlinRuntime(getModule());
     }
 
     @Override
     protected void tearDown() throws Exception {
-        super.tearDown();
+        ConfigLibraryUtil.unConfigureKotlinRuntime(getModule());
         editors.clear();
         editors = null;
+        super.tearDown();
     }
 
     @NotNull