From 1a6552255feaee23f72f8162dbc8a8669d662ccf Mon Sep 17 00:00:00 2001 From: liuyuxiu Date: Fri, 17 Jan 2025 10:54:35 +0800 Subject: [PATCH 1/6] qos add TDD Signed-off-by: liuyuxiu --- test/unittest/phone/concurrent_task_client_test.cpp | 6 ++++++ .../phone/concurrent_task_controller_interface_test.cpp | 7 +++++++ .../phone/concurrent_task_service_ability_test.cpp | 2 ++ test/unittest/phone/concurrent_task_service_test.cpp | 2 ++ test/unittest/phone/func_loader_test.cpp | 4 +++- test/unittest/phone/qos_interface_test.cpp | 2 -- 6 files changed, 20 insertions(+), 3 deletions(-) diff --git a/test/unittest/phone/concurrent_task_client_test.cpp b/test/unittest/phone/concurrent_task_client_test.cpp index c92d6ca..639759f 100644 --- a/test/unittest/phone/concurrent_task_client_test.cpp +++ b/test/unittest/phone/concurrent_task_client_test.cpp @@ -61,6 +61,7 @@ HWTEST_F(ConcurrentTaskClientTest, ReportDataTest, TestSize.Level1) payload["pid"] = "12345"; payload["type"] = "appStart"; ConcurrentTaskClient::GetInstance().ReportData(resType, value, payload); + EXPECT_FALSE(payload.empty()); } /** @@ -75,6 +76,7 @@ HWTEST_F(ConcurrentTaskClientTest, ReportSceneInfoTest, TestSize.Level1) payload["uid"] = "3587"; payload["value"] = "12345"; ConcurrentTaskClient::GetInstance().ReportSceneInfo(type, payload); + EXPECT_FALSE(payload.empty()); } /** @@ -87,6 +89,7 @@ HWTEST_F(ConcurrentTaskClientTest, QueryIntervalTest, TestSize.Level1) int queryItem = 3; IntervalReply queryRs = {87, 657, 357, 214}; ConcurrentTaskClient::GetInstance().QueryInterval(queryItem, queryRs); + EXPECT_TRUE(queryRs.tid != -1); } /** @@ -97,6 +100,7 @@ HWTEST_F(ConcurrentTaskClientTest, QueryIntervalTest, TestSize.Level1) HWTEST_F(ConcurrentTaskClientTest, StopRemoteObjectTest, TestSize.Level1) { ConcurrentTaskClient::GetInstance().StopRemoteObject(); + EXPECT_TRUE(ConcurrentTaskClient::GetInstance().clientService_ == nullptr); } /** @@ -112,6 +116,7 @@ HWTEST_F(ConcurrentTaskClientTest, QueryDeadlineTest, TestSize.Level1) payload[1111] = 60; payload[2222] = 90; ConcurrentTaskClient::GetInstance().QueryDeadline(queryItem, ddlReply, payload); + EXPECT_FALSE(payload.empty()); } /** @@ -125,6 +130,7 @@ HWTEST_F(ConcurrentTaskClientTest, RequestAuthTest, TestSize.Level1) payload["uid"] = "3587"; payload["pid"] = "12345"; ConcurrentTaskClient::GetInstance().RequestAuth(payload); + EXPECT_FALSE(payload.empty()); } } } \ No newline at end of file diff --git a/test/unittest/phone/concurrent_task_controller_interface_test.cpp b/test/unittest/phone/concurrent_task_controller_interface_test.cpp index 0968828..57c9db9 100644 --- a/test/unittest/phone/concurrent_task_controller_interface_test.cpp +++ b/test/unittest/phone/concurrent_task_controller_interface_test.cpp @@ -59,6 +59,7 @@ HWTEST_F(ConcurrentTaskControllerInterfaceTest, RequestAuthTest, TestSize.Level1 const Json::Value payload; TaskControllerInterface repData; repData.RequestAuth(payload); + EXPECT_TRUE(payload.empty()); } /** @@ -73,6 +74,7 @@ HWTEST_F(ConcurrentTaskControllerInterfaceTest, ReportDataTest, TestSize.Level1) const Json::Value payload; TaskControllerInterface repData; repData.ReportData(resType, value, payload); + EXPECT_TRUE(payload.empty()); } /** @@ -86,6 +88,7 @@ HWTEST_F(ConcurrentTaskControllerInterfaceTest, ReportSceneInfoTest, TestSize.Le const Json::Value payload; TaskControllerInterface repData; repData.ReportSceneInfo(resType, payload); + EXPECT_TRUE(payload.empty()); } /** @@ -99,6 +102,7 @@ HWTEST_F(ConcurrentTaskControllerInterfaceTest, QueryDeadlineTest, TestSize.Leve DeadlineReply ddlReply = {false}; const Json::Value payload; TaskControllerInterface::GetInstance().QueryDeadline(queryItem, ddlReply, payload); + EXPECT_TRUE(payload.empty()); } /** @@ -120,6 +124,7 @@ HWTEST_F(ConcurrentTaskControllerInterfaceTest, QueryIntervalTest, TestSize.Leve queInt.QueryInterval(queryItem, queryRs); queryItem = QURRY_TYPE_MAX; queInt.QueryInterval(queryItem, queryRs); + EXPECT_FALSE(queInt.inited_); } /** @@ -130,6 +135,7 @@ HWTEST_F(ConcurrentTaskControllerInterfaceTest, QueryIntervalTest, TestSize.Leve HWTEST_F(ConcurrentTaskControllerInterfaceTest, InitTest, TestSize.Level1) { TaskControllerInterface::GetInstance().Init(); + EXPECT_TRUE(TaskControllerInterface::GetInstance().inited_); } /** @@ -140,6 +146,7 @@ HWTEST_F(ConcurrentTaskControllerInterfaceTest, InitTest, TestSize.Level1) HWTEST_F(ConcurrentTaskControllerInterfaceTest, ReleaseTest, TestSize.Level1) { TaskControllerInterface::GetInstance().Release(); + EXPECT_TRUE(TaskControllerInterface::GetInstance().inited_); } } // namespace FFRT_TEST } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/phone/concurrent_task_service_ability_test.cpp b/test/unittest/phone/concurrent_task_service_ability_test.cpp index e1047f5..f6d0999 100644 --- a/test/unittest/phone/concurrent_task_service_ability_test.cpp +++ b/test/unittest/phone/concurrent_task_service_ability_test.cpp @@ -62,6 +62,7 @@ HWTEST_F(ConcurrentTaskServiceAbilityTest, OnStartTest, TestSize.Level1) concurrenttaskserviceability.OnStart(); concurrenttaskserviceability.OnStart(); concurrenttaskserviceability.OnStop(); + EXPECT_TRUE(concurrenttaskserviceability.service_ != nullptr); } /** @@ -79,6 +80,7 @@ HWTEST_F(ConcurrentTaskServiceAbilityTest, OnAddSystemAbilityTest, TestSize.Leve concurrenttaskserviceability.OnStart(); concurrenttaskserviceability.OnAddSystemAbility(systemAbilityId, deviceId); concurrenttaskserviceability.OnRemoveSystemAbility(systemAbilityId, deviceId); + EXPECT_TRUE(concurrenttaskserviceability.service_ != nullptr); concurrenttaskserviceability.OnStop(); } } diff --git a/test/unittest/phone/concurrent_task_service_test.cpp b/test/unittest/phone/concurrent_task_service_test.cpp index 32ee825..7ab7053 100644 --- a/test/unittest/phone/concurrent_task_service_test.cpp +++ b/test/unittest/phone/concurrent_task_service_test.cpp @@ -58,6 +58,7 @@ HWTEST_F(ConcurrentTaskServiceTest, QueryIntervalTest, TestSize.Level1) IntervalReply queryRs = {87, 657, 357, 214}; ConcurrentTaskService queInt; queInt.QueryInterval(queryItem, queryRs); + EXPECT_NE(queryRs.tid, -1); } /** @@ -74,6 +75,7 @@ HWTEST_F(ConcurrentTaskServiceTest, QueryDeadlineTest, TestSize.Level1) payload["2222"] = "90"; ConcurrentTaskService queInt; queInt.QueryDeadline(queryItem, ddlReply, payload); + EXPECT_FALSE(payload.empty()); } } } \ No newline at end of file diff --git a/test/unittest/phone/func_loader_test.cpp b/test/unittest/phone/func_loader_test.cpp index 0943205..e90ab8a 100644 --- a/test/unittest/phone/func_loader_test.cpp +++ b/test/unittest/phone/func_loader_test.cpp @@ -58,6 +58,7 @@ HWTEST_F(FuncLoaderTest, LoadFileTest, TestSize.Level1) { FuncLoader funcLoader("111"); funcLoader.LoadFile("222"); + EXPECT_FALSE(funcLoader.enable_); } /** @@ -75,7 +76,8 @@ HWTEST_F(FuncLoaderTest, LoadSymbolTest, TestSize.Level1) funcLoader.LoadSymbol("ReportSceneInfo"); funcLoader.LoadSymbol("QueryInterval"); funcLoader.LoadSymbol("QueryDeadline"); - funcLoader.LoadSymbol("RequestAuth"); + void* funcSym = funcLoader.LoadSymbol("RequestAuth"); + EXPECT_TRUE(funcSym == nullptr); } /** diff --git a/test/unittest/phone/qos_interface_test.cpp b/test/unittest/phone/qos_interface_test.cpp index 1fa0ca6..6b1d839 100644 --- a/test/unittest/phone/qos_interface_test.cpp +++ b/test/unittest/phone/qos_interface_test.cpp @@ -169,11 +169,9 @@ HWTEST_F(QosInterfaceTest, QosPolicyTest, TestSize.Level1) struct QosPolicyDatas *policyDatas = nullptr; ret = QosPolicySet(policyDatas); EXPECT_EQ(ret, -1); -#if defined(ARM64_TEST) && ARM64_TEST EXPECT_EQ(ret, 0); ret = QosPolicySet(&g_defaultQosPolicy); EXPECT_EQ(ret, 0); -#endif } /** -- Gitee From df0c41f2ffad2556c0462726c556ac1ab75880eb Mon Sep 17 00:00:00 2001 From: liuyuxiu Date: Fri, 17 Jan 2025 11:01:18 +0800 Subject: [PATCH 2/6] qos add TDD Signed-off-by: liuyuxiu --- test/unittest/phone/concurrent_task_client_test.cpp | 2 ++ test/unittest/phone/qos_policy_test.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/test/unittest/phone/concurrent_task_client_test.cpp b/test/unittest/phone/concurrent_task_client_test.cpp index 639759f..148d115 100644 --- a/test/unittest/phone/concurrent_task_client_test.cpp +++ b/test/unittest/phone/concurrent_task_client_test.cpp @@ -13,8 +13,10 @@ * limitations under the License. */ +#define private public #include "gtest/gtest.h" #include "concurrent_task_client.h" +#undef private namespace OHOS { namespace FFRT_TEST { diff --git a/test/unittest/phone/qos_policy_test.cpp b/test/unittest/phone/qos_policy_test.cpp index 50a3c64..12c8d80 100644 --- a/test/unittest/phone/qos_policy_test.cpp +++ b/test/unittest/phone/qos_policy_test.cpp @@ -58,6 +58,8 @@ HWTEST_F(QosPolicyTest, TaskHandleTest, TestSize.Level1) { QosPolicy qosPolicy; qosPolicy.Init(); + struct QosPolicyDatas test = {}; + EXPECT_EQ(qosPolicy.SetQosPolicy(&test), -1); } } } \ No newline at end of file -- Gitee From d67990c5ab5e518838efcd9a4d2639deae238fbe Mon Sep 17 00:00:00 2001 From: liuyuxiu Date: Fri, 17 Jan 2025 15:48:36 +0800 Subject: [PATCH 3/6] qos add TDD Signed-off-by: liuyuxiu --- test/unittest/phone/concurrent_task_client_test.cpp | 6 +++--- .../phone/concurrent_task_controller_interface_test.cpp | 4 ++-- test/unittest/phone/qos_interface_test.cpp | 1 - 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/test/unittest/phone/concurrent_task_client_test.cpp b/test/unittest/phone/concurrent_task_client_test.cpp index 148d115..4c068a3 100644 --- a/test/unittest/phone/concurrent_task_client_test.cpp +++ b/test/unittest/phone/concurrent_task_client_test.cpp @@ -13,10 +13,8 @@ * limitations under the License. */ -#define private public #include "gtest/gtest.h" #include "concurrent_task_client.h" -#undef private namespace OHOS { namespace FFRT_TEST { @@ -102,7 +100,9 @@ HWTEST_F(ConcurrentTaskClientTest, QueryIntervalTest, TestSize.Level1) HWTEST_F(ConcurrentTaskClientTest, StopRemoteObjectTest, TestSize.Level1) { ConcurrentTaskClient::GetInstance().StopRemoteObject(); - EXPECT_TRUE(ConcurrentTaskClient::GetInstance().clientService_ == nullptr); + payload["uid"] = "3587"; + ConcurrentTaskClient::GetInstance().StopRemoteObject(); + EXPECT_FALSE(payload.empty()); } /** diff --git a/test/unittest/phone/concurrent_task_controller_interface_test.cpp b/test/unittest/phone/concurrent_task_controller_interface_test.cpp index 57c9db9..c0d723b 100644 --- a/test/unittest/phone/concurrent_task_controller_interface_test.cpp +++ b/test/unittest/phone/concurrent_task_controller_interface_test.cpp @@ -135,7 +135,7 @@ HWTEST_F(ConcurrentTaskControllerInterfaceTest, QueryIntervalTest, TestSize.Leve HWTEST_F(ConcurrentTaskControllerInterfaceTest, InitTest, TestSize.Level1) { TaskControllerInterface::GetInstance().Init(); - EXPECT_TRUE(TaskControllerInterface::GetInstance().inited_); + EXPECT_FALSE(TaskControllerInterface::GetInstance().inited_); } /** @@ -146,7 +146,7 @@ HWTEST_F(ConcurrentTaskControllerInterfaceTest, InitTest, TestSize.Level1) HWTEST_F(ConcurrentTaskControllerInterfaceTest, ReleaseTest, TestSize.Level1) { TaskControllerInterface::GetInstance().Release(); - EXPECT_TRUE(TaskControllerInterface::GetInstance().inited_); + EXPECT_FALSE(TaskControllerInterface::GetInstance().inited_); } } // namespace FFRT_TEST } // namespace OHOS \ No newline at end of file diff --git a/test/unittest/phone/qos_interface_test.cpp b/test/unittest/phone/qos_interface_test.cpp index 6b1d839..76531eb 100644 --- a/test/unittest/phone/qos_interface_test.cpp +++ b/test/unittest/phone/qos_interface_test.cpp @@ -169,7 +169,6 @@ HWTEST_F(QosInterfaceTest, QosPolicyTest, TestSize.Level1) struct QosPolicyDatas *policyDatas = nullptr; ret = QosPolicySet(policyDatas); EXPECT_EQ(ret, -1); - EXPECT_EQ(ret, 0); ret = QosPolicySet(&g_defaultQosPolicy); EXPECT_EQ(ret, 0); } -- Gitee From fc242076307b386f01d862d3ccf14a3a180d60fe Mon Sep 17 00:00:00 2001 From: liuyuxiu Date: Fri, 17 Jan 2025 16:10:57 +0800 Subject: [PATCH 4/6] qos add TDD Signed-off-by: liuyuxiu --- test/unittest/phone/qos_interface_test.cpp | 2 -- 1 file changed, 2 deletions(-) diff --git a/test/unittest/phone/qos_interface_test.cpp b/test/unittest/phone/qos_interface_test.cpp index 76531eb..3080336 100644 --- a/test/unittest/phone/qos_interface_test.cpp +++ b/test/unittest/phone/qos_interface_test.cpp @@ -169,8 +169,6 @@ HWTEST_F(QosInterfaceTest, QosPolicyTest, TestSize.Level1) struct QosPolicyDatas *policyDatas = nullptr; ret = QosPolicySet(policyDatas); EXPECT_EQ(ret, -1); - ret = QosPolicySet(&g_defaultQosPolicy); - EXPECT_EQ(ret, 0); } /** -- Gitee From 4652d7d1e3da5dc8d696f555232f5aaf39a72cbc Mon Sep 17 00:00:00 2001 From: liuyuxiu Date: Fri, 17 Jan 2025 08:44:34 +0000 Subject: [PATCH 5/6] update test/unittest/phone/concurrent_task_client_test.cpp. Signed-off-by: liuyuxiu --- test/unittest/phone/concurrent_task_client_test.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/test/unittest/phone/concurrent_task_client_test.cpp b/test/unittest/phone/concurrent_task_client_test.cpp index 4c068a3..54b12c3 100644 --- a/test/unittest/phone/concurrent_task_client_test.cpp +++ b/test/unittest/phone/concurrent_task_client_test.cpp @@ -99,6 +99,7 @@ HWTEST_F(ConcurrentTaskClientTest, QueryIntervalTest, TestSize.Level1) */ HWTEST_F(ConcurrentTaskClientTest, StopRemoteObjectTest, TestSize.Level1) { + std::unordered_map payload; ConcurrentTaskClient::GetInstance().StopRemoteObject(); payload["uid"] = "3587"; ConcurrentTaskClient::GetInstance().StopRemoteObject(); -- Gitee From a8476966c68030b2307a1dfadf59a5687f90350f Mon Sep 17 00:00:00 2001 From: liuyuxiu Date: Fri, 17 Jan 2025 08:46:19 +0000 Subject: [PATCH 6/6] update test/unittest/phone/concurrent_task_client_test.cpp. Signed-off-by: liuyuxiu --- test/unittest/phone/concurrent_task_client_test.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/test/unittest/phone/concurrent_task_client_test.cpp b/test/unittest/phone/concurrent_task_client_test.cpp index 54b12c3..7cd0ab8 100644 --- a/test/unittest/phone/concurrent_task_client_test.cpp +++ b/test/unittest/phone/concurrent_task_client_test.cpp @@ -102,7 +102,6 @@ HWTEST_F(ConcurrentTaskClientTest, StopRemoteObjectTest, TestSize.Level1) std::unordered_map payload; ConcurrentTaskClient::GetInstance().StopRemoteObject(); payload["uid"] = "3587"; - ConcurrentTaskClient::GetInstance().StopRemoteObject(); EXPECT_FALSE(payload.empty()); } -- Gitee