From 7b87d84c397c1ca1ac870fac7121c7940c95339c Mon Sep 17 00:00:00 2001
From: levlam <levlam@telegram.org>
Date: Sat, 15 Feb 2020 04:07:19 +0300
Subject: [PATCH] Add find_bank_card_numbers test.

GitOrigin-RevId: 0905d918980d52267fb5cfea627737d22c8ea1d2
---
 td/telegram/MessageEntity.cpp | 17 ++++++++++-----
 test/message_entities.cpp     | 40 +++++++++++++++++++++++++++++++++++
 2 files changed, 52 insertions(+), 5 deletions(-)

diff --git a/td/telegram/MessageEntity.cpp b/td/telegram/MessageEntity.cpp
index 755b5f59..3f62f3f4 100644
--- a/td/telegram/MessageEntity.cpp
+++ b/td/telegram/MessageEntity.cpp
@@ -419,7 +419,7 @@ static vector<Slice> match_bank_card_numbers(Slice str) {
   // '/[\d- ]{13,}/'
 
   while (true) {
-    while (ptr != end && (*ptr < '0' || *ptr > '9')) {
+    while (ptr != end && !is_digit(*ptr)) {
       ptr++;
     }
     if (ptr == end) {
@@ -428,13 +428,20 @@ static vector<Slice> match_bank_card_numbers(Slice str) {
 
     auto card_number_begin = ptr;
     size_t digit_count = 0;
-    while (ptr != end && (('0' <= *ptr && *ptr <= '9') || *ptr == ' ' || *ptr == '-')) {
-      digit_count += static_cast<size_t>('0' <= *ptr && *ptr <= '9');
+    while (ptr != end && (is_digit(*ptr) || *ptr == ' ' || *ptr == '-')) {
+      digit_count += static_cast<size_t>(is_digit(*ptr));
       ptr++;
     }
+    if (digit_count < 13 || digit_count > 19) {
+      continue;
+    }
+
     auto card_number_end = ptr;
+    while (!is_digit(card_number_end[-1])) {
+      card_number_end--;
+    }
     auto card_number_size = card_number_end - card_number_begin;
-    if (digit_count < 13 || digit_count > 19 || card_number_size > 19 + 18) {
+    if (card_number_size > 2 * digit_count - 1) {
       continue;
     }
 
@@ -680,7 +687,7 @@ static bool is_valid_bank_card(Slice str) {
   char digits[MAX_CARD_LENGTH];
   size_t digit_count = 0;
   for (auto c : str) {
-    if ('0' <= c && c <= '9') {
+    if (is_digit(c)) {
       CHECK(digit_count < MAX_CARD_LENGTH);
       digits[digit_count++] = c;
     }
diff --git a/test/message_entities.cpp b/test/message_entities.cpp
index b43e4b5f..1f91b3f6 100644
--- a/test/message_entities.cpp
+++ b/test/message_entities.cpp
@@ -164,6 +164,46 @@ TEST(MessageEntities, cashtag) {
   check_cashtag(u8"\u2122$ABC\u2122", {"$ABC"});
 }
 
+static void check_bank_card_number(const td::string &str, const td::vector<td::string> &expected) {
+  auto result_slice = td::find_bank_card_numbers(str);
+  td::vector<td::string> result;
+  for (auto &it : result_slice) {
+    result.push_back(it.str());
+  }
+  if (result != expected) {
+    LOG(FATAL) << td::tag("text", str) << td::tag("got", td::format::as_array(result))
+               << td::tag("expected", td::format::as_array(expected));
+  }
+}
+
+TEST(MessageEntities, bank_card_number) {
+  check_bank_card_number("", {});
+  check_bank_card_number("123456789015", {});
+  check_bank_card_number("1234567890120", {});
+  check_bank_card_number("1234567890121", {});
+  check_bank_card_number("1234567890122", {});
+  check_bank_card_number("1234567890123", {});
+  check_bank_card_number("1234567890124", {});
+  check_bank_card_number("1234567890125", {});
+  check_bank_card_number("1234567890126", {});
+  check_bank_card_number("1234567890127", {});
+  check_bank_card_number("1234567890128", {"1234567890128"});
+  check_bank_card_number("1234567890129", {});
+  check_bank_card_number("12345678901500", {"12345678901500"});
+  check_bank_card_number("123456789012800", {"123456789012800"});
+  check_bank_card_number("1234567890151800", {"1234567890151800"});
+  check_bank_card_number("12345678901280000", {"12345678901280000"});
+  check_bank_card_number("123456789015009100", {"123456789015009100"});
+  check_bank_card_number("1234567890128000000", {"1234567890128000000"});
+  check_bank_card_number("12345678901500910000", {});
+  check_bank_card_number(" - - - -1 - -- 2 - - -- 34 - - - 56- - 7890150000  - - - -", {});
+  check_bank_card_number(" - - - -1 - -- 234 - - 56- - 7890150000  - - - -", {"1 - -- 234 - - 56- - 7890150000"});
+  check_bank_card_number("4916-3385-0608-2832; 5280 9342 8317 1080 ;345936346788903",
+                         {"4916-3385-0608-2832", "5280 9342 8317 1080", "345936346788903"});
+  check_bank_card_number("4556728228023269,4916141675244747020,49161416752447470,4556728228023269",
+                         {"4556728228023269", "4916141675244747020", "4556728228023269"});
+}
+
 static void check_is_email_address(const td::string &str, bool expected) {
   bool result = td::is_email_address(str);
   LOG_IF(FATAL, result != expected) << "Expected " << expected << " as result of is_email_address(" << str << ")";