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

Unified Diff: net/spdy/spdy_stream_spdy2_unittest.cc

Issue 9582034: Fork SPDY/2 and SPDY/3 versions of our SPDY tests, in preparation for landing (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: Fix merge bug Created 8 years, 10 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/spdy/spdy_session_unittest.cc ('k') | net/spdy/spdy_stream_spdy3_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/spdy/spdy_stream_spdy2_unittest.cc
===================================================================
--- net/spdy/spdy_stream_spdy2_unittest.cc (revision 124690)
+++ net/spdy/spdy_stream_spdy2_unittest.cc (working copy)
@@ -8,9 +8,11 @@
#include "net/spdy/spdy_stream.h"
#include "net/spdy/spdy_http_utils.h"
#include "net/spdy/spdy_session.h"
-#include "net/spdy/spdy_test_util.h"
+#include "net/spdy/spdy_test_util_spdy2.h"
#include "testing/gtest/include/gtest/gtest.h"
+using namespace net::test_spdy2;
+
// TODO(ukai): factor out common part with spdy_http_stream_unittest.cc
//
namespace net {
@@ -96,9 +98,9 @@
} // anonymous namespace
-class SpdyStreamTest : public testing::Test {
+class SpdyStreamSpdy2Test : public testing::Test {
protected:
- SpdyStreamTest() {
+ SpdyStreamSpdy2Test() {
}
scoped_refptr<SpdySession> CreateSpdySession() {
@@ -117,7 +119,7 @@
scoped_refptr<HttpNetworkSession> session_;
};
-TEST_F(SpdyStreamTest, SendDataAfterOpen) {
+TEST_F(SpdyStreamSpdy2Test, SendDataAfterOpen) {
SpdySessionDependencies session_deps;
session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps);
@@ -232,7 +234,7 @@
EXPECT_TRUE(delegate->closed());
}
-TEST_F(SpdyStreamTest, PushedStream) {
+TEST_F(SpdyStreamSpdy2Test, PushedStream) {
const char kStreamUrl[] = "http://www.google.com/";
SpdySessionDependencies session_deps;
@@ -266,7 +268,7 @@
EXPECT_EQ(kStreamUrl, stream->GetUrl().spec());
}
-TEST_F(SpdyStreamTest, StreamError) {
+TEST_F(SpdyStreamSpdy2Test, StreamError) {
SpdySessionDependencies session_deps;
session_ = SpdySessionDependencies::SpdyCreateSession(&session_deps);
« no previous file with comments | « net/spdy/spdy_session_unittest.cc ('k') | net/spdy/spdy_stream_spdy3_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698