tei/MapLibreParticleLab
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[render-test] Fix UPDATE_METRICS=1 changing the path of file size tests

Browse Source 
Should use the exact same path as described on style.json
This commit is contained in:
Thiago Marcos P. Santos
2019-10-11 16:31:15 +03:00
parent 0752e26055
commit 7f5c630613
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
render-test/runner.cpp
View File

@@ -579,20 +579,22 @@ bool TestRunner::runOperations(const std::string& key, TestMetadata& metadata) {
assert(operationArray[2].IsString());
std::string mark = std::string(operationArray[1].GetString(), operationArray[1].GetStringLength());
mbgl::filesystem::path path = std::string(operationArray[2].GetString(), operationArray[2].GetStringLength());
std::string path = std::string(operationArray[2].GetString(), operationArray[2].GetStringLength());
assert(!path.empty());
if (!path.is_absolute()) {
path = metadata.paths.defaultExpectations() / path;
mbgl::filesystem::path filePath(path);
if (!filePath.is_absolute()) {
filePath = metadata.paths.defaultExpectations() / filePath;
}
if (mbgl::filesystem::exists(path)) {
auto size = mbgl::filesystem::file_size(path);
if (mbgl::filesystem::exists(filePath)) {
auto size = mbgl::filesystem::file_size(filePath);
metadata.metrics.fileSize.emplace(std::piecewise_construct,
std::forward_as_tuple(std::move(mark)),
std::forward_as_tuple(std::move(path), size));
} else {
metadata.errorMessage = std::string("File not found: ") + path.string();
metadata.errorMessage = std::string("File not found: ") + path;
return false;
}
} else if (operationArray[0].GetString() == memoryProbeStartOp) {

2
render-test/tests/filesize/fail-size-is-over/metrics.json
View File

@@ -1 +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]]}
{"fileSize":[["image","expected.png",999],["style","style.json",999]]}

2
render-test/tests/filesize/fail-size-is-under/metrics.json
View File

@@ -1 +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]]}
{"fileSize":[["image","expected.png",100],["style","style.json",100]]}

2
render-test/tests/filesize/pass-size-is-same/metrics.json
View File

@@ -1 +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]]}
{"fileSize":[["image","expected.png",686],["style","style.json",609]]}