From 2fb1e47b75c038f226397df7b790ba699b6e2dc8 Mon Sep 17 00:00:00 2001 From: "Thiago Marcos P. Santos" Date: Fri, 11 Oct 2019 17:22:30 +0300 Subject: [render-test] No camelCase on the metrics.json tag It is ugly. --- render-test/parser.cpp | 8 +++--- .../file-size/fail-file-doesnt-match/expected.png | Bin 0 -> 169 bytes .../file-size/fail-file-doesnt-match/metrics.json | 14 +++++++++ .../file-size/fail-file-doesnt-match/style.json | 32 +++++++++++++++++++++ .../file-size/fail-file-not-found/expected.png | Bin 0 -> 169 bytes .../tests/file-size/fail-file-not-found/style.json | 32 +++++++++++++++++++++ .../tests/file-size/fail-size-is-over/expected.png | Bin 0 -> 169 bytes .../tests/file-size/fail-size-is-over/metrics.json | 14 +++++++++ .../tests/file-size/fail-size-is-over/style.json | 32 +++++++++++++++++++++ .../file-size/fail-size-is-under/expected.png | Bin 0 -> 169 bytes .../file-size/fail-size-is-under/metrics.json | 14 +++++++++ .../tests/file-size/fail-size-is-under/style.json | 32 +++++++++++++++++++++ .../tests/file-size/pass-size-is-same/expected.png | Bin 0 -> 169 bytes .../tests/file-size/pass-size-is-same/metrics.json | 14 +++++++++ .../tests/file-size/pass-size-is-same/style.json | 32 +++++++++++++++++++++ .../filesize/fail-file-doesnt-match/expected.png | Bin 169 -> 0 bytes .../filesize/fail-file-doesnt-match/metrics.json | 14 --------- .../filesize/fail-file-doesnt-match/style.json | 32 --------------------- .../filesize/fail-file-not-found/expected.png | Bin 169 -> 0 bytes .../tests/filesize/fail-file-not-found/style.json | 32 --------------------- .../tests/filesize/fail-size-is-over/expected.png | Bin 169 -> 0 bytes .../tests/filesize/fail-size-is-over/metrics.json | 14 --------- .../tests/filesize/fail-size-is-over/style.json | 32 --------------------- .../tests/filesize/fail-size-is-under/expected.png | Bin 169 -> 0 bytes .../tests/filesize/fail-size-is-under/metrics.json | 14 --------- .../tests/filesize/fail-size-is-under/style.json | 32 --------------------- .../tests/filesize/pass-size-is-same/expected.png | Bin 169 -> 0 bytes .../tests/filesize/pass-size-is-same/metrics.json | 14 --------- .../tests/filesize/pass-size-is-same/style.json | 32 --------------------- render-test/tests/should-fail.json | 8 +++--- 30 files changed, 224 insertions(+), 224 deletions(-) create mode 100644 render-test/tests/file-size/fail-file-doesnt-match/expected.png create mode 100644 render-test/tests/file-size/fail-file-doesnt-match/metrics.json create mode 100644 render-test/tests/file-size/fail-file-doesnt-match/style.json create mode 100644 render-test/tests/file-size/fail-file-not-found/expected.png create mode 100644 render-test/tests/file-size/fail-file-not-found/style.json create mode 100644 render-test/tests/file-size/fail-size-is-over/expected.png create mode 100644 render-test/tests/file-size/fail-size-is-over/metrics.json create mode 100644 render-test/tests/file-size/fail-size-is-over/style.json create mode 100644 render-test/tests/file-size/fail-size-is-under/expected.png create mode 100644 render-test/tests/file-size/fail-size-is-under/metrics.json create mode 100644 render-test/tests/file-size/fail-size-is-under/style.json create mode 100644 render-test/tests/file-size/pass-size-is-same/expected.png create mode 100644 render-test/tests/file-size/pass-size-is-same/metrics.json create mode 100644 render-test/tests/file-size/pass-size-is-same/style.json delete mode 100644 render-test/tests/filesize/fail-file-doesnt-match/expected.png delete mode 100644 render-test/tests/filesize/fail-file-doesnt-match/metrics.json delete mode 100644 render-test/tests/filesize/fail-file-doesnt-match/style.json delete mode 100644 render-test/tests/filesize/fail-file-not-found/expected.png delete mode 100644 render-test/tests/filesize/fail-file-not-found/style.json delete mode 100644 render-test/tests/filesize/fail-size-is-over/expected.png delete mode 100644 render-test/tests/filesize/fail-size-is-over/metrics.json delete mode 100644 render-test/tests/filesize/fail-size-is-over/style.json delete mode 100644 render-test/tests/filesize/fail-size-is-under/expected.png delete mode 100644 render-test/tests/filesize/fail-size-is-under/metrics.json delete mode 100644 render-test/tests/filesize/fail-size-is-under/style.json delete mode 100644 render-test/tests/filesize/pass-size-is-same/expected.png delete mode 100644 render-test/tests/filesize/pass-size-is-same/metrics.json delete mode 100644 render-test/tests/filesize/pass-size-is-same/style.json diff --git a/render-test/parser.cpp b/render-test/parser.cpp index aef2f40c16..cbbc43293a 100644 --- a/render-test/parser.cpp +++ b/render-test/parser.cpp @@ -274,9 +274,9 @@ std::string serializeMetrics(const TestMetrics& metrics) { writer.StartObject(); - // Start fileSize section. + // Start file-size section. if (!metrics.fileSize.empty()) { - writer.Key("fileSize"); + writer.Key("file-size"); writer.StartArray(); for (const auto& fileSizeProbe : metrics.fileSize) { assert(!fileSizeProbe.first.empty()); @@ -460,8 +460,8 @@ TestMetrics readExpectedMetrics(const mbgl::filesystem::path& path) { const auto& document = maybeJson.get(); - if (document.HasMember("fileSize")) { - const mbgl::JSValue& fileSizeValue = document["fileSize"]; + if (document.HasMember("file-size")) { + const mbgl::JSValue& fileSizeValue = document["file-size"]; assert(fileSizeValue.IsArray()); for (auto& probeValue : fileSizeValue.GetArray()) { assert(probeValue.IsArray()); diff --git a/render-test/tests/file-size/fail-file-doesnt-match/expected.png b/render-test/tests/file-size/fail-file-doesnt-match/expected.png new file mode 100644 index 0000000000..83d01c4e5d Binary files /dev/null and b/render-test/tests/file-size/fail-file-doesnt-match/expected.png differ diff --git a/render-test/tests/file-size/fail-file-doesnt-match/metrics.json b/render-test/tests/file-size/fail-file-doesnt-match/metrics.json new file mode 100644 index 0000000000..c0002163d6 --- /dev/null +++ b/render-test/tests/file-size/fail-file-doesnt-match/metrics.json @@ -0,0 +1,14 @@ +{ + "file-size": [ + [ + "image", + "expected.aaa", + 169 + ], + [ + "style", + "style.bbbb", + 510 + ] + ] +} diff --git a/render-test/tests/file-size/fail-file-doesnt-match/style.json b/render-test/tests/file-size/fail-file-doesnt-match/style.json new file mode 100644 index 0000000000..a3267fcf5e --- /dev/null +++ b/render-test/tests/file-size/fail-file-doesnt-match/style.json @@ -0,0 +1,32 @@ +{ + "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 + ] + } + } + }, + "layers": [ + { + "id": "circle", + "type": "circle", + "source": "geojson" + } + ] +} diff --git a/render-test/tests/file-size/fail-file-not-found/expected.png b/render-test/tests/file-size/fail-file-not-found/expected.png new file mode 100644 index 0000000000..83d01c4e5d Binary files /dev/null and b/render-test/tests/file-size/fail-file-not-found/expected.png differ diff --git a/render-test/tests/file-size/fail-file-not-found/style.json b/render-test/tests/file-size/fail-file-not-found/style.json new file mode 100644 index 0000000000..17dbd1e3d7 --- /dev/null +++ b/render-test/tests/file-size/fail-file-not-found/style.json @@ -0,0 +1,32 @@ +{ + "version": 8, + "metadata": { + "test": { + "operations": [ + ["probeFileSize", "style", "style.aaaa"], + ["probeFileSize", "image", "expected.bbb"] + ], + "width": 64, + "height": 64 + } + }, + "sources": { + "geojson": { + "type": "geojson", + "data": { + "type": "Point", + "coordinates": [ + 0, + 0 + ] + } + } + }, + "layers": [ + { + "id": "circle", + "type": "circle", + "source": "geojson" + } + ] +} diff --git a/render-test/tests/file-size/fail-size-is-over/expected.png b/render-test/tests/file-size/fail-size-is-over/expected.png new file mode 100644 index 0000000000..83d01c4e5d Binary files /dev/null and b/render-test/tests/file-size/fail-size-is-over/expected.png differ diff --git a/render-test/tests/file-size/fail-size-is-over/metrics.json b/render-test/tests/file-size/fail-size-is-over/metrics.json new file mode 100644 index 0000000000..bc194081cf --- /dev/null +++ b/render-test/tests/file-size/fail-size-is-over/metrics.json @@ -0,0 +1,14 @@ +{ + "file-size": [ + [ + "image", + "expected.png", + 999 + ], + [ + "style", + "style.json", + 999 + ] + ] +} diff --git a/render-test/tests/file-size/fail-size-is-over/style.json b/render-test/tests/file-size/fail-size-is-over/style.json new file mode 100644 index 0000000000..a3267fcf5e --- /dev/null +++ b/render-test/tests/file-size/fail-size-is-over/style.json @@ -0,0 +1,32 @@ +{ + "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 + ] + } + } + }, + "layers": [ + { + "id": "circle", + "type": "circle", + "source": "geojson" + } + ] +} diff --git a/render-test/tests/file-size/fail-size-is-under/expected.png b/render-test/tests/file-size/fail-size-is-under/expected.png new file mode 100644 index 0000000000..83d01c4e5d Binary files /dev/null and b/render-test/tests/file-size/fail-size-is-under/expected.png differ diff --git a/render-test/tests/file-size/fail-size-is-under/metrics.json b/render-test/tests/file-size/fail-size-is-under/metrics.json new file mode 100644 index 0000000000..d288c2ceee --- /dev/null +++ b/render-test/tests/file-size/fail-size-is-under/metrics.json @@ -0,0 +1,14 @@ +{ + "file-size": [ + [ + "image", + "expected.png", + 100 + ], + [ + "style", + "style.json", + 100 + ] + ] +} diff --git a/render-test/tests/file-size/fail-size-is-under/style.json b/render-test/tests/file-size/fail-size-is-under/style.json new file mode 100644 index 0000000000..a3267fcf5e --- /dev/null +++ b/render-test/tests/file-size/fail-size-is-under/style.json @@ -0,0 +1,32 @@ +{ + "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 + ] + } + } + }, + "layers": [ + { + "id": "circle", + "type": "circle", + "source": "geojson" + } + ] +} diff --git a/render-test/tests/file-size/pass-size-is-same/expected.png b/render-test/tests/file-size/pass-size-is-same/expected.png new file mode 100644 index 0000000000..83d01c4e5d Binary files /dev/null and b/render-test/tests/file-size/pass-size-is-same/expected.png differ diff --git a/render-test/tests/file-size/pass-size-is-same/metrics.json b/render-test/tests/file-size/pass-size-is-same/metrics.json new file mode 100644 index 0000000000..b98328f72e --- /dev/null +++ b/render-test/tests/file-size/pass-size-is-same/metrics.json @@ -0,0 +1,14 @@ +{ + "file-size": [ + [ + "image", + "expected.png", + 169 + ], + [ + "style", + "style.json", + 510 + ] + ] +} \ No newline at end of file diff --git a/render-test/tests/file-size/pass-size-is-same/style.json b/render-test/tests/file-size/pass-size-is-same/style.json new file mode 100644 index 0000000000..a3267fcf5e --- /dev/null +++ b/render-test/tests/file-size/pass-size-is-same/style.json @@ -0,0 +1,32 @@ +{ + "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 + ] + } + } + }, + "layers": [ + { + "id": "circle", + "type": "circle", + "source": "geojson" + } + ] +} diff --git a/render-test/tests/filesize/fail-file-doesnt-match/expected.png b/render-test/tests/filesize/fail-file-doesnt-match/expected.png deleted file mode 100644 index 83d01c4e5d..0000000000 Binary files a/render-test/tests/filesize/fail-file-doesnt-match/expected.png and /dev/null differ diff --git a/render-test/tests/filesize/fail-file-doesnt-match/metrics.json b/render-test/tests/filesize/fail-file-doesnt-match/metrics.json deleted file mode 100644 index e02fefc652..0000000000 --- a/render-test/tests/filesize/fail-file-doesnt-match/metrics.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "fileSize": [ - [ - "image", - "expected.aaa", - 169 - ], - [ - "style", - "style.bbbb", - 510 - ] - ] -} diff --git a/render-test/tests/filesize/fail-file-doesnt-match/style.json b/render-test/tests/filesize/fail-file-doesnt-match/style.json deleted file mode 100644 index a3267fcf5e..0000000000 --- a/render-test/tests/filesize/fail-file-doesnt-match/style.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "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 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/filesize/fail-file-not-found/expected.png b/render-test/tests/filesize/fail-file-not-found/expected.png deleted file mode 100644 index 83d01c4e5d..0000000000 Binary files a/render-test/tests/filesize/fail-file-not-found/expected.png and /dev/null differ diff --git a/render-test/tests/filesize/fail-file-not-found/style.json b/render-test/tests/filesize/fail-file-not-found/style.json deleted file mode 100644 index 17dbd1e3d7..0000000000 --- a/render-test/tests/filesize/fail-file-not-found/style.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "version": 8, - "metadata": { - "test": { - "operations": [ - ["probeFileSize", "style", "style.aaaa"], - ["probeFileSize", "image", "expected.bbb"] - ], - "width": 64, - "height": 64 - } - }, - "sources": { - "geojson": { - "type": "geojson", - "data": { - "type": "Point", - "coordinates": [ - 0, - 0 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/filesize/fail-size-is-over/expected.png b/render-test/tests/filesize/fail-size-is-over/expected.png deleted file mode 100644 index 83d01c4e5d..0000000000 Binary files a/render-test/tests/filesize/fail-size-is-over/expected.png and /dev/null differ diff --git a/render-test/tests/filesize/fail-size-is-over/metrics.json b/render-test/tests/filesize/fail-size-is-over/metrics.json deleted file mode 100644 index 07cd3b42c0..0000000000 --- a/render-test/tests/filesize/fail-size-is-over/metrics.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "fileSize": [ - [ - "image", - "expected.png", - 999 - ], - [ - "style", - "style.json", - 999 - ] - ] -} diff --git a/render-test/tests/filesize/fail-size-is-over/style.json b/render-test/tests/filesize/fail-size-is-over/style.json deleted file mode 100644 index a3267fcf5e..0000000000 --- a/render-test/tests/filesize/fail-size-is-over/style.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "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 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/filesize/fail-size-is-under/expected.png b/render-test/tests/filesize/fail-size-is-under/expected.png deleted file mode 100644 index 83d01c4e5d..0000000000 Binary files a/render-test/tests/filesize/fail-size-is-under/expected.png and /dev/null differ diff --git a/render-test/tests/filesize/fail-size-is-under/metrics.json b/render-test/tests/filesize/fail-size-is-under/metrics.json deleted file mode 100644 index f09728b5b3..0000000000 --- a/render-test/tests/filesize/fail-size-is-under/metrics.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "fileSize": [ - [ - "image", - "expected.png", - 100 - ], - [ - "style", - "style.json", - 100 - ] - ] -} diff --git a/render-test/tests/filesize/fail-size-is-under/style.json b/render-test/tests/filesize/fail-size-is-under/style.json deleted file mode 100644 index a3267fcf5e..0000000000 --- a/render-test/tests/filesize/fail-size-is-under/style.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "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 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/filesize/pass-size-is-same/expected.png b/render-test/tests/filesize/pass-size-is-same/expected.png deleted file mode 100644 index 83d01c4e5d..0000000000 Binary files a/render-test/tests/filesize/pass-size-is-same/expected.png and /dev/null differ diff --git a/render-test/tests/filesize/pass-size-is-same/metrics.json b/render-test/tests/filesize/pass-size-is-same/metrics.json deleted file mode 100644 index 82288122b8..0000000000 --- a/render-test/tests/filesize/pass-size-is-same/metrics.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "fileSize": [ - [ - "image", - "expected.png", - 169 - ], - [ - "style", - "style.json", - 510 - ] - ] -} \ 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 deleted file mode 100644 index a3267fcf5e..0000000000 --- a/render-test/tests/filesize/pass-size-is-same/style.json +++ /dev/null @@ -1,32 +0,0 @@ -{ - "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 - ] - } - } - }, - "layers": [ - { - "id": "circle", - "type": "circle", - "source": "geojson" - } - ] -} diff --git a/render-test/tests/should-fail.json b/render-test/tests/should-fail.json index 1c3784d473..30c91836a7 100644 --- a/render-test/tests/should-fail.json +++ b/render-test/tests/should-fail.json @@ -1,6 +1,6 @@ { - "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, doesn't match the expectation.", - "tests/filesize/fail-file-not-found": "Should fail, file not found." + "tests/file-size/fail-size-is-over": "Should fail, size is bigger than expected.", + "tests/file-size/fail-size-is-under": "Should fail, size is smaller than expected.", + "tests/file-size/fail-file-doesnt-match": "Should fail, doesn't match the expectation.", + "tests/file-size/fail-file-not-found": "Should fail, file not found." } -- cgit v1.2.1