[core] split off render layers

2 files changed, 4 insertions, 48 deletions

diff --git a/test/style/conversion/layer.test.cpp b/test/style/conversion/layer.test.cpp
index cfe2662fb8..ae8d4058ab 100644
--- a/test/style/conversion/layer.test.cpp
+++ b/test/style/conversion/layer.test.cpp
@@ -35,13 +35,13 @@ TEST(StyleConversion, LayerTransition) {
         }
     })JSON");
 
-    ASSERT_EQ(400ms, *layer->as<BackgroundLayer>()->impl->paint.cascading
+    ASSERT_EQ(400ms, *layer->as<BackgroundLayer>()->impl->cascading
         .get<BackgroundColor>().getTransition({}).duration);
-    ASSERT_EQ(500ms, *layer->as<BackgroundLayer>()->impl->paint.cascading
+    ASSERT_EQ(500ms, *layer->as<BackgroundLayer>()->impl->cascading
         .get<BackgroundColor>().getTransition({}).delay);
 
-    ASSERT_EQ(100ms, *layer->as<BackgroundLayer>()->impl->paint.cascading
+    ASSERT_EQ(100ms, *layer->as<BackgroundLayer>()->impl->cascading
         .get<BackgroundColor>().getTransition({"class"}).duration);
-    ASSERT_FALSE(bool(layer->as<BackgroundLayer>()->impl->paint.cascading
+    ASSERT_FALSE(bool(layer->as<BackgroundLayer>()->impl->cascading
         .get<BackgroundColor>().getTransition({"class"}).delay));
 }
diff --git a/test/style/group_by_layout.test.cpp b/test/style/group_by_layout.test.cpp
deleted file mode 100644
index 600ba6a0f1..0000000000
--- a/test/style/group_by_layout.test.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
-#include <mbgl/test/util.hpp>
-
-#include <mbgl/style/group_by_layout.hpp>
-#include <mbgl/style/layers/background_layer.hpp>
-#include <mbgl/style/layers/circle_layer.hpp>
-#include <mbgl/style/layers/line_layer.hpp>
-
-using namespace mbgl;
-using namespace mbgl::style;
-
-TEST(GroupByLayout, Related) {
-    std::vector<std::unique_ptr<Layer>> layers;
-    layers.push_back(std::make_unique<LineLayer>("a", "source"));
-    layers.push_back(std::make_unique<LineLayer>("b", "source"));
-    auto result = groupByLayout(layers);
-    ASSERT_EQ(1u, result.size());
-    ASSERT_EQ(2u, result[0].size());
-}
-
-TEST(GroupByLayout, UnrelatedType) {
-    std::vector<std::unique_ptr<Layer>> layers;
-    layers.push_back(std::make_unique<BackgroundLayer>("background"));
-    layers.push_back(std::make_unique<CircleLayer>("circle", "source"));
-    auto result = groupByLayout(layers);
-    ASSERT_EQ(2u, result.size());
-}
-
-TEST(GroupByLayout, UnrelatedFilter) {
-    std::vector<std::unique_ptr<Layer>> layers;
-    layers.push_back(std::make_unique<LineLayer>("a", "source"));
-    layers.push_back(std::make_unique<LineLayer>("b", "source"));
-    layers[0]->as<LineLayer>()->setFilter(EqualsFilter());
-    auto result = groupByLayout(layers);
-    ASSERT_EQ(2u, result.size());
-}
-
-TEST(GroupByLayout, UnrelatedLayout) {
-    std::vector<std::unique_ptr<Layer>> layers;
-    layers.push_back(std::make_unique<LineLayer>("a", "source"));
-    layers.push_back(std::make_unique<LineLayer>("b", "source"));
-    layers[0]->as<LineLayer>()->setLineCap(LineCapType::Square);
-    auto result = groupByLayout(layers);
-    ASSERT_EQ(2u, result.size());
-}