From b3e306ac32bcc9a773f08dbf7486e92bd00c06de Mon Sep 17 00:00:00 2001
From: pTalanov <talanov.pavel@gmail.com>
Date: Tue, 13 Mar 2012 18:42:28 +0400
Subject: [PATCH] KT-740 Turn on KT-740-3.kt test. Fix a typo.

---
 .../jetbrains/k2js/test/semantics/MiscTest.java  |  6 +++---
 .../KotlinPropertyAccessTranslator.java          |  2 +-
 .../testFiles/expression/misc/cases/KT-740-3.kt  | 16 ++++++++--------
 3 files changed, 12 insertions(+), 12 deletions(-)

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 cb6f6ece388..2f33d39c668 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
@@ -87,7 +87,7 @@ public final class MiscTest extends AbstractExpressionTest {
 
     //TODO: depends on KT-1198
     //TODO: look into BindingContext.VARIABLE_REASSIGNMENT
-//    public void testKt740_3() throws Exception {
-//        checkFooBoxIsOk("KT-740-3.kt");
-//    }
+    public void testKt740_3() throws Exception {
+        checkFooBoxIsOk("KT-740-3.kt");
+    }
 }
diff --git a/js/js.translator/src/org/jetbrains/k2js/translate/reference/KotlinPropertyAccessTranslator.java b/js/js.translator/src/org/jetbrains/k2js/translate/reference/KotlinPropertyAccessTranslator.java
index 2ffbb0055fe..60bab281814 100644
--- a/js/js.translator/src/org/jetbrains/k2js/translate/reference/KotlinPropertyAccessTranslator.java
+++ b/js/js.translator/src/org/jetbrains/k2js/translate/reference/KotlinPropertyAccessTranslator.java
@@ -76,7 +76,7 @@ public final class KotlinPropertyAccessTranslator extends PropertyAccessTranslat
     @NotNull
     public JsExpression translateAsSet(@Nullable JsExpression receiver, @NotNull JsExpression toSetTo) {
         PropertySetterDescriptor setter = propertyDescriptor.getSetter();
-        assert setter != null : "Setter for kotlin properties should bot be null.";
+        assert setter != null : "Setter for kotlin properties should not be null.";
         return callBuilderForAccessor(receiver)
                 .args(toSetTo)
                 .descriptor(setter)
diff --git a/js/js.translator/testFiles/expression/misc/cases/KT-740-3.kt b/js/js.translator/testFiles/expression/misc/cases/KT-740-3.kt
index 46ccd854d64..182592dc1fe 100644
--- a/js/js.translator/testFiles/expression/misc/cases/KT-740-3.kt
+++ b/js/js.translator/testFiles/expression/misc/cases/KT-740-3.kt
@@ -9,12 +9,13 @@ class A() {
     fun divAssign(a : Int) {
         c1++;
     }
-    fun times(a : Int) {
+    fun times(a : Int) : A {
         c2++;
+        return this;
     }
 }
 
-val a : A = A()
+var a : A = A()
 get() {
   c0++
   return $a
@@ -30,12 +31,11 @@ fun box() : String {
         return "2"
     }
     a *= 3
-    if (c0 != 1) {
+    if (c0 != 2) {
         return "3"
     }
-  if (c2 != 1) {
-    return "4"
-  }
-  return "OK"
-
+    if (c2 != 1) {
+      return "4"
+    }
+    return "OK"
 }
\ No newline at end of file