From cc337094e97ef406a98cff0dec3df20a706a7ec4 Mon Sep 17 00:00:00 2001
From: Rossen Hristov <rossen.hristov@telerik.com>
Date: Thu, 12 Jan 2017 14:12:41 +0200
Subject: [PATCH] Fix text & fromattedText failing tests

---
 tests/app/ui/tab-view/tab-view-tests.ts       |  2 +-
 .../xml-declaration/xml-declaration-tests.ts  | 20 +++++++++----------
 .../ui/text-base/text-base.android.ts         |  1 +
 .../ui/text-base/text-base.ios.ts             |  4 +++-
 .../ui/text-field/text-field.ios.ts           |  4 ----
 .../ui/text-view/text-view.ios.ts             |  4 ----
 6 files changed, 15 insertions(+), 20 deletions(-)

diff --git a/tests/app/ui/tab-view/tab-view-tests.ts b/tests/app/ui/tab-view/tab-view-tests.ts
index f6f818922..1e6af6658 100644
--- a/tests/app/ui/tab-view/tab-view-tests.ts
+++ b/tests/app/ui/tab-view/tab-view-tests.ts
@@ -330,7 +330,7 @@ export class TabViewTest extends testModule.UITest<tabViewModule.TabView> {
         assertFontsAreEqual(tabViewTestsNative.getNativeFont(this.testView), nativeFont, "Font must be bold 12 monospace after rebinding items.");
         //console.log(`>>>>>>>>>>>>> nativeFont: ${fontToString(nativeFont)}`);
 
-        console.log(`>>>>>>>>>>>>> RESET`);
+        //console.log(`>>>>>>>>>>>>> RESET`);
         this.testView.style.font = unsetValue;
         assertFontsAreEqual(tabViewTestsNative.getNativeFont(this.testView), originalFont, "Font must be the original one after resetting the style.");
     }
