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

Review fixes

Browse source
This commit is contained in:
Maksim Andrianov 2019-12-05 14:55:52 +03:00 • committed by Tatiana Yan
parent 7b98003b7e
commit 0c3495f6d3
2 changed files with 12 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
generator/generator_tests/collector_building_parts_tests.cpp
View file

@ -3,6 +3,7 @@
#include "generator/collector_building_parts.hpp"
#include "generator/feature_builder.hpp"
#include "generator/gen_mwm_info.hpp"
#include "generator/generator_tests_support/test_with_classificator.hpp"
#include "generator/intermediate_data.hpp"
#include "generator/osm_element.hpp"
@ -18,10 +19,12 @@
namespace
{
class OSMElementCacheReader : public generator::cache::OSMElementCacheReaderInterface
using namespace generator::tests_support;
class TestOSMElementCacheReader : public generator::cache::OSMElementCacheReaderInterface
{
public:
OSMElementCacheReader(std::unordered_map<generator::cache::Key, RelationElement> & m)
TestOSMElementCacheReader(std::unordered_map<generator::cache::Key, RelationElement> & m)
: m_mapping(m)
{
}
@ -131,7 +134,7 @@ private:
if (it == std::cend(m))
return;
OSMElementCacheReader reader(m_IdToRelation);
TestOSMElementCacheReader reader(m_IdToRelation);
for (auto id : it->second)
toDo(id, reader);
}
@ -150,17 +153,6 @@ generator::cache::Key const IntermediateDataReaderTest::kTopRelationId2 = 427104
// static
generator::cache::Key const IntermediateDataReaderTest::kOutlineId2 = 2360656;
struct TestsBase
{
TestsBase()
{
classificator::Load();
Platform & platform = GetPlatform();
auto const tmpDir = platform.TmpDir();
platform.SetWritableDirForTests(tmpDir);
}
};
void TestCollector(std::string const & filename, feature::FeatureBuilder const & fb,
IntermediateDataReaderTest & reader, generator::cache::Key topRelationId)
{
@ -192,7 +184,7 @@ void TestCollector(std::string const & filename, feature::FeatureBuilder const &
}
}
UNIT_CLASS_TEST(TestsBase, CollectorBuildingParts_Case1)
UNIT_CLASS_TEST(TestWithClassificator, CollectorBuildingParts_Case1)
{
using namespace platform::tests_support;
ScopedFile file("CollectorBuildingParts", ScopedFile::Mode::DoNotCreate);
@ -212,7 +204,7 @@ UNIT_CLASS_TEST(TestsBase, CollectorBuildingParts_Case1)
IntermediateDataReaderTest::kTopRelationId1);
}
UNIT_CLASS_TEST(TestsBase, CollectorBuildingParts_Case2)
UNIT_CLASS_TEST(TestWithClassificator, CollectorBuildingParts_Case2)
{
using namespace platform::tests_support;
ScopedFile file("CollectorBuildingParts", ScopedFile::Mode::DoNotCreate);

6
generator/intermediate_data.hpp
View file

@ -128,6 +128,8 @@ private:
class OSMElementCacheReaderInterface
{
public:
virtual ~OSMElementCacheReaderInterface() = default;
virtual bool Read(Key id, WayElement & value) = 0;
virtual bool Read(Key id, RelationElement & value) = 0;
};
@ -142,7 +144,7 @@ public:
bool Read(Key id, WayElement & value) override { return Read<>(id, value); }
bool Read(Key id, RelationElement & value) override { return Read<>(id, value); }
protected:
private:
template <class Value>
bool Read(Key id, Value & value)
{
@ -199,7 +201,7 @@ public:
void SaveOffsets();
protected:
private:
FileWriter m_fileWriter;
IndexFileWriter m_offsets;
std::string m_name;