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

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/http/disk_cache_based_quic_server_info_unittest.cc

Issue 2109503009: Refactor net tests to use GMock matchers for checking net::Error results (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Revert changes to contents.txt files Created 4 years, 6 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/http/bidirectional_stream_unittest.cc ('k') | net/http/http_auth_handler_basic_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/disk_cache_based_quic_server_info_unittest.cc
diff --git a/net/http/disk_cache_based_quic_server_info_unittest.cc b/net/http/disk_cache_based_quic_server_info_unittest.cc
index ce4d5526f5e0afc5383ba9f081309b3eea6827c8..e319e519f409bcf51a0f06b2b1f2f428ac2fbd7e 100644
--- a/net/http/disk_cache_based_quic_server_info_unittest.cc
+++ b/net/http/disk_cache_based_quic_server_info_unittest.cc
@@ -14,8 +14,13 @@
#include "net/http/mock_http_cache.h"
#include "net/quic/crypto/quic_server_info.h"
#include "net/quic/quic_server_id.h"
+#include "net/test/gtest_util.h"
+#include "testing/gmock/include/gmock/gmock.h"
#include "testing/gtest/include/gtest/gtest.h"
+using net::test::IsError;
+using net::test::IsOk;
+
using std::string;
namespace net {
@@ -96,10 +101,10 @@ TEST(DiskCacheBasedQuicServerInfo, DeleteInCallback) {
quic_server_info->Start();
TestCompletionCallback callback;
int rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Now complete the backend creation and let the callback run.
factory->FinishCreation();
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
}
// Tests the basic logic of storing, retrieving and updating data.
@@ -113,7 +118,7 @@ TEST(DiskCacheBasedQuicServerInfo, Update) {
new DiskCacheBasedQuicServerInfo(server_id, cache.http_cache()));
quic_server_info->Start();
int rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
QuicServerInfo::State* state = quic_server_info->mutable_state();
EXPECT_TRUE(state->certs.empty());
@@ -141,7 +146,7 @@ TEST(DiskCacheBasedQuicServerInfo, Update) {
new DiskCacheBasedQuicServerInfo(server_id, cache.http_cache()));
quic_server_info->Start();
rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
// And now update the data.
state = quic_server_info->mutable_state();
@@ -157,7 +162,7 @@ TEST(DiskCacheBasedQuicServerInfo, Update) {
new DiskCacheBasedQuicServerInfo(server_id, cache.http_cache()));
quic_server_info->Start();
rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
EXPECT_TRUE(quic_server_info->IsDataReady());
const QuicServerInfo::State& state1 = quic_server_info->state();
@@ -186,7 +191,7 @@ TEST(DiskCacheBasedQuicServerInfo, UpdateDifferentPorts) {
new DiskCacheBasedQuicServerInfo(server_id1, cache.http_cache()));
quic_server_info1->Start();
int rv = quic_server_info1->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
QuicServerInfo::State* state1 = quic_server_info1->mutable_state();
EXPECT_TRUE(state1->certs.empty());
@@ -214,7 +219,7 @@ TEST(DiskCacheBasedQuicServerInfo, UpdateDifferentPorts) {
new DiskCacheBasedQuicServerInfo(server_id2, cache.http_cache()));
quic_server_info2->Start();
rv = quic_server_info2->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
QuicServerInfo::State* state2 = quic_server_info2->mutable_state();
EXPECT_TRUE(state2->certs.empty());
@@ -241,7 +246,7 @@ TEST(DiskCacheBasedQuicServerInfo, UpdateDifferentPorts) {
new DiskCacheBasedQuicServerInfo(server_id1, cache.http_cache()));
quic_server_info->Start();
rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
EXPECT_TRUE(quic_server_info->IsDataReady());
const QuicServerInfo::State& state_a = quic_server_info->state();
@@ -258,7 +263,7 @@ TEST(DiskCacheBasedQuicServerInfo, UpdateDifferentPorts) {
new DiskCacheBasedQuicServerInfo(server_id2, cache.http_cache()));
quic_server_info->Start();
rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
EXPECT_TRUE(quic_server_info->IsDataReady());
const QuicServerInfo::State& state_b = quic_server_info->state();
@@ -286,7 +291,7 @@ TEST(DiskCacheBasedQuicServerInfo, IsReadyToPersist) {
EXPECT_FALSE(quic_server_info->IsDataReady());
quic_server_info->Start();
int rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
EXPECT_TRUE(quic_server_info->IsDataReady());
QuicServerInfo::State* state = quic_server_info->mutable_state();
@@ -321,7 +326,7 @@ TEST(DiskCacheBasedQuicServerInfo, IsReadyToPersist) {
new DiskCacheBasedQuicServerInfo(server_id, cache.http_cache()));
quic_server_info->Start();
rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
EXPECT_TRUE(quic_server_info->IsDataReady());
const QuicServerInfo::State& state1 = quic_server_info->state();
@@ -348,7 +353,7 @@ TEST(DiskCacheBasedQuicServerInfo, MultiplePersist) {
EXPECT_FALSE(quic_server_info->IsDataReady());
quic_server_info->Start();
int rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
EXPECT_TRUE(quic_server_info->IsDataReady());
// Persist data once.
@@ -411,7 +416,7 @@ TEST(DiskCacheBasedQuicServerInfo, MultiplePersist) {
new DiskCacheBasedQuicServerInfo(server_id, cache.http_cache()));
quic_server_info->Start();
rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
EXPECT_TRUE(quic_server_info->IsDataReady());
const QuicServerInfo::State& state1 = quic_server_info->state();
@@ -436,7 +441,7 @@ TEST(DiskCacheBasedQuicServerInfo, CancelWaitForDataReady) {
EXPECT_FALSE(quic_server_info->IsDataReady());
quic_server_info->Start();
int rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Now cancel the callback.
quic_server_info->CancelWaitForDataReadyCallback();
EXPECT_FALSE(quic_server_info->IsDataReady());
@@ -457,7 +462,7 @@ TEST(DiskCacheBasedQuicServerInfo, CancelWaitForDataReadyButDataIsReady) {
quic_server_info->Start();
int rv = quic_server_info->WaitForDataReady(callback.callback());
quic_server_info->CancelWaitForDataReadyCallback();
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
EXPECT_TRUE(quic_server_info->IsDataReady());
RemoveMockTransaction(&kHostInfoTransaction1);
}
@@ -476,7 +481,7 @@ TEST(DiskCacheBasedQuicServerInfo, CancelWaitForDataReadyAfterDeleteCache) {
quic_server_info->Start();
int rv = quic_server_info->WaitForDataReady(callback.callback());
quic_server_info->CancelWaitForDataReadyCallback();
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
EXPECT_TRUE(quic_server_info->IsDataReady());
RemoveMockTransaction(&kHostInfoTransaction1);
}
@@ -533,7 +538,7 @@ TEST(DiskCacheBasedQuicServerInfo, StartAndPersist) {
quic_server_info->Start();
TestCompletionCallback callback;
int rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
EXPECT_TRUE(quic_server_info->IsDataReady());
const QuicServerInfo::State& state1 = quic_server_info->state();
@@ -597,7 +602,7 @@ TEST(DiskCacheBasedQuicServerInfo, PersistWhenNotReadyToPersist) {
new DiskCacheBasedQuicServerInfo(server_id, cache.http_cache()));
quic_server_info->Start();
int rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
EXPECT_TRUE(quic_server_info->IsDataReady());
const QuicServerInfo::State& state1 = quic_server_info->state();
@@ -623,7 +628,7 @@ TEST(DiskCacheBasedQuicServerInfo, MultiplePersistsWithoutWaiting) {
EXPECT_FALSE(quic_server_info->IsDataReady());
quic_server_info->Start();
int rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
EXPECT_TRUE(quic_server_info->IsDataReady());
// Persist data once.
@@ -677,7 +682,7 @@ TEST(DiskCacheBasedQuicServerInfo, MultiplePersistsWithoutWaiting) {
new DiskCacheBasedQuicServerInfo(server_id, cache.http_cache()));
quic_server_info->Start();
rv = quic_server_info->WaitForDataReady(callback.callback());
- EXPECT_EQ(OK, callback.GetResult(rv));
+ EXPECT_THAT(callback.GetResult(rv), IsOk());
EXPECT_TRUE(quic_server_info->IsDataReady());
// Verify the second time persisted data is persisted.
@@ -707,10 +712,10 @@ TEST(DiskCacheBasedQuicServerInfo, DeleteServerInfoInCallback) {
DeleteCacheCompletionCallback cb(quic_server_info);
quic_server_info->Start();
int rv = quic_server_info->WaitForDataReady(cb.callback());
- EXPECT_EQ(ERR_IO_PENDING, rv);
+ EXPECT_THAT(rv, IsError(ERR_IO_PENDING));
// Now complete the backend creation and let the callback run.
factory->FinishCreation();
- EXPECT_EQ(OK, cb.GetResult(rv));
+ EXPECT_THAT(cb.GetResult(rv), IsOk());
}
} // namespace net
« no previous file with comments | « net/http/bidirectional_stream_unittest.cc ('k') | net/http/http_auth_handler_basic_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698