diff options
author | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-27 07:26:34 +0000 |
---|---|---|
committer | satorux@chromium.org <satorux@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-08-27 07:26:34 +0000 |
commit | ea78b1e8f6004bab26387cdd2a6bff6ccf108de6 (patch) | |
tree | d0ff8009b98d1db53852c85e6ecec3c307b46db2 /dbus/end_to_end_sync_unittest.cc | |
parent | e2dcc6bf7ba98799e0e289505dd685889dd5ccb2 (diff) | |
download | chromium_src-ea78b1e8f6004bab26387cdd2a6bff6ccf108de6.zip chromium_src-ea78b1e8f6004bab26387cdd2a6bff6ccf108de6.tar.gz chromium_src-ea78b1e8f6004bab26387cdd2a6bff6ccf108de6.tar.bz2 |
Minor cleanups and improvements for the D-Bus library.
- Add mock_export_object.{cc,h} to dbus.gyp, which were missing.
- Add a comment about shutdown of Bus in bus.h.
- Update mock_unittest.cc to call ShutdownAndBlock().
- Replace DCHECKs with LOG(ERROR)s followed by early exit.
- Add virtual to SetUp() and TearDown() in tests.
- Renamed a member variable to make it clearer.
BUG=chromium:90036
TEST=dbus_unittests
Review URL: http://codereview.chromium.org/7745044
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@98560 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'dbus/end_to_end_sync_unittest.cc')
-rw-r--r-- | dbus/end_to_end_sync_unittest.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/dbus/end_to_end_sync_unittest.cc b/dbus/end_to_end_sync_unittest.cc index fe0489a..87b261f 100644 --- a/dbus/end_to_end_sync_unittest.cc +++ b/dbus/end_to_end_sync_unittest.cc @@ -18,7 +18,7 @@ class EndToEndSyncTest : public testing::Test { EndToEndSyncTest() { } - void SetUp() { + virtual void SetUp() { // Start the test service; dbus::TestService::Options options; test_service_.reset(new dbus::TestService(options)); @@ -36,7 +36,7 @@ class EndToEndSyncTest : public testing::Test { ASSERT_FALSE(client_bus_->HasDBusThread()); } - void TearDown() { + virtual void TearDown() { test_service_->Shutdown(); ASSERT_TRUE(test_service_->WaitUntilServiceIsShutdown()); test_service_->Stop(); |