diff --git a/frameworks/resmgr_lite/src/hap_resource.cpp b/frameworks/resmgr_lite/src/hap_resource.cpp index f25b157bffca4ff2f02fb021c1a79b7842469c62..59e0cb900da12c8f8e1ed8449edccccb102bb3ac 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 c43bd22b3ce36f0311b127104abb544bab510077..90e3ab30e67d59cc3aa43fffc0517a305e4b3c12 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);