startup 子系统编译整改

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

startup/startup_standard/BUILD.gn

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

startup/startup_standard/entry/package.json

-{}

startup/startup_standard/entry/src/main/js/default/app.js → startup/startup_standard/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');
+    }
+};

startup/startup_standard/src/main/js/default/pages/index/index.css

+.container {
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+}
+
+.title {
+    font-size: 100px;
+}

startup/startup_standard/src/main/js/default/pages/index/index.hml

+<div class="container">
+    <text class="title">
+        {{ $t('strings.hello') }} {{ title }}
+    </text>
+</div>

startup/startup_standard/entry/src/main/js/default/pages/index/index.js → startup/startup_standard/src/main/js/default/pages/index/index.js

@@ -12,11 +12,12 @@
  * 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} from 'deccjsunit/lite'
+const core = Core.getInstance()
+core.init()
+require('../../test/List.test.js')
+core.execute()
 
 export default {
     data: {
@@ -24,31 +25,5 @@ export default {
     },
     onInit() {
         this.title = this.$t('strings.world');
-    },
-    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)
-        //        core.subscribeEvent('suite', instrumentLog)
-        //        core.subscribeEvent('task', instrumentLog)
-
-        const configService = core.getDefaultService('config')
-        configService.setConfig(this)
-
-        require('../../../test/List.test')
-        core.execute()
-    },
-    onReady() {
-    },
+    }
 }

