Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(106)

Side by Side Diff: chromeos/network/network_sms_handler_unittest.cc

Issue 11365022: Add TestInterface methods for adding shill stub devices and services (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix ShillDeviceClientStubImpl::CallGetPropertiesAndBlock Created 8 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chromeos/network/network_sms_handler.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 // Use of this source code is governed by a BSD-style license that can be 2 // Use of this source code is governed by a BSD-style license that can be
3 // found in the LICENSE file. 3 // found in the LICENSE file.
4 4
5 #include "chromeos/network/network_sms_handler.h" 5 #include "chromeos/network/network_sms_handler.h"
6 6
7 #include <set> 7 #include <set>
8 #include <string> 8 #include <string>
9 9
10 #include "base/command_line.h" 10 #include "base/command_line.h"
11 #include "base/memory/scoped_ptr.h" 11 #include "base/memory/scoped_ptr.h"
12 #include "base/message_loop.h" 12 #include "base/message_loop.h"
13 #include "chromeos/chromeos_switches.h" 13 #include "chromeos/chromeos_switches.h"
14 #include "chromeos/dbus/dbus_thread_manager.h" 14 #include "chromeos/dbus/dbus_thread_manager.h"
15 #include "chromeos/dbus/shill_device_client.h"
16 #include "chromeos/dbus/shill_manager_client.h"
15 #include "testing/gtest/include/gtest/gtest.h" 17 #include "testing/gtest/include/gtest/gtest.h"
18 #include "third_party/cros_system_api/dbus/service_constants.h"
16 19
17 namespace chromeos { 20 namespace chromeos {
18 21
19 namespace { 22 namespace {
20 23
21 class TestObserver : public NetworkSmsHandler::Observer { 24 class TestObserver : public NetworkSmsHandler::Observer {
22 public: 25 public:
23 TestObserver() {} 26 TestObserver() {}
24 virtual ~TestObserver() {} 27 virtual ~TestObserver() {}
25 28
(...skipping 21 matching lines...) Expand all
47 } // namespace 50 } // namespace
48 51
49 class NetworkSmsHandlerTest : public testing::Test { 52 class NetworkSmsHandlerTest : public testing::Test {
50 public: 53 public:
51 NetworkSmsHandlerTest() {} 54 NetworkSmsHandlerTest() {}
52 virtual ~NetworkSmsHandlerTest() {} 55 virtual ~NetworkSmsHandlerTest() {}
53 56
54 virtual void SetUp() OVERRIDE { 57 virtual void SetUp() OVERRIDE {
55 // Initialize DBusThreadManager with a stub implementation. 58 // Initialize DBusThreadManager with a stub implementation.
56 DBusThreadManager::InitializeWithStub(); 59 DBusThreadManager::InitializeWithStub();
60 ShillManagerClient::TestInterface* manager_test =
61 DBusThreadManager::Get()->GetShillManagerClient()->GetTestInterface();
62 ASSERT_TRUE(manager_test);
63 manager_test->AddDevice("stub_cellular_device2");
64 ShillDeviceClient::TestInterface* device_test =
65 DBusThreadManager::Get()->GetShillDeviceClient()->GetTestInterface();
66 ASSERT_TRUE(device_test);
67 device_test->AddDevice("stub_cellular_device2", flimflam::kTypeCellular,
68 "/org/freedesktop/ModemManager1/stub/0", ":stub.0");
57 } 69 }
58 70
59 virtual void TearDown() OVERRIDE { 71 virtual void TearDown() OVERRIDE {
60 DBusThreadManager::Shutdown(); 72 DBusThreadManager::Shutdown();
61 } 73 }
62 74
63 protected: 75 protected:
64 MessageLoopForUI message_loop_; 76 MessageLoopForUI message_loop_;
65 }; 77 };
66 78
(...skipping 11 matching lines...) Expand all
78 scoped_ptr<TestObserver> test_observer(new TestObserver()); 90 scoped_ptr<TestObserver> test_observer(new TestObserver());
79 sms_handler->AddObserver(test_observer.get()); 91 sms_handler->AddObserver(test_observer.get());
80 sms_handler->Init(); 92 sms_handler->Init();
81 message_loop_.RunAllPending(); 93 message_loop_.RunAllPending();
82 EXPECT_EQ(test_observer->message_count(), 0); 94 EXPECT_EQ(test_observer->message_count(), 0);
83 95
84 // Test that no messages have been received yet 96 // Test that no messages have been received yet
85 const std::set<std::string>& messages(test_observer->messages()); 97 const std::set<std::string>& messages(test_observer->messages());
86 // Note: The following string corresponds to values in 98 // Note: The following string corresponds to values in
87 // ModemMessagingClientStubImpl and SmsClientStubImpl. 99 // ModemMessagingClientStubImpl and SmsClientStubImpl.
100 // TODO(stevenjb): Use a TestInterface to set this up to remove dependency.
88 const char kMessage1[] = "SMSClientStubImpl: Test Message: /SMS/0"; 101 const char kMessage1[] = "SMSClientStubImpl: Test Message: /SMS/0";
89 EXPECT_EQ(messages.find(kMessage1), messages.end()); 102 EXPECT_EQ(messages.find(kMessage1), messages.end());
90 103
91 // Test for messages delivered by signals. 104 // Test for messages delivered by signals.
92 test_observer->ClearMessages(); 105 test_observer->ClearMessages();
93 sms_handler->RequestUpdate(); 106 sms_handler->RequestUpdate();
94 message_loop_.RunAllPending(); 107 message_loop_.RunAllPending();
95 EXPECT_GE(test_observer->message_count(), 1); 108 EXPECT_GE(test_observer->message_count(), 1);
96 EXPECT_NE(messages.find(kMessage1), messages.end()); 109 EXPECT_NE(messages.find(kMessage1), messages.end());
97 } 110 }
98 111
99 } // namespace chromeos 112 } // namespace chromeos
OLDNEW
« no previous file with comments | « chromeos/network/network_sms_handler.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698