commit 95c96c3a96140019bfeb586454216e45e995cfea
author dschinazi <dschinazi@google.com> Fri Mar 27 09:07:35 2020 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Mar 27 09:08:21 2020 -0700
tree 0fc5fe919199d30d877c4b675abf0edd19d5321e
parent 1bcd0c3f96e1668ab56cc134dc4cfd2ac5ed42a2

Move some QUIC tests to QuicTest

This will allow us to make some changes that require more use of QuicTest.

gfe-relnote: n/a, test-only
PiperOrigin-RevId: 303341169
Change-Id: I31bd61646301fad0b04dfe42c0134e4c5828ce40

quic/core/quic_circular_deque_test.cc

diff --git a/quic/core/quic_circular_deque_test.cc b/quic/core/quic_circular_deque_test.cc
index c165898..19005f6 100644
--- a/quic/core/quic_circular_deque_test.cc
+++ b/quic/core/quic_circular_deque_test.cc
@@ -16,6 +16,7 @@
 
 namespace quic {
 namespace test {
+namespace {
 
 template <typename T, template <typename> class BaseAllocator = std::allocator>
 class CountingAllocator : public BaseAllocator<T> {
@@ -105,7 +106,9 @@
   }
 }
 
-TEST(QuicCircularDeque, Empty) {
+class QuicCircularDequeTest : public QuicTest {};
+
+TEST_F(QuicCircularDequeTest, Empty) {
   QuicCircularDeque<int> dq;
   EXPECT_TRUE(dq.empty());
   EXPECT_EQ(0u, dq.size());
@@ -125,7 +128,7 @@
   EXPECT_QUIC_DEBUG_DEATH(dq[0], "");
 }
 
-TEST(QuicCircularDeque, Constructor) {
+TEST_F(QuicCircularDequeTest, Constructor) {
   QuicCircularDeque<int> dq;
   EXPECT_TRUE(dq.empty());
 
@@ -173,7 +176,7 @@
   EXPECT_THAT(dq9, ElementsAre(3, 4, 5, 6, 7));
 }
 
-TEST(QuicCircularDeque, Assign) {
+TEST_F(QuicCircularDequeTest, Assign) {
   // assign()
   QuicCircularDeque<int, 3, CountingAllocator<int>> dq;
   dq.assign(7, 1);
@@ -264,7 +267,7 @@
   EXPECT_TRUE(dq12.empty());
 }
 
-TEST(QuicCircularDeque, Access) {
+TEST_F(QuicCircularDequeTest, Access) {
   // at()
   // operator[]
   // front()
@@ -366,7 +369,7 @@
   EXPECT_EQ(1u, dq.get_allocator().allocate_count());
 }
 
-TEST(QuicCircularDeque, Iterate) {
+TEST_F(QuicCircularDequeTest, Iterate) {
   QuicCircularDeque<int> dq;
   EXPECT_EQ(dq.begin(), dq.end());
   EXPECT_EQ(dq.cbegin(), dq.cend());
@@ -428,7 +431,7 @@
   }
 }
 
-TEST(QuicCircularDeque, Iterator) {
+TEST_F(QuicCircularDequeTest, Iterator) {
   // Default constructed iterators of the same type compare equal.
   EXPECT_EQ(QuicCircularDeque<int>::iterator(),
             QuicCircularDeque<int>::iterator());
@@ -491,7 +494,7 @@
   }
 }
 
-TEST(QuicCircularDeque, Resize) {
+TEST_F(QuicCircularDequeTest, Resize) {
   QuicCircularDeque<int, 3, CountingAllocator<int>> dq;
   dq.resize(8);
   EXPECT_THAT(dq, ElementsAre(0, 0, 0, 0, 0, 0, 0, 0));
@@ -572,7 +575,7 @@
 };
 }  // namespace
 
-TEST(QuicCircularDeque, RelocateNonTriviallyCopyable) {
+TEST_F(QuicCircularDequeTest, RelocateNonTriviallyCopyable) {
   // When relocating non-trivially-copyable objects:
   // - Move constructor is preferred, if available.
   // - Copy constructor is used otherwise.
@@ -620,7 +623,7 @@
   }
 }
 
-TEST(QuicCircularDeque, PushPop) {
+TEST_F(QuicCircularDequeTest, PushPop) {
   // (push|pop|emplace)_(back|front)
 
   {
@@ -697,7 +700,7 @@
   }
 }
 
-TEST(QuicCircularDeque, Allocation) {
+TEST_F(QuicCircularDequeTest, Allocation) {
   CountingAllocator<int> alloc;
 
   {
@@ -729,6 +732,7 @@
   EXPECT_EQ(7u, alloc.deallocate_count());
 }
 
+}  // namespace
 }  // namespace test
 }  // namespace quic
 
@@ -759,7 +763,9 @@
     /*propagate_on_swap=*/std::false_type,
     /*equality_result=*/false>;
 
-TEST(QuicCircularDeque, Swap) {
+using quic::test::QuicCircularDequeTest;
+
+TEST_F(QuicCircularDequeTest, Swap) {
   using std::swap;
 
   quic::QuicCircularDeque<int64_t, 3, SwappableAllocator<int64_t>> dq1, dq2;

quic/core/quic_crypto_client_handshaker_test.cc

diff --git a/quic/core/quic_crypto_client_handshaker_test.cc b/quic/core/quic_crypto_client_handshaker_test.cc
index 9274b7e..ee94df3 100644
--- a/quic/core/quic_crypto_client_handshaker_test.cc
+++ b/quic/core/quic_crypto_client_handshaker_test.cc
@@ -14,8 +14,6 @@
 namespace quic {
 namespace {
 
-using ::testing::Test;
-
 class TestProofHandler : public QuicCryptoClientStream::ProofHandler {
  public:
   ~TestProofHandler() override {}
@@ -123,7 +121,7 @@
   }
 };
 
-class QuicCryptoClientHandshakerTest : public Test {
+class QuicCryptoClientHandshakerTest : public QuicTest {
  protected:
   QuicCryptoClientHandshakerTest()
       : proof_handler_(),