Fixes GTest deprecation warnings

This commit is contained in:
jaka.katrasnik 2020-03-16 15:44:48 +01:00 committed by Changming Sun
parent 0700d13ece
commit 88c65f8add
4 changed files with 5 additions and 5 deletions

View file

@ -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;

View file

@ -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) {

View file

@ -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

View file

@ -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