From 1f0a6d8b397d3792d3c9444ceb3f5b8472f074d4 Mon Sep 17 00:00:00 2001 From: jiyong Date: Wed, 15 Sep 2021 11:28:27 +0800 Subject: [PATCH] jiyong@huawei.com Signed-off-by: jiyong --- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../bundlemanager/actsbundlemanagertest/Test.json | 3 +-- .../entry/src/main/js/default/pages/index/index.js | 7 +------ .../entry/src/main/js/default/pages/index/index.js | 11 +---------- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../ces_standard/subscribeandpublish/BUILD.gn | 4 ++-- .../actssubscriberorderedtest/BUILD.gn | 2 +- .../entry/src/main/js/default/pages/index/index.js | 4 +--- .../actssubscriberunordertest/BUILD.gn | 4 ++-- .../entry/src/main/js/default/pages/index/index.js | 4 +--- 22 files changed, 24 insertions(+), 71 deletions(-) diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/default/pages/index/index.js index 74f3b650b..c1ff8fdb1 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/default/pages/index/index.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfirstscene/entry/src/main/js/default/pages/index/index.js @@ -13,7 +13,7 @@ * limitations under the License. */ import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -32,9 +32,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/default/pages/index/index.js index 74f3b650b..c1ff8fdb1 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/default/pages/index/index.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackfourthscene/entry/src/main/js/default/pages/index/index.js @@ -13,7 +13,7 @@ * limitations under the License. */ import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -32,9 +32,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/default/pages/index/index.js index 74f3b650b..c1ff8fdb1 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/default/pages/index/index.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbacksecondscene/entry/src/main/js/default/pages/index/index.js @@ -13,7 +13,7 @@ * limitations under the License. */ import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -32,9 +32,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') diff --git a/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/default/pages/index/index.js index 74f3b650b..c1ff8fdb1 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/default/pages/index/index.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamscallbackthirdscene/entry/src/main/js/default/pages/index/index.js @@ -13,7 +13,7 @@ * limitations under the License. */ import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -32,9 +32,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/default/pages/index/index.js index 74f3b650b..c1ff8fdb1 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/default/pages/index/index.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfifthscene/entry/src/main/js/default/pages/index/index.js @@ -13,7 +13,7 @@ * limitations under the License. */ import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -32,9 +32,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/default/pages/index/index.js index 74f3b650b..c1ff8fdb1 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/default/pages/index/index.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfirstscene/entry/src/main/js/default/pages/index/index.js @@ -13,7 +13,7 @@ * limitations under the License. */ import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -32,9 +32,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/default/pages/index/index.js index 74f3b650b..c1ff8fdb1 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/default/pages/index/index.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestfourthscene/entry/src/main/js/default/pages/index/index.js @@ -13,7 +13,7 @@ * limitations under the License. */ import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -32,9 +32,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/default/pages/index/index.js index 74f3b650b..c1ff8fdb1 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/default/pages/index/index.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestsecondscene/entry/src/main/js/default/pages/index/index.js @@ -13,7 +13,7 @@ * limitations under the License. */ import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -32,9 +32,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') diff --git a/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/default/pages/index/index.js index 74f3b650b..c1ff8fdb1 100644 --- a/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/default/pages/index/index.js +++ b/aafwk/aafwk_standard/abilitymanager/actsamstestthirdscene/entry/src/main/js/default/pages/index/index.js @@ -13,7 +13,7 @@ * limitations under the License. */ import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -32,9 +32,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') diff --git a/aafwk/aafwk_standard/context/actscontexttest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/context/actscontexttest/entry/src/main/js/default/pages/index/index.js index 81cee62d9..177e8dc6f 100755 --- a/aafwk/aafwk_standard/context/actscontexttest/entry/src/main/js/default/pages/index/index.js +++ b/aafwk/aafwk_standard/context/actscontexttest/entry/src/main/js/default/pages/index/index.js @@ -16,7 +16,7 @@ import file from '@system.file' import app from '@system.app' import device from '@system.device' import router from '@system.router' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -34,9 +34,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') diff --git a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/default/pages/index/index.js index 836c322bd..a84693493 100644 --- a/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/default/pages/index/index.js +++ b/aafwk/aafwk_standard/featureability/actsfeatureabilitytest/entry/src/main/js/default/pages/index/index.js @@ -14,7 +14,7 @@ */ import file from '@system.file' import app from '@system.app' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -32,9 +32,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') configService.setConfig(this) diff --git a/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/default/pages/index/index.js index 81cee62d9..177e8dc6f 100644 --- a/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/default/pages/index/index.js +++ b/aafwk/aafwk_standard/want/actsgetwantalltest/entry/src/main/js/default/pages/index/index.js @@ -16,7 +16,7 @@ import file from '@system.file' import app from '@system.app' import device from '@system.device' import router from '@system.router' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -34,9 +34,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') diff --git a/aafwk/aafwk_standard/want/actssetwanttest/entry/src/main/js/default/pages/index/index.js b/aafwk/aafwk_standard/want/actssetwanttest/entry/src/main/js/default/pages/index/index.js index 81cee62d9..177e8dc6f 100755 --- a/aafwk/aafwk_standard/want/actssetwanttest/entry/src/main/js/default/pages/index/index.js +++ b/aafwk/aafwk_standard/want/actssetwanttest/entry/src/main/js/default/pages/index/index.js @@ -16,7 +16,7 @@ import file from '@system.file' import app from '@system.app' import device from '@system.device' import router from '@system.router' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -34,9 +34,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/Test.json b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/Test.json index 97c2e04d4..8530ced98 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/Test.json +++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/Test.json @@ -25,8 +25,7 @@ "bmsJstest6.hap->/data/bmsJstest6.hap", "bmsJstest7.hap->/data/bmsJstest7.hap", "bmsJstest8.hap->/data/bmsJstest8.hap", - "bmsJstest9.hap->/data/bmsJstest9.hap", - "error.hap->/data/bmsJstest1.hap" + "bmsJstest9.hap->/data/bmsJstest9.hap" ] } diff --git a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/default/pages/index/index.js b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/default/pages/index/index.js index 3938f91f9..c04fe505c 100644 --- a/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/default/pages/index/index.js +++ b/appexecfwk/bundle_standard/bundlemanager/actsbundlemanagertest/entry/src/main/js/default/pages/index/index.js @@ -13,7 +13,7 @@ * limitations under the License. */ import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -28,12 +28,7 @@ export default { onShow() { console.info('onShow finish') const core = Core.getInstance() - const expectExtend = new ExpectExtend({ - 'id': 'extend' - }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') configService.setConfig(this) diff --git a/notification/ans_standard/cancel_test/MyApplicationCancelAll/entry/src/main/js/default/pages/index/index.js b/notification/ans_standard/cancel_test/MyApplicationCancelAll/entry/src/main/js/default/pages/index/index.js index f2940550d..782853da7 100644 --- a/notification/ans_standard/cancel_test/MyApplicationCancelAll/entry/src/main/js/default/pages/index/index.js +++ b/notification/ans_standard/cancel_test/MyApplicationCancelAll/entry/src/main/js/default/pages/index/index.js @@ -16,7 +16,7 @@ import file from '@system.file' import app from '@system.app' import device from '@system.device' import router from '@system.router' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -34,17 +34,8 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) - // const instrumentLog = new InstrumentLog({ - // 'id': 'report' - // }) core.addService('expect', expectExtend) - core.addService('report', reportExtend) - // core.addService('report', instrumentLog) core.init() - // core.subscribeEvent('spec', instrumentLog) - // core.subscribeEvent('suite', instrumentLog) - // core.subscribeEvent('task', instrumentLog) const configService = core.getDefaultService('config') configService.setConfig(this) diff --git a/notification/ans_standard/publish_test/notification-ContentType-All/entry/src/main/js/default/pages/index/index.js b/notification/ans_standard/publish_test/notification-ContentType-All/entry/src/main/js/default/pages/index/index.js index 1ab856251..b4cb27229 100644 --- a/notification/ans_standard/publish_test/notification-ContentType-All/entry/src/main/js/default/pages/index/index.js +++ b/notification/ans_standard/publish_test/notification-ContentType-All/entry/src/main/js/default/pages/index/index.js @@ -16,7 +16,7 @@ import file from '@system.file' import app from '@system.app' import device from '@system.device' import router from '@system.router' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -34,9 +34,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') diff --git a/notification/ces_standard/subscribeandpublish/BUILD.gn b/notification/ces_standard/subscribeandpublish/BUILD.gn index 0ea5f9776..2c036e34c 100644 --- a/notification/ces_standard/subscribeandpublish/BUILD.gn +++ b/notification/ces_standard/subscribeandpublish/BUILD.gn @@ -17,8 +17,8 @@ group("SubscribeAndPublish") { testonly = true if (is_standard_system) { deps = [ - "actssubscriberorderedtest:ActsSubscriberOrderedTest", - "actssubscriberunordertest:ActsSubscriberUnorderTest", + "actssubscriberorderedtest:ActsSubscriberTestOrder", + "actssubscriberunordertest:ActsSubscriberTestUnorder", ] } } diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/BUILD.gn b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/BUILD.gn index a3645a042..e5cb61fc8 100644 --- a/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/BUILD.gn +++ b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/BUILD.gn @@ -12,7 +12,7 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsSubscriberOrderedTest") { +ohos_js_hap_suite("ActsSubscriberTestOrder") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/default/pages/index/index.js b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/default/pages/index/index.js index 406c3b309..cafa53ad3 100644 --- a/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/default/pages/index/index.js +++ b/notification/ces_standard/subscribeandpublish/actssubscriberorderedtest/entry/src/main/js/default/pages/index/index.js @@ -13,7 +13,7 @@ * limitations under the License. */ import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -31,10 +31,8 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') configService.setConfig(this) diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/BUILD.gn b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/BUILD.gn index e87869680..eaadc294c 100644 --- a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/BUILD.gn +++ b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/BUILD.gn @@ -12,14 +12,14 @@ # limitations under the License. import("//test/xts/tools/build/suite.gni") -ohos_js_hap_suite("ActsSubscriberUnorderTest") { +ohos_js_hap_suite("ActsSubscriberTestUnorder") { hap_profile = "./entry/src/main/config.json" deps = [ ":hjs_demo_js_assets", ":hjs_demo_resources", ] certificate_profile = "./signature/openharmony_sx.p7b" - hap_name = "ActsSubscriberUnorderTest" + hap_name = "ActsSubscriberTestUnorder" } ohos_js_assets("hjs_demo_js_assets") { source_dir = "./entry/src/main/js/default" diff --git a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/default/pages/index/index.js b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/default/pages/index/index.js index 848149b45..b663350ec 100644 --- a/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/default/pages/index/index.js +++ b/notification/ces_standard/subscribeandpublish/actssubscriberunordertest/entry/src/main/js/default/pages/index/index.js @@ -13,7 +13,7 @@ * limitations under the License. */ import file from '@system.file' -import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index' +import {Core, ExpectExtend} from 'deccjsunit/index' const injectRef = Object.getPrototypeOf(global) || global injectRef.regeneratorRuntime = require('@babel/runtime/regenerator') @@ -31,9 +31,7 @@ export default { const expectExtend = new ExpectExtend({ 'id': 'extend' }) - const reportExtend = new ReportExtend(file) core.addService('expect', expectExtend) - core.addService('report', reportExtend) core.init() const configService = core.getDefaultService('config') configService.setConfig(this) -- GitLab