9个子系统命令编译适配

Signed-off-by: Nluozhewen <luozhewen@huawei.com>

account/OsAccountTest_js/BUILD.gn

@@ -10,9 +10,27 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import("//test/xts/tools/build/suite.gni")
 
+import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("osaccount_js_test") {
-  test_hap_name = "OsAccountJSApiTest"
-  hap_source_path = "hap/entry-debug-rich-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":osaccount_js_assets",
+    ":osaccount_resources",
+  ]
+#  shared_libraries = [
+    #    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "OsAccountJSApiTest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("osaccount_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("osaccount_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
 }

account/OsAccountTest_js/project/entry/package.json

-{}

account/OsAccountTest_js/project/entry/src/main/js/default/pages/index/index.js → account/OsAccountTest_js/src/main/js/default/pages/index/index.js

@@ -12,11 +12,11 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import file from '@system.file'
+
 import app from '@system.app'
 
 //import {Core, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index'
-import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
+import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -28,15 +28,10 @@ export default {
     onShow() {
         console.info('onShow finish')
         const core = Core.getInstance()
-        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)
@@ -46,7 +41,7 @@ export default {
         const configService = core.getDefaultService('config')
         configService.setConfig(this)
 
-        require('../../../test/List.test')
+        require('../../test/List.test')
         core.execute()
     },
     onReady() {

ace/ace_standard/BUILD.gn

@@ -11,9 +11,27 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import("//test/xts/tools/build/suite.gni")
 
+import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("ace_standard_test") {
-  test_hap_name = "ace_standard"
-  hap_source_path = "hap/entry-debug-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":ace_js_assets",
+    ":ace_resources",
+  ]
+#  shared_libraries = [
+    #    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "ace_standard"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("ace_js_assets") {
+  source_dir = "./src/main/js/default"
 }
+ohos_resources("ace_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

ace/ace_standard/project/entry/package.json

-{}

ace/ace_standard/project/entry/src/main/config.json → ace/ace_standard/src/main/config.json

@@ -5,6 +5,10 @@
     "version": {
       "code": 1000000,
       "name": "1.0.0"
+    },
+    "apiVersion": {
+      "compatible": 4,
+      "target": 5
     }
   },
   "deviceConfig": {},

ace/ace_standard/project/entry/src/main/js/default/pages/index/index.js → ace/ace_standard/src/main/js/default/pages/index/index.js

@@ -27,7 +27,7 @@ export default {
         })
         core.addService('expect', expectExtend)
         core.init()
-        require('../../../test/List.test')
+        require('../../test/List.test')
         core.execute()
     },
     onShow() {

distributeddatamgr/appdatamgrjstest/hap/BUILD.gn

@@ -10,9 +10,27 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import("//test/xts/tools/build/suite.gni")
 
+import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("appdatamgr_js_test") {
-  test_hap_name = "AppdatamagrJsTest"
-  hap_source_path = "entry-test-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":appdatamgr_js_assets",
+    ":appdatamgr_resources",
+  ]
+#  shared_libraries = [
+    #    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "AppdatamagrJsTest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("appdatamgr_js_assets") {
+  source_dir = "./src/main/js/default"
 }
+ohos_resources("appdatamgr_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

distributeddatamgr/appdatamgrjstest/hap/entry/package.json

-{}

distributeddatamgr/appdatamgrjstest/hap/entry/src/main/config.json → distributeddatamgr/appdatamgrjstest/hap/src/main/config.json

@@ -8,7 +8,7 @@
     },
     "apiVersion": {
       "compatible": 4,
-      "target": 4
+      "target": 5
     }
   },
   "deviceConfig": {},

distributeddatamgr/appdatamgrjstest/hap/entry/src/main/js/default/pages/index/index.js → distributeddatamgr/appdatamgrjstest/hap/src/main/js/default/pages/index/index.js

@@ -14,7 +14,7 @@
 */
 import file from '@system.file'
 
-import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
+import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -26,18 +26,13 @@ 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)
 
-        require('../../../test/List.test')
+        require('../../test/List.test')
         core.execute()
     },
     onReady() {

distributeddatamgr/distributeddatamgrjstest/hap/BUILD.gn

@@ -10,9 +10,27 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import("//test/xts/tools/build/suite.gni")
 
+import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("distributeddatamgr_js_test") {
-  test_hap_name = "DistributeddatamgrJsTest"
-  hap_source_path = "entry-test-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":distributeddatamgr_js_assets",
+    ":distributeddatamgr_resources",
+  ]
+#  shared_libraries = [
+    #    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "DistributeddatamgrJsTest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("distributeddatamgr_js_assets") {
+  source_dir = "./src/main/js/default"
 }
