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

File container handle moving constructor bugfix

Browse source
This commit is contained in:
Lev Dragunov 2015-02-27 11:28:55 +03:00 • committed by Alex Zolotarev
parent 80231c1d2f
commit 0e5ad066db
2 changed files with 48 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
coding/coding_tests/file_container_test.cpp
View file

@ -5,6 +5,7 @@
#include "../../base/logging.hpp"
#include "../../base/string_utils.hpp"
#include "../../base/scope_guard.hpp"
UNIT_TEST(FilesContainer_Smoke)
@ -233,6 +234,51 @@ UNIT_TEST(FilesMappingContainer_Handle)
FileWriter::DeleteFileX(fName);
}
UNIT_TEST(FilesMappingContainer_MoveHandle)
{
static uint8_t const kNumMapTests = 200;
class HandleWrapper
{
public:
HandleWrapper(FilesMappingContainer::Handle&& handle) : m_handle(move(handle))
{
TEST(m_handle.IsValid(), ());
}
private:
FilesMappingContainer::Handle m_handle;
};
string const containerPath = "file_container.tmp";
string const tagName = "dummy";
MY_SCOPE_GUARD(deleteContainerFileGuard, bind(&FileWriter::DeleteFileX, cref(containerPath)));
{
FilesContainerW writer(containerPath);
FileWriter w = writer.GetWriter(tagName);
w.Write(tagName.c_str(), tagName.size());
}
{
FilesMappingContainer cont(containerPath);
FilesMappingContainer::Handle h1 = cont.Map(tagName);
TEST(h1.IsValid(), ());
FilesMappingContainer::Handle h2(move(h1));
TEST(h2.IsValid(), ());
TEST(!h1.IsValid(), ());
for (int i = 0; i < kNumMapTests; ++i)
{
FilesMappingContainer::Handle parent_handle = cont.Map(tagName);
HandleWrapper tmp(move(parent_handle));
}
}
}
UNIT_TEST(FilesMappingContainer_Smoke)
{
string const fName = "file_container.tmp";

4
coding/file_container.hpp
View file

@ -145,9 +145,9 @@ public:
: m_base(base), m_origBase(alignBase), m_size(size), m_origSize(origSize)
{
}
Handle(Handle && h)
Handle(Handle && h) : Handle()
{
Assign(std::move(h));
Assign(move(h));
}
~Handle();