storage 子系统编译整改

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

storage/storageerrorjstest/BUILD.gn

@@ -13,6 +13,24 @@
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefileioerror_js_test") {
-  test_hap_name = "storagefileioerrorjstest"
-  hap_source_path = "hap/entry-debug-rich-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":storagefileioerror_js_assets",
+    ":storagefileioerror_js_resources",
+  ]
+#  shared_libraries = [
+#    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "storagefileioerrorjstest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
 }
+ohos_js_assets("storagefileioerror_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("storagefileioerror_js_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

storage/storageerrorjstest/project/entry/package.json

-{
-  "devDependencies": {
-    "chai": "^4.3.4",
-    "mocha": "^9.0.1"
-  }
-}

storage/storagefileiojstest/project/entry/src/main/config.json → storage/storageerrorjstest/src/main/config.json

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

storage/storageerrorjstest/project/entry/src/main/js/default/pages/index/index.js → storage/storageerrorjstest/src/main/js/default/pages/index/index.js

@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-import file from '@system.file'
 import app from '@system.app'
 
 import {Core} from 'deccjsunit/index'
@@ -30,7 +29,7 @@ export default {
     core.init()
     const configService = core.getDefaultService('config')
     configService.setConfig(this)
-    require('../../../test/List.test')
+    require('../../test/List.test')
     core.execute()
   },
   onReady() {

storage/storageerrorjstest/src/main/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "storagefileioerrorjstest"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Phone_Empty Feature Ability"
+    }
+  ]
+}
\ No newline at end of file

storage/storagefileconcurrentjstest/BUILD.gn

@@ -13,6 +13,24 @@
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefileconcurrent_js_test") {
-  test_hap_name = "storagefileconcurrentjstest"
-  hap_source_path = "hap/entry-debug-rich-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":storagefileconcurrent_js_assets",
+    ":storagefileconcurrent_js_resources",
+  ]
+#  shared_libraries = [
+#    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "storagefileconcurrentjstest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("storagefileconcurrent_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("storagefileconcurrent_js_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
 }

storage/storagefileconcurrentjstest/project/entry/package.json

-{
-  "devDependencies": {
-    "chai": "^4.3.4",
-    "mocha": "^9.0.1"
-  }
-}

storage/storagefileconcurrentjstest/project/entry/src/main/config.json → storage/storagefileconcurrentjstest/src/main/config.json

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

storage/storagefileiojstest/project/entry/src/main/js/default/pages/index/index.js → storage/storagefileconcurrentjstest/src/main/js/default/pages/index/index.js

@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-import file from '@system.file'
 import app from '@system.app'
 
 import {Core} from 'deccjsunit/index'
@@ -30,7 +29,7 @@ export default {
     core.init()
     const configService = core.getDefaultService('config')
     configService.setConfig(this)
-    require('../../../test/List.test')
+    require('../../test/List.test')
     core.execute()
   },
   onReady() {

storage/storagefileconcurrentjstest/src/main/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "storagefileconcurrentjstest"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Phone_Empty Feature Ability"
+    }
+  ]
+}
\ No newline at end of file

storage/storagefileiojstest/BUILD.gn

@@ -13,6 +13,24 @@
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefileio_js_test") {
-  test_hap_name = "Storagefileiojstest"
-  hap_source_path = "hap/entry-debug-rich-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":storagefileio_js_assets",
+    ":storagefileio_js_resources",
+  ]
+#  shared_libraries = [
+#    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "Storagefileiojstest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
 }
+ohos_js_assets("storagefileio_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("storagefileio_js_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

storage/storagefileiojstest/project/entry/package.json

-{
-  "devDependencies": {
-    "chai": "^4.3.4",
-    "mocha": "^9.0.1"
-  }
-}

storage/storageerrorjstest/project/entry/src/main/config.json → storage/storagefileiojstest/src/main/config.json

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

storage/storagefileconcurrentjstest/project/entry/src/main/js/default/pages/index/index.js → storage/storagefileiojstest/src/main/js/default/pages/index/index.js

@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-import file from '@system.file'
 import app from '@system.app'
 
 import {Core} from 'deccjsunit/index'
@@ -30,7 +29,7 @@ export default {
     core.init()
     const configService = core.getDefaultService('config')
     configService.setConfig(this)
-    require('../../../test/List.test')
+    require('../../test/List.test')
     core.execute()
   },
   onReady() {

storage/storagefileiojstest/src/main/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "Storagefileiojstest"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Phone_Empty Feature Ability"
+    }
+  ]
+}
\ No newline at end of file

