diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-21 13:56:13 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-21 13:56:13 +0000 |
| commit | dc2cc746109141fd48e9df1018204fdf772ac317 (patch) | |
| tree | bc492e9670c724649e4691b79c71140cf458cc51 /net/quic/crypto/crypto_framer_test.cc | |
| parent | 4fd911f27e187727b2dad1561d7257141a6589fc (diff) | |
| download | chromium_src-dc2cc746109141fd48e9df1018204fdf772ac317.zip chromium_src-dc2cc746109141fd48e9df1018204fdf772ac317.tar.gz chromium_src-dc2cc746109141fd48e9df1018204fdf772ac317.tar.bz2 | |
Change CryptoFramer to return a QuicData* instead of returning a bool and setting an out-param to the new QuicData*. This simplifies the API for callers.
Merge internal change 35500299
Review URL: https://chromiumcodereview.appspot.com/11184057
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@163203 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/quic/crypto/crypto_framer_test.cc')
| -rw-r--r-- | net/quic/crypto/crypto_framer_test.cc | 22 |
1 files changed, 8 insertions, 14 deletions
diff --git a/net/quic/crypto/crypto_framer_test.cc b/net/quic/crypto/crypto_framer_test.cc index 5d79eed..eed175f 100644 --- a/net/quic/crypto/crypto_framer_test.cc +++ b/net/quic/crypto/crypto_framer_test.cc @@ -100,10 +100,8 @@ TEST(CryptoFramerTest, ConstructHandshakeMessage) { }; CryptoFramer framer; - QuicData* data; - EXPECT_TRUE(framer.ConstructHandshakeMessage(message, &data)); - scoped_ptr<QuicData> scoped_data(data); - + scoped_ptr<QuicData> data(framer.ConstructHandshakeMessage(message)); + ASSERT_TRUE(data.get() != NULL); test::CompareCharArraysWithHexError("constructed packet", data->data(), data->length(), AsChars(packet), arraysize(packet)); @@ -137,9 +135,8 @@ TEST(CryptoFramerTest, ConstructHandshakeMessageWithTwoKeys) { }; CryptoFramer framer; - QuicData* data; - EXPECT_TRUE(framer.ConstructHandshakeMessage(message, &data)); - scoped_ptr<QuicData> scoped_data(data); + scoped_ptr<QuicData> data(framer.ConstructHandshakeMessage(message)); + ASSERT_TRUE(data.get() != NULL); test::CompareCharArraysWithHexError("constructed packet", data->data(), data->length(), @@ -154,10 +151,8 @@ TEST(CryptoFramerTest, ConstructHandshakeMessageTooManyEntries) { } CryptoFramer framer; - - QuicData* dummy = NULL; - EXPECT_FALSE(framer.ConstructHandshakeMessage(message, &dummy)); - scoped_ptr<QuicData> scoped_data(dummy); + scoped_ptr<QuicData> data(framer.ConstructHandshakeMessage(message)); + EXPECT_TRUE(data.get() == NULL); } @@ -167,9 +162,8 @@ TEST(CryptoFramerTest, ConstructHandshakeMessageInvalidLength) { message.tag_value_map[0x12345678] = ""; CryptoFramer framer; - QuicData* dummy = NULL; - EXPECT_FALSE(framer.ConstructHandshakeMessage(message, &dummy)); - scoped_ptr<QuicData> scoped_data(dummy); + scoped_ptr<QuicData> data(framer.ConstructHandshakeMessage(message)); + EXPECT_TRUE(data.get() == NULL); } TEST(CryptoFramerTest, ProcessInput) { |