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

Unified Diff: net/base/upload_file_element_reader_unittest.cc

Issue 140733002: Revert 244982 "Revert 244857 "net: Remove classes which were use..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: rebase Created 6 years, 11 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/base/upload_file_element_reader.cc ('k') | net/net.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/base/upload_file_element_reader_unittest.cc
diff --git a/net/base/upload_file_element_reader_unittest.cc b/net/base/upload_file_element_reader_unittest.cc
index 52f0f2788ffefd5a0867892e32f7a9ae06ffe635..d98262be49408f1bc6bed76d4e9b6e53f638eb1e 100644
--- a/net/base/upload_file_element_reader_unittest.cc
+++ b/net/base/upload_file_element_reader_unittest.cc
@@ -234,137 +234,4 @@ TEST_F(UploadFileElementReaderTest, WrongPath) {
EXPECT_EQ(ERR_FILE_NOT_FOUND, init_callback.WaitForResult());
}
-
-class UploadFileElementReaderSyncTest : public PlatformTest {
- protected:
- virtual void SetUp() OVERRIDE {
- // Some tests (*.ReadPartially) rely on bytes_.size() being even.
- const char kData[] = "123456789abcdefghi";
- bytes_.assign(kData, kData + arraysize(kData) - 1);
-
- ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
-
- ASSERT_TRUE(base::CreateTemporaryFileInDir(temp_dir_.path(),
- &temp_file_path_));
- ASSERT_EQ(
- static_cast<int>(bytes_.size()),
- file_util::WriteFile(temp_file_path_, &bytes_[0], bytes_.size()));
-
- reader_.reset(new UploadFileElementReaderSync(
- temp_file_path_, 0, kuint64max, base::Time()));
- ASSERT_EQ(OK, reader_->Init(CompletionCallback()));
- EXPECT_EQ(bytes_.size(), reader_->GetContentLength());
- EXPECT_EQ(bytes_.size(), reader_->BytesRemaining());
- EXPECT_FALSE(reader_->IsInMemory());
- }
-
- std::vector<char> bytes_;
- scoped_ptr<UploadElementReader> reader_;
- base::ScopedTempDir temp_dir_;
- base::FilePath temp_file_path_;
-};
-
-TEST_F(UploadFileElementReaderSyncTest, ReadPartially) {
- const size_t kHalfSize = bytes_.size() / 2;
- ASSERT_EQ(bytes_.size(), kHalfSize * 2);
- std::vector<char> buf(kHalfSize);
- scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
- EXPECT_EQ(
- static_cast<int>(buf.size()),
- reader_->Read(wrapped_buffer.get(), buf.size(), CompletionCallback()));
- EXPECT_EQ(bytes_.size() - buf.size(), reader_->BytesRemaining());
- EXPECT_EQ(std::vector<char>(bytes_.begin(), bytes_.begin() + kHalfSize), buf);
-
- EXPECT_EQ(
- static_cast<int>(buf.size()),
- reader_->Read(wrapped_buffer.get(), buf.size(), CompletionCallback()));
- EXPECT_EQ(0U, reader_->BytesRemaining());
- EXPECT_EQ(std::vector<char>(bytes_.begin() + kHalfSize, bytes_.end()), buf);
-}
-
-TEST_F(UploadFileElementReaderSyncTest, ReadAll) {
- std::vector<char> buf(bytes_.size());
- scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
- EXPECT_EQ(
- static_cast<int>(buf.size()),
- reader_->Read(wrapped_buffer.get(), buf.size(), CompletionCallback()));
- EXPECT_EQ(0U, reader_->BytesRemaining());
- EXPECT_EQ(bytes_, buf);
- // Try to read again.
- EXPECT_EQ(
- 0, reader_->Read(wrapped_buffer.get(), buf.size(), CompletionCallback()));
-}
-
-TEST_F(UploadFileElementReaderSyncTest, ReadTooMuch) {
- const size_t kTooLargeSize = bytes_.size() * 2;
- std::vector<char> buf(kTooLargeSize);
- scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
- EXPECT_EQ(
- static_cast<int>(bytes_.size()),
- reader_->Read(wrapped_buffer.get(), buf.size(), CompletionCallback()));
- EXPECT_EQ(0U, reader_->BytesRemaining());
- buf.resize(bytes_.size()); // Resize to compare.
- EXPECT_EQ(bytes_, buf);
-}
-
-TEST_F(UploadFileElementReaderSyncTest, MultipleInit) {
- std::vector<char> buf(bytes_.size());
- scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
-
- // Read all.
- EXPECT_EQ(
- static_cast<int>(buf.size()),
- reader_->Read(wrapped_buffer.get(), buf.size(), CompletionCallback()));
- EXPECT_EQ(0U, reader_->BytesRemaining());
- EXPECT_EQ(bytes_, buf);
-
- // Call Init() again to reset the state.
- ASSERT_EQ(OK, reader_->Init(CompletionCallback()));
- EXPECT_EQ(bytes_.size(), reader_->GetContentLength());
- EXPECT_EQ(bytes_.size(), reader_->BytesRemaining());
-
- // Read again.
- EXPECT_EQ(
- static_cast<int>(buf.size()),
- reader_->Read(wrapped_buffer.get(), buf.size(), CompletionCallback()));
- EXPECT_EQ(0U, reader_->BytesRemaining());
- EXPECT_EQ(bytes_, buf);
-}
-
-TEST_F(UploadFileElementReaderSyncTest, Range) {
- const uint64 kOffset = 2;
- const uint64 kLength = bytes_.size() - kOffset * 3;
- reader_.reset(new UploadFileElementReaderSync(
- temp_file_path_, kOffset, kLength, base::Time()));
- ASSERT_EQ(OK, reader_->Init(CompletionCallback()));
- EXPECT_EQ(kLength, reader_->GetContentLength());
- EXPECT_EQ(kLength, reader_->BytesRemaining());
- std::vector<char> buf(kLength);
- scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
- EXPECT_EQ(static_cast<int>(kLength),
- reader_->Read(wrapped_buffer.get(), kLength, CompletionCallback()));
- const std::vector<char> expected(bytes_.begin() + kOffset,
- bytes_.begin() + kOffset + kLength);
- EXPECT_EQ(expected, buf);
-}
-
-TEST_F(UploadFileElementReaderSyncTest, FileChanged) {
- base::File::Info info;
- ASSERT_TRUE(base::GetFileInfo(temp_file_path_, &info));
-
- // Expect one second before the actual modification time to simulate change.
- const base::Time expected_modification_time =
- info.last_modified - base::TimeDelta::FromSeconds(1);
- reader_.reset(new UploadFileElementReaderSync(
- temp_file_path_, 0, kuint64max, expected_modification_time));
- EXPECT_EQ(ERR_UPLOAD_FILE_CHANGED, reader_->Init(CompletionCallback()));
-}
-
-TEST_F(UploadFileElementReaderSyncTest, WrongPath) {
- const base::FilePath wrong_path(FILE_PATH_LITERAL("wrong_path"));
- reader_.reset(new UploadFileElementReaderSync(
- wrong_path, 0, kuint64max, base::Time()));
- ASSERT_EQ(ERR_FILE_NOT_FOUND, reader_->Init(CompletionCallback()));
-}
-
} // namespace net
« no previous file with comments | « net/base/upload_file_element_reader.cc ('k') | net/net.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698