From 33398f170db7586387c51ecb084db059a48018b7 Mon Sep 17 00:00:00 2001 From: VictoriaGuo Date: Tue, 22 Feb 2022 18:55:35 +0800 Subject: [PATCH] fixed 79d759d from https://gitee.com/victoriaguo/global_resmgr_lite/pulls/81 Optimize code Signed-off-by: VictoriaGuo --- frameworks/resmgr_lite/src/hap_resource.cpp | 4 ++-- .../test/unittest/lite/common/resource_manager_test.cpp | 6 ++++++ 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/frameworks/resmgr_lite/src/hap_resource.cpp b/frameworks/resmgr_lite/src/hap_resource.cpp index f25b157..59e0cb9 100644 --- a/frameworks/resmgr_lite/src/hap_resource.cpp +++ b/frameworks/resmgr_lite/src/hap_resource.cpp @@ -70,7 +70,7 @@ HapResource::~HapResource() { delete (resDesc_); std::map::iterator iter; - for (iter = idValuesMap_.begin(); iter != idValuesMap_.end(); iter++) { + for (iter = idValuesMap_.begin(); iter != idValuesMap_.end(); ++iter) { IdValues *ptr = iter->second; delete (ptr); } @@ -90,7 +90,7 @@ const HapResource *HapResource::LoadFromIndex(const char *path, const ResConfigI return nullptr; } inFile.seekg(0, std::ios::end); - size_t bufLen = inFile.tellg(); + int bufLen = inFile.tellg(); if (bufLen <= 0) { HILOG_ERROR("file size is zero"); inFile.close(); diff --git a/frameworks/resmgr_lite/test/unittest/lite/common/resource_manager_test.cpp b/frameworks/resmgr_lite/test/unittest/lite/common/resource_manager_test.cpp index c43bd22..90e3ab3 100644 --- a/frameworks/resmgr_lite/test/unittest/lite/common/resource_manager_test.cpp +++ b/frameworks/resmgr_lite/test/unittest/lite/common/resource_manager_test.cpp @@ -628,6 +628,7 @@ HWTEST_F(ResourceManagerTest, ResourceManagerGetPatternByIdTest001, TestSize.Lev RState state; id = GetResId("base", ResType::PATTERN); + ASSERT_TRUE(id > 0); state = rm->GetPatternById(id, outValue); ASSERT_EQ(SUCCESS, state); ASSERT_EQ(static_cast(3), outValue.size()); @@ -648,6 +649,7 @@ HWTEST_F(ResourceManagerTest, ResourceManagerGetPatternByIdTest002, TestSize.Lev RState state; id = GetResId("child", ResType::PATTERN); + ASSERT_TRUE(id > 0); state = rm->GetPatternById(id, outValue); ASSERT_EQ(SUCCESS, state); ASSERT_EQ(static_cast(4), outValue.size()); @@ -668,6 +670,7 @@ HWTEST_F(ResourceManagerTest, ResourceManagerGetPatternByIdTest003, TestSize.Lev RState state; id = GetResId("ccchild", ResType::PATTERN); + ASSERT_TRUE(id > 0); state = rm->GetPatternById(id, outValue); ASSERT_EQ(SUCCESS, state); ASSERT_EQ(static_cast(5), outValue.size()); @@ -1636,6 +1639,7 @@ HWTEST_F(ResourceManagerTest, ResourceManagerResolveParentReferenceTest001, Test RState ret; id = GetResId("base", ResType::PATTERN); + ASSERT_TRUE(id > 0); idItem = ((ResourceManagerImpl *)rm)->hapManager_->FindResourceById(id); ASSERT_TRUE(idItem != nullptr); ret = ((ResourceManagerImpl *)rm)->ResolveParentReference(idItem, outValue); @@ -1644,6 +1648,7 @@ HWTEST_F(ResourceManagerTest, ResourceManagerResolveParentReferenceTest001, Test HILOG_DEBUG("====="); id = GetResId("child", ResType::PATTERN); + ASSERT_TRUE(id > 0); idItem = ((ResourceManagerImpl *)rm)->hapManager_->FindResourceById(id); ASSERT_TRUE(idItem != nullptr); ret = ((ResourceManagerImpl *)rm)->ResolveParentReference(idItem, outValue); @@ -1652,6 +1657,7 @@ HWTEST_F(ResourceManagerTest, ResourceManagerResolveParentReferenceTest001, Test HILOG_DEBUG("====="); id = GetResId("ccchild", ResType::PATTERN); + ASSERT_TRUE(id > 0); idItem = ((ResourceManagerImpl *)rm)->hapManager_->FindResourceById(id); ASSERT_TRUE(idItem != nullptr); ret = ((ResourceManagerImpl *)rm)->ResolveParentReference(idItem, outValue); -- Gitee