From 99ec6752085c79bfd0639c7a22ea8b14e08e34b7 Mon Sep 17 00:00:00 2001 From: Teacher_Dong Date: Tue, 27 Feb 2024 15:58:05 +0800 Subject: [PATCH] Signed-off-by:Teacher_Dong --- .../entry/src/main/ets/Application/AbilityStage.ts | 13 +++++++++++++ .../entry/src/main/ets/FormAbility/FormAbility.ts | 13 +++++++++++++ .../entry/src/main/ets/MainAbility/MainAbility.ts | 13 +++++++++++++ .../src/main/ets/ServiceAbility/FormAbility.ts | 13 +++++++++++++ .../entry/src/main/ets/TestAbility/TestAbility.ts | 13 +++++++++++++ .../main/ets/TestRunner/OpenHarmonyTestRunner.ts | 13 +++++++++++++ .../interface_kits/coverage_summary_file.xml | 14 ++++++++++++++ .../keyword_registration/keyword_filter.py | 2 ++ localCoverage/resident_service/config/ams/ams.xml | 14 ++++++++++++++ .../resident_service/config/ams/foundation.xml | 14 ++++++++++++++ localCoverage/resident_service/config/bms/bms.xml | 14 ++++++++++++++ .../resident_service/config/bms/foundation.xml | 14 ++++++++++++++ .../resident_service/config/call/call.xml | 14 ++++++++++++++ .../resident_service/config/call/foundation.xml | 14 ++++++++++++++ localCoverage/resident_service/config/fms/fms.xml | 14 ++++++++++++++ .../resident_service/config/fms/foundation.xml | 14 ++++++++++++++ .../config/notification/foundation.xml | 14 ++++++++++++++ .../config/notification/notification.xml | 14 ++++++++++++++ .../resident_service/config/power/foundation.xml | 14 ++++++++++++++ .../resident_service/config/power/power.xml | 14 ++++++++++++++ .../resident_service/config/state/foundation.xml | 14 ++++++++++++++ .../resident_service/config/state/state.xml | 14 ++++++++++++++ .../resident_service/config/wms/foundation.xml | 14 ++++++++++++++ localCoverage/resident_service/config/wms/wms.xml | 14 ++++++++++++++ src/core/driver/drivers.py | 7 ++----- 25 files changed, 320 insertions(+), 5 deletions(-) diff --git a/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/Application/AbilityStage.ts b/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/Application/AbilityStage.ts index 379bc0b..e0732e9 100644 --- a/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/Application/AbilityStage.ts +++ b/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/Application/AbilityStage.ts @@ -1,3 +1,16 @@ +// Copyright (c) 2023 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 AbilityStage from "@ohos.app.ability.AbilityStage" export default class MyAbilityStage extends AbilityStage { diff --git a/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/FormAbility/FormAbility.ts b/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/FormAbility/FormAbility.ts index d443631..0c95f0e 100644 --- a/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/FormAbility/FormAbility.ts +++ b/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/FormAbility/FormAbility.ts @@ -1,3 +1,16 @@ +// Copyright (c) 2023 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 FormExtension from '@ohos.app.form.FormExtensionAbility'; import formBindingData from '@ohos.application.formBindingData'; import formInfo from '@ohos.application.formInfo'; diff --git a/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/MainAbility/MainAbility.ts b/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/MainAbility/MainAbility.ts index 6ee21a3..3141c2e 100644 --- a/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/MainAbility/MainAbility.ts +++ b/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/MainAbility/MainAbility.ts @@ -1,3 +1,16 @@ +// Copyright (c) 2023 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 Ability from '@ohos.app.ability.UIAbility' export default class MainAbility extends Ability { diff --git a/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/ServiceAbility/FormAbility.ts b/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/ServiceAbility/FormAbility.ts index d443631..0c95f0e 100644 --- a/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/ServiceAbility/FormAbility.ts +++ b/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/ServiceAbility/FormAbility.ts @@ -1,3 +1,16 @@ +// Copyright (c) 2023 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 FormExtension from '@ohos.app.form.FormExtensionAbility'; import formBindingData from '@ohos.application.formBindingData'; import formInfo from '@ohos.application.formInfo'; diff --git a/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/TestAbility/TestAbility.ts b/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/TestAbility/TestAbility.ts index 8f18d88..730e694 100644 --- a/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/TestAbility/TestAbility.ts +++ b/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/TestAbility/TestAbility.ts @@ -1,3 +1,16 @@ +// Copyright (c) 2023 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 Ability from '@ohos.app.ability.UIAbility' export default class TestAbility extends Ability { diff --git a/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts b/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts index 42f9867..f314906 100644 --- a/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts +++ b/examples/stagetest/actsbundlemanagerstagetest/entry/src/main/ets/TestRunner/OpenHarmonyTestRunner.ts @@ -1,3 +1,16 @@ +// Copyright (c) 2023 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 TestRunner from '@ohos.application.testRunner' import AbilityDelegatorRegistry from '@ohos.application.abilityDelegatorRegistry' diff --git a/localCoverage/interfaceCoverage/results/coverage/interface_kits/coverage_summary_file.xml b/localCoverage/interfaceCoverage/results/coverage/interface_kits/coverage_summary_file.xml index fb67817..fc3d4ae 100644 --- a/localCoverage/interfaceCoverage/results/coverage/interface_kits/coverage_summary_file.xml +++ b/localCoverage/interfaceCoverage/results/coverage/interface_kits/coverage_summary_file.xml @@ -1,4 +1,18 @@ + diff --git a/localCoverage/keyword_registration/keyword_filter.py b/localCoverage/keyword_registration/keyword_filter.py index ddb627e..35b3646 100644 --- a/localCoverage/keyword_registration/keyword_filter.py +++ b/localCoverage/keyword_registration/keyword_filter.py @@ -105,6 +105,7 @@ class KeywordRegistration: return keyword_list except (FileNotFoundError, AttributeError, FileExistsError): print(f"获取报备过滤关键字报错") + return [] @staticmethod def get_coverage_content(file_path): @@ -308,6 +309,7 @@ class KeywordRegistration: except (OSError, IndexError, TypeError) as error: print(f"覆盖率报告{branch_line}行获取函数名报错, error:{error}", traceback.format_exc()) + return "" @staticmethod def get_branch_line_list(keyword_line: int, branch_line_list: list): diff --git a/localCoverage/resident_service/config/ams/ams.xml b/localCoverage/resident_service/config/ams/ams.xml index 9fbe4b6..64894c7 100644 --- a/localCoverage/resident_service/config/ams/ams.xml +++ b/localCoverage/resident_service/config/ams/ams.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/ams/foundation.xml b/localCoverage/resident_service/config/ams/foundation.xml index 6b8da40..11d2a92 100644 --- a/localCoverage/resident_service/config/ams/foundation.xml +++ b/localCoverage/resident_service/config/ams/foundation.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/bms/bms.xml b/localCoverage/resident_service/config/bms/bms.xml index 6086c22..d74a33e 100644 --- a/localCoverage/resident_service/config/bms/bms.xml +++ b/localCoverage/resident_service/config/bms/bms.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/bms/foundation.xml b/localCoverage/resident_service/config/bms/foundation.xml index 845b3c3..c7be367 100644 --- a/localCoverage/resident_service/config/bms/foundation.xml +++ b/localCoverage/resident_service/config/bms/foundation.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/call/call.xml b/localCoverage/resident_service/config/call/call.xml index e8d279d..e6f850f 100644 --- a/localCoverage/resident_service/config/call/call.xml +++ b/localCoverage/resident_service/config/call/call.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/call/foundation.xml b/localCoverage/resident_service/config/call/foundation.xml index a8e632c..d25e2e2 100644 --- a/localCoverage/resident_service/config/call/foundation.xml +++ b/localCoverage/resident_service/config/call/foundation.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/fms/fms.xml b/localCoverage/resident_service/config/fms/fms.xml index abecd76..e5f5211 100644 --- a/localCoverage/resident_service/config/fms/fms.xml +++ b/localCoverage/resident_service/config/fms/fms.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/fms/foundation.xml b/localCoverage/resident_service/config/fms/foundation.xml index aae2385..b4514eb 100644 --- a/localCoverage/resident_service/config/fms/foundation.xml +++ b/localCoverage/resident_service/config/fms/foundation.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/notification/foundation.xml b/localCoverage/resident_service/config/notification/foundation.xml index ffcb838..1951918 100644 --- a/localCoverage/resident_service/config/notification/foundation.xml +++ b/localCoverage/resident_service/config/notification/foundation.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/notification/notification.xml b/localCoverage/resident_service/config/notification/notification.xml index 259bc9e..cc6ad89 100644 --- a/localCoverage/resident_service/config/notification/notification.xml +++ b/localCoverage/resident_service/config/notification/notification.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/power/foundation.xml b/localCoverage/resident_service/config/power/foundation.xml index 8df55e1..38a0e7f 100644 --- a/localCoverage/resident_service/config/power/foundation.xml +++ b/localCoverage/resident_service/config/power/foundation.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/power/power.xml b/localCoverage/resident_service/config/power/power.xml index a9f99c8..04e901a 100644 --- a/localCoverage/resident_service/config/power/power.xml +++ b/localCoverage/resident_service/config/power/power.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/state/foundation.xml b/localCoverage/resident_service/config/state/foundation.xml index d72b395..864ada0 100644 --- a/localCoverage/resident_service/config/state/foundation.xml +++ b/localCoverage/resident_service/config/state/foundation.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/state/state.xml b/localCoverage/resident_service/config/state/state.xml index 4fb86e2..0ddb3d9 100644 --- a/localCoverage/resident_service/config/state/state.xml +++ b/localCoverage/resident_service/config/state/state.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/wms/foundation.xml b/localCoverage/resident_service/config/wms/foundation.xml index f653b6f..9cc0818 100644 --- a/localCoverage/resident_service/config/wms/foundation.xml +++ b/localCoverage/resident_service/config/wms/foundation.xml @@ -1,4 +1,18 @@ + foundation diff --git a/localCoverage/resident_service/config/wms/wms.xml b/localCoverage/resident_service/config/wms/wms.xml index e74b72e..826c37f 100644 --- a/localCoverage/resident_service/config/wms/wms.xml +++ b/localCoverage/resident_service/config/wms/wms.xml @@ -1,4 +1,18 @@ + foundation diff --git a/src/core/driver/drivers.py b/src/core/driver/drivers.py index d203c33..57e6bfa 100644 --- a/src/core/driver/drivers.py +++ b/src/core/driver/drivers.py @@ -706,9 +706,8 @@ class CppTestDriver(IDriver): striped_content = str_content striped_bt = striped_content.encode("utf-8") - with open(name, "wb") as f: - if os.path.exists(name): - os.remove(name) + if os.path.exists(name): + os.remove(name) with os.fdopen(os.open(name, FLAGS, MODES), 'wb') as f: f.write(striped_bt) @@ -1084,8 +1083,6 @@ class JSUnitTestDriver(IDriver): driver_dict = data_dic.get("driver") if driver_dict and "test-timeout" in driver_dict.keys(): test_timeout = int(driver_dict["shell-timeout"]) / 1000 - else: - return return test_timeout except JSONDecodeError: return test_timeout -- Gitee