diff --git a/examples/napitutorials/entry/src/main/ets/pages/javascript/jsabstractops/napitypeof.ets b/examples/napitutorials/entry/src/main/ets/pages/javascript/jsabstractops/napitypeof.ets index e0530200d886d3cf6101b1d675bdb41a122c343f..6d63dd1ce8321926e466e4ff4e44b34393c18dba 100644 --- a/examples/napitutorials/entry/src/main/ets/pages/javascript/jsabstractops/napitypeof.ets +++ b/examples/napitutorials/entry/src/main/ets/pages/javascript/jsabstractops/napitypeof.ets @@ -37,8 +37,7 @@ struct napitypeoftypeof { + 'const testBoolResult = addon.testNapiTypeof(true); \n' + 'const testNumResult = addon.testNapiTypeof(-123.456); \n' + 'const testStrResult = addon.testNapiTypeof(\'test\'); \n' - + 'const testSymResult = addon.testNapiTypeof(Symbol()); \n' - + 'const testObjResult = addon.testNapiTypeof({}); \n' + + 'const testObjResult = addon.testNapiTypeof({testKey:\'testValue\'}); \n' + 'const testFuncResult = addon.testNapiTypeof(()=>{}); \n' + '// 输出强制转换结果 \n' + 'console.log(`undefined -> ${testUndefResult}`) \n' @@ -46,8 +45,7 @@ struct napitypeoftypeof { + 'console.log(`true -> ${testBoolResult}`) \n' + 'console.log(`-123.456 -> ${testNumResult}`) \n' + 'console.log(`\'test\' -> ${testStrResult}`) \n' - + 'console.log(`Symbol() -> ${testSymResult}`) \n' - + 'console.log(`{} -> ${testObjResult}`) \n' + + 'console.log(`{testKey:\'testValue\'} -> ${testObjResult}`) \n' + 'console.log(`()=>{} -> ${testFuncResult}`) \n'; controller: TextAreaController = new TextAreaController() private btnFontColor: Resource = $r('app.color.white'); @@ -103,13 +101,17 @@ struct napitypeoftypeof { .onClick(() => { try { // Test querying types + interface Test { + testKey: string + }; const testUndef: undefined = undefined; const testNull: null = null; const testBool: boolean = true; const testNum: number = -123.456; const testStr: string = 'test'; - const testSym: symbol = Symbol(); - const testObj = {}; + const testObj: Test = { + testKey: 'testValue' + }; const testFunc = () => { }; // const testBigInt = 1n; @@ -118,7 +120,6 @@ struct napitypeoftypeof { const testBoolResult = testNapi.testNapiTypeof(testBool); const testNumResult = testNapi.testNapiTypeof(testNum); const testStrResult = testNapi.testNapiTypeof(testStr); - const testSymResult = testNapi.testNapiTypeof(testSym); const testObjResult = testNapi.testNapiTypeof(testObj); const testFuncResult = testNapi.testNapiTypeof(testFunc); @@ -128,7 +129,6 @@ struct napitypeoftypeof { this.testcont = this.testcont.replace('${testBoolResult}', `## ${testBoolResult} ##`); this.testcont = this.testcont.replace('${testNumResult}', `## ${testNumResult} ##`); this.testcont = this.testcont.replace('${testStrResult}', `## ${testStrResult} ##`); - this.testcont = this.testcont.replace('${testSymResult}', `## ${testSymResult} ##`); this.testcont = this.testcont.replace('${testObjResult}', `## ${testObjResult} ##`); this.testcont = this.testcont.replace('${testFuncResult}', `## ${testFuncResult} ##`); @@ -138,7 +138,6 @@ struct napitypeoftypeof { hilog.info(0x0000, TAG, `${typeof testBool} -> ${testBoolResult}`); hilog.info(0x0000, TAG, `${typeof testNum} -> ${testNumResult}`); hilog.info(0x0000, TAG, `${typeof testStr} -> ${testStrResult}`); - hilog.info(0x0000, TAG, `${typeof testSym} -> ${testSymResult}`); hilog.info(0x0000, TAG, `${typeof testObj} -> ${testObjResult}`); hilog.info(0x0000, TAG, `${typeof testFunc} -> ${testFuncResult}`); } catch (error) { diff --git a/examples/napitutorials/entry/src/ohosTest/ets/test/javascriptapi/jsabstractops.test.ets b/examples/napitutorials/entry/src/ohosTest/ets/test/javascriptapi/jsabstractops.test.ets index 077032d9474ec0c46a113a7019d023ec14880f1b..02b62130ce01afe776960f83fc8f199b1fb61fc1 100644 --- a/examples/napitutorials/entry/src/ohosTest/ets/test/javascriptapi/jsabstractops.test.ets +++ b/examples/napitutorials/entry/src/ohosTest/ets/test/javascriptapi/jsabstractops.test.ets @@ -15,7 +15,7 @@ import hilog from '@ohos.hilog'; import testNapi from 'libentry.so'; -import { describe, beforeAll, beforeEach, afterEach, afterAll, it, expect } from '@ohos/hypium'; +import { afterAll, afterEach, beforeAll, beforeEach, describe, expect, it } from '@ohos/hypium'; export default function jsAbstractOpsTest() { describe('jsAbstractOpsTest', () => { @@ -218,13 +218,17 @@ export default function jsAbstractOpsTest() { hilog.info(0x0000, 'testTag', '%{public}s', 'it napiTypeof begin'); // Test querying types + interface Test { + testKey: string + }; const testUndef: undefined = undefined; const testNull: null = null; const testBool: boolean = true; const testNum: number = -123.456; const testStr: string = 'test'; - const testSym: symbol = Symbol(); - const testObj = {}; + const testObj: Test = { + testKey: 'testValue' + }; const testFunc = () => { }; const testUndefResult = testNapi.testNapiTypeof(testUndef); @@ -232,7 +236,6 @@ export default function jsAbstractOpsTest() { const testBoolResult = testNapi.testNapiTypeof(testBool); const testNumResult = testNapi.testNapiTypeof(testNum); const testStrResult = testNapi.testNapiTypeof(testStr); - const testSymResult = testNapi.testNapiTypeof(testSym); const testObjResult = testNapi.testNapiTypeof(testObj); const testFuncResult = testNapi.testNapiTypeof(testFunc); @@ -242,7 +245,6 @@ export default function jsAbstractOpsTest() { hilog.info(0x0000, 'testTag', `napi_typeof(${testBool}) = ${testBoolResult}`); hilog.info(0x0000, 'testTag', `napi_typeof(${testNum}) = ${testNumResult}`); hilog.info(0x0000, 'testTag', `napi_typeof(${testStr}) = ${testStrResult}`); - hilog.info(0x0000, 'testTag', `napi_typeof(${String(testSym)}) = ${testSymResult}`); hilog.info(0x0000, 'testTag', `napi_typeof(${testObj}) = ${testObjResult}`); hilog.info(0x0000, 'testTag', `napi_typeof(${testFunc}) = ${testFuncResult}`); @@ -252,7 +254,6 @@ export default function jsAbstractOpsTest() { expect(testBoolResult).assertInstanceOf('String'); expect(testNumResult).assertInstanceOf('String'); expect(testStrResult).assertInstanceOf('String'); - expect(testSymResult).assertInstanceOf('String'); expect(testObjResult).assertInstanceOf('String'); expect(testFuncResult).assertInstanceOf('String'); @@ -262,7 +263,6 @@ export default function jsAbstractOpsTest() { expect(testBoolResult).assertEqual('boolean'); expect(testNumResult).assertEqual('number'); expect(testStrResult).assertEqual('string'); - expect(testSymResult).assertEqual('symbol'); expect(testObjResult).assertEqual('object'); expect(testFuncResult).assertEqual('function'); hilog.info(0x0000, 'testTag', '%{public}s', 'it napiTypeof end');