diff --git a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java index 2aa01d656d3..c1bdd076918 100644 --- a/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java +++ b/js/js.tests/test/org/jetbrains/k2js/test/semantics/MiscTest.java @@ -56,8 +56,12 @@ public final class MiscTest extends AbstractExpressionTest { } } + public void testKt1052_2() throws Exception { + checkFooBoxIsTrue("KT-1052-2.kt"); + } + public void testKt1052() throws Exception { - checkFooBoxIsTrue("KT1052.kt"); + checkOutput("KT-1052.kt", "true\n"); } diff --git a/js/js.translator/testFiles/expression/misc/cases/KT1052.kt b/js/js.translator/testFiles/expression/misc/cases/KT-1052-2.kt similarity index 100% rename from js/js.translator/testFiles/expression/misc/cases/KT1052.kt rename to js/js.translator/testFiles/expression/misc/cases/KT-1052-2.kt diff --git a/js/js.translator/testFiles/expression/misc/cases/KT-1052.kt b/js/js.translator/testFiles/expression/misc/cases/KT-1052.kt new file mode 100644 index 00000000000..c8dd1669711 --- /dev/null +++ b/js/js.translator/testFiles/expression/misc/cases/KT-1052.kt @@ -0,0 +1,17 @@ +fun main(args : Array) { + println(true.and1(true)) +} + +fun Boolean.and1(other : Boolean) : Boolean{ + if(other == true) { + if(this == true){ + return true ; + } + else{ + return false; + } + } + else { + return false; + } +}