Migrated to official GoogleTest repo (#6286)

* Move gtest to <root>/wqthirdparty

* Fixed inference engine tests

* Fixed unit-tests

* Fixed GPU

* Fixed clDNN_unit_tests compilation

* Reverted ngraph changes

* Fixed VPU tests

* Fixed deprecated tests compilation

* Removed OpenVINO clone

* Added public submodule

* Removed

* Fixed Windows

* More updates for INSTANTIATE_TEST_SUITE_P

* Use release-1.10.0

* Removed ngraph copy of gtest

* Revert "Removed ngraph copy of gtest"

This reverts commit ec9fe08d79.

* Fixes for TYPED_TEST_CASE

* Fixed GNA tests

* Updated submodule

* Updaed index

* TMP disabled tests

* Revert changes and fix compilation errors

* Fixed caching tests

* Revert back

* Revert back all

Co-authored-by: Michael Nosov <mikhail.nosov@intel.com>

.gitmodules

@@ -6,10 +6,6 @@
 	path = inference-engine/thirdparty/mkl-dnn
 	url = https://github.com/openvinotoolkit/oneDNN.git
 	ignore = dirty
-[submodule "inference-engine/tests/ie_test_utils/common_test_utils/gtest"]
-	path = inference-engine/tests/ie_test_utils/common_test_utils/gtest
-	url = https://github.com/openvinotoolkit/googletest.git
-	ignore = dirty
 [submodule "inference-engine/samples/thirdparty/gflags"]
 	path = inference-engine/samples/thirdparty/gflags
 	url = https://github.com/gflags/gflags.git
@@ -22,3 +18,7 @@
 	path = thirdparty/zlib/zlib
 	url = https://github.com/madler/zlib.git
 	ignore = dirty
+[submodule "thirdparty/gtest"]
+	path = thirdparty/gtest
+	url = https://github.com/openvinotoolkit/googletest.git
+	ignore = dirty

docs/IE_PLUGIN_DG/PluginTesting.md

@@ -21,7 +21,7 @@ Engine concepts: plugin creation, multiple executable networks support, multiple
 
     @snippet single_layer_tests/convolution.cpp test_convolution:declare_parameters
 
-    - Instantiate the test itself using standard GoogleTest macro `INSTANTIATE_TEST_CASE_P`:
+    - Instantiate the test itself using standard GoogleTest macro `INSTANTIATE_TEST_SUITE_P`:
 
     @snippet single_layer_tests/convolution.cpp test_convolution:instantiate
 

docs/template_plugin/tests/functional/shared_tests_instances/behavior/caching_tests.cpp

@@ -15,7 +15,7 @@ namespace {
             1, 2
     };
 
-    INSTANTIATE_TEST_CASE_P(smoke_CachingSupportCase_Template, LoadNetworkCacheTestBase,
+    INSTANTIATE_TEST_SUITE_P(smoke_CachingSupportCase_Template, LoadNetworkCacheTestBase,
                             ::testing::Combine(
                                     ::testing::ValuesIn(LoadNetworkCacheTestBase::getStandardFunctions()),
                                     ::testing::ValuesIn(precisionsTemplate),

docs/template_plugin/tests/functional/shared_tests_instances/behavior/config.cpp

@@ -24,14 +24,14 @@ const std::vector<std::map<std::string, std::string>> inconfigs = {
     {{TEMPLATE_CONFIG_KEY(THROUGHPUT_STREAMS), CONFIG_VALUE(NO)}},
 };
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, IncorrectConfigTests,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, IncorrectConfigTests,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),
                                 ::testing::ValuesIn(inconfigs)),
                         IncorrectConfigTests::getTestCaseName);
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, IncorrectConfigAPITests,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, IncorrectConfigAPITests,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),
@@ -39,14 +39,14 @@ INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, IncorrectConfigAPITests,
                         IncorrectConfigAPITests::getTestCaseName);
 
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CorrectConfigAPITests,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CorrectConfigAPITests,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),
                                 ::testing::ValuesIn(configs)),
                         CorrectConfigAPITests::getTestCaseName);
 
-INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, CorrectConfigTests,
+INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, CorrectConfigTests,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),

docs/template_plugin/tests/functional/shared_tests_instances/behavior/core_integration.cpp

@@ -16,11 +16,11 @@ namespace {
 // IE Class Common tests with <pluginName, deviceName params>
 //
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassBasicTestP, IEClassBasicTestP,
         ::testing::Values(std::make_pair("templatePlugin", CommonTestUtils::DEVICE_TEMPLATE)));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassNetworkTestP, IEClassNetworkTestP,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