+ohos_resources("distributeddatamgr_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

distributeddatamgr/distributeddatamgrjstest/hap/entry/package.json

-{}

distributeddatamgr/distributeddatamgrjstest/hap/entry/src/main/config.json → distributeddatamgr/distributeddatamgrjstest/hap/src/main/config.json

@@ -5,6 +5,10 @@
     "version": {
       "code": 1000000,
       "name": "1.0.0"
+    },
+    "apiVersion": {
+      "compatible": 4,
+      "target": 5
     }
   },
   "deviceConfig": {},

distributeddatamgr/distributeddatamgrjstest/hap/entry/src/main/js/default/pages/index/index.js → distributeddatamgr/distributeddatamgrjstest/hap/src/main/js/default/pages/index/index.js

@@ -25,7 +25,7 @@ export default {
         console.info('onShow finish')
         const core = Core.getInstance()
         core.init()
-        require('../../../test/List.test')
+        require('../../test/List.test')
         core.execute()
     },
     onReady() {

global/i18n_standard/intljs/BUILD.gn

@@ -12,8 +12,25 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
-
 ohos_js_hap_suite("intljs_test") {
-  test_hap_name = "IntlJsTest"
-  hap_source_path = "hap/entry-release-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":intljs_assets",
+    ":intljs_resources",
+  ]
+#  shared_libraries = [
+    #    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "IntlJsTest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("intljs_assets") {
+  source_dir = "./src/main/js/default"
 }
+ohos_resources("intljs_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

global/i18n_standard/intljs/project/.gitignore

-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx

global/i18n_standard/intljs/project/entry/.gitignore

-/build

global/i18n_standard/intljs/project/entry/package.json

-{}

global/i18n_standard/intljs/project/gradle.properties

-# Project-wide Gradle settings.
-# IDE (e.g. DevEco Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# If the Chinese output is garbled, please configure the following parameter.
-# org.gradle.jvmargs=-Dfile.encoding=GBK

global/i18n_standard/intljs/project/settings.gradle

-include ':entry'

global/i18n_standard/intljs/project/entry/src/main/config.json → global/i18n_standard/intljs/src/main/config.json

@@ -8,7 +8,7 @@
     },
     "apiVersion": {
       "compatible": 4,
-      "target": 4
+      "target": 5
     }
   },
   "deviceConfig": {},

global/i18n_standard/intljs/project/entry/src/main/js/default/pages/index/index.js → global/i18n_standard/intljs/src/main/js/default/pages/index/index.js

@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import file from '@system.file'
-import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
+
+import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -25,18 +25,14 @@ 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)
 
-        require('../../../test/List.test')
+        require('../../test/List.test')
         core.execute()
 
     },

global/resmgr_standard/resmgrjs/BUILD.gn

@@ -12,8 +12,25 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
-
 ohos_js_hap_suite("resmgrjs_test") {
-  test_hap_name = "resmgrjs"
-  hap_source_path = "hap/entry-debug-rich-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":resmgrjs_assets",
+    ":resmgrjs_resources",
+  ]
+#  shared_libraries = [
+    #    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "resmgrjs"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("resmgrjs_assets") {
+  source_dir = "./src/main/js/default"
 }
+ohos_resources("resmgrjs_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

global/resmgr_standard/resmgrjs/project/.gitignore

-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx

global/resmgr_standard/resmgrjs/project/entry/.gitignore

-/build

global/resmgr_standard/resmgrjs/project/entry/package.json

-{}

global/resmgr_standard/resmgrjs/project/gradle.properties

-# Project-wide Gradle settings.
-# IDE (e.g. DevEco Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# If the Chinese output is garbled, please configure the following parameter.
-# org.gradle.jvmargs=-Dfile.encoding=GBK

global/resmgr_standard/resmgrjs/project/settings.gradle

-include ':entry'

global/resmgr_standard/resmgrjs/project/entry/src/main/config.json → global/resmgr_standard/resmgrjs/src/main/config.json

@@ -8,7 +8,7 @@
     },
     "apiVersion": {
       "compatible": 4,
-      "target": 4
+      "target": 5
     }
   },
   "deviceConfig": {},

global/resmgr_standard/resmgrjs/project/entry/src/main/js/default/pages/index/index.js → global/resmgr_standard/resmgrjs/src/main/js/default/pages/index/index.js

@@ -12,8 +12,8 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import file from '@system.file'
-import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
+
+import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -25,18 +25,13 @@ 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)
 
