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

Side by Side Diff: chrome/utility/safe_browsing/mac/hfs_unittest.cc

Issue 1899083002: Convert //chrome from scoped_ptr to std::unique_ptr (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 8 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
OLDNEW
1 // Copyright 2015 The Chromium Authors. All rights reserved. 1 // Copyright 2015 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/utility/safe_browsing/mac/hfs.h" 5 #include "chrome/utility/safe_browsing/mac/hfs.h"
6 6
7 #include <stddef.h> 7 #include <stddef.h>
8 #include <stdint.h> 8 #include <stdint.h>
9 9
10 #include "base/files/file.h" 10 #include "base/files/file.h"
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
124 return true; 124 return true;
125 } 125 }
126 } 126 }
127 return false; 127 return false;
128 } 128 }
129 129
130 HFSIterator* hfs_reader() { return hfs_reader_.get(); } 130 HFSIterator* hfs_reader() { return hfs_reader_.get(); }
131 131
132 private: 132 private:
133 base::File hfs_file_; 133 base::File hfs_file_;
134 scoped_ptr<FileReadStream> hfs_stream_; 134 std::unique_ptr<FileReadStream> hfs_stream_;
135 scoped_ptr<HFSIterator> hfs_reader_; 135 std::unique_ptr<HFSIterator> hfs_reader_;
136 }; 136 };
137 137
138 TEST_P(HFSFileReadTest, ReadReadme) { 138 TEST_P(HFSFileReadTest, ReadReadme) {
139 ASSERT_TRUE(GoToFile("README.txt")); 139 ASSERT_TRUE(GoToFile("README.txt"));
140 140
141 scoped_ptr<ReadStream> stream = hfs_reader()->GetReadStream(); 141 std::unique_ptr<ReadStream> stream = hfs_reader()->GetReadStream();
142 ASSERT_TRUE(stream.get()); 142 ASSERT_TRUE(stream.get());
143 143
144 EXPECT_FALSE(hfs_reader()->IsSymbolicLink()); 144 EXPECT_FALSE(hfs_reader()->IsSymbolicLink());
145 EXPECT_FALSE(hfs_reader()->IsHardLink()); 145 EXPECT_FALSE(hfs_reader()->IsHardLink());
146 EXPECT_FALSE(hfs_reader()->IsDecmpfsCompressed()); 146 EXPECT_FALSE(hfs_reader()->IsDecmpfsCompressed());
147 147
148 std::vector<uint8_t> buffer(4, 0); 148 std::vector<uint8_t> buffer(4, 0);
149 149
150 // Read the first four bytes. 150 // Read the first four bytes.
151 EXPECT_TRUE(stream->ReadExact(&buffer[0], buffer.size())); 151 EXPECT_TRUE(stream->ReadExact(&buffer[0], buffer.size()));
152 const uint8_t expected[] = { 'T', 'h', 'i', 's' }; 152 const uint8_t expected[] = { 'T', 'h', 'i', 's' };
153 EXPECT_EQ(0, memcmp(expected, &buffer[0], sizeof(expected))); 153 EXPECT_EQ(0, memcmp(expected, &buffer[0], sizeof(expected)));
154 buffer.clear(); 154 buffer.clear();
155 155
156 // Rewind back to the start. 156 // Rewind back to the start.
157 EXPECT_EQ(0, stream->Seek(0, SEEK_SET)); 157 EXPECT_EQ(0, stream->Seek(0, SEEK_SET));
158 158
159 // Read the entire file now. 159 // Read the entire file now.
160 EXPECT_TRUE(test::ReadEntireStream(stream.get(), &buffer)); 160 EXPECT_TRUE(test::ReadEntireStream(stream.get(), &buffer));
161 EXPECT_EQ("This is a test HFS+ filesystem generated by " 161 EXPECT_EQ("This is a test HFS+ filesystem generated by "
162 "chrome/test/data/safe_browsing/dmg/make_hfs.sh.\n", 162 "chrome/test/data/safe_browsing/dmg/make_hfs.sh.\n",
163 base::StringPiece(reinterpret_cast<const char*>(&buffer[0]), 163 base::StringPiece(reinterpret_cast<const char*>(&buffer[0]),
164 buffer.size())); 164 buffer.size()));
165 EXPECT_EQ(92u, buffer.size()); 165 EXPECT_EQ(92u, buffer.size());
166 } 166 }
167 167
168 TEST_P(HFSFileReadTest, ReadRandom) { 168 TEST_P(HFSFileReadTest, ReadRandom) {
169 ASSERT_TRUE(GoToFile("fifth/random")); 169 ASSERT_TRUE(GoToFile("fifth/random"));
170 170
171 scoped_ptr<ReadStream> stream = hfs_reader()->GetReadStream(); 171 std::unique_ptr<ReadStream> stream = hfs_reader()->GetReadStream();
172 ASSERT_TRUE(stream.get()); 172 ASSERT_TRUE(stream.get());
173 173
174 EXPECT_FALSE(hfs_reader()->IsSymbolicLink()); 174 EXPECT_FALSE(hfs_reader()->IsSymbolicLink());
175 EXPECT_FALSE(hfs_reader()->IsHardLink()); 175 EXPECT_FALSE(hfs_reader()->IsHardLink());
176 EXPECT_FALSE(hfs_reader()->IsDecmpfsCompressed()); 176 EXPECT_FALSE(hfs_reader()->IsDecmpfsCompressed());
177 177
178 std::vector<uint8_t> buffer; 178 std::vector<uint8_t> buffer;
179 EXPECT_TRUE(test::ReadEntireStream(stream.get(), &buffer)); 179 EXPECT_TRUE(test::ReadEntireStream(stream.get(), &buffer));
180 EXPECT_EQ(768u, buffer.size()); 180 EXPECT_EQ(768u, buffer.size());
181 } 181 }
182 182
183 TEST_P(HFSFileReadTest, Symlink) { 183 TEST_P(HFSFileReadTest, Symlink) {
184 ASSERT_TRUE(GoToFile("symlink-random")); 184 ASSERT_TRUE(GoToFile("symlink-random"));
185 185
186 scoped_ptr<ReadStream> stream = hfs_reader()->GetReadStream(); 186 std::unique_ptr<ReadStream> stream = hfs_reader()->GetReadStream();
187 ASSERT_TRUE(stream.get()); 187 ASSERT_TRUE(stream.get());
188 188
189 EXPECT_TRUE(hfs_reader()->IsSymbolicLink()); 189 EXPECT_TRUE(hfs_reader()->IsSymbolicLink());
190 EXPECT_FALSE(hfs_reader()->IsHardLink()); 190 EXPECT_FALSE(hfs_reader()->IsHardLink());
191 EXPECT_FALSE(hfs_reader()->IsDecmpfsCompressed()); 191 EXPECT_FALSE(hfs_reader()->IsDecmpfsCompressed());
192 192
193 std::vector<uint8_t> buffer; 193 std::vector<uint8_t> buffer;
194 EXPECT_TRUE(test::ReadEntireStream(stream.get(), &buffer)); 194 EXPECT_TRUE(test::ReadEntireStream(stream.get(), &buffer));
195 195
196 EXPECT_EQ("fourth/fifth/random", 196 EXPECT_EQ("fourth/fifth/random",
197 base::StringPiece(reinterpret_cast<const char*>(&buffer[0]), 197 base::StringPiece(reinterpret_cast<const char*>(&buffer[0]),
198 buffer.size())); 198 buffer.size()));
199 } 199 }
200 200
201 TEST_P(HFSFileReadTest, HardLink) { 201 TEST_P(HFSFileReadTest, HardLink) {
202 ASSERT_TRUE(GoToFile("unicode_name")); 202 ASSERT_TRUE(GoToFile("unicode_name"));
203 203
204 EXPECT_FALSE(hfs_reader()->IsSymbolicLink()); 204 EXPECT_FALSE(hfs_reader()->IsSymbolicLink());
205 EXPECT_TRUE(hfs_reader()->IsHardLink()); 205 EXPECT_TRUE(hfs_reader()->IsHardLink());
206 EXPECT_FALSE(hfs_reader()->IsDecmpfsCompressed()); 206 EXPECT_FALSE(hfs_reader()->IsDecmpfsCompressed());
207 } 207 }
208 208
209 TEST_P(HFSFileReadTest, DecmpfsFile) { 209 TEST_P(HFSFileReadTest, DecmpfsFile) {
210 ASSERT_TRUE(GoToFile("first/second/goat-output.txt")); 210 ASSERT_TRUE(GoToFile("first/second/goat-output.txt"));
211 211
212 scoped_ptr<ReadStream> stream = hfs_reader()->GetReadStream(); 212 std::unique_ptr<ReadStream> stream = hfs_reader()->GetReadStream();
213 ASSERT_TRUE(stream.get()); 213 ASSERT_TRUE(stream.get());
214 214
215 EXPECT_FALSE(hfs_reader()->IsSymbolicLink()); 215 EXPECT_FALSE(hfs_reader()->IsSymbolicLink());
216 EXPECT_FALSE(hfs_reader()->IsHardLink()); 216 EXPECT_FALSE(hfs_reader()->IsHardLink());
217 EXPECT_TRUE(hfs_reader()->IsDecmpfsCompressed()); 217 EXPECT_TRUE(hfs_reader()->IsDecmpfsCompressed());
218 218
219 std::vector<uint8_t> buffer; 219 std::vector<uint8_t> buffer;
220 EXPECT_TRUE(test::ReadEntireStream(stream.get(), &buffer)); 220 EXPECT_TRUE(test::ReadEntireStream(stream.get(), &buffer));
221 EXPECT_EQ(0u, buffer.size()); 221 EXPECT_EQ(0u, buffer.size());
222 } 222 }
223 223
224 INSTANTIATE_TEST_CASE_P(HFSIteratorTest, 224 INSTANTIATE_TEST_CASE_P(HFSIteratorTest,
225 HFSFileReadTest, 225 HFSFileReadTest,
226 testing::Values( 226 testing::Values(
227 "hfs_plus.img", 227 "hfs_plus.img",
228 "hfsx_case_sensitive.img")); 228 "hfsx_case_sensitive.img"));
229 229
230 } // namespace 230 } // namespace
231 } // namespace dmg 231 } // namespace dmg
232 } // namespace safe_browsing 232 } // namespace safe_browsing
OLDNEW
« no previous file with comments | « chrome/utility/safe_browsing/mac/hfs.cc ('k') | chrome/utility/safe_browsing/mac/read_stream_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698