summaryrefslogtreecommitdiff
path: root/test/style
diff options
context:
space:
mode:
authorBruno de Oliveira Abinader <bruno@mapbox.com>2016-03-11 14:57:12 +0200
committerBruno de Oliveira Abinader <bruno@mapbox.com>2016-03-18 01:27:48 +0200
commitcd1a06c2dc209da81b3d745c088e568b3b14809f (patch)
tree0a30b411984b5926e6bd11dd933614317ae359bb /test/style
parentc6ba05bbc3860d310e04faad93de1e82cb4b42fc (diff)
downloadqtlocation-mapboxgl-cd1a06c2dc209da81b3d745c088e568b3b14809f.tar.gz
[core] Get rid of MapData::{get,set}animationTime
Diffstat (limited to 'test/style')
-rw-r--r--test/style/style.cpp18
1 files changed, 12 insertions, 6 deletions
diff --git a/test/style/style.cpp b/test/style/style.cpp
index 6fa6a64b18..1d3b3beb47 100644
--- a/test/style/style.cpp
+++ b/test/style/style.cpp
@@ -16,9 +16,11 @@ TEST(Style, UnusedSource) {
StubFileSource fileSource;
Style style { data, fileSource };
+ auto now = Clock::now();
+
style.setJSON(util::read_file("test/fixtures/resources/style-unused-sources.json"), "");
- style.cascade();
- style.recalculate(0);
+ style.cascade(now);
+ style.recalculate(0, now);
Source *usedSource = style.getSource("usedsource");
EXPECT_TRUE(usedSource);
@@ -42,8 +44,10 @@ TEST(Style, UnusedSourceActiveViaClassUpdate) {
EXPECT_TRUE(style.addClass("visible"));
EXPECT_TRUE(style.hasClass("visible"));
- style.cascade();
- style.recalculate(0);
+ auto now = Clock::now();
+
+ style.cascade(now);
+ style.recalculate(0, now);
Source *unusedSource = style.getSource("unusedsource");
EXPECT_TRUE(unusedSource);
@@ -53,8 +57,10 @@ TEST(Style, UnusedSourceActiveViaClassUpdate) {
style.setJSON(util::read_file("test/fixtures/resources/style-unused-sources.json"), "");
EXPECT_FALSE(style.hasClass("visible"));
- style.cascade();
- style.recalculate(0);
+ now = Clock::now();
+
+ style.cascade(now);
+ style.recalculate(0, now);
unusedSource = style.getSource("unusedsource");
EXPECT_TRUE(unusedSource);