From 5c4c6648d1bbc66b38d702cc28e8bac8c5485247 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Tue, 2 Jun 2015 17:53:42 +0300 Subject: [PATCH] Rebase the resource loading tests Update the ResourceLoader tests to reflect the changes after we merged ResourceLoader with Style. --- .../{resources => style}/mock_file_source.cpp | 0 .../{resources => style}/mock_file_source.hpp | 0 test/{resources => style}/mock_view.hpp | 0 .../resource_loading.cpp} | 62 +++++++------------ test/test.gypi | 9 +-- 5 files changed, 26 insertions(+), 45 deletions(-) rename test/{resources => style}/mock_file_source.cpp (100%) rename test/{resources => style}/mock_file_source.hpp (100%) rename test/{resources => style}/mock_view.hpp (100%) rename test/{resources/resource_loader.cpp => style/resource_loading.cpp} (70%) diff --git a/test/resources/mock_file_source.cpp b/test/style/mock_file_source.cpp similarity index 100% rename from test/resources/mock_file_source.cpp rename to test/style/mock_file_source.cpp diff --git a/test/resources/mock_file_source.hpp b/test/style/mock_file_source.hpp similarity index 100% rename from test/resources/mock_file_source.hpp rename to test/style/mock_file_source.hpp diff --git a/test/resources/mock_view.hpp b/test/style/mock_view.hpp similarity index 100% rename from test/resources/mock_view.hpp rename to test/style/mock_view.hpp diff --git a/test/resources/resource_loader.cpp b/test/style/resource_loading.cpp similarity index 70% rename from test/resources/resource_loader.cpp rename to test/style/resource_loading.cpp index 7d57f47ee..5f7195d9b 100644 --- a/test/resources/resource_loader.cpp +++ b/test/style/resource_loading.cpp @@ -3,14 +3,10 @@ #include "mock_file_source.hpp" #include "mock_view.hpp" -#include -#include #include #include -#include #include #include -#include #include #include #include @@ -21,7 +17,7 @@ using namespace mbgl; namespace { -class MockMapContext : public ResourceLoader::Observer { +class MockMapContext : public Style::Observer { public: MockMapContext(uv_loop_t* loop, View& view, @@ -30,12 +26,6 @@ public: : env_(fileSource), envScope_(env_, ThreadType::Map, "Map"), data_(view, MapMode::Still), - glyphStore_(std::make_unique(loop, env_)), - glyphAtlas_(std::make_unique(1024, 1024)), - spriteAtlas_(std::make_unique(512, 512)), - texturePool_(std::make_unique()), - style_(std::make_unique