sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

visual tests: use boost::filesystem::path for paths

Browse source
This commit is contained in:
Jiri Drbalek 2015-05-19 17:10:55 +00:00
parent c37720066d
commit 3db7b0ca9b
2 changed files with 26 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
test/visual/runner.cpp
View file

@ -52,9 +52,9 @@ private:
double scale_factor_;
};
runner::runner(boost::filesystem::path const & styles_dir,
boost::filesystem::path const & output_dir,
boost::filesystem::path const & reference_dir,
runner::runner(runner::path_type const & styles_dir,
runner::path_type const & output_dir,
runner::path_type const & reference_dir,
bool overwrite,
std::size_t jobs)
: styles_dir_(styles_dir),
@ -69,22 +69,24 @@ runner::runner(boost::filesystem::path const & styles_dir,
result_list runner::test_all(report_type & report) const
{
std::vector<std::string> files = mapnik::util::list_directory(styles_dir_.string());
boost::filesystem::directory_iterator begin(styles_dir_);
boost::filesystem::directory_iterator end;
std::vector<runner::path_type> files(begin, end);
return test_parallel(files, report, jobs_);
}
result_list runner::test(std::vector<std::string> const & style_names, report_type & report) const
{
std::vector<std::string> files(style_names.size());
std::vector<runner::path_type> files(style_names.size());
std::transform(style_names.begin(), style_names.end(), std::back_inserter(files),
[&](std::string const & name)
{
return (styles_dir_ / (name + ".xml")).string();
return styles_dir_ / (name + ".xml");
});
return test_parallel(files, report, jobs_);
}
result_list runner::test_parallel(std::vector<std::string> const & files, report_type & report, std::size_t jobs) const
result_list runner::test_parallel(std::vector<runner::path_type> const & files, report_type & report, std::size_t jobs) const
{
result_list results;
@ -137,10 +139,10 @@ result_list runner::test_range(files_iterator begin, files_iterator end, std::re
config defaults;
result_list results;
for (std::vector<std::string>::const_iterator i = begin; i != end; i++)
for (runner::files_iterator i = begin; i != end; i++)
{
std::string const & file = *i;
if (file.size() >= 3 && file.substr(file.size() - 3) == "xml")
runner::path_type const & file = *i;
if (file.extension() == ".xml")
{
try
{
@ -151,7 +153,7 @@ result_list runner::test_range(files_iterator begin, files_iterator end, std::re
{
result r;
r.state = STATE_ERROR;
r.name = file;
r.name = file.string();
r.error_message = ex.what();
results.emplace_back(r);
mapnik::util::apply_visitor(report_visitor(r), report.get());
@ -162,14 +164,14 @@ result_list runner::test_range(files_iterator begin, files_iterator end, std::re
return results;
}
result_list runner::test_one(std::string const& style_path, config cfg, report_type & report) const
result_list runner::test_one(runner::path_type const& style_path, config cfg, report_type & report) const
{
mapnik::Map m(cfg.sizes.front().width, cfg.sizes.front().height);
result_list results;
try
{
mapnik::load_map(m, style_path, true);
mapnik::load_map(m, style_path.string(), true);
}
catch (std::exception const& ex)
{
@ -199,8 +201,7 @@ result_list runner::test_one(std::string const& style_path, config cfg, report_t
parse_map_sizes(*sizes, cfg.sizes);
}
boost::filesystem::path p(style_path);
std::string name(p.stem().string());
std::string name(style_path.stem().string());
for (map_size const & size : cfg.sizes)
{

20
test/visual/runner.hpp
View file

@ -38,11 +38,13 @@ class runner
using renderer_type = mapnik::util::variant<renderer<agg_renderer>,
renderer<cairo_renderer>/*,
renderer<grid_renderer>*/>;
using path_type = boost::filesystem::path;
using files_iterator = std::vector<path_type>::const_iterator;
public:
runner(boost::filesystem::path const & styles_dir,
boost::filesystem::path const & output_dir,
boost::filesystem::path const & reference_dir,
runner(path_type const & styles_dir,
path_type const & output_dir,
path_type const & reference_dir,
bool overwrite,
std::size_t jobs);
@ -50,17 +52,15 @@ public:
result_list test(std::vector<std::string> const & style_names, report_type & report) const;
private:
using files_iterator = std::vector<std::string>::const_iterator;
result_list test_parallel(std::vector<std::string> const & files, report_type & report, std::size_t jobs) const;
result_list test_parallel(std::vector<path_type> const & files, report_type & report, std::size_t jobs) const;
result_list test_range(files_iterator begin, files_iterator end, std::reference_wrapper<report_type> report) const;
result_list test_one(std::string const & style_path, config cfg, report_type & report) const;
result_list test_one(path_type const & style_path, config cfg, report_type & report) const;
void parse_map_sizes(std::string const & str, std::vector<map_size> & sizes) const;
const map_sizes_grammar<std::string::const_iterator> map_sizes_parser_;
const boost::filesystem::path styles_dir_;
const boost::filesystem::path output_dir_;
const boost::filesystem::path reference_dir_;
const path_type styles_dir_;
const path_type output_dir_;
const path_type reference_dir_;
const std::size_t jobs_;
const renderer_type renderers_[boost::mpl::size<renderer_type::types>::value];
};