From 88c65f8add003f77e1749a5321095e0fcfbfd0e7 Mon Sep 17 00:00:00 2001
From: "jaka.katrasnik" <jaka.katrasnik@sensum.eu>
Date: Mon, 16 Mar 2020 15:44:48 +0100
Subject: [PATCH] Fixes GTest deprecation warnings

---
 onnxruntime/test/framework/distance_test.cc      | 2 +-
 onnxruntime/test/framework/math_test.cc          | 2 +-
 onnxruntime/test/framework/session_state_test.cc | 2 +-
 onnxruntime/test/ir/onnx_model_test.cc           | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/onnxruntime/test/framework/distance_test.cc b/onnxruntime/test/framework/distance_test.cc
index ce45936e1e..219e52fd38 100644
--- a/onnxruntime/test/framework/distance_test.cc
+++ b/onnxruntime/test/framework/distance_test.cc
@@ -15,7 +15,7 @@ class SqeuclideanTest : public ::testing::Test {
 
 using MyTypes = Types<Sqeuclidean<double>, SqeuclideanWithEigen<double> >;
 
-TYPED_TEST_CASE(SqeuclideanTest, MyTypes);
+TYPED_TEST_SUITE(SqeuclideanTest, MyTypes);
 
 TYPED_TEST(SqeuclideanTest, test1) {
   double a = 10;
diff --git a/onnxruntime/test/framework/math_test.cc b/onnxruntime/test/framework/math_test.cc
index f5653517b8..7f6eaa3e3f 100644
--- a/onnxruntime/test/framework/math_test.cc
+++ b/onnxruntime/test/framework/math_test.cc
@@ -121,7 +121,7 @@ TEST_P(MathGemmTest, GemmNoTransTrans) {
   }
 }
 
-INSTANTIATE_TEST_CASE_P(MathGemmTests, MathGemmTest,
+INSTANTIATE_TEST_SUITE_P(MathGemmTests, MathGemmTest,
                         testing::Values(1, 4));
 
 TEST(MathTest, GemvNoTrans) {
diff --git a/onnxruntime/test/framework/session_state_test.cc b/onnxruntime/test/framework/session_state_test.cc
index ab64b8f12f..12e1ab724f 100644
--- a/onnxruntime/test/framework/session_state_test.cc
+++ b/onnxruntime/test/framework/session_state_test.cc
@@ -151,6 +151,6 @@ TEST_P(SessionStateTestP, TestInitializerProcessing) {
   }
 }
 
-INSTANTIATE_TEST_CASE_P(SessionStateTests, SessionStateTestP, testing::ValuesIn(param_list));
+INSTANTIATE_TEST_SUITE_P(SessionStateTests, SessionStateTestP, testing::ValuesIn(param_list));
 }  // namespace test
 }  // namespace onnxruntime
diff --git a/onnxruntime/test/ir/onnx_model_test.cc b/onnxruntime/test/ir/onnx_model_test.cc
index 55722380e2..2da5a17945 100644
--- a/onnxruntime/test/ir/onnx_model_test.cc
+++ b/onnxruntime/test/ir/onnx_model_test.cc
@@ -155,11 +155,11 @@ TEST_P(ONNXModelsTest1, LoadFromProtobuf) {
 }
 
 #ifndef DISABLE_CONTRIB_OPS
-INSTANTIATE_TEST_CASE_P(ONNXModelsTests,
+INSTANTIATE_TEST_SUITE_P(ONNXModelsTests,
                         ONNXModelsTest1,
                         ::testing::Values(ORT_TSTR("bvlc_alexnet"), ORT_TSTR("bvlc_googlenet"), ORT_TSTR("bvlc_reference_caffenet"), ORT_TSTR("bvlc_reference_rcnn_ilsvrc13"), ORT_TSTR("densenet121"), ORT_TSTR("emotion_ferplus"), ORT_TSTR("inception_v1"), ORT_TSTR("inception_v2"), ORT_TSTR("mnist"), ORT_TSTR("resnet50"), ORT_TSTR("shufflenet"), ORT_TSTR("squeezenet"), ORT_TSTR("tiny_yolov2"), ORT_TSTR("vgg19"), ORT_TSTR("zfnet512")));
 #else
-INSTANTIATE_TEST_CASE_P(ONNXModelsTests,
+INSTANTIATE_TEST_SUITE_P(ONNXModelsTests,
                         ONNXModelsTest1,
                         ::testing::Values(ORT_TSTR("bvlc_alexnet"), ORT_TSTR("bvlc_googlenet"), ORT_TSTR("bvlc_reference_caffenet"), ORT_TSTR("bvlc_reference_rcnn_ilsvrc13"), ORT_TSTR("densenet121"), ORT_TSTR("emotion_ferplus"), ORT_TSTR("inception_v1"), ORT_TSTR("inception_v2"), ORT_TSTR("mnist"), ORT_TSTR("resnet50"), ORT_TSTR("shufflenet"), ORT_TSTR("squeezenet"), ORT_TSTR("vgg19"), ORT_TSTR("zfnet512")));
 #endif