From c640e9841b302086c7702187d1239a24272932d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 3 Mar 2022 03:46:30 +0000 Subject: [PATCH 01/13] Description:TDD testing case. Sig:aafwk Feature or Bugfix:Bugfix Binary Source:No #I4W3OR; Signed-off-by: wuluofeng --- frameworks/ability_lite/BUILD.gn | 40 +++++++++++++++++++ .../unittest/ability_main_test.cpp | 0 2 files changed, 40 insertions(+) create mode 100644 frameworks/ability_lite/unittest/ability_main_test.cpp diff --git a/frameworks/ability_lite/BUILD.gn b/frameworks/ability_lite/BUILD.gn index 7ed6368..86a1a53 100755 --- a/frameworks/ability_lite/BUILD.gn +++ b/frameworks/ability_lite/BUILD.gn @@ -119,6 +119,46 @@ lite_library("ability") { } } +unittest("ability_main_test_lv0") { + output_extension = "bin" + output_dir = "$root_out_dir/test/unittest/MainTest_lv0" + + sources = [ "//foundation/aafwk/aafwk_lite/frameworks/ability_lite/unittest/ability_main_test.cpp" ] + + include_dirs = [ + "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite" + ] + + include_dirs = [ + "${aafwk_lite_path}/frameworks/abilitymgr_lite/include", + "${aafwk_lite_path}/frameworks/want_lite/include", + "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite", + "${aafwk_lite_path}/interfaces/kits/want_lite", + "${aafwk_lite_path}/interfaces/kits/ability_lite", + "${appexecfwk_lite_path}/utils/bundle_lite", + "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", + "${appexecfwk_lite_path}/frameworks/bundle_lite/include", + "//foundation/graphic/ui/frameworks", + "//foundation/graphic/surface/interfaces/kits", + "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", + "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", + "//foundation/communication/ipc_lite/frameworks/liteipc/include", + "//third_party/bounds_checking_function/include", + "//third_party/freetype/include", + "//utils/native/lite/kv_store/innerkits", + "//utils/native/lite/include", + "./include", + "./", + ] + + deps = [ + "${aafwk_lite_path}/frameworks/abilitymgr_lite:abilitymanager", + "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", + "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", + "//utils/native/lite/kv_store:kv_store", + ] +} + lite_component("aafwk_abilitykit_lite") { if (enable_ohos_appexecfwk_feature_ability == true) { public_configs = [ ":abilitykit_config" ] diff --git a/frameworks/ability_lite/unittest/ability_main_test.cpp b/frameworks/ability_lite/unittest/ability_main_test.cpp new file mode 100644 index 0000000..e69de29 -- Gitee From 6c707a1405a4d43a3dd07b72dd3e15740fc904e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 3 Mar 2022 07:05:14 +0000 Subject: [PATCH 02/13] Description:TDD testing case. Sig:aafwk Feature or Bugfix:Bugfix Binary Source:No #I4W3OR; Signed-off-by: wuluofeng --- frameworks/ability_lite/BUILD.gn | 6 ++- .../unittest/ability_main_test.cpp | 44 +++++++++++++++++++ 2 files changed, 49 insertions(+), 1 deletion(-) diff --git a/frameworks/ability_lite/BUILD.gn b/frameworks/ability_lite/BUILD.gn index 86a1a53..7df1e76 100755 --- a/frameworks/ability_lite/BUILD.gn +++ b/frameworks/ability_lite/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/subsystem/aafwk/config.gni") +import("//build/lite/config/test.gni") import("//build/lite/ndk/ndk.gni") generate_notice_file("ability_notice_file") { @@ -164,7 +165,10 @@ lite_component("aafwk_abilitykit_lite") { public_configs = [ ":abilitykit_config" ] } - features = [ ":ability" ] + features = [ + ":ability", + ":ability_main_test", + ] } config("abilitykit_config") { diff --git a/frameworks/ability_lite/unittest/ability_main_test.cpp b/frameworks/ability_lite/unittest/ability_main_test.cpp index e69de29..c5c184b 100644 --- a/frameworks/ability_lite/unittest/ability_main_test.cpp +++ b/frameworks/ability_lite/unittest/ability_main_test.cpp @@ -0,0 +1,44 @@ +//#include +//#include "../../../interfaces/innerkits/abilitymgr_lite/ability_main.h" + + +#define TDD_CASE_BEGIN() SetUp() +#define TDD_CASE_END() TearDown() + +#define HC_SUCCESS 0x00000000 + +// using namespace testing::ext; + + +namespace OHOS +{ + class AbilityMainTest //: public testing::Test + { + public: + // void SetUp() override + // { + // printf("AbilityMainTest setup"); + // } + + // void TearDown() override + // { + // printf("AbilityMainTest TearDown"); + // } + + void AbilityMainTest001(); + + }; + + void AbilityMainTest::AbilityMainTest001() + { + // printf("AbilityMainTest setup"); + // TDD_CASE_BEGIN(); + // const char *token = "com.huawei.launcher_BM70W1/aVSbkx+uI/WT/mO9NqmtEBx9esLAogYAid75/gTMpKWqrNUT5hS9Cj" + // "Bq6kt1OcxgZzdCJ4HuVyS4dP8w="; + // auto ret = AbilityMain(token); + // EXPECT_TRUE(ret == HC_SUCCESS); + // printf("--------AbilityMainTest001 end--------"); + // TDD_CASE_END(); + } + +} -- Gitee From 7c6558a3963d70d7473b10dc59e080cf8a63c3ae Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 3 Mar 2022 07:15:15 +0000 Subject: [PATCH 03/13] Description:TDD testing case. Sig:aafwk Feature or Bugfix:Bugfix Binary Source:No #I4W3OR; Signed-off-by: wuluofeng --- frameworks/ability_lite/BUILD.gn | 29 ------------------- .../unittest/ability_main_test.cpp | 15 ++++++++++ 2 files changed, 15 insertions(+), 29 deletions(-) diff --git a/frameworks/ability_lite/BUILD.gn b/frameworks/ability_lite/BUILD.gn index 7df1e76..b67d8cf 100755 --- a/frameworks/ability_lite/BUILD.gn +++ b/frameworks/ability_lite/BUILD.gn @@ -129,35 +129,6 @@ unittest("ability_main_test_lv0") { include_dirs = [ "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite" ] - - include_dirs = [ - "${aafwk_lite_path}/frameworks/abilitymgr_lite/include", - "${aafwk_lite_path}/frameworks/want_lite/include", - "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite", - "${aafwk_lite_path}/interfaces/kits/want_lite", - "${aafwk_lite_path}/interfaces/kits/ability_lite", - "${appexecfwk_lite_path}/utils/bundle_lite", - "${appexecfwk_lite_path}/interfaces/kits/bundle_lite", - "${appexecfwk_lite_path}/frameworks/bundle_lite/include", - "//foundation/graphic/ui/frameworks", - "//foundation/graphic/surface/interfaces/kits", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/registry", - "//foundation/distributedschedule/samgr_lite/interfaces/kits/samgr", - "//foundation/communication/ipc_lite/frameworks/liteipc/include", - "//third_party/bounds_checking_function/include", - "//third_party/freetype/include", - "//utils/native/lite/kv_store/innerkits", - "//utils/native/lite/include", - "./include", - "./", - ] - - deps = [ - "${aafwk_lite_path}/frameworks/abilitymgr_lite:abilitymanager", - "${appexecfwk_lite_path}/frameworks/bundle_lite:bundle", - "//base/hiviewdfx/hilog_lite/frameworks/featured:hilog_shared", - "//utils/native/lite/kv_store:kv_store", - ] } lite_component("aafwk_abilitykit_lite") { diff --git a/frameworks/ability_lite/unittest/ability_main_test.cpp b/frameworks/ability_lite/unittest/ability_main_test.cpp index c5c184b..24891e3 100644 --- a/frameworks/ability_lite/unittest/ability_main_test.cpp +++ b/frameworks/ability_lite/unittest/ability_main_test.cpp @@ -1,3 +1,18 @@ +/* + * Copyright (c) 2022 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. + */ + //#include //#include "../../../interfaces/innerkits/abilitymgr_lite/ability_main.h" -- Gitee From dbb6d9db7f69396e1b67aa9868200d59dd589985 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 3 Mar 2022 07:32:48 +0000 Subject: [PATCH 04/13] Description:TDD testing case. Sig:aafwk Feature or Bugfix:Bugfix Binary Source:No #I4W3OR; Signed-off-by: wuluofeng --- frameworks/ability_lite/BUILD.gn | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/frameworks/ability_lite/BUILD.gn b/frameworks/ability_lite/BUILD.gn index b67d8cf..51719b1 100755 --- a/frameworks/ability_lite/BUILD.gn +++ b/frameworks/ability_lite/BUILD.gn @@ -129,6 +129,8 @@ unittest("ability_main_test_lv0") { include_dirs = [ "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite" ] + + features = [ ":ability_main_test" ] } lite_component("aafwk_abilitykit_lite") { @@ -136,10 +138,7 @@ lite_component("aafwk_abilitykit_lite") { public_configs = [ ":abilitykit_config" ] } - features = [ - ":ability", - ":ability_main_test", - ] + features = [ ":ability" ] } config("abilitykit_config") { -- Gitee From c0aa85512b1fdaea19baf90580c2694139658c80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 3 Mar 2022 07:44:20 +0000 Subject: [PATCH 05/13] Description:TDD testing case. Sig:aafwk Feature or Bugfix:Bugfix Binary Source:No #I4W3OR; Signed-off-by: wuluofeng --- frameworks/ability_lite/BUILD.gn | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/frameworks/ability_lite/BUILD.gn b/frameworks/ability_lite/BUILD.gn index 51719b1..bcde77b 100755 --- a/frameworks/ability_lite/BUILD.gn +++ b/frameworks/ability_lite/BUILD.gn @@ -120,6 +120,14 @@ lite_library("ability") { } } +lite_component("aafwk_abilitykit_lite") { + if (enable_ohos_appexecfwk_feature_ability == true) { + public_configs = [ ":abilitykit_config" ] + } + + features = [ ":ability" ] +} + unittest("ability_main_test_lv0") { output_extension = "bin" output_dir = "$root_out_dir/test/unittest/MainTest_lv0" @@ -130,15 +138,7 @@ unittest("ability_main_test_lv0") { "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite" ] - features = [ ":ability_main_test" ] -} - -lite_component("aafwk_abilitykit_lite") { - if (enable_ohos_appexecfwk_feature_ability == true) { - public_configs = [ ":abilitykit_config" ] - } - - features = [ ":ability" ] + features += [ ":ability_main_test" ] } config("abilitykit_config") { -- Gitee From 7a7da373fe1d791c3aa9b0fe97c84b8d2c218d71 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 3 Mar 2022 08:18:31 +0000 Subject: [PATCH 06/13] 11 --- frameworks/ability_lite/BUILD.gn | 1 - 1 file changed, 1 deletion(-) diff --git a/frameworks/ability_lite/BUILD.gn b/frameworks/ability_lite/BUILD.gn index bcde77b..756092b 100755 --- a/frameworks/ability_lite/BUILD.gn +++ b/frameworks/ability_lite/BUILD.gn @@ -138,7 +138,6 @@ unittest("ability_main_test_lv0") { "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite" ] - features += [ ":ability_main_test" ] } config("abilitykit_config") { -- Gitee From bc20c816842a61e677c2165fafa15fc96b94ba86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 3 Mar 2022 08:37:58 +0000 Subject: [PATCH 07/13] ff --- .../unittest/ability_main_test.cpp | 40 +++++++++---------- 1 file changed, 20 insertions(+), 20 deletions(-) diff --git a/frameworks/ability_lite/unittest/ability_main_test.cpp b/frameworks/ability_lite/unittest/ability_main_test.cpp index 24891e3..766ead1 100644 --- a/frameworks/ability_lite/unittest/ability_main_test.cpp +++ b/frameworks/ability_lite/unittest/ability_main_test.cpp @@ -13,8 +13,8 @@ * limitations under the License. */ -//#include -//#include "../../../interfaces/innerkits/abilitymgr_lite/ability_main.h" +#include +#include "../../../interfaces/innerkits/abilitymgr_lite/ability_main.h" #define TDD_CASE_BEGIN() SetUp() @@ -22,23 +22,23 @@ #define HC_SUCCESS 0x00000000 -// using namespace testing::ext; +using namespace testing::ext; namespace OHOS { - class AbilityMainTest //: public testing::Test + class AbilityMainTest : public testing::Test { public: - // void SetUp() override - // { - // printf("AbilityMainTest setup"); - // } + void SetUp() override + { + printf("AbilityMainTest setup"); + } - // void TearDown() override - // { - // printf("AbilityMainTest TearDown"); - // } + void TearDown() override + { + printf("AbilityMainTest TearDown"); + } void AbilityMainTest001(); @@ -46,14 +46,14 @@ namespace OHOS void AbilityMainTest::AbilityMainTest001() { - // printf("AbilityMainTest setup"); - // TDD_CASE_BEGIN(); - // const char *token = "com.huawei.launcher_BM70W1/aVSbkx+uI/WT/mO9NqmtEBx9esLAogYAid75/gTMpKWqrNUT5hS9Cj" - // "Bq6kt1OcxgZzdCJ4HuVyS4dP8w="; - // auto ret = AbilityMain(token); - // EXPECT_TRUE(ret == HC_SUCCESS); - // printf("--------AbilityMainTest001 end--------"); - // TDD_CASE_END(); + printf("AbilityMainTest setup"); + TDD_CASE_BEGIN(); + const char *token = "com.huawei.launcher_BM70W1/aVSbkx+uI/WT/mO9NqmtEBx9esLAogYAid75/gTMpKWqrNUT5hS9Cj" + "Bq6kt1OcxgZzdCJ4HuVyS4dP8w="; + auto ret = AbilityMain(token); + EXPECT_TRUE(ret == HC_SUCCESS); + printf("--------AbilityMainTest001 end--------"); + TDD_CASE_END(); } } -- Gitee From 57323d9cf20beee3b27f158ce76acf7490469f08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 3 Mar 2022 09:01:08 +0000 Subject: [PATCH 08/13] 1 --- .../unittest/ability_main_test.cpp | 20 ++++--------------- 1 file changed, 4 insertions(+), 16 deletions(-) diff --git a/frameworks/ability_lite/unittest/ability_main_test.cpp b/frameworks/ability_lite/unittest/ability_main_test.cpp index 766ead1..f57d33c 100644 --- a/frameworks/ability_lite/unittest/ability_main_test.cpp +++ b/frameworks/ability_lite/unittest/ability_main_test.cpp @@ -16,19 +16,10 @@ #include #include "../../../interfaces/innerkits/abilitymgr_lite/ability_main.h" - -#define TDD_CASE_BEGIN() SetUp() -#define TDD_CASE_END() TearDown() - -#define HC_SUCCESS 0x00000000 - using namespace testing::ext; - -namespace OHOS -{ - class AbilityMainTest : public testing::Test - { +namespace OHOS { + class AbilityMainTest : public testing::Test { public: void SetUp() override { @@ -39,19 +30,16 @@ namespace OHOS { printf("AbilityMainTest TearDown"); } - void AbilityMainTest001(); - }; void AbilityMainTest::AbilityMainTest001() { printf("AbilityMainTest setup"); TDD_CASE_BEGIN(); - const char *token = "com.huawei.launcher_BM70W1/aVSbkx+uI/WT/mO9NqmtEBx9esLAogYAid75/gTMpKWqrNUT5hS9Cj" - "Bq6kt1OcxgZzdCJ4HuVyS4dP8w="; + const char *token = "launcher"; auto ret = AbilityMain(token); - EXPECT_TRUE(ret == HC_SUCCESS); + EXPECT_TRUE(ret == 0); printf("--------AbilityMainTest001 end--------"); TDD_CASE_END(); } -- Gitee From 2c9413728265a94ae38a009636996984031201d5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 3 Mar 2022 09:31:21 +0000 Subject: [PATCH 09/13] e --- frameworks/ability_lite/unittest/ability_main_test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/frameworks/ability_lite/unittest/ability_main_test.cpp b/frameworks/ability_lite/unittest/ability_main_test.cpp index f57d33c..b12e5fb 100644 --- a/frameworks/ability_lite/unittest/ability_main_test.cpp +++ b/frameworks/ability_lite/unittest/ability_main_test.cpp @@ -43,5 +43,4 @@ namespace OHOS { printf("--------AbilityMainTest001 end--------"); TDD_CASE_END(); } - } -- Gitee From 972f754594e960c2a3500dc6b4027eb283ed3690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 3 Mar 2022 10:46:07 +0000 Subject: [PATCH 10/13] wss --- frameworks/abilitymgr_lite/BUILD.gn | 9 ++ .../unittest/ability_manager_inner_test.cpp | 136 ++++++++++++++++++ 2 files changed, 145 insertions(+) create mode 100644 frameworks/abilitymgr_lite/unittest/ability_manager_inner_test.cpp diff --git a/frameworks/abilitymgr_lite/BUILD.gn b/frameworks/abilitymgr_lite/BUILD.gn index 6486a61..39ce24f 100755 --- a/frameworks/abilitymgr_lite/BUILD.gn +++ b/frameworks/abilitymgr_lite/BUILD.gn @@ -75,6 +75,15 @@ lite_library("abilitymanager") { ] } + +unittest("ability_manager_inner_test") { + output_extension = "bin" + output_dir = "$root_out_dir/test/unittest/ManagerInnerTest_lv0" + + sources = [ "//foundation/aafwk/aafwk_lite/frameworks/abilitymgr_lite/unittest/ability_manager_inner_test.cpp" ] + +} + lite_component("aafwk_abilityManager_lite") { features = [ ":abilitymanager" ] } diff --git a/frameworks/abilitymgr_lite/unittest/ability_manager_inner_test.cpp b/frameworks/abilitymgr_lite/unittest/ability_manager_inner_test.cpp new file mode 100644 index 0000000..25aa384 --- /dev/null +++ b/frameworks/abilitymgr_lite/unittest/ability_manager_inner_test.cpp @@ -0,0 +1,136 @@ +#include "gtest/gtest.h" +#include "../../../interfaces/innerkits/abilitymgr_lite/slite/ability_manager_inner.h" + +#define TDD_CASE_BEGIN() SetUp() +#define TDD_CASE_END() TearDown() + +#define HC_SUCCESS 0x00000000 + +using namespace testing::ext; + +typedef int (*StartCheckFunc)(const char *bundleName); + +namespace OHOS +{ + class AbilityManagerInnerTest : public testing::Test + { + public: + void SetUp() override + { + printf("AbilityManagerInnerTest setup"); + } + + void TearDown() override + { + printf("AbilityManagerInnerTest TearDown"); + } + + void AbilityManagerInnerTest001(); + void AbilityManagerInnerTest002(); + void AbilityManagerInnerTest003(); + void AbilityManagerInnerTest004(); + void AbilityManagerInnerTest005(); + void AbilityManagerInnerTest006(); + void AbilityManagerInnerTest007(); + void AbilityManagerInnerTest008(); + void RunTests(); + }; + + void AbilityManagerInnerTest::AbilityManagerInnerTest001() + { + printf("AbilityManagerInnerTest setup"); + TDD_CASE_BEGIN(); + StartCheckFunc startChecktCallback = getAbilityCallback(); + auto ret = RegAbilityCallback(startChecktCallback); + EXPECT_TRUE(ret == HC_SUCCESS); + printf("--------AbilityManagerInnerTest001 RegAbilityCallback end--------"); + TDD_CASE_END(); + } + + void AbilityManagerInnerTest::AbilityManagerInnerTest002() + { + printf("--------AbilityManagerInnerTest002 SchedulerLifecycleDone begin--------"); + TDD_CASE_BEGIN(); + int state = 2; + auto token = 0; + auto ret = SchedulerLifecycleDone(token, state); + EXPECT_TRUE(ret == HC_SUCCESS); + printf("--------AbilityManagerInnerTest002 SchedulerLifecycleDone end--------"); + TDD_CASE_END(); + } + + void AbilityManagerInnerTest::AbilityManagerInnerTest003() + { + printf("--------AbilityManagerInnerTest003 ForceStopBundle begin--------"); + TDD_CASE_BEGIN(); + auto token = 0; + auto ret = ForceStopBundle(token); + EXPECT_TRUE(ret == HC_SUCCESS); + printf("--------AbilityManagerInnerTest003 ForceStopBundle end--------"); + TDD_CASE_END(); + } + + void AbilityManagerInnerTest::AbilityManagerInnerTest004() + { + printf("--------AbilityManagerInnerTest004 GetTopAbility begin--------"); + TDD_CASE_BEGIN(); + auto ret = GetTopAbility(); + EXPECT_TRUE(ret == nullptr); + printf("--------AbilityManagerInnerTest004 GetTopAbility end--------"); + TDD_CASE_END(); + } + + void AbilityManagerInnerTest::AbilityManagerInnerTest005() + { + printf("--------AbilityManagerInnerTest005 ForceStop begin--------"); + TDD_CASE_BEGIN(); + char *bundlename = "com.huawei.launcher"; + auto ret = ForceStop(bundlename); + EXPECT_TRUE(ret == HC_SUCCESS); + printf("--------AbilityManagerInnerTest005 ForceStop end--------"); + TDD_CASE_END(); + } + + void AbilityManagerInnerTest::AbilityManagerInnerTest006() + { + printf("--------AbilityManagerInnerTest006 getAbilityCallback begin--------"); + TDD_CASE_BEGIN(); + auto ret = getAbilityCallback(); + EXPECT_TRUE(ret == nullptr); + printf("--------AbilityManagerInnerTest006 getAbilityCallback end--------"); + TDD_CASE_END(); + } + + void AbilityManagerInnerTest::AbilityManagerInnerTest007() + { + printf("--------AbilityManagerInnerTest007 setCleanAbilityDataFlag begin--------"); + TDD_CASE_BEGIN(); + bool cleanFlag = true; + setCleanAbilityDataFlag(cleanFlag); + printf("--------AbilityManagerInnerTest007 setCleanAbilityDataFlag end--------"); + TDD_CASE_END(); + } + + void AbilityManagerInnerTest::AbilityManagerInnerTest008() + { + printf("--------AbilityManagerInnerTest008 getCleanAbilityDataFlag begin--------"); + TDD_CASE_BEGIN(); + auto ret = getCleanAbilityDataFlag(); + EXPECT_TRUE(ret == HC_SUCCESS); + printf("--------AbilityManagerInnerTest008 getCleanAbilityDataFlag end--------"); + TDD_CASE_END(); + } + + void AbilityManagerInnerTest::RunTests() + { + void AbilityManagerInnerTest001(); + void AbilityManagerInnerTest002(); + void AbilityManagerInnerTest003(); + void AbilityManagerInnerTest004(); + void AbilityManagerInnerTest005(); + void AbilityManagerInnerTest006(); + void AbilityManagerInnerTest007(); + void AbilityManagerInnerTest008(); + } + +} -- Gitee From 01c61bfae8f2eedd1b6acefdda4f018b51afb639 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Thu, 3 Mar 2022 10:56:20 +0000 Subject: [PATCH 11/13] 1 --- frameworks/abilitymgr_lite/BUILD.gn | 1 + 1 file changed, 1 insertion(+) diff --git a/frameworks/abilitymgr_lite/BUILD.gn b/frameworks/abilitymgr_lite/BUILD.gn index 39ce24f..b133e60 100755 --- a/frameworks/abilitymgr_lite/BUILD.gn +++ b/frameworks/abilitymgr_lite/BUILD.gn @@ -12,6 +12,7 @@ # limitations under the License. import("//build/lite/config/component/lite_component.gni") import("//build/lite/config/subsystem/aafwk/config.gni") +import("//build/lite/config/test.gni") lite_library("abilitymanager") { if (ohos_kernel_type == "liteos_m") { -- Gitee From 98cbdb26d3f6cec6f5028e66ba9d5cfbe58a2e27 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Fri, 4 Mar 2022 02:01:03 +0000 Subject: [PATCH 12/13] ww --- .../unittest/ability_main_test.cpp | 4 +- .../unittest/ability_manager_inner_test.cpp | 73 ++++++++++--------- 2 files changed, 42 insertions(+), 35 deletions(-) diff --git a/frameworks/ability_lite/unittest/ability_main_test.cpp b/frameworks/ability_lite/unittest/ability_main_test.cpp index b12e5fb..ea5838c 100644 --- a/frameworks/ability_lite/unittest/ability_main_test.cpp +++ b/frameworks/ability_lite/unittest/ability_main_test.cpp @@ -36,11 +36,11 @@ namespace OHOS { void AbilityMainTest::AbilityMainTest001() { printf("AbilityMainTest setup"); - TDD_CASE_BEGIN(); + SetUp(); const char *token = "launcher"; auto ret = AbilityMain(token); EXPECT_TRUE(ret == 0); + TearDown(); printf("--------AbilityMainTest001 end--------"); - TDD_CASE_END(); } } diff --git a/frameworks/abilitymgr_lite/unittest/ability_manager_inner_test.cpp b/frameworks/abilitymgr_lite/unittest/ability_manager_inner_test.cpp index 25aa384..03c1134 100644 --- a/frameworks/abilitymgr_lite/unittest/ability_manager_inner_test.cpp +++ b/frameworks/abilitymgr_lite/unittest/ability_manager_inner_test.cpp @@ -1,19 +1,27 @@ +/* + * Copyright (c) 2022 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. + */ + #include "gtest/gtest.h" #include "../../../interfaces/innerkits/abilitymgr_lite/slite/ability_manager_inner.h" -#define TDD_CASE_BEGIN() SetUp() -#define TDD_CASE_END() TearDown() - -#define HC_SUCCESS 0x00000000 - using namespace testing::ext; -typedef int (*StartCheckFunc)(const char *bundleName); +using int (*StartCheckFunc)(const char *bundleName); -namespace OHOS -{ - class AbilityManagerInnerTest : public testing::Test - { +namespace OHOS { + class AbilityManagerInnerTest : public testing::Test { public: void SetUp() override { @@ -39,86 +47,86 @@ namespace OHOS void AbilityManagerInnerTest::AbilityManagerInnerTest001() { printf("AbilityManagerInnerTest setup"); - TDD_CASE_BEGIN(); + SetUp(); StartCheckFunc startChecktCallback = getAbilityCallback(); auto ret = RegAbilityCallback(startChecktCallback); - EXPECT_TRUE(ret == HC_SUCCESS); + EXPECT_TRUE(ret == 0); + TearDown(); printf("--------AbilityManagerInnerTest001 RegAbilityCallback end--------"); - TDD_CASE_END(); } void AbilityManagerInnerTest::AbilityManagerInnerTest002() { printf("--------AbilityManagerInnerTest002 SchedulerLifecycleDone begin--------"); - TDD_CASE_BEGIN(); + SetUp(); int state = 2; auto token = 0; auto ret = SchedulerLifecycleDone(token, state); - EXPECT_TRUE(ret == HC_SUCCESS); + EXPECT_TRUE(ret == 0); + TearDown(); printf("--------AbilityManagerInnerTest002 SchedulerLifecycleDone end--------"); - TDD_CASE_END(); } void AbilityManagerInnerTest::AbilityManagerInnerTest003() { printf("--------AbilityManagerInnerTest003 ForceStopBundle begin--------"); - TDD_CASE_BEGIN(); + SetUp(); auto token = 0; auto ret = ForceStopBundle(token); - EXPECT_TRUE(ret == HC_SUCCESS); + EXPECT_TRUE(ret == 0); + TearDown(); printf("--------AbilityManagerInnerTest003 ForceStopBundle end--------"); - TDD_CASE_END(); } void AbilityManagerInnerTest::AbilityManagerInnerTest004() { printf("--------AbilityManagerInnerTest004 GetTopAbility begin--------"); - TDD_CASE_BEGIN(); + SetUp(); auto ret = GetTopAbility(); EXPECT_TRUE(ret == nullptr); + TearDown(); printf("--------AbilityManagerInnerTest004 GetTopAbility end--------"); - TDD_CASE_END(); } void AbilityManagerInnerTest::AbilityManagerInnerTest005() { printf("--------AbilityManagerInnerTest005 ForceStop begin--------"); - TDD_CASE_BEGIN(); - char *bundlename = "com.huawei.launcher"; + SetUp(); + char *bundlename = "bundletest"; auto ret = ForceStop(bundlename); - EXPECT_TRUE(ret == HC_SUCCESS); + EXPECT_TRUE(ret == 0); + TearDown(); printf("--------AbilityManagerInnerTest005 ForceStop end--------"); - TDD_CASE_END(); } void AbilityManagerInnerTest::AbilityManagerInnerTest006() { printf("--------AbilityManagerInnerTest006 getAbilityCallback begin--------"); - TDD_CASE_BEGIN(); + SetUp(); auto ret = getAbilityCallback(); EXPECT_TRUE(ret == nullptr); + TearDown(); printf("--------AbilityManagerInnerTest006 getAbilityCallback end--------"); - TDD_CASE_END(); } void AbilityManagerInnerTest::AbilityManagerInnerTest007() { printf("--------AbilityManagerInnerTest007 setCleanAbilityDataFlag begin--------"); - TDD_CASE_BEGIN(); + SetUp(); bool cleanFlag = true; setCleanAbilityDataFlag(cleanFlag); + TearDown(); printf("--------AbilityManagerInnerTest007 setCleanAbilityDataFlag end--------"); - TDD_CASE_END(); } void AbilityManagerInnerTest::AbilityManagerInnerTest008() { printf("--------AbilityManagerInnerTest008 getCleanAbilityDataFlag begin--------"); - TDD_CASE_BEGIN(); + SetUp(); auto ret = getCleanAbilityDataFlag(); - EXPECT_TRUE(ret == HC_SUCCESS); + EXPECT_TRUE(ret == 0); + TearDown(); printf("--------AbilityManagerInnerTest008 getCleanAbilityDataFlag end--------"); - TDD_CASE_END(); } void AbilityManagerInnerTest::RunTests() @@ -132,5 +140,4 @@ namespace OHOS void AbilityManagerInnerTest007(); void AbilityManagerInnerTest008(); } - } -- Gitee From cee315154ef9ba54bf6725662b4691d045988e80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=90=B4=E7=8F=9E=E9=A3=8E?= Date: Fri, 4 Mar 2022 02:44:49 +0000 Subject: [PATCH 13/13] ss --- frameworks/ability_lite/BUILD.gn | 5 +---- frameworks/abilitymgr_lite/BUILD.gn | 2 -- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/frameworks/ability_lite/BUILD.gn b/frameworks/ability_lite/BUILD.gn index 756092b..6ed7b8a 100755 --- a/frameworks/ability_lite/BUILD.gn +++ b/frameworks/ability_lite/BUILD.gn @@ -134,10 +134,7 @@ unittest("ability_main_test_lv0") { sources = [ "//foundation/aafwk/aafwk_lite/frameworks/ability_lite/unittest/ability_main_test.cpp" ] - include_dirs = [ - "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite" - ] - + include_dirs = [ "${aafwk_lite_path}/interfaces/innerkits/abilitymgr_lite" ] } config("abilitykit_config") { diff --git a/frameworks/abilitymgr_lite/BUILD.gn b/frameworks/abilitymgr_lite/BUILD.gn index b133e60..a82202a 100755 --- a/frameworks/abilitymgr_lite/BUILD.gn +++ b/frameworks/abilitymgr_lite/BUILD.gn @@ -76,13 +76,11 @@ lite_library("abilitymanager") { ] } - unittest("ability_manager_inner_test") { output_extension = "bin" output_dir = "$root_out_dir/test/unittest/ManagerInnerTest_lv0" sources = [ "//foundation/aafwk/aafwk_lite/frameworks/abilitymgr_lite/unittest/ability_manager_inner_test.cpp" ] - } lite_component("aafwk_abilityManager_lite") { -- Gitee