diff --git a/compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.instructions b/compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.instructions deleted file mode 100644 index 69a7401f616..00000000000 --- a/compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.instructions +++ /dev/null @@ -1,106 +0,0 @@ -== Bar == -class Bar { - fun invoke(x: Int): Int = x - fun invoke(x: Int, y: Int) {} -} ---------------------- -L0: - 1 -L1: - NEXT:[] -error: - PREV:[] -sink: - PREV:[, ] -===================== -== invoke == -fun invoke(x: Int): Int = x ---------------------- -L0: - 1 - v(x: Int) - magic[FAKE_INITIALIZER](x: Int) -> - w(x|) - r(x) -> - ret(*|) L1 -L1: - NEXT:[] -error: - PREV:[] -sink: - PREV:[, ] -===================== -== invoke == -fun invoke(x: Int, y: Int) {} ---------------------- -L0: - 1 - v(x: Int) - magic[FAKE_INITIALIZER](x: Int) -> - w(x|) - v(y: Int) - magic[FAKE_INITIALIZER](y: Int) -> - w(y|) - 2 mark({}) - read (Unit) -L1: - 1 NEXT:[] -error: - PREV:[] -sink: - PREV:[, ] -===================== -== Foo == -class Foo { - val get: Bar = Bar() - val set: Bar = Bar() -} ---------------------- -L0: - 1 - v(val get: Bar = Bar()) - mark(Bar()) - call(Bar(), ) -> - w(get|) - v(val set: Bar = Bar()) - mark(Bar()) - call(Bar(), ) -> - w(set|) -L1: - NEXT:[] -error: - PREV:[] -sink: - PREV:[, ] -===================== -== test == -fun test(foo: Foo) { - foo[1] += 2 -} ---------------------- -L0: - 1 - v(foo: Foo) - magic[FAKE_INITIALIZER](foo: Foo) -> - w(foo|) - 2 mark({ foo[1] += 2 }) - mark(foo[1]) - r(foo) -> - r(foo[1], get|) -> - r(1) -> - mark(foo[1]) - call(foo[1], invoke|, ) -> - r(2) -> - mark(foo[1] += 2) - call(foo[1] += 2, plus|, ) -> - r(foo) -> - r(foo[1], set|) -> - r(1) -> - call(foo[1] += 2, invoke|, , ) -> -L1: - 1 NEXT:[] -error: - PREV:[] -sink: - PREV:[, ] -===================== diff --git a/compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.kt b/compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.kt deleted file mode 100644 index cc5b0539703..00000000000 --- a/compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.kt +++ /dev/null @@ -1,13 +0,0 @@ -class Bar { - fun invoke(x: Int): Int = x - fun invoke(x: Int, y: Int) {} -} - -class Foo { - val get: Bar = Bar() - val set: Bar = Bar() -} - -fun test(foo: Foo) { - foo[1] += 2 -} \ No newline at end of file diff --git a/compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.values b/compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.values deleted file mode 100644 index b0d41971a23..00000000000 --- a/compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.values +++ /dev/null @@ -1,41 +0,0 @@ -== Bar == -class Bar { - fun invoke(x: Int): Int = x - fun invoke(x: Int, y: Int) {} -} ---------------------- -===================== -== invoke == -fun invoke(x: Int): Int = x ---------------------- - : Int NEW: magic[FAKE_INITIALIZER](x: Int) -> -x : Int NEW: r(x) -> -===================== -== invoke == -fun invoke(x: Int, y: Int) {} ---------------------- - : Int NEW: magic[FAKE_INITIALIZER](x: Int) -> - : Int NEW: magic[FAKE_INITIALIZER](y: Int) -> -===================== -== Foo == -class Foo { - val get: Bar = Bar() - val set: Bar = Bar() -} ---------------------- -Bar() : Bar NEW: call(Bar(), ) -> -Bar() : Bar NEW: call(Bar(), ) -> -===================== -== test == -fun test(foo: Foo) { - foo[1] += 2 -} ---------------------- - : Foo NEW: magic[FAKE_INITIALIZER](foo: Foo) -> -foo : Foo NEW: r(foo) -> -1 : Int NEW: r(1) -> -foo[1] : Bar NEW: r(foo[1], set|) -> -2 : Int NEW: r(2) -> -foo[1] += 2 : * NEW: call(foo[1] += 2, invoke|, , ) -> -{ foo[1] += 2 } : * COPY -===================== diff --git a/compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.instructions b/compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.instructions deleted file mode 100644 index 28b80050177..00000000000 --- a/compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.instructions +++ /dev/null @@ -1,99 +0,0 @@ -== Bar == -class Bar { - fun invoke(x: Int, y: Int) {} -} ---------------------- -L0: - 1 -L1: - NEXT:[] -error: - PREV:[] -sink: - PREV:[, ] -===================== -== invoke == -fun invoke(x: Int, y: Int) {} ---------------------- -L0: - 1 - v(x: Int) - magic[FAKE_INITIALIZER](x: Int) -> - w(x|) - v(y: Int) - magic[FAKE_INITIALIZER](y: Int) -> - w(y|) - 2 mark({}) - read (Unit) -L1: - 1 NEXT:[] -error: - PREV:[] -sink: - PREV:[, ] -===================== -== Foo == -class Foo { - val set: Bar = Bar() -} ---------------------- -L0: - 1 - v(val set: Bar = Bar()) - mark(Bar()) - call(Bar(), ) -> - w(set|) -L1: - NEXT:[] -error: - PREV:[] -sink: - PREV:[, ] -===================== -== get == -fun Foo.get(x: Int): Int = x ---------------------- -L0: - 1 - v(x: Int) - magic[FAKE_INITIALIZER](x: Int) -> - w(x|) - r(x) -> - ret(*|) L1 -L1: - NEXT:[] -error: - PREV:[] -sink: - PREV:[, ] -===================== -== test == -fun test(foo: Foo) { - foo[1] += 2 -} ---------------------- -L0: - 1 - v(foo: Foo) - magic[FAKE_INITIALIZER](foo: Foo) -> - w(foo|) - 2 mark({ foo[1] += 2 }) - mark(foo[1]) - r(foo) -> - r(1) -> - mark(foo[1]) - call(foo[1], get|, ) -> - r(2) -> - mark(foo[1] += 2) - call(foo[1] += 2, plus|, ) -> - r(foo) -> - r(foo[1], set|) -> - r(1) -> - call(foo[1] += 2, invoke|, , ) -> -L1: - 1 NEXT:[] -error: - PREV:[] -sink: - PREV:[, ] -===================== diff --git a/compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.kt b/compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.kt deleted file mode 100644 index 031b314f778..00000000000 --- a/compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.kt +++ /dev/null @@ -1,13 +0,0 @@ -class Bar { - fun invoke(x: Int, y: Int) {} -} - -class Foo { - val set: Bar = Bar() -} - -fun Foo.get(x: Int): Int = x - -fun test(foo: Foo) { - foo[1] += 2 -} \ No newline at end of file diff --git a/compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.values b/compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.values deleted file mode 100644 index 57d465a96fb..00000000000 --- a/compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.values +++ /dev/null @@ -1,38 +0,0 @@ -== Bar == -class Bar { - fun invoke(x: Int, y: Int) {} -} ---------------------- -===================== -== invoke == -fun invoke(x: Int, y: Int) {} ---------------------- - : Int NEW: magic[FAKE_INITIALIZER](x: Int) -> - : Int NEW: magic[FAKE_INITIALIZER](y: Int) -> -===================== -== Foo == -class Foo { - val set: Bar = Bar() -} ---------------------- -Bar() : Bar NEW: call(Bar(), ) -> -===================== -== get == -fun Foo.get(x: Int): Int = x ---------------------- - : Int NEW: magic[FAKE_INITIALIZER](x: Int) -> -x : Int NEW: r(x) -> -===================== -== test == -fun test(foo: Foo) { - foo[1] += 2 -} ---------------------- - : Foo NEW: magic[FAKE_INITIALIZER](foo: Foo) -> -foo : Foo NEW: r(foo) -> -1 : Int NEW: r(1) -> -foo[1] : Bar NEW: r(foo[1], set|) -> -2 : Int NEW: r(2) -> -foo[1] += 2 : * NEW: call(foo[1] += 2, invoke|, , ) -> -{ foo[1] += 2 } : * COPY -===================== diff --git a/compiler/testData/cfg/conventions/getViaVar.kt b/compiler/testData/cfg/conventions/getViaVar.kt deleted file mode 100644 index 64863114b31..00000000000 --- a/compiler/testData/cfg/conventions/getViaVar.kt +++ /dev/null @@ -1,15 +0,0 @@ -class Bar { - fun invoke(x: Int): Int = x -} - -class Foo { - val get: Bar = Bar() -} - -fun test1(foo: Foo) { - foo[1] -} - -fun test2(foo: Foo, get: Foo.(Int) -> Int) { - foo[1] -} \ No newline at end of file diff --git a/compiler/testData/cfg/conventions/getViaVar.values b/compiler/testData/cfg/conventions/getViaVar.values deleted file mode 100644 index 30441f54865..00000000000 --- a/compiler/testData/cfg/conventions/getViaVar.values +++ /dev/null @@ -1,42 +0,0 @@ -== Bar == -class Bar { - fun invoke(x: Int): Int = x -} ---------------------- -===================== -== invoke == -fun invoke(x: Int): Int = x ---------------------- - : Int NEW: magic[FAKE_INITIALIZER](x: Int) -> -x : Int NEW: r(x) -> -===================== -== Foo == -class Foo { - val get: Bar = Bar() -} ---------------------- -Bar() : Bar NEW: call(Bar(), ) -> -===================== -== test1 == -fun test1(foo: Foo) { - foo[1] -} ---------------------- - : Foo NEW: magic[FAKE_INITIALIZER](foo: Foo) -> -foo : Foo NEW: r(foo) -> -1 : Int NEW: r(1) -> -foo[1] : * NEW: call(foo[1], invoke|, ) -> -{ foo[1] } : * COPY -===================== -== test2 == -fun test2(foo: Foo, get: Foo.(Int) -> Int) { - foo[1] -} ---------------------- - : Foo NEW: magic[FAKE_INITIALIZER](foo: Foo) -> - : {<: Foo.(Int) -> Int} NEW: magic[FAKE_INITIALIZER](get: Foo.(Int) -> Int) -> -foo : Foo NEW: r(foo) -> -1 : Int NEW: r(1) -> -foo[1] : * NEW: call(foo[1], invoke|, , ) -> -{ foo[1] } : * COPY -===================== diff --git a/compiler/testData/cfg/conventions/setViaVar.kt b/compiler/testData/cfg/conventions/setViaVar.kt deleted file mode 100644 index 05a19d6bd12..00000000000 --- a/compiler/testData/cfg/conventions/setViaVar.kt +++ /dev/null @@ -1,15 +0,0 @@ -class Bar { - fun invoke(x: Int, y: Int) {} -} - -class Foo { - val set: Bar = Bar() -} - -fun test1(foo: Foo) { - foo[1] = 2 -} - -fun test2(foo: Foo, set: Foo.(Int, Int) -> Int) { - foo[1] = 2 -} \ No newline at end of file diff --git a/compiler/testData/cfg/conventions/setViaVar.values b/compiler/testData/cfg/conventions/setViaVar.values deleted file mode 100644 index 90dcbd2e3d3..00000000000 --- a/compiler/testData/cfg/conventions/setViaVar.values +++ /dev/null @@ -1,46 +0,0 @@ -== Bar == -class Bar { - fun invoke(x: Int, y: Int) {} -} ---------------------- -===================== -== invoke == -fun invoke(x: Int, y: Int) {} ---------------------- - : Int NEW: magic[FAKE_INITIALIZER](x: Int) -> - : Int NEW: magic[FAKE_INITIALIZER](y: Int) -> -===================== -== Foo == -class Foo { - val set: Bar = Bar() -} ---------------------- -Bar() : Bar NEW: call(Bar(), ) -> -===================== -== test1 == -fun test1(foo: Foo) { - foo[1] = 2 -} ---------------------- - : Foo NEW: magic[FAKE_INITIALIZER](foo: Foo) -> -foo : Foo NEW: r(foo) -> -1 : Int NEW: r(1) -> -foo[1] : Bar NEW: r(foo[1], set|) -> -2 : Int NEW: r(2) -> -foo[1] = 2 : * NEW: call(foo[1] = 2, invoke|, , ) -> -{ foo[1] = 2 } : * COPY -===================== -== test2 == -fun test2(foo: Foo, set: Foo.(Int, Int) -> Int) { - foo[1] = 2 -} ---------------------- - : Foo NEW: magic[FAKE_INITIALIZER](foo: Foo) -> - : {<: Foo.(Int, Int) -> Int} NEW: magic[FAKE_INITIALIZER](set: Foo.(Int, Int) -> Int) -> -foo : Foo NEW: r(foo) -> -1 : Int NEW: r(1) -> -foo[1] : {<: (Foo, Int, Int) -> Int} NEW: r(foo[1], set) -> -2 : Int NEW: r(2) -> -foo[1] = 2 : * NEW: call(foo[1] = 2, invoke|, , , ) -> -{ foo[1] = 2 } : * COPY -===================== diff --git a/compiler/testData/codegen/box/operatorConventions/kt4991.kt b/compiler/testData/codegen/box/operatorConventions/kt4991.kt deleted file mode 100644 index 86aa5d06081..00000000000 --- a/compiler/testData/codegen/box/operatorConventions/kt4991.kt +++ /dev/null @@ -1,24 +0,0 @@ -var a = A() -var b = A() - -class A(var value: Int = 0) - -fun prefix(inc: A.() -> A) { - ++a -} - -fun postfix(inc: A.() -> A) { - b++ -} - -fun box(): String { - prefix { ++value; this } - - if (a.value != 1) return "fail 1" - - postfix { value++; this } - - if (b.value != 1) return "fail 2" - - return "OK" -} \ No newline at end of file diff --git a/compiler/testData/codegen/box/regressions/kt4682.kt b/compiler/testData/codegen/box/regressions/kt4682.kt deleted file mode 100644 index c3cac1045f0..00000000000 --- a/compiler/testData/codegen/box/regressions/kt4682.kt +++ /dev/null @@ -1,8 +0,0 @@ -fun foo(compareTo: Any.(p: Function0) -> Int, p: () -> Int) { - p < p -} - -fun box(): String { - foo({ it() }, { 42 }) - return "OK" -} diff --git a/compiler/testData/codegen/box/regressions/unjustifiedReferenceTarget.kt b/compiler/testData/codegen/box/regressions/unjustifiedReferenceTarget.kt deleted file mode 100644 index d2e11c59949..00000000000 --- a/compiler/testData/codegen/box/regressions/unjustifiedReferenceTarget.kt +++ /dev/null @@ -1,10 +0,0 @@ -class A - -fun foo(plusAssign: A.(A) -> Unit) { - A() += A() -} - -fun box(): String { - foo { } - return "OK" -} diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java index d6a22af62f7..2ede71e9dbf 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/ControlFlowTestGenerated.java @@ -277,30 +277,12 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { doTest(fileName); } - @TestMetadata("complexAssignmentWithGetSetViaVar.kt") - public void testComplexAssignmentWithGetSetViaVar() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.kt"); - doTest(fileName); - } - - @TestMetadata("complexAssignmentWithSetViaVar.kt") - public void testComplexAssignmentWithSetViaVar() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.kt"); - doTest(fileName); - } - @TestMetadata("equals.kt") public void testEquals() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/equals.kt"); doTest(fileName); } - @TestMetadata("getViaVar.kt") - public void testGetViaVar() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/getViaVar.kt"); - doTest(fileName); - } - @TestMetadata("incrementAtTheEnd.kt") public void testIncrementAtTheEnd() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/incrementAtTheEnd.kt"); @@ -318,12 +300,6 @@ public class ControlFlowTestGenerated extends AbstractControlFlowTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/notEqual.kt"); doTest(fileName); } - - @TestMetadata("setViaVar.kt") - public void testSetViaVar() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/setViaVar.kt"); - doTest(fileName); - } } @TestMetadata("compiler/testData/cfg/deadCode") diff --git a/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java index 6f20b22ce6d..440d0150fcd 100644 --- a/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/cfg/PseudoValueTestGenerated.java @@ -279,30 +279,12 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { doTest(fileName); } - @TestMetadata("complexAssignmentWithGetSetViaVar.kt") - public void testComplexAssignmentWithGetSetViaVar() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithGetSetViaVar.kt"); - doTest(fileName); - } - - @TestMetadata("complexAssignmentWithSetViaVar.kt") - public void testComplexAssignmentWithSetViaVar() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/complexAssignmentWithSetViaVar.kt"); - doTest(fileName); - } - @TestMetadata("equals.kt") public void testEquals() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/equals.kt"); doTest(fileName); } - @TestMetadata("getViaVar.kt") - public void testGetViaVar() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/getViaVar.kt"); - doTest(fileName); - } - @TestMetadata("incrementAtTheEnd.kt") public void testIncrementAtTheEnd() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/incrementAtTheEnd.kt"); @@ -320,12 +302,6 @@ public class PseudoValueTestGenerated extends AbstractPseudoValueTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/notEqual.kt"); doTest(fileName); } - - @TestMetadata("setViaVar.kt") - public void testSetViaVar() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/cfg/conventions/setViaVar.kt"); - doTest(fileName); - } } @TestMetadata("compiler/testData/cfg/deadCode") diff --git a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java index 3bf92d6aa3b..c1a2fd12b9d 100644 --- a/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java +++ b/compiler/tests/org/jetbrains/kotlin/codegen/BlackBoxCodegenTestGenerated.java @@ -9253,12 +9253,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } - @TestMetadata("kt4991.kt") - public void testKt4991() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/kt4991.kt"); - doTest(fileName); - } - @TestMetadata("nestedMaps.kt") public void testNestedMaps() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/operatorConventions/nestedMaps.kt"); @@ -12622,12 +12616,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { doTest(fileName); } - @TestMetadata("kt4682.kt") - public void testKt4682() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt4682.kt"); - doTest(fileName); - } - @TestMetadata("kt5056.kt") public void testKt5056() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/kt5056.kt"); @@ -12759,12 +12747,6 @@ public class BlackBoxCodegenTestGenerated extends AbstractBlackBoxCodegenTest { String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/typeCastException.kt"); doTest(fileName); } - - @TestMetadata("unjustifiedReferenceTarget.kt") - public void testUnjustifiedReferenceTarget() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("compiler/testData/codegen/box/regressions/unjustifiedReferenceTarget.kt"); - doTest(fileName); - } } @TestMetadata("compiler/testData/codegen/box/reified") diff --git a/idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt b/idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt deleted file mode 100644 index b88830f35d5..00000000000 --- a/idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt +++ /dev/null @@ -1,6 +0,0 @@ -// PARAM_DESCRIPTOR: value-parameter unaryPlus: kotlin.String.() -> kotlin.Unit defined in foo -// PARAM_TYPES: kotlin.String.() -> kotlin.Unit - -fun foo(unaryPlus: String.() -> Unit) { - + "A" -} diff --git a/idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt.after b/idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt.after deleted file mode 100644 index 7d6471c3cb0..00000000000 --- a/idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt.after +++ /dev/null @@ -1,8 +0,0 @@ -// PARAM_DESCRIPTOR: value-parameter unaryPlus: kotlin.String.() -> kotlin.Unit defined in foo -// PARAM_TYPES: kotlin.String.() -> kotlin.Unit - -fun foo(unaryPlus: String.() -> Unit) { - "A".(function(plus))() -} - -private fun function(unaryPlus: String.() -> Unit) = unaryPlus diff --git a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java index 4ea5a41d942..33addb26663 100644 --- a/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java +++ b/idea/tests/org/jetbrains/kotlin/idea/refactoring/introduce/ExtractionTestGenerated.java @@ -837,12 +837,6 @@ public class ExtractionTestGenerated extends AbstractExtractionTest { doExtractFunctionTest(fileName); } - @TestMetadata("convertUnaryExpression.kt") - public void testConvertUnaryExpression() throws Exception { - String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/convertUnaryExpression.kt"); - doExtractFunctionTest(fileName); - } - @TestMetadata("delegatingFunction.kt") public void testDelegatingFunction() throws Exception { String fileName = KotlinTestUtils.navigationMetadata("idea/testData/refactoring/extractFunction/basic/delegatingFunction.kt"); diff --git a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/OperatorOverloadingTest.java b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/OperatorOverloadingTest.java index 3cd8598d496..e21b88448c0 100644 --- a/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/OperatorOverloadingTest.java +++ b/js/js.tests/test/org/jetbrains/kotlin/js/test/semantics/OperatorOverloadingTest.java @@ -1,5 +1,5 @@ /* - * Copyright 2010-2015 JetBrains s.r.o. + * Copyright 2010-2016 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. @@ -120,8 +120,4 @@ public final class OperatorOverloadingTest extends SingleFileTranslationTest { public void testOverloadUnaryOperationsViaExtensionFunctions() throws Exception { fooBoxTest(); } - - public void testOverloadByLambda() throws Exception { - checkFooBoxIsOk(); - } } diff --git a/js/js.translator/testData/expression/compareTo/cases/customCompareToMethod.kt b/js/js.translator/testData/expression/compareTo/cases/customCompareToMethod.kt index 563bcb3f30d..6c07b6bb183 100644 --- a/js/js.translator/testData/expression/compareTo/cases/customCompareToMethod.kt +++ b/js/js.translator/testData/expression/compareTo/cases/customCompareToMethod.kt @@ -12,8 +12,6 @@ fun testExtensionFunctionAsCompareTo() { val x: B = B(100) val y: B = B(200) - assertEquals(false, x < y, "ext fun: x < y") - assertEquals(true, x > y, "ext fun: x > y") assertEquals(1, x.compareTo(y), "ext fun: x compareTo y") } diff --git a/js/js.translator/testData/operatorOverloading/cases/overloadByLambda.kt b/js/js.translator/testData/operatorOverloading/cases/overloadByLambda.kt deleted file mode 100644 index 1759fb741c5..00000000000 --- a/js/js.translator/testData/operatorOverloading/cases/overloadByLambda.kt +++ /dev/null @@ -1,19 +0,0 @@ -// EA-56241 -package foo - -class A(val v: Int) - -val times: A.(Int) -> Int = { a -> this.v * a } - -fun test(div: A.(Int) -> Int) = A(20) / 4 - -fun box(): String { - val compareTo: A.(A) -> Int = { a: A -> this.v - a.v } - - assertEquals(28, A(4) * 7) - assertEquals(5, test { this.v / it }) - assertEquals(false, A(49) <= A(7)) - assertEquals(true, A(5) > A(1)) - - return "OK" -}