From d2da09a4cfada6997914da65d83aac0bb558155c Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Thu, 27 Jan 2022 09:56:30 -0800 Subject: Export of internal Abseil changes -- 7fbe730c56c0890f27df47f9ad4f0cfa600c6ad9 by Derek Mauro : Internal change PiperOrigin-RevId: 424639048 -- 1825fcf704e45e881cdd1d2fe3eb2226f523f3cd by Derek Mauro : Disable tests Table.EnsureNonQuadraticTopNXorSeedByProbeSeqLength and Table.EnsureNonQuadraticTopNLinearTransformByProbeSeqLength again as they are (still) flaky PiperOrigin-RevId: 424616745 -- e624119171d9bceec2f6df023b220a6642070cfb by Abseil Team : Switch from *_TEST_CASE_P to *_TEST_SUITE_P gtest macros. PiperOrigin-RevId: 424404790 -- a110698c10554fb1f640412db8cd7c5a38b7b8e8 by Abseil Team : Remove extraneous newline in documentation. PiperOrigin-RevId: 424328502 GitOrigin-RevId: 7fbe730c56c0890f27df47f9ad4f0cfa600c6ad9 Change-Id: I56fd8c7cecf65fe37cb4cf2dde70842867d637d7 --- absl/hash/hash_test.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) (limited to 'absl/hash/hash_test.cc') diff --git a/absl/hash/hash_test.cc b/absl/hash/hash_test.cc index cea54dc0..39ff8f52 100644 --- a/absl/hash/hash_test.cc +++ b/absl/hash/hash_test.cc @@ -139,10 +139,10 @@ TYPED_TEST_P(HashValueIntTest, FastPath) { absl::Hash>{}(std::tuple(n))); } -REGISTER_TYPED_TEST_CASE_P(HashValueIntTest, BasicUsage, FastPath); +REGISTER_TYPED_TEST_SUITE_P(HashValueIntTest, BasicUsage, FastPath); using IntTypes = testing::Types; -INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueIntTest, IntTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueIntTest, IntTypes); enum LegacyEnum { kValue1, kValue2, kValue3 }; @@ -507,7 +507,7 @@ TYPED_TEST_P(HashValueSequenceTest, BasicUsage) { EXPECT_TRUE(absl::VerifyTypeImplementsAbslHashCorrectly(exemplars)); } -REGISTER_TYPED_TEST_CASE_P(HashValueSequenceTest, BasicUsage); +REGISTER_TYPED_TEST_SUITE_P(HashValueSequenceTest, BasicUsage); using IntSequenceTypes = testing::Types< std::deque, std::forward_list, std::list, std::vector, std::vector, TypeErasedContainer>, std::set, @@ -515,7 +515,7 @@ using IntSequenceTypes = testing::Types< TypeErasedContainer>, std::unordered_set, std::unordered_multiset, absl::flat_hash_set, absl::node_hash_set, absl::btree_set>; -INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueSequenceTest, IntSequenceTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueSequenceTest, IntSequenceTypes); template class HashValueNestedSequenceTest : public testing::Test {}; @@ -541,7 +541,7 @@ TYPED_TEST_P(HashValueNestedSequenceTest, BasicUsage) { EXPECT_TRUE(absl::VerifyTypeImplementsAbslHashCorrectly(exemplars)); } -REGISTER_TYPED_TEST_CASE_P(HashValueNestedSequenceTest, BasicUsage); +REGISTER_TYPED_TEST_SUITE_P(HashValueNestedSequenceTest, BasicUsage); template using TypeErasedSet = TypeErasedContainer>; @@ -551,7 +551,7 @@ using NestedIntSequenceTypes = testing::Types< UnorderedSequence>, UnorderedSequence>, TypeErasedSet>, TypeErasedSet>, TypeErasedSet>>; -INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueNestedSequenceTest, +INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueNestedSequenceTest, NestedIntSequenceTypes); // Private type that only supports AbslHashValue to make sure our chosen hash @@ -732,13 +732,13 @@ TYPED_TEST_P(HashValueAssociativeMapTest, BasicUsage) { EXPECT_TRUE(absl::VerifyTypeImplementsAbslHashCorrectly(exemplars)); } -REGISTER_TYPED_TEST_CASE_P(HashValueAssociativeMapTest, BasicUsage); +REGISTER_TYPED_TEST_SUITE_P(HashValueAssociativeMapTest, BasicUsage); using AssociativeMapTypes = testing::Types< std::map, std::unordered_map, absl::flat_hash_map, absl::node_hash_map, absl::btree_map, UnorderedSequence>>; -INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueAssociativeMapTest, +INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueAssociativeMapTest, AssociativeMapTypes); template @@ -763,11 +763,11 @@ TYPED_TEST_P(HashValueAssociativeMultimapTest, BasicUsage) { EXPECT_TRUE(absl::VerifyTypeImplementsAbslHashCorrectly(exemplars)); } -REGISTER_TYPED_TEST_CASE_P(HashValueAssociativeMultimapTest, BasicUsage); +REGISTER_TYPED_TEST_SUITE_P(HashValueAssociativeMultimapTest, BasicUsage); using AssociativeMultimapTypes = testing::Types, std::unordered_multimap>; -INSTANTIATE_TYPED_TEST_CASE_P(My, HashValueAssociativeMultimapTest, +INSTANTIATE_TYPED_TEST_SUITE_P(My, HashValueAssociativeMultimapTest, AssociativeMultimapTypes); TEST(HashValueTest, ReferenceWrapper) { @@ -1007,10 +1007,10 @@ TYPED_TEST_P(HashIntTest, BasicUsage) { Hash>()({})); } -REGISTER_TYPED_TEST_CASE_P(HashIntTest, BasicUsage); +REGISTER_TYPED_TEST_SUITE_P(HashIntTest, BasicUsage); using IntTypes = testing::Types; -INSTANTIATE_TYPED_TEST_CASE_P(My, HashIntTest, IntTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(My, HashIntTest, IntTypes); struct StructWithPadding { char c; -- cgit v1.2.3