Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 // Copyright (c) 2011 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2011 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 <algorithm> | 5 #include <algorithm> |
| 6 #include <string> | 6 #include <string> |
| 7 #include <vector> | 7 #include <vector> |
| 8 | 8 |
| 9 #include "base/bind.h" | 9 #include "base/bind.h" |
| 10 #include "base/memory/scoped_ptr.h" | 10 #include "base/memory/scoped_ptr.h" |
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 287 | 287 |
| 288 TEST_F(EndToEndAsyncTest, TestSignal) { | 288 TEST_F(EndToEndAsyncTest, TestSignal) { |
| 289 const char kMessage[] = "hello, world"; | 289 const char kMessage[] = "hello, world"; |
| 290 // Send the test signal from the exported object. | 290 // Send the test signal from the exported object. |
| 291 test_service_->SendTestSignal(kMessage); | 291 test_service_->SendTestSignal(kMessage); |
| 292 // Receive the signal with the object proxy. The signal is handled in | 292 // Receive the signal with the object proxy. The signal is handled in |
| 293 // EndToEndAsyncTest::OnTestSignal() in the main thread. | 293 // EndToEndAsyncTest::OnTestSignal() in the main thread. |
| 294 WaitForTestSignal(); | 294 WaitForTestSignal(); |
| 295 ASSERT_EQ(kMessage, test_signal_string_); | 295 ASSERT_EQ(kMessage, test_signal_string_); |
| 296 } | 296 } |
| 297 | 297 |
|
Raghu Simha
2011/12/08 00:51:59
nit: Add an annotation to the bug ID with a TODO.
| |
| 298 TEST_F(EndToEndAsyncTest, TestSignalFromRoot) { | 298 TEST_F(EndToEndAsyncTest, FLAKY_TestSignalFromRoot) { |
| 299 const char kMessage[] = "hello, world"; | 299 const char kMessage[] = "hello, world"; |
| 300 // Send the test signal from the root object path, to see if we can | 300 // Send the test signal from the root object path, to see if we can |
| 301 // handle signals sent from "/", like dbus-send does. | 301 // handle signals sent from "/", like dbus-send does. |
| 302 test_service_->SendTestSignalFromRoot(kMessage); | 302 test_service_->SendTestSignalFromRoot(kMessage); |
| 303 // Receive the signal with the object proxy. The signal is handled in | 303 // Receive the signal with the object proxy. The signal is handled in |
| 304 // EndToEndAsyncTest::OnTestSignal() in the main thread. | 304 // EndToEndAsyncTest::OnTestSignal() in the main thread. |
| 305 WaitForTestSignal(); | 305 WaitForTestSignal(); |
| 306 ASSERT_EQ(kMessage, test_signal_string_); | 306 ASSERT_EQ(kMessage, test_signal_string_); |
| 307 } | 307 } |
| OLD | NEW |