!612 BMS/CES 异步规避以及json文件修改

Merge pull request !612 from jiyong/master

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')

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')

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')

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')

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')

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')

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')

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')

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')

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')

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)

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')

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')

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"
             ]
             
         }        

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)

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)

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')

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",
     ]
   }
 }

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",

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)

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"

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)