| Index: base/numerics/safe_numerics_unittest.cc
|
| diff --git a/base/numerics/safe_numerics_unittest.cc b/base/numerics/safe_numerics_unittest.cc
|
| index 3185b06faf08753110dc5c67d34d9c69a28fb760..d61cea072f894fc6732f979524a0e8b4315e9237 100644
|
| --- a/base/numerics/safe_numerics_unittest.cc
|
| +++ b/base/numerics/safe_numerics_unittest.cc
|
| @@ -18,7 +18,10 @@
|
| using std::numeric_limits;
|
| using base::CheckedNumeric;
|
| using base::checked_cast;
|
| +using base::SSizeT;
|
| +using base::StrictNumeric;
|
| using base::saturated_cast;
|
| +using base::strict_cast;
|
| using base::internal::MaxExponent;
|
| using base::internal::RANGE_VALID;
|
| using base::internal::RANGE_INVALID;
|
| @@ -560,8 +563,20 @@ TEST(SafeNumerics, CastTests) {
|
| double double_large = numeric_limits<double>::max();
|
| double double_infinity = numeric_limits<float>::infinity();
|
|
|
| - // Just test that the cast compiles, since the other tests cover logic.
|
| + // Just test that the casts compile, since the other tests cover logic.
|
| EXPECT_EQ(0, checked_cast<int>(static_cast<size_t>(0)));
|
| + EXPECT_EQ(0, strict_cast<int>(static_cast<char>(0)));
|
| + EXPECT_EQ(0, strict_cast<int>(static_cast<unsigned char>(0)));
|
| + EXPECT_EQ(0U, strict_cast<unsigned>(static_cast<unsigned char>(0)));
|
| + EXPECT_EQ(1ULL, static_cast<uint64_t>(StrictNumeric<size_t>(1U)));
|
| + EXPECT_EQ(1ULL, static_cast<uint64_t>(SSizeT(1U)));
|
| + EXPECT_EQ(1U, static_cast<size_t>(StrictNumeric<unsigned>(1U)));
|
| +
|
| + // These casts and coercions will fail to compile:
|
| + // EXPECT_EQ(0, strict_cast<int>(static_cast<size_t>(0)));
|
| + // EXPECT_EQ(0, strict_cast<size_t>(static_cast<int>(0)));
|
| + // EXPECT_EQ(1ULL, StrictNumeric<size_t>(1));
|
| + // EXPECT_EQ(1, StrictNumeric<size_t>(1U));
|
|
|
| // Test various saturation corner cases.
|
| EXPECT_EQ(saturated_cast<int>(small_negative),
|
|
|