From 53131def65d2654f63afb0d9fedb756e9f98559e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Minh=20Nguy=E1=BB=85n?= Date: Tue, 19 Jul 2016 15:26:09 -0700 Subject: [PATCH] [core] Fixed test build errors Missed this bad merge from #5729. --- platform/macos/CHANGELOG.md | 2 +- test/api/annotations.cpp | 15 --------------- 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/platform/macos/CHANGELOG.md b/platform/macos/CHANGELOG.md index a53668797..f87869c00 100644 --- a/platform/macos/CHANGELOG.md +++ b/platform/macos/CHANGELOG.md @@ -1,6 +1,6 @@ # Changelog for Mapbox macOS SDK -## master +## 0.2.1 * Fixed a crash that occurred when a sprite URL lacks a file extension. See [this comment](https://github.com/mapbox/mapbox-gl-native/issues/5722#issuecomment-233701251) to determine who may be affected by this bug. ([#5723](https://github.com/mapbox/mapbox-gl-native/pull/5723)) * Right-clicking to open MGLMapView’s context menu no longer prevents the user from subsequently panning the map by clicking and dragging. ([#5593](https://github.com/mapbox/mapbox-gl-native/pull/5593)) diff --git a/test/api/annotations.cpp b/test/api/annotations.cpp index e3f189c16..a1e67b29c 100644 --- a/test/api/annotations.cpp +++ b/test/api/annotations.cpp @@ -94,21 +94,6 @@ TEST(Annotations, OverlappingFillAnnotation) { test.checkRendering("overlapping_fill_annotation"); } -TEST(Annotations, OverlappingFillAnnotation) { - AnnotationTest test; - - Polygon polygon = {{ {{ { 0, 0 }, { 0, 45 }, { 45, 45 }, { 45, 0 } }} }}; - FillAnnotation underlaidAnnotation { polygon }; - underlaidAnnotation.color = { { 0, 255, 0, 1 } }; - FillAnnotation overlaidAnnotation { polygon }; - overlaidAnnotation.color = { { 255, 0, 0, 1 } }; - - test.map.setStyleJSON(util::read_file("test/fixtures/api/empty.json")); - test.map.addAnnotation(underlaidAnnotation); - test.map.addAnnotation(overlaidAnnotation); - test.checkRendering("overlapping_fill_annotation"); -} - TEST(Annotations, StyleSourcedShapeAnnotation) { AnnotationTest test;