5 files changed, 135 insertions(+), 8 deletions(-)

M module-db/Tables/SMSTable.cpp
M test/harness/harness.py
M test/harness/utils.py
M test/pytest/conftest.py
M test/pytest/test_send_message.py

@@ 210,7 210,7 @@ SMSTableRow SMSTable::getDraftByThreadId(uint32_t threadId)
 std::vector<SMSTableRow> SMSTable::getByText(std::string text)
 {
 
-    auto retQuery = db->query("SELECT *, INSTR(body,'%s') pos FROM sms WHERE pos > 0;", text.c_str());
+    auto retQuery = db->query("SELECT *, INSTR(body,'%q') pos FROM sms WHERE pos > 0;", text.c_str());
 
     if ((retQuery == nullptr) || (retQuery->getRowCount() == 0)) {
         return std::vector<SMSTableRow>();


@@ 237,7 237,7 @@ std::vector<SMSTableRow> SMSTable::getByText(std::string text)
 std::vector<SMSTableRow> SMSTable::getByText(std::string text, uint32_t threadId)
 {
     auto retQuery =
-        db->query("SELECT *, INSTR(body,'%s') pos FROM sms WHERE pos > 0 AND thread_id=%u;", text.c_str(), threadId);
+        db->query("SELECT *, INSTR(body,'%q') pos FROM sms WHERE pos > 0 AND thread_id=%u;", text.c_str(), threadId);
     if ((retQuery == nullptr) || (retQuery->getRowCount() == 0)) {
         return {};
     }

@@ 7,7 7,7 @@ from harness import utils, log
 from harness.interface import CDCSerial as serial
 from harness.interface.defs import key_codes, endpoint, method
 from harness.interface.CDCSerial import Keytype
-from harness.utils import send_keystoke, application_keypath, send_char
+from harness.utils import send_keystoke, application_keypath, send_char, clear_last_char
 from harness.interface.error import TestError, Error
 import random
 


@@ 73,6 73,7 @@ class Harness:
         send_keystoke(application_keypath[app], self.connection)
 
     def send_text(self, text: str):
+        clear_last_char()
         for letter in text:
             try:
                 send_char(letter, self.connection)

@@ 208,6 208,11 @@ def send_keystoke(keypath, connection):
 last_char = '\0'
 
 
+def clear_last_char():
+    global last_char
+    last_char = '\0'
+
+
 def send_char(char: str, connection):
     global last_char
     key_type = Keytype.short_press

@@ 14,7 14,9 @@ from harness import log
 from harness.harness import Harness
 from harness import utils
 from harness.interface.error import TestError, Error
-from harness.interface.CDCSerial import CDCSerial as serial
+from harness.interface.CDCSerial import Keytype, CDCSerial as serial
+from harness.interface.defs import key_codes
+
 
 simulator_port = 'simulator'
 


@@ 121,6 123,19 @@ def phones_unlocked(harnesses):
         harness.unlock_phone()
         assert harness.is_phone_unlocked
 
+
+@pytest.fixture(scope='session')
+def phone_in_desktop(harness):
+    # go to desktop
+    if harness.get_application_name() != "ApplicationDesktop":
+        harness.connection.send_key_code(key_codes["fnRight"], Keytype.long_press)
+        # in some cases we have to do it twice
+        if harness.get_application_name() != "ApplicationDesktop":
+            harness.connection.send_key_code(key_codes["fnRight"], Keytype.long_press)
+    # assert that we are in ApplicationDesktop
+    assert harness.get_application_name() == "ApplicationDesktop"
+
+
 def pytest_configure(config):
     config.addinivalue_line("markers",
                             "service_desktop_test: mark test if it's related to service-desktop API")

@@ 33,20 33,21 @@ def add_new_template(harness, template_text: str):
     assert ret["status"] == status["OK"]
 
 
-def erase_contacts_by_name(harness, name):
+def get_all_contacts(harness):
     body = {"count": True}
     ret = harness.endpoint_request("contacts", "get", body)
     assert ret["status"] == status["OK"]
 
+    contacts = []
     count = ret["body"]["count"]
     if count == 0:
-        return 0
+        return contacts
 
     # try to get more than available
     batch_size = 30
     divider = int((count + 10) / batch_size)
     reminder = (count + 10) % batch_size
-    contacts = []
+
     for i in range(divider):
         body = {"count": batch_size, "offset": batch_size * i}
         ret = harness.endpoint_request("contacts", "get", body)


@@ 57,7 58,13 @@ def erase_contacts_by_name(harness, name):
     ret = harness.endpoint_request("contacts", "get", body)
     assert ret["status"] == status["OK"]
     contacts = contacts + ret["body"]
+    return contacts
+
 
+def erase_contacts_by_name(harness, name):
+    contacts = get_all_contacts(harness)
+
+    # collecting contacts to remove by name
     ids = []
     for contact in contacts:
         if name in contact["priName"]:


@@ 71,6 78,26 @@ def erase_contacts_by_name(harness, name):
         assert ret["status"] == status["OK"]
 
 
+def erase_contacts_by_phone_number(harness, phone_number):
+    contacts = get_all_contacts(harness)
+
+    # collecting contacts to remove by phone number
+    ids = []
+    for contact in contacts:
+        numbers = contact["numbers"]
+        for number in numbers:
+            if number == phone_number:
+                ids.append(contact["id"])
+                break
+
+    # erase all contacts by id
+    for identifier in ids:
+        # removing added contact
+        body = {"id": identifier}
+        ret = harness.endpoint_request("contacts", "del", body)
+        assert ret["status"] == status["OK"]
+
+
 def get_message_by_text(harness, message: str, phone_number: str):
     body = {"category": "message", "messageBody": message, "phoneNumber": phone_number}
     return harness.endpoint_request("messages", "get", body)["body"]


@@ 116,6 143,7 @@ def enter_contacts_menu(harness):
 
 @pytest.mark.rt1051
 @pytest.mark.usefixtures("phone_unlocked")
+@pytest.mark.usefixtures("phone_in_desktop")
 def test_send_message(harness, phone_number, sms_text):
     old_messages = get_message_by_text(harness, sms_text, str(phone_number))
 


@@ 146,6 174,7 @@ def test_send_message(harness, phone_number, sms_text):
 
 @pytest.mark.rt1051
 @pytest.mark.usefixtures("phone_unlocked")
+@pytest.mark.usefixtures("phone_in_desktop")
 def test_send_prepared_message(harness, phone_number, sms_text):
     old_messages = get_message_by_text(harness, sms_text, str(phone_number))
 


@@ 159,7 188,7 @@ def test_send_prepared_message(harness, phone_number, sms_text):
 
 
 testdata = [
-    "Ala1Ma śżżń 😚",
+    "'\"\\àśżżńú😚",
     "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
     "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
     "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA😚"


@@ 195,6 224,7 @@ def test_send_prepared_draft_message(harness, phone_number, sms_text):
 
 @pytest.mark.rt1051
 @pytest.mark.usefixtures("phone_unlocked")
+@pytest.mark.usefixtures("phone_in_desktop")
 def test_send_message_from_template(harness, phone_number, sms_text):
     old_messages = get_message_by_text(harness, sms_text, str(phone_number))
     # erasing all templates


@@ 232,6 262,7 @@ def test_send_message_from_template(harness, phone_number, sms_text):
 
 @pytest.mark.rt1051
 @pytest.mark.usefixtures("phone_unlocked")
+@pytest.mark.usefixtures("phone_in_desktop")
 def test_forward_message(harness, phone_number, sms_text):
     # send first message in order to forward it
     test_send_prepared_message(harness, phone_number, sms_text)


@@ 273,6 304,7 @@ def test_forward_message(harness, phone_number, sms_text):
 
 @pytest.mark.rt1051
 @pytest.mark.usefixtures("phone_unlocked")
+@pytest.mark.usefixtures("phone_in_desktop")
 def test_resend_message(harness, phone_number, sms_text):
     # send first message in order to resend it
     prepare_sms(harness, sms_text, str(phone_number), SMSType.FAILED.value)


@@ 304,9 336,12 @@ def test_resend_message(harness, phone_number, sms_text):
 
 @pytest.mark.rt1051
 @pytest.mark.usefixtures("phone_unlocked")
+@pytest.mark.usefixtures("phone_in_desktop")
 def test_send_message_from_phonebook(harness, phone_number, sms_text):
     # erase Test contacts
     erase_contacts_by_name(harness, "Test")
+    # erase Test contacts
+    erase_contacts_by_phone_number(harness, "Test")
 
     old_messages = get_message_by_text(harness, sms_text, str(phone_number))
     # adding new test contact


@@ 359,3 394,74 @@ def test_send_message_from_phonebook(harness, phone_number, sms_text):
     body = {"id": added_contact_id}
     ret = harness.endpoint_request("contacts", "del", body)
     assert ret["status"] == status["OK"]
+
+
+@pytest.mark.rt1051
+@pytest.mark.usefixtures("phone_unlocked")
+@pytest.mark.usefixtures("phone_in_desktop")
+def test_send_message_using_phonebook(harness, phone_number, sms_text):
+    # erase Test contacts
+    erase_contacts_by_name(harness, "Test")
+    # erase Test contacts
+    erase_contacts_by_phone_number(harness, str(phone_number))
+
+    old_messages = get_message_by_text(harness, sms_text, str(phone_number))
+    # adding new test contact
+    body = {"address": "6 Czeczota St.\n02600 Warsaw",
+            "altName": "Testowy",
+            "blocked": False,
+            "favourite": True,
+            "numbers": [str(phone_number)],
+            "priName": "Test"}
+    ret = harness.endpoint_request("contacts", "put", body)
+    assert ret["status"] == status["OK"]
+    added_contact_id = ret["body"]["id"]
+
+    # enter messages menu
+    enter_messages_menu(harness)
+    # create new message
+    harness.connection.send_key_code(key_codes["left"])
+    # select contact
+    harness.connection.send_key_code(key_codes["enter"])
+    # search test contact
+    harness.connection.send_key_code(key_codes["right"])
+    # write search text
+    harness.send_text("Test")
+    # search for added contact
+    harness.connection.send_key_code(key_codes["enter"])
+    # choose contact
+    harness.connection.send_key_code(key_codes["enter"])
+    # reset contact
+    harness.connection.send_key_code(key_codes["#"])
+    # select contact
+    harness.connection.send_key_code(key_codes["enter"])
+    # search test contact
+    harness.connection.send_key_code(key_codes["right"])
+    # write search text
+    harness.send_text("Test")
+
+    # search for added contact
+    harness.connection.send_key_code(key_codes["enter"])
+    # select contact
+    harness.connection.send_key_code(key_codes["enter"])
+
+    # go to text in new message windows
+    harness.connection.send_key_code(key_codes["down"])
+
+    # write a message
+    harness.send_text(sms_text)
+    # send
+    harness.connection.send_key_code(key_codes["enter"])
+    # go back to main screen
+    harness.connection.send_key_code(key_codes["fnRight"], Keytype.long_press)
+
+    time.sleep(3)
+    # check if we back to ApplicationDesktop
+    assert harness.get_application_name() == "ApplicationDesktop"
+    new_messages = get_message_by_text(harness, sms_text, str(phone_number))
+    compare_messages(old_messages, new_messages)
+
+    # removing added contact
+    body = {"id": added_contact_id}
+    ret = harness.endpoint_request("contacts", "del", body)
+    assert ret["status"] == status["OK"]