@@ -139,10 +139,10 @@ TYPED_TEST_P(HashValueIntTest, FastPath) {
139
139
absl::Hash<std::tuple<TypeParam>>{}(std::tuple<TypeParam>(n)));
140
140
}
141
141
142
- REGISTER_TYPED_TEST_CASE_P (HashValueIntTest, BasicUsage, FastPath);
142
+ REGISTER_TYPED_TEST_SUITE_P (HashValueIntTest, BasicUsage, FastPath);
143
143
using IntTypes = testing::Types<unsigned char , char , int , int32_t , int64_t ,
144
144
uint32_t , uint64_t , size_t >;
145
- INSTANTIATE_TYPED_TEST_CASE_P (My, HashValueIntTest, IntTypes);
145
+ INSTANTIATE_TYPED_TEST_SUITE_P (My, HashValueIntTest, IntTypes);
146
146
147
147
enum LegacyEnum { kValue1 , kValue2 , kValue3 };
148
148
@@ -507,15 +507,15 @@ TYPED_TEST_P(HashValueSequenceTest, BasicUsage) {
507
507
EXPECT_TRUE (absl::VerifyTypeImplementsAbslHashCorrectly (exemplars));
508
508
}
509
509
510
- REGISTER_TYPED_TEST_CASE_P (HashValueSequenceTest, BasicUsage);
510
+ REGISTER_TYPED_TEST_SUITE_P (HashValueSequenceTest, BasicUsage);
511
511
using IntSequenceTypes = testing::Types<
512
512
std::deque<int >, std::forward_list<int >, std::list<int >, std::vector<int >,
513
513
std::vector<bool >, TypeErasedContainer<std::vector<int >>, std::set<int >,
514
514
std::multiset<int >, UnorderedSequence<int >,
515
515
TypeErasedContainer<UnorderedSequence<int >>, std::unordered_set<int >,
516
516
std::unordered_multiset<int >, absl::flat_hash_set<int >,
517
517
absl::node_hash_set<int >, absl::btree_set<int >>;
518
- INSTANTIATE_TYPED_TEST_CASE_P (My, HashValueSequenceTest, IntSequenceTypes);
518
+ INSTANTIATE_TYPED_TEST_SUITE_P (My, HashValueSequenceTest, IntSequenceTypes);
519
519
520
520
template <typename T>
521
521
class HashValueNestedSequenceTest : public testing ::Test {};
@@ -541,7 +541,7 @@ TYPED_TEST_P(HashValueNestedSequenceTest, BasicUsage) {
541
541
EXPECT_TRUE (absl::VerifyTypeImplementsAbslHashCorrectly (exemplars));
542
542
}
543
543
544
- REGISTER_TYPED_TEST_CASE_P (HashValueNestedSequenceTest, BasicUsage);
544
+ REGISTER_TYPED_TEST_SUITE_P (HashValueNestedSequenceTest, BasicUsage);
545
545
template <typename T>
546
546
using TypeErasedSet = TypeErasedContainer<UnorderedSequence<T>>;
547
547
@@ -551,7 +551,7 @@ using NestedIntSequenceTypes = testing::Types<
551
551
UnorderedSequence<UnorderedSequence<int >>,
552
552
UnorderedSequence<TypeErasedSet<int >>, TypeErasedSet<std::vector<int >>,
553
553
TypeErasedSet<UnorderedSequence<int >>, TypeErasedSet<TypeErasedSet<int >>>;
554
- INSTANTIATE_TYPED_TEST_CASE_P (My, HashValueNestedSequenceTest,
554
+ INSTANTIATE_TYPED_TEST_SUITE_P (My, HashValueNestedSequenceTest,
555
555
NestedIntSequenceTypes);
556
556
557
557
// Private type that only supports AbslHashValue to make sure our chosen hash
@@ -732,13 +732,13 @@ TYPED_TEST_P(HashValueAssociativeMapTest, BasicUsage) {
732
732
EXPECT_TRUE (absl::VerifyTypeImplementsAbslHashCorrectly (exemplars));
733
733
}
734
734
735
- REGISTER_TYPED_TEST_CASE_P (HashValueAssociativeMapTest, BasicUsage);
735
+ REGISTER_TYPED_TEST_SUITE_P (HashValueAssociativeMapTest, BasicUsage);
736
736
using AssociativeMapTypes = testing::Types<
737
737
std::map<int , std::string>, std::unordered_map<int , std::string>,
738
738
absl::flat_hash_map<int , std::string>,
739
739
absl::node_hash_map<int , std::string>, absl::btree_map<int , std::string>,
740
740
UnorderedSequence<std::pair<const int , std::string>>>;
741
- INSTANTIATE_TYPED_TEST_CASE_P (My, HashValueAssociativeMapTest,
741
+ INSTANTIATE_TYPED_TEST_SUITE_P (My, HashValueAssociativeMapTest,
742
742
AssociativeMapTypes);
743
743
744
744
template <typename T>
@@ -763,11 +763,11 @@ TYPED_TEST_P(HashValueAssociativeMultimapTest, BasicUsage) {
763
763
EXPECT_TRUE (absl::VerifyTypeImplementsAbslHashCorrectly (exemplars));
764
764
}
765
765
766
- REGISTER_TYPED_TEST_CASE_P (HashValueAssociativeMultimapTest, BasicUsage);
766
+ REGISTER_TYPED_TEST_SUITE_P (HashValueAssociativeMultimapTest, BasicUsage);
767
767
using AssociativeMultimapTypes =
768
768
testing::Types<std::multimap<int , std::string>,
769
769
std::unordered_multimap<int , std::string>>;
770
- INSTANTIATE_TYPED_TEST_CASE_P (My, HashValueAssociativeMultimapTest,
770
+ INSTANTIATE_TYPED_TEST_SUITE_P (My, HashValueAssociativeMultimapTest,
771
771
AssociativeMultimapTypes);
772
772
773
773
TEST (HashValueTest, ReferenceWrapper) {
@@ -1007,10 +1007,10 @@ TYPED_TEST_P(HashIntTest, BasicUsage) {
1007
1007
Hash<CombineVariadic<TypeParam>>()({}));
1008
1008
}
1009
1009
1010
- REGISTER_TYPED_TEST_CASE_P (HashIntTest, BasicUsage);
1010
+ REGISTER_TYPED_TEST_SUITE_P (HashIntTest, BasicUsage);
1011
1011
using IntTypes = testing::Types<unsigned char , char , int , int32_t , int64_t ,
1012
1012
uint32_t , uint64_t , size_t >;
1013
- INSTANTIATE_TYPED_TEST_CASE_P (My, HashIntTest, IntTypes);
1013
+ INSTANTIATE_TYPED_TEST_SUITE_P (My, HashIntTest, IntTypes);
1014
1014
1015
1015
struct StructWithPadding {
1016
1016
char c;
0 commit comments