diff --git a/tests/app/xml-declaration/xml-declaration-tests.ts b/tests/app/xml-declaration/xml-declaration-tests.ts
index e9f5b3de6..1ca9ea566 100644
--- a/tests/app/xml-declaration/xml-declaration-tests.ts
+++ b/tests/app/xml-declaration/xml-declaration-tests.ts
@@ -700,8 +700,8 @@ export function test_parseSpansDirectlyOnLabel() {
     function testAction(views: Array<viewModule.View>) {
         var page = <Page>views[0];
         var testLabel = <Label>page.getViewById("testLabel");
-        TKUnit.assertEqual(testLabel.formattedText + "", "We areAwesome", "Formatted string should be set");
-        TKUnit.assertEqual(testLabel.text + "", "We areAwesome", "Formatted string should be set");
+        TKUnit.assertEqual(testLabel.formattedText + "", "We areAwesome", "formattedText");
+        TKUnit.assertEqual(testLabel.text + "", "We areAwesome", "text");
     }
 
     helper.navigate(function () { return p; });
@@ -713,8 +713,8 @@ export function test_parseSpansDirectlyOnButton() {
     function testAction(views: Array<viewModule.View>) {
         var page = <Page>views[0];
         var testButton = <Button>page.getViewById("testButton");
-        TKUnit.assertEqual(testButton.formattedText + "", "We areAwesome", "Formatted string should be set");
-        TKUnit.assertEqual(testButton.text + "", "We areAwesome", "Formatted string should be set");
+        TKUnit.assertEqual(testButton.formattedText + "", "We areAwesome", "formattedText");
+        TKUnit.assertEqual(testButton.text + "", "We areAwesome", "text");
     }
 
     helper.navigate(function () { return p; });
@@ -726,8 +726,8 @@ export function test_parseFormattedStringWithoutFormattedText() {
     function testAction(views: Array<viewModule.View>) {
         var page = <Page>views[0];
         var testButton = <Button>page.getViewById("testButton");
-        TKUnit.assertEqual(testButton.formattedText + "", "author num_comments", "Formatted string should be set");
-        TKUnit.assertEqual(testButton.text + "", "author num_comments", "Formatted string should be set");
+        TKUnit.assertEqual(testButton.formattedText + "", "author num_comments", "formattedText");
+        TKUnit.assertEqual(testButton.text + "", "author num_comments", "text");
     }
 
     helper.navigate(function () { return p; });
@@ -739,8 +739,8 @@ export function test_parseFormattedStringFullSyntax() {
     function testAction(views: Array<viewModule.View>) {
         var page = <Page>views[0];
         var testButton = <Button>page.getViewById("testButton");
-        TKUnit.assertEqual(testButton.formattedText + "", "author num_comments", "Formatted string should be set");
-        TKUnit.assertEqual(testButton.text + "", "author num_comments", "Formatted string should be set");
+        TKUnit.assertEqual(testButton.formattedText + "", "author num_comments", "formattedText");
+        TKUnit.assertEqual(testButton.text + "", "author num_comments", "text");
     }
 
     helper.navigate(function () { return p; });
@@ -752,8 +752,8 @@ export function test_parseSpansDirectlyToFormattedString() {
     function testAction(views: Array<viewModule.View>) {
         var page = <Page>views[0];
         var testButton = <Button>page.getViewById("testButton");
-        TKUnit.assertEqual(testButton.formattedText + "", "author num_comments", "Formatted string should be set");
-        TKUnit.assertEqual(testButton.text + "", "author num_comments", "Formatted string should be set");
+        TKUnit.assertEqual(testButton.formattedText + "", "author num_comments", "formattedText");
+        TKUnit.assertEqual(testButton.text + "", "author num_comments", "text");
     }
 
     helper.navigate(function () { return p; });
diff --git a/tns-core-modules/ui/text-base/text-base.android.ts b/tns-core-modules/ui/text-base/text-base.android.ts
index 90838f180..67dbe6c82 100644
--- a/tns-core-modules/ui/text-base/text-base.android.ts
+++ b/tns-core-modules/ui/text-base/text-base.android.ts
@@ -28,6 +28,7 @@ export class TextBase extends TextBaseCommon {
         let spannableStringBuilder = createSpannableStringBuilder(value);
         const text = (spannableStringBuilder === null || spannableStringBuilder === undefined) ? '' : <any>spannableStringBuilder;
         this._nativeView.setText(text);
+        textProperty.nativeValueChange(this, (value === null || value === undefined) ? '' : value.toString());
 
         if (spannableStringBuilder && this._nativeView instanceof android.widget.Button && 
             !(this._nativeView.getTransformationMethod() instanceof TextTransformation)){
diff --git a/tns-core-modules/ui/text-base/text-base.ios.ts b/tns-core-modules/ui/text-base/text-base.ios.ts
index 384d3d1f1..390a8aef9 100644
--- a/tns-core-modules/ui/text-base/text-base.ios.ts
+++ b/tns-core-modules/ui/text-base/text-base.ios.ts
@@ -49,9 +49,11 @@ export class TextBase extends TextBaseCommon {
         let nativeView = this.nativeView;
         if (nativeView instanceof UIButton) {
             nativeView.setAttributedTitleForState(mas, UIControlState.Normal);
-        } else {
+        } 
+        else {
             nativeView.attributedText = mas;
         }
+        textProperty.nativeValueChange(this, (value === null || value === undefined) ? '' : value.toString());
     }
 
     //Color
diff --git a/tns-core-modules/ui/text-field/text-field.ios.ts b/tns-core-modules/ui/text-field/text-field.ios.ts
index 6aab40ef0..e78d6836c 100644
--- a/tns-core-modules/ui/text-field/text-field.ios.ts
+++ b/tns-core-modules/ui/text-field/text-field.ios.ts
@@ -40,10 +40,6 @@ class UITextFieldDelegateImpl extends NSObject implements UITextFieldDelegate {
             }
 
             owner.dismissSoftInput();
-
-            // if (owner.formattedText) {
-            //     formattedTextProperty.nativeValueChange(owner, textField.attributedText);
-            // }
         }
     }
 
diff --git a/tns-core-modules/ui/text-view/text-view.ios.ts b/tns-core-modules/ui/text-view/text-view.ios.ts
index 8cf3f21e0..e77b67e61 100644
--- a/tns-core-modules/ui/text-view/text-view.ios.ts
+++ b/tns-core-modules/ui/text-view/text-view.ios.ts
@@ -39,10 +39,6 @@ class UITextViewDelegateImpl extends NSObject implements UITextViewDelegate {
 
             owner.dismissSoftInput();
             owner._refreshHintState(owner.hint, textView.text);
-
-            // if (owner.formattedText) {
-            //     formattedTextProperty.nativeValueChange(owner, textView.attributedText);
-            // }
         }
     }