commit 696ee606fd34c32d5c913e936edc3224174b2d3f
author dschinazi <dschinazi@google.com> Thu Apr 25 16:05:35 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Fri Apr 26 08:58:37 2019 -0700
tree dbb57af5ff5182ff1e69275a193c3a96e15a66f3
parent 43a1c0f10f2855c3cd142f500e8d19ac6d6f5a8c

Make QUIC EXPECT and ASSERT test macros reject comparison of unsigned integers

This CL overrides the CHECK/DCHECK/EXPECT/ASSERT macros. Unfortunately these macros allow comparison of integers of different signs, which allows us to write EXPECT_EQ(a, b) when a and b have different signs. However, the equivalent macros in Chromium do not allow this mismatch, and this has caused as number of quiche merge issues. Therefore, to avoid those, we add a non-executed comparison to the macros which ensures that compilation fails if there is a comparison of different signs. An example of the fix previously required for quiche merge can be found in cl/244853842.

gfe-relnote: n/a, changes only impact compile-time for debug builds and tests
PiperOrigin-RevId: 245325129
Change-Id: I1e4d0bb424754c62e62a72378789ae6902eb9af5

quic/core/quic_stream_test.cc

diff --git a/quic/core/quic_stream_test.cc b/quic/core/quic_stream_test.cc
index d1b442e..b9d97a1 100644
--- a/quic/core/quic_stream_test.cc
+++ b/quic/core/quic_stream_test.cc
@@ -1006,7 +1006,8 @@
   // Buffered data size < threshold, ask upper layer for more data.
   EXPECT_CALL(*stream_, OnCanWriteNewData()).Times(1);
   stream_->OnCanWrite();
-  EXPECT_EQ(GetQuicFlag(FLAGS_quic_buffered_data_threshold) - 1,
+  EXPECT_EQ(static_cast<uint64_t>(
+                GetQuicFlag(FLAGS_quic_buffered_data_threshold) - 1),
             stream_->BufferedDataBytes());
   EXPECT_TRUE(stream_->CanWriteNewData());
 
@@ -1055,7 +1056,8 @@
 
   EXPECT_CALL(*stream_, OnCanWriteNewData()).Times(1);
   stream_->OnCanWrite();
-  EXPECT_EQ(GetQuicFlag(FLAGS_quic_buffered_data_threshold) - 1,
+  EXPECT_EQ(static_cast<uint64_t>(
+                GetQuicFlag(FLAGS_quic_buffered_data_threshold) - 1),
             stream_->BufferedDataBytes());
   EXPECT_TRUE(stream_->CanWriteNewData());
 
@@ -1139,7 +1141,8 @@
       }));
   EXPECT_CALL(*stream_, OnCanWriteNewData()).Times(1);
   stream_->OnCanWrite();
-  EXPECT_EQ(GetQuicFlag(FLAGS_quic_buffered_data_threshold) - 1,
+  EXPECT_EQ(static_cast<uint64_t>(
+                GetQuicFlag(FLAGS_quic_buffered_data_threshold) - 1),
             stream_->BufferedDataBytes());
   // Try to write slices2 again.
   EXPECT_CALL(*session_, WritevData(_, _, _, _, _)).Times(0);