kirylkaveryn/organicmaps
1
Fork 0
forked from organicmaps/organicmaps-tmp
Code Pull requests Activity

[new downloader] Adding different tests.

Browse source
This commit is contained in:
Vladimir Byko-Ianko 2016-02-09 08:32:00 +03:00 • committed by Sergey Yershov
parent bfd8647a8c
commit 8d6702035a
2 changed files with 71 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
storage/storage_tests/country_info_getter_test.cpp
View file

@ -1,5 +1,7 @@
#include "testing/testing.hpp"
#include "storage/storage_tests/create_country_info_getter.hpp"
#include "storage/country_info_getter.hpp"
#include "storage/country.hpp"
#include "storage/storage.hpp"
@ -18,12 +20,7 @@ using namespace storage;
namespace
{
unique_ptr<CountryInfoGetter> CreateCountryInfoGetter()
{
Platform & platform = GetPlatform();
return make_unique<CountryInfoReader>(platform.GetReader(PACKED_POLYGONS_FILE),
platform.GetReader(COUNTRIES_FILE));
}
double constexpr kEpsilon = 1e-3;
bool IsEmptyName(map<string, CountryInfo> const & id2info, string const & id)
{
@ -86,3 +83,31 @@ UNIT_TEST(CountryInfoGetter_SomeRects)
LOG(LINFO, ("Canada: ", getter->CalcLimitRect("Canada_")));
}
UNIT_TEST(CountryInfoGetter_CalcLimitRectForLeafSingleMwm)
{
auto const getter = CreateCountryInfoGetterMigrate();
Storage storage(COUNTRIES_MIGRATE_FILE);
if (!version::IsSingleMwm(storage.GetCurrentDataVersion()))
return;
m2::RectD leafBoundBox = getter->CalcLimitRectForLeaf("Angola");
TEST(my::AlmostEqualAbs(leafBoundBox.maxX(), 24.08212, kEpsilon), ());
TEST(my::AlmostEqualAbs(leafBoundBox.maxY(), -4.393187, kEpsilon), ());
TEST(my::AlmostEqualAbs(leafBoundBox.minX(), 9.205259, kEpsilon), ());
TEST(my::AlmostEqualAbs(leafBoundBox.minY(), -18.34456, kEpsilon), ());
}
UNIT_TEST(CountryInfoGetter_CalcLimitRectForLeafTwoComponentMwm)
{
auto const getter = CreateCountryInfoGetterMigrate();
Storage storage(COUNTRIES_MIGRATE_FILE);
if (version::IsSingleMwm(storage.GetCurrentDataVersion()))
return;
m2::RectD leafBoundBox = getter->CalcLimitRectForLeaf("Angola");
TEST(my::AlmostEqualAbs(leafBoundBox.maxX(), 24.08212, kEpsilon), ());
TEST(my::AlmostEqualAbs(leafBoundBox.maxY(), -4.393187, kEpsilon), ());
TEST(my::AlmostEqualAbs(leafBoundBox.minX(), 11.50151, kEpsilon), ());
TEST(my::AlmostEqualAbs(leafBoundBox.minY(), -18.344569, kEpsilon), ());
}

50
storage/storage_tests/storage_tests.cpp
View file

@ -4,6 +4,8 @@
#include "storage/storage.hpp"
#include "storage/storage_defines.hpp"
#include "storage/storage_helpers.hpp"
#include "storage/storage_tests/create_country_info_getter.hpp"
#include "storage/storage_tests/fake_map_files_downloader.hpp"
#include "storage/storage_tests/task_runner.hpp"
#include "storage/storage_tests/test_map_files_downloader.hpp"
@ -428,15 +430,6 @@ void InitStorage(Storage & storage, TaskRunner & runner,
storage.RegisterAllLocalMaps();
storage.SetDownloaderForTesting(make_unique<FakeMapFilesDownloader>(runner));
}
unique_ptr<storage::CountryInfoGetter> CreateCountryInfoGetter(bool isSingleMwm)
{
Platform & platform = GetPlatform();
string const packedPolygons = isSingleMwm ? PACKED_POLYGONS_MIGRATE_FILE : PACKED_POLYGONS_FILE;
string const countryTxt = isSingleMwm ? COUNTRIES_MIGRATE_FILE : COUNTRIES_FILE;
return make_unique<storage::CountryInfoReader>(platform.GetReader(packedPolygons),
platform.GetReader(countryTxt));
}
} // namespace
UNIT_TEST(StorageTest_Smoke)
@ -1080,7 +1073,8 @@ UNIT_TEST(StorageTest_IsPointCoveredByDownloadedMaps)
InitStorage(storage, runner);
bool const isSingleMwm = version::IsSingleMwm(storage.GetCurrentDataVersion());
auto const countryInfoGetter = CreateCountryInfoGetter(isSingleMwm);
auto const countryInfoGetter = isSingleMwm ? CreateCountryInfoGetterMigrate()
: CreateCountryInfoGetter();
ASSERT(countryInfoGetter, ());
string const uruguayId = string("Uruguay");
m2::PointD const montevideoUruguay = MercatorBounds::FromLatLon(-34.8094, -56.1558);
@ -1227,4 +1221,40 @@ UNIT_TEST(StorageTest_ParseStatus)
TEST_EQUAL(StatusAndError(NodeStatus::Downloading, NodeErrorCode::NoError),
ParseStatus(Status::EDownloading), ());
}
UNIT_TEST(StorageTest_ForEachInSubtree)
{
Storage storage(kSingleMwmCountriesTxt, make_unique<TestMapFilesDownloader>());
TCountriesVec leafVec;
auto forEach = [&leafVec](TCountryId const & descendantCountryId, bool expandableNode)
{
if (!expandableNode)
leafVec.push_back(descendantCountryId);
};
storage.ForEachInSubtree(storage.GetRootId(), forEach);
TCountriesVec expectedLeafVec = {"Abkhazia", "Algeria_Central", "Algeria_Coast", "South Korea_South"};
TEST_EQUAL(leafVec, expectedLeafVec, ());
}
UNIT_TEST(StorageTest_CalcLimitRect)
{
double constexpr kEpsilon = 1e-3;
Storage storage(COUNTRIES_FILE);
if (!version::IsSingleMwm(storage.GetCurrentDataVersion()))
return;
TaskRunner runner;
InitStorage(storage, runner);
auto const countryInfoGetter = CreateCountryInfoGetterMigrate();
ASSERT(countryInfoGetter, ());
m2::RectD algeriaBoundBox = CalcLimitRect("Algeria", storage, *countryInfoGetter);
TEST(my::AlmostEqualAbs(algeriaBoundBox.maxX(), 11.99734, kEpsilon), ());
TEST(my::AlmostEqualAbs(algeriaBoundBox.maxY(), 40.2488, kEpsilon), ());
TEST(my::AlmostEqualAbs(algeriaBoundBox.minX(), -8.6689, kEpsilon), ());
TEST(my::AlmostEqualAbs(algeriaBoundBox.minY(), 19.32443, kEpsilon), ());
}
} // namespace storage