-        require('../../../test/List.test')
+        require('../../test/List.test')
         core.execute()
     },
     onReady() {

graphic/windowstandard/BUILD.gn

@@ -12,8 +12,25 @@
 # limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
-
 ohos_js_hap_suite("window_hap_test") {
-  test_hap_name = "windowhaptest"
-  hap_source_path = "hap/entry-debug-rich-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":window_js_assets",
+    ":window_resources",
+  ]
+#  shared_libraries = [
+    #    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "windowhaptest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("window_js_assets") {
+  source_dir = "./src/main/js/default"
 }
+ohos_resources("window_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

graphic/windowstandard/project/.gitignore

-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-/entry/.preview
-.cxx

graphic/windowstandard/project/.idea/.gitignore

-# Default ignored files
-/shelf/
-/workspace.xml

graphic/windowstandard/project/.idea/compiler.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="1.8" />
-  </component>
-</project>
\ No newline at end of file

graphic/windowstandard/project/.idea/gradle.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="GradleMigrationSettings" migrationVersion="1" />
-  <component name="GradleSettings">
-    <option name="linkedExternalProjectsSettings">
-      <GradleProjectSettings>
-        <option name="testRunner" value="PLATFORM" />
-        <option name="distributionType" value="LOCAL" />
-        <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleHome" value="C:\Program Files\Huawei\DevEco Studio 2.1.0.301\tools\gradle" />
-        <option name="modules">
-          <set>
-            <option value="$PROJECT_DIR$" />
-            <option value="$PROJECT_DIR$/entry" />
-          </set>
-        </option>
-        <option name="resolveModulePerSourceSet" value="false" />
-        <option name="useQualifiedModuleNames" value="false" />
-      </GradleProjectSettings>
-    </option>
-  </component>
-</project>
\ No newline at end of file

graphic/windowstandard/project/.idea/jarRepositories.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="RemoteRepositoriesConfiguration">
-    <remote-repository>
-      <option name="id" value="central" />
-      <option name="name" value="Maven Central repository" />
-      <option name="url" value="https://repo1.maven.org/maven2" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="jboss.community" />
-      <option name="name" value="JBoss Community repository" />
-      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven2" />
-      <option name="name" value="maven2" />
-      <option name="url" value="https://developer.huawei.com/repo/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="BintrayJCenter" />
-      <option name="name" value="BintrayJCenter" />
-      <option name="url" value="https://jcenter.bintray.com/" />
-    </remote-repository>
-    <remote-repository>
-      <option name="id" value="maven" />
-      <option name="name" value="maven" />
-      <option name="url" value="https://repo.huaweicloud.com/repository/maven/" />
-    </remote-repository>
-  </component>
-</project>
\ No newline at end of file

graphic/windowstandard/project/.idea/misc.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK" />
-</project>
\ No newline at end of file

graphic/windowstandard/project/.idea/vcs.xml

-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="$PROJECT_DIR$/../../../../.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/../../.." vcs="Git" />
-    <mapping directory="$PROJECT_DIR$/../.." vcs="Git" />
-  </component>
-</project>
\ No newline at end of file

graphic/windowstandard/project/entry/.gitignore

-/build

graphic/windowstandard/project/entry/package.json

-{}

graphic/windowstandard/project/entry/src/main/js/test/List.test.js

-/*
- * Copyright (C) 2021 Huawei Device Co., Ltd.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-require('./ExampleJsunit.test.js')
-require('./window.test.js')

graphic/windowstandard/project/entry/src/main/config.json → graphic/windowstandard/src/main/config.json

@@ -8,8 +8,7 @@
     },
     "apiVersion": {
       "compatible": 5,
-      "target": 5,
-      "releaseType": "Beta1"
+      "target": 5
     }
   },
   "deviceConfig": {},

graphic/windowstandard/project/entry/src/main/js/default/pages/index/index.js → graphic/windowstandard/src/main/js/default/pages/index/index.js

@@ -12,10 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import {Core} from 'deccjsunit/lite'
+import {Core} from 'deccjsunit/index'
 const core = Core.getInstance()
 core.init()
-require('../../../test/List.test.js')
+require('../../test/List.test.js')
 core.execute()
 
 export default {

graphic/windowstandard/src/main/js/default/test/List.test.js

+/*
+ * Copyright (C) 2021 Huawei Device Co., Ltd.
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+require('./window.test.js')

hiviewdfx/hiappeventtest/hiappeventjstest/BUILD.gn

@@ -10,9 +10,27 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import("//test/xts/tools/build/suite.gni")
 
+import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("hiappeventjstest") {
-  test_hap_name = "HiAppeventTest"
-  hap_source_path = "hap/entry-debug-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":hiappevent_js_assets",
+    ":hiappevent_resources",
+  ]
+#  shared_libraries = [
+    #    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "HiAppeventTest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("hiappevent_js_assets") {
+  source_dir = "./src/main/js/default"
 }
+ohos_resources("hiappevent_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

hiviewdfx/hiappeventtest/hiappeventjstest/project/entry/package.json

-{}

hiviewdfx/hiappeventtest/hiappeventjstest/project/gradle.properties

-# Project-wide Gradle settings.
-# IDE (e.g. DevEco Studio) users:
-# Gradle settings configured through the IDE *will override*
-# any settings specified in this file.
-# For more details on how to configure your build environment visit
-# http://www.gradle.org/docs/current/userguide/build_environment.html
-# Specifies the JVM arguments used for the daemon process.
-# The setting is particularly useful for tweaking memory settings.
-# If the Chinese output is garbled, please configure the following parameter.
-# org.gradle.jvmargs=-Dfile.encoding=GBK

hiviewdfx/hiappeventtest/hiappeventjstest/project/settings.gradle

-include ':entry'

hiviewdfx/hiappeventtest/hiappeventjstest/project/entry/src/main/js/default/pages/index/index.js → hiviewdfx/hiappeventtest/hiappeventjstest/src/main/js/default/pages/index/index.js

@@ -12,11 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import file from '@system.file'
 import app from '@system.app'
 import device from '@system.device'
 import router from '@system.router'
-import {Core, ExpectExtend, ReportExtend, Constant} from 'deccjsunit/index'
+import {Core, ExpectExtend, Constant} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -31,14 +30,12 @@ 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)
 
-        require('../../../test/List.test')
+        require('../../test/List.test')
         core.execute()
     },
     onReady() {

miscservices/TimeTest_js/BUILD.gn

@@ -10,9 +10,27 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import("//test/xts/tools/build/suite.gni")
 
+import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("time_js_test") {
-  test_hap_name = "TimeJSApiTest"
-  hap_source_path = "hap/entry-debug-rich-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":time_js_assets",
+    ":time_resources",
+  ]
+#  shared_libraries = [
+    #    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "TimeJSApiTest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("time_js_assets") {
+  source_dir = "./src/main/js/default"
 }
+ohos_resources("time_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

miscservices/TimeTest_js/project/entry/package.json

-{}

miscservices/TimeTest_js/project/entry/src/main/js/default/pages/index/index.js → miscservices/TimeTest_js/src/main/js/default/pages/index/index.js

@@ -12,11 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import file from '@system.file'
 import app from '@system.app'
 
 //import {Core, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index'
-import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
+import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -31,22 +30,16 @@ 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)
 
-        require('../../../test/List.test')
+        require('../../test/List.test')
         core.execute()
     },
     onReady() {

multimedia/audio/audio_js_standard/audioManager/BUILD.gn

@@ -10,9 +10,27 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import("//test/xts/tools/build/suite.gni")
 
+import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("audio_manager_js_hap") {
-  test_hap_name = "AudioManagerJsTest"
-  hap_source_path = "hap/AudioManager.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":audio_manager_js_assets",
+    ":audio_manager_resources",
+  ]
+#  shared_libraries = [
+    #    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "AudioManagerJsTest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("audio_manager_js_assets") {
+  source_dir = "./src/main/js/default"
 }
+ohos_resources("audio_manager_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

multimedia/audio/audio_js_standard/audioPlayer_API/project/entry/src/main/config.json → multimedia/audio/audio_js_standard/audioManager/src/main/config.json

@@ -8,7 +8,7 @@
     },
     "apiVersion": {
       "compatible": 4,
-      "target": 4
+      "target": 5
     }
   },
   "deviceConfig": {},

multimedia/audio/audio_js_standard/audioManager/project/entry/src/main/js/default/pages/index/index.js → multimedia/audio/audio_js_standard/audioManager/src/main/js/default/pages/index/index.js

@@ -13,9 +13,8 @@
  * limitations under the License.
  */
 
-import file from '@system.file'
 import app from '@system.app'
-import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
+import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -30,14 +29,12 @@ 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)
 
