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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/websockets/websocket_deflate_stream_test.cc

Issue 266243004: Clang format slam. Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 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 side-by-side diff with in-line comments
Download patch
« net/base/mime_util_unittest.cc ('K') | « net/websockets/websocket_deflate_stream.cc ('k') | net/websockets/websocket_deflater.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/websockets/websocket_deflate_stream_test.cc
diff --git a/net/websockets/websocket_deflate_stream_test.cc b/net/websockets/websocket_deflate_stream_test.cc
index a8b4e59c32b16fec0a636d3b93c3bdde7e098581..2812fa0a8f9dc5c094d33e2335ad80085b7c880d 100644
--- a/net/websockets/websocket_deflate_stream_test.cc
+++ b/net/websockets/websocket_deflate_stream_test.cc
@@ -94,10 +94,10 @@ void AppendTo(ScopedVector<WebSocketFrame>* frames,
class MockWebSocketStream : public WebSocketStream {
public:
- MOCK_METHOD2(ReadFrames, int(ScopedVector<WebSocketFrame>*,
- const CompletionCallback&));
- MOCK_METHOD2(WriteFrames, int(ScopedVector<WebSocketFrame>*,
- const CompletionCallback&));
+ MOCK_METHOD2(ReadFrames,
+ int(ScopedVector<WebSocketFrame>*, const CompletionCallback&));
+ MOCK_METHOD2(WriteFrames,
+ int(ScopedVector<WebSocketFrame>*, const CompletionCallback&));
MOCK_METHOD0(Close, void());
MOCK_CONST_METHOD0(GetSubProtocol, std::string());
MOCK_CONST_METHOD0(GetExtensions, std::string());
@@ -208,9 +208,7 @@ class WebSocketDeflatePredictorMock : public WebSocketDeflatePredictor {
class WebSocketDeflateStreamTest : public ::testing::Test {
public:
- WebSocketDeflateStreamTest()
- : mock_stream_(NULL),
- predictor_(NULL) {}
+ WebSocketDeflateStreamTest() : mock_stream_(NULL), predictor_(NULL) {}
virtual ~WebSocketDeflateStreamTest() {}
virtual void SetUp() {
@@ -301,9 +299,7 @@ class ReadFramesStub {
int result() const { return result_; }
const CompletionCallback callback() const { return callback_; }
- ScopedVector<WebSocketFrame>* frames_passed() {
- return frames_passed_;
- }
+ ScopedVector<WebSocketFrame>* frames_passed() { return frames_passed_; }
private:
int result_;
@@ -317,8 +313,7 @@ class ReadFramesStub {
// saves |callback| parameter to |callback_|.
class WriteFramesStub {
public:
- explicit WriteFramesStub(WebSocketDeflatePredictorMock* predictor,
- int result)
+ explicit WriteFramesStub(WebSocketDeflatePredictorMock* predictor, int result)
: result_(result), predictor_(predictor) {}
int Call(ScopedVector<WebSocketFrame>* frames,
@@ -354,10 +349,8 @@ TEST_F(WebSocketDeflateStreamTest, ReadFailedImmediately) {
TEST_F(WebSocketDeflateStreamTest, ReadUncompressedFrameImmediately) {
ScopedVector<WebSocketFrame> frames_to_output;
- AppendTo(&frames_to_output,
- WebSocketFrameHeader::kOpCodeText,
- kFinal,
- "hello");
+ AppendTo(
+ &frames_to_output, WebSocketFrameHeader::kOpCodeText, kFinal, "hello");
ReadFramesStub stub(OK, &frames_to_output);
ScopedVector<WebSocketFrame> frames;
@@ -394,10 +387,8 @@ TEST_F(WebSocketDeflateStreamTest, ReadUncompressedFrameAsync) {
checkpoint.Call(0);
- AppendTo(stub.frames_passed(),
- WebSocketFrameHeader::kOpCodeText,
- kFinal,
- "hello");
+ AppendTo(
+ stub.frames_passed(), WebSocketFrameHeader::kOpCodeText, kFinal, "hello");
stub.callback().Run(OK);
ASSERT_EQ(1u, frames.size());
EXPECT_EQ(WebSocketFrameHeader::kOpCodeText, frames[0]->header.opcode);
@@ -425,10 +416,8 @@ TEST_F(WebSocketDeflateStreamTest, ReadFailedAsync) {
checkpoint.Call(0);
- AppendTo(stub.frames_passed(),
- WebSocketFrameHeader::kOpCodeText,
- kFinal,
- "hello");
+ AppendTo(
+ stub.frames_passed(), WebSocketFrameHeader::kOpCodeText, kFinal, "hello");
stub.callback().Run(ERR_FAILED);
ASSERT_EQ(0u, frames.size());
}
@@ -490,10 +479,8 @@ TEST_F(WebSocketDeflateStreamTest,
ScopedVector<WebSocketFrame> frames_to_output;
const std::string data1("\xf2", 1);
const std::string data2("\x48\xcd\xc9\xc9\x07\x00", 6);
- AppendTo(&frames_to_output,
- WebSocketFrameHeader::kOpCodeText,
- kReserved1,
- data1);
+ AppendTo(
+ &frames_to_output, WebSocketFrameHeader::kOpCodeText, kReserved1, data1);
ReadFramesStub stub1(OK, &frames_to_output), stub2(ERR_IO_PENDING);
MockCallback mock_callback, checkpoint;
CompletionCallback callback =
@@ -511,10 +498,8 @@ TEST_F(WebSocketDeflateStreamTest,
ASSERT_EQ(ERR_IO_PENDING, deflate_stream_->ReadFrames(&frames, callback));
ASSERT_EQ(0u, frames.size());
- AppendTo(stub2.frames_passed(),
- WebSocketFrameHeader::kOpCodeText,
- kFinal,
- data2);
+ AppendTo(
+ stub2.frames_passed(), WebSocketFrameHeader::kOpCodeText, kFinal, data2);
checkpoint.Call(0);
stub2.callback().Run(OK);
@@ -551,10 +536,8 @@ TEST_F(WebSocketDeflateStreamTest, MergeMultipleFramesInReadFrames) {
const std::string data1("\xf2\x48\xcd", 3);
const std::string data2("\xc9\xc9\x07\x00", 4);
ScopedVector<WebSocketFrame> frames_to_output;
- AppendTo(&frames_to_output,
- WebSocketFrameHeader::kOpCodeText,
- kReserved1,
- data1);
+ AppendTo(
+ &frames_to_output, WebSocketFrameHeader::kOpCodeText, kReserved1, data1);
AppendTo(&frames_to_output,
WebSocketFrameHeader::kOpCodeContinuation,
kFinal,
@@ -578,12 +561,9 @@ TEST_F(WebSocketDeflateStreamTest, MergeMultipleFramesInReadFrames) {
TEST_F(WebSocketDeflateStreamTest, ReadUncompressedEmptyFrames) {
ScopedVector<WebSocketFrame> frames_to_output;
- AppendTo(&frames_to_output,
- WebSocketFrameHeader::kOpCodeText,
- kNoFlag);
- AppendTo(&frames_to_output,
- WebSocketFrameHeader::kOpCodeContinuation,
- kFinal);
+ AppendTo(&frames_to_output, WebSocketFrameHeader::kOpCodeText, kNoFlag);
+ AppendTo(
+ &frames_to_output, WebSocketFrameHeader::kOpCodeContinuation, kFinal);
ReadFramesStub stub(OK, &frames_to_output);
CompletionCallback callback;
ScopedVector<WebSocketFrame> frames;
@@ -612,9 +592,8 @@ TEST_F(WebSocketDeflateStreamTest, ReadCompressedEmptyFrames) {
WebSocketFrameHeader::kOpCodeText,
kReserved1,
std::string("\x02\x00", 1));
- AppendTo(&frames_to_output,
- WebSocketFrameHeader::kOpCodeContinuation,
- kFinal);
+ AppendTo(
+ &frames_to_output, WebSocketFrameHeader::kOpCodeContinuation, kFinal);
ReadFramesStub stub(OK, &frames_to_output);
CompletionCallback callback;
ScopedVector<WebSocketFrame> frames;
@@ -632,17 +611,13 @@ TEST_F(WebSocketDeflateStreamTest, ReadCompressedEmptyFrames) {
EXPECT_EQ("", ToString(frames[0]));
}
-TEST_F(WebSocketDeflateStreamTest,
- ReadCompressedFrameFollowedByEmptyFrame) {
+TEST_F(WebSocketDeflateStreamTest, ReadCompressedFrameFollowedByEmptyFrame) {
const std::string data("\xf2\x48\xcd\xc9\xc9\x07\x00", 7);
ScopedVector<WebSocketFrame> frames_to_output;
- AppendTo(&frames_to_output,
- WebSocketFrameHeader::kOpCodeText,
- kReserved1,
- data);
- AppendTo(&frames_to_output,
- WebSocketFrameHeader::kOpCodeContinuation,
- kFinal);
+ AppendTo(
+ &frames_to_output, WebSocketFrameHeader::kOpCodeText, kReserved1, data);
+ AppendTo(
+ &frames_to_output, WebSocketFrameHeader::kOpCodeContinuation, kFinal);
ReadFramesStub stub(OK, &frames_to_output);
CompletionCallback callback;
ScopedVector<WebSocketFrame> frames;
@@ -664,10 +639,8 @@ TEST_F(WebSocketDeflateStreamTest, ReadControlFrameBetweenDataFrames) {
const std::string data1("\xf2\x48\xcd", 3);
const std::string data2("\xc9\xc9\x07\x00", 4);
ScopedVector<WebSocketFrame> frames_to_output;
- AppendTo(&frames_to_output,
- WebSocketFrameHeader::kOpCodeText,
- kReserved1,
- data1);
+ AppendTo(
+ &frames_to_output, WebSocketFrameHeader::kOpCodeText, kReserved1, data1);
AppendTo(&frames_to_output, WebSocketFrameHeader::kOpCodePing, kFinal);
AppendTo(&frames_to_output, WebSocketFrameHeader::kOpCodeText, kFinal, data2);
ReadFramesStub stub(OK, &frames_to_output);
@@ -745,10 +718,7 @@ TEST_F(WebSocketDeflateStreamTest, InflaterInternalDataCanBeEmpty) {
WebSocketFrameHeader::kOpCodeBinary,
kReserved1,
ToString(deflater.GetOutput(deflater.CurrentOutputSize())));
- AppendTo(&frames_to_output,
- WebSocketFrameHeader::kOpCodeBinary,
- kFinal,
- "");
+ AppendTo(&frames_to_output, WebSocketFrameHeader::kOpCodeBinary, kFinal, "");
ReadFramesStub stub(OK, &frames_to_output);
CompletionCallback callback;
@@ -779,10 +749,8 @@ TEST_F(WebSocketDeflateStreamTest,
const std::string data1("\xf2\x48\xcd", 3);
const std::string data2("\xc9\xc9\x07\x00", 4);
ScopedVector<WebSocketFrame> frames_to_output;
- AppendTo(&frames_to_output,
- WebSocketFrameHeader::kOpCodeText,
- kReserved1,
- data1);
+ AppendTo(
+ &frames_to_output, WebSocketFrameHeader::kOpCodeText, kReserved1, data1);
AppendTo(&frames_to_output,
WebSocketFrameHeader::kOpCodeContinuation,
kFinal | kReserved1,
@@ -803,10 +771,8 @@ TEST_F(WebSocketDeflateStreamTest,
TEST_F(WebSocketDeflateStreamTest,
Reserved1TurnsOnDuringReadingUncompressedContinuationFrame) {
ScopedVector<WebSocketFrame> frames_to_output;
- AppendTo(&frames_to_output,
- WebSocketFrameHeader::kOpCodeText,
- kNoFlag,
- "hello");
+ AppendTo(
+ &frames_to_output, WebSocketFrameHeader::kOpCodeText, kNoFlag, "hello");
AppendTo(&frames_to_output,
WebSocketFrameHeader::kOpCodeContinuation,
kFinal | kReserved1,
@@ -826,11 +792,11 @@ TEST_F(WebSocketDeflateStreamTest,
TEST_F(WebSocketDeflateStreamTest, ReadCompressedMessages) {
ScopedVector<WebSocketFrame> frames_to_output;
- AppendTo(&frames_to_output,
- WebSocketFrameHeader::kOpCodeText,
- kFinal | kReserved1,
- std::string(
- "\x4a\xce\xcf\x2d\x28\x4a\x2d\x2e\x4e\x4d\x31\x04\x00", 13));
+ AppendTo(
+ &frames_to_output,
+ WebSocketFrameHeader::kOpCodeText,
+ kFinal | kReserved1,
+ std::string("\x4a\xce\xcf\x2d\x28\x4a\x2d\x2e\x4e\x4d\x31\x04\x00", 13));
AppendTo(&frames_to_output,
WebSocketFrameHeader::kOpCodeText,
kFinal | kReserved1,
@@ -893,8 +859,7 @@ TEST_F(WebSocketDeflateStreamTest,
AppendTo(&frames_to_output,
WebSocketFrameHeader::kOpCodeText,
kFinal | kReserved1,
- std::string(
- "\x4a\xce\xcf\x2d\x28\x4a\x2d\x2e\x4e\x4d\x01\x00", 12));
+ std::string("\x4a\xce\xcf\x2d\x28\x4a\x2d\x2e\x4e\x4d\x01\x00", 12));
AppendTo(&frames_to_output,
WebSocketFrameHeader::kOpCodeText,
kFinal,
@@ -930,8 +895,7 @@ TEST_F(WebSocketDeflateStreamTest,
AppendTo(&frames_to_output,
WebSocketFrameHeader::kOpCodeText,
kFinal | kReserved1,
- std::string(
- "\x4a\xce\xcf\x2d\x28\x4a\x2d\x2e\x4e\x4d\x01\x00", 12));
+ std::string("\x4a\xce\xcf\x2d\x28\x4a\x2d\x2e\x4e\x4d\x01\x00", 12));
ReadFramesStub stub(OK, &frames_to_output);
CompletionCallback callback;
ScopedVector<WebSocketFrame> frames;
@@ -1319,8 +1283,10 @@ TEST_F(WebSocketDeflateStreamWithClientWindowBitsTest, WindowBits8) {
ASSERT_EQ(OK, deflate_stream_->WriteFrames(&frames_, callback));
const ScopedVector<WebSocketFrame>& frames_passed = *stub.frames();
ASSERT_EQ(1u, frames_passed.size());
- EXPECT_EQ(std::string("r\xce(\xca\xcf\xcd,\xcdM\x1c\xe1\xc0\x39\xa3"
- "(?7\xb3\x34\x17\x00", 21),
+ EXPECT_EQ(std::string(
+ "r\xce(\xca\xcf\xcd,\xcdM\x1c\xe1\xc0\x39\xa3"
+ "(?7\xb3\x34\x17\x00",
+ 21),
ToString(frames_passed[0]));
}
« net/base/mime_util_unittest.cc ('K') | « net/websockets/websocket_deflate_stream.cc ('k') | net/websockets/websocket_deflater.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698