Chromium Code Reviews| OLD | NEW |
|---|---|
| (Empty) | |
| 1 // Copyright 2016 The Chromium Authors. All rights reserved. | |
|
James Cook
2017/02/10 17:36:38
2017 unless this is mostly a move
yiyix
2017/02/13 23:34:00
Done.
| |
| 2 // Use of this source code is governed by a BSD-style license that can be | |
| 3 // found in the LICENSE file. | |
| 4 | |
| 5 #include "ash/common/system/chromeos/network/sms_observer.h" | |
|
James Cook
2017/02/10 17:36:38
nit: blank line below
yiyix
2017/02/13 23:34:00
Done.
| |
| 6 #include "ash/common/shelf/shelf_widget.h" | |
| 7 #include "ash/common/shelf/wm_shelf.h" | |
| 8 #include "ash/public/interfaces/vpn_list.mojom.h" | |
| 9 #include "ash/test/ash_test_base.h" | |
| 10 #include "base/macros.h" | |
| 11 #include "base/strings/utf_string_conversions.h" | |
| 12 #include "testing/gtest/include/gtest/gtest.h" | |
| 13 #include "ui/base/l10n/l10n_util.h" | |
| 14 #include "ui/message_center/message_center.h" | |
| 15 #include "ui/message_center/notification.h" | |
| 16 #include "ui/message_center/notification_list.h" | |
| 17 | |
| 18 namespace ash { | |
| 19 namespace test { | |
| 20 | |
| 21 class SmsObserverTest : public AshTestBase { | |
| 22 public: | |
| 23 SmsObserverTest() {} | |
| 24 ~SmsObserverTest() override {} | |
| 25 | |
| 26 SmsObserver* GetSmsObserver(ShelfWidget* shelf_widget) { | |
| 27 return shelf_widget->sms_observer_.get(); | |
| 28 } | |
| 29 | |
| 30 private: | |
| 31 DISALLOW_COPY_AND_ASSIGN(SmsObserverTest); | |
| 32 }; | |
| 33 | |
| 34 std::unique_ptr<base::DictionaryValue> CreateMessage( | |
|
James Cook
2017/02/10 17:36:38
put in anonymous namespace
yiyix
2017/02/13 23:34:00
Done. Is it true that unless it's class specific h
James Cook
2017/02/14 02:04:38
Yes. Unless you need to access it from outside the
| |
| 35 const char* kDefaultNumber, | |
|
James Cook
2017/02/10 17:36:38
default_number (and below)
yiyix
2017/02/13 23:34:00
Done.
| |
| 36 const char* kDefaultMessage, | |
| 37 const char* kDefaultTimestamp) { | |
| 38 std::unique_ptr<base::DictionaryValue> sms(new base::DictionaryValue()); | |
|
James Cook
2017/02/10 17:36:38
prefer MakeUnique
yiyix
2017/02/13 23:34:00
Done.
| |
| 39 if (kDefaultNumber) | |
| 40 sms->SetString("number", kDefaultNumber); | |
| 41 if (kDefaultMessage) | |
| 42 sms->SetString("text", kDefaultMessage); | |
| 43 if (kDefaultTimestamp) | |
| 44 sms->SetString("timestamp", kDefaultMessage); | |
| 45 return sms; | |
| 46 } | |
| 47 | |
| 48 // Verify if notification is received after receiving a sms message with | |
| 49 // number and content. | |
| 50 TEST_F(SmsObserverTest, SendTextMessage) { | |
| 51 SmsObserver* sms_observer = GetSmsObserver(GetPrimaryShelf()->shelf_widget()); | |
| 52 EXPECT_EQ( | |
| 53 0u, | |
| 54 message_center::MessageCenter::Get()->GetVisibleNotifications().size()); | |
| 55 | |
| 56 sms_observer->MessageReceived(*CreateMessage("000-000-0000", | |
|
James Cook
2017/02/10 17:36:38
nit: put result of CreateMessage in a local var. I
yiyix
2017/02/13 23:34:00
Done.
| |
| 57 "FakeSMSClient: Test Message.", | |
| 58 "Fri Jun 8 13:26:04 EDT 2016")); | |
| 59 | |
| 60 const message_center::NotificationList::Notifications notifications = | |
| 61 message_center::MessageCenter::Get()->GetVisibleNotifications(); | |
| 62 EXPECT_EQ(1u, notifications.size()); | |
| 63 | |
| 64 EXPECT_EQ((*notifications.begin())->title(), | |
|
James Cook
2017/02/10 17:36:38
nit: revert EXPECT_EQ parameters so expected value
yiyix
2017/02/13 23:34:00
Done.
| |
| 65 base::ASCIIToUTF16("000-000-0000")); | |
| 66 EXPECT_EQ((*notifications.begin())->message(), | |
| 67 base::ASCIIToUTF16("FakeSMSClient: Test Message.")); | |
| 68 message_center::MessageCenter::Get()->RemoveAllNotifications( | |
| 69 false /* by_user */, message_center::MessageCenter::RemoveType::ALL); | |
| 70 EXPECT_EQ( | |
| 71 0u, | |
| 72 message_center::MessageCenter::Get()->GetVisibleNotifications().size()); | |
|
James Cook
2017/02/10 17:36:38
optional: using message_center::MessageCenter if i
yiyix
2017/02/13 23:34:00
Done.
| |
| 73 } | |
| 74 | |
| 75 // Verify if no notification is received if phone number is missing in sms | |
| 76 // message. | |
| 77 TEST_F(SmsObserverTest, TextMessageMissingNumber) { | |
| 78 SmsObserver* sms_observer = GetSmsObserver(GetPrimaryShelf()->shelf_widget()); | |
| 79 EXPECT_EQ( | |
| 80 0u, | |
| 81 message_center::MessageCenter::Get()->GetVisibleNotifications().size()); | |
| 82 sms_observer->MessageReceived(*CreateMessage( | |
| 83 nullptr, "FakeSMSClient: Test Message.", "Fri Jun 8 13:26:04 EDT 2016")); | |
| 84 EXPECT_EQ( | |
| 85 0u, | |
| 86 message_center::MessageCenter::Get()->GetVisibleNotifications().size()); | |
| 87 } | |
| 88 | |
| 89 // Verify if no notification is received if text body is empty in sms message. | |
| 90 TEST_F(SmsObserverTest, TextMessageEmptyText) { | |
| 91 SmsObserver* sms_observer = GetSmsObserver(GetPrimaryShelf()->shelf_widget()); | |
| 92 EXPECT_EQ( | |
| 93 0u, | |
| 94 message_center::MessageCenter::Get()->GetVisibleNotifications().size()); | |
| 95 sms_observer->MessageReceived( | |
| 96 *CreateMessage("000-000-0000", "", "Fri Jun 8 13:26:04 EDT 2016")); | |
| 97 EXPECT_EQ( | |
| 98 0u, | |
| 99 message_center::MessageCenter::Get()->GetVisibleNotifications().size()); | |
| 100 } | |
| 101 | |
| 102 // Verify if no notification is received if the text is missing in sms message. | |
| 103 TEST_F(SmsObserverTest, TextMessageMissingText) { | |
| 104 SmsObserver* sms_observer = GetSmsObserver(GetPrimaryShelf()->shelf_widget()); | |
| 105 EXPECT_EQ( | |
| 106 0u, | |
| 107 message_center::MessageCenter::Get()->GetVisibleNotifications().size()); | |
| 108 sms_observer->MessageReceived( | |
| 109 *CreateMessage("000-000-0000", nullptr, "Fri Jun 8 13:26:04 EDT 2016")); | |
| 110 EXPECT_EQ( | |
| 111 0u, | |
| 112 message_center::MessageCenter::Get()->GetVisibleNotifications().size()); | |
| 113 } | |
| 114 | |
| 115 // Verify if 2 notification received after receiving 2 sms messages from the | |
| 116 // same number. | |
| 117 TEST_F(SmsObserverTest, MultipleTextMessages) { | |
| 118 SmsObserver* sms_observer = GetSmsObserver(GetPrimaryShelf()->shelf_widget()); | |
| 119 EXPECT_EQ( | |
| 120 0u, | |
| 121 message_center::MessageCenter::Get()->GetVisibleNotifications().size()); | |
| 122 | |
| 123 sms_observer->MessageReceived(*CreateMessage("000-000-0000", "first message", | |
| 124 "Fri Jun 8 13:26:04 EDT 2016")); | |
| 125 | |
| 126 sms_observer->MessageReceived(*CreateMessage("000-000-0000", "second message", | |
| 127 "Fri Jun 8 13:26:04 EDT 2016")); | |
| 128 const message_center::NotificationList::Notifications notifications = | |
| 129 message_center::MessageCenter::Get()->GetVisibleNotifications(); | |
| 130 EXPECT_EQ(2u, notifications.size()); | |
| 131 | |
| 132 for (message_center::Notification* iter : notifications) { | |
| 133 if (iter->id().find("chrome://network/sms1") != std::string::npos) { | |
| 134 EXPECT_EQ(iter->title(), base::ASCIIToUTF16("000-000-0000")); | |
| 135 EXPECT_EQ(iter->message(), base::ASCIIToUTF16("first message")); | |
| 136 } else if (iter->id().find("chrome://network/sms2") != std::string::npos) { | |
| 137 EXPECT_EQ(iter->title(), base::ASCIIToUTF16("000-000-0000")); | |
| 138 EXPECT_EQ(iter->message(), base::ASCIIToUTF16("second message")); | |
| 139 } else { | |
| 140 ASSERT_TRUE(false); | |
| 141 } | |
| 142 } | |
| 143 } | |
| 144 | |
| 145 } // namespace test | |
| 146 } // namespace ash | |
| OLD | NEW |