From 6859c9a2d676b542244a7c96a96faebbff98f599 Mon Sep 17 00:00:00 2001
From: yfwang6 <wangyongfei6@huawei.com>
Date: Mon, 29 Aug 2022 16:50:27 +0800
Subject: [PATCH] fixed ed6d4aa from
 https://gitee.com/yfwang6/developtools_ace-ets2bundle/pulls/1044 fixed
 74fcfa4 from https://gitee.com/yfwang6/developtools_ace-ets2bundle/pulls/1033
 wangyongfei6@huawei.com

ut for @watch do not work issue

Signed-off-by: yfwang6 <wangyongfei6@huawei.com>
Change-Id: I552c9c470010c8d40d7102f6f1f216fce9261d3e
---
 .../application_state_management/@storageLink/@storageLink.ts | 4 ++--
 .../application_state_management/@storageProp/@storageProp.ts | 4 ++--
 .../application_state_management/appStorage/appStorage.ts     | 4 ++--
 compiler/test/ut/ui_state_management/others/@watch/@watch.ts  | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/compiler/test/ut/ui_state_management/application_state_management/@storageLink/@storageLink.ts b/compiler/test/ut/ui_state_management/application_state_management/@storageLink/@storageLink.ts
index 24e1600..8fc33b4 100644
--- a/compiler/test/ut/ui_state_management/application_state_management/@storageLink/@storageLink.ts
+++ b/compiler/test/ut/ui_state_management/application_state_management/@storageLink/@storageLink.ts
@@ -53,8 +53,8 @@ let envLang = AppStorage.Prop('languageCode');
 class MyComponent extends View {
     constructor(compilerAssignedUniqueChildId, parent, params) {
         super(compilerAssignedUniqueChildId, parent);
-        this.__varA = AppStorage.GetOrCreate().setAndLink('varA', 2, this);
-        this.__lang = AppStorage.GetOrCreate().setAndProp('languageCode', 'en', this);
+        this.__varA = AppStorage.SetAndLink('varA', 2, this, "varA");
+        this.__lang = AppStorage.SetAndProp('languageCode', 'en', this, "lang");
         this.label = 'count';
         this.updateWithValueParams(params);
     }
diff --git a/compiler/test/ut/ui_state_management/application_state_management/@storageProp/@storageProp.ts b/compiler/test/ut/ui_state_management/application_state_management/@storageProp/@storageProp.ts
index 24e1600..8fc33b4 100644
--- a/compiler/test/ut/ui_state_management/application_state_management/@storageProp/@storageProp.ts
+++ b/compiler/test/ut/ui_state_management/application_state_management/@storageProp/@storageProp.ts
@@ -53,8 +53,8 @@ let envLang = AppStorage.Prop('languageCode');
 class MyComponent extends View {
     constructor(compilerAssignedUniqueChildId, parent, params) {
         super(compilerAssignedUniqueChildId, parent);
-        this.__varA = AppStorage.GetOrCreate().setAndLink('varA', 2, this);
-        this.__lang = AppStorage.GetOrCreate().setAndProp('languageCode', 'en', this);
+        this.__varA = AppStorage.SetAndLink('varA', 2, this, "varA");
+        this.__lang = AppStorage.SetAndProp('languageCode', 'en', this, "lang");
         this.label = 'count';
         this.updateWithValueParams(params);
     }
diff --git a/compiler/test/ut/ui_state_management/application_state_management/appStorage/appStorage.ts b/compiler/test/ut/ui_state_management/application_state_management/appStorage/appStorage.ts
index 24e1600..8fc33b4 100644
--- a/compiler/test/ut/ui_state_management/application_state_management/appStorage/appStorage.ts
+++ b/compiler/test/ut/ui_state_management/application_state_management/appStorage/appStorage.ts
@@ -53,8 +53,8 @@ let envLang = AppStorage.Prop('languageCode');
 class MyComponent extends View {
     constructor(compilerAssignedUniqueChildId, parent, params) {
         super(compilerAssignedUniqueChildId, parent);
-        this.__varA = AppStorage.GetOrCreate().setAndLink('varA', 2, this);
-        this.__lang = AppStorage.GetOrCreate().setAndProp('languageCode', 'en', this);
+        this.__varA = AppStorage.SetAndLink('varA', 2, this, "varA");
+        this.__lang = AppStorage.SetAndProp('languageCode', 'en', this, "lang");
         this.label = 'count';
         this.updateWithValueParams(params);
     }
diff --git a/compiler/test/ut/ui_state_management/others/@watch/@watch.ts b/compiler/test/ut/ui_state_management/others/@watch/@watch.ts
index 6bd197a..1be5659 100644
--- a/compiler/test/ut/ui_state_management/others/@watch/@watch.ts
+++ b/compiler/test/ut/ui_state_management/others/@watch/@watch.ts
@@ -72,9 +72,9 @@ exports.expectResult =
         this.__totalPurchase = new ObservedPropertySimple(0, this, "totalPurchase");
         this.__defArray = new ObservedPropertyObject(['c', 'g', 't', 'z'], this, "defArray");
         this.__resultTip = new ObservedPropertySimple('', this, "resultTip");
-        this.updateWithValueParams(params);
         this.declareWatch("shopBasket", this.onBasketUpdated);
         this.declareWatch("defArray", this.onPutItem);
+        this.updateWithValueParams(params);
     }
     updateWithValueParams(params) {
         if (params.shopBasket !== undefined) {