From 83c33cdeb25831cde370b543d9e10c8d1859aec8 Mon Sep 17 00:00:00 2001
From: Alexander Shalamov <alexander.shalamov@mapbox.com>
Date: Tue, 23 Apr 2019 16:08:16 +0300
Subject: [core] Pass ImageManager to ImageRequestor's constructor

This makes ImageRequestor API explicitly dependant on ImageManager, so that
ImageRequestor can unregister itself from ImageManager on destruction.
---
 test/renderer/image_manager.test.cpp | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'test')

diff --git a/test/renderer/image_manager.test.cpp b/test/renderer/image_manager.test.cpp
index d124e67e10..51b257094a 100644
--- a/test/renderer/image_manager.test.cpp
+++ b/test/renderer/image_manager.test.cpp
@@ -108,6 +108,8 @@ TEST(ImageManager, RemoveReleasesBinPackRect) {
 
 class StubImageRequestor : public ImageRequestor {
 public:
+    StubImageRequestor(ImageManager& imageManager) : ImageRequestor(imageManager) {}
+
     void onImagesAvailable(ImageMap icons, ImageMap patterns, std::unordered_map<std::string, uint32_t> versionMap, uint64_t imageCorrelationID_) final {
         if (imagesAvailable && imageCorrelationID == imageCorrelationID_) imagesAvailable(icons, patterns, versionMap);
     }
@@ -118,7 +120,7 @@ public:
 
 TEST(ImageManager, NotifiesRequestorWhenSpriteIsLoaded) {
     ImageManager imageManager;
-    StubImageRequestor requestor;
+    StubImageRequestor requestor(imageManager);
     bool notified = false;
 
     ImageManagerObserver observer;
@@ -142,7 +144,7 @@ TEST(ImageManager, NotifiesRequestorWhenSpriteIsLoaded) {
 
 TEST(ImageManager, NotifiesRequestorImmediatelyIfDependenciesAreSatisfied) {
     ImageManager imageManager;
-    StubImageRequestor requestor;
+    StubImageRequestor requestor(imageManager);
     bool notified = false;
 
     requestor.imagesAvailable = [&] (ImageMap, ImageMap, std::unordered_map<std::string, uint32_t>) {
@@ -170,7 +172,7 @@ class StubImageManagerObserver : public ImageManagerObserver {
 
 TEST(ImageManager, OnStyleImageMissingBeforeSpriteLoaded) {
     ImageManager imageManager;
-    StubImageRequestor requestor;
+    StubImageRequestor requestor(imageManager);
     StubImageManagerObserver observer;
 
     imageManager.setObserver(&observer);
@@ -203,7 +205,7 @@ TEST(ImageManager, OnStyleImageMissingBeforeSpriteLoaded) {
 
 TEST(ImageManager, OnStyleImageMissingAfterSpriteLoaded) {
     ImageManager imageManager;
-    StubImageRequestor requestor;
+    StubImageRequestor requestor(imageManager);
     StubImageManagerObserver observer;
 
     imageManager.setObserver(&observer);
-- 
cgit v1.2.1