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

Side by Side Diff: chrome/browser/policy/cros_user_policy_cache_unittest.cc

Issue 11413050: chrome/browser: Update calls from RunAllPending() to RunUntilIdle(). (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 8 years, 1 month 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) 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 "base/bind.h" 5 #include "base/bind.h"
6 #include "base/file_path.h" 6 #include "base/file_path.h"
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/files/scoped_temp_dir.h" 8 #include "base/files/scoped_temp_dir.h"
9 #include "base/memory/scoped_ptr.h" 9 #include "base/memory/scoped_ptr.h"
10 #include "base/message_loop.h" 10 #include "base/message_loop.h"
(...skipping 101 matching lines...) Expand 10 before | Expand all | Expand 10 after
112 token_file(), 112 token_file(),
113 policy_file()); 113 policy_file());
114 EXPECT_FALSE(cache.IsReady()); 114 EXPECT_FALSE(cache.IsReady());
115 EXPECT_FALSE(data_store_->token_cache_loaded()); 115 EXPECT_FALSE(data_store_->token_cache_loaded());
116 116
117 // Initialize the cache. 117 // Initialize the cache.
118 EXPECT_CALL(session_manager_client_, RetrieveUserPolicy(_)) 118 EXPECT_CALL(session_manager_client_, RetrieveUserPolicy(_))
119 .WillOnce(InvokeCallbackArgument<0>(std::string())); 119 .WillOnce(InvokeCallbackArgument<0>(std::string()));
120 120
121 cache.Load(); 121 cache.Load();
122 loop_.RunAllPending(); 122 loop_.RunUntilIdle();
123 123
124 EXPECT_TRUE(cache.IsReady()); 124 EXPECT_TRUE(cache.IsReady());
125 EXPECT_TRUE(data_store_->token_cache_loaded()); 125 EXPECT_TRUE(data_store_->token_cache_loaded());
126 EXPECT_EQ(0U, cache.policy()->size()); 126 EXPECT_EQ(0U, cache.policy()->size());
127 127
128 // Set policy. 128 // Set policy.
129 em::PolicyFetchResponse response; 129 em::PolicyFetchResponse response;
130 CreatePolicyResponse(&response); 130 CreatePolicyResponse(&response);
131 std::string serialized_response; 131 std::string serialized_response;
132 ASSERT_TRUE(response.SerializeToString(&serialized_response)); 132 ASSERT_TRUE(response.SerializeToString(&serialized_response));
133 testing::Sequence seq; 133 testing::Sequence seq;
134 EXPECT_CALL(session_manager_client_, StoreUserPolicy(serialized_response, _)) 134 EXPECT_CALL(session_manager_client_, StoreUserPolicy(serialized_response, _))
135 .InSequence(seq) 135 .InSequence(seq)
136 .WillOnce(InvokeCallbackArgument<1>(true)); 136 .WillOnce(InvokeCallbackArgument<1>(true));
137 EXPECT_CALL(session_manager_client_, RetrieveUserPolicy(_)) 137 EXPECT_CALL(session_manager_client_, RetrieveUserPolicy(_))
138 .InSequence(seq) 138 .InSequence(seq)
139 .WillOnce(InvokeCallbackArgument<0>(serialized_response)); 139 .WillOnce(InvokeCallbackArgument<0>(serialized_response));
140 140
141 EXPECT_TRUE(cache.SetPolicy(response)); 141 EXPECT_TRUE(cache.SetPolicy(response));
142 loop_.RunAllPending(); 142 loop_.RunUntilIdle();
143 143
144 EXPECT_EQ(1U, cache.policy()->size()); 144 EXPECT_EQ(1U, cache.policy()->size());
145 const PolicyMap::Entry* entry = cache.policy()->Get(key::kShowHomeButton); 145 const PolicyMap::Entry* entry = cache.policy()->Get(key::kShowHomeButton);
146 ASSERT_TRUE(entry); 146 ASSERT_TRUE(entry);
147 EXPECT_TRUE(base::FundamentalValue(true).Equals(entry->value)); 147 EXPECT_TRUE(base::FundamentalValue(true).Equals(entry->value));
148 }; 148 };
149 149
150 TEST_F(CrosUserPolicyCacheTest, Migration) { 150 TEST_F(CrosUserPolicyCacheTest, Migration) {
151 std::string data; 151 std::string data;
152 152
(...skipping 14 matching lines...) Expand all
167 token_file(), 167 token_file(),
168 policy_file()); 168 policy_file());
169 EXPECT_FALSE(cache.IsReady()); 169 EXPECT_FALSE(cache.IsReady());
170 EXPECT_FALSE(data_store_->token_cache_loaded()); 170 EXPECT_FALSE(data_store_->token_cache_loaded());
171 171
172 // Initialize the cache. 172 // Initialize the cache.
173 EXPECT_CALL(session_manager_client_, RetrieveUserPolicy(_)) 173 EXPECT_CALL(session_manager_client_, RetrieveUserPolicy(_))
174 .WillOnce(InvokeCallbackArgument<0>(std::string())); 174 .WillOnce(InvokeCallbackArgument<0>(std::string()));
175 175
176 cache.Load(); 176 cache.Load();
177 loop_.RunAllPending(); 177 loop_.RunUntilIdle();
178 178
179 EXPECT_TRUE(cache.IsReady()); 179 EXPECT_TRUE(cache.IsReady());
180 EXPECT_TRUE(data_store_->token_cache_loaded()); 180 EXPECT_TRUE(data_store_->token_cache_loaded());
181 EXPECT_EQ(kFakeDeviceId, data_store_->device_id()); 181 EXPECT_EQ(kFakeDeviceId, data_store_->device_id());
182 EXPECT_EQ(kFakeToken, data_store_->device_token()); 182 EXPECT_EQ(kFakeToken, data_store_->device_token());
183 EXPECT_EQ(1U, cache.policy()->size()); 183 EXPECT_EQ(1U, cache.policy()->size());
184 const PolicyMap::Entry* entry = cache.policy()->Get(key::kShowHomeButton); 184 const PolicyMap::Entry* entry = cache.policy()->Get(key::kShowHomeButton);
185 ASSERT_TRUE(entry); 185 ASSERT_TRUE(entry);
186 EXPECT_TRUE(base::FundamentalValue(true).Equals(entry->value)); 186 EXPECT_TRUE(base::FundamentalValue(true).Equals(entry->value));
187 }; 187 };
188 188
189 } // namespace 189 } // namespace
190 } // namespace policy 190 } // namespace policy
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698