OLD | NEW |
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 <string> | 5 #include <string> |
6 | 6 |
7 #include "base/guid.h" | 7 #include "base/guid.h" |
8 #include "base/macros.h" | 8 #include "base/macros.h" |
9 #include "base/strings/stringprintf.h" | 9 #include "base/strings/stringprintf.h" |
10 #include "chrome/browser/sync/test/integration/preferences_helper.h" | 10 #include "chrome/browser/sync/test/integration/preferences_helper.h" |
11 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" | 11 #include "chrome/browser/sync/test/integration/profile_sync_service_harness.h" |
12 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" | 12 #include "chrome/browser/sync/test/integration/sync_integration_test_util.h" |
13 #include "chrome/browser/sync/test/integration/sync_test.h" | 13 #include "chrome/browser/sync/test/integration/sync_test.h" |
14 #include "chrome/common/pref_names.h" | 14 #include "chrome/common/pref_names.h" |
15 #include "components/prefs/pref_service.h" | 15 #include "components/prefs/pref_service.h" |
16 | 16 |
17 using preferences_helper::AwaitBooleanPrefMatches; | |
18 using preferences_helper::AwaitIntegerPrefMatches; | |
19 using preferences_helper::AwaitListPrefMatches; | |
20 using preferences_helper::AwaitStringPrefMatches; | |
21 using preferences_helper::BooleanPrefMatches; | 17 using preferences_helper::BooleanPrefMatches; |
22 using preferences_helper::ChangeBooleanPref; | 18 using preferences_helper::ChangeBooleanPref; |
23 using preferences_helper::ChangeIntegerPref; | 19 using preferences_helper::ChangeIntegerPref; |
24 using preferences_helper::ChangeListPref; | 20 using preferences_helper::ChangeListPref; |
25 using preferences_helper::ChangeStringPref; | 21 using preferences_helper::ChangeStringPref; |
26 using preferences_helper::GetPrefs; | 22 using preferences_helper::GetPrefs; |
27 | 23 |
28 class TwoClientPreferencesSyncTest : public SyncTest { | 24 class TwoClientPreferencesSyncTest : public SyncTest { |
29 public: | 25 public: |
30 TwoClientPreferencesSyncTest() : SyncTest(TWO_CLIENT) {} | 26 TwoClientPreferencesSyncTest() : SyncTest(TWO_CLIENT) {} |
31 ~TwoClientPreferencesSyncTest() override {} | 27 ~TwoClientPreferencesSyncTest() override {} |
32 | 28 |
33 bool TestUsesSelfNotifications() override { return false; } | 29 bool TestUsesSelfNotifications() override { return false; } |
34 | 30 |
35 private: | 31 private: |
36 DISALLOW_COPY_AND_ASSIGN(TwoClientPreferencesSyncTest); | 32 DISALLOW_COPY_AND_ASSIGN(TwoClientPreferencesSyncTest); |
37 }; | 33 }; |
38 | 34 |
39 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, E2E_ONLY(Sanity)) { | 35 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, E2E_ONLY(Sanity)) { |
40 DisableVerifier(); | 36 DisableVerifier(); |
41 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; | 37 ASSERT_TRUE(SetupSync()) << "SetupSync() failed."; |
42 ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage)); | 38 ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait()); |
43 const std::string new_home_page = base::StringPrintf( | 39 const std::string new_home_page = base::StringPrintf( |
44 "https://example.com/%s", base::GenerateGUID().c_str()); | 40 "https://example.com/%s", base::GenerateGUID().c_str()); |
45 ChangeStringPref(0, prefs::kHomePage, new_home_page); | 41 ChangeStringPref(0, prefs::kHomePage, new_home_page); |
46 ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage)); | 42 ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait()); |
47 for (int i = 0; i < num_clients(); ++i) { | 43 for (int i = 0; i < num_clients(); ++i) { |
48 ASSERT_EQ(new_home_page, GetPrefs(i)->GetString(prefs::kHomePage)); | 44 ASSERT_EQ(new_home_page, GetPrefs(i)->GetString(prefs::kHomePage)); |
49 } | 45 } |
50 } | 46 } |
51 | 47 |
52 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, E2E_ENABLED(BooleanPref)) { | 48 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, E2E_ENABLED(BooleanPref)) { |
53 ASSERT_TRUE(SetupSync()); | 49 ASSERT_TRUE(SetupSync()); |
54 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage)); | 50 ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kHomePageIsNewTabPage).Wait()); |
55 | 51 |
56 ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage); | 52 ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage); |
57 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage)); | 53 ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kHomePageIsNewTabPage).Wait()); |
58 } | 54 } |
59 | 55 |
60 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, | 56 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, |
61 E2E_ENABLED(Bidirectional)) { | 57 E2E_ENABLED(Bidirectional)) { |
62 ASSERT_TRUE(SetupSync()); | 58 ASSERT_TRUE(SetupSync()); |
63 | 59 |
64 ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage)); | 60 ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait()); |
65 | 61 |
66 ChangeStringPref(0, prefs::kHomePage, "http://www.google.com/0"); | 62 ChangeStringPref(0, prefs::kHomePage, "http://www.google.com/0"); |
67 ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage)); | 63 ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait()); |
68 EXPECT_EQ("http://www.google.com/0", GetPrefs(0)->GetString(prefs::kHomePage))
; | 64 EXPECT_EQ("http://www.google.com/0", |
| 65 GetPrefs(0)->GetString(prefs::kHomePage)); |
69 | 66 |
70 ChangeStringPref(1, prefs::kHomePage, "http://www.google.com/1"); | 67 ChangeStringPref(1, prefs::kHomePage, "http://www.google.com/1"); |
71 ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage)); | 68 ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait()); |
72 EXPECT_EQ("http://www.google.com/1", GetPrefs(0)->GetString(prefs::kHomePage))
; | 69 EXPECT_EQ("http://www.google.com/1", |
| 70 GetPrefs(0)->GetString(prefs::kHomePage)); |
73 } | 71 } |
74 | 72 |
75 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, | 73 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, |
76 E2E_ENABLED(UnsyncableBooleanPref)) { | 74 E2E_ENABLED(UnsyncableBooleanPref)) { |
77 ASSERT_TRUE(SetupSync()); | 75 ASSERT_TRUE(SetupSync()); |
78 DisableVerifier(); | 76 DisableVerifier(); |
79 ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage)); | 77 ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait()); |
80 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kDisableScreenshots)); | 78 ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kDisableScreenshots).Wait()); |
81 | 79 |
82 // This pref is not syncable. | 80 // This pref is not syncable. |
83 ChangeBooleanPref(0, prefs::kDisableScreenshots); | 81 ChangeBooleanPref(0, prefs::kDisableScreenshots); |
84 | 82 |
85 // This pref is syncable. | 83 // This pref is syncable. |
86 ChangeStringPref(0, prefs::kHomePage, "http://news.google.com"); | 84 ChangeStringPref(0, prefs::kHomePage, "http://news.google.com"); |
87 | 85 |
88 // Wait until the syncable pref is synced, then expect that the non-syncable | 86 // Wait until the syncable pref is synced, then expect that the non-syncable |
89 // one is still out of sync. | 87 // one is still out of sync. |
90 ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage)); | 88 ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait()); |
91 ASSERT_FALSE(BooleanPrefMatches(prefs::kDisableScreenshots)); | 89 ASSERT_FALSE(BooleanPrefMatches(prefs::kDisableScreenshots)); |
92 } | 90 } |
93 | 91 |
94 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, E2E_ENABLED(StringPref)) { | 92 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, E2E_ENABLED(StringPref)) { |
95 ASSERT_TRUE(SetupSync()); | 93 ASSERT_TRUE(SetupSync()); |
96 ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage)); | 94 ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait()); |
97 | 95 |
98 ChangeStringPref(0, prefs::kHomePage, "http://news.google.com"); | 96 ChangeStringPref(0, prefs::kHomePage, "http://news.google.com"); |
99 ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage)); | 97 ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait()); |
100 } | 98 } |
101 | 99 |
102 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, | 100 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, |
103 E2E_ENABLED(ComplexPrefs)) { | 101 E2E_ENABLED(ComplexPrefs)) { |
104 ASSERT_TRUE(SetupSync()); | 102 ASSERT_TRUE(SetupSync()); |
105 ASSERT_TRUE(AwaitIntegerPrefMatches(prefs::kRestoreOnStartup)); | 103 ASSERT_TRUE(IntegerPrefMatchChecker(prefs::kRestoreOnStartup).Wait()); |
106 ASSERT_TRUE(AwaitListPrefMatches(prefs::kURLsToRestoreOnStartup)); | 104 ASSERT_TRUE(ListPrefMatchChecker(prefs::kURLsToRestoreOnStartup).Wait()); |
107 | 105 |
108 ChangeIntegerPref(0, prefs::kRestoreOnStartup, 0); | 106 ChangeIntegerPref(0, prefs::kRestoreOnStartup, 0); |
109 ASSERT_TRUE(AwaitIntegerPrefMatches(prefs::kRestoreOnStartup)); | 107 ASSERT_TRUE(IntegerPrefMatchChecker(prefs::kRestoreOnStartup).Wait()); |
110 | 108 |
111 base::ListValue urls; | 109 base::ListValue urls; |
112 urls.AppendString("http://www.google.com/"); | 110 urls.AppendString("http://www.google.com/"); |
113 urls.AppendString("http://www.flickr.com/"); | 111 urls.AppendString("http://www.flickr.com/"); |
114 ChangeIntegerPref(0, prefs::kRestoreOnStartup, 4); | 112 ChangeIntegerPref(0, prefs::kRestoreOnStartup, 4); |
115 ChangeListPref(0, prefs::kURLsToRestoreOnStartup, urls); | 113 ChangeListPref(0, prefs::kURLsToRestoreOnStartup, urls); |
116 ASSERT_TRUE(AwaitIntegerPrefMatches(prefs::kRestoreOnStartup)); | 114 ASSERT_TRUE(IntegerPrefMatchChecker(prefs::kRestoreOnStartup).Wait()); |
117 ASSERT_TRUE(AwaitListPrefMatches(prefs::kURLsToRestoreOnStartup)); | 115 ASSERT_TRUE(ListPrefMatchChecker(prefs::kURLsToRestoreOnStartup).Wait()); |
118 } | 116 } |
119 | 117 |
120 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, | 118 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, |
121 E2E_ENABLED(SingleClientEnabledEncryptionBothChanged)) { | 119 E2E_ENABLED(SingleClientEnabledEncryptionBothChanged)) { |
122 ASSERT_TRUE(SetupSync()); | 120 ASSERT_TRUE(SetupSync()); |
123 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage)); | 121 ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kHomePageIsNewTabPage).Wait()); |
124 ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage)); | 122 ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait()); |
125 | 123 |
126 ASSERT_TRUE(EnableEncryption(0)); | 124 ASSERT_TRUE(EnableEncryption(0)); |
127 ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage); | 125 ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage); |
128 ChangeStringPref(1, prefs::kHomePage, "http://www.google.com/1"); | 126 ChangeStringPref(1, prefs::kHomePage, "http://www.google.com/1"); |
129 ASSERT_TRUE(AwaitEncryptionComplete(0)); | 127 ASSERT_TRUE(AwaitEncryptionComplete(0)); |
130 ASSERT_TRUE(AwaitEncryptionComplete(1)); | 128 ASSERT_TRUE(AwaitEncryptionComplete(1)); |
131 ASSERT_TRUE(AwaitStringPrefMatches(prefs::kHomePage)); | 129 ASSERT_TRUE(StringPrefMatchChecker(prefs::kHomePage).Wait()); |
132 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage)); | 130 ASSERT_TRUE(BooleanPrefMatches(prefs::kHomePageIsNewTabPage)); |
133 } | 131 } |
134 | 132 |
135 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, | 133 IN_PROC_BROWSER_TEST_F(TwoClientPreferencesSyncTest, |
136 E2E_ENABLED(BothClientsEnabledEncryptionAndChangedMultipleTimes)) { | 134 E2E_ENABLED(BothClientsEnabledEncryptionAndChangedMultipleTimes)) { |
137 ASSERT_TRUE(SetupSync()); | 135 ASSERT_TRUE(SetupSync()); |
138 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage)); | 136 ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kHomePageIsNewTabPage).Wait()); |
139 | 137 |
140 ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage); | 138 ChangeBooleanPref(0, prefs::kHomePageIsNewTabPage); |
141 ASSERT_TRUE(EnableEncryption(0)); | 139 ASSERT_TRUE(EnableEncryption(0)); |
142 ASSERT_TRUE(EnableEncryption(1)); | 140 ASSERT_TRUE(EnableEncryption(1)); |
143 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kHomePageIsNewTabPage)); | 141 ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kHomePageIsNewTabPage).Wait()); |
144 | 142 |
145 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton)); | 143 ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kShowHomeButton).Wait()); |
146 ChangeBooleanPref(0, prefs::kShowHomeButton); | 144 ChangeBooleanPref(0, prefs::kShowHomeButton); |
147 ASSERT_TRUE(AwaitBooleanPrefMatches(prefs::kShowHomeButton)); | 145 ASSERT_TRUE(BooleanPrefMatchChecker(prefs::kShowHomeButton).Wait()); |
148 } | 146 } |
OLD | NEW |