| OLD | NEW |
| 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" |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 // first test message until RequestUpdate has been called. | 74 // first test message until RequestUpdate has been called. |
| 75 network_sms_handler_.reset(new NetworkSmsHandler()); | 75 network_sms_handler_.reset(new NetworkSmsHandler()); |
| 76 network_sms_handler_->Init(); | 76 network_sms_handler_->Init(); |
| 77 test_observer_.reset(new TestObserver()); | 77 test_observer_.reset(new TestObserver()); |
| 78 network_sms_handler_->AddObserver(test_observer_.get()); | 78 network_sms_handler_->AddObserver(test_observer_.get()); |
| 79 network_sms_handler_->RequestUpdate(true); | 79 network_sms_handler_->RequestUpdate(true); |
| 80 message_loop_.RunUntilIdle(); | 80 message_loop_.RunUntilIdle(); |
| 81 } | 81 } |
| 82 | 82 |
| 83 void TearDown() override { | 83 void TearDown() override { |
| 84 network_sms_handler_->RemoveObserver(test_observer_.get()); |
| 84 network_sms_handler_.reset(); | 85 network_sms_handler_.reset(); |
| 85 DBusThreadManager::Shutdown(); | 86 DBusThreadManager::Shutdown(); |
| 86 } | 87 } |
| 87 | 88 |
| 88 protected: | 89 protected: |
| 89 base::MessageLoopForUI message_loop_; | 90 base::MessageLoopForUI message_loop_; |
| 90 scoped_ptr<NetworkSmsHandler> network_sms_handler_; | 91 scoped_ptr<NetworkSmsHandler> network_sms_handler_; |
| 91 scoped_ptr<TestObserver> test_observer_; | 92 scoped_ptr<TestObserver> test_observer_; |
| 92 }; | 93 }; |
| 93 | 94 |
| (...skipping 10 matching lines...) Expand all Loading... |
| 104 | 105 |
| 105 // Test for messages delivered by signals. | 106 // Test for messages delivered by signals. |
| 106 test_observer_->ClearMessages(); | 107 test_observer_->ClearMessages(); |
| 107 network_sms_handler_->RequestUpdate(false); | 108 network_sms_handler_->RequestUpdate(false); |
| 108 message_loop_.RunUntilIdle(); | 109 message_loop_.RunUntilIdle(); |
| 109 EXPECT_GE(test_observer_->message_count(), 1); | 110 EXPECT_GE(test_observer_->message_count(), 1); |
| 110 EXPECT_NE(messages.find(kMessage1), messages.end()); | 111 EXPECT_NE(messages.find(kMessage1), messages.end()); |
| 111 } | 112 } |
| 112 | 113 |
| 113 } // namespace chromeos | 114 } // namespace chromeos |
| OLD | NEW |