diff options
Diffstat (limited to 'test/renderer/image_manager.test.cpp')
-rw-r--r-- | test/renderer/image_manager.test.cpp | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/test/renderer/image_manager.test.cpp b/test/renderer/image_manager.test.cpp index 203e05d492..ebe1bcd72f 100644 --- a/test/renderer/image_manager.test.cpp +++ b/test/renderer/image_manager.test.cpp @@ -108,11 +108,12 @@ TEST(ImageManager, RemoveReleasesBinPackRect) { class StubImageRequestor : public ImageRequestor { public: - void onImagesAvailable(ImageMap images) final { - if (imagesAvailable) imagesAvailable(images); + void onImagesAvailable(ImageMap images, uint64_t imageCorrelationID_) final { + if (imagesAvailable && imageCorrelationID == imageCorrelationID_) imagesAvailable(images); } std::function<void (ImageMap)> imagesAvailable; + uint64_t imageCorrelationID = 0; }; TEST(ImageManager, NotifiesRequestorWhenSpriteIsLoaded) { @@ -124,10 +125,11 @@ TEST(ImageManager, NotifiesRequestorWhenSpriteIsLoaded) { notified = true; }; - imageManager.getImages(requestor, {"one"}); + uint64_t imageCorrelationID = 0; + imageManager.getImages(requestor, std::make_pair(std::set<std::string> {"one"}, imageCorrelationID)); ASSERT_FALSE(notified); - imageManager.onSpriteLoaded(); + imageManager.setLoaded(true); ASSERT_TRUE(notified); } @@ -140,8 +142,9 @@ TEST(ImageManager, NotifiesRequestorImmediatelyIfDependenciesAreSatisfied) { notified = true; }; + uint64_t imageCorrelationID = 0; imageManager.addImage(makeMutable<style::Image::Impl>("one", PremultipliedImage({ 16, 16 }), 2)); - imageManager.getImages(requestor, {"one"}); + imageManager.getImages(requestor, std::make_pair(std::set<std::string> {"one"}, imageCorrelationID)); ASSERT_TRUE(notified); } |