Consolidate vector deserialization.

This commit is contained in:
Daniel Patterson
2016-11-15 00:08:45 -08:00
parent 1fc969e6c8
commit 7b1131b982
4 changed files with 23 additions and 90 deletions
+4 -16
View File
@@ -1,4 +1,5 @@
#include "util/io.hpp"
#include "storage/io.hpp"
#include "util/typedefs.hpp"
#include <boost/test/test_case_template.hpp>
@@ -10,21 +11,6 @@ const static std::string IO_TMP_FILE = "test_io.tmp";
BOOST_AUTO_TEST_SUITE(osrm_io)
BOOST_AUTO_TEST_CASE(io_flags)
{
std::vector<bool> flags_in, flags_out;
flags_in.resize(53);
for (std::size_t i = 0; i < flags_in.size(); ++i)
flags_in[i] = ((i % 2) == 1);
osrm::util::serializeFlags(IO_TMP_FILE, flags_in);
osrm::util::deserializeFlags(IO_TMP_FILE, flags_out);
BOOST_REQUIRE_EQUAL(flags_in.size(), flags_out.size());
BOOST_CHECK_EQUAL_COLLECTIONS(
flags_out.begin(), flags_out.end(), flags_in.begin(), flags_in.end());
}
BOOST_AUTO_TEST_CASE(io_data)
{
std::vector<int> data_in, data_out;
@@ -33,7 +19,9 @@ BOOST_AUTO_TEST_CASE(io_data)
data_in[i] = i;
osrm::util::serializeVector(IO_TMP_FILE, data_in);
osrm::util::deserializeVector(IO_TMP_FILE, data_out);
osrm::storage::io::FileReader f(IO_TMP_FILE);
f.DeserializeVector(data_out);
BOOST_REQUIRE_EQUAL(data_in.size(), data_out.size());
BOOST_CHECK_EQUAL_COLLECTIONS(data_out.begin(), data_out.end(), data_in.begin(), data_in.end());