From 6f67689418478d0bb95739db1b6f5bd11bb47bb8 Mon Sep 17 00:00:00 2001 From: hekun Date: Mon, 12 Jun 2023 16:44:28 +0800 Subject: [PATCH] delete Repeate case Signed-off-by: hekun --- .../entry/src/main/ets/test/listTest.test.ets | 12 ++--- .../main/ets/test/stateManagement.test.ets | 8 ++-- .../test/SubscribaleAbstractJsunit.test.ets | 19 +------- .../src/main/ets/test/ProgressJsunit.test.ets | 2 +- .../main/ets/test/AppStorageJsunit.test.ets | 7 ++- arkui/ace_standard/Test.json | 1 + .../default/test/commonComponentJsApi.test.js | 48 +------------------ .../main/js/default/test/videoProps.test.js | 2 +- 8 files changed, 18 insertions(+), 81 deletions(-) diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/listTest.test.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/listTest.test.ets index 91d7c03c9..40063dbb8 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/listTest.test.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/listTest.test.ets @@ -115,19 +115,19 @@ export default function listNewJsunit() { }); /* - * @tc.number SUB_ACE_BASIC_ETS_API_0006 - * @tc.name testListNe0006 - * @tc.desic acelistNeEtsTest0006 + * @tc.number SUB_ACE_BASIC_ETS_API_0005 + * @tc.name testListNe0005 + * @tc.desic acelistNeEtsTest0005 */ it('testListNe0005', 0, async function (done) { - console.info('listNe testListNe0006 START'); + console.info('listNe testListNe0005 START'); await Utils.sleep(2000); let strJson = getInspectorByKey('list1'); - console.info("[testListNe0006] component lanes strJson:" + strJson); + console.info("[testListNe0005] component lanes strJson:" + strJson); let obj = JSON.parse(strJson); expect(obj.$type).assertEqual('List'); expect(obj.$attrs.lanes).assertEqual('4'); - console.info("[testListNe0006] lanes value :" + obj.$attrs.lanes); + console.info("[testListNe0005] lanes value :" + obj.$attrs.lanes); done(); }); diff --git a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/stateManagement.test.ets b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/stateManagement.test.ets index c2750384c..73b46859e 100644 --- a/arkui/ace_ets_component_apilack/entry/src/main/ets/test/stateManagement.test.ets +++ b/arkui/ace_ets_component_apilack/entry/src/main/ets/test/stateManagement.test.ets @@ -214,11 +214,11 @@ export default function stateManagementGetSharedJsunit() { /* * @tc.number SUB_ACE_BASIC_ETS_API_0008 - * @tc.name test_setAndProp_0001 + * @tc.name test_setAndProp_0002 * @tc.desc bind localStorage */ - it('test_setAndProp_0001', 0, async function (done) { - console.info('test_setAndProp_0001 START'); + it('test_setAndProp_0002', 0, async function (done) { + console.info('test_setAndProp_0002 START'); await Utils.sleep(2000); try { let storage = new LocalStorage() @@ -227,7 +227,7 @@ export default function stateManagementGetSharedJsunit() { expect(size == 1).assertTrue(); done(); } catch (err) { - console.info("test_setAndProp_0001 err : " + JSON.stringify(err)); + console.info("test_setAndProp_0002 err : " + JSON.stringify(err)); expect().assertFail(); done(); } diff --git a/arkui/ace_ets_component_four/entry/src/main/ets/test/SubscribaleAbstractJsunit.test.ets b/arkui/ace_ets_component_four/entry/src/main/ets/test/SubscribaleAbstractJsunit.test.ets index 98db64a1f..8ba5ae9c9 100644 --- a/arkui/ace_ets_component_four/entry/src/main/ets/test/SubscribaleAbstractJsunit.test.ets +++ b/arkui/ace_ets_component_four/entry/src/main/ets/test/SubscribaleAbstractJsunit.test.ets @@ -99,24 +99,7 @@ export default function SubscribaleAbstractJsunit() { console.info('[stateManagement_IPropertySubscriber_0100] END'); done(); }); - - /** - * @tc.number stateManagement_IPropertySubscriber_0100 - * @tc.name stateManagement IPropertySubscriber validation - * @tc.desc Function test - */ - it('stateManagement_IPropertySubscriber_0100', 0, function (done) { - done(); - return; - console.info('[stateManagement_IPropertySubscriber_0100] Start'); - let iPropertySubscriber =new IPropertySubscriber(); - let id = iPropertySubscriber.id(); - let aboutToBeDeleted = iPropertySubscriber.aboutToBeDeleted(); - expect(true).assertTrue(); - console.info('[stateManagement_IPropertySubscriber_0100] END'); - done(); - }); - + /** * @tc.number stateManagement_SyncedPropertyOneWay_0100 * @tc.name stateManagement stateManagement_SyncedPropertyOneWay_0100 validation diff --git a/arkui/ace_ets_standard/entry/src/main/ets/test/ProgressJsunit.test.ets b/arkui/ace_ets_standard/entry/src/main/ets/test/ProgressJsunit.test.ets index 2cfa2ee9a..e82d2e4f0 100644 --- a/arkui/ace_ets_standard/entry/src/main/ets/test/ProgressJsunit.test.ets +++ b/arkui/ace_ets_standard/entry/src/main/ets/test/ProgressJsunit.test.ets @@ -133,7 +133,7 @@ export default function progressJsunit() { * @tc.name testGetProgressAttr050 * @tc.desc aceEtsTest */ - it('testGetProgressAttr020', 0, async function (done) { + it('testGetProgressAttr050', 0, async function (done) { console.info('testGetProgressAttr5 START'); let strJson = getInspectorByKey('progress5'); let obj = JSON.parse(strJson); diff --git a/arkui/ace_ets_test/entry/src/main/ets/test/AppStorageJsunit.test.ets b/arkui/ace_ets_test/entry/src/main/ets/test/AppStorageJsunit.test.ets index e892cd687..e0d31b0c0 100644 --- a/arkui/ace_ets_test/entry/src/main/ets/test/AppStorageJsunit.test.ets +++ b/arkui/ace_ets_test/entry/src/main/ets/test/AppStorageJsunit.test.ets @@ -13,7 +13,6 @@ * limitations under the License. */ -// @ts-nocheck import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from "@ohos/hypium" import router from '@system.router'; @@ -22,7 +21,7 @@ export default function appStorageJsunit() { function sleep(time) { return new Promise((resolve, reject) => { setTimeout(() => { - resolve() + resolve('ok') }, time * 1000) }).then(() => { console.info(`sleep ${time} over...`) @@ -44,7 +43,7 @@ export default function appStorageJsunit() { console.info("push AppStorage page success " + JSON.stringify(result)); } } catch (err) { - console.error("push AppStorage page error " + JSON.stringify(result)); + console.error("push AppStorage page error " + JSON.stringify(err)); } await sleep(2) done() @@ -194,7 +193,7 @@ export default function appStorageJsunit() { * @tc.name appStorageTest009 * @tc.desc aceEtsTest */ - it('appStorageTest008', 0, async function (done) { + it('appStorageTest009', 0, async function (done) { console.info('AppStorageTest009 START'); let strJson = getInspectorByKey('Button0_9'); let obj = JSON.parse(strJson); diff --git a/arkui/ace_standard/Test.json b/arkui/ace_standard/Test.json index 76700d48b..e2a35c1e4 100644 --- a/arkui/ace_standard/Test.json +++ b/arkui/ace_standard/Test.json @@ -17,6 +17,7 @@ { "type": "ShellKit", "run-command": [ + "hilog -Q pidoff", "power-shell wakeup", "power-shell setmode 602" ] diff --git a/arkui/ace_standard/src/main/js/default/test/commonComponentJsApi.test.js b/arkui/ace_standard/src/main/js/default/test/commonComponentJsApi.test.js index d68100db0..120a7b4c1 100644 --- a/arkui/ace_standard/src/main/js/default/test/commonComponentJsApi.test.js +++ b/arkui/ace_standard/src/main/js/default/test/commonComponentJsApi.test.js @@ -104,30 +104,6 @@ describe('aceJsTest', function () { done(); }); - /** - * @tc.number SUB_ACE_BASIC_COMPONENT_JS_API_0100 - * @tc.name testCameraComponent - * @tc.desc ACE - */ - it('testCameraComponent', 0, async function (done) { - console.info('testCameraComponent START'); - let result; - let options = { - uri: 'pages/camera/router/index' - } - try { - result = router.push(options) - console.info("push camera page success " + JSON.stringify(result)); - } catch (err) { - console.error("push camera page error " + JSON.stringify(result)); - } - await sleep(1000) - let pages = router.getState(); - console.info("[router.camera] getState" + JSON.stringify(pages)); - expect("pages/camera/router/").assertEqual(pages.path); - done(); - }); - /** * @tc.number SUB_ACE_BASIC_COMPONENT_JS_API_0300 * @tc.name testInputComponent @@ -828,28 +804,6 @@ describe('aceJsTest', function () { done(); }); - /** - * @tc.number SUB_ACE_BASIC_COMPONENT_JS_API_0100 - * @tc.name testMarqueeComponent - * @tc.desc ACE - */ - it('testMarqueeComponent', 0, async function (done) { - let result; - let options = { - uri: 'pages/marquee/router/index' - } - try { - result = router.push(options) - console.info("push marquee page success " + JSON.stringify(result)); - } catch (err) { - console.error("push marquee page error " + JSON.stringify(result)); - } - await sleep(5000) - let pages = router.getState(); - console.info("[router.marquee] getState" + JSON.stringify(pages)); - expect("pages/marquee/router/").assertEqual(pages.path); - done(); - }); /** * @tc.number SUB_ACE_BASIC_COMPONENT_JS_API_0100 @@ -1199,7 +1153,7 @@ describe('aceJsTest', function () { /** * @tc.number SUB_ACE_BASIC_COMPONENT_JS_API_0100 - * @tc.name testCameraComponent + * @tc.name testWebComponent * @tc.desc ACE */ it('testWebComponent', 0, async function (done) { diff --git a/arkui/ace_standard/src/main/js/default/test/videoProps.test.js b/arkui/ace_standard/src/main/js/default/test/videoProps.test.js index e51517710..f3ef2e902 100644 --- a/arkui/ace_standard/src/main/js/default/test/videoProps.test.js +++ b/arkui/ace_standard/src/main/js/default/test/videoProps.test.js @@ -515,7 +515,7 @@ describe('videoPropsJsTest', function () { * @tc.name testVideoAutoplayPropTrue * @tc.desc ACE */ - it('testVideoAutoplayPropFalse', 0, async function (done) { + it('testVideoAutoplayPropTrue', 0, async function (done) { console.info('testVideoAutoplayPropTrue START'); console.info("[videoProps] get globalThis.value is: " + JSON.stringify(globalThis.value)); -- GitLab