diff options
| author | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-07 14:56:32 -0800 |
|---|---|---|
| committer | John Firebaugh <john.firebaugh@gmail.com> | 2015-12-07 18:22:33 -0800 |
| commit | e04c5f650648d150e78da3602745b6190ec4aee3 (patch) | |
| tree | 5420b75780c798af82aa5831a1413c8bf1df0c96 /test | |
| parent | 8bfc5de1dc969559e031de6650d234e086cb4fb2 (diff) | |
| download | qtlocation-mapboxgl-e04c5f650648d150e78da3602745b6190ec4aee3.tar.gz | |
[core] Replace StyleLayerType with RTTI
Diffstat (limited to 'test')
| -rw-r--r-- | test/miscellaneous/enums.cpp | 35 | ||||
| -rw-r--r-- | test/style/style_layer.cpp | 4 | ||||
| -rw-r--r-- | test/test.gypi | 1 |
3 files changed, 2 insertions, 38 deletions
diff --git a/test/miscellaneous/enums.cpp b/test/miscellaneous/enums.cpp deleted file mode 100644 index f96b568f5b..0000000000 --- a/test/miscellaneous/enums.cpp +++ /dev/null @@ -1,35 +0,0 @@ -#include <iostream> -#include "../fixtures/util.hpp" - -#include <algorithm> - -#include <mbgl/style/types.hpp> - -using namespace mbgl; - -TEST(Enums, StyleLayerType) { - ASSERT_EQ(StyleLayerType::Unknown, StyleLayerTypeClass("unknown")); - ASSERT_EQ(StyleLayerType::Fill, StyleLayerTypeClass("fill")); - ASSERT_EQ(StyleLayerType::Line, StyleLayerTypeClass("line")); - ASSERT_EQ(StyleLayerType::Symbol, StyleLayerTypeClass("symbol")); - ASSERT_EQ(StyleLayerType::Raster, StyleLayerTypeClass("raster")); - ASSERT_EQ(StyleLayerType::Background, StyleLayerTypeClass("background")); - - ASSERT_EQ(StyleLayerType::Unknown, StyleLayerTypeClass(StyleLayerType::Unknown)); - ASSERT_EQ(StyleLayerType::Fill, StyleLayerTypeClass(StyleLayerType::Fill)); - ASSERT_EQ(StyleLayerType::Line, StyleLayerTypeClass(StyleLayerType::Line)); - ASSERT_EQ(StyleLayerType::Symbol, StyleLayerTypeClass(StyleLayerType::Symbol)); - ASSERT_EQ(StyleLayerType::Raster, StyleLayerTypeClass(StyleLayerType::Raster)); - ASSERT_EQ(StyleLayerType::Background, StyleLayerTypeClass(StyleLayerType::Background)); - - ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Unknown), StyleLayerTypeClass(StyleLayerType::Unknown)); - ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Fill), StyleLayerTypeClass(StyleLayerType::Fill)); - ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Line), StyleLayerTypeClass(StyleLayerType::Line)); - ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Symbol), StyleLayerTypeClass(StyleLayerType::Symbol)); - ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Raster), StyleLayerTypeClass(StyleLayerType::Raster)); - ASSERT_EQ(StyleLayerTypeClass(StyleLayerType::Background), StyleLayerTypeClass(StyleLayerType::Background)); - - ASSERT_FALSE(StyleLayerTypeClass("").valid()); - ASSERT_FALSE(StyleLayerTypeClass("Backgrund").valid()); -} - diff --git a/test/style/style_layer.cpp b/test/style/style_layer.cpp index d005371fef..40c4df2b43 100644 --- a/test/style/style_layer.cpp +++ b/test/style/style_layer.cpp @@ -6,12 +6,12 @@ using namespace mbgl; TEST(StyleLayer, Create) { - std::unique_ptr<StyleLayer> layer = StyleLayer::create(StyleLayerType::Background); + std::unique_ptr<StyleLayer> layer = std::make_unique<BackgroundLayer>(); EXPECT_TRUE(reinterpret_cast<BackgroundLayer*>(layer.get())); } TEST(StyleLayer, Clone) { - std::unique_ptr<StyleLayer> layer = StyleLayer::create(StyleLayerType::Background); + std::unique_ptr<StyleLayer> layer = std::make_unique<BackgroundLayer>(); std::unique_ptr<StyleLayer> clone = layer->clone(); EXPECT_NE(layer.get(), clone.get()); EXPECT_TRUE(reinterpret_cast<BackgroundLayer*>(layer.get())); diff --git a/test/test.gypi b/test/test.gypi index 2188ed905a..c7d99ddfae 100644 --- a/test/test.gypi +++ b/test/test.gypi @@ -50,7 +50,6 @@ 'miscellaneous/binpack.cpp', 'miscellaneous/bilinear.cpp', 'miscellaneous/comparisons.cpp', - 'miscellaneous/enums.cpp', 'miscellaneous/functions.cpp', 'miscellaneous/geo.cpp', 'miscellaneous/image.cpp', |