diff --git a/lib/resources/resource.cpp b/lib/resources/resource.cpp index dd4f39b..3c6e81e 100644 --- a/lib/resources/resource.cpp +++ b/lib/resources/resource.cpp @@ -42,7 +42,7 @@ size_t pixelarium::resources::ImageResourcePool::SetResource(unique_ptr res) +bool pixelarium::resources::ImageResourcePool::ModifyResource(size_t id, std::unique_ptr res) { auto search{this->resources_.find(id)}; if (search == this->resources_.end()) return false; diff --git a/lib/resources/resource.hpp b/lib/resources/resource.hpp index 45380d1..61e17a8 100644 --- a/lib/resources/resource.hpp +++ b/lib/resources/resource.hpp @@ -11,7 +11,7 @@ namespace pixelarium::resources { struct IResource { - virtual ~IResource() = 0; + virtual ~IResource() = default; }; template @@ -25,7 +25,7 @@ class IResourcePool virtual ~IResourcePool() = default; virtual std::optional GetResource(size_t id) const = 0; virtual size_t SetResource(std::unique_ptr res) = 0; - virtual bool UpdateResource(size_t id, std::unique_ptr res) = 0; + virtual bool ModifyResource(size_t id, std::unique_ptr res) = 0; virtual bool DeleteResource(size_t id) = 0; virtual void EnumerateResources(const std::function& func) = 0; }; @@ -47,7 +47,7 @@ class ImageResourcePool : public IResourcePool std::optional GetResource(size_t id) const override; size_t SetResource(std::unique_ptr res) override; - bool UpdateResource(size_t id, std::unique_ptr res) override; + bool ModifyResource(size_t id, std::unique_ptr res) override; bool DeleteResource(size_t id) override; void EnumerateResources(const std::function& func) override; diff --git a/tests/lib/resources/test_resource.cpp b/tests/lib/resources/test_resource.cpp index 4beb72b..69fcb97 100644 --- a/tests/lib/resources/test_resource.cpp +++ b/tests/lib/resources/test_resource.cpp @@ -43,22 +43,22 @@ TEST(ImageResourcePoolTest, GetNonExistentResourceReturnsEmptyOptional) EXPECT_FALSE(pool.GetResource(12345)); } -TEST(ImageResourcePoolTest, UpdateResourceSuccess) +TEST(ImageResourcePoolTest, ModifyResourceSuccess) { ImageResourcePool pool; auto id = pool.SetResource(std::make_unique()); auto new_img = std::make_unique(); - EXPECT_TRUE(pool.UpdateResource(id, std::move(new_img))); + EXPECT_TRUE(pool.ModifyResource(id, std::move(new_img))); auto res = pool.GetResource(id); EXPECT_TRUE(res.has_value()); EXPECT_NE(res.value(), nullptr); } -TEST(ImageResourcePoolTest, UpdateResourceFail) +TEST(ImageResourcePoolTest, ModifyResourceFail) { ImageResourcePool pool; auto new_img = std::make_unique(); - EXPECT_FALSE(pool.UpdateResource(999, std::move(new_img))); + EXPECT_FALSE(pool.ModifyResource(999, std::move(new_img))); } TEST(ImageResourcePoolTest, DeleteResourceSuccess)