@@ -28,39 +28,39 @@ INSTANTIATE_TEST_CASE_P(
 // IE Class GetMetric
 //
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassGetMetricTest, IEClassGetMetricTest_SUPPORTED_CONFIG_KEYS,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassGetMetricTest, IEClassGetMetricTest_SUPPORTED_METRICS,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassGetMetricTest, IEClassGetMetricTest_AVAILABLE_DEVICES,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassGetMetricTest, IEClassGetMetricTest_FULL_DEVICE_NAME,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassGetMetricTest, IEClassGetMetricTest_OPTIMIZATION_CAPABILITIES,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassGetMetricTest, IEClassGetMetricTest_RANGE_FOR_ASYNC_INFER_REQUESTS,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassGetMetricTest, IEClassGetMetricTest_ThrowUnsupported,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassGetConfigTest, IEClassGetConfigTest_ThrowUnsupported,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassGetAvailableDevices, IEClassGetAvailableDevices,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
@@ -111,7 +111,7 @@ TEST_F(IEClassSetConfigTestHETERO, smoke_SetConfigNoThrow) {
 // IE Class GetConfig
 //
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassGetConfigTest, IEClassGetConfigTest,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
@@ -143,46 +143,46 @@ TEST_F(IEClassGetConfigTestTEMPLATE, smoke_GetConfigNoThrow) {
 // Executable Network GetMetric
 //
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE, "MULTI:TEMPLATE", "HETERO:TEMPLATE"));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_SUPPORTED_METRICS,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE, "MULTI:TEMPLATE", "HETERO:TEMPLATE"));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_NETWORK_NAME,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE, "MULTI:TEMPLATE", "HETERO:TEMPLATE"));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_OPTIMAL_NUMBER_OF_INFER_REQUESTS,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE, "MULTI:TEMPLATE", "HETERO:TEMPLATE"));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassExecutableNetworkGetMetricTest_ThrowsUnsupported, IEClassExecutableNetworkGetMetricTest,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE, "MULTI:TEMPLATE", "HETERO:TEMPLATE"));
 //
 // Executable Network GetConfig / SetConfig
 //
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassExecutableNetworkGetConfigTest, IEClassExecutableNetworkGetConfigTest,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassExecutableNetworkSetConfigTest, IEClassExecutableNetworkSetConfigTest,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
 // IE Class Query network
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassQueryNetworkTest, IEClassQueryNetworkTest,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
 // IE Class Load network
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassLoadNetworkTest, IEClassLoadNetworkTest,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
@@ -192,19 +192,19 @@ INSTANTIATE_TEST_CASE_P(
 
 #ifdef ENABLE_MKL_DNN
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_METRICS,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_NETWORK_NAME,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_TARGET_FALLBACK,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE));
 

docs/template_plugin/tests/functional/shared_tests_instances/behavior/cpp_holders.cpp

@@ -20,19 +20,19 @@ const std::vector<std::vector<int >> orders = {
     {2, 1, 0}
 };
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, HoldersTest,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, HoldersTest,
         ::testing::Combine(
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),
         ::testing::ValuesIn(orders)),
         HoldersTest::getTestCaseName);
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, HoldersTestImportNetwork,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, HoldersTestImportNetwork,
         ::testing::Combine(
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE, "HETERO:TEMPLATE"),
         ::testing::ValuesIn(orders)),
         HoldersTest::getTestCaseName);
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, HoldersTestOnImportedNetwork,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, HoldersTestOnImportedNetwork,
         ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE, "HETERO:TEMPLATE"),
         HoldersTestOnImportedNetwork::getTestCaseName);
 

docs/template_plugin/tests/functional/shared_tests_instances/behavior/exec_graph_info.cpp

@@ -19,7 +19,7 @@ const std::vector<std::map<std::string, std::string>> configs = {
     {}
 };
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, ExecGraphTests,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, ExecGraphTests,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),

docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request.cpp

@@ -19,7 +19,7 @@ const std::vector<std::map<std::string, std::string>> configs = {
     {}
 };
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestTests,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestTests,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),

docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_callback.cpp

@@ -19,7 +19,7 @@ const std::vector<std::map<std::string, std::string>> configs = {
     {}
 };
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CallbackTests,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CallbackTests,
         ::testing::Combine(
             ::testing::ValuesIn(netPrecisions),
             ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),

docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_config.cpp

@@ -19,7 +19,7 @@ const std::vector<std::map<std::string, std::string>> configs = {
     {}
 };
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferConfigTests,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferConfigTests,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),

docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_input.cpp

@@ -17,7 +17,7 @@ const std::vector<std::map<std::string, std::string>> configs = {
     {}
 };
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestInputTests,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestInputTests,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),

docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_output.cpp

@@ -17,7 +17,7 @@ const std::vector<std::map<std::string, std::string>> configs = {
     {}
 };
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestOutputTests,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestOutputTests,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),

docs/template_plugin/tests/functional/shared_tests_instances/behavior/layout.cpp

@@ -26,7 +26,7 @@ const std::vector<std::vector<size_t>> inputShapes = {
     { 3 }
 };
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, LayoutTest,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, LayoutTest,
                         ::testing::Combine(
                                 ::testing::Values(InferenceEngine::Precision::FP32),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),

docs/template_plugin/tests/functional/shared_tests_instances/behavior/preprocessing.cpp

@@ -17,7 +17,7 @@ const std::vector<std::map<std::string, std::string>> configs = {
     {}
 };
 
