summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--render-test/parser.cpp8
-rw-r--r--render-test/tests/file-size/fail-file-doesnt-match/expected.png (renamed from render-test/tests/filesize/fail-file-doesnt-match/expected.png)bin169 -> 169 bytes
-rw-r--r--render-test/tests/file-size/fail-file-doesnt-match/metrics.json (renamed from render-test/tests/filesize/fail-file-doesnt-match/metrics.json)2
-rw-r--r--render-test/tests/file-size/fail-file-doesnt-match/style.json (renamed from render-test/tests/filesize/fail-file-doesnt-match/style.json)0
-rw-r--r--render-test/tests/file-size/fail-file-not-found/expected.png (renamed from render-test/tests/filesize/fail-file-not-found/expected.png)bin169 -> 169 bytes
-rw-r--r--render-test/tests/file-size/fail-file-not-found/style.json (renamed from render-test/tests/filesize/fail-file-not-found/style.json)0
-rw-r--r--render-test/tests/file-size/fail-size-is-over/expected.png (renamed from render-test/tests/filesize/fail-size-is-over/expected.png)bin169 -> 169 bytes
-rw-r--r--render-test/tests/file-size/fail-size-is-over/metrics.json (renamed from render-test/tests/filesize/fail-size-is-over/metrics.json)2
-rw-r--r--render-test/tests/file-size/fail-size-is-over/style.json (renamed from render-test/tests/filesize/fail-size-is-over/style.json)0
-rw-r--r--render-test/tests/file-size/fail-size-is-under/expected.png (renamed from render-test/tests/filesize/fail-size-is-under/expected.png)bin169 -> 169 bytes
-rw-r--r--render-test/tests/file-size/fail-size-is-under/metrics.json (renamed from render-test/tests/filesize/fail-size-is-under/metrics.json)2
-rw-r--r--render-test/tests/file-size/fail-size-is-under/style.json (renamed from render-test/tests/filesize/fail-size-is-under/style.json)0
-rw-r--r--render-test/tests/file-size/pass-size-is-same/expected.png (renamed from render-test/tests/filesize/pass-size-is-same/expected.png)bin169 -> 169 bytes
-rw-r--r--render-test/tests/file-size/pass-size-is-same/metrics.json (renamed from render-test/tests/filesize/pass-size-is-same/metrics.json)2
-rw-r--r--render-test/tests/file-size/pass-size-is-same/style.json (renamed from render-test/tests/filesize/pass-size-is-same/style.json)0
-rw-r--r--render-test/tests/should-fail.json8
16 files changed, 12 insertions, 12 deletions
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<mbgl::JSDocument>();
- 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
index 83d01c4e5d..83d01c4e5d 100644
--- a/render-test/tests/filesize/fail-file-doesnt-match/expected.png
+++ b/render-test/tests/file-size/fail-file-doesnt-match/expected.png
Binary files differ
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
index e02fefc652..c0002163d6 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
index a3267fcf5e..a3267fcf5e 100644
--- a/render-test/tests/filesize/fail-file-doesnt-match/style.json
+++ b/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
index 83d01c4e5d..83d01c4e5d 100644
--- a/render-test/tests/filesize/fail-file-not-found/expected.png
+++ b/render-test/tests/file-size/fail-file-not-found/expected.png
Binary files differ
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
index 17dbd1e3d7..17dbd1e3d7 100644
--- a/render-test/tests/filesize/fail-file-not-found/style.json
+++ b/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
index 83d01c4e5d..83d01c4e5d 100644
--- a/render-test/tests/filesize/fail-size-is-over/expected.png
+++ b/render-test/tests/file-size/fail-size-is-over/expected.png
Binary files differ
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
index 07cd3b42c0..bc194081cf 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
index a3267fcf5e..a3267fcf5e 100644
--- a/render-test/tests/filesize/fail-size-is-over/style.json
+++ b/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
index 83d01c4e5d..83d01c4e5d 100644
--- a/render-test/tests/filesize/fail-size-is-under/expected.png
+++ b/render-test/tests/file-size/fail-size-is-under/expected.png
Binary files differ
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
index f09728b5b3..d288c2ceee 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
index a3267fcf5e..a3267fcf5e 100644
--- a/render-test/tests/filesize/fail-size-is-under/style.json
+++ b/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
index 83d01c4e5d..83d01c4e5d 100644
--- a/render-test/tests/filesize/pass-size-is-same/expected.png
+++ b/render-test/tests/file-size/pass-size-is-same/expected.png
Binary files differ
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
index 82288122b8..b98328f72e 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
index a3267fcf5e..a3267fcf5e 100644
--- a/render-test/tests/filesize/pass-size-is-same/style.json
+++ b/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 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."
}