Format all C++ and Java code via clang-format

Signed-off-by: Konstantin Pastbin <konstantin.pastbin@gmail.com>
This commit is contained in:
Konstantin Pastbin
2025-08-17 14:32:37 +07:00
parent 9f0290c0ec
commit bfffa1fff4
2169 changed files with 56441 additions and 64188 deletions

View File

@@ -14,11 +14,12 @@ namespace gpx_tests
static kml::FileData LoadGpxFromString(std::string_view content)
{
TEST_NO_THROW(
{
kml::FileData dataFromText;
kml::DeserializerGpx(dataFromText).Deserialize(MemReader(content));
return dataFromText;
}, ());
{
kml::FileData dataFromText;
kml::DeserializerGpx(dataFromText).Deserialize(MemReader(content));
return dataFromText;
},
());
}
static kml::FileData LoadGpxFromFile(std::string const & file)
@@ -122,12 +123,14 @@ UNIT_TEST(Gpx_Test_Track_Without_Timestamps)
{
auto const & line = lines[0];
TEST_EQUAL(line.size(), 3, ());
TEST_EQUAL(line.back(), geometry::PointWithAltitude(mercator::FromLatLon(54.05293900056246, 25.72998046875), 0), ());
TEST_EQUAL(line.back(), geometry::PointWithAltitude(mercator::FromLatLon(54.05293900056246, 25.72998046875), 0),
());
}
{
auto const & line = lines[1];
TEST_EQUAL(line.size(), 2, ());
TEST_EQUAL(line.back(), geometry::PointWithAltitude(mercator::FromLatLon(54.32933804825253, 25.136718750000004), 0), ());
TEST_EQUAL(line.back(), geometry::PointWithAltitude(mercator::FromLatLon(54.32933804825253, 25.136718750000004), 0),
());
}
// Also test default colors for tracks.
{
@@ -284,8 +287,10 @@ UNIT_TEST(Route)
auto line = dataFromFile.m_tracksData[0].m_geometry.m_lines[0];
TEST_EQUAL(line.size(), 2, ());
TEST_EQUAL(dataFromFile.m_categoryData.m_name[kml::kDefaultLang], "Some random route", ());
TEST_EQUAL(line[0], geometry::PointWithAltitude(mercator::FromLatLon(48.20984622935899, 16.376023292541507), 184), ());
TEST_EQUAL(line[1], geometry::PointWithAltitude(mercator::FromLatLon(48.209503040543545, 16.381065845489506), 187), ());
TEST_EQUAL(line[0], geometry::PointWithAltitude(mercator::FromLatLon(48.20984622935899, 16.376023292541507), 184),
());
TEST_EQUAL(line[1], geometry::PointWithAltitude(mercator::FromLatLon(48.209503040543545, 16.381065845489506), 187),
());
}
UNIT_TEST(Color)
@@ -396,5 +401,4 @@ UNIT_TEST(MapGarminColor)
TEST_EQUAL("DarkYellow", kml::gpx::MapGarminColor(0xb5b721ff), ());
}
} // namespace gpx_tests

View File