-INSTANTIATE_TEST_CASE_P(smoke_PreprocessingPrecisionConvertTestsViaSetInput, PreprocessingPrecisionConvertTest,
+INSTANTIATE_TEST_SUITE_P(smoke_PreprocessingPrecisionConvertTestsViaSetInput, PreprocessingPrecisionConvertTest,
                         ::testing::Combine(
                                 ::testing::ValuesIn(inputPrecisions),
                                 ::testing::Values(4),   // Number of input tensor channels
@@ -26,7 +26,7 @@ INSTANTIATE_TEST_CASE_P(smoke_PreprocessingPrecisionConvertTestsViaSetInput, Pre
                                 ::testing::ValuesIn(configs)),
                         PreprocessingPrecisionConvertTest::getTestCaseName);
 
-INSTANTIATE_TEST_CASE_P(smoke_PreprocessingPrecisionConvertTestsViaGetBlob, PreprocessingPrecisionConvertTest,
+INSTANTIATE_TEST_SUITE_P(smoke_PreprocessingPrecisionConvertTestsViaGetBlob, PreprocessingPrecisionConvertTest,
                         ::testing::Combine(
                                 ::testing::ValuesIn(inputPrecisions),
                                 ::testing::Values(4),       // Number of input tensor channels (blob_copy only supports 4d and 5d tensors)

docs/template_plugin/tests/functional/shared_tests_instances/behavior/set_preprocess.cpp

@@ -26,21 +26,21 @@ const std::vector<std::map<std::string, std::string>> heteroConfigs = {
         {{ "TARGET_FALLBACK", CommonTestUtils::DEVICE_TEMPLATE }}
 };
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, PreprocessTest,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, PreprocessTest,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),
                                 ::testing::ValuesIn(configs)),
                         PreprocessTest::getTestCaseName);
 
-INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, PreprocessTest,
+INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, PreprocessTest,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_MULTI),
                                 ::testing::ValuesIn(multiConfigs)),
                         PreprocessTest::getTestCaseName);
 
-INSTANTIATE_TEST_CASE_P(smoke_Hetero_BehaviorTests, PreprocessTest,
+INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, PreprocessTest,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_HETERO),
@@ -61,7 +61,7 @@ const std::vector<InferenceEngine::Layout> ioLayouts = {
     InferenceEngine::Layout::NHWC
 };
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, PreprocessConversionTest,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, PreprocessConversionTest,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::ValuesIn(ioPrecisions),
@@ -75,7 +75,7 @@ INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, PreprocessConversionTest,
                                 ::testing::ValuesIn(configs)),
                         PreprocessConversionTest::getTestCaseName);
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, PreprocessDynamicallyInSetBlobTest,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, PreprocessDynamicallyInSetBlobTest,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Bool(),

docs/template_plugin/tests/functional/shared_tests_instances/behavior/test_plugin.cpp

@@ -17,21 +17,21 @@ const std::vector<std::map<std::string, std::string>> configs = {
     {}
 };
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, BehaviorTests,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, BehaviorTests,
                         ::testing::Combine(
                                 ::testing::Values(InferenceEngine::Precision::FP32),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),
                                 ::testing::ValuesIn(configs)),
                         BehaviorTests::getTestCaseName);
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, BehaviorTestInput,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, BehaviorTestInput,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),
                                 ::testing::ValuesIn(configs)),
                         BehaviorTestInput::getTestCaseName);
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, BehaviorTestOutput,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, BehaviorTestOutput,
                         ::testing::Combine(
                                 ::testing::ValuesIn(netPrecisions),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),

docs/template_plugin/tests/functional/shared_tests_instances/behavior/version.cpp

@@ -12,7 +12,7 @@ const std::vector<std::map<std::string, std::string>> configs = {
     {}
 };
 
-INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, VersionTest,
+INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, VersionTest,
                         ::testing::Combine(
                                 ::testing::Values(InferenceEngine::Precision::FP32),
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE),

docs/template_plugin/tests/functional/shared_tests_instances/hetero/query_network.cpp

@@ -13,7 +13,7 @@ using namespace HeteroTests;
 
 auto ConvBias = ngraph::builder::subgraph::makeConvBias();
 