-        require('../../../test/List.test')
+        require('../../test/List.test')
         core.execute()
     },
     onReady() {

multimedia/audio/audio_js_standard/audioPlayer/BUILD.gn

@@ -10,9 +10,27 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import("//test/xts/tools/build/suite.gni")
 
+import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("audio_player_js_hap") {
-  test_hap_name = "AudioPlayerJsTest"
-  hap_source_path = "hap/AudioPlayer_JS.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":audio_player_js_assets",
+    ":audio_player_resources",
+  ]
+#  shared_libraries = [
+    #    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "AudioPlayerJsTest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("audio_player_js_assets") {
+  source_dir = "./src/main/js/default"
 }
+ohos_resources("audio_player_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

multimedia/audio/audio_js_standard/audioManager/project/entry/src/main/config.json → multimedia/audio/audio_js_standard/audioPlayer/src/main/config.json

@@ -8,7 +8,7 @@
     },
     "apiVersion": {
       "compatible": 4,
-      "target": 4
+      "target": 5
     }
   },
   "deviceConfig": {},

multimedia/audio/audio_js_standard/audioPlayer_API/project/entry/src/main/js/default/pages/index/index.js → multimedia/audio/audio_js_standard/audioPlayer/src/main/js/default/pages/index/index.js

@@ -13,9 +13,8 @@
  * limitations under the License.
  */
 