@@ -36,10 +36,8 @@ UNIT_TEST(Kml_MinzoomQuadtree_PopulationGrowthRate)
size_t const kMaxDepth = 5;
double const step = 1.0 / (1 << kMaxDepth);
for (int x = 0; x < (1 << kMaxDepth); ++x)
{
for (int y = 0; y < (1 << kMaxDepth); ++y)
minZoomQuadtree.Add(MakeGlobalPoint((0.5 + x) * step, (0.5 + y) * step), 0.0 /* rank */);
}
double const kCountPerTile = 1.0;
std::map<int /* zoom */, size_t> populationCount;
auto const incZoomPopulation = [&](double & rank, int zoom)
@@ -59,16 +57,13 @@ UNIT_TEST(Kml_MinzoomQuadtree_PopulationGrowthRate)
TEST_EQUAL(partialSums.front(), 1, ());
TEST_EQUAL(partialSums.back(), (1 << (kMaxDepth * 2)), ());
auto const isGrowthExponential = [](size_t lhs, size_t rhs) { return rhs != 4 * lhs; };
TEST(std::adjacent_find(partialSums.cbegin(), partialSums.cend(), isGrowthExponential) ==
partialSums.cend(), (partialSums));
TEST(std::adjacent_find(partialSums.cbegin(), partialSums.cend(), isGrowthExponential) == partialSums.cend(),
(partialSums));
}
std::mt19937 g(0);
auto const gen = [&g]
{
return std::generate_canonical<double, std::numeric_limits<uint32_t>::digits>(g);
};
auto const gen = [&g] { return std::generate_canonical<double, std::numeric_limits<uint32_t>::digits>(g); };
for (int i = 0; i < 5; ++i)
{
@@ -100,7 +95,8 @@ UNIT_TEST(Kml_MinzoomQuadtree_PopulationGrowthRate)
for (size_t i = 0; i < partialSums.size(); ++i)
{
auto const maxAbsErr = 4.0 * std::ceil(std::sqrt(kCountPerTile * areaScale)) + 4.0;
TEST_LESS_OR_EQUAL(partialSums[i], kCountPerTile * areaScale + maxAbsErr, (kCountPerTile, maxAbsErr, partialSums));
TEST_LESS_OR_EQUAL(partialSums[i], kCountPerTile * areaScale + maxAbsErr,
(kCountPerTile, maxAbsErr, partialSums));
areaScale *= 4.0;
}
}
@@ -123,10 +119,7 @@ UNIT_TEST(Kml_MinzoomQuadtree_CornerCases)
{
kml::MinZoomQuadtree<double /* rank */, std::less<double>> minZoomQuadtree{{} /* less */};
double const kCountPerTile = 100.0;
auto const unreachable = [&](double & /* rank */, int /* zoom */)
{
TEST(false, ());
};
auto const unreachable = [&](double & /* rank */, int /* zoom */) { TEST(false, ()); };
minZoomQuadtree.SetMinZoom(kCountPerTile, scales::GetUpperStyleScale(), unreachable);
}
}
@@ -137,10 +130,8 @@ UNIT_TEST(Kml_MinzoomQuadtree_MaxZoom)
size_t const kMaxDepth = 5;
double const step = 1.0 / (1 << kMaxDepth);
for (int x = 0; x < (1 << kMaxDepth); ++x)
{
for (int y = 0; y < (1 << kMaxDepth); ++y)
minZoomQuadtree.Add(MakeGlobalPoint((0.5 + x) * step, (0.5 + y) * step), 0.0 /* rank */);
}
double const kCountPerTile = 1.0;
std::map<int /* zoom */, size_t> populationCount;
auto const incZoomPopulation = [&](double & rank, int zoom)
@@ -162,6 +153,7 @@ UNIT_TEST(Kml_MinzoomQuadtree_MaxZoom)
TEST_EQUAL(partialSums.back(), (1 << (kMaxDepth * 2)), ());
auto const isGrowthExponential = [](size_t lhs, size_t rhs) { return rhs != 4 * lhs; };
TEST(std::adjacent_find(partialSums.cbegin(), std::prev(partialSums.cend()), isGrowthExponential) ==
std::prev(partialSums.cend()), (partialSums));
std::prev(partialSums.cend()),
(partialSums));
TEST_LESS_OR_EQUAL(4 * *std::prev(partialSums.cend(), 2), partialSums.back(), ());
}

View File

