From 283b805f28dbda3a8ce1ccb14905d62f91eeb4cc Mon Sep 17 00:00:00 2001 From: zhoulisheng1 Date: Tue, 26 Sep 2023 16:05:21 +0800 Subject: [PATCH] =?UTF-8?q?1.XTS=E6=B5=8B=E8=AF=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E6=94=B9,ArkTs=E6=95=B4=E6=94=B9=E4=B9=8B=E5=90=8EXTS?= =?UTF-8?q?=E4=B9=9F=E9=9C=80=E8=A6=81=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zhoulisheng1 --- .../src/main/ets/entryability/EntryAbility.ts | 2 +- entry/src/ohosTest/ets/test/lrucache.test.ets | 48 ++++++++++++------- .../ohosTest/ets/test/requestoption.test.ets | 2 +- .../ohosTest/ets/testability/TestAbility.ets | 3 +- 4 files changed, 35 insertions(+), 20 deletions(-) diff --git a/entry/src/main/ets/entryability/EntryAbility.ts b/entry/src/main/ets/entryability/EntryAbility.ts index 23b1c61..b251a00 100644 --- a/entry/src/main/ets/entryability/EntryAbility.ts +++ b/entry/src/main/ets/entryability/EntryAbility.ts @@ -44,7 +44,7 @@ export default class EntryAbility extends UIAbility { } hilog.info(0x0000, 'testTag', 'Succeeded in loading the content. Data: %{public}s', JSON.stringify(data) ?? ''); }); - this.context.resourceManager + ImageKnife.with(this.context); // 全局配置网络加载进度条 ImageKnifeGlobal.getInstance().getImageKnife().setDefaultLifeCycle(ImageKnifeDrawFactory.createProgressLifeCycle("#10a5ff", 0.5)) diff --git a/entry/src/ohosTest/ets/test/lrucache.test.ets b/entry/src/ohosTest/ets/test/lrucache.test.ets index f70a2dc..3238954 100644 --- a/entry/src/ohosTest/ets/test/lrucache.test.ets +++ b/entry/src/ohosTest/ets/test/lrucache.test.ets @@ -39,13 +39,13 @@ export default function lruCacheTest() { }) it('testLruCacheSize',0, ()=> { // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. - let memoryCache = new LruCache(100); + let memoryCache = new LruCache(100); expect(memoryCache.size).assertEqual(0); expect(memoryCache.maxsize).assertEqual(100) }) it('testLruCachePut',1, ()=> { // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. - let memoryCache = new LruCache(5); + let memoryCache = new LruCache(5); memoryCache.put("1","1"); memoryCache.put("2","2"); memoryCache.put("3","3"); @@ -59,7 +59,7 @@ export default function lruCacheTest() { }) it('testLruCacheGet',2, ()=> { // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. - let memoryCache = new LruCache(5); + let memoryCache = new LruCache(5); memoryCache.put("1","1"); memoryCache.put("2","2"); memoryCache.put("3","3"); @@ -73,7 +73,7 @@ export default function lruCacheTest() { }) it('testLruCacheAlgorithm',3, ()=> { // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. - let memoryCache = new LruCache(5); + let memoryCache = new LruCache(5); memoryCache.put("1","1"); memoryCache.put("2","2"); memoryCache.put("3","3"); @@ -82,17 +82,24 @@ export default function lruCacheTest() { memoryCache.get("1"); memoryCache.get("2"); - - memoryCache.foreachLruCache( (value, key, index)=> { - if(index == 0){ - expect(key).assertEqual("2") - expect(value).assertEqual("2") + let count:number = 1 + let callback =(key:string,value:string)=>{ + if(count == 5){ + expect(key).assertEqual("2") + expect(value).assertEqual("2") + } + console.log('dodo count='+count+' key='+key+' value='+value) + count++; } - }) + memoryCache.foreachLruCache( (value:string, key:string, map:Map)=> { + callback(key,value) + }) + expect(memoryCache.size).assertEqual(5) + }) it('testLruCacheRemove',4, ()=> { // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. - let memoryCache = new LruCache(5); + let memoryCache = new LruCache(5); memoryCache.put("1","1"); memoryCache.put("2","2"); memoryCache.put("3","3"); @@ -104,16 +111,23 @@ export default function lruCacheTest() { memoryCache.remove("2"); - memoryCache.foreachLruCache( (value, key, index)=> { - if(index == 0){ - expect(key).assertEqual("1") - expect(value).assertEqual("1") + let count:number = 1 + let callback =(key:string,value:string)=>{ + if(count == 4){ + expect(key).assertEqual("1") + expect(value).assertEqual("1") + } + console.log('dodo count='+count+' key='+key+' value='+value) + count++; } - }) + memoryCache.foreachLruCache( (value:string, key:string, map:Map)=> { + callback(key,value) + }) + expect(memoryCache.size).assertEqual(4) }) it('testLruCacheResize',5, ()=> { // Defines a test case. This API supports three parameters: test case name, filter parameter, and test case function. - let memoryCache = new LruCache(5); + let memoryCache = new LruCache(5); memoryCache.put("1","1"); memoryCache.put("2","2"); memoryCache.put("3","3"); diff --git a/entry/src/ohosTest/ets/test/requestoption.test.ets b/entry/src/ohosTest/ets/test/requestoption.test.ets index fc90593..fcf48f7 100644 --- a/entry/src/ohosTest/ets/test/requestoption.test.ets +++ b/entry/src/ohosTest/ets/test/requestoption.test.ets @@ -44,7 +44,7 @@ export default function RequestOptionTest() { }) it('TestConfigLoadSrc',1, ()=> { let option = new RequestOption(); - expect(option.loadSrc).assertEqual(undefined) + expect(option.loadSrc).assertEqual('') option.loadSrc = $r('app.media.icon') expect(JSON.stringify(option.loadSrc)).assertEqual(JSON.stringify($r('app.media.icon'))) }) diff --git a/entry/src/ohosTest/ets/testability/TestAbility.ets b/entry/src/ohosTest/ets/testability/TestAbility.ets index 8b92e2a..a105b2e 100644 --- a/entry/src/ohosTest/ets/testability/TestAbility.ets +++ b/entry/src/ohosTest/ets/testability/TestAbility.ets @@ -30,7 +30,8 @@ export default class TestAbility extends UIAbility { abilityDelegatorArguments = AbilityDelegatorRegistry.getArguments() hilog.info(0x0000, 'testTag', '%{public}s', 'start run testcase!!!'); Hypium.hypiumTest(abilityDelegator, abilityDelegatorArguments, testsuite) - (ImageKnifeGlobal.getInstance().setHapContext(this.context.createModuleContext("entry_test"))) + // 初始化xts的ImageKnife + ImageKnife.with(this.context.createModuleContext("entry_test")); } onDestroy() {