From 3ac706edfefc9c8f2ee1ad9eb38bf688364cdb77 Mon Sep 17 00:00:00 2001 From: Mikhail Pozdnyakov Date: Thu, 17 Oct 2019 15:42:30 +0300 Subject: [core] Update ImageManager.OnStyleImageMissingBeforeSpriteLoaded So that it checks pending image requests for a different requestor. --- test/renderer/image_manager.test.cpp | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/test/renderer/image_manager.test.cpp b/test/renderer/image_manager.test.cpp index f1061ce59..20c0a3a7f 100644 --- a/test/renderer/image_manager.test.cpp +++ b/test/renderer/image_manager.test.cpp @@ -189,7 +189,7 @@ TEST(ImageManager, OnStyleImageMissingBeforeSpriteLoaded) { // Repeated request of the same image shall not result another // `ImageManagerObserver.onStyleImageMissing()` call. - imageManager.getImages(requestor, std::make_pair(dependencies, imageCorrelationID)); + imageManager.getImages(requestor, std::make_pair(dependencies, ++imageCorrelationID)); runLoop.runOnce(); EXPECT_EQ(observer.count, 1); @@ -197,10 +197,20 @@ TEST(ImageManager, OnStyleImageMissingBeforeSpriteLoaded) { // Request for updated dependencies must be dispatched to the // observer. dependencies.emplace("post", ImageType::Icon); - imageManager.getImages(requestor, std::make_pair(dependencies, imageCorrelationID)); + imageManager.getImages(requestor, std::make_pair(dependencies, ++imageCorrelationID)); runLoop.runOnce(); EXPECT_EQ(observer.count, 2); + + // Another requestor shall not have pending requests for already obtained images. + StubImageRequestor anotherRequestor(imageManager); + imageManager.getImages(anotherRequestor, std::make_pair(dependencies, ++imageCorrelationID)); + ASSERT_FALSE(anotherRequestor.hasPendingRequests()); + + dependencies.emplace("unfamiliar", ImageType::Icon); + imageManager.getImages(anotherRequestor, std::make_pair(dependencies, ++imageCorrelationID)); + EXPECT_TRUE(anotherRequestor.hasPendingRequests()); + EXPECT_TRUE(anotherRequestor.hasPendingRequest("unfamiliar")); } TEST(ImageManager, OnStyleImageMissingAfterSpriteLoaded) { -- cgit v1.2.3