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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/tools/flip_server/spdy_interface_test.cc

Issue 93793004: Format and Refactor Flip Server. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 7 years 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/tools/flip_server/sm_connection.cc ('K') | « net/tools/flip_server/spdy_interface.cc ('k') | net/tools/flip_server/spdy_ssl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/tools/flip_server/spdy_interface_test.cc
diff --git a/net/tools/flip_server/spdy_interface_test.cc b/net/tools/flip_server/spdy_interface_test.cc
index 660bf6c816c649ea3810c0e835a73361d6584ead..711199f7260ecb1a3e7d179f636412bf209dd827 100644
--- a/net/tools/flip_server/spdy_interface_test.cc
+++ b/net/tools/flip_server/spdy_interface_test.cc
@@ -32,9 +32,7 @@ namespace {
struct StringSaver {
public:
StringSaver() : data(NULL), size(0) {}
- void Save() {
- string = std::string(data, size);
- }
+ void Save() { string = std::string(data, size); }
const char* data;
size_t size;
@@ -46,20 +44,19 @@ class SpdyFramerVisitor : public BufferedSpdyFramerVisitorInterface {
virtual ~SpdyFramerVisitor() {}
MOCK_METHOD1(OnError, void(SpdyFramer::SpdyError));
MOCK_METHOD2(OnStreamError, void(SpdyStreamId, const std::string&));
- MOCK_METHOD7(OnSynStream, void(SpdyStreamId,
- SpdyStreamId,
- SpdyPriority,
- uint8,
- bool,
- bool,
- const SpdyHeaderBlock&));
+ MOCK_METHOD7(OnSynStream,
+ void(SpdyStreamId,
+ SpdyStreamId,
+ SpdyPriority,
+ uint8,
+ bool,
+ bool,
+ const SpdyHeaderBlock&));
MOCK_METHOD3(OnSynStream, void(SpdyStreamId, bool, const SpdyHeaderBlock&));
MOCK_METHOD3(OnSynReply, void(SpdyStreamId, bool, const SpdyHeaderBlock&));
MOCK_METHOD3(OnHeaders, void(SpdyStreamId, bool, const SpdyHeaderBlock&));
- MOCK_METHOD4(OnStreamFrameData, void(SpdyStreamId,
- const char*,
- size_t,
- bool));
+ MOCK_METHOD4(OnStreamFrameData,
+ void(SpdyStreamId, const char*, size_t, bool));
MOCK_METHOD1(OnSettings, void(bool clear_persisted));
MOCK_METHOD3(OnSetting, void(SpdySettingsIds, uint8, uint32));
MOCK_METHOD1(OnPing, void(uint32 unique_id));
@@ -83,14 +80,15 @@ class FakeSMConnection : public SMConnection {
log_prefix) {}
MOCK_METHOD0(Cleanup, void());
- MOCK_METHOD8(InitSMConnection, void(SMConnectionPoolInterface*,
- SMInterface*,
- EpollServer*,
- int,
- std::string,
- std::string,
- std::string,
- bool));
+ MOCK_METHOD8(InitSMConnection,
+ void(SMConnectionPoolInterface*,
+ SMInterface*,
+ EpollServer*,
+ int,
+ std::string,
+ std::string,
+ std::string,
+ bool));
};
// This class is almost SpdySM, except one function.
@@ -99,11 +97,11 @@ class TestSpdySM : public SpdySM {
public:
virtual ~TestSpdySM() {}
TestSpdySM(SMConnection* connection,
- SMInterface* sm_http_interface,
- EpollServer* epoll_server,
- MemoryCache* memory_cache,
- FlipAcceptor* acceptor,
- SpdyMajorVersion version)
+ SMInterface* sm_http_interface,
+ EpollServer* epoll_server,
+ MemoryCache* memory_cache,
+ FlipAcceptor* acceptor,
+ SpdyMajorVersion version)
: SpdySM(connection,
sm_http_interface,
epoll_server,
@@ -194,30 +192,22 @@ class SpdySMProxyTest : public SpdySMTestBase {
class SpdySMServerTest : public SpdySMTestBase {
public:
- SpdySMServerTest(): SpdySMTestBase(FLIP_HANDLER_SPDY_SERVER) {}
+ SpdySMServerTest() : SpdySMTestBase(FLIP_HANDLER_SPDY_SERVER) {}
virtual ~SpdySMServerTest() {}
};
INSTANTIATE_TEST_CASE_P(SpdySMProxyTest,
SpdySMProxyTest,
Values(SPDY2, SPDY3, SPDY4));
-INSTANTIATE_TEST_CASE_P(SpdySMServerTest,
- SpdySMServerTest,
- Values(SPDY2));
+INSTANTIATE_TEST_CASE_P(SpdySMServerTest, SpdySMServerTest, Values(SPDY2));
TEST_P(SpdySMProxyTest, InitSMConnection) {
{
InSequence s;
EXPECT_CALL(*connection_, InitSMConnection(_, _, _, _, _, _, _, _));
}
- interface_->InitSMConnection(NULL,
- NULL,
- epoll_server_.get(),
- -1,
- "",
- "",
- "",
- false);
+ interface_->InitSMConnection(
+ NULL, NULL, epoll_server_.get(), -1, "", "", "", false);
}
TEST_P(SpdySMProxyTest, OnSynStream) {
@@ -225,7 +215,8 @@ TEST_P(SpdySMProxyTest, OnSynStream) {
scoped_ptr<MockSMInterface> mock_interface(new MockSMInterface);
uint32 stream_id = 92;
uint32 associated_id = 43;
- std::string expected = "GET /path HTTP/1.0\r\n"
+ std::string expected =
+ "GET /path HTTP/1.0\r\n"
"method: GET\r\n"
"scheme: http\r\n"
"url: http://www.example.com/path\r\n"
@@ -238,8 +229,7 @@ TEST_P(SpdySMProxyTest, OnSynStream) {
StringSaver saver;
{
InSequence s;
- EXPECT_CALL(*interface_,
- FindOrMakeNewSMConnectionInterface(_, _))
+ EXPECT_CALL(*interface_, FindOrMakeNewSMConnectionInterface(_, _))
.WillOnce(Return(mock_interface.get()));
EXPECT_CALL(*mock_interface, SetStreamID(stream_id));
EXPECT_CALL(*mock_interface, ProcessWriteInput(_, _))
@@ -267,8 +257,7 @@ TEST_P(SpdySMProxyTest, OnStreamFrameData) {
block["version"] = "HTTP/1.0";
{
InSequence s;
- EXPECT_CALL(*interface_,
- FindOrMakeNewSMConnectionInterface(_, _))
+ EXPECT_CALL(*interface_, FindOrMakeNewSMConnectionInterface(_, _))
.WillOnce(Return(mock_interface.get()));
EXPECT_CALL(*mock_interface, SetStreamID(stream_id));
EXPECT_CALL(*mock_interface, ProcessWriteInput(_, _)).Times(1);
@@ -342,8 +331,8 @@ TEST_P(SpdySMProxyTest, PostAcceptHook) {
{
InSequence s;
EXPECT_CALL(*spdy_framer_visitor_, OnSettings(false));
- EXPECT_CALL(*spdy_framer_visitor_, OnSetting(
- SETTINGS_MAX_CONCURRENT_STREAMS, 0u, 100u));
+ EXPECT_CALL(*spdy_framer_visitor_,
+ OnSetting(SETTINGS_MAX_CONCURRENT_STREAMS, 0u, 100u));
}
spdy_framer_->ProcessInput(df->data, df->size);
}
@@ -383,14 +372,13 @@ TEST_P(SpdySMProxyTest, SendErrorNotFound) {
{
InSequence s;
- EXPECT_CALL(*spdy_framer_visitor_,
- OnSynReply(stream_id, false, _))
+ EXPECT_CALL(*spdy_framer_visitor_, OnSynReply(stream_id, false, _))
.WillOnce(SaveArg<2>(&actual_header_block));
EXPECT_CALL(checkpoint, Call(0));
EXPECT_CALL(*spdy_framer_visitor_,
- OnStreamFrameData(stream_id, _, _, false)).Times(1)
- .WillOnce(DoAll(SaveArg<1>(&actual_data),
- SaveArg<2>(&actual_size)));
+ OnStreamFrameData(stream_id, _, _, false))
+ .Times(1)
+ .WillOnce(DoAll(SaveArg<1>(&actual_data), SaveArg<2>(&actual_size)));
EXPECT_CALL(*spdy_framer_visitor_,
OnStreamFrameData(stream_id, NULL, 0, true)).Times(1);
}
@@ -481,8 +469,7 @@ TEST_P(SpdySMProxyTest, SendDataFrame) {
InSequence s;
EXPECT_CALL(*spdy_framer_visitor_,
OnStreamFrameData(stream_id, _, _, false))
- .WillOnce(DoAll(SaveArg<1>(&actual_data),
- SaveArg<2>(&actual_size)));
+ .WillOnce(DoAll(SaveArg<1>(&actual_data), SaveArg<2>(&actual_size)));
}
spdy_framer_->ProcessInput(df->data, df->size);
@@ -496,18 +483,17 @@ TEST_P(SpdySMProxyTest, SendLongDataFrame) {
const char* actual_data;
size_t actual_size;
- std::string data =
- std::string(kSpdySegmentSize, 'a') +
- std::string(kSpdySegmentSize, 'b') +
- "c";
+ std::string data = std::string(kSpdySegmentSize, 'a') +
+ std::string(kSpdySegmentSize, 'b') + "c";
interface_->SendDataFrame(stream_id, data.data(), data.size(), flags, true);
{
InSequence s;
EXPECT_CALL(*spdy_framer_visitor_,
- OnStreamFrameData(stream_id, _, _, false)).Times(3)
- .WillRepeatedly(DoAll(SaveArg<1>(&actual_data),
- SaveArg<2>(&actual_size)));
+ OnStreamFrameData(stream_id, _, _, false))
+ .Times(3)
+ .WillRepeatedly(
+ DoAll(SaveArg<1>(&actual_data), SaveArg<2>(&actual_size)));
}
ASSERT_EQ(3u, connection_->output_list()->size());
@@ -621,14 +607,13 @@ TEST_P(SpdySMServerTest, NewStreamError) {
{
InSequence s;
- EXPECT_CALL(*spdy_framer_visitor_,
- OnSynReply(stream_id, false, _))
+ EXPECT_CALL(*spdy_framer_visitor_, OnSynReply(stream_id, false, _))
.WillOnce(SaveArg<2>(&actual_header_block));
EXPECT_CALL(checkpoint, Call(0));
EXPECT_CALL(*spdy_framer_visitor_,
- OnStreamFrameData(stream_id, _, _, false)).Times(1)
- .WillOnce(DoAll(SaveArg<1>(&actual_data),
- SaveArg<2>(&actual_size)));
+ OnStreamFrameData(stream_id, _, _, false))
+ .Times(1)
+ .WillOnce(DoAll(SaveArg<1>(&actual_data), SaveArg<2>(&actual_size)));
EXPECT_CALL(*spdy_framer_visitor_,
OnStreamFrameData(stream_id, NULL, 0, true)).Times(1);
}
« net/tools/flip_server/sm_connection.cc ('K') | « net/tools/flip_server/spdy_interface.cc ('k') | net/tools/flip_server/spdy_ssl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698