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

Side by Side Diff: net/base/upload_file_element_reader_unittest.cc

Issue 10910268: net: Make UploadDataStream::Read() asynchronous (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Address comments Created 8 years, 2 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 | Annotate | Revision Log
« no previous file with comments | « net/base/upload_file_element_reader.cc ('k') | net/http/http_stream_parser.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 "net/base/upload_file_element_reader.h" 5 #include "net/base/upload_file_element_reader.h"
6 6
7 #include "base/file_util.h" 7 #include "base/file_util.h"
8 #include "base/scoped_temp_dir.h" 8 #include "base/scoped_temp_dir.h"
9 #include "net/base/io_buffer.h"
9 #include "net/base/net_errors.h" 10 #include "net/base/net_errors.h"
11 #include "net/base/test_completion_callback.h"
10 #include "testing/gtest/include/gtest/gtest.h" 12 #include "testing/gtest/include/gtest/gtest.h"
11 #include "testing/platform_test.h" 13 #include "testing/platform_test.h"
12 14
13 namespace net { 15 namespace net {
14 16
15 class UploadFileElementReaderTest : public PlatformTest { 17 class UploadFileElementReaderTest : public PlatformTest {
16 protected: 18 protected:
17 virtual void SetUp() OVERRIDE { 19 virtual void SetUp() OVERRIDE {
20 // Some tests (*.ReadPartially) rely on bytes_.size() being even.
18 const char kData[] = "123456789abcdefghi"; 21 const char kData[] = "123456789abcdefghi";
19 bytes_.assign(kData, kData + arraysize(kData)); 22 bytes_.assign(kData, kData + arraysize(kData) - 1);
20 23
21 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir()); 24 ASSERT_TRUE(temp_dir_.CreateUniqueTempDir());
22 25
23 ASSERT_TRUE(file_util::CreateTemporaryFileInDir(temp_dir_.path(), 26 ASSERT_TRUE(file_util::CreateTemporaryFileInDir(temp_dir_.path(),
24 &temp_file_path_)); 27 &temp_file_path_));
25 ASSERT_EQ( 28 ASSERT_EQ(
26 static_cast<int>(bytes_.size()), 29 static_cast<int>(bytes_.size()),
27 file_util::WriteFile(temp_file_path_, &bytes_[0], bytes_.size())); 30 file_util::WriteFile(temp_file_path_, &bytes_[0], bytes_.size()));
28 31
29 reader_.reset(new UploadFileElementReader( 32 reader_.reset(new UploadFileElementReader(
30 temp_file_path_, 0, kuint64max, base::Time())); 33 temp_file_path_, 0, kuint64max, base::Time()));
31 ASSERT_EQ(OK, reader_->InitSync()); 34 ASSERT_EQ(OK, reader_->InitSync());
32 EXPECT_EQ(bytes_.size(), reader_->GetContentLength()); 35 EXPECT_EQ(bytes_.size(), reader_->GetContentLength());
33 EXPECT_EQ(bytes_.size(), reader_->BytesRemaining()); 36 EXPECT_EQ(bytes_.size(), reader_->BytesRemaining());
34 EXPECT_FALSE(reader_->IsInMemory()); 37 EXPECT_FALSE(reader_->IsInMemory());
35 } 38 }
36 39
37 std::vector<char> bytes_; 40 std::vector<char> bytes_;
38 scoped_ptr<UploadElementReader> reader_; 41 scoped_ptr<UploadElementReader> reader_;
39 ScopedTempDir temp_dir_; 42 ScopedTempDir temp_dir_;
40 FilePath temp_file_path_; 43 FilePath temp_file_path_;
41 }; 44 };
42 45
43 TEST_F(UploadFileElementReaderTest, ReadPartially) { 46 TEST_F(UploadFileElementReaderTest, ReadPartially) {
44 const size_t kHalfSize = bytes_.size() / 2; 47 const size_t kHalfSize = bytes_.size() / 2;
48 ASSERT_EQ(bytes_.size(), kHalfSize * 2);
45 std::vector<char> buf(kHalfSize); 49 std::vector<char> buf(kHalfSize);
50 scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
46 EXPECT_EQ(static_cast<int>(buf.size()), 51 EXPECT_EQ(static_cast<int>(buf.size()),
47 reader_->ReadSync(&buf[0], buf.size())); 52 reader_->ReadSync(wrapped_buffer, buf.size()));
48 EXPECT_EQ(bytes_.size() - buf.size(), reader_->BytesRemaining()); 53 EXPECT_EQ(bytes_.size() - buf.size(), reader_->BytesRemaining());
49 bytes_.resize(kHalfSize); // Resize to compare. 54 EXPECT_EQ(std::vector<char>(bytes_.begin(), bytes_.begin() + kHalfSize), buf);
50 EXPECT_EQ(bytes_, buf); 55
56 EXPECT_EQ(static_cast<int>(buf.size()),
57 reader_->ReadSync(wrapped_buffer, buf.size()));
58 EXPECT_EQ(0U, reader_->BytesRemaining());
59 EXPECT_EQ(std::vector<char>(bytes_.begin() + kHalfSize, bytes_.end()), buf);
51 } 60 }
52 61
53 TEST_F(UploadFileElementReaderTest, ReadAll) { 62 TEST_F(UploadFileElementReaderTest, ReadAll) {
54 std::vector<char> buf(bytes_.size()); 63 std::vector<char> buf(bytes_.size());
64 scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
55 EXPECT_EQ(static_cast<int>(buf.size()), 65 EXPECT_EQ(static_cast<int>(buf.size()),
56 reader_->ReadSync(&buf[0], buf.size())); 66 reader_->ReadSync(wrapped_buffer, buf.size()));
57 EXPECT_EQ(0U, reader_->BytesRemaining()); 67 EXPECT_EQ(0U, reader_->BytesRemaining());
58 EXPECT_EQ(bytes_, buf); 68 EXPECT_EQ(bytes_, buf);
59 // Try to read again. 69 // Try to read again.
60 EXPECT_EQ(0, reader_->ReadSync(&buf[0], buf.size())); 70 EXPECT_EQ(0, reader_->ReadSync(wrapped_buffer, buf.size()));
61 } 71 }
62 72
63 TEST_F(UploadFileElementReaderTest, ReadTooMuch) { 73 TEST_F(UploadFileElementReaderTest, ReadTooMuch) {
64 const size_t kTooLargeSize = bytes_.size() * 2; 74 const size_t kTooLargeSize = bytes_.size() * 2;
65 std::vector<char> buf(kTooLargeSize); 75 std::vector<char> buf(kTooLargeSize);
76 scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
66 EXPECT_EQ(static_cast<int>(bytes_.size()), 77 EXPECT_EQ(static_cast<int>(bytes_.size()),
67 reader_->ReadSync(&buf[0], buf.size())); 78 reader_->ReadSync(wrapped_buffer, buf.size()));
68 EXPECT_EQ(0U, reader_->BytesRemaining()); 79 EXPECT_EQ(0U, reader_->BytesRemaining());
69 buf.resize(bytes_.size()); // Resize to compare. 80 buf.resize(bytes_.size()); // Resize to compare.
70 EXPECT_EQ(bytes_, buf); 81 EXPECT_EQ(bytes_, buf);
82 }
83
84 TEST_F(UploadFileElementReaderTest, ReadPartiallyAsync) {
85 const size_t kHalfSize = bytes_.size() / 2;
86 ASSERT_EQ(bytes_.size(), kHalfSize * 2);
87 std::vector<char> buf(kHalfSize);
88 scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
89 TestCompletionCallback test_callback;
90 EXPECT_EQ(ERR_IO_PENDING,
91 reader_->Read(wrapped_buffer, buf.size(),
92 test_callback.callback()));
93
94 EXPECT_EQ(static_cast<int>(buf.size()), test_callback.WaitForResult());
95 EXPECT_EQ(bytes_.size() - buf.size(), reader_->BytesRemaining());
96 EXPECT_EQ(std::vector<char>(bytes_.begin(), bytes_.begin() + kHalfSize), buf);
97
98 EXPECT_EQ(ERR_IO_PENDING,
99 reader_->Read(wrapped_buffer, buf.size(),
100 test_callback.callback()));
101
102 EXPECT_EQ(static_cast<int>(buf.size()), test_callback.WaitForResult());
103 EXPECT_EQ(0U, reader_->BytesRemaining());
104 EXPECT_EQ(std::vector<char>(bytes_.begin() + kHalfSize, bytes_.end()), buf);
105 }
106
107 TEST_F(UploadFileElementReaderTest, ReadAllAsync) {
108 std::vector<char> buf(bytes_.size());
109 scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
110 TestCompletionCallback test_callback;
111 EXPECT_EQ(ERR_IO_PENDING,
112 reader_->Read(wrapped_buffer, buf.size(),
113 test_callback.callback()));
114
115 EXPECT_EQ(static_cast<int>(buf.size()), test_callback.WaitForResult());
116 EXPECT_EQ(0U, reader_->BytesRemaining());
117 EXPECT_EQ(bytes_, buf);
118 // Try to read again.
119 EXPECT_EQ(0, reader_->ReadSync(wrapped_buffer, buf.size()));
120 }
121
122 TEST_F(UploadFileElementReaderTest, ReadTooMuchAsync) {
123 const size_t kTooLargeSize = bytes_.size() * 2;
124 std::vector<char> buf(kTooLargeSize);
125 scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
126 TestCompletionCallback test_callback;
127 EXPECT_EQ(ERR_IO_PENDING,
128 reader_->Read(wrapped_buffer, buf.size(),
129 test_callback.callback()));
130
131 EXPECT_EQ(static_cast<int>(bytes_.size()), test_callback.WaitForResult());
132 EXPECT_EQ(0U, reader_->BytesRemaining());
133 buf.resize(bytes_.size()); // Resize to compare.
134 EXPECT_EQ(bytes_, buf);
71 } 135 }
72 136
73 TEST_F(UploadFileElementReaderTest, Range) { 137 TEST_F(UploadFileElementReaderTest, Range) {
74 const uint64 kOffset = 2; 138 const uint64 kOffset = 2;
75 const uint64 kLength = bytes_.size() - kOffset * 3; 139 const uint64 kLength = bytes_.size() - kOffset * 3;
76 reader_.reset(new UploadFileElementReader( 140 reader_.reset(new UploadFileElementReader(
77 temp_file_path_, kOffset, kLength, base::Time())); 141 temp_file_path_, kOffset, kLength, base::Time()));
78 ASSERT_EQ(OK, reader_->InitSync()); 142 ASSERT_EQ(OK, reader_->InitSync());
79 EXPECT_EQ(kLength, reader_->GetContentLength()); 143 EXPECT_EQ(kLength, reader_->GetContentLength());
80 EXPECT_EQ(kLength, reader_->BytesRemaining()); 144 EXPECT_EQ(kLength, reader_->BytesRemaining());
81 std::vector<char> buf(kLength); 145 std::vector<char> buf(kLength);
146 scoped_refptr<IOBuffer> wrapped_buffer = new WrappedIOBuffer(&buf[0]);
82 EXPECT_EQ(static_cast<int>(kLength), 147 EXPECT_EQ(static_cast<int>(kLength),
83 reader_->ReadSync(&buf[0], kLength)); 148 reader_->ReadSync(wrapped_buffer, kLength));
84 const std::vector<char> expected(bytes_.begin() + kOffset, 149 const std::vector<char> expected(bytes_.begin() + kOffset,
85 bytes_.begin() + kOffset + kLength); 150 bytes_.begin() + kOffset + kLength);
86 EXPECT_EQ(expected, buf); 151 EXPECT_EQ(expected, buf);
87 } 152 }
88 153
89 TEST_F(UploadFileElementReaderTest, FileChanged) { 154 TEST_F(UploadFileElementReaderTest, FileChanged) {
90 base::PlatformFileInfo info; 155 base::PlatformFileInfo info;
91 ASSERT_TRUE(file_util::GetFileInfo(temp_file_path_, &info)); 156 ASSERT_TRUE(file_util::GetFileInfo(temp_file_path_, &info));
92 157
93 // Expect one second before the actual modification time to simulate change. 158 // Expect one second before the actual modification time to simulate change.
94 const base::Time expected_modification_time = 159 const base::Time expected_modification_time =
95 info.last_modified - base::TimeDelta::FromSeconds(1); 160 info.last_modified - base::TimeDelta::FromSeconds(1);
96 reader_.reset(new UploadFileElementReader( 161 reader_.reset(new UploadFileElementReader(
97 temp_file_path_, 0, kuint64max, expected_modification_time)); 162 temp_file_path_, 0, kuint64max, expected_modification_time));
98 EXPECT_EQ(ERR_UPLOAD_FILE_CHANGED, reader_->InitSync()); 163 EXPECT_EQ(ERR_UPLOAD_FILE_CHANGED, reader_->InitSync());
99 } 164 }
100 165
101 TEST_F(UploadFileElementReaderTest, WrongPath) { 166 TEST_F(UploadFileElementReaderTest, WrongPath) {
102 const FilePath wrong_path(FILE_PATH_LITERAL("wrong_path")); 167 const FilePath wrong_path(FILE_PATH_LITERAL("wrong_path"));
103 reader_.reset(new UploadFileElementReader( 168 reader_.reset(new UploadFileElementReader(
104 wrong_path, 0, kuint64max, base::Time())); 169 wrong_path, 0, kuint64max, base::Time()));
105 ASSERT_EQ(OK, reader_->InitSync()); 170 ASSERT_EQ(OK, reader_->InitSync());
106 EXPECT_EQ(0U, reader_->GetContentLength()); 171 EXPECT_EQ(0U, reader_->GetContentLength());
107 EXPECT_EQ(0U, reader_->BytesRemaining()); 172 EXPECT_EQ(0U, reader_->BytesRemaining());
108 } 173 }
109 174
110 } // namespace net 175 } // namespace net
OLDNEW
« no previous file with comments | « net/base/upload_file_element_reader.cc ('k') | net/http/http_stream_parser.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698