@@ -87,9 +87,7 @@ kml::FileData GenerateKmlFileData()
bookmarkData.m_visible = false;
bookmarkData.m_nearestToponym = "12345";
bookmarkData.m_minZoom = 10;
bookmarkData.m_properties = {{"bm_property1", "value1"},
{"bm_property2", "value2"},
{"score", "5"}};
bookmarkData.m_properties = {{"bm_property1", "value1"}, {"bm_property2", "value2"}, {"score", "5"}};
bookmarkData.m_compilations = {1, 2, 3, 4, 5};
result.m_bookmarksData.emplace_back(std::move(bookmarkData));
@@ -103,9 +101,7 @@ kml::FileData GenerateKmlFileData()
{7.0, {kml::PredefinedColor::None, 0x00ff00ff}}};
trackData.m_timestamp = kml::TimestampClock::from_time_t(900);
trackData.m_geometry.AddLine({
{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}
});
trackData.m_geometry.AddLine({{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}});
trackData.m_visible = false;
trackData.m_nearestToponyms = {"12345", "54321", "98765"};
@@ -166,9 +162,7 @@ kml::FileData GenerateKmlFileDataForTrackWithoutTimestamps()
auto data = GenerateKmlFileData();
auto & trackData = data.m_tracksData[0];
trackData.m_geometry.Clear();
trackData.m_geometry.AddLine({
{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}
});
trackData.m_geometry.AddLine({{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}});
trackData.m_geometry.AddTimestamps({});
return data;
}
@@ -180,21 +174,15 @@ kml::FileData GenerateKmlFileDataForTrackWithTimestamps()
trackData.m_geometry.Clear();
// track 1 (without timestamps)
trackData.m_geometry.AddLine({
{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}
});
trackData.m_geometry.AddLine({{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}});
trackData.m_geometry.AddTimestamps({});
// track 2
trackData.m_geometry.AddLine({
{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}
});
trackData.m_geometry.AddLine({{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}, {{45.1964, 56.9832}, 3}});
trackData.m_geometry.AddTimestamps({0.0, 1.0, 2.0});
// track 3
trackData.m_geometry.AddLine({
{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}
});
trackData.m_geometry.AddLine({{{45.9242, 56.8679}, 1}, {{45.2244, 56.2786}, 2}});
trackData.m_geometry.AddTimestamps({0.0, 1.0});
return data;
}
@@ -207,28 +195,30 @@ UNIT_TEST(Kml_Deserialization_Text_Bin_Memory)
kml::FileData dataFromText;
TEST_NO_THROW(
{
kml::DeserializerKml des(dataFromText);
MemReader reader(kTextKml, strlen(kTextKml));
des.Deserialize(reader);
}, ());
{
kml::DeserializerKml des(dataFromText);
MemReader reader(kTextKml, strlen(kTextKml));
des.Deserialize(reader);
},
());
// TODO: uncomment to output bytes to the log.
// std::vector<uint8_t> buffer;
// {
// kml::binary::SerializerKml ser(dataFromText);
// MemWriter<decltype(buffer)> sink(buffer);
// ser.Serialize(sink);
// }
// LOG(LINFO, (FormatBytesFromBuffer(buffer)));
// TODO: uncomment to output bytes to the log.
// std::vector<uint8_t> buffer;
// {
// kml::binary::SerializerKml ser(dataFromText);
// MemWriter<decltype(buffer)> sink(buffer);
// ser.Serialize(sink);
// }
// LOG(LINFO, (FormatBytesFromBuffer(buffer)));
kml::FileData dataFromBin;
TEST_NO_THROW(
{
MemReader reader(kBinKml.data(), kBinKml.size());
kml::binary::DeserializerKml des(dataFromBin);
des.Deserialize(reader);
}, ());
{
MemReader reader(kBinKml.data(), kBinKml.size());
kml::binary::DeserializerKml des(dataFromBin);
des.Deserialize(reader);
},
());
TEST_EQUAL(dataFromText, dataFromBin, ());
}
@@ -295,26 +285,29 @@ UNIT_TEST(Kml_Deserialization_Text_File)
std::string const kmlFile = base::JoinPath(GetPlatform().TmpDir(), "tmp.kml");
SCOPE_GUARD(fileGuard, std::bind(&FileWriter::DeleteFileX, kmlFile));
TEST_NO_THROW(
{
FileWriter file(kmlFile);
file.Write(kTextKml, strlen(kTextKml));
}, ());
{
FileWriter file(kmlFile);
file.Write(kTextKml, strlen(kTextKml));
},
());
kml::FileData dataFromFile;
TEST_NO_THROW(
{
kml::DeserializerKml des(dataFromFile);
FileReader reader(kmlFile);
des.Deserialize(reader);
}, ());
{
kml::DeserializerKml des(dataFromFile);
FileReader reader(kmlFile);
des.Deserialize(reader);
},
());
kml::FileData dataFromText;
TEST_NO_THROW(
{
kml::DeserializerKml des(dataFromText);
MemReader reader(kTextKml, strlen(kTextKml));
des.Deserialize(reader);
}, ());
{
kml::DeserializerKml des(dataFromText);
MemReader reader(kTextKml, strlen(kTextKml));
des.Deserialize(reader);
},
());
TEST_EQUAL(dataFromFile, dataFromText, ());
}
@@ -324,26 +317,29 @@ UNIT_TEST(Kml_Deserialization_Bin_File)
std::string const kmbFile = base::JoinPath(GetPlatform().TmpDir(), "tmp.kmb");
SCOPE_GUARD(fileGuard, std::bind(&FileWriter::DeleteFileX, kmbFile));
TEST_NO_THROW(
{
FileWriter file(kmbFile);
file.Write(kBinKml.data(), kBinKml.size());
}, ());
{
FileWriter file(kmbFile);
file.Write(kBinKml.data(), kBinKml.size());
},
());
kml::FileData dataFromFile;
TEST_NO_THROW(
{
kml::binary::DeserializerKml des(dataFromFile);
FileReader reader(kmbFile);
des.Deserialize(reader);
}, ());
{
kml::binary::DeserializerKml des(dataFromFile);
FileReader reader(kmbFile);
des.Deserialize(reader);
},
());
kml::FileData dataFromBin;
TEST_NO_THROW(
{
kml::binary::DeserializerKml des(dataFromBin);
MemReader reader(kBinKml.data(), kBinKml.size());
des.Deserialize(reader);
}, ());
{
kml::binary::DeserializerKml des(dataFromBin);
MemReader reader(kBinKml.data(), kBinKml.size());
des.Deserialize(reader);
},
());
TEST_EQUAL(dataFromFile, dataFromBin, ());
}
@@ -357,19 +353,21 @@ UNIT_TEST(Kml_Serialization_Bin_File)
std::string const kmbFile = base::JoinPath(GetPlatform().TmpDir(), "tmp.kmb");
SCOPE_GUARD(fileGuard, std::bind(&FileWriter::DeleteFileX, kmbFile));
TEST_NO_THROW(
{
kml::binary::SerializerKml ser(data);
FileWriter writer(kmbFile);
ser.Serialize(writer);
}, ());
{
kml::binary::SerializerKml ser(data);
FileWriter writer(kmbFile);
ser.Serialize(writer);
},
());
kml::FileData dataFromFile;
TEST_NO_THROW(
{
kml::binary::DeserializerKml des(dataFromFile);
FileReader reader(kmbFile);
des.Deserialize(reader);
}, ());
{
kml::binary::DeserializerKml des(dataFromFile);
FileReader reader(kmbFile);
des.Deserialize(reader);
},
());
TEST_EQUAL(data, dataFromFile, ());
}
@@ -387,37 +385,40 @@ UNIT_TEST(Kml_Serialization_Text_File_Track_Without_Timestamps)
std::string const kmlFile = base::JoinPath(GetPlatform().TmpDir(), "tmp.kml");
SCOPE_GUARD(fileGuard, std::bind(&FileWriter::DeleteFileX, kmlFile));
TEST_NO_THROW(
{
kml::SerializerKml ser(data);
FileWriter sink(kmlFile);
ser.Serialize(sink);
}, ());
{
kml::SerializerKml ser(data);
FileWriter sink(kmlFile);
ser.Serialize(sink);
},
());
// TODO: uncomment to output KML to the log.
// std::string buffer;
// {
// kml::SerializerKml ser(data);
// MemWriter<decltype(buffer)> sink(buffer);
// ser.Serialize(sink);
// }
// LOG(LINFO, (buffer));
// TODO: uncomment to output KML to the log.
// std::string buffer;
// {
// kml::SerializerKml ser(data);
// MemWriter<decltype(buffer)> sink(buffer);
// ser.Serialize(sink);
// }
// LOG(LINFO, (buffer));
kml::FileData dataFromGeneratedFile;
TEST_NO_THROW(
{
kml::DeserializerKml des(dataFromGeneratedFile);
FileReader reader(kmlFile);
des.Deserialize(reader);
}, ());
{
kml::DeserializerKml des(dataFromGeneratedFile);
FileReader reader(kmlFile);
des.Deserialize(reader);
},
());
TEST_EQUAL(dataFromGeneratedFile, data, ());
kml::FileData dataFromFile;
TEST_NO_THROW(
{
kml::DeserializerKml des(dataFromFile);
FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/generated.kml"));
des.Deserialize(reader);
}, ());
{
kml::DeserializerKml des(dataFromFile);
FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/generated.kml"));
des.Deserialize(reader);
},
());
TEST_EQUAL(dataFromFile, data, ());
std::string dataFromFileBuffer;
@@ -444,28 +445,31 @@ UNIT_TEST(Kml_Serialization_Text_File_Tracks_With_Timestamps)
std::string const kmlFile = base::JoinPath(GetPlatform().TmpDir(), "tmp.kml");
SCOPE_GUARD(fileGuard, std::bind(&FileWriter::DeleteFileX, kmlFile));
TEST_NO_THROW(
{
kml::SerializerKml ser(data);
FileWriter sink(kmlFile);
ser.Serialize(sink);
}, ());
{
kml::SerializerKml ser(data);
FileWriter sink(kmlFile);
ser.Serialize(sink);
},
());
kml::FileData dataFromGeneratedFile;
TEST_NO_THROW(
{
kml::DeserializerKml des(dataFromGeneratedFile);
FileReader reader(kmlFile);
des.Deserialize(reader);
}, ());
{
kml::DeserializerKml des(dataFromGeneratedFile);
FileReader reader(kmlFile);
des.Deserialize(reader);
},
());
TEST_EQUAL(dataFromGeneratedFile, data, ());
kml::FileData dataFromFile;
TEST_NO_THROW(
{
kml::DeserializerKml des(dataFromFile);
FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/generated_mixed_tracks.kml"));
des.Deserialize(reader);
}, ());
{
kml::DeserializerKml des(dataFromFile);
FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/generated_mixed_tracks.kml"));
des.Deserialize(reader);
},
());
TEST_EQUAL(dataFromFile, data, ());
}
@@ -474,19 +478,21 @@ UNIT_TEST(Kml_Deserialization_From_Bin_V3_And_V4)
{
kml::FileData dataFromBinV3;
TEST_NO_THROW(
{
MemReader reader(kBinKmlV3.data(), kBinKmlV3.size());
kml::binary::DeserializerKml des(dataFromBinV3);
des.Deserialize(reader);
}, ());
{
MemReader reader(kBinKmlV3.data(), kBinKmlV3.size());
kml::binary::DeserializerKml des(dataFromBinV3);
des.Deserialize(reader);
},
());
kml::FileData dataFromBinV4;
TEST_NO_THROW(
{
MemReader reader(kBinKmlV4.data(), kBinKmlV4.size());
kml::binary::DeserializerKml des(dataFromBinV4);
des.Deserialize(reader);
}, ());
{
MemReader reader(kBinKmlV4.data(), kBinKmlV4.size());
kml::binary::DeserializerKml des(dataFromBinV4);
des.Deserialize(reader);
},
());
TEST_EQUAL(dataFromBinV3, dataFromBinV4, ());
}
@@ -494,40 +500,43 @@ UNIT_TEST(Kml_Deserialization_From_Bin_V6_And_V7)
{
kml::FileData dataFromBinV6;
TEST_NO_THROW(
{
MemReader reader(kBinKmlV6.data(), kBinKmlV6.size());
kml::binary::DeserializerKml des(dataFromBinV6);
des.Deserialize(reader);
}, ());
{
MemReader reader(kBinKmlV6.data(), kBinKmlV6.size());
kml::binary::DeserializerKml des(dataFromBinV6);
des.Deserialize(reader);
},
());
kml::FileData dataFromBinV7;
TEST_NO_THROW(
{
MemReader reader(kBinKmlV7.data(), kBinKmlV7.size());
kml::binary::DeserializerKml des(dataFromBinV7);
des.Deserialize(reader);
}, ());
{
MemReader reader(kBinKmlV7.data(), kBinKmlV7.size());
kml::binary::DeserializerKml des(dataFromBinV7);
des.Deserialize(reader);
},
());
TEST_EQUAL(dataFromBinV6, dataFromBinV7, ());
}
UNIT_TEST(Kml_Deserialization_From_Bin_V7_And_V8)
{
kml::FileData dataFromBinV7;
TEST_NO_THROW(
{
MemReader reader(kBinKmlV7.data(), kBinKmlV7.size());
kml::binary::DeserializerKml des(dataFromBinV7);
des.Deserialize(reader);
}, ());
{
MemReader reader(kBinKmlV7.data(), kBinKmlV7.size());
kml::binary::DeserializerKml des(dataFromBinV7);
des.Deserialize(reader);
},
());
kml::FileData dataFromBinV8;
TEST_NO_THROW(
{
MemReader reader(kBinKmlV8.data(), kBinKmlV8.size());
kml::binary::DeserializerKml des(dataFromBinV8);
des.Deserialize(reader);
}, ());
{
MemReader reader(kBinKmlV8.data(), kBinKmlV8.size());
kml::binary::DeserializerKml des(dataFromBinV8);
des.Deserialize(reader);
},
());
TEST_EQUAL(dataFromBinV7, dataFromBinV8, ());
}
@@ -535,22 +544,24 @@ UNIT_TEST(Kml_Deserialization_From_Bin_V8_And_V8MM)
{
kml::FileData dataFromBinV8;
TEST_NO_THROW(
{
MemReader reader(kBinKmlV8.data(), kBinKmlV8.size());
kml::binary::DeserializerKml des(dataFromBinV8);
des.Deserialize(reader);
}, ());
{
MemReader reader(kBinKmlV8.data(), kBinKmlV8.size());
kml::binary::DeserializerKml des(dataFromBinV8);
des.Deserialize(reader);
},
());
kml::FileData dataFromBinV8MM;
TEST_NO_THROW(
{
MemReader reader(kBinKmlV8MM.data(), kBinKmlV8MM.size());
kml::binary::DeserializerKml des(dataFromBinV8MM);
des.Deserialize(reader);
}, ());
{
MemReader reader(kBinKmlV8MM.data(), kBinKmlV8MM.size());
kml::binary::DeserializerKml des(dataFromBinV8MM);
des.Deserialize(reader);
},
());
// Can't compare dataFromBinV8.m_categoryData and dataFromBinV8MM.m_categoryData directly
// because new format has less properties and different m_id. Compare some properties here:
// Can't compare dataFromBinV8.m_categoryData and dataFromBinV8MM.m_categoryData directly
// because new format has less properties and different m_id. Compare some properties here:
TEST_EQUAL(dataFromBinV8.m_categoryData.m_name, dataFromBinV8MM.m_categoryData.m_name, ());
TEST_EQUAL(dataFromBinV8.m_categoryData.m_description, dataFromBinV8MM.m_categoryData.m_description, ());
TEST_EQUAL(dataFromBinV8.m_categoryData.m_annotation, dataFromBinV8MM.m_categoryData.m_annotation, ());
@@ -569,19 +580,21 @@ UNIT_TEST(Kml_Deserialization_From_KMB_V8_And_V9MM)
{
kml::FileData dataFromBinV8;
TEST_NO_THROW(
{
MemReader reader(kBinKmlV8.data(), kBinKmlV8.size());
kml::binary::DeserializerKml des(dataFromBinV8);
des.Deserialize(reader);
}, ());
{
MemReader reader(kBinKmlV8.data(), kBinKmlV8.size());
kml::binary::DeserializerKml des(dataFromBinV8);
des.Deserialize(reader);
},
());
kml::FileData dataFromBinV9MM;
TEST_NO_THROW(
{
MemReader reader(kBinKmlV9MM.data(), kBinKmlV9MM.size());
kml::binary::DeserializerKml des(dataFromBinV9MM);
des.Deserialize(reader);
}, ());
{
MemReader reader(kBinKmlV9MM.data(), kBinKmlV9MM.size());
kml::binary::DeserializerKml des(dataFromBinV9MM);
des.Deserialize(reader);
},
());
// Can't compare dataFromBinV8.m_categoryData and dataFromBinV9MM.m_categoryData directly
// because new format has less properties and different m_id. Compare some properties here:
@@ -595,10 +608,12 @@ UNIT_TEST(Kml_Deserialization_From_KMB_V8_And_V9MM)
TEST_EQUAL(dataFromBinV8.m_categoryData.m_tags, dataFromBinV9MM.m_categoryData.m_tags, ());
TEST_EQUAL(dataFromBinV8.m_categoryData.m_properties, dataFromBinV9MM.m_categoryData.m_properties, ());
dataFromBinV8.m_bookmarksData[0].m_id = dataFromBinV9MM.m_bookmarksData[0].m_id; // V8 and V9MM bookmarks have different IDs. Fix ID value manually.
dataFromBinV8.m_bookmarksData[0].m_id =
dataFromBinV9MM.m_bookmarksData[0].m_id; // V8 and V9MM bookmarks have different IDs. Fix ID value manually.
TEST_EQUAL(dataFromBinV8.m_bookmarksData, dataFromBinV9MM.m_bookmarksData, ());
dataFromBinV8.m_tracksData[0].m_id = dataFromBinV9MM.m_tracksData[0].m_id; // V8 and V9MM tracks have different IDs. Fix ID value manually.
dataFromBinV8.m_tracksData[0].m_id =
dataFromBinV9MM.m_tracksData[0].m_id; // V8 and V9MM tracks have different IDs. Fix ID value manually.
TEST_EQUAL(dataFromBinV8.m_tracksData, dataFromBinV9MM.m_tracksData, ());
}
@@ -606,11 +621,12 @@ UNIT_TEST(Kml_Deserialization_From_KMB_V9MM_With_MultiGeometry)
{
kml::FileData dataFromBinV9MM;
TEST_NO_THROW(
{
MemReader reader(kBinKmlMultiGeometryV9MM.data(), kBinKmlMultiGeometryV9MM.size());
kml::binary::DeserializerKml des(dataFromBinV9MM);
des.Deserialize(reader);
}, ());
{
MemReader reader(kBinKmlMultiGeometryV9MM.data(), kBinKmlMultiGeometryV9MM.size());
kml::binary::DeserializerKml des(dataFromBinV9MM);
des.Deserialize(reader);
},
());
TEST_EQUAL(dataFromBinV9MM.m_tracksData.size(), 1, ());
@@ -689,10 +705,7 @@ UNIT_TEST(Kml_Ver_2_3)
</kml>)";
kml::FileData fData;
TEST_NO_THROW(
{
kml::DeserializerKml(fData).Deserialize(MemReader(data));
}, ());
TEST_NO_THROW({ kml::DeserializerKml(fData).Deserialize(MemReader(data)); }, ());
TEST_EQUAL(fData.m_tracksData.size(), 1, ());
auto const & geom = fData.m_tracksData[0].m_geometry;
@@ -736,10 +749,7 @@ UNIT_TEST(Kml_Placemark_contains_both_Bookmark_and_Track_data)
</kml>)";
kml::FileData fData;
TEST_NO_THROW(
{
kml::DeserializerKml(fData).Deserialize(MemReader(input));
}, ());
TEST_NO_THROW({ kml::DeserializerKml(fData).Deserialize(MemReader(input)); }, ());
TEST_EQUAL(fData.m_bookmarksData.size(), 2, ());
TEST_EQUAL(fData.m_tracksData.size(), 2, ());
@@ -772,10 +782,7 @@ UNIT_TEST(Fix_Invisible_Color_Bug_In_Gpx_Tracks)
</kml>)";
kml::FileData fData;
TEST_NO_THROW(
{
kml::DeserializerKml(fData).Deserialize(MemReader(input));
}, ());
TEST_NO_THROW({ kml::DeserializerKml(fData).Deserialize(MemReader(input)); }, ());
TEST_EQUAL(fData.m_tracksData.size(), 2, ());
TEST_EQUAL(fData.m_tracksData[0].m_layers.size(), 1, ());
@@ -788,11 +795,13 @@ UNIT_TEST(Kml_Tracks_With_Different_Points_And_Timestamps_Order)
{
kml::FileData dataFromFile;
TEST_NO_THROW(
{
kml::DeserializerKml des(dataFromFile);
FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/track_with_timestams_different_orders.kml"));
des.Deserialize(reader);
}, ());
{
kml::DeserializerKml des(dataFromFile);
FileReader reader(
GetPlatform().TestsDataPathForFile("test_data/kml/track_with_timestams_different_orders.kml"));
des.Deserialize(reader);
},
());
TEST_EQUAL(dataFromFile.m_tracksData.size(), 1, ());
auto const & geom = dataFromFile.m_tracksData[0].m_geometry;
@@ -810,11 +819,12 @@ UNIT_TEST(Kml_Track_Points_And_Timestamps_Sizes_Mismatch)
{
kml::FileData dataFromFile;
TEST_ANY_THROW(
{
kml::DeserializerKml des(dataFromFile);
FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/track_with_timestamps_mismatch.kml"));
des.Deserialize(reader);
}, ());
{
kml::DeserializerKml des(dataFromFile);
FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/track_with_timestamps_mismatch.kml"));
des.Deserialize(reader);
},
());
TEST_EQUAL(dataFromFile.m_tracksData.size(), 0, ());
}
@@ -840,10 +850,7 @@ UNIT_TEST(Kml_Import_OpenTracks)
</kml>)";
kml::FileData fData;
TEST_NO_THROW(
{
kml::DeserializerKml(fData).Deserialize(MemReader(input));
}, ());
TEST_NO_THROW({ kml::DeserializerKml(fData).Deserialize(MemReader(input)); }, ());
{
TEST_EQUAL(fData.m_tracksData.size(), 1, ());
@@ -858,11 +865,12 @@ UNIT_TEST(Kml_Import_OpenTracks)
fData = {};
TEST_NO_THROW(
{
kml::DeserializerKml des(fData);
FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/track_from_OpenTracks.kml"));
des.Deserialize(reader);
}, ());
{
kml::DeserializerKml des(fData);
FileReader reader(GetPlatform().TestsDataPathForFile("test_data/kml/track_from_OpenTracks.kml"));
des.Deserialize(reader);
},
());
{
TEST_EQUAL(fData.m_tracksData.size(), 1, ());
@@ -896,10 +904,7 @@ UNIT_TEST(Kml_BadTracks)
</kml>)";
kml::FileData fData;
TEST_NO_THROW(
{
kml::DeserializerKml(fData).Deserialize(MemReader(input));
}, ());
TEST_NO_THROW({ kml::DeserializerKml(fData).Deserialize(MemReader(input)); }, ());
{
TEST_EQUAL(fData.m_tracksData.size(), 1, ());

File diff suppressed because it is too large Load Diff