diff options
| author | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-31 23:39:25 +0000 |
|---|---|---|
| committer | akalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-08-31 23:39:25 +0000 |
| commit | 33596da5267a8a3e2e6cb0d44bbc8660f615b878 (patch) | |
| tree | ee9e5b9c4ea8bc6f8d0592f9f784a6a67c447f48 /sync/sync.gyp | |
| parent | 939532d0da8b6e19f3424c9a8a6cac9fc1dc5e12 (diff) | |
| download | chromium_src-33596da5267a8a3e2e6cb0d44bbc8660f615b878.zip chromium_src-33596da5267a8a3e2e6cb0d44bbc8660f615b878.tar.gz chromium_src-33596da5267a8a3e2e6cb0d44bbc8660f615b878.tar.bz2 | |
[Sync] Rework Invalidator-related unit tests
Introduce invalidator_test_template.h, which contains tests that should be used for each Invalidator implementation. Make all Invalidator implementations, and also InvalidatorRegistrar, instantiate that test template. Move most InvalidatorRegistrar tests and some of the other Invalidator implementation tests to the template.
Make P2PInvalidator support arbitrary object IDs. Also make SendInvalidation take an ObjectIdStateMap.
Simplify BridgedInvalidator a bit; it no longer requires a call to UpdateEnabledTypes (it just uses all registered types from its registrar).
Rework tests for BridgedInvalidator/ChromeSyncNotifierBridge to not require functions in ChromeSyncNotifierBridge to be marked virtual.
Add conversions to/from Values for InvalidationState, ObjectId, and ObjectIdStateMap.
BUG=141678
Review URL: https://chromiumcodereview.appspot.com/10874096
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@154538 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sync/sync.gyp')
| -rw-r--r-- | sync/sync.gyp | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sync/sync.gyp b/sync/sync.gyp index a5a9e80..9d68359 100644 --- a/sync/sync.gyp +++ b/sync/sync.gyp @@ -41,6 +41,7 @@ 'sources': [ 'base/sync_export.h', 'internal_api/public/base/enum_set.h', + 'internal_api/public/base/invalidation_state.cc', 'internal_api/public/base/invalidation_state.h', 'internal_api/public/base/model_type.h', 'internal_api/public/base/model_type_state_map.cc', @@ -488,6 +489,7 @@ 'notifier/fake_invalidator.h', 'notifier/fake_invalidation_handler.cc', 'notifier/fake_invalidation_handler.h', + 'notifier/invalidator_test_template.h', 'notifier/object_id_state_map_test_util.cc', 'notifier/object_id_state_map_test_util.h', ], @@ -577,7 +579,6 @@ 'test_support_sync', ], 'direct_dependent_settings': { - 'variables': { 'enable_wexit_time_destructors': 1, }, 'include_dirs': [ '..', ], @@ -664,7 +665,6 @@ 'test_support_sync_notifier', ], 'direct_dependent_settings': { - 'variables': { 'enable_wexit_time_destructors': 1, }, 'include_dirs': [ '..', ], @@ -676,6 +676,7 @@ 'sources': [ 'notifier/chrome_invalidation_client_unittest.cc', 'notifier/chrome_system_resources_unittest.cc', + 'notifier/fake_invalidator_unittest.cc', 'notifier/invalidation_notifier_unittest.cc', 'notifier/invalidator_registrar_unittest.cc', 'notifier/non_blocking_invalidator_unittest.cc', @@ -724,7 +725,6 @@ 'test_support_syncapi_core', ], 'direct_dependent_settings': { - 'variables': { 'enable_wexit_time_destructors': 1, }, 'include_dirs': [ '..', ], @@ -770,7 +770,6 @@ 'test_support_syncapi_service', ], 'direct_dependent_settings': { - 'variables': { 'enable_wexit_time_destructors': 1, }, 'include_dirs': [ '..', ], @@ -785,6 +784,8 @@ { 'target_name': 'sync_unit_tests', 'type': '<(gtest_target_type)', + # Typed-parametrized tests generate exit-time destructors. + 'variables': { 'enable_wexit_time_destructors': 0, }, 'dependencies': [ '../base/base.gyp:run_all_unittests', 'sync_tests', |