From b3ec985568176b077756b66754470988436d43c1 Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 12 May 2017 13:01:00 -0700
Subject: [core] Trim StyleObserver interface

It doesn't need to inherit from SpriteLoaderObserver and GlyphAtlasObserver.
---
 test/sprite/sprite_loader.test.cpp | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

(limited to 'test/sprite')

diff --git a/test/sprite/sprite_loader.test.cpp b/test/sprite/sprite_loader.test.cpp
index 06018cc390..99f44e57e4 100644
--- a/test/sprite/sprite_loader.test.cpp
+++ b/test/sprite/sprite_loader.test.cpp
@@ -1,9 +1,9 @@
 #include <mbgl/test/util.hpp>
 #include <mbgl/test/fixture_log_observer.hpp>
 #include <mbgl/test/stub_file_source.hpp>
-#include <mbgl/test/stub_style_observer.hpp>
 
 #include <mbgl/sprite/sprite_loader.hpp>
+#include <mbgl/sprite/sprite_loader_observer.hpp>
 #include <mbgl/sprite/sprite_parser.hpp>
 #include <mbgl/util/io.hpp>
 #include <mbgl/util/image.hpp>
@@ -14,6 +14,21 @@
 #include <utility>
 
 using namespace mbgl;
+using namespace mbgl::style;
+
+class StubSpriteLoaderObserver : public SpriteLoaderObserver {
+public:
+    void onSpriteLoaded(Images&& images) override {
+        if (spriteLoaded) spriteLoaded(std::move(images));
+    }
+
+    void onSpriteError(std::exception_ptr error) override {
+        if (spriteError) spriteError(error);
+    }
+
+    std::function<void (Images&&)> spriteLoaded;
+    std::function<void (std::exception_ptr)> spriteError;
+};
 
 class SpriteLoaderTest {
 public:
@@ -21,7 +36,7 @@ public:
 
     util::RunLoop loop;
     StubFileSource fileSource;
-    StubStyleObserver observer;
+    StubSpriteLoaderObserver observer;
     ThreadPool threadPool { 1 };
     SpriteLoader spriteLoader{ 1 };
 
-- 
cgit v1.2.1