From 361982fef83a145769da5c04d1c19731df89921c Mon Sep 17 00:00:00 2001
From: Mikhail Pozdnyakov <mikhail.pozdnyakov@mapbox.com>
Date: Thu, 22 Nov 2018 15:37:09 +0200
Subject: [core][Android][Darwin] LayerManager creates RenderLayer instances

`LayerManager` is now responsible for `RenderLayer` instances creation,
so that there is a single entry point for creating of objects, which
correspond to a certain layer type.

The `LayerType type` field is dropped from `Layer::Impl`.
---
 test/style/conversion/layer.test.cpp |  2 +-
 test/style/style_layer.test.cpp      | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'test/style')

diff --git a/test/style/conversion/layer.test.cpp b/test/style/conversion/layer.test.cpp
index 18754a09fb..d65644b91b 100644
--- a/test/style/conversion/layer.test.cpp
+++ b/test/style/conversion/layer.test.cpp
@@ -25,7 +25,7 @@ TEST(StyleConversion, LayerTransition) {
             }
         }
     })JSON");
-	ASSERT_EQ(LayerType::Background, layer->getType());
+    ASSERT_STREQ("background", layer->getTypeInfo()->type);
     ASSERT_EQ(400ms, *static_cast<BackgroundLayer*>(layer.get())->impl().paint
         .get<BackgroundColor>().options.duration);
     ASSERT_EQ(500ms, *static_cast<BackgroundLayer*>(layer.get())->impl().paint
diff --git a/test/style/style_layer.test.cpp b/test/style/style_layer.test.cpp
index 5ea16b7422..50aa643b50 100644
--- a/test/style/style_layer.test.cpp
+++ b/test/style/style_layer.test.cpp
@@ -54,7 +54,7 @@ const auto duration = 1.0f;
 
 TEST(Layer, BackgroundProperties) {
     auto layer = std::make_unique<BackgroundLayer>("background");
-    ASSERT_EQ(LayerType::Background, layer->getType());
+    ASSERT_STREQ("background", layer->getTypeInfo()->type);
 
     // Paint properties
 
@@ -70,7 +70,7 @@ TEST(Layer, BackgroundProperties) {
 
 TEST(Layer, CircleProperties) {
     auto layer = std::make_unique<CircleLayer>("circle", "source");
-    ASSERT_EQ(LayerType::Circle, layer->getType());
+    ASSERT_STREQ("circle", layer->getTypeInfo()->type);
 
     // Paint properties
 
@@ -95,7 +95,7 @@ TEST(Layer, CircleProperties) {
 
 TEST(Layer, FillProperties) {
     auto layer = std::make_unique<FillLayer>("fill", "source");
-    ASSERT_EQ(LayerType::Fill, layer->getType());
+    ASSERT_STREQ("fill", layer->getTypeInfo()->type);
 
     // Paint properties
 
@@ -123,7 +123,7 @@ TEST(Layer, FillProperties) {
 
 TEST(Layer, LineProperties) {
     auto layer = std::make_unique<LineLayer>("line", "source");
-    ASSERT_EQ(LayerType::Line, layer->getType());
+    ASSERT_STREQ("line", layer->getTypeInfo()->type);
 
     // Layout properties
 
@@ -174,7 +174,7 @@ TEST(Layer, LineProperties) {
 
 TEST(Layer, RasterProperties) {
     auto layer = std::make_unique<RasterLayer>("raster", "source");
-    ASSERT_EQ(LayerType::Raster, layer->getType());
+    ASSERT_STREQ("raster", layer->getTypeInfo()->type);
 
     // Paint properties
 
-- 
cgit v1.2.1