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

[editor] review fixes

Browse source
This commit is contained in:
Arsentiy Milchakov 2017-11-23 17:20:31 +03:00 • committed by mgsergio
parent 0e3a046555
commit 9d8432c63d
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
indexer/editable_map_object.cpp
View file

@ -635,9 +635,9 @@ bool EditableMapObject::ValidatePhoneList(string const & phone)
{
// BNF:
// <digit> ::= '0' | '1' | '2' | '3' | '4' | '5' | '6' | '7' | '8' | '9'
// <available_chars> ::= ' ' | '+' | '-' | '(' | ')' | '' <available_chars>
// <available_char> ::= ' ' | '+' | '-' | '(' | ')'
// <delimeter> ::= ',' | ';'
// <phone> ::= <digit> | <available_chars> <phone>
// <phone> ::= (<digit> | <available_chars>)+
// <phone_list> ::= '' | <phone> | <phone> <delimeter> <phone_list>
if (phone.empty())
@ -667,7 +667,7 @@ bool EditableMapObject::ValidatePhoneList(string const & phone)
return false;
if (isdigit(*curr))
++digitsCount;
++digitsCount;
}
if (digitsCount < kMinNumberLen || digitsCount > kMaxNumberLen)

7
indexer/indexer_tests/editable_map_object_test.cpp
View file

@ -139,6 +139,13 @@ UNIT_TEST(EditableMapObject_ValidatePhoneList)
TEST(!EditableMapObject::ValidatePhoneList(";"), ());
TEST(!EditableMapObject::ValidatePhoneList(","), ());
TEST(!EditableMapObject::ValidatePhoneList(";;;;;;"), ());
// Now it is possible to specify the following incorrect phone numbers.
// TODO: replace current implementation of ValidatePhoneList by a correct one.
TEST(EditableMapObject::ValidatePhoneList("7+ 10 10"), ());
TEST(EditableMapObject::ValidatePhoneList("+7 )10( 10"), ());
TEST(EditableMapObject::ValidatePhoneList("+7 )10 10"), ());
TEST(EditableMapObject::ValidatePhoneList("+7 10 (---) 10"), ());
}
UNIT_TEST(EditableMapObject_ValidateWebsite)