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

Merge pull request #3691 from milchakov/Fix_code_style

Browse source 
[editor] Fix code style
This commit is contained in:
Ilya Zverev 2016-06-29 21:50:50 +04:00 • committed by GitHub
commit 6cc553b2ce
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
indexer/editable_map_object.cpp
View file

@ -317,13 +317,13 @@ bool EditableMapObject::ValidateEmail(string const & email)
if (strings::IsASCIIString(email))
return regex_match(email, regex(R"([^@\s]+@[a-zA-Z0-9-]+(\.[a-zA-Z0-9-]+)+$)"));
if ('@' == email.front() || '@' == email.back())
return false;
if ('.' == email.back())
return false;
auto const atPos = find(begin(email), end(email), '@');
if (atPos == end(email))
return false;

2
indexer/indexer_tests/editable_map_object_test.cpp
View file

@ -109,7 +109,7 @@ UNIT_TEST(EditableMapObject_ValidateEmail)
TEST(EditableMapObject::ValidateEmail("e@ma.i.l"), ());
TEST(EditableMapObject::ValidateEmail("e-m.ail@dot.com.gov"), ());
TEST(EditableMapObject::ValidateEmail("#$%&'*+-/=?^`_{}|~.@dot.qw.com.gov"), ());
TEST(!EditableMapObject::ValidateEmail("e.ma.il"), ());
TEST(!EditableMapObject::ValidateEmail("e@ma@il"), ());
TEST(!EditableMapObject::ValidateEmail("e@ma@i.l"), ());