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

Side by Side Diff: base/files/important_file_writer_unittest.cc

Issue 1100773004: base: Remove most uses of MessageLoopProxy (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Added some missing includes. Created 5 years, 7 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
« no previous file with comments | « base/files/important_file_writer.cc ('k') | base/memory/ref_counted_delete_on_message_loop.h » ('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 "base/files/important_file_writer.h" 5 #include "base/files/important_file_writer.h"
6 6
7 #include "base/bind.h" 7 #include "base/bind.h"
8 #include "base/compiler_specific.h" 8 #include "base/compiler_specific.h"
9 #include "base/files/file_path.h" 9 #include "base/files/file_path.h"
10 #include "base/files/file_util.h" 10 #include "base/files/file_util.h"
11 #include "base/files/scoped_temp_dir.h" 11 #include "base/files/scoped_temp_dir.h"
12 #include "base/location.h"
12 #include "base/logging.h" 13 #include "base/logging.h"
13 #include "base/message_loop/message_loop.h"
14 #include "base/run_loop.h" 14 #include "base/run_loop.h"
15 #include "base/single_thread_task_runner.h"
16 #include "base/thread_task_runner_handle.h"
15 #include "base/threading/thread.h" 17 #include "base/threading/thread.h"
16 #include "base/time/time.h" 18 #include "base/time/time.h"
17 #include "testing/gtest/include/gtest/gtest.h" 19 #include "testing/gtest/include/gtest/gtest.h"
18 20
19 namespace base { 21 namespace base {
20 22
21 namespace { 23 namespace {
22 24
23 std::string GetFileContent(const FilePath& path) { 25 std::string GetFileContent(const FilePath& path) {
24 std::string content; 26 std::string content;
(...skipping 65 matching lines...) Expand 10 before | Expand all | Expand 10 after
90 protected: 92 protected:
91 SuccessfulWriteObserver successful_write_observer_; 93 SuccessfulWriteObserver successful_write_observer_;
92 FilePath file_; 94 FilePath file_;
93 MessageLoop loop_; 95 MessageLoop loop_;
94 96
95 private: 97 private:
96 ScopedTempDir temp_dir_; 98 ScopedTempDir temp_dir_;
97 }; 99 };
98 100
99 TEST_F(ImportantFileWriterTest, Basic) { 101 TEST_F(ImportantFileWriterTest, Basic) {
100 ImportantFileWriter writer(file_, MessageLoopProxy::current().get()); 102 ImportantFileWriter writer(file_, ThreadTaskRunnerHandle::Get());
101 EXPECT_FALSE(PathExists(writer.path())); 103 EXPECT_FALSE(PathExists(writer.path()));
102 EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState()); 104 EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState());
103 writer.WriteNow(make_scoped_ptr(new std::string("foo"))); 105 writer.WriteNow(make_scoped_ptr(new std::string("foo")));
104 RunLoop().RunUntilIdle(); 106 RunLoop().RunUntilIdle();
105 107
106 EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState()); 108 EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState());
107 ASSERT_TRUE(PathExists(writer.path())); 109 ASSERT_TRUE(PathExists(writer.path()));
108 EXPECT_EQ("foo", GetFileContent(writer.path())); 110 EXPECT_EQ("foo", GetFileContent(writer.path()));
109 } 111 }
110 112
111 TEST_F(ImportantFileWriterTest, BasicWithSuccessfulWriteObserver) { 113 TEST_F(ImportantFileWriterTest, BasicWithSuccessfulWriteObserver) {
112 ImportantFileWriter writer(file_, MessageLoopProxy::current().get()); 114 ImportantFileWriter writer(file_, ThreadTaskRunnerHandle::Get());
113 EXPECT_FALSE(PathExists(writer.path())); 115 EXPECT_FALSE(PathExists(writer.path()));
114 EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState()); 116 EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState());
115 successful_write_observer_.ObserveNextSuccessfulWrite(&writer); 117 successful_write_observer_.ObserveNextSuccessfulWrite(&writer);
116 writer.WriteNow(make_scoped_ptr(new std::string("foo"))); 118 writer.WriteNow(make_scoped_ptr(new std::string("foo")));
117 RunLoop().RunUntilIdle(); 119 RunLoop().RunUntilIdle();
118 120
119 // Confirm that the observer is invoked. 121 // Confirm that the observer is invoked.
120 EXPECT_TRUE(successful_write_observer_.GetAndResetObservationState()); 122 EXPECT_TRUE(successful_write_observer_.GetAndResetObservationState());
121 ASSERT_TRUE(PathExists(writer.path())); 123 ASSERT_TRUE(PathExists(writer.path()));
122 EXPECT_EQ("foo", GetFileContent(writer.path())); 124 EXPECT_EQ("foo", GetFileContent(writer.path()));
(...skipping 13 matching lines...) Expand all
136 EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState()); 138 EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState());
137 writer.WriteNow(make_scoped_ptr(new std::string("baz"))); 139 writer.WriteNow(make_scoped_ptr(new std::string("baz")));
138 RunLoop().RunUntilIdle(); 140 RunLoop().RunUntilIdle();
139 141
140 EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState()); 142 EXPECT_FALSE(successful_write_observer_.GetAndResetObservationState());
141 ASSERT_TRUE(PathExists(writer.path())); 143 ASSERT_TRUE(PathExists(writer.path()));
142 EXPECT_EQ("baz", GetFileContent(writer.path())); 144 EXPECT_EQ("baz", GetFileContent(writer.path()));
143 } 145 }
144 146
145 TEST_F(ImportantFileWriterTest, ScheduleWrite) { 147 TEST_F(ImportantFileWriterTest, ScheduleWrite) {
146 ImportantFileWriter writer(file_, MessageLoopProxy::current().get()); 148 ImportantFileWriter writer(file_, ThreadTaskRunnerHandle::Get());
147 writer.set_commit_interval(TimeDelta::FromMilliseconds(25)); 149 writer.set_commit_interval(TimeDelta::FromMilliseconds(25));
148 EXPECT_FALSE(writer.HasPendingWrite()); 150 EXPECT_FALSE(writer.HasPendingWrite());
149 DataSerializer serializer("foo"); 151 DataSerializer serializer("foo");
150 writer.ScheduleWrite(&serializer); 152 writer.ScheduleWrite(&serializer);
151 EXPECT_TRUE(writer.HasPendingWrite()); 153 EXPECT_TRUE(writer.HasPendingWrite());
152 MessageLoop::current()->PostDelayedTask( 154 ThreadTaskRunnerHandle::Get()->PostDelayedTask(
153 FROM_HERE, 155 FROM_HERE, MessageLoop::QuitWhenIdleClosure(),
154 MessageLoop::QuitWhenIdleClosure(),
155 TimeDelta::FromMilliseconds(100)); 156 TimeDelta::FromMilliseconds(100));
156 MessageLoop::current()->Run(); 157 MessageLoop::current()->Run();
157 EXPECT_FALSE(writer.HasPendingWrite()); 158 EXPECT_FALSE(writer.HasPendingWrite());
158 ASSERT_TRUE(PathExists(writer.path())); 159 ASSERT_TRUE(PathExists(writer.path()));
159 EXPECT_EQ("foo", GetFileContent(writer.path())); 160 EXPECT_EQ("foo", GetFileContent(writer.path()));
160 } 161 }
161 162
162 TEST_F(ImportantFileWriterTest, DoScheduledWrite) { 163 TEST_F(ImportantFileWriterTest, DoScheduledWrite) {
163 ImportantFileWriter writer(file_, MessageLoopProxy::current().get()); 164 ImportantFileWriter writer(file_, ThreadTaskRunnerHandle::Get());
164 EXPECT_FALSE(writer.HasPendingWrite()); 165 EXPECT_FALSE(writer.HasPendingWrite());
165 DataSerializer serializer("foo"); 166 DataSerializer serializer("foo");
166 writer.ScheduleWrite(&serializer); 167 writer.ScheduleWrite(&serializer);
167 EXPECT_TRUE(writer.HasPendingWrite()); 168 EXPECT_TRUE(writer.HasPendingWrite());
168 writer.DoScheduledWrite(); 169 writer.DoScheduledWrite();
169 MessageLoop::current()->PostDelayedTask( 170 ThreadTaskRunnerHandle::Get()->PostDelayedTask(
170 FROM_HERE, 171 FROM_HERE, MessageLoop::QuitWhenIdleClosure(),
171 MessageLoop::QuitWhenIdleClosure(),
172 TimeDelta::FromMilliseconds(100)); 172 TimeDelta::FromMilliseconds(100));
173 MessageLoop::current()->Run(); 173 MessageLoop::current()->Run();
174 EXPECT_FALSE(writer.HasPendingWrite()); 174 EXPECT_FALSE(writer.HasPendingWrite());
175 ASSERT_TRUE(PathExists(writer.path())); 175 ASSERT_TRUE(PathExists(writer.path()));
176 EXPECT_EQ("foo", GetFileContent(writer.path())); 176 EXPECT_EQ("foo", GetFileContent(writer.path()));
177 } 177 }
178 178
179 TEST_F(ImportantFileWriterTest, BatchingWrites) { 179 TEST_F(ImportantFileWriterTest, BatchingWrites) {
180 ImportantFileWriter writer(file_, MessageLoopProxy::current().get()); 180 ImportantFileWriter writer(file_, ThreadTaskRunnerHandle::Get());
181 writer.set_commit_interval(TimeDelta::FromMilliseconds(25)); 181 writer.set_commit_interval(TimeDelta::FromMilliseconds(25));
182 DataSerializer foo("foo"), bar("bar"), baz("baz"); 182 DataSerializer foo("foo"), bar("bar"), baz("baz");
183 writer.ScheduleWrite(&foo); 183 writer.ScheduleWrite(&foo);
184 writer.ScheduleWrite(&bar); 184 writer.ScheduleWrite(&bar);
185 writer.ScheduleWrite(&baz); 185 writer.ScheduleWrite(&baz);
186 MessageLoop::current()->PostDelayedTask( 186 ThreadTaskRunnerHandle::Get()->PostDelayedTask(
187 FROM_HERE, 187 FROM_HERE, MessageLoop::QuitWhenIdleClosure(),
188 MessageLoop::QuitWhenIdleClosure(),
189 TimeDelta::FromMilliseconds(100)); 188 TimeDelta::FromMilliseconds(100));
190 MessageLoop::current()->Run(); 189 MessageLoop::current()->Run();
191 ASSERT_TRUE(PathExists(writer.path())); 190 ASSERT_TRUE(PathExists(writer.path()));
192 EXPECT_EQ("baz", GetFileContent(writer.path())); 191 EXPECT_EQ("baz", GetFileContent(writer.path()));
193 } 192 }
194 193
195 } // namespace base 194 } // namespace base
OLDNEW
« no previous file with comments | « base/files/important_file_writer.cc ('k') | base/memory/ref_counted_delete_on_message_loop.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698