From 7a6f0aa3a4d6f901e39e20d7c65e3e76f5df360d Mon Sep 17 00:00:00 2001 From: yanghang Date: Sat, 12 Apr 2025 10:52:44 +0800 Subject: [PATCH] fix: Isolate PC use cases Signed-off-by: yanghang --- frameworks/native/test/unittest/BUILD.gn | 3 ++ .../test/unittest/src/battery_client_test.cpp | 8 +++++ test/systemtest/BUILD.gn | 12 ++++++-- .../src/battery_event_system_test.cpp | 5 ++-- test/systemtest/src/battery_sttest.cpp | 30 +++++++++++++++---- 5 files changed, 49 insertions(+), 9 deletions(-) diff --git a/frameworks/native/test/unittest/BUILD.gn b/frameworks/native/test/unittest/BUILD.gn index ec238da..9f97f4f 100644 --- a/frameworks/native/test/unittest/BUILD.gn +++ b/frameworks/native/test/unittest/BUILD.gn @@ -45,6 +45,9 @@ ohos_unittest("test_batteryclient") { "safwk:system_ability_fwk", "samgr:samgr_proxy", ] + if (battery_manager_feature_set_low_capacity_threshold) { + defines += [ "PC_TEST" ] + } } ohos_unittest("test_batteryclient_death") { diff --git a/frameworks/native/test/unittest/src/battery_client_test.cpp b/frameworks/native/test/unittest/src/battery_client_test.cpp index b016c86..48c7b4d 100755 --- a/frameworks/native/test/unittest/src/battery_client_test.cpp +++ b/frameworks/native/test/unittest/src/battery_client_test.cpp @@ -286,7 +286,11 @@ HWTEST_F (BatteryClientTest, BatteryClient007, TestSize.Level1) auto technology = BatterySrvClient.GetTechnology(); BATTERY_HILOGI(LABEL_TEST, "BatteryClientTest::technology=%{public}s", technology.c_str()); GTEST_LOG_(INFO) << "BatteryClient::BatteryClient007 executing, technology=" << technology; +#ifdef PC_TEST + ASSERT_TRUE(technology == "Li-ion"); +#else ASSERT_TRUE(technology == "Li-poly"); +#endif } BATTERY_HILOGD(LABEL_TEST, "BatteryClient::BatteryClient007 end."); } @@ -318,7 +322,11 @@ HWTEST_F (BatteryClientTest, BatteryClient008, TestSize.Level1) static_cast(pluggedType)); GTEST_LOG_(INFO) << "BatteryClient::BatteryClient008 executing, pluggedType=" << static_cast(pluggedType); +#ifdef PC_TEST + ASSERT_TRUE(pluggedType == OHOS::PowerMgr::BatteryPluggedType::PLUGGED_TYPE_AC); +#else ASSERT_TRUE(pluggedType == OHOS::PowerMgr::BatteryPluggedType::PLUGGED_TYPE_USB); +#endif } BATTERY_HILOGD(LABEL_TEST, "BatteryClient::BatteryClient008 end."); } diff --git a/test/systemtest/BUILD.gn b/test/systemtest/BUILD.gn index 01b1fcf..dfe52cc 100644 --- a/test/systemtest/BUILD.gn +++ b/test/systemtest/BUILD.gn @@ -63,6 +63,10 @@ ohos_systemtest("test_systemtest") { "safwk:system_ability_fwk", "samgr:samgr_proxy", ] + + if (battery_manager_feature_set_low_capacity_threshold) { + defines += [ "PC_TEST" ] + } } ##############################systemtest########################################## @@ -93,7 +97,7 @@ ohos_systemtest("test_charger_offline_shutdown") { ##############################systemtest########################################## ohos_systemtest("test_battery_event_systemtest") { module_out_path = module_output_path - + defines = [] sources = [ "${battery_manager_path}/test/utils/test_utils.cpp", "src/battery_event_system_test.cpp", @@ -128,7 +132,11 @@ ohos_systemtest("test_battery_event_systemtest") { ] if (build_variant == "user") { - defines = [ "BATTERY_USER_VERSION" ] + defines += [ "BATTERY_USER_VERSION" ] + } + + if (battery_manager_feature_set_low_capacity_threshold) { + defines += [ "PC_TEST" ] } } diff --git a/test/systemtest/src/battery_event_system_test.cpp b/test/systemtest/src/battery_event_system_test.cpp index 846c7f4..fe38efc 100644 --- a/test/systemtest/src/battery_event_system_test.cpp +++ b/test/systemtest/src/battery_event_system_test.cpp @@ -601,8 +601,10 @@ HWTEST_F(BatteryEventSystemTest, BatteryEventSystemTest009, TestSize.Level0) } EXPECT_EQ(g_capacity, capacity); EXPECT_EQ(capacity, BatterySrvClient::GetInstance().GetCapacity()); +#ifndef PC_TEST EXPECT_EQ(g_capacityLevel, static_cast(BatteryCapacityLevel::LEVEL_CRITICAL)); EXPECT_TRUE(BatteryCapacityLevel::LEVEL_CRITICAL == BatterySrvClient::GetInstance().GetCapacityLevel()); +#endif system("hidumper -s 3302 -a -u"); if (g_cv.wait_for(lck, std::chrono::seconds(TIME_OUT)) == std::cv_status::timeout) { @@ -635,8 +637,7 @@ HWTEST_F(BatteryEventSystemTest, BatteryEventSystemTest009, TestSize.Level0) } EXPECT_EQ(g_capacity, BatterySrvClient::GetInstance().GetCapacity()); EXPECT_EQ(g_chargeState, static_cast(BatterySrvClient::GetInstance().GetChargingStatus())); - auto ret = CommonEventManager::UnSubscribeCommonEvent(subscriber); - EXPECT_TRUE(ret); + EXPECT_TRUE(CommonEventManager::UnSubscribeCommonEvent(subscriber)); } #endif } // namespace diff --git a/test/systemtest/src/battery_sttest.cpp b/test/systemtest/src/battery_sttest.cpp index 7b589a8..bbe0708 100755 --- a/test/systemtest/src/battery_sttest.cpp +++ b/test/systemtest/src/battery_sttest.cpp @@ -593,7 +593,11 @@ HWTEST_F (BatterySttest, BatteryST017, TestSize.Level1) auto technology = BatterySrvClient.GetTechnology(); BATTERY_HILOGD(LABEL_TEST, "BatteryST017::technology=%{public}s", technology.c_str()); GTEST_LOG_(INFO) << "BatteryST017 executing, technology=" << technology; - EXPECT_TRUE(technology == "Li-poly"); +#ifdef PC_TEST + EXPECT_TRUE(technology == "Li-ion"); +#else + EXPECT_TRUE(technology == "Li-poly"); +#endif } BATTERY_HILOGD(LABEL_TEST, "BatteryST058 end."); } @@ -623,7 +627,11 @@ HWTEST_F (BatterySttest, BatteryST018, TestSize.Level1) static_cast(pluggedType)); GTEST_LOG_(INFO) << "BatteryST018 executing, pluggedType=" << static_cast(pluggedType); - EXPECT_TRUE(pluggedType == OHOS::PowerMgr::BatteryPluggedType::PLUGGED_TYPE_USB); +#ifdef PC_TEST + EXPECT_TRUE(pluggedType == OHOS::PowerMgr::BatteryPluggedType::PLUGGED_TYPE_AC); +#else + EXPECT_TRUE(pluggedType == OHOS::PowerMgr::BatteryPluggedType::PLUGGED_TYPE_USB); +#endif } BATTERY_HILOGD(LABEL_TEST, "BatteryST018 end."); } @@ -653,7 +661,11 @@ HWTEST_F (BatterySttest, BatteryST019, TestSize.Level1) static_cast(pluggedType)); GTEST_LOG_(INFO) << "BatteryST019 executing, pluggedType=" << static_cast(pluggedType); - EXPECT_TRUE(pluggedType == OHOS::PowerMgr::BatteryPluggedType::PLUGGED_TYPE_USB); +#ifdef PC_TEST + EXPECT_TRUE(pluggedType == OHOS::PowerMgr::BatteryPluggedType::PLUGGED_TYPE_AC); +#else + EXPECT_TRUE(pluggedType == OHOS::PowerMgr::BatteryPluggedType::PLUGGED_TYPE_USB); +#endif } BATTERY_HILOGD(LABEL_TEST, "BatteryST019 end."); } @@ -683,7 +695,11 @@ HWTEST_F (BatterySttest, BatteryST020, TestSize.Level1) static_cast(pluggedType)); GTEST_LOG_(INFO) << "BatteryST020 executing, pluggedType=" << static_cast(pluggedType); - EXPECT_TRUE(pluggedType == OHOS::PowerMgr::BatteryPluggedType::PLUGGED_TYPE_USB); +#ifdef PC_TEST + EXPECT_TRUE(pluggedType == OHOS::PowerMgr::BatteryPluggedType::PLUGGED_TYPE_AC); +#else + EXPECT_TRUE(pluggedType == OHOS::PowerMgr::BatteryPluggedType::PLUGGED_TYPE_USB); +#endif } BATTERY_HILOGD(LABEL_TEST, "BatteryST020 end."); } @@ -714,7 +730,11 @@ HWTEST_F (BatterySttest, BatteryST021, TestSize.Level1) static_cast(pluggedType)); GTEST_LOG_(INFO) << "BatteryST021 executing, pluggedType=" << static_cast(pluggedType); - EXPECT_TRUE(pluggedType == OHOS::PowerMgr::BatteryPluggedType::PLUGGED_TYPE_USB); +#ifdef PC_TEST + EXPECT_TRUE(pluggedType == OHOS::PowerMgr::BatteryPluggedType::PLUGGED_TYPE_AC); +#else + EXPECT_TRUE(pluggedType == OHOS::PowerMgr::BatteryPluggedType::PLUGGED_TYPE_USB); +#endif } BATTERY_HILOGD(LABEL_TEST, "BatteryST021 end."); } -- Gitee