From f0138a5b14cc64e1be8113b46c9972de5eab1b5b Mon Sep 17 00:00:00 2001 From: lifansheng Date: Sun, 26 Sep 2021 11:41:11 +0800 Subject: [PATCH] Signed-off-by: lifansheng On branch OpenHarmony-3.0-LTS Your branch is up to date with 'origin/OpenHarmony-3.0-LTS'. Changes to be committed: modified: compileruntime/process_lib_standard/project/entry/src/main/js/default/app.js modified: compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/app.js modified: compileruntime/url_lib_standard/Test.json modified: compileruntime/url_lib_standard/project/entry/src/main/js/default/app.js modified: compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/app.js modified: compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.js modified: compileruntime/util_lib_standard/Test.json modified: compileruntime/util_lib_standard/project/entry/src/main/js/default/app.js modified: compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/app.js --- .../project/entry/src/main/js/default/app.js | 14 ++++++++++++++ .../project/entry/src/ohosTest/js/default/app.js | 14 ++++++++++++++ compileruntime/url_lib_standard/Test.json | 4 ++-- .../project/entry/src/main/js/default/app.js | 14 ++++++++++++++ .../project/entry/src/ohosTest/js/default/app.js | 14 ++++++++++++++ .../src/ohosTest/js/default/pages/index/index.js | 14 ++++++++++++++ compileruntime/util_lib_standard/Test.json | 4 ++-- .../project/entry/src/main/js/default/app.js | 14 ++++++++++++++ .../project/entry/src/ohosTest/js/default/app.js | 14 ++++++++++++++ 9 files changed, 102 insertions(+), 4 deletions(-) diff --git a/compileruntime/process_lib_standard/project/entry/src/main/js/default/app.js b/compileruntime/process_lib_standard/project/entry/src/main/js/default/app.js index aedcefe00..ef92b6e96 100644 --- a/compileruntime/process_lib_standard/project/entry/src/main/js/default/app.js +++ b/compileruntime/process_lib_standard/project/entry/src/main/js/default/app.js @@ -1,3 +1,17 @@ +/* + * 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'); diff --git a/compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/app.js b/compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/app.js index 55b67e96d..4952e62fd 100644 --- a/compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/app.js +++ b/compileruntime/process_lib_standard/project/entry/src/ohosTest/js/default/app.js @@ -1,3 +1,17 @@ +/* + * 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('TestApplication onCreate'); diff --git a/compileruntime/url_lib_standard/Test.json b/compileruntime/url_lib_standard/Test.json index 782b4805d..a5d217e9f 100644 --- a/compileruntime/url_lib_standard/Test.json +++ b/compileruntime/url_lib_standard/Test.json @@ -2,9 +2,9 @@ "description": "Configuration for startup url js api Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "21600000", + "test-timeout": "60000", "package": "com.example.url", - "shell-timeout": "21600000" + "shell-timeout": "60000" }, "kits": [ { diff --git a/compileruntime/url_lib_standard/project/entry/src/main/js/default/app.js b/compileruntime/url_lib_standard/project/entry/src/main/js/default/app.js index aedcefe00..ef92b6e96 100644 --- a/compileruntime/url_lib_standard/project/entry/src/main/js/default/app.js +++ b/compileruntime/url_lib_standard/project/entry/src/main/js/default/app.js @@ -1,3 +1,17 @@ +/* + * 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'); diff --git a/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/app.js b/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/app.js index 55b67e96d..4952e62fd 100644 --- a/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/app.js +++ b/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/app.js @@ -1,3 +1,17 @@ +/* + * 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('TestApplication onCreate'); diff --git a/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.js b/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.js index 8be2df247..1edd1fbaa 100644 --- a/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.js +++ b/compileruntime/url_lib_standard/project/entry/src/ohosTest/js/default/pages/index/index.js @@ -1,3 +1,17 @@ +/* + * 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 device from '@system.device' diff --git a/compileruntime/util_lib_standard/Test.json b/compileruntime/util_lib_standard/Test.json index 375f4eb70..301ce904e 100644 --- a/compileruntime/util_lib_standard/Test.json +++ b/compileruntime/util_lib_standard/Test.json @@ -2,9 +2,9 @@ "description": "Configuration for startup util js api Tests", "driver": { "type": "JSUnitTest", - "test-timeout": "21600000", + "test-timeout": "60000", "package": "com.example.childprocess", - "shell-timeout": "21600000" + "shell-timeout": "60000" }, "kits": [ { diff --git a/compileruntime/util_lib_standard/project/entry/src/main/js/default/app.js b/compileruntime/util_lib_standard/project/entry/src/main/js/default/app.js index aedcefe00..ef92b6e96 100644 --- a/compileruntime/util_lib_standard/project/entry/src/main/js/default/app.js +++ b/compileruntime/util_lib_standard/project/entry/src/main/js/default/app.js @@ -1,3 +1,17 @@ +/* + * 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'); diff --git a/compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/app.js b/compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/app.js index 55b67e96d..4952e62fd 100644 --- a/compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/app.js +++ b/compileruntime/util_lib_standard/project/entry/src/ohosTest/js/default/app.js @@ -1,3 +1,17 @@ +/* + * 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('TestApplication onCreate'); -- GitLab