Gerneric image codec abstraction init (#6)
* remove raw pointer from resource manager
* towards generic images
* 💅 and pin libCZI module
* remove raw pointer from resource manager
* towards generic images
* fix rendering
* fix rendering
* fix unit tests
* fix pipeline
* fix gcc build
* re-enable tests
* add czi impl
* remove resource button
* refactor user code app to being a "default app"
* ui resources
* missing lib?
* init czi render support
* typos
This commit is contained in:
committed by
Maximilian Kueffner
parent
bce12b0bb4
commit
0be064bb8e
@@ -2,15 +2,24 @@
|
||||
|
||||
#include <algorithm>
|
||||
|
||||
#include "imaging/PixelariumImage.hpp"
|
||||
#include "resources/resource.hpp"
|
||||
|
||||
namespace
|
||||
{
|
||||
|
||||
class DummyImage : public pixelarium::imaging::PixelariumImage
|
||||
// A Mock implementation for tests requiring _any_ instance of a IPixelariumImage
|
||||
class DummyImage : public pixelarium::imaging::IPixelariumImage
|
||||
{
|
||||
// Implement minimal interface if needed for test
|
||||
public:
|
||||
std::optional<std::unique_ptr<cv::Mat>> TryGetImage() override { return {}; }
|
||||
|
||||
std::optional<std::unique_ptr<cv::Mat>> TryGetImage(const pixelarium::imaging::IImageQuery&) override { return {}; }
|
||||
|
||||
std::string Name() const noexcept override { return {}; }
|
||||
|
||||
bool Empty() const noexcept override { return true; }
|
||||
|
||||
std::filesystem::path Uri() const noexcept override { return {}; }
|
||||
};
|
||||
|
||||
} // anonymous namespace
|
||||
@@ -23,18 +32,20 @@ TEST(ImageResourcePoolTest, SetAndGetResource)
|
||||
auto img = std::make_unique<DummyImage>();
|
||||
auto id = pool.SetResource(std::move(img));
|
||||
auto res = pool.GetResource(id);
|
||||
auto res_img = res.value().lock();
|
||||
EXPECT_TRUE(res.has_value());
|
||||
EXPECT_NE(res.value(), nullptr);
|
||||
EXPECT_NE(res_img, nullptr);
|
||||
}
|
||||
|
||||
TEST(ImageResourcePoolTest, SetWrappedRawPointerGet)
|
||||
{
|
||||
ImageResourcePool pool;
|
||||
auto img = new DummyImage();
|
||||
auto id = pool.SetResource(std::unique_ptr<pixelarium::imaging::PixelariumImage>(img));
|
||||
auto id = pool.SetResource(std::unique_ptr<pixelarium::imaging::IPixelariumImage>(img));
|
||||
auto res = pool.GetResource(id);
|
||||
auto res_img = res.value().lock();
|
||||
EXPECT_TRUE(res.has_value());
|
||||
EXPECT_NE(res.value(), nullptr);
|
||||
EXPECT_NE(res_img, nullptr);
|
||||
}
|
||||
|
||||
TEST(ImageResourcePoolTest, GetNonExistentResourceReturnsEmptyOptional)
|
||||
@@ -50,8 +61,9 @@ TEST(ImageResourcePoolTest, ModifyResourceSuccess)
|
||||
auto new_img = std::make_unique<DummyImage>();
|
||||
EXPECT_TRUE(pool.ModifyResource(id, std::move(new_img)));
|
||||
auto res = pool.GetResource(id);
|
||||
auto res_img = res.value().lock();
|
||||
EXPECT_TRUE(res.has_value());
|
||||
EXPECT_NE(res.value(), nullptr);
|
||||
EXPECT_NE(res_img, nullptr);
|
||||
}
|
||||
|
||||
TEST(ImageResourcePoolTest, ModifyResourceFail)
|
||||
@@ -82,7 +94,8 @@ TEST(ImageResourcePoolTest, EnumerateResources)
|
||||
auto id2 = pool.SetResource(std::make_unique<DummyImage>());
|
||||
std::vector<size_t> found_ids{};
|
||||
|
||||
pool.EnumerateResources([&found_ids](size_t id, size_t, const pixelarium::imaging::PixelariumImage&) { found_ids.push_back(id); });
|
||||
pool.EnumerateResources([&found_ids](size_t id, size_t, const pixelarium::imaging::IPixelariumImage&)
|
||||
{ found_ids.push_back(id); });
|
||||
|
||||
EXPECT_EQ(found_ids.size(), 2);
|
||||
EXPECT_NE(std::find(found_ids.begin(), found_ids.end(), id1), found_ids.end());
|
||||
@@ -96,7 +109,8 @@ TEST(ImageResourcePoolTest, TemplatedEnumerate)
|
||||
auto id2 = pool.SetResource(std::make_unique<DummyImage>());
|
||||
std::vector<size_t> found_ids{};
|
||||
|
||||
pool.Enumerate([&found_ids](size_t id, size_t, const pixelarium::imaging::PixelariumImage&) { found_ids.push_back(id); });
|
||||
pool.Enumerate([&found_ids](size_t id, size_t, const pixelarium::imaging::IPixelariumImage&)
|
||||
{ found_ids.push_back(id); });
|
||||
|
||||
EXPECT_EQ(found_ids.size(), 2);
|
||||
EXPECT_NE(std::find(found_ids.begin(), found_ids.end(), id1), found_ids.end());
|
||||
|
||||
Reference in New Issue
Block a user