diff options
Diffstat (limited to 'render-test')
-rw-r--r-- | render-test/parser.cpp | 8 | ||||
-rw-r--r-- | render-test/tests/filesize/fail-file-doesnt-match/expected.png | bin | 0 -> 686 bytes | |||
-rw-r--r-- | render-test/tests/filesize/fail-file-doesnt-match/style.json | 36 | ||||
-rw-r--r-- | render-test/tests/filesize/fail-size-is-over/expected.png | bin | 0 -> 686 bytes | |||
-rw-r--r-- | render-test/tests/filesize/fail-size-is-over/metrics.json | 1 | ||||
-rw-r--r-- | render-test/tests/filesize/fail-size-is-over/style.json | 36 | ||||
-rw-r--r-- | render-test/tests/filesize/fail-size-is-under/expected.png | bin | 0 -> 686 bytes | |||
-rw-r--r-- | render-test/tests/filesize/fail-size-is-under/metrics.json | 1 | ||||
-rw-r--r-- | render-test/tests/filesize/fail-size-is-under/style.json | 36 | ||||
-rw-r--r-- | render-test/tests/filesize/pass-size-is-same/expected.png | bin | 0 -> 686 bytes | |||
-rw-r--r-- | render-test/tests/filesize/pass-size-is-same/metrics.json | 1 | ||||
-rw-r--r-- | render-test/tests/filesize/pass-size-is-same/style.json | 36 | ||||
-rw-r--r-- | render-test/tests/should-fail.json | 5 |
13 files changed, 157 insertions, 3 deletions
diff --git a/render-test/parser.cpp b/render-test/parser.cpp index 613fc566ea..3da7e6ea01 100644 --- a/render-test/parser.cpp +++ b/render-test/parser.cpp @@ -421,15 +421,17 @@ std::vector<std::pair<std::string, std::string>> parseIgnores() { auto mainIgnoresPath = mbgl::filesystem::path(TEST_RUNNER_ROOT_PATH).append("platform/node/test/ignores.json"); mbgl::filesystem::path platformSpecificIgnores; + mbgl::filesystem::path ownTestsIgnores = + mbgl::filesystem::path(TEST_RUNNER_ROOT_PATH).append("render-test/tests/should-fail.json"); #ifdef __APPLE__ platformSpecificIgnores = mbgl::filesystem::path(TEST_RUNNER_ROOT_PATH).append("render-test/mac-ignores.json"); #elif __linux__ platformSpecificIgnores = mbgl::filesystem::path(TEST_RUNNER_ROOT_PATH).append("render-test/linux-ignores.json"); #endif - - std::vector<mbgl::filesystem::path> ignoresPaths = { mainIgnoresPath, platformSpecificIgnores }; - for (auto path: ignoresPaths) { + + std::vector<mbgl::filesystem::path> ignoresPaths = {mainIgnoresPath, platformSpecificIgnores, ownTestsIgnores}; + for (const auto& path : ignoresPaths) { auto maybeIgnores = readJson(path); if (!maybeIgnores.is<mbgl::JSDocument>()) { continue; diff --git a/render-test/tests/filesize/fail-file-doesnt-match/expected.png b/render-test/tests/filesize/fail-file-doesnt-match/expected.png Binary files differnew file mode 100644 index 0000000000..feed2e457f --- /dev/null +++ b/render-test/tests/filesize/fail-file-doesnt-match/expected.png diff --git a/render-test/tests/filesize/fail-file-doesnt-match/style.json b/render-test/tests/filesize/fail-file-doesnt-match/style.json new file mode 100644 index 0000000000..91e90ffbe8 --- /dev/null +++ b/render-test/tests/filesize/fail-file-doesnt-match/style.json @@ -0,0 +1,36 @@ +{ + "version": 8, + "metadata": { + "test": { + "operations": [ + ["probeFileSize", "style", "aaaaa.json"], + ["probeFileSize", "image", "bbbbb.png"] + ], + "width": 64, + "height": 64 + } + }, + "sources": { + "geojson": { + "type": "geojson", + "data": { + "type": "Point", + "coordinates": [ + 0, + 0 + ] + } + } + }, + "sprite": "local://sprites/sprite", + "layers": [ + { + "id": "symbol", + "type": "symbol", + "source": "geojson", + "layout": { + "icon-image": "circle-12" + } + } + ] +} diff --git a/render-test/tests/filesize/fail-size-is-over/expected.png b/render-test/tests/filesize/fail-size-is-over/expected.png Binary files differnew file mode 100644 index 0000000000..feed2e457f --- /dev/null +++ b/render-test/tests/filesize/fail-size-is-over/expected.png diff --git a/render-test/tests/filesize/fail-size-is-over/metrics.json b/render-test/tests/filesize/fail-size-is-over/metrics.json new file mode 100644 index 0000000000..2df7e7da11 --- /dev/null +++ b/render-test/tests/filesize/fail-size-is-over/metrics.json @@ -0,0 +1 @@ +{"fileSize":[["image","../render-test/tests/filesize/fail-size-is-over/expected.png",100],["style","../render-test/tests/filesize/fail-size-is-over/style.json",100]]} diff --git a/render-test/tests/filesize/fail-size-is-over/style.json b/render-test/tests/filesize/fail-size-is-over/style.json new file mode 100644 index 0000000000..ce2069a372 --- /dev/null +++ b/render-test/tests/filesize/fail-size-is-over/style.json @@ -0,0 +1,36 @@ +{ + "version": 8, + "metadata": { + "test": { + "operations": [ + ["probeFileSize", "style", "style.json"], + ["probeFileSize", "image", "expected.png"] + ], + "width": 64, + "height": 64 + } + }, + "sources": { + "geojson": { + "type": "geojson", + "data": { + "type": "Point", + "coordinates": [ + 0, + 0 + ] + } + } + }, + "sprite": "local://sprites/sprite", + "layers": [ + { + "id": "symbol", + "type": "symbol", + "source": "geojson", + "layout": { + "icon-image": "circle-12" + } + } + ] +} diff --git a/render-test/tests/filesize/fail-size-is-under/expected.png b/render-test/tests/filesize/fail-size-is-under/expected.png Binary files differnew file mode 100644 index 0000000000..feed2e457f --- /dev/null +++ b/render-test/tests/filesize/fail-size-is-under/expected.png diff --git a/render-test/tests/filesize/fail-size-is-under/metrics.json b/render-test/tests/filesize/fail-size-is-under/metrics.json new file mode 100644 index 0000000000..92d3f1e3d5 --- /dev/null +++ b/render-test/tests/filesize/fail-size-is-under/metrics.json @@ -0,0 +1 @@ +{"fileSize":[["image","../render-test/tests/filesize/fail-size-is-under/expected.png",999],["style","../render-test/tests/filesize/fail-size-is-under/style.json",999]]} diff --git a/render-test/tests/filesize/fail-size-is-under/style.json b/render-test/tests/filesize/fail-size-is-under/style.json new file mode 100644 index 0000000000..ce2069a372 --- /dev/null +++ b/render-test/tests/filesize/fail-size-is-under/style.json @@ -0,0 +1,36 @@ +{ + "version": 8, + "metadata": { + "test": { + "operations": [ + ["probeFileSize", "style", "style.json"], + ["probeFileSize", "image", "expected.png"] + ], + "width": 64, + "height": 64 + } + }, + "sources": { + "geojson": { + "type": "geojson", + "data": { + "type": "Point", + "coordinates": [ + 0, + 0 + ] + } + } + }, + "sprite": "local://sprites/sprite", + "layers": [ + { + "id": "symbol", + "type": "symbol", + "source": "geojson", + "layout": { + "icon-image": "circle-12" + } + } + ] +} diff --git a/render-test/tests/filesize/pass-size-is-same/expected.png b/render-test/tests/filesize/pass-size-is-same/expected.png Binary files differnew file mode 100644 index 0000000000..feed2e457f --- /dev/null +++ b/render-test/tests/filesize/pass-size-is-same/expected.png diff --git a/render-test/tests/filesize/pass-size-is-same/metrics.json b/render-test/tests/filesize/pass-size-is-same/metrics.json new file mode 100644 index 0000000000..4c01d3b2ca --- /dev/null +++ b/render-test/tests/filesize/pass-size-is-same/metrics.json @@ -0,0 +1 @@ +{"fileSize":[["image","../render-test/tests/filesize/pass-size-is-same/expected.png",686],["style","../render-test/tests/filesize/pass-size-is-same/style.json",609]]}
\ No newline at end of file diff --git a/render-test/tests/filesize/pass-size-is-same/style.json b/render-test/tests/filesize/pass-size-is-same/style.json new file mode 100644 index 0000000000..ce2069a372 --- /dev/null +++ b/render-test/tests/filesize/pass-size-is-same/style.json @@ -0,0 +1,36 @@ +{ + "version": 8, + "metadata": { + "test": { + "operations": [ + ["probeFileSize", "style", "style.json"], + ["probeFileSize", "image", "expected.png"] + ], + "width": 64, + "height": 64 + } + }, + "sources": { + "geojson": { + "type": "geojson", + "data": { + "type": "Point", + "coordinates": [ + 0, + 0 + ] + } + } + }, + "sprite": "local://sprites/sprite", + "layers": [ + { + "id": "symbol", + "type": "symbol", + "source": "geojson", + "layout": { + "icon-image": "circle-12" + } + } + ] +} diff --git a/render-test/tests/should-fail.json b/render-test/tests/should-fail.json new file mode 100644 index 0000000000..28859d4151 --- /dev/null +++ b/render-test/tests/should-fail.json @@ -0,0 +1,5 @@ +{ + "tests/filesize/fail-size-is-over": "Should fail, size is bigger than expected.", + "tests/filesize/fail-size-is-under": "Should fail, size is smaller than expected.", + "tests/filesize/fail-file-doesnt-match": "Should fail, file not found." +} |