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

Side by Side Diff: chrome/browser/sync/syncable/syncable_unittest.cc

Issue 9483002: Move values_test_util.{h,cc} to base/test (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Addressed comments Created 8 years, 9 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « chrome/browser/sync/syncable/syncable_id_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 "chrome/browser/sync/syncable/syncable.h" 5 #include "chrome/browser/sync/syncable/syncable.h"
6 6
7 #include <string> 7 #include <string>
8 8
9 #include "base/compiler_specific.h" 9 #include "base/compiler_specific.h"
10 #include "base/file_path.h" 10 #include "base/file_path.h"
11 #include "base/file_util.h" 11 #include "base/file_util.h"
12 #include "base/location.h" 12 #include "base/location.h"
13 #include "base/logging.h" 13 #include "base/logging.h"
14 #include "base/memory/scoped_ptr.h" 14 #include "base/memory/scoped_ptr.h"
15 #include "base/message_loop.h" 15 #include "base/message_loop.h"
16 #include "base/scoped_temp_dir.h" 16 #include "base/scoped_temp_dir.h"
17 #include "base/stringprintf.h" 17 #include "base/stringprintf.h"
18 #include "base/synchronization/condition_variable.h" 18 #include "base/synchronization/condition_variable.h"
19 #include "base/test/values_test_util.h"
19 #include "base/threading/platform_thread.h" 20 #include "base/threading/platform_thread.h"
20 #include "base/values.h" 21 #include "base/values.h"
21 #include "chrome/browser/sync/engine/syncproto.h" 22 #include "chrome/browser/sync/engine/syncproto.h"
22 #include "chrome/browser/sync/internal_api/includes/test_unrecoverable_error_han dler.h" 23 #include "chrome/browser/sync/internal_api/includes/test_unrecoverable_error_han dler.h"
23 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h" 24 #include "chrome/browser/sync/protocol/bookmark_specifics.pb.h"
24 #include "chrome/browser/sync/syncable/directory_backing_store.h" 25 #include "chrome/browser/sync/syncable/directory_backing_store.h"
25 #include "chrome/browser/sync/syncable/directory_change_delegate.h" 26 #include "chrome/browser/sync/syncable/directory_change_delegate.h"
26 #include "chrome/browser/sync/test/engine/test_id_factory.h" 27 #include "chrome/browser/sync/test/engine/test_id_factory.h"
27 #include "chrome/browser/sync/test/engine/test_syncable_utils.h" 28 #include "chrome/browser/sync/test/engine/test_syncable_utils.h"
28 #include "chrome/browser/sync/test/null_directory_change_delegate.h" 29 #include "chrome/browser/sync/test/null_directory_change_delegate.h"
29 #include "chrome/browser/sync/test/null_transaction_observer.h" 30 #include "chrome/browser/sync/test/null_transaction_observer.h"
30 #include "chrome/test/base/values_test_util.h"
31 #include "testing/gtest/include/gtest/gtest.h" 31 #include "testing/gtest/include/gtest/gtest.h"
32 #include "third_party/sqlite/sqlite3.h" 32 #include "third_party/sqlite/sqlite3.h"
33 33
34 using browser_sync::TestIdFactory; 34 using browser_sync::TestIdFactory;
35 using test::ExpectDictBooleanValue; 35 using base::ExpectDictBooleanValue;
36 using test::ExpectDictStringValue; 36 using base::ExpectDictStringValue;
37 37
38 namespace syncable { 38 namespace syncable {
39 39
40 class SyncableKernelTest : public testing::Test {}; 40 class SyncableKernelTest : public testing::Test {};
41 41
42 // TODO(akalin): Add unit tests for EntryKernel::ContainsString(). 42 // TODO(akalin): Add unit tests for EntryKernel::ContainsString().
43 43
44 TEST_F(SyncableKernelTest, ToValue) { 44 TEST_F(SyncableKernelTest, ToValue) {
45 EntryKernel kernel; 45 EntryKernel kernel;
46 scoped_ptr<DictionaryValue> value(kernel.ToValue()); 46 scoped_ptr<DictionaryValue> value(kernel.ToValue());
(...skipping 1642 matching lines...) Expand 10 before | Expand all | Expand 10 after
1689 TEST_F(SyncableClientTagTest, TestClientTagIndexDuplicateServer) { 1689 TEST_F(SyncableClientTagTest, TestClientTagIndexDuplicateServer) {
1690 EXPECT_TRUE(CreateWithDefaultTag(factory_.NewServerId(), true)); 1690 EXPECT_TRUE(CreateWithDefaultTag(factory_.NewServerId(), true));
1691 EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), true)); 1691 EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), true));
1692 EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), false)); 1692 EXPECT_FALSE(CreateWithDefaultTag(factory_.NewServerId(), false));
1693 EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), false)); 1693 EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), false));
1694 EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), true)); 1694 EXPECT_FALSE(CreateWithDefaultTag(factory_.NewLocalId(), true));
1695 } 1695 }
1696 1696
1697 } // namespace 1697 } // namespace
1698 } // namespace syncable 1698 } // namespace syncable
OLDNEW
« no previous file with comments | « chrome/browser/sync/syncable/syncable_id_unittest.cc ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698