| Index: net/spdy/spdy_protocol_test_utils.h
|
| diff --git a/net/spdy/spdy_protocol_test_utils.h b/net/spdy/spdy_protocol_test_utils.h
|
| deleted file mode 100644
|
| index f360d51e01895e43b104d56c51064ddae9b06c4c..0000000000000000000000000000000000000000
|
| --- a/net/spdy/spdy_protocol_test_utils.h
|
| +++ /dev/null
|
| @@ -1,159 +0,0 @@
|
| -// Copyright 2016 The Chromium Authors. All rights reserved.
|
| -// Use of this source code is governed by a BSD-style license that can be
|
| -// found in the LICENSE file.
|
| -
|
| -#ifndef NET_SPDY_SPDY_PROTOCOL_TEST_UTILS_H_
|
| -#define NET_SPDY_SPDY_PROTOCOL_TEST_UTILS_H_
|
| -
|
| -// These functions support tests that need to compare two concrete SpdyFrameIR
|
| -// instances for equality. They return AssertionResult, so they may be used as
|
| -// follows:
|
| -//
|
| -// SomeSpdyFrameIRSubClass expected_ir(...);
|
| -// std::unique_ptr<SpdyFrameIR> collected_frame;
|
| -// ... some test code that may fill in collected_frame ...
|
| -// ASSERT_TRUE(VerifySpdyFrameIREquals(expected_ir, collected_frame.get()));
|
| -//
|
| -// TODO(jamessynge): Where it makes sense in these functions, it would be nice
|
| -// to make use of the existing gMock matchers here, instead of rolling our own.
|
| -
|
| -#include <typeinfo>
|
| -
|
| -#include "base/logging.h"
|
| -#include "net/spdy/spdy_protocol.h"
|
| -#include "net/spdy/spdy_test_utils.h"
|
| -#include "testing/gmock/include/gmock/gmock.h"
|
| -
|
| -namespace net {
|
| -namespace test {
|
| -
|
| -// Verify the header entries in two SpdyFrameWithHeaderBlockIR instances
|
| -// are the same.
|
| -::testing::AssertionResult VerifySpdyFrameWithHeaderBlockIREquals(
|
| - const SpdyFrameWithHeaderBlockIR& expected,
|
| - const SpdyFrameWithHeaderBlockIR& actual);
|
| -
|
| -// Verify that the padding in two frames of type T is the same.
|
| -template <class T>
|
| -::testing::AssertionResult VerifySpdyFrameWithPaddingIREquals(const T& expected,
|
| - const T& actual) {
|
| - DVLOG(1) << "VerifySpdyFrameWithPaddingIREquals";
|
| - if (expected.padded() != actual.padded())
|
| - return ::testing::AssertionFailure();
|
| - if (expected.padded()) {
|
| - if (expected.padding_payload_len() != actual.padding_payload_len())
|
| - return ::testing::AssertionFailure();
|
| - }
|
| -
|
| - return ::testing::AssertionSuccess();
|
| -}
|
| -
|
| -// Verify the priority fields in two frames of type T are the same.
|
| -template <class T>
|
| -::testing::AssertionResult VerifySpdyFrameWithPriorityIREquals(
|
| - const T& expected,
|
| - const T& actual) {
|
| - DVLOG(1) << "VerifySpdyFrameWithPriorityIREquals";
|
| - if (expected.parent_stream_id() != actual.parent_stream_id())
|
| - return ::testing::AssertionFailure();
|
| - if (expected.weight() != actual.weight())
|
| - return ::testing::AssertionFailure();
|
| - if (expected.exclusive() != actual.exclusive())
|
| - return ::testing::AssertionFailure();
|
| -
|
| - return ::testing::AssertionSuccess();
|
| -}
|
| -
|
| -// Verify that two SpdyAltSvcIR frames are the same.
|
| -::testing::AssertionResult VerifySpdyFrameIREquals(const SpdyAltSvcIR& expected,
|
| - const SpdyAltSvcIR& actual);
|
| -
|
| -// VerifySpdyFrameIREquals for SpdyContinuationIR frames isn't really needed
|
| -// because we don't really make use of SpdyContinuationIR, instead creating
|
| -// SpdyHeadersIR or SpdyPushPromiseIR with the pre-encoding form of the HPACK
|
| -// block (i.e. we don't yet have a CONTINUATION frame).
|
| -//
|
| -// ::testing::AssertionResult VerifySpdyFrameIREquals(
|
| -// const SpdyContinuationIR& expected,
|
| -// const SpdyContinuationIR& actual) {
|
| -// return ::testing::AssertionFailure()
|
| -// << "VerifySpdyFrameIREquals SpdyContinuationIR NYI";
|
| -// }
|
| -
|
| -// Verify that two SpdyDataIR frames are the same.
|
| -::testing::AssertionResult VerifySpdyFrameIREquals(const SpdyDataIR& expected,
|
| - const SpdyDataIR& actual);
|
| -
|
| -// Verify that two SpdyGoAwayIR frames are the same.
|
| -::testing::AssertionResult VerifySpdyFrameIREquals(const SpdyGoAwayIR& expected,
|
| - const SpdyGoAwayIR& actual);
|
| -
|
| -// Verify that two SpdyHeadersIR frames are the same.
|
| -::testing::AssertionResult VerifySpdyFrameIREquals(
|
| - const SpdyHeadersIR& expected,
|
| - const SpdyHeadersIR& actual);
|
| -
|
| -// Verify that two SpdyPingIR frames are the same.
|
| -::testing::AssertionResult VerifySpdyFrameIREquals(const SpdyPingIR& expected,
|
| - const SpdyPingIR& actual);
|
| -
|
| -// Verify that two SpdyPriorityIR frames are the same.
|
| -::testing::AssertionResult VerifySpdyFrameIREquals(
|
| - const SpdyPriorityIR& expected,
|
| - const SpdyPriorityIR& actual);
|
| -
|
| -// Verify that two SpdyPushPromiseIR frames are the same.
|
| -::testing::AssertionResult VerifySpdyFrameIREquals(
|
| - const SpdyPushPromiseIR& expected,
|
| - const SpdyPushPromiseIR& actual);
|
| -
|
| -// Verify that two SpdyRstStreamIR frames are the same.
|
| -::testing::AssertionResult VerifySpdyFrameIREquals(
|
| - const SpdyRstStreamIR& expected,
|
| - const SpdyRstStreamIR& actual);
|
| -
|
| -// Verify that two SpdySettingsIR frames are the same.
|
| -::testing::AssertionResult VerifySpdyFrameIREquals(
|
| - const SpdySettingsIR& expected,
|
| - const SpdySettingsIR& actual);
|
| -
|
| -// Verify that two SpdyWindowUpdateIR frames are the same.
|
| -::testing::AssertionResult VerifySpdyFrameIREquals(
|
| - const SpdyWindowUpdateIR& expected,
|
| - const SpdyWindowUpdateIR& actual);
|
| -
|
| -// Verify that either expected and actual are both nullptr, or that both are not
|
| -// nullptr, and that actual is of type E, and that it matches expected.
|
| -template <class E>
|
| -::testing::AssertionResult VerifySpdyFrameIREquals(const E* expected,
|
| - const SpdyFrameIR* actual) {
|
| - if (expected == nullptr || actual == nullptr) {
|
| - DVLOG(1) << "VerifySpdyFrameIREquals one null";
|
| - if (expected != nullptr)
|
| - return ::testing::AssertionFailure();
|
| - if (actual != nullptr)
|
| - return ::testing::AssertionFailure();
|
| -
|
| - return ::testing::AssertionSuccess();
|
| - }
|
| - DVLOG(1) << "VerifySpdyFrameIREquals not null";
|
| - const E* actual2 = reinterpret_cast<const E*>(actual);
|
| - if (actual2 == nullptr)
|
| - return ::testing::AssertionFailure();
|
| -
|
| - return VerifySpdyFrameIREquals(*expected, *actual2);
|
| -}
|
| -
|
| -// Verify that actual is not nullptr, that it is of type E and that it
|
| -// matches expected.
|
| -template <class E>
|
| -::testing::AssertionResult VerifySpdyFrameIREquals(const E& expected,
|
| - const SpdyFrameIR* actual) {
|
| - DVLOG(1) << "VerifySpdyFrameIREquals";
|
| - return VerifySpdyFrameIREquals(&expected, actual);
|
| -}
|
| -
|
| -} // namespace test
|
| -} // namespace net
|
| -
|
| -#endif // NET_SPDY_SPDY_PROTOCOL_TEST_UTILS_H_
|
|
|