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

Unified Diff: dbus/dbus.gyp

Issue 7714030: Add mock classes for Bus, ObjectProxy, and ExportedObject. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix clang build Created 9 years, 4 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « dbus/bus.h ('k') | dbus/exported_object.h » ('j') | dbus/mock_bus.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: dbus/dbus.gyp
diff --git a/dbus/dbus.gyp b/dbus/dbus.gyp
index 143f672ed38bb7af88da5502c96c836778b1f95b..c17aecf06ac5ec9b611933ed80d48cb059668b13 100644
--- a/dbus/dbus.gyp
+++ b/dbus/dbus.gyp
@@ -17,8 +17,8 @@
'sources': [
'bus.cc',
'bus.h',
- 'exported_object.h',
'exported_object.cc',
+ 'exported_object.h',
'message.cc',
'message.h',
'object_proxy.cc',
@@ -27,20 +27,43 @@
],
},
{
+ # This target contains mocks that can be used to write unit tests
+ # without issuing actual D-Bus calls.
+ 'target_name': 'dbus_test_support',
+ 'type': 'static_library',
+ 'dependencies': [
+ '../build/linux/system.gyp:dbus',
+ '../testing/gmock.gyp:gmock',
+ 'dbus',
+ ],
+ 'sources': [
+ 'mock_bus.cc',
+ 'mock_bus.h',
+ 'mock_object_proxy.cc',
+ 'mock_object_proxy.h',
+ ],
+ 'include_dirs': [
+ '..',
+ ],
+ },
+ {
'target_name': 'dbus_unittests',
'type': 'executable',
'dependencies': [
- 'dbus',
'../base/base.gyp:test_support_base',
- '../testing/gtest.gyp:gtest',
'../build/linux/system.gyp:dbus',
+ '../testing/gmock.gyp:gmock',
+ '../testing/gtest.gyp:gtest',
+ 'dbus',
+ 'dbus_test_support',
],
'sources': [
'../base/test/run_all_unittests.cc',
'bus_unittest.cc',
- 'message_unittest.cc',
'end_to_end_async_unittest.cc',
'end_to_end_sync_unittest.cc',
+ 'message_unittest.cc',
+ 'mock_unittest.cc',
'test_service.cc',
'test_service.h',
],
« no previous file with comments | « dbus/bus.h ('k') | dbus/exported_object.h » ('j') | dbus/mock_bus.h » ('J')

Powered by Google App Engine
This is Rietveld 408576698