storage/storagefileioperformancejstest/BUILD.gn

@@ -13,6 +13,24 @@
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefileioperformance_js_test") {
-  test_hap_name = "storagefileioperformancejstest"
-  hap_source_path = "hap/entry-debug-rich-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":storagefileioperformance_js_assets",
+    ":storagefileioperformance_js_resources",
+  ]
+#  shared_libraries = [
+#    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "storagefileioperformancejstest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
 }
+ohos_js_assets("storagefileioperformance_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("storagefileioperformance_js_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

storage/storagefileioperformancejstest/project/entry/package.json

-{
-  "devDependencies": {
-    "chai": "^4.3.4",
-    "mocha": "^9.0.1"
-  }
-}

storage/storagefileioperformancejstest/project/entry/src/main/config.json → storage/storagefileioperformancejstest/src/main/config.json

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

storage/storagefileioperformancejstest/project/entry/src/main/js/default/pages/index/index.js → storage/storagefileioperformancejstest/src/main/js/default/pages/index/index.js

@@ -13,7 +13,6 @@
  * limitations under the License.
  */
 
-import file from '@system.file'
 import app from '@system.app'
 
 import {Core} from 'deccjsunit/index'
@@ -30,7 +29,7 @@ export default {
     core.init()
     const configService = core.getDefaultService('config')
     configService.setConfig(this)
-    require('../../../test/List.test')
+    require('../../test/List.test')
     core.execute()
   },
   onReady() {

storage/storagefileioperformancejstest/src/main/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "storagefileioperformancejstest"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Phone_Empty Feature Ability"
+    }
+  ]
+}
\ No newline at end of file

storage/storagefileioreliabilityjstest/BUILD.gn

@@ -13,6 +13,24 @@
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefileioreliability_js_test") {
-  test_hap_name = "storagefileioreliabilityjstest"
-  hap_source_path = "hap/entry-debug-rich-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":storagefileioreliability_js_assets",
+    ":storagefileioreliability_js_resources",
+  ]
+#  shared_libraries = [
+#    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "storagefileioreliabilityjstest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
 }
