修改ut报错

Signed-off-by: Ncheng_jinsong <chengjinsong2@huawei.com>

test/moduletest/deviceinfo_moduleTest.cpp

@@ -47,20 +47,18 @@ HWTEST_F(DeviceInfoModuleTest, DeviceInfoGetUdid_001, TestSize.Level0)
     sptr<ISystemAbilityManager> samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
     BEGET_ERROR_CHECK(samgr != nullptr, return, "Get samgr failed");
     sptr<IRemoteObject> object = samgr->GetSystemAbility(SYSPARAM_DEVICE_SERVICE_ID);
-    EXPECT_EQ(object != nullptr, 1);
     BEGET_ERROR_CHECK(object != nullptr, return, "Get deviceinfo manager object from samgr failed");
 
     std::this_thread::sleep_for(std::chrono::seconds(20)); // wait sa died 20s
 
     object = samgr->GetSystemAbility(SYSPARAM_DEVICE_SERVICE_ID);
-    EXPECT_EQ(object == nullptr, 1);
     BEGET_ERROR_CHECK(object == nullptr, return, "Get deviceinfo manager object from samgr failed");
 
     ret = AclGetDevUdid(udid, sizeof(udid));
     EXPECT_EQ(ret, SYSPARAM_PERMISSION_DENIED);
 
     object = samgr->GetSystemAbility(SYSPARAM_DEVICE_SERVICE_ID);
-    EXPECT_EQ(object != nullptr, 1);
+    BEGET_ERROR_CHECK(object != nullptr, return, "Get deviceinfo manager object from samgr failed");
 
     GTEST_LOG_(INFO) << "DeviceInfoGetUdid_001 end";
 }
@@ -74,20 +72,18 @@ HWTEST_F(DeviceInfoModuleTest, DeviceInfoGetSerial_001, TestSize.Level0)
     sptr<ISystemAbilityManager> samgr = SystemAbilityManagerClient::GetInstance().GetSystemAbilityManager();
     BEGET_ERROR_CHECK(samgr != nullptr, return, "Get samgr failed");
     sptr<IRemoteObject> object = samgr->GetSystemAbility(SYSPARAM_DEVICE_SERVICE_ID);
-    EXPECT_EQ(object != nullptr, 1);
     BEGET_ERROR_CHECK(object != nullptr, return, "Get deviceinfo manager object from samgr failed");
 
     std::this_thread::sleep_for(std::chrono::seconds(20)); // wait sa died 20s
 
     object = samgr->GetSystemAbility(SYSPARAM_DEVICE_SERVICE_ID);
-    EXPECT_EQ(object == nullptr, 1);
     BEGET_ERROR_CHECK(object == nullptr, return, "Get deviceinfo manager object from samgr failed");
 
     serial = AclGetSerial();
     EXPECT_EQ(serial != nullptr, 1);
 
     object = samgr->GetSystemAbility(SYSPARAM_DEVICE_SERVICE_ID);
-    EXPECT_EQ(object != nullptr, 1);
+    BEGET_ERROR_CHECK(object != nullptr, return, "Get deviceinfo manager object from samgr failed");
 
     GTEST_LOG_(INFO) << "DeviceInfoGetSerial_001 end";
 }

test/moduletest/service_control_test.cpp

@@ -17,6 +17,7 @@
 #include <gtest/gtest.h>
 
 #include "service_control.h"
+#include "beget_ext.h"
 #include "test_utils.h"
 
 using namespace testing::ext;
@@ -259,7 +260,7 @@ HWTEST_F(ServiceControlTest, WaitForServiceStatusTest, TestSize.Level1)
     // service is stopped now. try to wait a status which will not be set
     std::cout << "Wait for service " << serviceName << " status change to start\n";
     ret = ServiceWaitForStatus(serviceName.c_str(), SERVICE_STARTED, WAIT_SERVICE_STATUS_TIMEOUT);
-    EXPECT_EQ(ret, -1);
+    BEGET_ERROR_CHECK(ret == -1, return, "Get media_service status failed.");
 
     serviceName = "non-exist-service";
     std::cout << "Wait for service " << serviceName << " status change to stop\n";