diff options
author | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-09-08 09:56:14 +0300 |
---|---|---|
committer | Bruno de Oliveira Abinader <bruno@mapbox.com> | 2019-09-11 14:56:29 +0300 |
commit | fdfb6b14df0ddfa8dcbd2e54d7864428c37e0833 (patch) | |
tree | c81f67d0a1168aa4a90d57f4759d16b4b382503b | |
parent | 06ca1fd4e5188e184a442de3281b24115460b4cf (diff) | |
download | qtlocation-mapboxgl-fdfb6b14df0ddfa8dcbd2e54d7864428c37e0833.tar.gz |
render-test
-rw-r--r-- | cmake/render-test.cmake | 1 | ||||
-rw-r--r-- | render-test/main.cpp | 4 | ||||
-rw-r--r-- | render-test/parser.cpp | 6 | ||||
-rw-r--r-- | render-test/runner.cpp | 16 |
4 files changed, 14 insertions, 13 deletions
diff --git a/cmake/render-test.cmake b/cmake/render-test.cmake index 9bc37df808..6b05c6d3ef 100644 --- a/cmake/render-test.cmake +++ b/cmake/render-test.cmake @@ -20,6 +20,7 @@ target_include_directories(mbgl-render-test target_link_libraries(mbgl-render-test PRIVATE mbgl-core mbgl-filesource + Mapbox::Base::io Mapbox::Base::Extras::args expected Mapbox::Base::Extras::filesystem diff --git a/render-test/main.cpp b/render-test/main.cpp index 3ab48fe5b2..311e80c5c4 100644 --- a/render-test/main.cpp +++ b/render-test/main.cpp @@ -1,7 +1,7 @@ #include "allocation_index.hpp" #include <mbgl/util/run_loop.hpp> -#include <mbgl/util/io.hpp> +#include <mapbox/io.hpp> #include "metadata.hpp" #include "parser.hpp" @@ -132,7 +132,7 @@ int main(int argc, char** argv) { } std::string resultsHTML = createResultPage(stats, metadatas, shuffle, seed); - mbgl::util::write_file(testRootPath + "/index.html", resultsHTML); + mapbox::base::io::writeFile(testRootPath + "/index.html", resultsHTML); const uint32_t count = stats.erroredTests + stats.failedTests + stats.ignoreFailedTests + stats.ignorePassedTests + diff --git a/render-test/parser.cpp b/render-test/parser.cpp index 9b462dee72..ebe3b549a9 100644 --- a/render-test/parser.cpp +++ b/render-test/parser.cpp @@ -1,5 +1,5 @@ #include <mbgl/util/logging.hpp> -#include <mbgl/util/io.hpp> +#include <mapbox/io.hpp> #include <mbgl/util/rapidjson.hpp> #include <mbgl/util/string.hpp> @@ -182,9 +182,9 @@ TestPaths makeTestPaths(mbgl::filesystem::path stylePath) { } // namespace JSONReply readJson(const mbgl::filesystem::path& jsonPath) { - auto maybeJSON = mbgl::util::readFile(jsonPath); + auto maybeJSON = mapbox::base::io::readFile(jsonPath); if (!maybeJSON) { - return { std::string("Unable to open file ") + jsonPath.string() }; + return { maybeJSON.error() }; } mbgl::JSDocument document; diff --git a/render-test/runner.cpp b/render-test/runner.cpp index 54660979cf..e31bb625e5 100644 --- a/render-test/runner.cpp +++ b/render-test/runner.cpp @@ -10,7 +10,7 @@ #include <mbgl/style/style.hpp> #include <mbgl/style/rapidjson_conversion.hpp> #include <mbgl/util/chrono.hpp> -#include <mbgl/util/io.hpp> +#include <mapbox/io.hpp> #include <mbgl/util/image.hpp> #include <mbgl/util/run_loop.hpp> #include <mbgl/util/string.hpp> @@ -59,20 +59,20 @@ bool TestRunner::checkResults(mbgl::PremultipliedImage&& actualImage, TestMetada #if !TEST_READ_ONLY if (getenv("UPDATE_PLATFORM")) { mbgl::filesystem::create_directories(expectations.back()); - mbgl::util::write_file(expectations.back().string() + "/expected.png", mbgl::encodePNG(actualImage)); + mapbox::base::io::writeFile(expectations.back().string() + "/expected.png", mbgl::encodePNG(actualImage)); return true; } else if (getenv("UPDATE_DEFAULT")) { - mbgl::util::write_file(base + "/expected.png", mbgl::encodePNG(actualImage)); + mapbox::base::io::writeFile(base + "/expected.png", mbgl::encodePNG(actualImage)); return true; } else if (getenv("UPDATE_METRICS")) { if (!metadata.metrics.isEmpty()) { mbgl::filesystem::create_directories(expectations.back()); - mbgl::util::write_file(expectations.back().string() + "/metrics.json", serializeMetrics(metadata.metrics)); + mapbox::base::io::writeFile(expectations.back().string() + "/metrics.json", serializeMetrics(metadata.metrics)); return true; } } - mbgl::util::write_file(base + "/actual.png", metadata.actual); + mapbox::base::io::writeFile(base + "/actual.png", metadata.actual); #endif mbgl::PremultipliedImage expectedImage { actualImage.size }; @@ -99,7 +99,7 @@ bool TestRunner::checkResults(mbgl::PremultipliedImage&& actualImage, TestMetada } for (const auto& entry: expectedImagesPaths) { - mbgl::optional<std::string> maybeExpectedImage = mbgl::util::readFile(entry); + auto maybeExpectedImage = mapbox::base::io::readFile(entry); if (!maybeExpectedImage) { metadata.errorMessage = "Failed to load expected image " + entry; return false; @@ -116,7 +116,7 @@ bool TestRunner::checkResults(mbgl::PremultipliedImage&& actualImage, TestMetada metadata.diff = mbgl::encodePNG(imageDiff); #if !TEST_READ_ONLY - mbgl::util::write_file(base + "/diff.png", metadata.diff); + mapbox::base::io::writeFile(base + "/diff.png", metadata.diff); #endif metadata.difference = pixels / expectedImage.size.area(); @@ -249,7 +249,7 @@ bool TestRunner::runOperations(const std::string& key, TestMetadata& metadata) { const mbgl::filesystem::path filePath(std::string(TEST_RUNNER_ROOT_PATH) + "/mapbox-gl-js/test/integration/" + imagePath); - mbgl::optional<std::string> maybeImage = mbgl::util::readFile(filePath.string()); + auto maybeImage = mapbox::base::io::readFile(filePath); if (!maybeImage) { metadata.errorMessage = std::string("Failed to load expected image ") + filePath.string(); return false; |