diff --git a/render-test/parser.cpp b/render-test/parser.cpp index aef2f40c1..cbbc43293 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/filesize/fail-file-doesnt-match/expected.png b/render-test/tests/file-size/fail-file-doesnt-match/expected.png similarity index 100% rename from render-test/tests/filesize/fail-file-doesnt-match/expected.png rename to render-test/tests/file-size/fail-file-doesnt-match/expected.png diff --git a/render-test/tests/filesize/fail-file-doesnt-match/metrics.json b/render-test/tests/file-size/fail-file-doesnt-match/metrics.json similarity index 90% rename from render-test/tests/filesize/fail-file-doesnt-match/metrics.json rename to render-test/tests/file-size/fail-file-doesnt-match/metrics.json index e02fefc65..c0002163d 100644 --- a/render-test/tests/filesize/fail-file-doesnt-match/metrics.json +++ b/render-test/tests/file-size/fail-file-doesnt-match/metrics.json @@ -1,5 +1,5 @@ { - "fileSize": [ + "file-size": [ [ "image", "expected.aaa", diff --git a/render-test/tests/filesize/fail-file-doesnt-match/style.json b/render-test/tests/file-size/fail-file-doesnt-match/style.json similarity index 100% rename from render-test/tests/filesize/fail-file-doesnt-match/style.json rename to render-test/tests/file-size/fail-file-doesnt-match/style.json diff --git a/render-test/tests/filesize/fail-file-not-found/expected.png b/render-test/tests/file-size/fail-file-not-found/expected.png similarity index 100% rename from render-test/tests/filesize/fail-file-not-found/expected.png rename to render-test/tests/file-size/fail-file-not-found/expected.png diff --git a/render-test/tests/filesize/fail-file-not-found/style.json b/render-test/tests/file-size/fail-file-not-found/style.json similarity index 100% rename from render-test/tests/filesize/fail-file-not-found/style.json rename to render-test/tests/file-size/fail-file-not-found/style.json diff --git a/render-test/tests/filesize/fail-size-is-over/expected.png b/render-test/tests/file-size/fail-size-is-over/expected.png similarity index 100% rename from render-test/tests/filesize/fail-size-is-over/expected.png rename to render-test/tests/file-size/fail-size-is-over/expected.png diff --git a/render-test/tests/filesize/fail-size-is-over/metrics.json b/render-test/tests/file-size/fail-size-is-over/metrics.json similarity index 90% rename from render-test/tests/filesize/fail-size-is-over/metrics.json rename to render-test/tests/file-size/fail-size-is-over/metrics.json index 07cd3b42c..bc194081c 100644 --- a/render-test/tests/filesize/fail-size-is-over/metrics.json +++ b/render-test/tests/file-size/fail-size-is-over/metrics.json @@ -1,5 +1,5 @@ { - "fileSize": [ + "file-size": [ [ "image", "expected.png", diff --git a/render-test/tests/filesize/fail-size-is-over/style.json b/render-test/tests/file-size/fail-size-is-over/style.json similarity index 100% rename from render-test/tests/filesize/fail-size-is-over/style.json rename to render-test/tests/file-size/fail-size-is-over/style.json diff --git a/render-test/tests/filesize/fail-size-is-under/expected.png b/render-test/tests/file-size/fail-size-is-under/expected.png similarity index 100% rename from render-test/tests/filesize/fail-size-is-under/expected.png rename to render-test/tests/file-size/fail-size-is-under/expected.png diff --git a/render-test/tests/filesize/fail-size-is-under/metrics.json b/render-test/tests/file-size/fail-size-is-under/metrics.json similarity index 90% rename from render-test/tests/filesize/fail-size-is-under/metrics.json rename to render-test/tests/file-size/fail-size-is-under/metrics.json index f09728b5b..d288c2cee 100644 --- a/render-test/tests/filesize/fail-size-is-under/metrics.json +++ b/render-test/tests/file-size/fail-size-is-under/metrics.json @@ -1,5 +1,5 @@ { - "fileSize": [ + "file-size": [ [ "image", "expected.png", diff --git a/render-test/tests/filesize/fail-size-is-under/style.json b/render-test/tests/file-size/fail-size-is-under/style.json similarity index 100% rename from render-test/tests/filesize/fail-size-is-under/style.json rename to render-test/tests/file-size/fail-size-is-under/style.json diff --git a/render-test/tests/filesize/pass-size-is-same/expected.png b/render-test/tests/file-size/pass-size-is-same/expected.png similarity index 100% rename from render-test/tests/filesize/pass-size-is-same/expected.png rename to render-test/tests/file-size/pass-size-is-same/expected.png diff --git a/render-test/tests/filesize/pass-size-is-same/metrics.json b/render-test/tests/file-size/pass-size-is-same/metrics.json similarity index 90% rename from render-test/tests/filesize/pass-size-is-same/metrics.json rename to render-test/tests/file-size/pass-size-is-same/metrics.json index 82288122b..b98328f72 100644 --- a/render-test/tests/filesize/pass-size-is-same/metrics.json +++ b/render-test/tests/file-size/pass-size-is-same/metrics.json @@ -1,5 +1,5 @@ { - "fileSize": [ + "file-size": [ [ "image", "expected.png", diff --git a/render-test/tests/filesize/pass-size-is-same/style.json b/render-test/tests/file-size/pass-size-is-same/style.json similarity index 100% rename from render-test/tests/filesize/pass-size-is-same/style.json rename to render-test/tests/file-size/pass-size-is-same/style.json diff --git a/render-test/tests/should-fail.json b/render-test/tests/should-fail.json index 1c3784d47..30c91836a 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." }