+ohos_js_assets("storagefileioreliability_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("storagefileioreliability_js_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

storage/storagefileioreliabilityjstest/project/entry/package.json

-{
-  "devDependencies": {
-    "chai": "^4.3.4",
-    "mocha": "^9.0.1"
-  }
-}

storage/storagefileioreliabilityjstest/project/entry/src/main/config.json

-{
-  "app": {
-    "bundleName": "ohos.acts.stroage.fileio",
-    "vendor": "example",
-    "version": {
-      "code": 1000000,
-      "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 4,
-      "target": 5,
-      "releaseType": "Release"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "ohos.acts.stroage.fileio",
-    "name": ".MyApplication",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": true
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "ohos.acts.stroage.fileio.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:app_name",
-        "type": "page",
-        "launchType": "standard",
-        "visible": true
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": false
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file

storage/storagefileioreliabilityjstest/project/entry/src/main/js/default/pages/index/index.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.
- */
-
-import file from '@system.file'
-import app from '@system.app'
-
-import {Core} from 'deccjsunit/index'
-export default {
-   data: {
-       title: ''
-  },
-  onInit() {
-    this.title = this.$t('strings.world');
-  },
-  onShow() {
-    console.info('onShow finish')
-    const core = Core.getInstance()
-    core.init()
-    const configService = core.getDefaultService('config')
-    configService.setConfig(this)
-    require('../../../test/List.test')
-    core.execute()
-  },
-  onReady() {
-  },
-}
\ No newline at end of file

storage/storagefileioreliabilityjstest/src/main/config.json

+{
+  "app": {
+    "bundleName": "ohos.acts.stroage.fileio",
+    "vendor": "example",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    },
+    "apiVersion": {
+      "compatible": 4,
+      "target": 5
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "ohos.acts.stroage.fileio",
+    "name": ".MyApplication",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": true
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "name": "ohos.acts.stroage.fileio.MainAbility",
+        "icon": "$media:icon",
+        "description": "$string:mainability_description",
+        "label": "$string:app_name",
+        "type": "page",
+        "launchType": "standard",
+        "visible": true
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": "default",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file

storage/storagefileioreliabilityjstest/src/main/js/default/pages/index/index.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.
+ */
+
+import app from '@system.app'
+
+import {Core} from 'deccjsunit/index'
+export default {
+   data: {
+       title: ''
+  },
+  onInit() {
+    this.title = this.$t('strings.world');
+  },
+  onShow() {
+    console.info('onShow finish')
+    const core = Core.getInstance()
+    core.init()
+    const configService = core.getDefaultService('config')
+    configService.setConfig(this)
+    require('../../test/List.test')
+    core.execute()
+  },
+  onReady() {
+  },
+}
\ No newline at end of file

storage/storagefileioreliabilityjstest/src/main/resources/base/element/string.json

+{
+  "string": [
+    {
+      "name": "app_name",
+      "value": "storagefileioreliabilityjstest"
+    },
+    {
+      "name": "mainability_description",
+      "value": "JS_Phone_Empty Feature Ability"
+    }
+  ]
+}
\ No newline at end of file

storage/storagefileiostabilityjstest/BUILD.gn

@@ -13,6 +13,24 @@
 import("//test/xts/tools/build/suite.gni")
 
 ohos_js_hap_suite("storagefileiostability_js_test") {
-  test_hap_name = "storagefileiostabilityjstest"
-  hap_source_path = "hap/entry-debug-rich-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":storagefileiostability_js_assets",
+    ":storagefileiostability_js_resources",
+  ]
+#  shared_libraries = [
+#    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "storagefileiostabilityjstest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
 }
+ohos_js_assets("storagefileiostability_js_assets") {
+  source_dir = "./src/main/js/default"
+}
+ohos_resources("storagefileiostability_js_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

storage/storagefileiostabilityjstest/project/entry/package.json

-{
-  "devDependencies": {
-    "chai": "^4.3.4",
-    "mocha": "^9.0.1"
-  }
-}

storage/storagefileiostabilityjstest/project/entry/src/main/config.json

-{
-  "app": {
-    "bundleName": "ohos.acts.stroage.fileio",
-    "vendor": "example",
-    "version": {
-      "code": 1000000,
-      "name": "1.0.0"
-    },
-    "apiVersion": {
-      "compatible": 4,
-      "target": 5,
-      "releaseType": "Release"
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "ohos.acts.stroage.fileio",
-    "name": ".MyApplication",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry",
-      "moduleType": "entry",
-      "installationFree": true
-    },
-    "abilities": [
-      {
-        "skills": [
-          {
-            "entities": [
-              "entity.system.home"
-            ],
-            "actions": [
-              "action.system.home"
-            ]
-          }
-        ],
-        "name": "ohos.acts.stroage.fileio.MainAbility",
-        "icon": "$media:icon",
-        "description": "$string:mainability_description",
-        "label": "$string:app_name",
-        "type": "page",
-        "launchType": "standard",
-        "visible": true
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 720,
-          "autoDesignWidth": false
-        }
-      }
-    ]
-  }
-}
\ No newline at end of file

storage/storagefileiostabilityjstest/src/main/config.json

+{
+  "app": {
+    "bundleName": "ohos.acts.stroage.fileio",
+    "vendor": "example",
+    "version": {
+      "code": 1000000,
+      "name": "1.0.0"
+    },
+    "apiVersion": {
+      "compatible": 4,
+      "target": 5
+    }
+  },
+  "deviceConfig": {},
+  "module": {
+    "package": "ohos.acts.stroage.fileio",
+    "name": ".MyApplication",
+    "deviceType": [
+      "phone"
+    ],
+    "distro": {
+      "deliveryWithInstall": true,
+      "moduleName": "entry",
+      "moduleType": "entry",
+      "installationFree": true
+    },
+    "abilities": [
+      {
+        "skills": [
+          {
+            "entities": [
+              "entity.system.home"
+            ],
+            "actions": [
+              "action.system.home"
+            ]
+          }
+        ],
+        "name": "ohos.acts.stroage.fileio.MainAbility",
+        "icon": "$media:icon",
+        "description": "$string:mainability_description",
+        "label": "$string:app_name",
+        "type": "page",
+        "launchType": "standard",
+        "visible": true
+      }
+    ],
+    "js": [
+      {
+        "pages": [
+          "pages/index/index"
+        ],
+        "name": "default",
+        "window": {
+          "designWidth": 720,
+          "autoDesignWidth": false
+        }
+      }
+    ]
+  }
+}
\ No newline at end of file