Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mapsme/omim.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/editor
diff options
context:
space:
mode:
authorr.kuznetsov <r.kuznetsov@corp.mail.ru>2018-10-08 11:21:40 +0300
committerDaria Volvenkova <d.volvenkova@corp.mail.ru>2018-10-08 14:51:03 +0300
commit1c2405a9ccc2d136802e01ba5e39b9172f493b3c (patch)
treee4e630d9f2ad2e28f575cdb73e818ceb262af003 /editor
parentf446393602bbd88067e3cce593933a21abfaeb7c (diff)
Fixed tests and worker thread
Diffstat (limited to 'editor')
-rw-r--r--editor/editor_tests/osm_editor_test.cpp11
1 files changed, 9 insertions, 2 deletions
diff --git a/editor/editor_tests/osm_editor_test.cpp b/editor/editor_tests/osm_editor_test.cpp
index c829883b54..9516ab7dbd 100644
--- a/editor/editor_tests/osm_editor_test.cpp
+++ b/editor/editor_tests/osm_editor_test.cpp
@@ -14,6 +14,7 @@
#include "indexer/ftypes_matcher.hpp"
#include "indexer/scales.hpp"
+#include "platform/platform_tests_support/async_gui_thread.hpp"
#include "platform/platform_tests_support/scoped_file.hpp"
#include "coding/file_name_utils.hpp"
@@ -607,7 +608,10 @@ void EditorTest::OnMapDeregisteredTest()
TEST(!editor.m_features.Get()->empty(), ());
TEST_EQUAL(editor.m_features.Get()->size(), 2, ());
- editor.OnMapDeregistered(gbMwmId.GetInfo()->GetLocalFile());
+ {
+ platform::tests_support::AsyncGuiThread guiThread;
+ editor.OnMapDeregistered(gbMwmId.GetInfo()->GetLocalFile());
+ }
TEST_EQUAL(editor.m_features.Get()->size(), 1, ());
auto const editedMwmId = editor.m_features.Get()->find(rfMwmId);
@@ -1251,7 +1255,10 @@ void EditorTest::SaveTransactionTest()
}
{
- editor.OnMapDeregistered(mwmId.GetInfo()->GetLocalFile());
+ {
+ platform::tests_support::AsyncGuiThread guiThread;
+ editor.OnMapDeregistered(mwmId.GetInfo()->GetLocalFile());
+ }
auto const features = editor.m_features.Get();
auto const mwmIt = features->find(mwmId);