update 子系统编译整改

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

updater/update_test/BUILD.gn

@@ -9,11 +9,28 @@
 # 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.
+# limitations under the License.
 
 import("//test/xts/tools/build/suite.gni")
-
 ohos_js_hap_suite("update_js_test") {
- test_hap_name = "updatejstest" 
- hap_source_path = "hap/entry-debug-signed.hap"
+  hap_profile = "./src/main/config.json"
+  deps = [
+    ":update_js_assets",
+    ":update_js_resources",
+  ]
+#  shared_libraries = [
+#    "//third_party/giflib:libgif",
+#    "//third_party/libpng:libpng",
+#  ]
+  certificate_profile = "./signature/openharmony_sx.p7b"
+  hap_name = "updatejstest"
+#  part_name = "prebuilt_hap"
+#  subsystem_name = "xts"
+}
+ohos_js_assets("update_js_assets") {
+  source_dir = "./src/main/js/default"
 }
+ohos_resources("update_js_resources") {
+  sources = [ "./src/main/resources" ]
+  hap_profile = "./src/main/config.json"
+}
\ No newline at end of file

updater/update_test/gradle/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('./update.test.js')
\ No newline at end of file

updater/update_test/gradle/entry/src/ohosTest/config.json

-{
-  "app": {
-    "bundleName": "ohos.acts.upgrade",
-    "vendor": "example",
-    "version": {
-      "code": 1,
-      "name": "1.0"
-    },
-    "apiVersion": {
-      "compatible": 4,
-      "target": 5
-    }
-  },
-  "deviceConfig": {},
-  "module": {
-    "package": "ohos.acts.upgrade",
-    "name": "testModule",
-    "deviceType": [
-      "phone"
-    ],
-    "distro": {
-      "deliveryWithInstall": true,
-      "moduleName": "entry_test",
-      "moduleType": "feature",
-      "installationFree": true
-    },
-    "abilities": [
-      {
-        "name": "ohos.acts.upgrade.MainAbility",
-        "description": "Test Entry Ability",
-        "icon": "$media:icon",
-        "label": "$string:app_name",
-        "launchType": "standard",
-        "orientation": "landscape",
-        "visible": true,
-        "type": "page"
-      }
-    ],
-    "js": [
-      {
-        "pages": [
-          "pages/index/index"
-        ],
-        "name": "default",
-        "window": {
-          "designWidth": 750,
-          "autoDesignWidth": false
-        }
-      }
-    ]
-  }
-}

updater/update_test/gradle/entry/src/ohosTest/resources/base/element/string.json

-{
-  "string": [
-    {
-      "name": "app_name",
-      "value": "MyApplication0420"
-    },
-    {
-      "name": "mainability_description",
-      "value": "hap sample empty page"
-    }
-  ]
-}

updater/update_test/gradle/entry/src/main/js/default/app.js → updater/update_test/src/main/js/default/app.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.
- */
-
-export default {
-    onCreate() {
-        console.info('AceApplication onCreate');
-    },
-    onDestroy() {
-        console.info('AceApplication onDestroy');
-    }
-};
+/*
+ * 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.
+ */
+
+export default {
+    onCreate() {
+        console.info('AceApplication onCreate');
+    },
+    onDestroy() {
+        console.info('AceApplication onDestroy');
+    }
+};

updater/update_test/gradle/entry/src/main/js/default/pages/index/index.js → updater/update_test/src/main/js/default/pages/index/index.js

@@ -16,7 +16,7 @@
 import {Core} from 'deccjsunit/lite'
 const core = Core.getInstance()
 core.init()
-require('../../../test/List.test.js')
+require('../../test/List.test.js')
 core.execute()
 
 export default {

updater/update_test/gradle/entry/src/ohosTest/js/test/list.test.js → updater/update_test/src/main/js/default/test/List.test.js

@@ -12,5 +12,5 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
-require('./update.test.js');
\ No newline at end of file
+
+require('./update.test.js')
\ No newline at end of file

updater/update_test/gradle/entry/src/main/resources/base/element/string.json → updater/update_test/src/main/resources/base/element/string.json

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