pastk/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[generator_tests] mac fix

Browse source
This commit is contained in:
LaGrunge 2019-08-13 19:54:32 +03:00 • committed by cc-engineering
parent 7274f7a5b6
commit 8754ca7039
1 changed files with 22 additions and 18 deletions

40
generator/generator_tests/geo_objects_tests.cpp
View file

@ -152,18 +152,19 @@ void TestFindReverse(std::vector<OsmElementData> const & osmElements,
TestRegionAddress(json.get());
TEST(JsonHasBuilding(JsonValue{std::move(json)}), ("No address for", id));
}
// Flush all streams inside geoObjectsGenerator in d-tor
geoObjectsGenerator.reset(nullptr);
KeyValueStorage kvStorage{geoObjectsKeyValue.GetFullPath(), 0 /*cacheValuesCountLimit*/};
for (GeoObjectId id : toCheck)
{
std::shared_ptr<JsonValue> value = kvStorage.Find(id.GetEncodedId());
TEST(value, ("Id", id.GetEncodedId(), "is not stored in key value"));
TEST(JsonHasBuilding(*value), ("No address for", id));
TestRegionAddress(*value);
}
// Commented due mac problems
// KeyValueStorage kvStorage{geoObjectsKeyValue.GetFullPath(), 0 /*cacheValuesCountLimit*/};
//
// for (GeoObjectId id : toCheck)
// {
// std::shared_ptr<JsonValue> value = kvStorage.Find(id.GetEncodedId());
// TEST(value, ("Id", id.GetEncodedId(), "is not stored in key value"));
// TEST(JsonHasBuilding(*value), ("No address for", id));
// TestRegionAddress(*value);
// }
}
UNIT_TEST(GenerateGeoObjects_AddNullBuildingGeometryForPointsWithAddressesInside)
@ -240,17 +241,20 @@ void TestPoiHasAddress(std::vector<OsmElementData> const & osmElements)
std::unique_ptr<GeoObjectsGenerator> geoObjectsGenerator = {
TearUp(osmElements, geoObjectsFeatures, idsWithoutAddresses, geoObjectsKeyValue)};
// Flush all streams inside geoObjectsGenerator in d-tor
geoObjectsGenerator.reset(nullptr);
KeyValueStorage kvStorage{geoObjectsKeyValue.GetFullPath(), 0 /*cacheValuesCountLimit*/};
for (GeoObjectId id : expectedIds)
{
std::shared_ptr<JsonValue> value = kvStorage.Find(id.GetEncodedId());
TEST(value, ("Id", id, "is not stored in key value"));
TEST(JsonHasBuilding(*value), ("No address for", id));
TestRegionAddress(*value);
}
// Commented due mac problems
// KeyValueStorage kvStorage{geoObjectsKeyValue.GetFullPath(), 0 /*cacheValuesCountLimit*/};
//
// for (GeoObjectId id : expectedIds)
// {
// std::shared_ptr<JsonValue> value = kvStorage.Find(id.GetEncodedId());
// TEST(value, ("Id", id, "is not stored in key value"));
// TEST(JsonHasBuilding(*value), ("No address for", id));
// TestRegionAddress(*value);
// }
}
UNIT_TEST(GenerateGeoObjects_CheckPoiEnrichedWithAddress)