-INSTANTIATE_TEST_CASE_P(smoke_FullySupportedTopologies, QueryNetworkTest,
+INSTANTIATE_TEST_SUITE_P(smoke_FullySupportedTopologies, QueryNetworkTest,
                         ::testing::Combine(
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE, "HETERO:TEMPLATE", "MULTI:TEMPLATE"),
                                 ::testing::Values(ConvBias)),

docs/template_plugin/tests/functional/shared_tests_instances/hetero/synthetic.cpp

@@ -11,13 +11,13 @@
 namespace {
 using namespace HeteroTests;
 
-INSTANTIATE_TEST_CASE_P(smoke_SingleMajorNode, HeteroSyntheticTest,
+INSTANTIATE_TEST_SUITE_P(smoke_SingleMajorNode, HeteroSyntheticTest,
                         ::testing::Combine(
                                 ::testing::Values(std::vector<PluginParameter>{{"TEMPLATE0", "templatePlugin"}, {"TEMPLATE1", "templatePlugin"}}),
                                 ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_singleMajorNodeFunctions)),
                         HeteroSyntheticTest::getTestCaseName);
 
-INSTANTIATE_TEST_CASE_P(nightly_RandomMajorNodes, HeteroSyntheticTest,
+INSTANTIATE_TEST_SUITE_P(nightly_RandomMajorNodes, HeteroSyntheticTest,
                         ::testing::Combine(
                                 ::testing::Values(std::vector<PluginParameter>{{"TEMPLATE0", "templatePlugin"}, {"TEMPLATE1", "templatePlugin"}}),
                                 ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_randomMajorNodeFunctions)),

docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp

@@ -57,7 +57,7 @@ const auto conv2DParams_AutoPadValid = ::testing::Combine(
 );
 
 // ! [test_convolution:instantiate]
-INSTANTIATE_TEST_CASE_P(Convolution2D_ExplicitPadding, ConvolutionLayerTest,
+INSTANTIATE_TEST_SUITE_P(Convolution2D_ExplicitPadding, ConvolutionLayerTest,
                         ::testing::Combine(
                                 conv2DParams_ExplicitPadding,
                                 ::testing::ValuesIn(netPrecisions),
@@ -70,7 +70,7 @@ INSTANTIATE_TEST_CASE_P(Convolution2D_ExplicitPadding, ConvolutionLayerTest,
                         ConvolutionLayerTest::getTestCaseName);
 // ! [test_convolution:instantiate]
 
-INSTANTIATE_TEST_CASE_P(Convolution2D_AutoPadValid, ConvolutionLayerTest,
+INSTANTIATE_TEST_SUITE_P(Convolution2D_AutoPadValid, ConvolutionLayerTest,
                         ::testing::Combine(
                                 conv2DParams_AutoPadValid,
                                 ::testing::ValuesIn(netPrecisions),
@@ -113,7 +113,7 @@ const auto conv3DParams_AutoPadValid = ::testing::Combine(
         ::testing::Values(ngraph::op::PadType::VALID)
 );
 
-INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_ExplicitPadding, ConvolutionLayerTest,
+INSTANTIATE_TEST_SUITE_P(smoke_Convolution3D_ExplicitPadding, ConvolutionLayerTest,
                         ::testing::Combine(
                                 conv3DParams_ExplicitPadding,
                                 ::testing::ValuesIn(netPrecisions),
@@ -125,7 +125,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_ExplicitPadding, ConvolutionLayerTes
                                 ::testing::Values(CommonTestUtils::DEVICE_TEMPLATE)),
                         ConvolutionLayerTest::getTestCaseName);
 
-INSTANTIATE_TEST_CASE_P(nightly_Convolution3D_AutoPadValid, ConvolutionLayerTest,
+INSTANTIATE_TEST_SUITE_P(nightly_Convolution3D_AutoPadValid, ConvolutionLayerTest,
                         ::testing::Combine(
                                 conv3DParams_AutoPadValid,
                                 ::testing::ValuesIn(netPrecisions),

docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp

@@ -15,7 +15,7 @@ const std::vector<InferenceEngine::Precision> netPrecisions = {
     InferenceEngine::Precision::FP32,
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_ReshapeCheckDynBatch, ReshapeLayerTestRevise,
     ::testing::Combine(
         ::testing::Values(true), ::testing::ValuesIn(netPrecisions),
@@ -29,7 +29,7 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::Values(std::map<std::string, std::string>({}))),
     ReshapeLayerTestRevise::getTestCaseName);
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_ReshapeCheck, ReshapeLayerTestRevise,
     ::testing::Combine(
         ::testing::Values(true), ::testing::ValuesIn(netPrecisions),
@@ -43,7 +43,7 @@ INSTANTIATE_TEST_CASE_P(
         ::testing::Values(std::map<std::string, std::string>({}))),
     ReshapeLayerTestRevise::getTestCaseName);
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_ReshapeCheckNegative, ReshapeLayerTestRevise,
     ::testing::Combine(
         ::testing::Values(true), ::testing::ValuesIn(netPrecisions),

docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp

@@ -41,7 +41,7 @@ const auto params2D = testing::Combine(
     testing::Values(std::map<std::string, std::string>())
 );
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_SoftMax2D,
         SoftMaxLayerTest,
         params2D,
@@ -68,7 +68,7 @@ const auto params4D = testing::Combine(
     testing::Values(std::map<std::string, std::string>())
 );
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
         smoke_SoftMax4D,
         SoftMaxLayerTest,
         params4D,

docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/split.cpp

@@ -11,7 +11,7 @@ using namespace LayerTestsDefinitions;
 
 namespace {
 
-INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, SplitLayerTest,
+INSTANTIATE_TEST_SUITE_P(smoke_NumSplitsCheck, SplitLayerTest,
                         ::testing::Combine(
                                 ::testing::Values(1, 2, 3, 5, 6, 10, 30),
                                 ::testing::Values(0, 1, 2, 3),

inference-engine/src/gna_plugin/optimizer/gna_pass_manager.cpp

@@ -1216,8 +1216,8 @@ void InsertConcatAligningFilterPass::run() {
                 // modifying output rows to be used - to avoid modification to original concat we are store num of elements in params
                 dims[1] = num_rows_out;
 
-                if (concatInput->getLayout() == Layout::NC && dims[0] > 8 ||
-                    concatInput->getLayout() == Layout::CN && dims[1] > 8) {
+                if ((concatInput->getLayout() == Layout::NC && dims[0] > 8) ||
+                    (concatInput->getLayout() == Layout::CN && dims[1] > 8)) {
                     THROW_GNA_EXCEPTION << "unsupported batch number '" <<
                         (concatInput->getLayout() == Layout::NC ? dims[0] : dims[1]) <<
                         "' in layer '" << concatLayer->name << "'";
@@ -1669,7 +1669,7 @@ void BroadcastConstPass::run() {
         };
 
         auto nextLayer = CNNNetCheckNextLayerSkipCertain(constLayer, 0, 0, true, isNonFunctional).first;
-        if (!nextLayer || !LayerInfo(nextLayer).isEltwise() && !LayerInfo(nextLayer).isFakeQuantize()) {
+        if (!nextLayer || (!LayerInfo(nextLayer).isEltwise() && !LayerInfo(nextLayer).isFakeQuantize())) {
             continue;
         }
 

inference-engine/tests/functional/inference_engine/blob_copy_test.cpp

@@ -320,7 +320,7 @@ std::vector<PrecisionType> BlobCopy_PrecisionParams = {
 
 }  // namespace
 
-INSTANTIATE_TEST_CASE_P(accuracy, BlobCopyTest,
+INSTANTIATE_TEST_SUITE_P(accuracy, BlobCopyTest,
                         ::testing::Combine(::testing::ValuesIn(BlobCopy_srcLayoutParam),
                            ::testing::ValuesIn(BlobCopy_dstLayoutParam),
                            ::testing::ValuesIn(BlobCopy_BatchNum),
@@ -468,7 +468,7 @@ TEST_P(BlobCopySetLayoutTest, BlobCopyWithNCHW_To_NHWC_After_setLayout) {
     ASSERT_TRUE(IsEqualBlobCopy(ref, dst)) << "'blob_copy' after setLayout function is not correct";
 }
 
-INSTANTIATE_TEST_CASE_P(accuracy, BlobCopySetLayoutTest,
+INSTANTIATE_TEST_SUITE_P(accuracy, BlobCopySetLayoutTest,
     ::testing::Combine(::testing::ValuesIn(BlobCopySetLayout_Dims),
                        ::testing::ValuesIn(BlobCopySetLayout_Precisions)));
 

inference-engine/tests/functional/inference_engine/caching_test.cpp

@@ -67,7 +67,7 @@ public:
     MockRemoteContext(std::string name): m_name(std::move(name)) {}
     std::string getDeviceName() const noexcept { return m_name; }
     MOCK_METHOD2(CreateBlob, RemoteBlob::Ptr(const TensorDesc&, const ParamMap&));
-    MOCK_QUALIFIED_METHOD0(getParams, const, ParamMap());
+    MOCK_CONST_METHOD0(getParams, ParamMap());
 };
 
 class MockCachingInferencePluginBase : public InferenceEngine::IInferencePlugin {
@@ -1075,7 +1075,7 @@ TEST_P(CachingTest, TestCacheFileOldVersion) {
             if (index != std::string::npos) {
                 content.replace(index, buildNum.size(), zeroBuild);
             } else {
-                SKIP();
+                return; // skip test
             }
             std::ofstream out(fileName, std::ios_base::binary);
             out.write(content.c_str(), content.size());
@@ -1505,7 +1505,7 @@ TEST_P(CachingTest, LoadMulti_NoCachingOnDevice) {
     }
 }
 
-INSTANTIATE_TEST_CASE_P(CachingTest, CachingTest,
+INSTANTIATE_TEST_SUITE_P(CachingTest, CachingTest,
                         ::testing::Combine(
                             ::testing::ValuesIn(loadVariants),
                             ::testing::ValuesIn(cacheFolders)),

inference-engine/tests/functional/inference_engine/cnn_network/matmul_sr_tests.cpp

@@ -70,7 +70,7 @@ public:
 TEST_P(SmartReshapeMatMulTests, ReshapeMatMul) {
 }
 
-INSTANTIATE_TEST_CASE_P(NGraph, SmartReshapeMatMulTests, testing::Values(
+INSTANTIATE_TEST_SUITE_P(NGraph, SmartReshapeMatMulTests, testing::Values(
         ReshapeMatMulTestCase{true, {1, 20, 30}, {30, 40}, {20, -1}, false, false, {{"input_A", {2, 20, 30}}}},
         ReshapeMatMulTestCase{true, {1, 20, 30}, {40, 30}, {20, -1}, false, true, {{"input_A", {2, 20, 30}}}},
         ReshapeMatMulTestCase{true, {1, 30, 20}, {30, 20}, {-1, 20}, true, false, {{"input_A", {2, 30, 20}}}},

inference-engine/tests/functional/inference_engine/ir_serialization/serialize.cpp

@@ -53,7 +53,7 @@ TEST_P(SerializationTest, CompareFunctions) {
     ASSERT_TRUE(success) << message;
 }
 
-INSTANTIATE_TEST_CASE_P(IRSerialization, SerializationTest,
+INSTANTIATE_TEST_SUITE_P(IRSerialization, SerializationTest,
         testing::Values(std::make_tuple("add_abc.xml", "add_abc.bin"),
                         std::make_tuple("add_abc_f64.xml", ""),
                         std::make_tuple("add_abc_bin.xml", ""),
@@ -76,7 +76,7 @@ INSTANTIATE_TEST_CASE_P(IRSerialization, SerializationTest,
 
 #ifdef NGRAPH_ONNX_IMPORT_ENABLE
 
-INSTANTIATE_TEST_CASE_P(ONNXSerialization, SerializationTest,
+INSTANTIATE_TEST_SUITE_P(ONNXSerialization, SerializationTest,
         testing::Values(std::make_tuple("add_abc.prototxt", ""),
                         std::make_tuple("split_equal_parts_2d.prototxt", ""),
                         std::make_tuple("addmul_abc.prototxt", ""),

inference-engine/tests/functional/inference_engine/lp_transformations/add_transformation.cpp

@@ -807,7 +807,7 @@ const std::vector<AddTransformationTestValues> addTransformationTestValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     AddTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/avg_pool_transformation.cpp

@@ -336,7 +336,7 @@ const std::vector<AvgPoolTransformationTestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     AvgPoolTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/clamp_transformation.cpp

@@ -451,7 +451,7 @@ const std::vector<ClampTransformationTestValues> testValues = {
         true // non dequantization multiply
     },
 };
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ClampTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/compose_fake_quantize_transformation.cpp

@@ -140,7 +140,7 @@ const std::vector<ComposeFakeQuantizeTransformationParams> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ComposeFakeQuantizeTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/concat_selection_with_intermediate_transformation.cpp

@@ -173,7 +173,7 @@ const std::vector<TestValues> testValues = {
     }
 };
 
- INSTANTIATE_TEST_CASE_P(
+ INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConcatSelectionWithIntermediateTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/concat_transformation.cpp

@@ -737,7 +737,7 @@ const std::vector<ngraph::Shape> shapes = {
     { 4, 3, 9, 9 }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConcatTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_different_precision_on_children.cpp

@@ -237,7 +237,7 @@ const std::vector<ConcatTransformationTestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConcatWithDifferentChildrenTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_precision_selection_transformation.cpp

@@ -306,7 +306,7 @@ const std::vector<ngraph::Shape> shapes = {
     { 4, 3, 9, 9 }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConcatWithIntermediatePrecisionSelectionTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_reshape_transformation.cpp

@@ -133,7 +133,7 @@ const std::vector<TestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConcatWithIntermediateReshapeTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_transformation.cpp

@@ -292,7 +292,7 @@ const std::vector<ngraph::Shape> shapes = {
     { 4, 3, 9, 9 }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConcatWithIntermediateTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_with_constant_transformation.cpp

@@ -309,7 +309,7 @@ const std::vector<ngraph::Shape> shapes = {
     { 4, 3, 9, 9 }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConcatWithIntermediateWithConstantTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_neighbors_transformation.cpp

@@ -344,7 +344,7 @@ const std::vector<ngraph::Shape> shapes = {
     { 4, 3, 9, 9 }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConcatWithNeighborsTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_reshape_at_the_end_transformation.cpp

@@ -206,7 +206,7 @@ const std::vector<ngraph::Shape> shapes = {
     { 4, 3, 9, 9 }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConcatWithReshapeAtTheEndTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_split_transformation.cpp

@@ -300,7 +300,7 @@ const std::vector<ConcatTransformationTestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConcatWithSplitTransformation,
     ::testing::Combine(
@@ -334,7 +334,7 @@ const std::vector<ConcatTransformationTestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConcatWithSplitTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_strided_slice_transformation.cpp

@@ -273,7 +273,7 @@ const std::vector<ngraph::Shape> shapes = {
     { 4, 4, 9, 9 }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConcatWithStridedSliceTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/convert_mul_or_add_finally_transformation_with_dequantization.cpp

@@ -109,7 +109,7 @@ std::vector<ConvertMulOrAddFinallyTransformationWithDequantizationTestValues> te
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConvertMulOrAddFinallyTransformationWithDequantization,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/convert_subtract_constant_transformation.cpp

@@ -324,7 +324,7 @@ const std::vector<ConvertSubtractConstantTransformationTestValues> testValues =
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConvertSubtractConstantTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/convolution_backprop_data_transformation.cpp

@@ -445,7 +445,7 @@ const std::vector<ConvolutionBackpropDataTransformationTestValues> testValues =
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConvolutionBackpropDataTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/convolution_qdq_transformation.cpp

@@ -495,7 +495,7 @@ const std::vector<ConvolutionQDqTransformationTestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConvolutionQDqTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/convolution_transformation.cpp

@@ -424,7 +424,7 @@ const std::vector<ConvolutionTransformationTestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConvolutionTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/convolution_with_incorrect_weights.cpp

@@ -130,7 +130,7 @@ const std::vector<ConvolutionWIthIncorrectWeightsTestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ConvolutionWIthIncorrectWeightsTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/depth_to_space_transformation.cpp

@@ -244,7 +244,7 @@ const std::vector<DepthToSpaceTransformationTestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     DepthToSpaceTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/disable_convert_on_const_path_transformation.cpp

@@ -161,7 +161,7 @@ const std::vector<DisableConvertOnConstPathTransformationValues> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     DisableConvertOnConstPathTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/elementwise_with_multi_parent_dequantization_transformation.cpp

@@ -154,7 +154,7 @@ const std::vector<ElementwiseWithMultiParentDequantizationTransformationTestValu
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ElementwiseWithMultiParentDequantizationTransformation,
     ::testing::ValuesIn(addTransformationTestValues),

inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp

@@ -161,7 +161,7 @@ const std::vector<ngraph::Shape> shapes = {
     // TODO: 3D tensor
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_on_weights_with_unsupported_child.cpp

@@ -119,7 +119,7 @@ const std::vector<FakeQuantizeOnWeightsWithUnsupportedChildTestValues> testValue
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     FakeQuantizeOnWeightsWithUnsupportedChild,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_precision_selection_transformation.cpp

@@ -193,7 +193,7 @@ const std::vector<ngraph::Shape> shapes = {
     // TODO: 3D tensor
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     FakeQuantizePrecisionSelectionTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_transformation.cpp

@@ -222,7 +222,7 @@ const std::vector<ngraph::Shape> shapes = {
     // TODO: 3D tensor
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     FakeQuantizeTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp

@@ -205,7 +205,7 @@ const std::vector<ngraph::Shape> shapes = {
     // TODO: 3D tensor
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     FakeQuantizeWithNotOptimalTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_with_dynamic_intervals_transformation.cpp

@@ -157,7 +157,7 @@ const std::vector<FakeQuantizeWithDynamicIntervalsTransformationTestValues> fake
 
 const std::vector<ngraph::Shape> shapes = { { 1, 32, 72, 48 } };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     FakeQuantizeWithDynamicIntervalsTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/fold_convert_transformation.cpp

@@ -165,7 +165,7 @@ const std::vector<FoldConvertTransformationTestValues> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     FoldConvertTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/fold_fake_quantize_in_transformations.cpp

@@ -206,7 +206,7 @@ const std::vector<FoldFakeQuantizeInTransformationsTestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     FoldFakeQuantizeInTransformations,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/fuse_convert_transformation.cpp

@@ -180,7 +180,7 @@ TEST_P(FuseConvertTransformation, CompareFunctions) {
     ASSERT_TRUE(res.first) << res.second;
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     FuseConvertTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/fuse_fake_quantize_transformation.cpp

@@ -342,7 +342,7 @@ const std::vector<FuseFakeQuantizeTransformationTestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     FuseFakeQuantizeTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/fuse_fake_quantize_with_multi_inputs_transformation.cpp

@@ -135,7 +135,7 @@ const std::vector<FuseFakeQuantizeTransformationTestValues> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     FuseFakeQuantizeWithMultiInputsTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/fuse_multiply_to_fake_quantize_transformation.cpp

@@ -140,7 +140,7 @@ const std::vector<FuseMultiplyToFakeQuantizeTransformationTestValues> testValues
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     FuseMultiplyToFakeQuantizeTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/fuse_subtract_to_fake_quantize_transformation.cpp

@@ -217,7 +217,7 @@ const std::vector<FuseSubtractToFakeQuantizeTransformationTestValues> testValues
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     FuseSubtractToFakeQuantizeTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/get_dequantization_below_transformation.cpp

@@ -124,7 +124,7 @@ const std::vector<ngraph::Shape> shapes = {
     // TODO: 3D tensor
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     GetDequantizationBelowTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/get_dequantization_test.cpp

@@ -78,7 +78,7 @@ TEST_P(GetDequantizationTestTransformation, CompareFunctions) {
     ASSERT_TRUE(res.first) << res.second;
 }
 
-INSTANTIATE_TEST_CASE_P(smoke_LPT, GetDequantizationTestTransformation,
+INSTANTIATE_TEST_SUITE_P(smoke_LPT, GetDequantizationTestTransformation,
     ::testing::Combine(
         ::testing::ValuesIn(isConvert),
         ::testing::ValuesIn(isSubtract),

inference-engine/tests/functional/inference_engine/lp_transformations/get_dequantization_transformation.cpp

@@ -155,7 +155,7 @@ const std::vector<ngraph::Shape> shapes = {
     // TODO: 3D tensor
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     GetDequantizationTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/group_convolution_transformation.cpp

@@ -702,7 +702,7 @@ const std::vector<GroupConvolutionTestValues> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     GroupConvolutionTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/interpolate_transformation.cpp

@@ -446,7 +446,7 @@ TEST_P(InterpolateTransformation, CompareFunctions) {
     ASSERT_TRUE(res.first) << res.second;
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     InterpolateTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/is_function_quantized_transformation.cpp

@@ -109,7 +109,7 @@ const std::vector<IsFunctionQuantizedTransformationValues> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     IsFunctionQuantizedTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/mat_mul_transformation.cpp

@@ -357,7 +357,7 @@ std::vector<MatMullTransformationTestValues> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     MatMulTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/mat_mul_with_constant_transformation.cpp

@@ -592,7 +592,7 @@ std::vector<MatMullTransformationTestValues> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     MatMulWithConstantTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/max_pool_transformation.cpp

@@ -208,7 +208,7 @@ const std::vector<MaxPoolTransformationTestValues> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     MaxPoolTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/move_dequantization_after_transformation.cpp

@@ -256,7 +256,7 @@ const std::vector<MoveDequantizationAfterTransformationParams> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     MoveDequantizationAfterTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/mul_add_to_scaleshift_or_power_transformation.cpp

@@ -135,7 +135,7 @@ const std::vector<MulAddToScaleshiftOrPowerParams> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     MulAddToScaleshiftOrPowerTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/multiply_to_group_convolution_transformation.cpp

@@ -312,7 +312,7 @@ TEST_P(MultiplyToGroupConvolutionTransformation, CompareFunctions) {
     ASSERT_TRUE(res.first) << res.second;
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     MultiplyToGroupConvolutionTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/multiply_transformation.cpp

@@ -727,7 +727,7 @@ const std::vector<MultiplyTransformationTestValues> multiplyTransformationTestVa
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     MultiplyTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/mvn_transformation.cpp

@@ -298,7 +298,7 @@ TEST_P(MVNTransformation, CompareFunctions) {
     ASSERT_TRUE(res.first) << res.second;
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     MVNTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/normalize_dequantization_transformation.cpp

@@ -163,7 +163,7 @@ const std::vector<NormalizeDequantizationTestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     NormalizeDequantizationTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/normalize_l2_transformation.cpp

@@ -269,7 +269,7 @@ const std::vector<NormalizeL2TransformationTestValues> normalizeL2Transformation
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     NormalizeL2Transformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/prelu_transformation.cpp

@@ -159,7 +159,7 @@ const std::vector<PReluTransformationTestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     PReluTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/pull_reshape_through_dequantization_transformation.cpp

@@ -349,7 +349,7 @@ const std::vector<PullReshapeThroughDequantizationTestValues> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     PullReshapeThroughDequantizationTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/pull_transpose_through_dequantization_transformation.cpp

@@ -237,7 +237,7 @@ const std::vector<PullTransposeThroughDequantizationTestValues> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     PullTransposeThroughDequantizationTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/reduce_max_transformation.cpp

@@ -301,7 +301,7 @@ const std::vector<ReduceTransformationTestValues> reduceMaxTransformationTestVal
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ReduceMaxTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/reduce_mean_transformation.cpp

@@ -269,7 +269,7 @@ const std::vector<ReduceTransformationTestValues> reduceMeanTransformationTestVa
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ReduceMeanTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/reduce_min_transformation.cpp

@@ -301,7 +301,7 @@ const std::vector<ReduceTransformationTestValues> reduceMinTransformationTestVal
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ReduceMinTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/reduce_sum_transformation.cpp

@@ -293,7 +293,7 @@ const std::vector<ReduceTransformationTestValues> reduceSumTransformationTestVal
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ReduceSumTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/relu_transformation.cpp

@@ -234,7 +234,7 @@ const std::vector<ReluTransformationTestValues> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ReluTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/reshape_fully_connected_transformation.cpp

@@ -99,7 +99,7 @@ std::vector<ReshapeFullyConnectedTransformationTestValues> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ReshapeFullyConnectedTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/reshape_transformation.cpp

@@ -647,7 +647,7 @@ TEST_P(ReshapeTransformation, CompareFunctions) {
     ASSERT_TRUE(res.first) << res.second;
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ReshapeTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/round_transformation.cpp

@@ -102,7 +102,7 @@ TEST_P(RoundTransformation, CompareFunctions) {
     ASSERT_TRUE(res.first) << res.second;
 }
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     LPT,
     RoundTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/separate_in_standalone_branch_transformation.cpp

@@ -158,7 +158,7 @@ std::vector<SeparateInStandaloneBranchTransformationTestValues> testValues = {
     }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     SeparateInStandaloneBranchTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/shuffle_channels_transformation.cpp

@@ -280,7 +280,7 @@ const std::vector<ShuffleChannelsTransformationTestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     ShuffleChannelsTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/split_transformation.cpp

@@ -456,7 +456,7 @@ const std::vector<SplitTransformationTestValues> testValues = {
         { }
     },
 };
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     SplitTransformation,
     ::testing::Combine(

inference-engine/tests/functional/inference_engine/lp_transformations/squeeze_transformation.cpp

@@ -223,7 +223,7 @@ const std::vector<SqueezeTransformationTestValues> testValues = {
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     SqueezeTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/strided_slice_transformation.cpp

@@ -535,7 +535,7 @@ const std::vector<StridedSliceTransformationTestValues> stridedSliceTransformati
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     StridedSliceTransformation,
     ::testing::ValuesIn(stridedSliceTransformationTestValues),

inference-engine/tests/functional/inference_engine/lp_transformations/subtract_multiply_to_multiply_add_transformation.cpp

@@ -273,7 +273,7 @@ const std::vector<SubtractMultiplyToMultiplyAddTransformationTestValues> testVal
     },
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     SubtractMultiplyToMultiplyAddTransformation,
     ::testing::ValuesIn(testValues),

inference-engine/tests/functional/inference_engine/lp_transformations/transformations_after_split_transformation.cpp

@@ -213,7 +213,7 @@ const std::vector<std::string> transformationNames = {
     "SubtractMultiplyToMultiplyAddTransformation",
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     TransformationsAfterSplitTransformation,
     ::testing::ValuesIn(transformationNames),

inference-engine/tests/functional/inference_engine/lp_transformations/transformer_is_function_quantized.cpp

@@ -79,7 +79,7 @@ const std::vector<TestValues> testValues = {
     { {}, {} }
 };
 
-INSTANTIATE_TEST_CASE_P(
+INSTANTIATE_TEST_SUITE_P(
     smoke_LPT,
     TransformerIsFunctionQuantized,
     ::testing::ValuesIn(testValues),