Open-Harbor/osrm-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 3 Wiki Activity

Remove old io::FileWrite serialization code

Browse Source
This commit is contained in:
Patrick Niklaus
2018-03-22 17:34:26 +00:00
parent f1a392c4df
commit a542da3678
9 changed files with 20 additions and 425 deletions
Download Patch File Download Diff File Expand all files Collapse all files
unit_tests/storage/serialization.cpp
-20
View File
@@ -32,26 +32,6 @@ BOOST_AUTO_TEST_CASE(unpack_test)
BOOST_CHECK_EQUAL_COLLECTIONS(v.begin(), v.end(), expected.begin(), expected.end());
}
BOOST_AUTO_TEST_CASE(bin_serialize_bool_vector)
{
TemporaryFile tmp;
{
std::vector<std::vector<bool>> data = {
{}, {0}, {1, 1, 1}, {1, 1, 0, 0, 1, 1, 0, 0}, {1, 1, 0, 0, 1, 1, 0, 0, 1}};
for (const auto &v : data)
{
{
io::FileWriter writer(tmp.path, io::FileWriter::GenerateFingerprint);
storage::serialization::write(writer, v);
}
std::vector<bool> result;
io::FileReader reader(tmp.path, io::FileReader::VerifyFingerprint);
storage::serialization::read(reader, result);
BOOST_CHECK_EQUAL_COLLECTIONS(v.begin(), v.end(), result.begin(), result.end());
}
}
}
BOOST_AUTO_TEST_CASE(tar_serialize_bool_vector)
{
TemporaryFile tmp;
unit_tests/util/io.cpp
+12 -6
View File
@@ -32,12 +32,14 @@ BOOST_AUTO_TEST_CASE(io_data)
{
osrm::storage::io::FileWriter outfile(IO_TMP_FILE,
osrm::storage::io::FileWriter::GenerateFingerprint);
osrm::storage::serialization::write(outfile, data_in);
outfile.WriteElementCount64(data_in.size());
outfile.WriteFrom(data_in.data(), data_in.size());
}
osrm::storage::io::FileReader infile(IO_TMP_FILE,
osrm::storage::io::FileReader::VerifyFingerprint);
osrm::storage::serialization::read(infile, data_out);
data_out.resize(infile.ReadElementCount64());
infile.ReadInto(data_out.data(), data_out.size());
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());
@@ -88,7 +90,8 @@ BOOST_AUTO_TEST_CASE(file_too_small)
{
osrm::storage::io::FileWriter outfile(
IO_TOO_SMALL_FILE, osrm::storage::io::FileWriter::GenerateFingerprint);
osrm::storage::serialization::write(outfile, v);
outfile.WriteElementCount64(v.size());
outfile.WriteFrom(v.data(), v.size());
}
std::fstream f(IO_TOO_SMALL_FILE);
@@ -102,7 +105,8 @@ BOOST_AUTO_TEST_CASE(file_too_small)
osrm::storage::io::FileReader infile(IO_TOO_SMALL_FILE,
osrm::storage::io::FileReader::VerifyFingerprint);
std::vector<int> buffer;
osrm::storage::serialization::read(infile, buffer);
buffer.resize(infile.ReadElementCount64());
infile.ReadInto(buffer.data(), buffer.size());
BOOST_REQUIRE_MESSAGE(false, "Should not get here");
}
catch (const osrm::util::RuntimeError &e)
@@ -124,7 +128,8 @@ BOOST_AUTO_TEST_CASE(io_corrupt_fingerprint)
osrm::storage::io::FileWriter::HasNoFingerprint);
outfile.WriteFrom(0xDEADBEEFCAFEFACE);
osrm::storage::serialization::write(outfile, v);
outfile.WriteElementCount64(v.size());
outfile.WriteFrom(v.data(), v.size());
}
try
@@ -155,7 +160,8 @@ BOOST_AUTO_TEST_CASE(io_incompatible_fingerprint)
const auto fingerprint = osrm::util::FingerPrint::GetValid();
outfile.WriteFrom(fingerprint);
osrm::storage::serialization::write(outfile, v);
outfile.WriteElementCount64(v.size());
outfile.WriteFrom(v.data(), v.size());
}
std::fstream f(IO_INCOMPATIBLE_FINGERPRINT_FILE);