startup/startup_standard/entry/src/main/js/test/List.test.js → startup/startup_standard/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('./DeviceInfoJsUnit.test.js')
-require('./ParametersJsUnit.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('./DeviceInfoJsUnit.test.js')
+require('./ParametersJsUnit.test.js')
+
+
+

startup/startup_standard/entry/src/main/js/test/ParametersJsUnit.test.js → startup/startup_standard/src/main/js/default/test/ParametersJsUnit.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.
- */
-
-// @ts-nocheck
-import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
-import systemparameter from '@ohos.systemParameter'
-
-describe('SystemParameterTest', function () {
-    console.info('SystemParameterTest start################################start');
-    /**
-     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0100
-     * @tc.name      testSet01
-     * @tc.desc       Set the value for the given key with parameter callback.
-     * @tc.size      : MEDIUM
-     * @tc.type      : Function
-     * @tc.level     : Level 0
-     */
-    it('system_parameter_test_001', 0, async function (done) {
-        console.info('system_parameter_test_001 start');
-        var ret = false;
-            try {
-                systemparameter.set("hw_sc.build.os.version", "10.20.30.4", function (err, data) {
-                    if (err == undefined) {
-                        ret = true;
-                        console.info("set callback hw_sc.build.os.version value success :" + data);
-                    } else {
-                        console.info("set callback hw_sc.build.os.version value err:" + err.code);
-                    }
-                });
-                done();
-            }catch(e){
-                console.info("set callback hw_sc.build.os.version unexpect err:" + e);
-            }
-        setTimeout("expect(ret).assertTrue()", "10");
-        console.info('system_parameter_test_001 : PASS');
-    })
-
-    /**
-     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0200
-     * @tc.name      testSet02
-     * @tc.desc       Set the value for the given key.
-     * @tc.size      : MEDIUM
-     * @tc.type      : Function
-     * @tc.level     : Level 0
-     */
-    it('system_parameter_test_002', 0, async function (done) {
-        console.info('system_parameter_test_002 start');
-        var ret = false;
-        try {
-            systemparameter.set("ro.secure", "10.20.30.4", function (err, data) {
-                if (err == undefined) {
-                    console.info("set callback ro.secure value success:" + data)
-                } else {
-                    ret = true;
-                    console.info("set callback ro.secure value err:" + err.code)
-                }
-
-            });
-            done();
-        }catch(e){
-            console.info("set callback ro.secure unexpect err:" + e)
-        }
-        setTimeout("expect(ret).assertTrue()", "10");
-        console.info('system_parameter_test_002 : PASS');
-    })
-
-    /**
-     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0300
-     * @tc.name      testSet03
-     * @tc.desc       Set the value for the given key.
-     * @tc.size      : MEDIUM
-     * @tc.type      : Function
-     * @tc.level     : Level 0
-     */
-    it('system_parameter_test_003', 0, async function (done) {
-        console.info('system_parameter_test_003 start');
-        var parameterInfo = systemparameter.set("hw_sc.build.os.version", "1.5.3.6");
-        var ret = false;
-        try {
-            parameterInfo.then(function (value) {
-                console.info("promise  set hw_sc.build.os.version success: " + value);
-            }).catch(function (err) {
-                console.info("promise  set hw_sc.build.os.version error: " + err.code);
-            });
-            done();
-        }catch(e){
-            console.info("set callback hw_sc.build.os.version unexpect err:" + e)
-        }
-        if (parameterInfo !== null) {
-            ret = true;
-        }
-        expect(ret).assertTrue();
-        console.info('system_parameter_test_003 : PASS');
-    })
-
-    /**
-     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0400
-     * @tc.name      testSet04
-     * @tc.desc       Set the value for the given key.
-     * @tc.size      : MEDIUM
-     * @tc.type      : Function
-     * @tc.level     : Level 0
-     */
-    it('system_parameter_test_004', 0, async function (done) {
-        console.info('system_parameter_test_004 start');
-        var parameterInfo = systemparameter.set("ro.secure", "10");
-        var ret = false;
-        try {
-            parameterInfo.then(function (value) {
-                console.info("12333 promise  set ro.secure success: " + value);
-            }).catch(function (err) {
-                console.info("12333 promise  set ro.secure error: " + err.code);
-            });
-            done();
-        }catch(e){
-            console.info("set callback ro.secure unexpect err:" + e)
-        }
-        if (parameterInfo !== null) {
-            ret = true;
-        }
-        expect(ret).assertTrue();
-        console.info('system_parameter_test_004 ：PASS');
-    })
-
-    /**
-     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0500
-     * @tc.name      testSetSync01
-     * @tc.desc       Set the value for the given key.
-     * @tc.size      : MEDIUM
-     * @tc.type      : Function
-     * @tc.level     : Level 0
-     */
-    it('system_parameter_test_005', 0, function () {
-        console.info('system_parameter_test_005 start');
-        var ret = false;
-        try {
-            var parameterInfo = systemparameter.setSync("hw_sc.build.os.version", "2.5.3.7");
-            console.info("promise  setSync ro.secure success: " + parameterInfo);
-            ret = true;
-        }catch(e){
-            console.info("promise  setSync ro.secure error: " + e);
-        }
-        expect(ret).assertTrue();
-        console.info('system_parameter_test_005 : PASS');
-    })
-
-    /**
-     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0600
-     * @tc.name      testSetSync02
-     * @tc.desc       Set the value for the given key.
-     * @tc.size      : MEDIUM
-     * @tc.type      : Function
-     * @tc.level     : Level 0
-     */
-    it('system_parameter_test_006', 0, function () {
-        console.info('system_parameter_test_006 start');
-        var ret = false;
-        try {
-            var parameterInfo = systemparameter.setSync("hw_sc.build.os.version", 56789);
-            console.info("promise  setSync ro.secure success: " + parameterInfo);
-        }catch(e){
-            ret = true;
-            console.info("promise  setSync ro.secure error: " + e);
-        }
-        expect(ret).assertTrue();
-        console.info('system_parameter_test_006 : PASS');
-    })
-
-    /**
-     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0800
-     * @tc.name      testGet02
-     * @tc.desc       Set the value for the given key.
-     * @tc.size      : MEDIUM
-     * @tc.type      : Function
-     * @tc.level     : Level 0
-     */
-    it('system_parameter_test_008', 0, async function (done) {
-        console.info('system_parameter_test_008 start');
-        var ret = false;
-        try {
-            var parameterInfo = systemparameter.get("hw_sc.build.os.version");
-
-            parameterInfo.then(function (value) {
-                ret = true;
-                console.info("promise get hw_sc.build.os.version success: " + value);
-            }).catch(function (err) {
-                console.info("promise get hw_sc.build.os.version error: " + err.code);
-            });
-            done();
-        }catch(e){
-            console.info("promise  setSync ro.secure error: " + e);
-        }
-        setTimeout("expect(ret).assertTrue()", "10");
-        console.info('system_parameter_test_008 : PASS');
-    })
-
-    /**
-     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0150
-     * @tc.name      testGetSync01
-     * @tc.desc      Gets the value of the attribute with the specified key.
-     * @tc.size      : MEDIUM
-     * @tc.type      : Function
-     * @tc.level     : Level 0
-     */
-    it('system_parameter_test_014', 0, async function (done) {
-        console.info('system_parameter_test_014 start');
-        var ret = false;
-        try {
-            var parameterInfo = systemparameter.getSync("hw_sc.build.os.version", 496);
-            parameterInfo.then(function (value) {
-                console.info("496 promise get hw_sc.build.os.version success: " + value);
-            }).catch(function (err) {
-                console.info("496 promise get hw_sc.build.os.version error: " + err.code);
-            });
-            done();
-        } catch (e) {
-            ret = true;
-            console.info("promise get input error: " + e);
-        }
-        expect(ret).assertTrue();
-        console.info('system_parameter_test_014 : PASS');
-    })
+/*
+ * 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.
+ */
+
+// @ts-nocheck
+import {describe, beforeAll, beforeEach, afterEach, afterAll, it, expect} from 'deccjsunit/index'
+import systemparameter from '@ohos.systemParameter'
+
+describe('SystemParameterTest', function () {
+    console.info('SystemParameterTest start################################start');
+    /**
+     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0100
+     * @tc.name      testSet01
+     * @tc.desc       Set the value for the given key with parameter callback.
+     * @tc.size      : MEDIUM
+     * @tc.type      : Function
+     * @tc.level     : Level 0
+     */
+    it('system_parameter_test_001', 0, async function (done) {
+        console.info('system_parameter_test_001 start');
+        var ret = false;
+            try {
+                systemparameter.set("hw_sc.build.os.version", "10.20.30.4", function (err, data) {
+                    if (err == undefined) {
+                        ret = true;
+                        console.info("set callback hw_sc.build.os.version value success :" + data);
+                    } else {
+                        console.info("set callback hw_sc.build.os.version value err:" + err.code);
+                    }
+                });
+                done();
+            }catch(e){
+                console.info("set callback hw_sc.build.os.version unexpect err:" + e);
+            }
+        setTimeout("expect(ret).assertTrue()", "10");
+        console.info('system_parameter_test_001 : PASS');
+    })
+
+    /**
+     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0200
+     * @tc.name      testSet02
+     * @tc.desc       Set the value for the given key.
+     * @tc.size      : MEDIUM
+     * @tc.type      : Function
+     * @tc.level     : Level 0
+     */
+    it('system_parameter_test_002', 0, async function (done) {
+        console.info('system_parameter_test_002 start');
+        var ret = false;
+        try {
+            systemparameter.set("ro.secure", "10.20.30.4", function (err, data) {
+                if (err == undefined) {
+                    console.info("set callback ro.secure value success:" + data)
+                } else {
+                    ret = true;
+                    console.info("set callback ro.secure value err:" + err.code)
+                }
+
+            });
+            done();
+        }catch(e){
+            console.info("set callback ro.secure unexpect err:" + e)
+        }
+        setTimeout("expect(ret).assertTrue()", "10");
+        console.info('system_parameter_test_002 : PASS');
+    })
+
+    /**
+     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0300
+     * @tc.name      testSet03
+     * @tc.desc       Set the value for the given key.
+     * @tc.size      : MEDIUM
+     * @tc.type      : Function
+     * @tc.level     : Level 0
+     */
+    it('system_parameter_test_003', 0, async function (done) {
+        console.info('system_parameter_test_003 start');
+        var parameterInfo = systemparameter.set("hw_sc.build.os.version", "1.5.3.6");
+        var ret = false;
+        try {
+            parameterInfo.then(function (value) {
+                console.info("promise  set hw_sc.build.os.version success: " + value);
+            }).catch(function (err) {
+                console.info("promise  set hw_sc.build.os.version error: " + err.code);
+            });
+            done();
+        }catch(e){
+            console.info("set callback hw_sc.build.os.version unexpect err:" + e)
+        }
+        if (parameterInfo !== null) {
+            ret = true;
+        }
+        expect(ret).assertTrue();
+        console.info('system_parameter_test_003 : PASS');
+    })
+
+    /**
+     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0400
+     * @tc.name      testSet04
+     * @tc.desc       Set the value for the given key.
+     * @tc.size      : MEDIUM
+     * @tc.type      : Function
+     * @tc.level     : Level 0
+     */
+    it('system_parameter_test_004', 0, async function (done) {
+        console.info('system_parameter_test_004 start');
+        var parameterInfo = systemparameter.set("ro.secure", "10");
+        var ret = false;
+        try {
+            parameterInfo.then(function (value) {
+                console.info("12333 promise  set ro.secure success: " + value);
+            }).catch(function (err) {
+                console.info("12333 promise  set ro.secure error: " + err.code);
+            });
+            done();
+        }catch(e){
+            console.info("set callback ro.secure unexpect err:" + e)
+        }
+        if (parameterInfo !== null) {
+            ret = true;
+        }
+        expect(ret).assertTrue();
+        console.info('system_parameter_test_004 ：PASS');
+    })
+
+    /**
+     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0500
+     * @tc.name      testSetSync01
+     * @tc.desc       Set the value for the given key.
+     * @tc.size      : MEDIUM
+     * @tc.type      : Function
+     * @tc.level     : Level 0
+     */
+    it('system_parameter_test_005', 0, function () {
+        console.info('system_parameter_test_005 start');
+        var ret = false;
+        try {
+            var parameterInfo = systemparameter.setSync("hw_sc.build.os.version", "2.5.3.7");
+            console.info("promise  setSync ro.secure success: " + parameterInfo);
+            ret = true;
+        }catch(e){
+            console.info("promise  setSync ro.secure error: " + e);
+        }
+        expect(ret).assertTrue();
+        console.info('system_parameter_test_005 : PASS');
+    })
+
+    /**
+     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0600
+     * @tc.name      testSetSync02
+     * @tc.desc       Set the value for the given key.
+     * @tc.size      : MEDIUM
+     * @tc.type      : Function
+     * @tc.level     : Level 0
+     */
+    it('system_parameter_test_006', 0, function () {
+        console.info('system_parameter_test_006 start');
+        var ret = false;
+        try {
+            var parameterInfo = systemparameter.setSync("hw_sc.build.os.version", 56789);
+            console.info("promise  setSync ro.secure success: " + parameterInfo);
+        }catch(e){
+            ret = true;
+            console.info("promise  setSync ro.secure error: " + e);
+        }
+        expect(ret).assertTrue();
+        console.info('system_parameter_test_006 : PASS');
+    })
+
+    /**
+     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0800
+     * @tc.name      testGet02
+     * @tc.desc       Set the value for the given key.
+     * @tc.size      : MEDIUM
+     * @tc.type      : Function
+     * @tc.level     : Level 0
+     */
+    it('system_parameter_test_008', 0, async function (done) {
+        console.info('system_parameter_test_008 start');
+        var ret = false;
+        try {
+            var parameterInfo = systemparameter.get("hw_sc.build.os.version");
+
+            parameterInfo.then(function (value) {
+                ret = true;
+                console.info("promise get hw_sc.build.os.version success: " + value);
+            }).catch(function (err) {
+                console.info("promise get hw_sc.build.os.version error: " + err.code);
+            });
+            done();
+        }catch(e){
+            console.info("promise  setSync ro.secure error: " + e);
+        }
+        setTimeout("expect(ret).assertTrue()", "10");
+        console.info('system_parameter_test_008 : PASS');
+    })
+
+    /**
+     * @tc.number    SUB_STARTUP_JS_SYSTEM_PARAMETER_0150
+     * @tc.name      testGetSync01
+     * @tc.desc      Gets the value of the attribute with the specified key.
+     * @tc.size      : MEDIUM
+     * @tc.type      : Function
+     * @tc.level     : Level 0
+     */
+    it('system_parameter_test_014', 0, async function (done) {
+        console.info('system_parameter_test_014 start');
+        var ret = false;
+        try {
+            var parameterInfo = systemparameter.getSync("hw_sc.build.os.version", 496);
+            parameterInfo.then(function (value) {
+                console.info("496 promise get hw_sc.build.os.version success: " + value);
+            }).catch(function (err) {
+                console.info("496 promise get hw_sc.build.os.version error: " + err.code);
+            });
+            done();
+        } catch (e) {
+            ret = true;
+            console.info("promise get input error: " + e);
+        }
+        expect(ret).assertTrue();
+        console.info('system_parameter_test_014 : PASS');
+    })
 })
\ No newline at end of file

startup/startup_standard/src/main/resources/base/element/string.json

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

updater/update_test/src/main/js/default/i18n/en-US.json

+{
+  "strings": {
+    "hello": "Hello",
+    "world": "World"
+  }
+}
\ No newline at end of file

updater/update_test/src/main/js/default/i18n/zh-CN.json

+{
+  "strings": {
+    "hello": "您好",
+    "world": "世界"
+  }
+}
\ No newline at end of file