From a542ceab43bdf235237284114600b043995f810f Mon Sep 17 00:00:00 2001
From: liuycag <liuycag@digitalchina.com>
Date: Thu, 2 Jun 2022 05:02:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dtest=5Fmap=E6=B5=8B=E8=AF=95?=
 =?UTF-8?q?=E7=94=A8=E4=BE=8B=E7=BC=96=E8=AF=91=E5=A4=B1=E8=B4=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

fix: #I5ADDH

Signed-off-by: liuycag <liuycag@digitalchina.com>
---
 src/gen/extend/x_napi_tool.js           |  4 +++-
 test/storytest/test_map/@ohos.test.d.ts |  8 ++------
 test/storytest/test_map/test.js         | 24 ++++++------------------
 3 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/src/gen/extend/x_napi_tool.js b/src/gen/extend/x_napi_tool.js
index acdfb46f..1db467cd 100644
--- a/src/gen/extend/x_napi_tool.js
+++ b/src/gen/extend/x_napi_tool.js
@@ -290,8 +290,10 @@ uint32_t XNapiTool::GetMapLength(napi_value value)
 
 napi_value XNapiTool::GetMapElementName(napi_value value, uint32_t p)
 {
+    napi_value name_result;
+    napi_get_property_names(env_, value, &name_result);
     napi_value result;
-    napi_status result_status = napi_get_element(env_, value, p, &result);
+    napi_status result_status = napi_get_element(env_, name_result, p, &result);
     CC_ASSERT(result_status == napi_ok);
     return result;
 }
diff --git a/test/storytest/test_map/@ohos.test.d.ts b/test/storytest/test_map/@ohos.test.d.ts
index 96220087..9eaddd85 100644
--- a/test/storytest/test_map/@ohos.test.d.ts
+++ b/test/storytest/test_map/@ohos.test.d.ts
@@ -14,15 +14,11 @@
 */
 declare namespace napitest {
     interface TestClass1 {
-        map1 : {[key: string]: number} ;
-        map2 : {[key: string]: string} ;
-        map3 : {[key: string]: boolean} ;
+        map1 : {[key: string]: string} ;
     }
 
     interface TestClass2 {
-        fun1(v: {[key: string]: string}): {[key: string]: string};
-        fun1(v: {[key: string]: number}): {[key: string]: number};
-        fun1(v: {[key: string]: boolean}): {[key: string]: boolean};
+        fun1(v: {[key: string]: string}):  number;
     }
 }
 export default napitest;
\ No newline at end of file
diff --git a/test/storytest/test_map/test.js b/test/storytest/test_map/test.js
index 7ed0fa72..b97c3e04 100644
--- a/test/storytest/test_map/test.js
+++ b/test/storytest/test_map/test.js
@@ -12,27 +12,15 @@
 * See the License for the specific language governing permissions and 
 * limitations under the License. 
 */
-const { TestClass1,TestClass2 } = require("./out/build/Release/napitest")
+const { TestClass1 ,TestClass2 } = require("./out/build/Release/napitest")
 var assert = require("assert");
 
 describe('Map', function () {
 
-    it('test fun1', function () {
-        let testMap1 = {"name":"jonas","age":"18"};
-        let ret = fun1(testMap1);
-        assert.strictEqual(ret, {});
+    it('test TestClass2 fun1', function () {
+        let tc2 = new TestClass2();
+        let ret = tc2.fun1({"age":"ageValue","name":"nameValue"});
+        assert.strictEqual(ret, 0);
     });
-
-    it('test fun2', function () {
-        let testMap2 = {"name": 666,"age": 18};
-        let ret = fun1(testMap2);
-        assert.strictEqual(ret, {});
-    });
-
-    it('test fun3', function () {
-        let testMap3 = {"name": true,"age": false};
-        let ret = fun1(testMap3);
-        assert.strictEqual(ret, {});
-    });
-
+    
 });
\ No newline at end of file
-- 
Gitee