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

Side by Side Diff: content/browser/streams/stream_unittest.cc

Issue 2368913002: Fix stream errors that occur after a stream starts not propagating. (Closed)
Patch Set: fix tests Created 4 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
OLDNEW
1 // Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 // Copyright (c) 2013 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 <stddef.h> 5 #include <stddef.h>
6 6
7 #include "base/message_loop/message_loop.h" 7 #include "base/message_loop/message_loop.h"
8 #include "base/run_loop.h" 8 #include "base/run_loop.h"
9 #include "base/test/test_simple_task_runner.h" 9 #include "base/test/test_simple_task_runner.h"
10 #include "content/browser/streams/stream.h" 10 #include "content/browser/streams/stream.h"
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 while (true) { 54 while (true) {
55 Stream::StreamState state = 55 Stream::StreamState state =
56 stream->ReadRawData(buffer.get(), kBufferSize, &bytes_read); 56 stream->ReadRawData(buffer.get(), kBufferSize, &bytes_read);
57 switch (state) { 57 switch (state) {
58 case Stream::STREAM_HAS_DATA: 58 case Stream::STREAM_HAS_DATA:
59 // TODO(tyoshino): Move these expectations to the beginning of Read() 59 // TODO(tyoshino): Move these expectations to the beginning of Read()
60 // method once Stream::Finalize() is fixed. 60 // method once Stream::Finalize() is fixed.
61 EXPECT_FALSE(completed_); 61 EXPECT_FALSE(completed_);
62 break; 62 break;
63 case Stream::STREAM_COMPLETE: 63 case Stream::STREAM_COMPLETE:
64 completed_ = true; 64 completed_ = true;
tyoshino (SeeGerritForStatus) 2016/09/27 10:24:56 save GetStatus() here and export as status()?
jam 2016/09/27 15:41:07 Done.
65 return; 65 return;
66 case Stream::STREAM_EMPTY: 66 case Stream::STREAM_EMPTY:
67 EXPECT_FALSE(completed_); 67 EXPECT_FALSE(completed_);
68 return; 68 return;
69 case Stream::STREAM_ABORTED: 69 case Stream::STREAM_ABORTED:
70 aborted_ = true; 70 aborted_ = true;
71 EXPECT_FALSE(completed_); 71 EXPECT_FALSE(completed_);
72 return; 72 return;
73 } 73 }
74 size_t old_capacity = buffer_->capacity(); 74 size_t old_capacity = buffer_->capacity();
(...skipping 113 matching lines...) Expand 10 before | Expand all | Expand 10 after
188 TestStreamWriter writer; 188 TestStreamWriter writer;
189 189
190 GURL url("blob://stream"); 190 GURL url("blob://stream");
191 scoped_refptr<Stream> stream( 191 scoped_refptr<Stream> stream(
192 new Stream(registry_.get(), &writer, url)); 192 new Stream(registry_.get(), &writer, url));
193 EXPECT_TRUE(stream->SetReadObserver(&reader)); 193 EXPECT_TRUE(stream->SetReadObserver(&reader));
194 194
195 const int kBufferSize = 1000000; 195 const int kBufferSize = 1000000;
196 scoped_refptr<net::IOBuffer> buffer(NewIOBuffer(kBufferSize)); 196 scoped_refptr<net::IOBuffer> buffer(NewIOBuffer(kBufferSize));
197 writer.Write(stream.get(), buffer, kBufferSize); 197 writer.Write(stream.get(), buffer, kBufferSize);
198 stream->Finalize(); 198 stream->Finalize(0);
199 base::RunLoop().RunUntilIdle(); 199 base::RunLoop().RunUntilIdle();
200 EXPECT_TRUE(reader.completed()); 200 EXPECT_TRUE(reader.completed());
tyoshino (SeeGerritForStatus) 2016/09/27 10:24:56 check status() here and could you please add a te
jam 2016/09/27 15:41:07 Done.
201 201
202 ASSERT_EQ(reader.buffer()->capacity(), kBufferSize); 202 ASSERT_EQ(reader.buffer()->capacity(), kBufferSize);
203 for (int i = 0; i < kBufferSize; i++) 203 for (int i = 0; i < kBufferSize; i++)
204 EXPECT_EQ(buffer->data()[i], reader.buffer()->data()[i]); 204 EXPECT_EQ(buffer->data()[i], reader.buffer()->data()[i]);
205 } 205 }
206 206
207 TEST_F(StreamTest, Abort) { 207 TEST_F(StreamTest, Abort) {
208 TestStreamReader reader; 208 TestStreamReader reader;
209 TestStreamWriter writer; 209 TestStreamWriter writer;
210 210
(...skipping 18 matching lines...) Expand all
229 TestStreamWriter writer; 229 TestStreamWriter writer;
230 230
231 GURL url("blob://stream"); 231 GURL url("blob://stream");
232 scoped_refptr<Stream> stream( 232 scoped_refptr<Stream> stream(
233 new Stream(registry_.get(), &writer, url)); 233 new Stream(registry_.get(), &writer, url));
234 EXPECT_TRUE(stream->SetReadObserver(&reader)); 234 EXPECT_TRUE(stream->SetReadObserver(&reader));
235 235
236 const int kBufferSize = 0; 236 const int kBufferSize = 0;
237 scoped_refptr<net::IOBuffer> buffer(NewIOBuffer(kBufferSize)); 237 scoped_refptr<net::IOBuffer> buffer(NewIOBuffer(kBufferSize));
238 stream->AddData(buffer, kBufferSize); 238 stream->AddData(buffer, kBufferSize);
239 stream->Finalize(); 239 stream->Finalize(0);
tyoshino (SeeGerritForStatus) 2016/09/27 10:24:56 check status() here
jam 2016/09/27 15:41:07 Done.
240 base::RunLoop().RunUntilIdle(); 240 base::RunLoop().RunUntilIdle();
241 EXPECT_TRUE(reader.completed()); 241 EXPECT_TRUE(reader.completed());
242 EXPECT_EQ(0, reader.buffer()->capacity()); 242 EXPECT_EQ(0, reader.buffer()->capacity());
243 } 243 }
244 244
245 TEST_F(StreamTest, GetStream) { 245 TEST_F(StreamTest, GetStream) {
246 TestStreamWriter writer; 246 TestStreamWriter writer;
247 247
248 GURL url("blob://stream"); 248 GURL url("blob://stream");
249 scoped_refptr<Stream> stream1( 249 scoped_refptr<Stream> stream1(
(...skipping 140 matching lines...) Expand 10 before | Expand all | Expand 10 after
390 TEST_F(StreamTest, AbortPendingStream) { 390 TEST_F(StreamTest, AbortPendingStream) {
391 TestStreamWriter writer; 391 TestStreamWriter writer;
392 392
393 GURL url("blob://stream"); 393 GURL url("blob://stream");
394 registry_->AbortPendingStream(url); 394 registry_->AbortPendingStream(url);
395 scoped_refptr<Stream> stream1(new Stream(registry_.get(), &writer, url)); 395 scoped_refptr<Stream> stream1(new Stream(registry_.get(), &writer, url));
396 ASSERT_EQ(nullptr, registry_->GetStream(url).get()); 396 ASSERT_EQ(nullptr, registry_->GetStream(url).get());
397 } 397 }
398 398
399 } // namespace content 399 } // namespace content
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698