From 2eaf93a349fe2d4d4a2d89ea723302d2b34ec98e Mon Sep 17 00:00:00 2001 From: "A. Unique TensorFlower" Date: Wed, 16 Jan 2019 10:54:45 -0800 Subject: [PATCH] Replace calls to deprecated googletest macros *TEST_CASE() with *TEST_SUITE() PiperOrigin-RevId: 229586776 --- .../compiler/tf2xla/literal_util_test.cc | 2 +- .../partial_run_mgr_test.cc | 2 +- tensorflow/core/framework/bfloat16_test.cc | 2 +- tensorflow/core/framework/model_test.cc | 17 ++++---- tensorflow/core/kernels/conv_ops_test.cc | 40 +++++++++---------- tensorflow/core/lib/gtl/int_type_test.cc | 2 +- tensorflow/core/nccl/nccl_manager_test.cc | 2 +- .../bidirectional_sequence_lstm_test.cc | 2 +- tensorflow/lite/kernels/conv_test.cc | 2 +- .../lite/kernels/depthwise_conv_test.cc | 4 +- .../lite/kernels/fully_connected_test.cc | 4 +- tensorflow/lite/kernels/reshape_test.cc | 6 +-- .../lite/kernels/transpose_conv_test.cc | 2 +- tensorflow/lite/models/speech_test.cc | 8 ++-- .../lite/toco/import_tensorflow_test.cc | 8 ++-- tensorflow/lite/toco/tooling_util_test.cc | 4 +- 16 files changed, 54 insertions(+), 53 deletions(-) diff --git a/tensorflow/compiler/tf2xla/literal_util_test.cc b/tensorflow/compiler/tf2xla/literal_util_test.cc index 15f4c38da29..44bccfe6474 100644 --- a/tensorflow/compiler/tf2xla/literal_util_test.cc +++ b/tensorflow/compiler/tf2xla/literal_util_test.cc @@ -49,7 +49,7 @@ using Types = std::pair, std::pair, std::pair>; -TYPED_TEST_CASE(LiteralUtilTest, Types); +TYPED_TEST_SUITE(LiteralUtilTest, Types); TYPED_TEST(LiteralUtilTest, LiteralToQuantizedHostTensor) { using int_type = typename TypeParam::first_type; diff --git a/tensorflow/core/distributed_runtime/partial_run_mgr_test.cc b/tensorflow/core/distributed_runtime/partial_run_mgr_test.cc index 5f7c0cb3cae..a2b799c3e42 100644 --- a/tensorflow/core/distributed_runtime/partial_run_mgr_test.cc +++ b/tensorflow/core/distributed_runtime/partial_run_mgr_test.cc @@ -139,7 +139,7 @@ TEST_P(StatusPropagationTest, PartialRunDoneFirst) { // ExecutorDone and PartialRunDone. Status ExecutorError() { return errors::Internal("executor error"); } Status PartialRunError() { return errors::Internal("partial run error"); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( PartialRunMgr, StatusPropagationTest, ::testing::Values( StatusTestParam{Status::OK(), Status::OK(), Status::OK()}, diff --git a/tensorflow/core/framework/bfloat16_test.cc b/tensorflow/core/framework/bfloat16_test.cc index ce970854941..7da1727e47c 100644 --- a/tensorflow/core/framework/bfloat16_test.cc +++ b/tensorflow/core/framework/bfloat16_test.cc @@ -75,7 +75,7 @@ TEST_P(Bfloat16Test, TruncateTest) { EXPECT_EQ(GetParam().expected_rounding, float(rounded)); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( Bfloat16Test_Instantiation, Bfloat16Test, ::testing::Values( Bfloat16TestParam{ diff --git a/tensorflow/core/framework/model_test.cc b/tensorflow/core/framework/model_test.cc index 013f1e61c88..1d7f407e180 100644 --- a/tensorflow/core/framework/model_test.cc +++ b/tensorflow/core/framework/model_test.cc @@ -83,9 +83,10 @@ TEST_P(AsyncInterleaveManyTest, Model) { EXPECT_GE(async_interleave_many->OutputTime(&input_times), 0); } -INSTANTIATE_TEST_CASE_P(Test, AsyncInterleaveManyTest, - ::testing::Combine(::testing::Values(1, 2), - ::testing::Values(0, 50, 100, 200))); +INSTANTIATE_TEST_SUITE_P(Test, AsyncInterleaveManyTest, + ::testing::Combine(::testing::Values(1, 2), + ::testing::Values(0, 50, 100, + 200))); class AsyncKnownRatioTest : public ::testing::TestWithParam> {}; @@ -156,10 +157,10 @@ TEST_P(AsyncKnownRatioTest, Model) { EXPECT_GE(async_known_many->OutputTime(&input_times), 0); } -INSTANTIATE_TEST_CASE_P(Test, AsyncKnownRatioTest, - ::testing::Combine(::testing::Values(1, 2, 4, 8), - ::testing::Values(0, 50, 100, 200), - ::testing::Values(0, 1, 2, 4))); +INSTANTIATE_TEST_SUITE_P(Test, AsyncKnownRatioTest, + ::testing::Combine(::testing::Values(1, 2, 4, 8), + ::testing::Values(0, 50, 100, 200), + ::testing::Values(0, 1, 2, 4))); TEST(InterleaveManyTest, Model) { std::shared_ptr interleave_many = @@ -245,7 +246,7 @@ TEST_P(KnownRatioTest, Model) { num_inputs_per_output * (50 + 100) + 64); } -INSTANTIATE_TEST_CASE_P(Test, KnownRatioTest, ::testing::Values(0, 1, 2, 4)); +INSTANTIATE_TEST_SUITE_P(Test, KnownRatioTest, ::testing::Values(0, 1, 2, 4)); TEST(SourceTest, Model) { std::shared_ptr source = model::MakeSourceNode({0, "source", nullptr}); diff --git a/tensorflow/core/kernels/conv_ops_test.cc b/tensorflow/core/kernels/conv_ops_test.cc index fc93915e165..a4cd67804ed 100644 --- a/tensorflow/core/kernels/conv_ops_test.cc +++ b/tensorflow/core/kernels/conv_ops_test.cc @@ -952,8 +952,8 @@ class FusedConv2DWithBiasOpTest : public FusedConv2DOpTest {}; template class FusedConv2DWithBatchNormOpTest : public FusedConv2DOpTest {}; -TYPED_TEST_CASE_P(FusedConv2DWithBiasOpTest); -TYPED_TEST_CASE_P(FusedConv2DWithBatchNormOpTest); +TYPED_TEST_SUITE_P(FusedConv2DWithBiasOpTest); +TYPED_TEST_SUITE_P(FusedConv2DWithBatchNormOpTest); // -------------------------------------------------------------------------- // // Conv2D + BiasAdd + {Relu} // @@ -1035,29 +1035,29 @@ TYPED_TEST_P(FusedConv2DWithBatchNormOpTest, SpatialConvolutionAndRelu) { this->VerifyConv2DWithBatchNormAndRelu(filter_size, filter_count); } -REGISTER_TYPED_TEST_CASE_P(FusedConv2DWithBiasOpTest, // - OneByOneConvolution, // - ImageSizeConvolution, // - SpatialConvolution, // - OneByOneConvolutionAndRelu, // - ImageSizeConvolutionAndRelu, // - SpatialConvolutionAndRelu); +REGISTER_TYPED_TEST_SUITE_P(FusedConv2DWithBiasOpTest, // + OneByOneConvolution, // + ImageSizeConvolution, // + SpatialConvolution, // + OneByOneConvolutionAndRelu, // + ImageSizeConvolutionAndRelu, // + SpatialConvolutionAndRelu); -REGISTER_TYPED_TEST_CASE_P(FusedConv2DWithBatchNormOpTest, // - OneByOneConvolution, // - ImageSizeConvolution, // - SpatialConvolution, // - OneByOneConvolutionAndRelu, // - ImageSizeConvolutionAndRelu, // - SpatialConvolutionAndRelu); +REGISTER_TYPED_TEST_SUITE_P(FusedConv2DWithBatchNormOpTest, // + OneByOneConvolution, // + ImageSizeConvolution, // + SpatialConvolution, // + OneByOneConvolutionAndRelu, // + ImageSizeConvolutionAndRelu, // + SpatialConvolutionAndRelu); using FusedBiasAddDataTypes = ::testing::Types; -INSTANTIATE_TYPED_TEST_CASE_P(Test, FusedConv2DWithBiasOpTest, - FusedBiasAddDataTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(Test, FusedConv2DWithBiasOpTest, + FusedBiasAddDataTypes); using FusedBatchNormDataTypes = ::testing::Types; -INSTANTIATE_TYPED_TEST_CASE_P(Test, FusedConv2DWithBatchNormOpTest, - FusedBatchNormDataTypes); +INSTANTIATE_TYPED_TEST_SUITE_P(Test, FusedConv2DWithBatchNormOpTest, + FusedBatchNormDataTypes); //////////////////////////////////////////////////////////////////////////////// // Performance benchmarks for the FusedConv2DWithBiasOp. // diff --git a/tensorflow/core/lib/gtl/int_type_test.cc b/tensorflow/core/lib/gtl/int_type_test.cc index 61d364017cb..89d2d0e8fe8 100644 --- a/tensorflow/core/lib/gtl/int_type_test.cc +++ b/tensorflow/core/lib/gtl/int_type_test.cc @@ -45,7 +45,7 @@ typedef ::testing::Types SupportedIntTypes; -TYPED_TEST_CASE(IntTypeTest, SupportedIntTypes); +TYPED_TEST_SUITE(IntTypeTest, SupportedIntTypes); TYPED_TEST(IntTypeTest, TestInitialization) { constexpr typename TestFixture::T a; diff --git a/tensorflow/core/nccl/nccl_manager_test.cc b/tensorflow/core/nccl/nccl_manager_test.cc index 58bb84ac57e..e65af133891 100644 --- a/tensorflow/core/nccl/nccl_manager_test.cc +++ b/tensorflow/core/nccl/nccl_manager_test.cc @@ -209,7 +209,7 @@ const Scalar NcclManagerTest::max_ = // Instantiate tests for float and double. using TypeList = ::testing::Types; -TYPED_TEST_CASE(NcclManagerTest, TypeList); +TYPED_TEST_SUITE(NcclManagerTest, TypeList); // Test basic sum reduction. TYPED_TEST(NcclManagerTest, BasicSumReduction) { diff --git a/tensorflow/lite/kernels/bidirectional_sequence_lstm_test.cc b/tensorflow/lite/kernels/bidirectional_sequence_lstm_test.cc index 59ea47a2a22..707f06af832 100644 --- a/tensorflow/lite/kernels/bidirectional_sequence_lstm_test.cc +++ b/tensorflow/lite/kernels/bidirectional_sequence_lstm_test.cc @@ -400,7 +400,7 @@ class BidirectionalLSTMOpModel : public SingleOpModel { // indicating whether to use quantization or not. class LSTMOpTest : public ::testing::TestWithParam {}; -INSTANTIATE_TEST_CASE_P(QuantizationOrNot, LSTMOpTest, ::testing::Bool()); +INSTANTIATE_TEST_SUITE_P(QuantizationOrNot, LSTMOpTest, ::testing::Bool()); TEST_P(LSTMOpTest, BlackBoxTestNoCifgNoPeepholeNoProjectionNoClipping) { const int n_batch = 1; diff --git a/tensorflow/lite/kernels/conv_test.cc b/tensorflow/lite/kernels/conv_test.cc index 478df3354f5..d0350b2fa7f 100644 --- a/tensorflow/lite/kernels/conv_test.cc +++ b/tensorflow/lite/kernels/conv_test.cc @@ -1069,7 +1069,7 @@ TEST_P(ConvolutionOpTest, DISABLED_PointwiseMultifilterHybrid) { 0.0474))); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( ConvolutionOpTest, ConvolutionOpTest, ::testing::ValuesIn(SingleOpTest::GetKernelTags(*kKernelMap))); diff --git a/tensorflow/lite/kernels/depthwise_conv_test.cc b/tensorflow/lite/kernels/depthwise_conv_test.cc index d924e6f7007..75aed4cc4a9 100644 --- a/tensorflow/lite/kernels/depthwise_conv_test.cc +++ b/tensorflow/lite/kernels/depthwise_conv_test.cc @@ -437,11 +437,11 @@ TEST_P(QuantizedDepthwiseConvolutionOpTest, SimpleDilatedTestPaddingSame) { ElementsAreArray({4, 7, 3, 6, 10, 4, 2, 3, 1})); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DepthwiseConvolutionOpTest, DepthwiseConvolutionOpTest, ::testing::ValuesIn(SingleOpTest::GetKernelTags(*kKernelMap))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( QuantizedDepthwiseConvolutionOpTest, QuantizedDepthwiseConvolutionOpTest, ::testing::ValuesIn(SingleOpTest::GetKernelTags(*kKernelMap))); diff --git a/tensorflow/lite/kernels/fully_connected_test.cc b/tensorflow/lite/kernels/fully_connected_test.cc index d1d29fc7e6c..03f4ea71430 100644 --- a/tensorflow/lite/kernels/fully_connected_test.cc +++ b/tensorflow/lite/kernels/fully_connected_test.cc @@ -725,11 +725,11 @@ TEST_P(QuantizedFullyConnectedOpTest, ElementsAre(175, 177, 179, 243, 245, 247)); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( FloatFullyConnectedOpTest, FloatFullyConnectedOpTest, ::testing::ValuesIn(SingleOpTest::GetKernelTags(*kKernelMap))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( QuantizedFullyConnectedOpTest, QuantizedFullyConnectedOpTest, ::testing::ValuesIn(SingleOpTest::GetKernelTags(*kKernelMapNoPie))); diff --git a/tensorflow/lite/kernels/reshape_test.cc b/tensorflow/lite/kernels/reshape_test.cc index f98f3eb9aea..e2210aeaf09 100644 --- a/tensorflow/lite/kernels/reshape_test.cc +++ b/tensorflow/lite/kernels/reshape_test.cc @@ -236,9 +236,9 @@ TEST_P(ReshapeOpTest, Strings) { ElementsAreArray({"1", "2", "3", "4", "5", "6", "7", "8"})); } -INSTANTIATE_TEST_CASE_P(VariedShapeSpec, ReshapeOpTest, - ::testing::Values(kAsReshapeOption, kAsConstantTensor, - kAsTensor)); +INSTANTIATE_TEST_SUITE_P(VariedShapeSpec, ReshapeOpTest, + ::testing::Values(kAsReshapeOption, kAsConstantTensor, + kAsTensor)); } // namespace } // namespace tflite diff --git a/tensorflow/lite/kernels/transpose_conv_test.cc b/tensorflow/lite/kernels/transpose_conv_test.cc index 0520d84a30b..44d1336b99f 100644 --- a/tensorflow/lite/kernels/transpose_conv_test.cc +++ b/tensorflow/lite/kernels/transpose_conv_test.cc @@ -252,7 +252,7 @@ TEST_P(TransposeConvOpTest, AccuracyTest) { EXPECT_THAT(m.GetOutputShape(), ElementsAreArray({1, 3, 4, 1})); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( TransposeConvOpTest, TransposeConvOpTest, ::testing::ValuesIn(SingleOpTest::GetKernelTags(*kKernelMap))); diff --git a/tensorflow/lite/models/speech_test.cc b/tensorflow/lite/models/speech_test.cc index 17b7e8f28e8..f3509d1eced 100644 --- a/tensorflow/lite/models/speech_test.cc +++ b/tensorflow/lite/models/speech_test.cc @@ -196,10 +196,10 @@ TEST_P(SpeechTest, DISABLED_TtsTest) { // 200s just to bring up the Android emulator.) static const int kAllInvocations = -1; static const int kFirstFewInvocations = 10; -INSTANTIATE_TEST_CASE_P(LongTests, SpeechTest, - ::testing::Values(kAllInvocations)); -INSTANTIATE_TEST_CASE_P(ShortTests, SpeechTest, - ::testing::Values(kFirstFewInvocations)); +INSTANTIATE_TEST_SUITE_P(LongTests, SpeechTest, + ::testing::Values(kAllInvocations)); +INSTANTIATE_TEST_SUITE_P(ShortTests, SpeechTest, + ::testing::Values(kFirstFewInvocations)); } // namespace } // namespace tflite diff --git a/tensorflow/lite/toco/import_tensorflow_test.cc b/tensorflow/lite/toco/import_tensorflow_test.cc index de7f4cdb7e3..8ff3f7733af 100644 --- a/tensorflow/lite/toco/import_tensorflow_test.cc +++ b/tensorflow/lite/toco/import_tensorflow_test.cc @@ -257,8 +257,8 @@ std::vector TestTypes() { return {DT_FLOAT, DT_INT32, DT_INT64, DT_BOOL, DT_QUINT8, DT_COMPLEX64}; } -INSTANTIATE_TEST_CASE_P(ShapeImportTest, ShapeImportTest, - ::testing::ValuesIn(TestTypes())); +INSTANTIATE_TEST_SUITE_P(ShapeImportTest, ShapeImportTest, + ::testing::ValuesIn(TestTypes())); class ContentImportTest : public ::testing::Test { public: @@ -418,8 +418,8 @@ TEST_P(TypeImportTest, BasicTypeInference) { model.operators[0].get()); ASSERT_THAT(op->output_data_types, ::testing::ElementsAre(GetParam().second)); } -INSTANTIATE_TEST_CASE_P(BasicTypeInference, TypeImportTest, - ::testing::ValuesIn(UnaryTestTypes())); +INSTANTIATE_TEST_SUITE_P(BasicTypeInference, TypeImportTest, + ::testing::ValuesIn(UnaryTestTypes())); TEST(ImportTest, TypeInferenceWithFixedOutputType) { // Create an op that has a fixed output type (bool). diff --git a/tensorflow/lite/toco/tooling_util_test.cc b/tensorflow/lite/toco/tooling_util_test.cc index faa6fe412ec..f063ce71e91 100644 --- a/tensorflow/lite/toco/tooling_util_test.cc +++ b/tensorflow/lite/toco/tooling_util_test.cc @@ -96,8 +96,8 @@ TEST_P(ShapeTest, Agrees) { } } -INSTANTIATE_TEST_CASE_P(AgreeBroadcast, ShapeTest, - ::testing::ValuesIn(CreateShapePairs())); +INSTANTIATE_TEST_SUITE_P(AgreeBroadcast, ShapeTest, + ::testing::ValuesIn(CreateShapePairs())); static const char kNegativeValuesMessage[] = "Tensor shape should not include negative values";