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

Side by Side Diff: chrome/browser/sync/syncable/syncable_id_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
OLDNEW
1 // Copyright (c) 2011 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_id.h" 5 #include "chrome/browser/sync/syncable/syncable_id.h"
6 6
7 #include <vector> 7 #include <vector>
8 8
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/test/values_test_util.h"
10 #include "base/values.h" 11 #include "base/values.h"
11 #include "chrome/browser/sync/test/engine/test_id_factory.h" 12 #include "chrome/browser/sync/test/engine/test_id_factory.h"
12 #include "chrome/test/base/values_test_util.h"
13 #include "testing/gtest/include/gtest/gtest.h" 13 #include "testing/gtest/include/gtest/gtest.h"
14 14
15 using std::vector; 15 using std::vector;
16 16
17 namespace syncable { 17 namespace syncable {
18 18
19 using browser_sync::TestIdFactory; 19 using browser_sync::TestIdFactory;
20 20
21 class SyncableIdTest : public testing::Test { }; 21 class SyncableIdTest : public testing::Test { };
22 22
(...skipping 55 matching lines...) Expand 10 before | Expand all | Expand 10 after
78 ASSERT_GT(j->GetLexicographicSuccessor(), *i); 78 ASSERT_GT(j->GetLexicographicSuccessor(), *i);
79 ASSERT_GT(j->GetLexicographicSuccessor(), 79 ASSERT_GT(j->GetLexicographicSuccessor(),
80 i->GetLexicographicSuccessor()); 80 i->GetLexicographicSuccessor());
81 ASSERT_GT(*j, i->GetLexicographicSuccessor()); 81 ASSERT_GT(*j, i->GetLexicographicSuccessor());
82 } 82 }
83 } 83 }
84 } 84 }
85 } 85 }
86 86
87 TEST(SyncableIdTest, ToValue) { 87 TEST(SyncableIdTest, ToValue) {
88 test::ExpectStringValue("r", Id::CreateFromServerId("0").ToValue()); 88 base::ExpectStringValue("r", Id::CreateFromServerId("0").ToValue());
89 test::ExpectStringValue("svalue", Id::CreateFromServerId("value").ToValue()); 89 base::ExpectStringValue("svalue", Id::CreateFromServerId("value").ToValue());
90 90
91 test::ExpectStringValue("r", Id::CreateFromClientString("0").ToValue()); 91 base::ExpectStringValue("r", Id::CreateFromClientString("0").ToValue());
92 test::ExpectStringValue("cvalue", 92 base::ExpectStringValue("cvalue",
93 Id::CreateFromClientString("value").ToValue()); 93 Id::CreateFromClientString("value").ToValue());
94 } 94 }
95 95
96 } // namespace syncable 96 } // namespace syncable
OLDNEW
« no previous file with comments | « chrome/browser/sync/syncable/model_type_unittest.cc ('k') | chrome/browser/sync/syncable/syncable_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698