From 065d9b8b170b2ac8301d70c592a04917213f010a Mon Sep 17 00:00:00 2001 From: Arsentiy Milchakov Date: Wed, 29 Jun 2016 20:06:35 +0300 Subject: [PATCH] Fix code style --- indexer/editable_map_object.cpp | 6 +++--- indexer/indexer_tests/editable_map_object_test.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/indexer/editable_map_object.cpp b/indexer/editable_map_object.cpp index d074f2255a..83700838fc 100644 --- a/indexer/editable_map_object.cpp +++ b/indexer/editable_map_object.cpp @@ -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; diff --git a/indexer/indexer_tests/editable_map_object_test.cpp b/indexer/indexer_tests/editable_map_object_test.cpp index aea2186bd1..d33275d68a 100644 --- a/indexer/indexer_tests/editable_map_object_test.cpp +++ b/indexer/indexer_tests/editable_map_object_test.cpp @@ -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"), ());