From 866cd8211510172e3b7455a83684bfd7ea25fc6f Mon Sep 17 00:00:00 2001 From: Andrey Klimenko Date: Mon, 21 Nov 2016 16:17:51 +0200 Subject: [PATCH] TizenRefApp-7695 fixed codestyle in Settings/* also fixed it in unit-tests Change-Id: Ibc4c67028993030961a3850cf42e60d23ae18c9a Signed-off-by: Andrey Klimenko --- src/Settings/Controller/inc/Settings.h | 1 - src/Settings/Controller/src/MsgOnSimCard.cpp | 64 +++++++++---------- src/Settings/Controller/src/Settings.cpp | 61 +++++++----------- src/Settings/Controller/src/SettingsSound.cpp | 12 ++-- .../Controller/src/SimListViewItem.cpp | 8 +-- src/Settings/View/inc/SimMsgLayout.h | 1 - .../View/src/SettingsGroupListViewItem.cpp | 2 +- .../View/src/SettingsListViewItem.cpp | 34 ++++------ src/Settings/View/src/SimMsgLayout.cpp | 1 - test/TC/TestAppControlUtils.cpp | 16 ++--- test/TC/TestContactManager.cpp | 8 +-- test/TC/TestMessageSender.cpp | 4 +- test/TC/TestMsgUtils.cpp | 8 +-- test/TC/TestTextDecorator.cpp | 2 +- test/TC/TestTimeUtils.cpp | 2 +- 15 files changed, 97 insertions(+), 127 deletions(-) diff --git a/src/Settings/Controller/inc/Settings.h b/src/Settings/Controller/inc/Settings.h index 69cc0635..4cf7b491 100644 --- a/src/Settings/Controller/inc/Settings.h +++ b/src/Settings/Controller/inc/Settings.h @@ -127,7 +127,6 @@ namespace Msg SettingsListItem *m_pReadReportItem; SettingsListItem *m_pAutoRetItem; SettingsListItem *m_pAutoRetRoamingItem; - }; } diff --git a/src/Settings/Controller/src/MsgOnSimCard.cpp b/src/Settings/Controller/src/MsgOnSimCard.cpp index eeb4932f..4ff0ed07 100644 --- a/src/Settings/Controller/src/MsgOnSimCard.cpp +++ b/src/Settings/Controller/src/MsgOnSimCard.cpp @@ -75,7 +75,7 @@ void MsgOnSimCard::fillList() { MessageSMSListRef list = getMsgEngine().getStorage().getSimMsgList(); int length = list->getLength(); - for(int i = 0; i < length; ++i) + for (int i = 0; i < length; ++i) { SimListViewItem *item = new SimListViewItem(list->at(i)); m_pList->appendItem(*item); @@ -99,25 +99,23 @@ void MsgOnSimCard::onAttached(ViewItem &item) void MsgOnSimCard::onButtonClicked(NaviFrameItem &item, NaviButtonId buttonId) { - if(buttonId == NaviOkButtonId) + if (buttonId == NaviOkButtonId) { if (m_SimMode == DeleteMode) { deleteSelectedItems(); - } - else if (m_SimMode == CopyToDeviceMode) - { + } else if (m_SimMode == CopyToDeviceMode) { copySelectedItems(); } - } - else if(buttonId == NaviPrevButtonId) + } else if (buttonId == NaviPrevButtonId) { pop(); + } setMode(NormalMode); } void MsgOnSimCard::onListItemChecked(ListItem &listItem) { - if(dynamic_cast(&listItem)) + if (dynamic_cast(&listItem)) { bool checked = listItem.getCheckedState(); m_pList->checkAllItems(checked); @@ -141,7 +139,7 @@ void MsgOnSimCard::onHwMoreButtonClicked() void MsgOnSimCard::onHwBackButtonClicked() { - if(m_SimMode == CopyToDeviceMode || m_SimMode == DeleteMode) + if (m_SimMode == CopyToDeviceMode || m_SimMode == DeleteMode) setNormalMode(); else pop(); @@ -149,7 +147,7 @@ void MsgOnSimCard::onHwBackButtonClicked() void MsgOnSimCard::showCopyDeletePopup() { - if(!m_pList->isEmpty()) + if (!m_pList->isEmpty()) { PopupList &listPopup = getApp().getPopupManager().getMorePopup(); listPopup.appendItem(msg("IDS_MSG_OPT_COPY_TO_DEVICE_ABB"), POPUPLIST_ITEM_PRESSED_CB(MsgOnSimCard, onCopyToDeviceItemPressed), this); @@ -173,11 +171,11 @@ void MsgOnSimCard::onDeleteItemPressed(PopupListItem &item) void MsgOnSimCard::onMsgStorageDelete(const MsgIdList &msgIdList) { auto simListItems = m_pList->getItems(); - for(auto &itemId: msgIdList) + for (auto &itemId: msgIdList) { - for(auto *simItem : simListItems) + for (auto *simItem : simListItems) { - if(simItem->getMsgId() == itemId) + if (simItem->getMsgId() == itemId) { simItem->destroy(); break; @@ -189,10 +187,10 @@ void MsgOnSimCard::onMsgStorageDelete(const MsgIdList &msgIdList) void MsgOnSimCard::setMode(SimMode mode) { - if(m_SimMode == mode) + if (m_SimMode == mode) return; - switch(mode) + switch (mode) { case CopyToDeviceMode: setCopyToDeviceMode(true); @@ -215,7 +213,7 @@ void MsgOnSimCard::setMode(SimMode mode) void MsgOnSimCard::setNormalMode() { // Reset previus mode: - switch(m_SimMode) + switch (m_SimMode) { case CopyToDeviceMode: setCopyToDeviceMode(false); @@ -236,7 +234,7 @@ void MsgOnSimCard::setNormalMode() void MsgOnSimCard::setCopyToDeviceMode(bool value) { - if(value) + if (value) m_SimMode = CopyToDeviceMode; setTitleWithButtons(value); @@ -244,7 +242,7 @@ void MsgOnSimCard::setCopyToDeviceMode(bool value) void MsgOnSimCard::setDeleteMode(bool value) { - if(value) + if (value) m_SimMode = DeleteMode; setTitleWithButtons(value); @@ -252,9 +250,9 @@ void MsgOnSimCard::setDeleteMode(bool value) void MsgOnSimCard::setTitleTranslatable() { - if(m_SimMode == NormalMode) + if (m_SimMode == NormalMode) getNaviBar().setTitle(msg("IDS_MSG_HEADER_MESSAGES_ON_SIM_CARD_ABB")); - else if(m_SimMode == DeleteMode || m_SimMode == CopyToDeviceMode) + else if (m_SimMode == DeleteMode || m_SimMode == CopyToDeviceMode) getNaviBar().setTitle(msgArgs("IDS_MSG_HEADER_PD_SELECTED_ABB3", m_CheckCount)); } @@ -264,7 +262,7 @@ void MsgOnSimCard::setTitleWithButtons(bool value) getNaviBar().clear(); getNaviBar().showButton(NaviOkButtonId, value); - if(value) + if (value) { if (m_SimMode == DeleteMode) getNaviBar().setButtonText(NaviOkButtonId, msgt("IDS_MSG_ACBUTTON_DELETE_ABB")); @@ -285,8 +283,8 @@ void MsgOnSimCard::deleteSelectedItems() auto items = m_pList->getItems(); MsgIdList messages; - for(auto *item : items) - if(item->getCheckedState()) + for (auto *item : items) + if (item->getCheckedState()) messages.push_back(item->getMsgId()); getApp().getMsgEngine().getStorage().deleteMessages(messages); @@ -295,12 +293,12 @@ void MsgOnSimCard::deleteSelectedItems() void MsgOnSimCard::copySelectedItems() { auto items = m_pList->getItems(); - for(auto *item : items) + for (auto *item : items) { - if(item->getCheckedState()) + if (item->getCheckedState()) { MessageRef msg = getApp().getMsgEngine().getStorage().getMessage(item->getMsgId()); - if(msg) + if (msg) { msg->setMessageStorageType(Message::MS_Phone); getApp().getMsgEngine().getStorage().saveMessage(*msg, false); @@ -314,20 +312,18 @@ void MsgOnSimCard::showSelectAllItem(bool show, bool resetCheck) { SelectAllListItem *item = dynamic_cast(m_pList->getFirstItem()); - if(show) + if (show) { - if(!item) + if (!item) { item = new SelectAllListItem; m_pList->prependItem(*item); } - if(item && resetCheck) + if (item && resetCheck) item->setCheckedState(false, true); - } - else - { - if(item) + } else { + if (item) item->destroy(); } } @@ -337,7 +333,7 @@ void MsgOnSimCard::calcChecked(int &check, int &total) const check = 0; total = 0; auto items = m_pList->getItems(); - for(ListItem *item: items) + for (ListItem *item: items) { if (item->getCheckedState()) ++check; diff --git a/src/Settings/Controller/src/Settings.cpp b/src/Settings/Controller/src/Settings.cpp index 455ac724..29eb5ce6 100644 --- a/src/Settings/Controller/src/Settings.cpp +++ b/src/Settings/Controller/src/Settings.cpp @@ -59,7 +59,7 @@ Settings::~Settings() void Settings::create() { - if(!isExistingMmsAutoRetrRoamingBackup()) + if (!isExistingMmsAutoRetrRoamingBackup()) setMmsAutoRetrRoamingBackup(getMsgSettings().getMmsAutoRetrRoaming()); m_pList = new ListView(getParent()); @@ -168,67 +168,56 @@ void Settings::appendVibrationItem() void Settings::appendDelivReportSmsItem() { - m_pDelivReportSmsItem = appendItem - ( SettingsListViewItem::multiLineIconStyle, + m_pDelivReportSmsItem = appendItem( + SettingsListViewItem::multiLineIconStyle, &Settings::delivReportSmsItemHandler, "IDS_MSGF_BODY_DELIVERY_REPORT", - "IDS_MSGS_BODY_REQUEST_A_DELIVERY_REPORT_FOR_EACH_MESSAGE_YOU_SEND" - ); + "IDS_MSGS_BODY_REQUEST_A_DELIVERY_REPORT_FOR_EACH_MESSAGE_YOU_SEND"); } void Settings::appendMsgOnSimItem() { - m_pMsgOnSimItem = appendItem - ( + m_pMsgOnSimItem = appendItem( SettingsListViewItem::multiLineStyle, &Settings::msgOnSimItemHandler, "IDS_MSG_TMBODY_MESSAGES_ON_SIM_CARD", - "IDS_MSG_SBODY_MANAGE_THE_MESSAGES_STORED_ON_YOUR_SIM_CARD" - ); + "IDS_MSG_SBODY_MANAGE_THE_MESSAGES_STORED_ON_YOUR_SIM_CARD"); } void Settings::appendDelivReportMmsItem() { - m_pDelivReportMmsItem = appendItem - ( + m_pDelivReportMmsItem = appendItem( SettingsListViewItem::multiLineIconStyle, &Settings::delivReportMmsItemHandler, "IDS_MSGF_BODY_DELIVERY_REPORT", - "IDS_MSGS_BODY_REQUEST_A_DELIVERY_REPORT_FOR_EACH_MESSAGE_YOU_SEND" - ); + "IDS_MSGS_BODY_REQUEST_A_DELIVERY_REPORT_FOR_EACH_MESSAGE_YOU_SEND"); } void Settings::appendReadReportItem() { - m_pReadReportItem = appendItem - ( + m_pReadReportItem = appendItem( SettingsListViewItem::multiLineIconStyle, &Settings::readReportItemHandler, "IDS_MSGF_BODY_READ_REPORT", - "IDS_MSGS_BODY_REQUEST_A_READ_REPORT_FOR_EACH_MESSAGE_YOU_SEND" - ); + "IDS_MSGS_BODY_REQUEST_A_READ_REPORT_FOR_EACH_MESSAGE_YOU_SEND"); } void Settings::appendAutoRetItem() { - m_pAutoRetItem = appendItem - ( + m_pAutoRetItem = appendItem( SettingsListViewItem::multiLineIconStyle, &Settings::autoRetItemHandler, "IDS_MSG_TMBODY_AUTO_RETRIEVE", - "IDS_MSG_BODY_RETRIEVE_MESSAGES_AUTOMATICALLY" - ); + "IDS_MSG_BODY_RETRIEVE_MESSAGES_AUTOMATICALLY"); } void Settings::appendAutoRetRoamingItem() { - m_pAutoRetRoamingItem = appendItem - ( + m_pAutoRetRoamingItem = appendItem( SettingsListViewItem::multiLineIconStyle, &Settings::autoRetRoamingItemHandler, "IDS_MSG_TMBODY_AUTO_RETRIEVE_WHILE_ROAMING", - "IDS_MSG_BODY_RETRIEVE_MESSAGES_AUTOMATICALLY_WHILE_ROAMING" - ); + "IDS_MSG_BODY_RETRIEVE_MESSAGES_AUTOMATICALLY_WHILE_ROAMING"); } void Settings::updateAlertsItem() @@ -242,11 +231,11 @@ void Settings::updateSoundItem() m_pSoundItem->disabled(!getMsgSettings().getAlerts()); std::string ringtoneName; - if(getMsgSettings().getRingtoneType() == MsgSettings::SilentRingtone) + if (getMsgSettings().getRingtoneType() == MsgSettings::SilentRingtone) ringtoneName = "Silent"; - else if(getMsgSettings().getRingtoneType() == MsgSettings::DefaultRingtone) + else if (getMsgSettings().getRingtoneType() == MsgSettings::DefaultRingtone) ringtoneName = "Default"; - else if(getMsgSettings().getRingtoneType() == MsgSettings::UserRingtone) + else if (getMsgSettings().getRingtoneType() == MsgSettings::UserRingtone) ringtoneName = MediaUtils::getTitle(getMsgSettings().getRingtone()); m_pSoundItem->setSubText(ringtoneName); @@ -344,14 +333,12 @@ void Settings::autoRetItemHandler(SettingsListItem &item) MSG_LOG(""); getMsgSettings().setMmsAutoRetr(item.getCheckButtonState()); bool mmsAutoRetr = getMsgSettings().getMmsAutoRetr(); - if(mmsAutoRetr) + if (mmsAutoRetr) { // Restore: - if(isExistingMmsAutoRetrRoamingBackup()) + if (isExistingMmsAutoRetrRoamingBackup()) getMsgSettings().setMmsAutoRetrRoaming(getMmsAutoRetrRoamingBackup()); - } - else - { + } else { // Save: setMmsAutoRetrRoamingBackup(getMsgSettings().getMmsAutoRetrRoaming()); getMsgSettings().setMmsAutoRetrRoaming(false); @@ -380,7 +367,7 @@ void Settings::onAttached(ViewItem &item) void Settings::callItemHandler(SettingsListItem &item) { SettingsListItem::MethodHandler m = item.getHandler(); - if(m) + if (m) (this->*m)(item); } @@ -389,7 +376,7 @@ void Settings::onListItemSelected(ListItem &listItem) MSG_LOG("Item: ", &listItem); listItem.setSelected(false); SettingsListItem *settingItem = dynamic_cast(&listItem); - if(settingItem) + if (settingItem) { settingItem->changeCheckButtonState(); callItemHandler(*settingItem); @@ -400,7 +387,7 @@ void Settings::onCheckButtonChanged(SettingsListViewItem &item) { MSG_LOG("Item: ", &item); SettingsListItem *settingItem = dynamic_cast(&item); - if(settingItem) + if (settingItem) callItemHandler(*settingItem); } @@ -418,6 +405,6 @@ void Settings::onLanguageChanged() void Settings::onButtonClicked(NaviFrameItem &item, NaviButtonId buttonId) { - if(buttonId == NaviPrevButtonId) + if (buttonId == NaviPrevButtonId) pop(); } diff --git a/src/Settings/Controller/src/SettingsSound.cpp b/src/Settings/Controller/src/SettingsSound.cpp index 3ddfba0b..161c77b8 100644 --- a/src/Settings/Controller/src/SettingsSound.cpp +++ b/src/Settings/Controller/src/SettingsSound.cpp @@ -56,14 +56,14 @@ static void soundPickerCb(app_control_h request, app_control_h reply, app_contro char *ringtone = nullptr; app_control_get_extra_data(reply, sRingtoneKeyResult, &ringtone); - if(!ringtone) + if (!ringtone) return; auto *settings = static_cast(user_data); - if(strcmp(ringtone, sRingtoneKeySilent) == 0) + if (strcmp(ringtone, sRingtoneKeySilent) == 0) settings->setRingtoneType(MsgSettings::SilentRingtone); - else if(strcmp(ringtone, sRingtoneKeyDefault) == 0) + else if (strcmp(ringtone, sRingtoneKeyDefault) == 0) settings->setRingtoneType(MsgSettings::DefaultRingtone); else { @@ -90,11 +90,11 @@ void SettingsSound::launchSoundPicker() app_control_add_extra_data(h, sRingtoneKeyTitle, msg("IDS_MSG_HEADER_MESSAGE_TONE_ABB").get()); std::string selectedData; - if(m_SettingsHandle.getRingtoneType() == MsgSettings::SilentRingtone) + if (m_SettingsHandle.getRingtoneType() == MsgSettings::SilentRingtone) selectedData = sRingtoneKeySilent; - else if(m_SettingsHandle.getRingtoneType() == MsgSettings::DefaultRingtone) + else if (m_SettingsHandle.getRingtoneType() == MsgSettings::DefaultRingtone) selectedData = sRingtoneKeyDefault; - else if(m_SettingsHandle.getRingtoneType() == MsgSettings::UserRingtone) + else if (m_SettingsHandle.getRingtoneType() == MsgSettings::UserRingtone) selectedData = m_SettingsHandle.getRingtone(); const char *selectedDataArray[] = {selectedData.c_str()}; diff --git a/src/Settings/Controller/src/SimListViewItem.cpp b/src/Settings/Controller/src/SimListViewItem.cpp index 7a284d1c..599208fb 100644 --- a/src/Settings/Controller/src/SimListViewItem.cpp +++ b/src/Settings/Controller/src/SimListViewItem.cpp @@ -51,7 +51,7 @@ void SimListViewItem::updateModel(const MessageSMS &msg) { const MsgAddressList &addressList = msg.getAddressList(); int length = addressList.getLength(); - for(int i = 0; i < length; ++i) + for (int i = 0; i < length; ++i) { m_Name += addressList.at(i).getAddress(); } @@ -63,12 +63,10 @@ void SimListViewItem::updateModel(const MessageSMS &msg) std::string SimListViewItem::getText(ListItem &item, const char *part) { - if(!strcmp(part, messagePart)) + if (!strcmp(part, messagePart)) { return TextDecorator::make(getMessage(), msgTextStyle); - } - else if(!strcmp(part, namePart)) - { + } else if (!strcmp(part, namePart)) { return TextDecorator::make(getName(), nameTextStyle); } diff --git a/src/Settings/View/inc/SimMsgLayout.h b/src/Settings/View/inc/SimMsgLayout.h index d1283628..cdf2e0a7 100644 --- a/src/Settings/View/inc/SimMsgLayout.h +++ b/src/Settings/View/inc/SimMsgLayout.h @@ -65,7 +65,6 @@ namespace Msg private: Evas_Object *m_pLayout; - }; } diff --git a/src/Settings/View/src/SettingsGroupListViewItem.cpp b/src/Settings/View/src/SettingsGroupListViewItem.cpp index d583a9f6..3b9dde38 100644 --- a/src/Settings/View/src/SettingsGroupListViewItem.cpp +++ b/src/Settings/View/src/SettingsGroupListViewItem.cpp @@ -36,7 +36,7 @@ SettingsGroupListViewItem::~SettingsGroupListViewItem() std::string SettingsGroupListViewItem::getText(ListItem &item, const char *part) { - if(!strcmp(part, "elm.text")) + if (!strcmp(part, "elm.text")) return msg(m_Title); else return ""; diff --git a/src/Settings/View/src/SettingsListViewItem.cpp b/src/Settings/View/src/SettingsListViewItem.cpp index b9630a9d..2f0133e6 100644 --- a/src/Settings/View/src/SettingsListViewItem.cpp +++ b/src/Settings/View/src/SettingsListViewItem.cpp @@ -54,7 +54,7 @@ void SettingsListViewItem::disabledCheckButton(bool disabled) void SettingsListViewItem::setCheckButtonState(bool state) { - if(m_CheckButtonState != state) + if (m_CheckButtonState != state) { m_CheckButtonState = state; update(); @@ -83,20 +83,16 @@ void SettingsListViewItem::setSubText(const std::string &text) std::string SettingsListViewItem::getText(ListItem &item, const char *part) { - if(getStyle().get() == oneLineIconStyle.get()) + if (getStyle().get() == oneLineIconStyle.get()) { - if(strcmp(part, "elm.text") == 0) + if (strcmp(part, "elm.text") == 0) return msg(m_MainText); - } - else if(getStyle().get() == multiLineStyle.get() || getStyle().get() == multiLineIconStyle.get()) - { - if(strcmp(part, "elm.text") == 0) + } else if (getStyle().get() == multiLineStyle.get() || getStyle().get() == multiLineIconStyle.get()) { + if (strcmp(part, "elm.text") == 0) return msg(m_MainText); - else if(strcmp(part, "elm.text.multiline") == 0) + else if (strcmp(part, "elm.text.multiline") == 0) return msg(m_SubText); - } - else - { + } else { MSG_LOG_ERROR("Unknown style"); } @@ -105,16 +101,12 @@ std::string SettingsListViewItem::getText(ListItem &item, const char *part) Evas_Object *SettingsListViewItem::getContent(ListItem &item, const char *part) { - if(getStyle().get() == oneLineIconStyle.get() || getStyle().get() == multiLineIconStyle.get()) + if (getStyle().get() == oneLineIconStyle.get() || getStyle().get() == multiLineIconStyle.get()) { - if(strcmp(part, "elm.swallow.end") == 0) + if (strcmp(part, "elm.swallow.end") == 0) return createCheckButton(*getOwner()); - } - else if(getStyle().get() == multiLineStyle.get()) - { - } - else - { + } else if (getStyle().get() == multiLineStyle.get()) { + } else { MSG_LOG_ERROR("Unknown style"); } @@ -124,7 +116,7 @@ Evas_Object *SettingsListViewItem::getContent(ListItem &item, const char *part) Evas_Object *SettingsListViewItem::createCheckButton(Evas_Object *parent) { Evas_Object *check = nullptr; - if(m_ShowCheckButton) + if (m_ShowCheckButton) { check = elm_check_add(parent); elm_object_focus_allow_set(check, false); @@ -146,6 +138,6 @@ void SettingsListViewItem::setListener(ISettingsListViewItemListener *listener) void SettingsListViewItem::onCheckButtonChanged(Evas_Object *obj, void *eventInfo) { - if(m_pListener) + if (m_pListener) m_pListener->onCheckButtonChanged(*this); } diff --git a/src/Settings/View/src/SimMsgLayout.cpp b/src/Settings/View/src/SimMsgLayout.cpp index 3759471f..2c1132d3 100644 --- a/src/Settings/View/src/SimMsgLayout.cpp +++ b/src/Settings/View/src/SimMsgLayout.cpp @@ -28,7 +28,6 @@ SimMsgLayout::SimMsgLayout(Evas_Object *parent) SimMsgLayout::~SimMsgLayout() { - } void SimMsgLayout::create(Evas_Object *parent) diff --git a/test/TC/TestAppControlUtils.cpp b/test/TC/TestAppControlUtils.cpp index 4cd34c3c..9363d05b 100644 --- a/test/TC/TestAppControlUtils.cpp +++ b/test/TC/TestAppControlUtils.cpp @@ -35,7 +35,7 @@ class TestAppControlUtils: public testing::Test app_control_h m_handle; }; -TEST_F( TestAppControlUtils, GetExtraData) +TEST_F(TestAppControlUtils, GetExtraData) { const std::string stringToBeFound("test-string"); app_control_add_extra_data(m_handle, APP_CONTROL_DATA_PATH, stringToBeFound.c_str()); @@ -45,7 +45,7 @@ TEST_F( TestAppControlUtils, GetExtraData) ASSERT_NE(stringToBeNotFound, AppControlUtils::getExtraData(m_handle, APP_CONTROL_DATA_PATH)); } -TEST_F( TestAppControlUtils, GetExtraDataArray) +TEST_F(TestAppControlUtils, GetExtraDataArray) { const size_t arrSize = 4; char* arr[] = {"hello", "world", "asdf", "qwerty"}; @@ -54,8 +54,8 @@ TEST_F( TestAppControlUtils, GetExtraDataArray) std::list gotList; AppControlUtils::getExtraDataArray(m_handle, APP_CONTROL_DATA_PATH, gotList); - int i=0; - for(auto num: gotList) + int i = 0; + for (auto num: gotList) { std::string s(arr[i]); ASSERT_EQ(s, num); @@ -63,7 +63,7 @@ TEST_F( TestAppControlUtils, GetExtraDataArray) } } -TEST_F( TestAppControlUtils, getExtraDataInt) +TEST_F(TestAppControlUtils, getExtraDataInt) { const char* numsStr = "100"; app_control_add_extra_data(m_handle, APP_CONTROL_DATA_SELECTED, numsStr); @@ -74,7 +74,7 @@ TEST_F( TestAppControlUtils, getExtraDataInt) ASSERT_EQ(s, std::to_string(number)); } -TEST_F( TestAppControlUtils, GetExtraDataIntArray) +TEST_F(TestAppControlUtils, GetExtraDataIntArray) { const std::size_t arrSize = 4; const char* numsStrList[] = {"1", "2", "3", "4"}; @@ -82,8 +82,8 @@ TEST_F( TestAppControlUtils, GetExtraDataIntArray) std::list gotNums; AppControlUtils::getExtraDataIntArray(m_handle, APP_CONTROL_DATA_SELECTED, gotNums); - int i=0; - for(auto num: gotNums) + int i = 0; + for (auto num: gotNums) { std::string s(numsStrList[i]); ASSERT_EQ(s, std::to_string(num)); diff --git a/test/TC/TestContactManager.cpp b/test/TC/TestContactManager.cpp index 6ce96ffb..f7198162 100644 --- a/test/TC/TestContactManager.cpp +++ b/test/TC/TestContactManager.cpp @@ -44,7 +44,7 @@ class TestContactManager: public testing::Test //____________________________________________________________________________// -TEST_F( TestContactManager, FindNameSasha ) +TEST_F(TestContactManager, FindNameSasha) { const std::string strNumber = "0936403503"; const std::string strName = "Sasha"; @@ -61,7 +61,7 @@ TEST_F( TestContactManager, FindNameSasha ) //____________________________________________________________________________// -TEST_F( TestContactManager, FindNameVova ) +TEST_F(TestContactManager, FindNameVova) { const std::string strNumber = "0501234567"; const std::string strName = "Vova"; @@ -79,7 +79,7 @@ TEST_F( TestContactManager, FindNameVova ) //____________________________________________________________________________// -TEST_F( TestContactManager, TestGetNameById ) +TEST_F(TestContactManager, TestGetNameById) { const std::string strNumber = "0971234567"; const std::string strName = "Test1"; @@ -96,7 +96,7 @@ TEST_F( TestContactManager, TestGetNameById ) //____________________________________________________________________________// -TEST_F( TestContactManager, TestRenameContact ) +TEST_F(TestContactManager, TestRenameContact) { const std::string strNumber = "0971234567"; const std::string strName = "Test1"; diff --git a/test/TC/TestMessageSender.cpp b/test/TC/TestMessageSender.cpp index 06163328..3394abe0 100644 --- a/test/TC/TestMessageSender.cpp +++ b/test/TC/TestMessageSender.cpp @@ -43,7 +43,7 @@ class TestMessageSender: public testing::Test //____________________________________________________________________________// -TEST_F( TestMessageSender, SendSms ) +TEST_F(TestMessageSender, SendSms) { std::string number = "0941234567"; @@ -68,7 +68,7 @@ TEST_F( TestMessageSender, SendSms ) //____________________________________________________________________________// -TEST_F( TestMessageSender, TestInvalidSmsHandle ) +TEST_F(TestMessageSender, TestInvalidSmsHandle) { MessageSMSRef sms; MsgTransport::SendResult result = m_Engine.getTransport().sendMessage(sms); diff --git a/test/TC/TestMsgUtils.cpp b/test/TC/TestMsgUtils.cpp index f8a5549d..b374b278 100644 --- a/test/TC/TestMsgUtils.cpp +++ b/test/TC/TestMsgUtils.cpp @@ -19,7 +19,7 @@ #include "MsgUtils.h" -TEST( TestMsgUtils, isValidNumberTest) +TEST(TestMsgUtils, isValidNumberTest) { ASSERT_TRUE(Msg::MsgUtils::isValidNumber("+3804534332")); ASSERT_TRUE(Msg::MsgUtils::isValidNumber("+38(045)34332")); @@ -46,7 +46,7 @@ TEST( TestMsgUtils, isValidNumberTest) ASSERT_FALSE(Msg::MsgUtils::isValidNumber("Contact Name")); } -TEST( TestMsgUtils, isValidEmailTest) +TEST(TestMsgUtils, isValidEmailTest) { ASSERT_TRUE(Msg::MsgUtils::isValidEmail("prettyandsimple@example.com")); ASSERT_TRUE(Msg::MsgUtils::isValidEmail("very.common@example.com")); @@ -72,7 +72,7 @@ TEST( TestMsgUtils, isValidEmailTest) ASSERT_FALSE(Msg::MsgUtils::isValidEmail("trailing space@example.com")); } -TEST( TestMsgUtils, makeNormalizedNumberTest) +TEST(TestMsgUtils, makeNormalizedNumberTest) { ASSERT_EQ(Msg::MsgUtils::makeNormalizedNumber("+38(045)34332"), "+3804534332"); ASSERT_EQ(Msg::MsgUtils::makeNormalizedNumber("+380453-43-32"), "+3804534332"); @@ -82,7 +82,7 @@ TEST( TestMsgUtils, makeNormalizedNumberTest) ASSERT_EQ(Msg::MsgUtils::makeNormalizedNumber("+38(045)343-32-12-115"), "+380453433212115"); } -TEST( TestMsgUtils, tokenizeRecipients) +TEST(TestMsgUtils, tokenizeRecipients) { Msg::TokenizedRecipients expectedResult = {{{"123", Msg::MsgAddress::Phone}, {"345", Msg::MsgAddress::Phone}}, ""}; Msg::TokenizedRecipients actualResult = Msg::MsgUtils::tokenizeRecipients("123,345"); diff --git a/test/TC/TestTextDecorator.cpp b/test/TC/TestTextDecorator.cpp index cd8bc103..94c4712b 100644 --- a/test/TC/TestTextDecorator.cpp +++ b/test/TC/TestTextDecorator.cpp @@ -38,7 +38,7 @@ TEST(TestTextDecorator, customStyleTest) ASSERT_NE(foundPos, std::string::npos); } -TEST( TestTextDecorator, defaultFormatTest ) +TEST(TestTextDecorator, defaultFormatTest) { std::string text("a text to format"); Msg::TextStyle defaultStyle; diff --git a/test/TC/TestTimeUtils.cpp b/test/TC/TestTimeUtils.cpp index 66335e78..67638b57 100644 --- a/test/TC/TestTimeUtils.cpp +++ b/test/TC/TestTimeUtils.cpp @@ -32,7 +32,7 @@ class TimeUtilsTest using namespace Msg; -TEST( TimeUtilsTest, ValidTime ) +TEST(TimeUtilsTest, ValidTime) { std::string systemLocale = TimeUtilsTest::getDefaultLocale(); // Save system locale before test start std::string localeTest = "en_"; -- 2.34.1