-import file from '@system.file'
 import app from '@system.app'
-import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
+import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -30,14 +29,12 @@ 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)
 
-        require('../../../test/List.test')
+        require('../../test/List.test')
         core.execute()
     },
     onReady() {

multimedia/audio/audio_js_standard/audioPlayer_API/BUILD.gn

@@ -10,9 +10,27 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import("//test/xts/tools/build/suite.gni")
 
+import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("audio_player_api_js_hap") {
-  test_hap_name = "AudioPlayerApiJsTest"
-  hap_source_path = "hap/AudioPlayer_Api_JS.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":audio_player_api_js_assets",
+    ":audio_player_api_resources",
+  ]
+#  shared_libraries = [
+    #    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "AudioPlayerApiJsTest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("audio_player_api_js_assets") {
+  source_dir = "./src/main/js/default"
 }
+ohos_resources("audio_player_api_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

multimedia/audio/audio_js_standard/audioPlayer/project/entry/src/main/config.json → multimedia/audio/audio_js_standard/audioPlayer_API/src/main/config.json

@@ -8,7 +8,7 @@
     },
     "apiVersion": {
       "compatible": 4,
-      "target": 4
+      "target": 5
     }
   },
   "deviceConfig": {},

multimedia/audio/audio_js_standard/audioPlayer/project/entry/src/main/js/default/pages/index/index.js → multimedia/audio/audio_js_standard/audioPlayer_API/src/main/js/default/pages/index/index.js

@@ -13,9 +13,8 @@
  * limitations under the License.
  */
 
-import file from '@system.file'
 import app from '@system.app'
-import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
+import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -30,14 +29,12 @@ 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)
 
-        require('../../../test/List.test')
+        require('../../test/List.test')
         core.execute()
     },
     onReady() {

powermgr/powermgrbattery/BUILD.gn

@@ -10,9 +10,27 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-import("//test/xts/tools/build/suite.gni")
 
+import("//test/xts/tools/build/suite.gni")
 ohos_js_hap_suite("powermgr_battery_test") {
-  test_hap_name = "Powermgrbatterytest"
-  hap_source_path = "hap/entry-debug-rich-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":powermgr_battery_js_assets",
+    ":powermgr_battery_resources",
+  ]
+#  shared_libraries = [
+    #    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "Powermgrbatterytest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("powermgr_battery_js_assets") {
+  source_dir = "./src/main/js/default"
 }
+ohos_resources("powermgr_battery_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

powermgr/powermgrbattery/project/.gitignore

-*.iml
-.gradle
-/local.properties
-/.idea/caches
-/.idea/libraries
-/.idea/modules.xml
-/.idea/workspace.xml
-/.idea/navEditor.xml
-/.idea/assetWizardSettings.xml
-.DS_Store
-/build
-/captures
-.externalNativeBuild
-.cxx

powermgr/powermgrbattery/project/entry/.gitignore

-/build

powermgr/powermgrbattery/project/entry/package.json

-{}

powermgr/powermgrbattery/project/entry/src/main/js/default/pages/index/index.js → powermgr/powermgrbattery/src/main/js/default/pages/index/index.js

@@ -12,11 +12,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-import file from '@system.file'
 import app from '@system.app'
 
 //import {Core, ExpectExtend, ReportExtend, InstrumentLog} from 'deccjsunit/index'
-import {Core, ExpectExtend, ReportExtend} from 'deccjsunit/index'
+import {Core, ExpectExtend} from 'deccjsunit/index'
 
 export default {
     data: {
@@ -31,12 +30,7 @@ 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)
@@ -46,7 +40,7 @@ export default {
         const configService = core.getDefaultService('config')
         configService.setConfig(this)
 
-        require('../../../test/List.test')
+        require('../../test/List.test')
         core.execute()
     },
     onReady() {