summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorKonstantin Käfer <mail@kkaefer.com>2016-09-05 19:03:27 +0200
committerKonstantin Käfer <mail@kkaefer.com>2016-09-05 19:03:27 +0200
commit46b73b8a2cf5748596ab6023e2cb1f2ce45d2b0d (patch)
treedb1f2b4075c076bcd1e964ddb7414b81b6808464 /test
parent51b2033fce5ca4d016b67b94abc50c1822c139fe (diff)
downloadqtlocation-mapboxgl-46b73b8a2cf5748596ab6023e2cb1f2ce45d2b0d.tar.gz
[core] Source::update => Source::{load,parse}Tiles, Source::load => Source::loadDescription
Diffstat (limited to 'test')
-rw-r--r--test/style/source.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/test/style/source.cpp b/test/style/source.cpp
index 59b2524e17..cc23698b2b 100644
--- a/test/style/source.cpp
+++ b/test/style/source.cpp
@@ -87,7 +87,7 @@ TEST(Source, LoadingFail) {
VectorSource source("source", "url");
source.baseImpl->setObserver(&test.observer);
- source.baseImpl->load(test.fileSource);
+ source.baseImpl->loadDescription(test.fileSource);
test.run();
}
@@ -110,7 +110,7 @@ TEST(Source, LoadingCorrupt) {
VectorSource source("source", "url");
source.baseImpl->setObserver(&test.observer);
- source.baseImpl->load(test.fileSource);
+ source.baseImpl->loadDescription(test.fileSource);
test.run();
}
@@ -138,8 +138,8 @@ TEST(Source, RasterTileEmpty) {
RasterSource source("source", tileset, 512);
source.baseImpl->setObserver(&test.observer);
- source.baseImpl->load(test.fileSource);
- source.baseImpl->update(test.updateParameters);
+ source.baseImpl->loadDescription(test.fileSource);
+ source.baseImpl->loadTiles(test.updateParameters);
test.run();
}
@@ -167,8 +167,8 @@ TEST(Source, VectorTileEmpty) {
VectorSource source("source", tileset);
source.baseImpl->setObserver(&test.observer);
- source.baseImpl->load(test.fileSource);
- source.baseImpl->update(test.updateParameters);
+ source.baseImpl->loadDescription(test.fileSource);
+ source.baseImpl->loadTiles(test.updateParameters);
test.run();
}
@@ -196,8 +196,8 @@ TEST(Source, RasterTileFail) {
RasterSource source("source", tileset, 512);
source.baseImpl->setObserver(&test.observer);
- source.baseImpl->load(test.fileSource);
- source.baseImpl->update(test.updateParameters);
+ source.baseImpl->loadDescription(test.fileSource);
+ source.baseImpl->loadTiles(test.updateParameters);
test.run();
}
@@ -225,8 +225,8 @@ TEST(Source, VectorTileFail) {
VectorSource source("source", tileset);
source.baseImpl->setObserver(&test.observer);
- source.baseImpl->load(test.fileSource);
- source.baseImpl->update(test.updateParameters);
+ source.baseImpl->loadDescription(test.fileSource);
+ source.baseImpl->loadTiles(test.updateParameters);
test.run();
}
@@ -253,8 +253,8 @@ TEST(Source, RasterTileCorrupt) {
RasterSource source("source", tileset, 512);
source.baseImpl->setObserver(&test.observer);
- source.baseImpl->load(test.fileSource);
- source.baseImpl->update(test.updateParameters);
+ source.baseImpl->loadDescription(test.fileSource);
+ source.baseImpl->loadTiles(test.updateParameters);
test.run();
}
@@ -285,8 +285,8 @@ TEST(Source, VectorTileCorrupt) {
VectorSource source("source", tileset);
source.baseImpl->setObserver(&test.observer);
- source.baseImpl->load(test.fileSource);
- source.baseImpl->update(test.updateParameters);
+ source.baseImpl->loadDescription(test.fileSource);
+ source.baseImpl->loadTiles(test.updateParameters);
test.run();
}
@@ -312,8 +312,8 @@ TEST(Source, RasterTileCancel) {
RasterSource source("source", tileset, 512);
source.baseImpl->setObserver(&test.observer);
- source.baseImpl->load(test.fileSource);
- source.baseImpl->update(test.updateParameters);
+ source.baseImpl->loadDescription(test.fileSource);
+ source.baseImpl->loadTiles(test.updateParameters);
test.run();
}
@@ -339,8 +339,8 @@ TEST(Source, VectorTileCancel) {
VectorSource source("source", tileset);
source.baseImpl->setObserver(&test.observer);
- source.baseImpl->load(test.fileSource);
- source.baseImpl->update(test.updateParameters);
+ source.baseImpl->loadDescription(test.fileSource);
+ source.baseImpl->loadTiles(test.updateParameters);
test.run();
}