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'