From fa2f9c5201983d7ce247d1723083ca033f3c672d Mon Sep 17 00:00:00 2001 From: Ilya Lavrenov Date: Tue, 22 Jun 2021 17:39:39 +0300 Subject: [PATCH] Migrated to official GoogleTest repo (#6286) * Move gtest to /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 ec9fe08d79acf77b0a77f1b255c1b39cc9ce93cb. * 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 --- .gitmodules | 8 +- docs/IE_PLUGIN_DG/PluginTesting.md | 2 +- .../behavior/caching_tests.cpp | 2 +- .../behavior/config.cpp | 8 +- .../behavior/core_integration.cpp | 50 +- .../behavior/cpp_holders.cpp | 6 +- .../behavior/exec_graph_info.cpp | 2 +- .../behavior/infer_request.cpp | 2 +- .../behavior/infer_request_callback.cpp | 2 +- .../behavior/infer_request_config.cpp | 2 +- .../behavior/infer_request_input.cpp | 2 +- .../behavior/infer_request_output.cpp | 2 +- .../behavior/layout.cpp | 2 +- .../behavior/preprocessing.cpp | 4 +- .../behavior/set_preprocess.cpp | 10 +- .../behavior/test_plugin.cpp | 6 +- .../behavior/version.cpp | 2 +- .../hetero/query_network.cpp | 2 +- .../hetero/synthetic.cpp | 4 +- .../single_layer_tests/convolution.cpp | 8 +- .../single_layer_tests/reshape.cpp | 6 +- .../single_layer_tests/softmax.cpp | 4 +- .../single_layer_tests/split.cpp | 2 +- .../gna_plugin/optimizer/gna_pass_manager.cpp | 6 +- .../inference_engine/blob_copy_test.cpp | 4 +- .../inference_engine/caching_test.cpp | 6 +- .../cnn_network/matmul_sr_tests.cpp | 2 +- .../ir_serialization/serialize.cpp | 4 +- .../lp_transformations/add_transformation.cpp | 2 +- .../avg_pool_transformation.cpp | 2 +- .../clamp_transformation.cpp | 2 +- .../compose_fake_quantize_transformation.cpp | 2 +- ...ction_with_intermediate_transformation.cpp | 2 +- .../concat_transformation.cpp | 2 +- ...t_with_different_precision_on_children.cpp | 2 +- ...ate_precision_selection_transformation.cpp | 2 +- ...th_intermediate_reshape_transformation.cpp | 2 +- ...oncat_with_intermediate_transformation.cpp | 2 +- ...ermediate_with_constant_transformation.cpp | 2 +- .../concat_with_neighbors_transformation.cpp | 2 +- ...with_reshape_at_the_end_transformation.cpp | 2 +- .../concat_with_split_transformation.cpp | 4 +- ...ncat_with_strided_slice_transformation.cpp | 2 +- ...lly_transformation_with_dequantization.cpp | 2 +- ...nvert_subtract_constant_transformation.cpp | 2 +- ...nvolution_backprop_data_transformation.cpp | 2 +- .../convolution_qdq_transformation.cpp | 2 +- .../convolution_transformation.cpp | 2 +- .../convolution_with_incorrect_weights.cpp | 2 +- .../depth_to_space_transformation.cpp | 2 +- ...e_convert_on_const_path_transformation.cpp | 2 +- ...i_parent_dequantization_transformation.cpp | 2 +- ...d_two_output_branches_with_convolution.cpp | 2 +- ...tize_on_weights_with_unsupported_child.cpp | 2 +- ...ize_precision_selection_transformation.cpp | 2 +- .../fake_quantize_transformation.cpp | 2 +- ...ize_with_dq_not_optimal_transformation.cpp | 2 +- ..._with_dynamic_intervals_transformation.cpp | 2 +- .../fold_convert_transformation.cpp | 2 +- .../fold_fake_quantize_in_transformations.cpp | 2 +- .../fuse_convert_transformation.cpp | 2 +- .../fuse_fake_quantize_transformation.cpp | 2 +- ...ntize_with_multi_inputs_transformation.cpp | 2 +- ...ltiply_to_fake_quantize_transformation.cpp | 2 +- ...btract_to_fake_quantize_transformation.cpp | 2 +- ...et_dequantization_below_transformation.cpp | 2 +- .../get_dequantization_test.cpp | 2 +- .../get_dequantization_transformation.cpp | 2 +- .../group_convolution_transformation.cpp | 2 +- .../interpolate_transformation.cpp | 2 +- .../is_function_quantized_transformation.cpp | 2 +- .../mat_mul_transformation.cpp | 2 +- .../mat_mul_with_constant_transformation.cpp | 2 +- .../max_pool_transformation.cpp | 2 +- ...ve_dequantization_after_transformation.cpp | 2 +- ..._to_scaleshift_or_power_transformation.cpp | 2 +- ...ly_to_group_convolution_transformation.cpp | 2 +- .../multiply_transformation.cpp | 2 +- .../lp_transformations/mvn_transformation.cpp | 2 +- ...ormalize_dequantization_transformation.cpp | 2 +- .../normalize_l2_transformation.cpp | 2 +- .../prelu_transformation.cpp | 2 +- ..._through_dequantization_transformation.cpp | 2 +- ..._through_dequantization_transformation.cpp | 2 +- .../reduce_max_transformation.cpp | 2 +- .../reduce_mean_transformation.cpp | 2 +- .../reduce_min_transformation.cpp | 2 +- .../reduce_sum_transformation.cpp | 2 +- .../relu_transformation.cpp | 2 +- ...reshape_fully_connected_transformation.cpp | 2 +- .../reshape_transformation.cpp | 2 +- .../round_transformation.cpp | 2 +- ...te_in_standalone_branch_transformation.cpp | 2 +- .../shuffle_channels_transformation.cpp | 2 +- .../split_transformation.cpp | 2 +- .../squeeze_transformation.cpp | 2 +- .../strided_slice_transformation.cpp | 2 +- ...ultiply_to_multiply_add_transformation.cpp | 2 +- ...sformations_after_split_transformation.cpp | 2 +- .../transformer_is_function_quantized.cpp | 2 +- .../transpose_transformation.cpp | 2 +- .../unsqueeze_transformation.cpp | 2 +- .../variadic_split_transformation.cpp | 2 +- .../ngraph_reader/net_reader_test.cpp | 2 +- .../serialization/single_layer/activation.cpp | 8 +- .../serialization/single_layer/batch_norm.cpp | 2 +- .../single_layer/binary_convolution.cpp | 4 +- .../serialization/single_layer/broadcast.cpp | 2 +- .../serialization/single_layer/clamp.cpp | 2 +- .../serialization/single_layer/constant.cpp | 4 +- .../serialization/single_layer/convert.cpp | 2 +- .../single_layer/convolution.cpp | 4 +- .../single_layer/convolution_backprop.cpp | 2 +- .../single_layer/deformable_convolution.cpp | 4 +- .../single_layer/deformable_psroi_pooling.cpp | 2 +- .../single_layer/detection_output.cpp | 2 +- .../single_layer/elementwise.cpp | 2 +- .../single_layer/extractimagepatches.cpp | 2 +- .../single_layer/group_convolution.cpp | 2 +- .../group_convolution_backprop_data.cpp | 2 +- .../single_layer/minimum_maximum.cpp | 2 +- .../serialization/single_layer/mvn.cpp | 4 +- .../single_layer/non_max_suppression.cpp | 2 +- .../serialization/single_layer/nonzero.cpp | 2 +- .../single_layer/normalize_l2.cpp | 2 +- .../serialization/single_layer/one_hot.cpp | 2 +- .../serialization/single_layer/pad.cpp | 2 +- .../serialization/single_layer/pooling.cpp | 4 +- .../serialization/single_layer/prelu.cpp | 2 +- .../single_layer/prior_box_clustered.cpp | 2 +- .../serialization/single_layer/reduce_ops.cpp | 10 +- .../single_layer/region_yolo.cpp | 2 +- .../serialization/single_layer/reshape.cpp | 2 +- .../serialization/single_layer/result.cpp | 2 +- .../single_layer/scatter_nd_update.cpp | 2 +- .../single_layer/shuffle_channels.cpp | 2 +- .../single_layer/space_to_batch.cpp | 2 +- .../serialization/single_layer/split.cpp | 2 +- .../serialization/single_layer/squeeze.cpp | 2 +- .../single_layer/tensor_iterator.cpp | 2 +- .../serialization/single_layer/transpose.cpp | 6 +- .../serialization/single_layer/unsqueeze.cpp | 2 +- .../single_layer/variadic_split.cpp | 2 +- .../inference_engine/task_executor_tests.cpp | 4 +- .../broadcast_elementwise_fusion_test.cpp | 10 +- .../transformations/conv_fusion_test.cpp | 8 +- .../convert_broadcast3_test.cpp | 10 +- .../convert_convolution_test.cpp | 2 +- .../convert_deconvolution_test.cpp | 2 +- .../convert_reduce_to_pooling_test.cpp | 6 +- .../eliminate_unsqueeze_gather.cpp | 2 +- .../transformations/fq_decomposition_test.cpp | 16 +- .../transformations/fq_mul_fusion_test.cpp | 24 +- .../transformations/fq_reshape_fusion.cpp | 2 +- .../mul_add_conversion_test.cpp | 18 +- .../shuffle_channels_fusion_test.cpp | 2 +- .../transformations/softmax_fusion.cpp | 4 +- .../transpose_sinking_test.cpp | 6 +- .../transpose_to_reshape_test.cpp | 8 +- .../weights_dequantize_to_fake_quantize.cpp | 2 +- .../test_runner/src/read_ir/read_ir.cpp | 2 +- .../cpu/bfloat16/bf16_network_restoring.cpp | 2 +- .../plugin/cpu/bfloat16/bfloat16_helpers.hpp | 2 +- .../plugin/cpu/bfloat16/concat_in_place.cpp | 4 +- .../plugin/cpu/bfloat16/conv_add.cpp | 4 +- .../plugin/cpu/bfloat16/conv_conv.cpp | 4 +- .../plugin/cpu/bfloat16/conv_dwconv_relu.cpp | 4 +- .../cpu/bfloat16/conv_eltwise_depthwise.cpp | 6 +- .../conv_relu_pool_conv_relu_pool.cpp | 4 +- .../plugin/cpu/bfloat16/elt_max.cpp | 4 +- .../functional/plugin/cpu/bfloat16/elt_x3.cpp | 4 +- .../cpu/bfloat16/faster_100_5_1_1_conv.cpp | 4 +- .../plugin/cpu/bfloat16/gather_multiply.cpp | 4 +- .../gather_x2_add_mul_relu_concat_matmul.cpp | 4 +- .../plugin/cpu/bfloat16/memory_conv.cpp | 2 +- .../bfloat16/mobilenet_ssd_with_branching.cpp | 4 +- .../bfloat16/scaleshift_conv_eltwise_conv.cpp | 4 +- .../scaleshift_conv_eltwise_relu_conv.cpp | 4 +- .../scaleshift_conv_eltwise_scaleshift.cpp | 4 +- .../cpu/bfloat16/scaleshift_conv_elu_conv.cpp | 4 +- .../cpu/bfloat16/scaleshift_conv_relu.cpp | 4 +- .../scaleshift_conv_x2_concat_relu.cpp | 4 +- .../bfloat16/scaleshift_conv_x2_eltwise.cpp | 4 +- .../scaleshift_conv_x2_mixed1_eltwise.cpp | 4 +- .../scaleshift_conv_x2_mixed2_eltwise.cpp | 4 +- .../bfloat16/scaleshift_conv_x3_eltwise.cpp | 4 +- .../scaleshift_x2_conv_x2_eltwise.cpp | 4 +- .../scaleshift_x3_conv_eltwise_relu.cpp | 4 +- .../cpu/bfloat16/tail_fp32_optimization.cpp | 4 +- .../plugin/cpu/bfloat16/topk_inputs_i32.cpp | 4 +- .../behavior/add_output.cpp | 2 +- .../behavior/caching_tests.cpp | 2 +- .../behavior/config.cpp | 22 +- .../behavior/core_integration.cpp | 54 +- .../behavior/core_threading_tests.cpp | 6 +- .../behavior/cpp_holders.cpp | 2 +- .../behavior/exec_graph_info.cpp | 6 +- .../behavior/infer_request.cpp | 6 +- .../behavior/infer_request_callback.cpp | 6 +- .../behavior/infer_request_cancellation.cpp | 2 +- .../behavior/infer_request_config.cpp | 12 +- .../behavior/infer_request_input.cpp | 6 +- .../behavior/infer_request_output.cpp | 6 +- .../behavior/invalid_cases/proposal.cpp | 2 +- .../behavior/layout.cpp | 2 +- .../behavior/perf_counters.cpp | 4 +- .../behavior/preprocessing.cpp | 4 +- .../behavior/set_blob.cpp | 2 +- .../behavior/set_blob_of_kind.cpp | 8 +- .../behavior/set_preprocess.cpp | 24 +- .../behavior/test_plugin.cpp | 18 +- .../behavior/version.cpp | 8 +- .../configuration_tests.cpp | 2 +- .../configuration_tests/dynamic_batch.cpp | 4 +- .../exec_graph_serialization.cpp | 2 +- .../execution_graph_tests/keep_assign.cpp | 2 +- .../nms_transformation_for_last_node.cpp | 2 +- .../num_inputs_fusing_bin_conv.cpp | 2 +- .../remove_parameter.cpp | 2 +- .../runtime_precision.cpp | 2 +- .../unique_node_names.cpp | 2 +- .../hetero/query_network.cpp | 2 +- .../hetero/synthetic.cpp | 4 +- .../add_transformation.cpp | 2 +- .../clamp_transformation.cpp | 2 +- .../concat_transformation.cpp | 2 +- .../concat_with_child_and_output.cpp | 2 +- ...t_with_different_precision_on_children.cpp | 2 +- ...oncat_with_intermediate_transformation.cpp | 2 +- .../concat_with_neighbors_transformation.cpp | 2 +- .../concat_with_split_transformation.cpp | 2 +- ...nvolution_backprop_data_transformation.cpp | 2 +- .../convolution_qdq_transformation.cpp | 2 +- .../convolution_transformation.cpp | 4 +- .../depth_to_space_transformation.cpp | 4 +- ...e_quantize_and_avg_pool_transformation.cpp | 2 +- ...e_quantize_and_max_pool_transformation.cpp | 2 +- ...d_two_output_branches_with_convolution.cpp | 2 +- ...ize_precision_selection_transformation.cpp | 2 +- .../fake_quantize_transformation.cpp | 2 +- ...ize_with_dq_not_optimal_transformation.cpp | 2 +- .../fully_connected_transformation.cpp | 2 +- .../fuse_convert_transformation.cpp | 2 +- ...uantize_and_scale_shift_transformation.cpp | 2 +- .../fuse_fake_quantize_transformation.cpp | 2 +- ...ltiply_to_fake_quantize_transformation.cpp | 2 +- ...btract_to_fake_quantize_transformation.cpp | 2 +- .../gemm_transformation.cpp | 2 +- .../group_convolution_transformation.cpp | 2 +- .../groupconvolution_qdq_transformation.cpp | 2 +- .../interpolate_transformation.cpp | 2 +- .../mat_mul_transformation.cpp | 2 +- .../mat_mul_with_constant_transformation.cpp | 2 +- ..._constant_fake_quantize_transformation.cpp | 2 +- ...ly_to_group_convolution_transformation.cpp | 2 +- .../multiply_transformation.cpp | 2 +- ...ultiply_with_one_parent_transformation.cpp | 2 +- .../mvn_transformation.cpp | 2 +- .../normalize_transformation.cpp | 2 +- ...put_layers_handling_in_transformations.cpp | 2 +- ...handling_in_transformations_for_concat.cpp | 2 +- ...ansformations_for_concat_multi_channel.cpp | 2 +- .../prelu_transformation.cpp | 2 +- ..._through_dequantization_transformation.cpp | 2 +- .../reduce_max_transformation.cpp | 2 +- .../reduce_mean_transformation.cpp | 2 +- .../reduce_min_transformation.cpp | 2 +- .../reduce_sum_transformation.cpp | 2 +- .../relu_transformation.cpp | 2 +- .../reshape_transformation.cpp | 2 +- .../shuffle_channels_transformation.cpp | 2 +- .../split_transformation.cpp | 2 +- .../squeeze_transformation.cpp | 2 +- .../strided_slice_transformation.cpp | 2 +- ...ultiply_to_multiply_add_transformation.cpp | 2 +- .../subtract_transformation.cpp | 2 +- .../transpose_after_matmul_transformation.cpp | 2 +- .../transpose_transformation.cpp | 2 +- .../unsqueeze_transformation.cpp | 2 +- .../variadic_split_transformation.cpp | 2 +- .../multi/cpu_remote_blob_tests.cpp | 2 +- .../conv_bias_fusion.cpp | 2 +- .../plugin_specific_ngraph_conversion.cpp | 2 +- .../single_layer_tests/activation.cpp | 10 +- .../single_layer_tests/batch_norm.cpp | 2 +- .../single_layer_tests/batch_to_space.cpp | 2 +- .../single_layer_tests/binary_convolution.cpp | 4 +- .../single_layer_tests/broadcast.cpp | 14 +- .../single_layer_tests/bucketize.cpp | 4 +- .../single_layer_tests/clamp.cpp | 4 +- .../single_layer_tests/comparison.cpp | 2 +- .../single_layer_tests/concat.cpp | 2 +- .../single_layer_tests/constant.cpp | 4 +- .../single_layer_tests/convert.cpp | 2 +- .../single_layer_tests/convert_like.cpp | 2 +- .../single_layer_tests/convolution.cpp | 14 +- .../convolution_backprop_data.cpp | 20 +- .../single_layer_tests/ctc_greedy_decoder.cpp | 2 +- .../ctc_greedy_decoder_seq_len.cpp | 4 +- .../single_layer_tests/ctc_loss.cpp | 4 +- .../single_layer_tests/cum_sum.cpp | 16 +- .../deformable_convolution.cpp | 6 +- .../deformable_psroi_pooling.cpp | 4 +- .../single_layer_tests/depth_to_space.cpp | 4 +- .../single_layer_tests/detection_output.cpp | 4 +- .../single_layer_tests/dft.cpp | 8 +- .../single_layer_tests/eltwise.cpp | 4 +- .../embedding_bag_offsets_sum.cpp | 2 +- .../embedding_bag_packed_sum.cpp | 2 +- .../embedding_segments_sum.cpp | 2 +- .../extract_image_patches.cpp | 2 +- .../single_layer_tests/fake_quantize.cpp | 8 +- .../single_layer_tests/gather.cpp | 12 +- .../single_layer_tests/gather_elements.cpp | 10 +- .../single_layer_tests/gather_nd.cpp | 4 +- .../single_layer_tests/gather_tree.cpp | 2 +- .../single_layer_tests/group_convolution.cpp | 12 +- .../group_convolution_backprop_data.cpp | 12 +- .../single_layer_tests/gru_cell.cpp | 2 +- .../single_layer_tests/gru_sequence.cpp | 4 +- .../single_layer_tests/interpolate.cpp | 8 +- .../single_layer_tests/log_softmax.cpp | 4 +- .../single_layer_tests/logical.cpp | 4 +- .../single_layer_tests/loop.cpp | 6 +- .../single_layer_tests/lrn.cpp | 8 +- .../single_layer_tests/lstm_cell.cpp | 2 +- .../single_layer_tests/lstm_sequence.cpp | 4 +- .../single_layer_tests/mat_mul.cpp | 2 +- .../single_layer_tests/memory.cpp | 2 +- .../single_layer_tests/minimum_maximum.cpp | 2 +- .../single_layer_tests/mvn.cpp | 18 +- .../non_max_suppression.cpp | 2 +- .../single_layer_tests/normalize_l2.cpp | 2 +- .../single_layer_tests/one_hot.cpp | 6 +- .../single_layer_tests/pad.cpp | 12 +- .../single_layer_tests/pooling.cpp | 28 +- .../single_layer_tests/proposal.cpp | 2 +- .../single_layer_tests/psroi_pooling.cpp | 4 +- .../single_layer_tests/range.cpp | 2 +- .../single_layer_tests/reduce_ops.cpp | 16 +- .../single_layer_tests/region_yolo.cpp | 6 +- .../single_layer_tests/reorg_yolo.cpp | 12 +- .../single_layer_tests/reshape.cpp | 6 +- .../single_layer_tests/result.cpp | 2 +- .../single_layer_tests/reverse_sequence.cpp | 2 +- .../single_layer_tests/rnn_cell.cpp | 2 +- .../single_layer_tests/rnn_sequence.cpp | 4 +- .../single_layer_tests/roi_align.cpp | 4 +- .../single_layer_tests/roi_pooling.cpp | 4 +- .../single_layer_tests/roll.cpp | 16 +- .../single_layer_tests/scatter_ND_update.cpp | 2 +- .../scatter_elements_update.cpp | 2 +- .../single_layer_tests/scatter_update.cpp | 2 +- .../single_layer_tests/select.cpp | 4 +- .../single_layer_tests/shape_of.cpp | 2 +- .../single_layer_tests/shuffle_channels.cpp | 12 +- .../single_layer_tests/softmax.cpp | 4 +- .../single_layer_tests/space_to_batch.cpp | 4 +- .../single_layer_tests/space_to_depth.cpp | 4 +- .../single_layer_tests/split.cpp | 4 +- .../single_layer_tests/squeeze_unsqueeze.cpp | 4 +- .../single_layer_tests/strided_slice.cpp | 2 +- .../single_layer_tests/tensor_iterator.cpp | 4 +- .../single_layer_tests/tile.cpp | 4 +- .../single_layer_tests/topk.cpp | 2 +- .../single_layer_tests/transpose.cpp | 8 +- .../single_layer_tests/variadic_split.cpp | 2 +- .../subgraph_tests/codegen_add.cpp | 2 +- .../subgraph_tests/codegen_bert.cpp | 2 +- .../subgraph_tests/codegen_gelu.cpp | 2 +- .../subgraph_tests/constant_result.cpp | 2 +- .../subgraph_tests/conv_eltwise_fusion.cpp | 24 +- .../convert_pad_to_group_conv.cpp | 4 +- .../get_output_before_activation.cpp | 2 +- .../subgraph_tests/matmul_squeeze_add.cpp | 2 +- .../subgraph_tests/memory_LSTMCell.cpp | 2 +- .../subgraph_tests/multiple_LSTMCell.cpp | 2 +- .../subgraph_tests/multiply_add.cpp | 2 +- .../subgraph_tests/mvn_multiply_add.cpp | 6 +- .../subgraph_tests/parameter_result.cpp | 2 +- .../subgraph_tests/perm_conv_perm_concat.cpp | 2 +- .../quantized_convolution_backprop_data.cpp | 4 +- .../quantized_group_convolution.cpp | 4 +- ...ntized_group_convolution_backprop_data.cpp | 4 +- .../subgraph_tests/quantized_mat_mul.cpp | 6 +- .../subgraph_tests/range_add.cpp | 10 +- .../subgraph_tests/relu_shape_of.cpp | 2 +- .../reshape_squeeze_reshape_relu.cpp | 2 +- .../subgraph_tests/split_concat_memory.cpp | 2 +- .../subgraph_tests/split_conv_concat.cpp | 2 +- .../subgraph_tests/tensor_names.cpp | 2 +- .../subgraph_tests/variadic_split_pad.cpp | 2 +- .../cpu/single_layer_tests/activation.cpp | 4 +- .../cpu/single_layer_tests/batch_to_space.cpp | 8 +- .../plugin/cpu/single_layer_tests/concat.cpp | 22 +- .../plugin/cpu/single_layer_tests/convert.cpp | 4 +- .../convert_to_plugin_specific_node.cpp | 4 +- .../cpu/single_layer_tests/convolution.cpp | 46 +- .../convolution_backprop_data.cpp | 20 +- .../cpu/single_layer_tests/depth_to_space.cpp | 8 +- .../plugin/cpu/single_layer_tests/eltwise.cpp | 20 +- .../extract_image_patches.cpp | 2 +- .../cpu/single_layer_tests/fake_quantize.cpp | 10 +- .../single_layer_tests/gather_elements.cpp | 2 +- .../single_layer_tests/group_convolution.cpp | 38 +- .../group_convolution_backprop_data.cpp | 20 +- .../cpu/single_layer_tests/gru_cell.cpp | 2 +- .../cpu/single_layer_tests/gru_sequence.cpp | 4 +- .../cpu/single_layer_tests/interpolate.cpp | 12 +- .../plugin/cpu/single_layer_tests/logical.cpp | 4 +- .../cpu/single_layer_tests/lstm_cell.cpp | 2 +- .../cpu/single_layer_tests/lstm_sequence.cpp | 4 +- .../plugin/cpu/single_layer_tests/mat_mul.cpp | 6 +- .../plugin/cpu/single_layer_tests/mvn.cpp | 12 +- .../cpu/single_layer_tests/normalize.cpp | 6 +- .../plugin/cpu/single_layer_tests/one_hot.cpp | 10 +- .../plugin/cpu/single_layer_tests/pad.cpp | 16 +- .../plugin/cpu/single_layer_tests/pooling.cpp | 16 +- .../cpu/single_layer_tests/psroi_pooling.cpp | 4 +- .../cpu/single_layer_tests/reduce_ops.cpp | 16 +- .../cpu/single_layer_tests/region_yolo.cpp | 6 +- .../cpu/single_layer_tests/rnn_cell.cpp | 2 +- .../cpu/single_layer_tests/rnn_sequence.cpp | 4 +- .../cpu/single_layer_tests/roi_pooling.cpp | 4 +- .../cpu/single_layer_tests/roialign.cpp | 2 +- .../single_layer_tests/shuffle_channels.cpp | 8 +- .../plugin/cpu/single_layer_tests/softmax.cpp | 4 +- .../cpu/single_layer_tests/space_to_batch.cpp | 6 +- .../cpu/single_layer_tests/space_to_depth.cpp | 8 +- .../plugin/cpu/single_layer_tests/split.cpp | 26 +- .../cpu/single_layer_tests/strided_slice.cpp | 10 +- .../cpu/single_layer_tests/transpose.cpp | 8 +- .../cpu/subgraph_tests/src/conv3d_reshape.cpp | 2 +- .../cpu/subgraph_tests/src/conv_concat.cpp | 26 +- .../subgraph_tests/src/conv_maxpool_activ.cpp | 2 +- .../cpu/subgraph_tests/src/eltwise_chain.cpp | 4 +- .../src/fuse_muladd_ewsimple.cpp | 6 +- .../src/fuse_scaleshift_and_fakequantize.cpp | 2 +- .../src/fuse_transpose_reorder.cpp | 6 +- .../src/param_result_custom_blob.cpp | 4 +- .../cpu/subgraph_tests/src/reshape_fc.cpp | 2 +- ...shape_permute_conv_permute_reshape_act.cpp | 2 +- .../import_export_act_conv_act.cpp | 2 +- .../import_export_memory_layer.cpp | 2 +- .../plugin/gna/pass_tests/4d_eltwise.cpp | 4 +- .../gna/pass_tests/act_maxpool_reordering.cpp | 2 +- .../pass_tests/broadcast_const_with_fq.cpp | 2 +- .../convert_matmul_to_fullyconnected.cpp | 2 +- .../convert_matmul_to_pointwise_conv.cpp | 4 +- .../eltwise_split_over_channels_pass.cpp | 2 +- .../plugin/gna/pass_tests/fq_activation.cpp | 2 +- .../fq_fusion_with_multiple_weights.cpp | 2 +- .../gna/pass_tests/fq_maxpool_reordering.cpp | 2 +- .../insert_copy_layer_before_self_concat.cpp | 2 +- .../insert_transpose_before_matmul.cpp | 2 +- .../insert_transpose_between_convs.cpp | 4 +- .../gna/pass_tests/layers_restrictions.cpp | 4 +- .../remove_permutations_NHWC_to_NCHW_pass.cpp | 10 +- .../behavior/add_output.cpp | 2 +- .../behavior/caching_tests.cpp | 2 +- .../behavior/config.cpp | 6 +- .../behavior/core_integration.cpp | 56 +- .../behavior/core_threading_tests.cpp | 4 +- .../behavior/cpp_holders.cpp | 6 +- .../behavior/exec_graph_info.cpp | 2 +- .../behavior/infer_request.cpp | 4 +- .../behavior/infer_request_callback.cpp | 4 +- .../behavior/infer_request_config.cpp | 4 +- .../behavior/infer_request_input.cpp | 2 +- .../behavior/infer_request_output.cpp | 2 +- .../behavior/layout.cpp | 2 +- .../behavior/memory_states.cpp | 2 +- .../behavior/test_plugin.cpp | 6 +- .../behavior/version.cpp | 4 +- .../import_reshape_permute_conv.cpp | 2 +- .../single_layer_tests/activation.cpp | 2 +- .../single_layer_tests/concat.cpp | 2 +- .../single_layer_tests/convolution.cpp | 12 +- .../convolution_negative.cpp | 2 +- .../single_layer_tests/eltwise.cpp | 2 +- .../single_layer_tests/fake_quantize.cpp | 2 +- .../single_layer_tests/low_precision.cpp | 2 +- .../single_layer_tests/mat_mul.cpp | 2 +- .../single_layer_tests/memory.cpp | 2 +- .../single_layer_tests/pooling.cpp | 10 +- .../single_layer_tests/power.cpp | 2 +- .../single_layer_tests/split.cpp | 2 +- .../single_layer_tests/tensor_iterator.cpp | 2 +- .../activation_concats_eltwise.cpp | 2 +- .../subgraph_tests/activation_fq.cpp | 2 +- .../subgraph_tests/basic_lstm.cpp | 2 +- .../subgraph_tests/broadcast_power.cpp | 2 +- .../subgraph_tests/cascade_concat.cpp | 4 +- .../subgraph_tests/clamp_fq.cpp | 2 +- .../subgraph_tests/concat_conv.cpp | 2 +- .../subgraph_tests/concat_multi_input.cpp | 2 +- .../subgraph_tests/concat_quantization.cpp | 2 +- ...ntization_during_memory_requantization.cpp | 2 +- .../subgraph_tests/connect_split_concat.cpp | 4 +- .../subgraph_tests/const_conv_concat.cpp | 2 +- .../const_strided_slice_concat.cpp | 2 +- .../subgraph_tests/constant_result.cpp | 2 +- .../subgraph_tests/conv_fq_eltwise.cpp | 2 +- .../subgraph_tests/conv_fq_relu.cpp | 2 +- .../convolution_relu_sequence.cpp | 2 +- .../subgraph_tests/copy_before_squeeze.cpp | 2 +- .../subgraph_tests/crop4d.cpp | 2 +- .../subgraph_tests/delayed_copy_layer.cpp | 2 +- .../subgraph_tests/eltwise_conv_eltwise.cpp | 6 +- .../eltwise_reshape_activation.cpp | 2 +- .../subgraph_tests/fc_conv_fc.cpp | 6 +- .../first_connect_input_concat.cpp | 2 +- .../subgraph_tests/fq_conv_fq_affine.cpp | 2 +- .../get_output_before_activation.cpp | 2 +- .../handling_orientation_conv.cpp | 2 +- .../subgraph_tests/input_conv.cpp | 2 +- .../subgraph_tests/input_split_concat.cpp | 2 +- .../subgraph_tests/matmul_squeeze_add.cpp | 2 +- .../subgraph_tests/memory_LSTMCell.cpp | 2 +- .../memory_eltwise_reshape_concat.cpp | 2 +- .../multioutput_eltwise_squeeze_eltwise.cpp | 2 +- .../subgraph_tests/multiple_LSTMCell.cpp | 2 +- .../subgraph_tests/multiple_concat.cpp | 8 +- .../negative_memory_layer_offset.cpp | 2 +- .../subgraph_tests/perm_conv_perm_concat.cpp | 2 +- ...shape_permute_conv_permute_reshape_act.cpp | 2 +- .../reshape_squeeze_reshape_relu.cpp | 2 +- .../reshapre_permute_reshape.cpp | 2 +- .../subgraph_tests/scale_shift.cpp | 2 +- .../scaleshift_conv_scaleshift.cpp | 4 +- .../subgraph_tests/softsign.cpp | 2 +- .../subgraph_tests/split_conv.cpp | 2 +- .../subgraph_tests/split_conv_concat.cpp | 2 +- .../subgraph_tests/split_relu.cpp | 2 +- .../split_trivial_permute_concat.cpp | 2 +- .../subgraph_tests/stridedslice_conv.cpp | 2 +- .../subgraph_tests/tensor_names.cpp | 2 +- .../subgraph_tests/trivial_concat.cpp | 2 +- .../two_fake_quantize_to_fullyconnected.cpp | 6 +- .../cldnn_remote_blob_tests.cpp | 4 +- .../behavior/caching_tests.cpp | 2 +- .../behavior/config.cpp | 24 +- .../behavior/core_integration.cpp | 64 +- .../behavior/core_threading_tests.cpp | 4 +- .../behavior/cpp_holders.cpp | 2 +- .../behavior/exec_graph_info.cpp | 2 +- .../behavior/infer_request.cpp | 8 +- .../behavior/infer_request_callback.cpp | 8 +- .../behavior/infer_request_config.cpp | 8 +- .../behavior/infer_request_input.cpp | 8 +- .../behavior/infer_request_output.cpp | 8 +- .../behavior/layout.cpp | 2 +- .../behavior/perf_counters.cpp | 4 +- .../behavior/set_blob_of_kind.cpp | 2 +- .../behavior/set_preprocess.cpp | 12 +- .../behavior/test_plugin.cpp | 24 +- .../behavior/version.cpp | 10 +- .../configuration_tests/dynamic_batch.cpp | 4 +- .../unique_node_names.cpp | 2 +- .../hetero/query_network.cpp | 2 +- .../add_transformation.cpp | 2 +- .../clamp_transformation.cpp | 2 +- .../concat_transformation.cpp | 2 +- .../concat_with_child_and_output.cpp | 2 +- ...t_with_different_precision_on_children.cpp | 2 +- ...oncat_with_intermediate_transformation.cpp | 2 +- ...at_with_neighbors_graph_transformation.cpp | 2 +- .../concat_with_split_transformation.cpp | 2 +- ...nvolution_backprop_data_transformation.cpp | 2 +- .../convolution_qdq_transformation.cpp | 2 +- .../convolution_transformation.cpp | 4 +- .../depth_to_space_transformation.cpp | 4 +- ...e_quantize_and_avg_pool_transformation.cpp | 2 +- ...e_quantize_and_max_pool_transformation.cpp | 2 +- ...d_two_output_branches_with_convolution.cpp | 2 +- ...ize_precision_selection_transformation.cpp | 2 +- .../fake_quantize_transformation.cpp | 2 +- ...ize_with_dq_not_optimal_transformation.cpp | 2 +- .../fully_connected_transformation.cpp | 2 +- .../fuse_convert_transformation.cpp | 2 +- ...uantize_and_scale_shift_transformation.cpp | 2 +- .../fuse_fake_quantize_transformation.cpp | 2 +- ...ltiply_to_fake_quantize_transformation.cpp | 2 +- ...btract_to_fake_quantize_transformation.cpp | 2 +- .../gemm_transformation.cpp | 2 +- .../group_convolution_transformation.cpp | 2 +- .../groupconvolution_qdq_transformation.cpp | 2 +- .../interpolate_transformation.cpp | 2 +- .../mat_mul_transformation.cpp | 2 +- .../mat_mul_with_constant_transformation.cpp | 2 +- ..._constant_fake_quantize_transformation.cpp | 2 +- ...ly_to_group_convolution_transformation.cpp | 2 +- .../multiply_transformation.cpp | 2 +- ...ultiply_with_one_parent_transformation.cpp | 2 +- .../mvn_transformation.cpp | 2 +- .../normalize_transformation.cpp | 2 +- ...put_layers_handling_in_transformations.cpp | 2 +- ...handling_in_transformations_for_concat.cpp | 2 +- ...ansformations_for_concat_multi_channel.cpp | 2 +- .../prelu_transformation.cpp | 2 +- ..._through_dequantization_transformation.cpp | 2 +- .../reduce_max_transformation.cpp | 2 +- .../reduce_mean_transformation.cpp | 2 +- .../reduce_min_transformation.cpp | 2 +- .../reduce_sum_transformation.cpp | 2 +- .../relu_transformation.cpp | 2 +- .../reshape_transformation.cpp | 2 +- .../shuffle_channels_transformation.cpp | 2 +- .../split_transformation.cpp | 2 +- .../squeeze_transformation.cpp | 2 +- .../strided_slice_transformation.cpp | 2 +- ...ultiply_to_multiply_add_transformation.cpp | 2 +- .../subtract_transformation.cpp | 2 +- .../transpose_after_matmul_transformation.cpp | 2 +- .../transpose_transformation.cpp | 2 +- .../unsqueeze_transformation.cpp | 2 +- .../variadic_split_transformation.cpp | 2 +- .../multi/gpu_remote_blob_tests.cpp | 4 +- .../conv_bias_fusion.cpp | 2 +- .../plugin_specific_ngraph_conversion.cpp | 2 +- .../single_layer_tests/activation.cpp | 6 +- .../single_layer_tests/batch_norm.cpp | 2 +- .../single_layer_tests/batch_to_space.cpp | 2 +- .../single_layer_tests/broadcast.cpp | 14 +- .../single_layer_tests/comparison.cpp | 2 +- .../single_layer_tests/concat.cpp | 2 +- .../single_layer_tests/convert.cpp | 2 +- .../single_layer_tests/convert_like.cpp | 2 +- .../single_layer_tests/convolution.cpp | 6 +- .../convolution_backprop_data.cpp | 16 +- .../single_layer_tests/ctc_greedy_decoder.cpp | 2 +- .../ctc_greedy_decoder_seq_len.cpp | 4 +- .../single_layer_tests/cum_sum.cpp | 4 +- .../single_layer_tests/depth_to_space.cpp | 4 +- .../single_layer_tests/detection_output.cpp | 4 +- .../single_layer_tests/eltwise.cpp | 2 +- .../embedding_bag_offsets_sum.cpp | 2 +- .../embedding_bag_packed_sum.cpp | 2 +- .../embedding_segments_sum.cpp | 2 +- .../extract_image_patches.cpp | 2 +- .../single_layer_tests/fake_quantize.cpp | 2 +- .../single_layer_tests/gather.cpp | 28 +- .../single_layer_tests/gather_nd.cpp | 6 +- .../single_layer_tests/gather_tree.cpp | 2 +- .../single_layer_tests/grn.cpp | 2 +- .../single_layer_tests/group_convolution.cpp | 8 +- .../group_convolution_backprop_data.cpp | 8 +- .../single_layer_tests/gru_cell.cpp | 2 +- .../single_layer_tests/gru_sequence.cpp | 4 +- .../single_layer_tests/interpolate.cpp | 4 +- .../single_layer_tests/log_softmax.cpp | 4 +- .../single_layer_tests/logical.cpp | 4 +- .../single_layer_tests/lrn.cpp | 2 +- .../single_layer_tests/lstm_cell.cpp | 4 +- .../single_layer_tests/lstm_sequence.cpp | 6 +- .../single_layer_tests/mat_mul.cpp | 2 +- .../single_layer_tests/minimum_maximum.cpp | 2 +- .../single_layer_tests/mvn.cpp | 18 +- .../non_max_suppression.cpp | 2 +- .../single_layer_tests/normalize_l2.cpp | 2 +- .../single_layer_tests/pad.cpp | 8 +- .../single_layer_tests/pooling.cpp | 10 +- .../single_layer_tests/power.cpp | 2 +- .../prior_box_clustered.cpp | 2 +- .../single_layer_tests/proposal.cpp | 2 +- .../single_layer_tests/reduce_ops.cpp | 16 +- .../single_layer_tests/region_yolo.cpp | 6 +- .../single_layer_tests/reorg_yolo.cpp | 12 +- .../single_layer_tests/reshape.cpp | 6 +- .../single_layer_tests/reverse_sequence.cpp | 2 +- .../single_layer_tests/rnn_cell.cpp | 2 +- .../single_layer_tests/rnn_sequence.cpp | 4 +- .../scatter_elements_update.cpp | 2 +- .../single_layer_tests/scatter_nd_update.cpp | 2 +- .../single_layer_tests/scatter_update.cpp | 2 +- .../single_layer_tests/select.cpp | 4 +- .../single_layer_tests/shuffle_channels.cpp | 8 +- .../single_layer_tests/softmax.cpp | 4 +- .../single_layer_tests/space_to_batch.cpp | 2 +- .../single_layer_tests/space_to_depth.cpp | 4 +- .../single_layer_tests/split.cpp | 4 +- .../single_layer_tests/squeeze_unsqueeze.cpp | 4 +- .../single_layer_tests/strided_slice.cpp | 4 +- .../single_layer_tests/tile.cpp | 4 +- .../single_layer_tests/topk.cpp | 2 +- .../single_layer_tests/transpose.cpp | 6 +- .../single_layer_tests/variadic_split.cpp | 2 +- .../subgraph_tests/constant_result.cpp | 2 +- .../get_output_before_activation.cpp | 2 +- .../subgraph_tests/matmul_squeeze_add.cpp | 2 +- .../subgraph_tests/multiply_add.cpp | 2 +- .../subgraph_tests/parameter_result.cpp | 2 +- .../subgraph_tests/perm_conv_perm_concat.cpp | 2 +- .../quantized_convolution_backprop_data.cpp | 4 +- ...ntized_group_convolution_backprop_data.cpp | 4 +- .../subgraph_tests/reduce_eltwise.cpp | 6 +- ...shape_permute_conv_permute_reshape_act.cpp | 2 +- .../reshape_squeeze_reshape_relu.cpp | 2 +- .../subgraph_tests/scale_shift.cpp | 2 +- .../subgraph_tests/split_conv_concat.cpp | 2 +- .../subgraph_tests/tensor_names.cpp | 2 +- .../single_layer_tests/tensor_iterator.cpp | 2 +- .../operations/dynamic_shape_resolver.cpp | 12 +- .../operations/out_shape_of_reshape.cpp | 10 +- .../operations/static_shape_broadcast.cpp | 14 +- .../operations/static_shape_nonzero.cpp | 8 +- ...xtract_image_patches_to_reorg_yolo_vpu.cpp | 10 +- ...mic_to_static_shape_binary_elementwise.cpp | 2 +- .../dynamic_to_static_shape_broadcast.cpp | 4 +- .../dynamic_to_static_shape_clamp.cpp | 2 +- .../dynamic_to_static_shape_concat.cpp | 2 +- .../dynamic_to_static_shape_convert.cpp | 2 +- .../dynamic_to_static_shape_gather.cpp | 6 +- ...ynamic_to_static_shape_gather_elements.cpp | 2 +- .../dynamic_to_static_shape_gather_nd.cpp | 2 +- .../dynamic_to_static_shape_matmul.cpp | 2 +- ...ic_to_static_shape_non_max_suppression.cpp | 2 +- .../dynamic_to_static_shape_nonzero.cpp | 2 +- .../dynamic_to_static_shape_reduce.cpp | 4 +- .../dynamic_to_static_shape_reshape.cpp | 2 +- .../dynamic_to_static_shape_roialign.cpp | 6 +- .../dynamic_to_static_shape_scatter.cpp | 2 +- .../dynamic_to_static_shape_split.cpp | 2 +- .../dynamic_to_static_shape_squeeze.cpp | 2 +- .../dynamic_to_static_shape_topk.cpp | 4 +- .../dynamic_to_static_shape_transpose.cpp | 2 +- ...amic_to_static_shape_unary_elementwise.cpp | 2 +- .../dynamic_to_static_shape_unsqueeze.cpp | 2 +- ...dynamic_to_static_shape_variadic_split.cpp | 2 +- .../eliminate_shapeof_after_dsr.cpp | 6 +- .../behavior/caching_tests.cpp | 4 +- .../behavior/config.cpp | 26 +- .../behavior/core_integration.cpp | 42 +- .../behavior/core_threading_tests.cpp | 4 +- .../behavior/cpp_holders.cpp | 6 +- .../behavior/detect_network_batch_test.cpp | 2 +- .../behavior/exec_graph_info.cpp | 2 +- .../behavior/infer_request.cpp | 4 +- .../behavior/infer_request_callback.cpp | 4 +- .../behavior/infer_request_config.cpp | 8 +- .../behavior/infer_request_input.cpp | 4 +- .../behavior/infer_request_output.cpp | 4 +- .../behavior/layout.cpp | 2 +- .../behavior/query_network.cpp | 2 +- .../behavior/set_preprocess.cpp | 8 +- .../behavior/stress_tests.cpp | 2 +- .../behavior/test_plugin.cpp | 12 +- .../behavior/version.cpp | 6 +- .../import_export_tests/import_nonzero.cpp | 2 +- .../myriad_remote_blobs_tests.cpp | 2 +- .../single_layer_tests/activation.cpp | 2 +- .../single_layer_tests/comparison.cpp | 4 +- .../single_layer_tests/concat.cpp | 2 +- .../single_layer_tests/convolution.cpp | 6 +- .../ctc_greedy_decoder_seq_len.cpp | 2 +- .../single_layer_tests/eltwise.cpp | 4 +- .../single_layer_tests/gather_elements.cpp | 4 +- .../single_layer_tests/gather_nd.cpp | 2 +- .../single_layer_tests/interpolate.cpp | 14 +- .../single_layer_tests/logical.cpp | 4 +- .../single_layer_tests/mat_mul.cpp | 2 +- .../single_layer_tests/minimum_maximum.cpp | 2 +- .../single_layer_tests/mvn.cpp | 4 +- .../single_layer_tests/nonzero.cpp | 2 +- .../single_layer_tests/pad.cpp | 8 +- .../single_layer_tests/pooling.cpp | 12 +- .../single_layer_tests/proposal.cpp | 2 +- .../single_layer_tests/roi_pooling.cpp | 4 +- .../single_layer_tests/split.cpp | 4 +- .../single_layer_tests/strided_slice.cpp | 2 +- .../single_layer_tests/topk.cpp | 4 +- .../subgraph_tests/constant_result.cpp | 2 +- .../reshape_squeeze_reshape_relu.cpp | 2 +- .../subgraph_tests/split_conv_concat.cpp | 2 +- .../subgraph_tests/tensor_names.cpp | 2 +- .../myriad/single_layer_tests/gather.cpp | 2 +- .../out_shape_of_reshape.cpp | 2 +- .../static_shape_broadcast.cpp | 2 +- .../single_layer_tests/static_shape_nms.cpp | 8 +- .../static_shape_nonzero.cpp | 2 +- .../subgraph_tests/concat_split_transpose.cpp | 2 +- .../subgraph_tests/dsr_binary_elementwise.cpp | 12 +- .../myriad/subgraph_tests/dsr_clamp.cpp | 2 +- .../myriad/subgraph_tests/dsr_concat.cpp | 2 +- .../myriad/subgraph_tests/dsr_convert.cpp | 2 +- .../myriad/subgraph_tests/dsr_gather.cpp | 6 +- .../subgraph_tests/dsr_gather_elements.cpp | 2 +- .../myriad/subgraph_tests/dsr_gather_nd.cpp | 6 +- .../myriad/subgraph_tests/dsr_matmul.cpp | 2 +- .../dsr_non_max_suppression.cpp | 2 +- .../myriad/subgraph_tests/dsr_reduce.cpp | 4 +- .../myriad/subgraph_tests/dsr_reshape.cpp | 4 +- .../myriad/subgraph_tests/dsr_roialign.cpp | 6 +- .../myriad/subgraph_tests/dsr_scatter.cpp | 2 +- .../myriad/subgraph_tests/dsr_split.cpp | 2 +- .../myriad/subgraph_tests/dsr_squeeze.cpp | 2 +- .../subgraph_tests/dsr_strided_slice.cpp | 2 +- .../plugin/myriad/subgraph_tests/dsr_topk.cpp | 4 +- .../subgraph_tests/dsr_unary_elementwise.cpp | 2 +- .../myriad/subgraph_tests/dsr_unsqueeze.cpp | 2 +- .../subgraph_tests/dsr_variadic_split.cpp | 2 +- .../subgraph_tests/gather_gather_elements.cpp | 2 +- .../myriad/subgraph_tests/nms_nonzero.cpp | 2 +- .../subgraph_tests/nonzero_broadcast.cpp | 2 +- .../subgraph_tests/nonzero_transpose.cpp | 2 +- .../subgraph_tests/parameter_result.cpp | 2 +- .../parameter_shapeof_result.cpp | 2 +- .../subgraph_tests/topk_k_propagation.cpp | 12 +- .../subgraph_tests/unsqueeze_gather.cpp | 2 +- .../shared/src/behavior/caching_tests.cpp | 10 +- .../single_layer/non_max_suppression.hpp | 10 + .../tests/ie_test_utils/CMakeLists.txt | 4 +- .../common_test_utils/CMakeLists.txt | 66 +- .../common_test_utils/common_utils.cpp | 5 + .../common_test_utils/common_utils.hpp | 5 + .../ie_test_utils/common_test_utils/gtest | 1 - .../ie_test_utils/unit_test_utils/mock.cpp | 1 + .../cpp_interfaces/interface/mock_icore.hpp | 14 +- .../interface/mock_iinference_plugin.hpp | 20 +- .../unit_test_utils/mocks/mock_allocator.hpp | 8 +- .../mocks/mock_icnn_network.hpp | 40 +- .../mocks/mock_iexecutable_network.hpp | 24 +- .../mocks/mock_iinfer_request.hpp | 30 +- .../mocks/mock_not_empty_icnn_network.hpp | 17 +- .../unit/cpu/mkldnn_memory_desc_test.cpp | 10 +- .../tests/unit/cpu/mkldnn_memory_test.cpp | 4 +- .../ie_infer_async_request_base_test.cpp | 3 +- .../ie_memory_state_internal_test.cpp | 9 +- .../tests/unit/vpu/blob_reader_tests.cpp | 6 +- .../passes_tests/annotate_memory_types.cpp | 2 +- .../vpu/myriad_tests/aot_behavior_tests.cpp | 2 +- .../vpu/myriad_tests/vpu_boot_tests.cpp | 2 +- .../vpu/myriad_tests/vpu_protocol_tests.cpp | 2 +- .../vpu/myriad_tests/vpu_watchdog_tests.cpp | 2 +- .../fluid_preproc/cpu/fluid_tests_cpu.cpp | 70 +- .../backward_compatibility.cpp | 2 +- .../input_tests/parser_tests.cpp | 2 +- .../io_blob_tests/cropResize_tests.hpp | 4 +- .../shared_tests/io_blob_tests/dims_tests.hpp | 4 +- .../io_blob_tests/layout_tests.hpp | 6 +- .../functional/shared_tests/lstm/plg_test.hpp | 4 +- .../shared_tests/lstm/rnn_seq_test.hpp | 2 +- .../layers/myriad_layers_CTCDecoder_test.cpp | 2 +- ...myriad_layers_batch_normalization_test.cpp | 2 +- .../common/layers/myriad_layers_bias_test.cpp | 2 +- .../common/layers/myriad_layers_blob_test.cpp | 6 +- .../layers/myriad_layers_clamp_test.cpp | 2 +- .../layers/myriad_layers_concat_test.cpp | 2 +- .../layers/myriad_layers_conv_nd_test.cpp | 30 +- .../layers/myriad_layers_convert_test.cpp | 6 +- .../layers/myriad_layers_convolution1x1.cpp | 2 +- .../layers/myriad_layers_convolution3x3.cpp | 2 +- .../layers/myriad_layers_convolution_test.cpp | 102 +- .../common/layers/myriad_layers_copy_test.cpp | 2 +- .../common/layers/myriad_layers_crop_test.cpp | 6 +- .../layers/myriad_layers_custom_test.cpp | 14 +- .../myriad_layers_deconvolution_test.cpp | 14 +- .../layers/myriad_layers_eltwise_test.cpp | 48 +- .../common/layers/myriad_layers_elu_test.cpp | 2 +- .../common/layers/myriad_layers_erf_test.cpp | 2 +- ...myriad_layers_exp_detectionoutput_test.cpp | 2 +- .../myriad_layers_exp_generateproposals.cpp | 2 +- ...iad_layers_exp_priorgridgenerator_test.cpp | 6 +- .../common/layers/myriad_layers_exp_test.cpp | 2 +- .../myriad_layers_exp_topkrois_test.cpp | 2 +- .../layers/myriad_layers_flatten_test.cpp | 2 +- .../layers/myriad_layers_floor_test.cpp | 2 +- .../myriad_layers_fully_connected_tests.cpp | 6 +- .../common/layers/myriad_layers_gemm_test.cpp | 2 +- .../common/layers/myriad_layers_grn_test.cpp | 2 +- .../layers/myriad_layers_interp_test.cpp | 2 +- .../common/layers/myriad_layers_log_test.cpp | 2 +- .../common/layers/myriad_layers_lrn_test.cpp | 2 +- .../common/layers/myriad_layers_lstm_cell.cpp | 4 +- .../common/layers/myriad_layers_mvn_test.cpp | 2 +- .../layers/myriad_layers_nonzero_test.cpp | 2 +- .../layers/myriad_layers_normalize_test.cpp | 4 +- .../layers/myriad_layers_oneHot_test.cpp | 4 +- .../common/layers/myriad_layers_pad_test.cpp | 2 +- .../layers/myriad_layers_permute_nd_test.cpp | 14 +- .../layers/myriad_layers_permute_test.cpp | 4 +- .../layers/myriad_layers_pool_nd_test.cpp | 44 +- .../layers/myriad_layers_pooling_test.cpp | 48 +- .../layers/myriad_layers_power_test.cpp | 2 +- .../layers/myriad_layers_prelu_test.cpp | 16 +- .../myriad_layers_psroipooling_test.cpp | 2 +- .../myriad_layers_psroipooling_test.hpp | 2 +- .../layers/myriad_layers_reduce_test.cpp | 10 +- .../layers/myriad_layers_region_test.cpp | 4 +- .../common/layers/myriad_layers_relu_test.cpp | 16 +- .../layers/myriad_layers_reorg_test.cpp | 4 +- .../layers/myriad_layers_resample_test.cpp | 4 +- .../layers/myriad_layers_reshape_test.cpp | 8 +- .../myriad_layers_reverse_sequence_test.cpp | 2 +- .../layers/myriad_layers_roi_align_test.cpp | 8 +- ...riad_layers_roi_feature_extractor_test.cpp | 4 +- .../layers/myriad_layers_roi_pooling_test.cpp | 4 +- .../layers/myriad_layers_scale_test.cpp | 2 +- ...ad_layers_scatter_elements_update_test.cpp | 4 +- .../myriad_layers_scatter_update_test.cpp | 4 +- .../layers/myriad_layers_select_test.cpp | 2 +- .../layers/myriad_layers_sigmoid_test.cpp | 10 +- .../layers/myriad_layers_slice_test.cpp | 2 +- .../layers/myriad_layers_softmax_test.cpp | 2 +- .../layers/myriad_layers_split_test.cpp | 2 +- .../layers/myriad_layers_squeeze_test.cpp | 10 +- .../myriad_layers_strided_slice_test.cpp | 2 +- .../common/layers/myriad_layers_tanh_test.cpp | 10 +- .../common/layers/myriad_layers_tile_test.cpp | 4 +- .../common/layers/myriad_layers_topk_test.cpp | 2 +- .../layers/myriad_layers_unsqueeze_test.cpp | 2 +- .../vpu/common/myriad_get_output_tests.cpp | 2 +- .../vpu/common/myriad_hw_conv_tests.hpp | 130 +- .../vpu/common/myriad_hw_extra_tests.hpp | 20 +- .../vpu/common/myriad_hw_fc_tests.hpp | 28 +- .../vpu/common/myriad_hw_network_tests.hpp | 4 +- .../vpu/common/myriad_hw_pool_tests.hpp | 60 +- .../vpu/common/myriad_merge_permute_tests.cpp | 6 +- .../regression/helpers/vpu_case_common.hpp | 8 +- .../merge_permute_and_reorder_test.cpp | 4 +- .../vpu/myriad_tests/myriad_configs_tests.cpp | 8 +- .../myriad_multiple_graph_tests.cpp | 2 +- .../myriad_streams_configuration_tests.cpp | 2 +- .../single_layer_tests.cpp | 6 +- .../input_tests/parser_tests.cpp | 2 +- .../vpu/vpu_base/vpu_tests_config.hpp | 4 +- .../helpers/tests_vpu_common.hpp | 2 +- .../engines/gna/fp32_non_quantized_tests.cpp | 2 +- .../engines/gna/gna_input_precision_test.cpp | 2 +- .../unit/engines/gna/gna_matcher.cpp | 2 +- .../unit/engines/gna/gna_proc_type_test.cpp | 2 +- .../engines/gna/layers/activation_test.cpp | 2 +- .../gna/layers/gna_align_filter2_tests.cpp | 2 +- .../engines/gna/layers/gna_conv1d_test.cpp | 2 +- .../engines/gna/layers/gna_eltwise_test.cpp | 2 +- .../layers/gna_multi_input_to_concat_test.cpp | 2 +- .../engines/gna/layers/gna_permute_test.cpp | 2 +- .../gna/layers/gna_split_to_concat_test.cpp | 2 +- .../engines/gna/layers/gna_squeeze_test.cpp | 4 +- .../unit/engines/vpu/merge_parallel_fc.cpp | 4 +- .../vpu/mvnc/pthread_semaphore_tests.cpp | 2 +- .../unit/engines/vpu/mvnc/watchdog_tests.cpp | 8 +- .../engines/vpu/mvnc/xlink_device_tests.cpp | 2 +- .../myriad_tests/helpers/myriad_mvnc_stub.h | 4 +- .../vpu/myriad_tests/myriad_engine_tests.cpp | 18 +- .../vpu/myriad_tests/myriad_metrics_tests.cpp | 6 +- .../unit/graph_tools/graph_copy_tests.cpp | 4 +- .../unit/graph_tools/graph_tools_test.cpp | 4 +- .../get_num_iterations_test.cpp | 18 +- .../thirdparty/clDNN/CMakeLists.txt | 3 - .../clDNN/common/googletest-fused/License.txt | 28 - .../googletest-fused/gmock-gtest-all.cc | 13278 ---------- .../common/googletest-fused/gmock/gmock.h | 16697 ------------ .../common/googletest-fused/gtest/gtest.h | 21575 ---------------- .../clDNN/common/googletest-fused/version.txt | 4 - .../thirdparty/clDNN/tests/CMakeLists.txt | 18 +- .../module_tests/test_uqr_distribution.cpp | 2 +- .../tests/module_tests/usm_memory_test.cpp | 12 +- .../binary_convolution_gpu_test.cpp | 4 +- .../clDNN/tests/test_cases/cache_test.cpp | 2 +- .../test_cases/concatenation_gpu_test.cpp | 10 +- .../tests/test_cases/convolution_gpu_test.cpp | 24 +- .../clDNN/tests/test_cases/crop_gpu_test.cpp | 4 +- .../tests/test_cases/cum_sum_gpu_test.cpp | 24 +- .../test_cases/deconvolution_gpu_test.cpp | 6 +- .../test_cases/depth_concatenate_gpu_test.cpp | 2 +- .../test_cases/detection_output_test.cpp | 2 +- .../tests/test_cases/eltwise_gpu_test.cpp | 24 +- .../test_cases/fully_connected_gpu_test.cpp | 52 +- .../tests/test_cases/fusings_gpu_test.cpp | 544 +- .../clDNN/tests/test_cases/gemm_gpu_test.cpp | 60 +- .../test_cases/lstm_dynamic_gpu_test.cpp | 4 +- .../clDNN/tests/test_cases/mvn_gpu_test.cpp | 12 +- .../test_cases/non_max_suppression_test.cpp | 2 +- .../tests/test_cases/permute_gpu_test.cpp | 8 +- .../tests/test_cases/pooling_gpu_test.cpp | 10 +- .../test_cases/pyramid_roi_align_gpu_test.cpp | 2 +- .../tests/test_cases/reduce_gpu_test.cpp | 14 +- .../tests/test_cases/reorder_gpu_test.cpp | 2 +- .../tests/test_cases/resample_gpu_test.cpp | 12 +- .../tests/test_cases/softmax_gpu_test.cpp | 2 +- .../clDNN/tests/test_cases/topology_test.cpp | 2 +- .../clDNN/tests/test_utils/network_test.h | 2 +- .../movidius/mvnc/tests/mvnc_stress_tests.cpp | 2 +- .../movidius/mvnc/tests/mvnc_tests_common.cpp | 8 +- .../movidius/mvnc/tests/mvnc_tests_usb.cpp | 2 +- .../tests/XLink/XLink_common_tests.cpp | 16 +- tests/stress_tests/memcheck_tests/tests.cpp | 2 +- tests/stress_tests/memleaks_tests/tests.cpp | 6 +- tests/stress_tests/unittests/tests.cpp | 6 +- thirdparty/CMakeLists.txt | 56 +- thirdparty/gtest | 1 + 992 files changed, 2923 insertions(+), 54492 deletions(-) delete mode 160000 inference-engine/tests/ie_test_utils/common_test_utils/gtest delete mode 100644 inference-engine/thirdparty/clDNN/common/googletest-fused/License.txt delete mode 100644 inference-engine/thirdparty/clDNN/common/googletest-fused/gmock-gtest-all.cc delete mode 100644 inference-engine/thirdparty/clDNN/common/googletest-fused/gmock/gmock.h delete mode 100644 inference-engine/thirdparty/clDNN/common/googletest-fused/gtest/gtest.h delete mode 100644 inference-engine/thirdparty/clDNN/common/googletest-fused/version.txt create mode 160000 thirdparty/gtest diff --git a/.gitmodules b/.gitmodules index dad6d39352d..58650288430 100644 --- a/.gitmodules +++ b/.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 diff --git a/docs/IE_PLUGIN_DG/PluginTesting.md b/docs/IE_PLUGIN_DG/PluginTesting.md index 0aae6280601..e2aabeff32e 100644 --- a/docs/IE_PLUGIN_DG/PluginTesting.md +++ b/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 diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/caching_tests.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/caching_tests.cpp index f61e4c54d7e..a698d72e526 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/caching_tests.cpp +++ b/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), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/config.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/config.cpp index fad461c814d..34e0eb46eac 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/config.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/config.cpp @@ -24,14 +24,14 @@ const std::vector> 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), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/core_integration.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/core_integration.cpp index 2b669a6520a..2c067aaf7b6 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/core_integration.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/core_integration.cpp @@ -16,11 +16,11 @@ namespace { // IE Class Common tests with // -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)); diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/cpp_holders.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/cpp_holders.cpp index 8a2ee657b79..7c372c708ad 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/cpp_holders.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/cpp_holders.cpp @@ -20,19 +20,19 @@ const std::vector> 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); diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/exec_graph_info.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/exec_graph_info.cpp index a0aa412fb0d..597e029fc5b 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/exec_graph_info.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/exec_graph_info.cpp @@ -19,7 +19,7 @@ const std::vector> 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), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request.cpp index 2b39ef54005..edb803a614f 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request.cpp @@ -19,7 +19,7 @@ const std::vector> 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), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_callback.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_callback.cpp index 8fd635ae8bf..3bc9d1f6f02 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_callback.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_callback.cpp @@ -19,7 +19,7 @@ const std::vector> 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), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_config.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_config.cpp index 3ee70738e5a..a6ffbe80bbc 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_config.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_config.cpp @@ -19,7 +19,7 @@ const std::vector> 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), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_input.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_input.cpp index dde2fa6d2cd..23d5cb7136f 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_input.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_input.cpp @@ -17,7 +17,7 @@ const std::vector> 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), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_output.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_output.cpp index 9c8a24413fa..eae52cec60c 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_output.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/infer_request_output.cpp @@ -17,7 +17,7 @@ const std::vector> 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), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/layout.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/layout.cpp index c5770ede2a0..f4d8091b20e 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/layout.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/layout.cpp @@ -26,7 +26,7 @@ const std::vector> 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), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/preprocessing.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/preprocessing.cpp index 29651f6da34..4aa9439b1ad 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/preprocessing.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/preprocessing.cpp @@ -17,7 +17,7 @@ const std::vector> 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) diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/set_preprocess.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/set_preprocess.cpp index a33bcd7638c..19841bb64da 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/set_preprocess.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/set_preprocess.cpp @@ -26,21 +26,21 @@ const std::vector> 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 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(), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/test_plugin.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/test_plugin.cpp index 8d65895bc36..b8d5e9bc9bd 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/test_plugin.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/test_plugin.cpp @@ -17,21 +17,21 @@ const std::vector> 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), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/version.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/version.cpp index 818a627a519..8b22d2eb240 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/behavior/version.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/behavior/version.cpp @@ -12,7 +12,7 @@ const std::vector> 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), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/hetero/query_network.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/hetero/query_network.cpp index b369e55adf2..64b88ea714f 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/hetero/query_network.cpp +++ b/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)), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/hetero/synthetic.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/hetero/synthetic.cpp index 15f940780dd..164d959e408 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/hetero/synthetic.cpp +++ b/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{{"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{{"TEMPLATE0", "templatePlugin"}, {"TEMPLATE1", "templatePlugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_randomMajorNodeFunctions)), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp index 3f6d9c49406..c099cb3d5d4 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/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), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp index e0c986ad8b5..d95ecdd81c8 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp +++ b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/reshape.cpp @@ -15,7 +15,7 @@ const std::vector 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({}))), 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({}))), ReshapeLayerTestRevise::getTestCaseName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReshapeCheckNegative, ReshapeLayerTestRevise, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp index 3ad1b07c736..583d2d7b81e 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/softmax.cpp +++ b/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()) ); -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()) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_SoftMax4D, SoftMaxLayerTest, params4D, diff --git a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/split.cpp b/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/split.cpp index 44f2c673778..f4ea3db8af9 100644 --- a/docs/template_plugin/tests/functional/shared_tests_instances/single_layer_tests/split.cpp +++ b/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), diff --git a/inference-engine/src/gna_plugin/optimizer/gna_pass_manager.cpp b/inference-engine/src/gna_plugin/optimizer/gna_pass_manager.cpp index ac01a2324c9..5b0fbcd297d 100644 --- a/inference-engine/src/gna_plugin/optimizer/gna_pass_manager.cpp +++ b/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; } diff --git a/inference-engine/tests/functional/inference_engine/blob_copy_test.cpp b/inference-engine/tests/functional/inference_engine/blob_copy_test.cpp index 1968c4cb91d..d6356f154d0 100644 --- a/inference-engine/tests/functional/inference_engine/blob_copy_test.cpp +++ b/inference-engine/tests/functional/inference_engine/blob_copy_test.cpp @@ -320,7 +320,7 @@ std::vector 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))); diff --git a/inference-engine/tests/functional/inference_engine/caching_test.cpp b/inference-engine/tests/functional/inference_engine/caching_test.cpp index cad8bd4428e..4f27b8abaf9 100644 --- a/inference-engine/tests/functional/inference_engine/caching_test.cpp +++ b/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)), diff --git a/inference-engine/tests/functional/inference_engine/cnn_network/matmul_sr_tests.cpp b/inference-engine/tests/functional/inference_engine/cnn_network/matmul_sr_tests.cpp index a013ac8c902..33940bfab6d 100644 --- a/inference-engine/tests/functional/inference_engine/cnn_network/matmul_sr_tests.cpp +++ b/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}}}}, diff --git a/inference-engine/tests/functional/inference_engine/ir_serialization/serialize.cpp b/inference-engine/tests/functional/inference_engine/ir_serialization/serialize.cpp index 990fa74c183..c9efc087a31 100644 --- a/inference-engine/tests/functional/inference_engine/ir_serialization/serialize.cpp +++ b/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", ""), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/add_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/add_transformation.cpp index 8098b89e73c..2644d58470f 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/add_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/add_transformation.cpp @@ -807,7 +807,7 @@ const std::vector addTransformationTestValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, AddTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/avg_pool_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/avg_pool_transformation.cpp index 94d0abed429..1e200cba655 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/avg_pool_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/avg_pool_transformation.cpp @@ -336,7 +336,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, AvgPoolTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/clamp_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/clamp_transformation.cpp index d2785e355a4..994fe9a644e 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/clamp_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/clamp_transformation.cpp @@ -451,7 +451,7 @@ const std::vector testValues = { true // non dequantization multiply }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ClampTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/compose_fake_quantize_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/compose_fake_quantize_transformation.cpp index ce66f1848e0..247569a9573 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/compose_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/compose_fake_quantize_transformation.cpp @@ -140,7 +140,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ComposeFakeQuantizeTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_selection_with_intermediate_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_selection_with_intermediate_transformation.cpp index 8f553ac5fd6..cadf373676c 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_selection_with_intermediate_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_selection_with_intermediate_transformation.cpp @@ -173,7 +173,7 @@ const std::vector testValues = { } }; - INSTANTIATE_TEST_CASE_P( + INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConcatSelectionWithIntermediateTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_transformation.cpp index c199e60fbfd..fd50c03c1c5 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_transformation.cpp @@ -737,7 +737,7 @@ const std::vector shapes = { { 4, 3, 9, 9 } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConcatTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_different_precision_on_children.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_different_precision_on_children.cpp index dc2567fb70d..53fddd1e39d 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_different_precision_on_children.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_different_precision_on_children.cpp @@ -237,7 +237,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConcatWithDifferentChildrenTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_precision_selection_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_precision_selection_transformation.cpp index 0d6b29d5fe5..82afd2c7fe3 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_precision_selection_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_precision_selection_transformation.cpp @@ -306,7 +306,7 @@ const std::vector shapes = { { 4, 3, 9, 9 } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConcatWithIntermediatePrecisionSelectionTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_reshape_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_reshape_transformation.cpp index ea537db49cf..a56c34ce08a 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_reshape_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_reshape_transformation.cpp @@ -133,7 +133,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConcatWithIntermediateReshapeTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_transformation.cpp index 974111bdae8..5963cbb8fd3 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_transformation.cpp @@ -292,7 +292,7 @@ const std::vector shapes = { { 4, 3, 9, 9 } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConcatWithIntermediateTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_with_constant_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_with_constant_transformation.cpp index 7ddf74cd52a..0a6b0cbdc7c 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_with_constant_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_intermediate_with_constant_transformation.cpp @@ -309,7 +309,7 @@ const std::vector shapes = { { 4, 3, 9, 9 } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConcatWithIntermediateWithConstantTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_neighbors_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_neighbors_transformation.cpp index c099b523b39..7a8098a996b 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_neighbors_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_neighbors_transformation.cpp @@ -344,7 +344,7 @@ const std::vector shapes = { { 4, 3, 9, 9 } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConcatWithNeighborsTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_reshape_at_the_end_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_reshape_at_the_end_transformation.cpp index 8f2f17a00f8..599e4f2c0bc 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_reshape_at_the_end_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_reshape_at_the_end_transformation.cpp @@ -206,7 +206,7 @@ const std::vector shapes = { { 4, 3, 9, 9 } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConcatWithReshapeAtTheEndTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_split_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_split_transformation.cpp index 5f966576594..de12ada6591 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_split_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_split_transformation.cpp @@ -300,7 +300,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConcatWithSplitTransformation, ::testing::Combine( @@ -334,7 +334,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConcatWithSplitTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_strided_slice_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_strided_slice_transformation.cpp index f11f20da124..72dd960dbc4 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_strided_slice_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/concat_with_strided_slice_transformation.cpp @@ -273,7 +273,7 @@ const std::vector shapes = { { 4, 4, 9, 9 } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConcatWithStridedSliceTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/convert_mul_or_add_finally_transformation_with_dequantization.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/convert_mul_or_add_finally_transformation_with_dequantization.cpp index 585f57c707e..edb4e813b7f 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/convert_mul_or_add_finally_transformation_with_dequantization.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/convert_mul_or_add_finally_transformation_with_dequantization.cpp @@ -109,7 +109,7 @@ std::vector te } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConvertMulOrAddFinallyTransformationWithDequantization, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/convert_subtract_constant_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/convert_subtract_constant_transformation.cpp index d908a6c6c9f..235c6f77e26 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/convert_subtract_constant_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/convert_subtract_constant_transformation.cpp @@ -324,7 +324,7 @@ const std::vector testValues = }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConvertSubtractConstantTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_backprop_data_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_backprop_data_transformation.cpp index 10ba4513f20..eb62cd89b24 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_backprop_data_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_backprop_data_transformation.cpp @@ -445,7 +445,7 @@ const std::vector testValues = }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConvolutionBackpropDataTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_qdq_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_qdq_transformation.cpp index 75b1d965e53..6812b00c1da 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_qdq_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_qdq_transformation.cpp @@ -495,7 +495,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConvolutionQDqTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_transformation.cpp index 8c2d42dfbf3..bad2201a65d 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_transformation.cpp @@ -424,7 +424,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConvolutionTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_with_incorrect_weights.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_with_incorrect_weights.cpp index b85c333928f..7a6b43bc547 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_with_incorrect_weights.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/convolution_with_incorrect_weights.cpp @@ -130,7 +130,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ConvolutionWIthIncorrectWeightsTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/depth_to_space_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/depth_to_space_transformation.cpp index afbc2346c0f..8ba97cb1e0e 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/depth_to_space_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/depth_to_space_transformation.cpp @@ -244,7 +244,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, DepthToSpaceTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/disable_convert_on_const_path_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/disable_convert_on_const_path_transformation.cpp index 23396b71cda..5a2fbe0f39a 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/disable_convert_on_const_path_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/disable_convert_on_const_path_transformation.cpp @@ -161,7 +161,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, DisableConvertOnConstPathTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/elementwise_with_multi_parent_dequantization_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/elementwise_with_multi_parent_dequantization_transformation.cpp index 6945e3ed1c0..415301ec850 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/elementwise_with_multi_parent_dequantization_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/elementwise_with_multi_parent_dequantization_transformation.cpp @@ -154,7 +154,7 @@ const std::vector shapes = { // TODO: 3D tensor }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_on_weights_with_unsupported_child.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_on_weights_with_unsupported_child.cpp index f430adb5974..b29eff3926e 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_on_weights_with_unsupported_child.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_on_weights_with_unsupported_child.cpp @@ -119,7 +119,7 @@ const std::vector testValue }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, FakeQuantizeOnWeightsWithUnsupportedChild, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_precision_selection_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_precision_selection_transformation.cpp index 5bbf9363792..c0db76cfd24 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_precision_selection_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_precision_selection_transformation.cpp @@ -193,7 +193,7 @@ const std::vector shapes = { // TODO: 3D tensor }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, FakeQuantizePrecisionSelectionTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_transformation.cpp index 9ec593b6371..7154009ff6f 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_transformation.cpp @@ -222,7 +222,7 @@ const std::vector shapes = { // TODO: 3D tensor }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, FakeQuantizeTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index b057615dcad..a67d10ed8bf 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -205,7 +205,7 @@ const std::vector shapes = { // TODO: 3D tensor }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, FakeQuantizeWithNotOptimalTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_with_dynamic_intervals_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_with_dynamic_intervals_transformation.cpp index e7955f99871..77513ca6b92 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_with_dynamic_intervals_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/fake_quantize_with_dynamic_intervals_transformation.cpp @@ -157,7 +157,7 @@ const std::vector fake const std::vector shapes = { { 1, 32, 72, 48 } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, FakeQuantizeWithDynamicIntervalsTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/fold_convert_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/fold_convert_transformation.cpp index 68b6e16b9a6..94a978e5825 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/fold_convert_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/fold_convert_transformation.cpp @@ -165,7 +165,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, FoldConvertTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/fold_fake_quantize_in_transformations.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/fold_fake_quantize_in_transformations.cpp index fe2b958d216..3be09188b8c 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/fold_fake_quantize_in_transformations.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/fold_fake_quantize_in_transformations.cpp @@ -206,7 +206,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, FoldFakeQuantizeInTransformations, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_convert_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_convert_transformation.cpp index 626b251ebfc..e3854ad12cd 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_convert_transformation.cpp +++ b/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), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_fake_quantize_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_fake_quantize_transformation.cpp index 100b166e92e..6b063c00875 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_fake_quantize_transformation.cpp @@ -342,7 +342,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, FuseFakeQuantizeTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_fake_quantize_with_multi_inputs_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_fake_quantize_with_multi_inputs_transformation.cpp index fcbb532a6f1..0f51338a464 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_fake_quantize_with_multi_inputs_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_fake_quantize_with_multi_inputs_transformation.cpp @@ -135,7 +135,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, FuseFakeQuantizeWithMultiInputsTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_multiply_to_fake_quantize_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_multiply_to_fake_quantize_transformation.cpp index bf0ce1b4484..2fe1093cd94 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_multiply_to_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_multiply_to_fake_quantize_transformation.cpp @@ -140,7 +140,7 @@ const std::vector testValues }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, FuseMultiplyToFakeQuantizeTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_subtract_to_fake_quantize_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_subtract_to_fake_quantize_transformation.cpp index 94016eb98f8..d65c313ebab 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_subtract_to_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/fuse_subtract_to_fake_quantize_transformation.cpp @@ -217,7 +217,7 @@ const std::vector testValues }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, FuseSubtractToFakeQuantizeTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/get_dequantization_below_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/get_dequantization_below_transformation.cpp index c92126b3252..53a803e88a9 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/get_dequantization_below_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/get_dequantization_below_transformation.cpp @@ -124,7 +124,7 @@ const std::vector shapes = { // TODO: 3D tensor }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, GetDequantizationBelowTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/get_dequantization_test.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/get_dequantization_test.cpp index 0260a46467a..3e6af62a937 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/get_dequantization_test.cpp +++ b/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), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/get_dequantization_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/get_dequantization_transformation.cpp index 7f527e21092..1e69ae86bc8 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/get_dequantization_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/get_dequantization_transformation.cpp @@ -155,7 +155,7 @@ const std::vector shapes = { // TODO: 3D tensor }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, GetDequantizationTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/group_convolution_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/group_convolution_transformation.cpp index 22844037c98..e8ba7d4e5f1 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/group_convolution_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/group_convolution_transformation.cpp @@ -702,7 +702,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, GroupConvolutionTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/interpolate_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/interpolate_transformation.cpp index 0e90edef6d7..74a78d350e0 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/interpolate_transformation.cpp +++ b/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), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/is_function_quantized_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/is_function_quantized_transformation.cpp index 860f7931cf6..b66b02eba31 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/is_function_quantized_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/is_function_quantized_transformation.cpp @@ -109,7 +109,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, IsFunctionQuantizedTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/mat_mul_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/mat_mul_transformation.cpp index 934326f9573..090c46bbd9a 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/mat_mul_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/mat_mul_transformation.cpp @@ -357,7 +357,7 @@ std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, MatMulTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/mat_mul_with_constant_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/mat_mul_with_constant_transformation.cpp index 5c4e171d504..35e2806fd63 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/mat_mul_with_constant_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/mat_mul_with_constant_transformation.cpp @@ -592,7 +592,7 @@ std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, MatMulWithConstantTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/max_pool_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/max_pool_transformation.cpp index c7c3bae73fc..f3c641b9af1 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/max_pool_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/max_pool_transformation.cpp @@ -208,7 +208,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, MaxPoolTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/move_dequantization_after_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/move_dequantization_after_transformation.cpp index c50375d14df..a9106994aa7 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/move_dequantization_after_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/move_dequantization_after_transformation.cpp @@ -256,7 +256,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, MoveDequantizationAfterTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/mul_add_to_scaleshift_or_power_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/mul_add_to_scaleshift_or_power_transformation.cpp index 14da96bd21b..0b32cedb351 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/mul_add_to_scaleshift_or_power_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/mul_add_to_scaleshift_or_power_transformation.cpp @@ -135,7 +135,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, MulAddToScaleshiftOrPowerTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/multiply_to_group_convolution_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/multiply_to_group_convolution_transformation.cpp index a7f4013c315..858041bba68 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/multiply_to_group_convolution_transformation.cpp +++ b/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), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/multiply_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/multiply_transformation.cpp index a17839f8d3c..7441cf29160 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/multiply_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/multiply_transformation.cpp @@ -727,7 +727,7 @@ const std::vector multiplyTransformationTestVa }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, MultiplyTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/mvn_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/mvn_transformation.cpp index ba90f89d3f4..40cb46151dc 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/mvn_transformation.cpp +++ b/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( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/normalize_dequantization_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/normalize_dequantization_transformation.cpp index 63592e5b35c..17a8b601f12 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/normalize_dequantization_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/normalize_dequantization_transformation.cpp @@ -163,7 +163,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, NormalizeDequantizationTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/normalize_l2_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/normalize_l2_transformation.cpp index 72e1c715ac6..6e34ea092d9 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/normalize_l2_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/normalize_l2_transformation.cpp @@ -269,7 +269,7 @@ const std::vector normalizeL2Transformation }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, NormalizeL2Transformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/prelu_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/prelu_transformation.cpp index bbe0e3bd9a2..66e6a161a7a 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/prelu_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/prelu_transformation.cpp @@ -159,7 +159,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, PReluTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/pull_reshape_through_dequantization_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/pull_reshape_through_dequantization_transformation.cpp index f00dcc62173..33a9b90cd54 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/pull_reshape_through_dequantization_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/pull_reshape_through_dequantization_transformation.cpp @@ -349,7 +349,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, PullReshapeThroughDequantizationTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/pull_transpose_through_dequantization_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/pull_transpose_through_dequantization_transformation.cpp index 5794ffc55e5..fd459eeb1d1 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/pull_transpose_through_dequantization_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/pull_transpose_through_dequantization_transformation.cpp @@ -237,7 +237,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, PullTransposeThroughDequantizationTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_max_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_max_transformation.cpp index 4d2ab19bdb3..23569ae8f80 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_max_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_max_transformation.cpp @@ -301,7 +301,7 @@ const std::vector reduceMaxTransformationTestVal }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ReduceMaxTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_mean_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_mean_transformation.cpp index 5a61b55f21b..1fbfbb4362d 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_mean_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_mean_transformation.cpp @@ -269,7 +269,7 @@ const std::vector reduceMeanTransformationTestVa }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ReduceMeanTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_min_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_min_transformation.cpp index 65a01088ab5..563a30ebdc6 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_min_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_min_transformation.cpp @@ -301,7 +301,7 @@ const std::vector reduceMinTransformationTestVal }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ReduceMinTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_sum_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_sum_transformation.cpp index 0dcf43331f0..95c9d8b5707 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_sum_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/reduce_sum_transformation.cpp @@ -293,7 +293,7 @@ const std::vector reduceSumTransformationTestVal }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ReduceSumTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/relu_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/relu_transformation.cpp index 090bf1b6aea..92ee87caa61 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/relu_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/relu_transformation.cpp @@ -234,7 +234,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ReluTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/reshape_fully_connected_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/reshape_fully_connected_transformation.cpp index a0ad21362ed..9c78d217897 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/reshape_fully_connected_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/reshape_fully_connected_transformation.cpp @@ -99,7 +99,7 @@ std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ReshapeFullyConnectedTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/reshape_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/reshape_transformation.cpp index c2ff5b59048..2ea6cb9f088 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/reshape_transformation.cpp +++ b/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), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/round_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/round_transformation.cpp index 04ff6e9f0d3..0612881bff3 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/round_transformation.cpp +++ b/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), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/separate_in_standalone_branch_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/separate_in_standalone_branch_transformation.cpp index 04832b837fe..a62be54c87f 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/separate_in_standalone_branch_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/separate_in_standalone_branch_transformation.cpp @@ -158,7 +158,7 @@ std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, SeparateInStandaloneBranchTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/shuffle_channels_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/shuffle_channels_transformation.cpp index 88a205089d6..d70f611b91d 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/shuffle_channels_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/shuffle_channels_transformation.cpp @@ -280,7 +280,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, ShuffleChannelsTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/split_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/split_transformation.cpp index b08d154c17c..89b5b166e8c 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/split_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/split_transformation.cpp @@ -456,7 +456,7 @@ const std::vector testValues = { { } }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, SplitTransformation, ::testing::Combine( diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/squeeze_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/squeeze_transformation.cpp index a753c972ba3..ffac08817e3 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/squeeze_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/squeeze_transformation.cpp @@ -223,7 +223,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, SqueezeTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/strided_slice_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/strided_slice_transformation.cpp index ca8f4a68518..028fa55a2cb 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/strided_slice_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/strided_slice_transformation.cpp @@ -535,7 +535,7 @@ const std::vector stridedSliceTransformati }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, StridedSliceTransformation, ::testing::ValuesIn(stridedSliceTransformationTestValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/subtract_multiply_to_multiply_add_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/subtract_multiply_to_multiply_add_transformation.cpp index e7a7ca81fbc..d854afe6428 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/subtract_multiply_to_multiply_add_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/subtract_multiply_to_multiply_add_transformation.cpp @@ -273,7 +273,7 @@ const std::vector testVal }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, SubtractMultiplyToMultiplyAddTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/transformations_after_split_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/transformations_after_split_transformation.cpp index d4e5b377305..0795c8d5101 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/transformations_after_split_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/transformations_after_split_transformation.cpp @@ -213,7 +213,7 @@ const std::vector transformationNames = { "SubtractMultiplyToMultiplyAddTransformation", }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, TransformationsAfterSplitTransformation, ::testing::ValuesIn(transformationNames), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/transformer_is_function_quantized.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/transformer_is_function_quantized.cpp index 1ad9e702d18..5a00bbc015c 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/transformer_is_function_quantized.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/transformer_is_function_quantized.cpp @@ -79,7 +79,7 @@ const std::vector testValues = { { {}, {} } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, TransformerIsFunctionQuantized, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/transpose_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/transpose_transformation.cpp index de8d2f780b8..ad07bcd6bc7 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/transpose_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/transpose_transformation.cpp @@ -202,7 +202,7 @@ TEST_P(TransposeTransformation, CompareFunctions) { ASSERT_TRUE(res.first) << res.second; } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, TransposeTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/unsqueeze_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/unsqueeze_transformation.cpp index 00359326fb0..2aa00c5cefd 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/unsqueeze_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/unsqueeze_transformation.cpp @@ -223,7 +223,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, UnsqueezeTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/lp_transformations/variadic_split_transformation.cpp b/inference-engine/tests/functional/inference_engine/lp_transformations/variadic_split_transformation.cpp index 990de4d98d7..b5075dfc7f4 100644 --- a/inference-engine/tests/functional/inference_engine/lp_transformations/variadic_split_transformation.cpp +++ b/inference-engine/tests/functional/inference_engine/lp_transformations/variadic_split_transformation.cpp @@ -464,7 +464,7 @@ const std::vector testValues = { { } }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LPT, VariadicSplitTransformation, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/ngraph_reader/net_reader_test.cpp b/inference-engine/tests/functional/inference_engine/ngraph_reader/net_reader_test.cpp index 3944a885382..d32b6ab07de 100644 --- a/inference-engine/tests/functional/inference_engine/ngraph_reader/net_reader_test.cpp +++ b/inference-engine/tests/functional/inference_engine/ngraph_reader/net_reader_test.cpp @@ -198,7 +198,7 @@ static const auto params = testing::Combine( testing::Values(InferenceEngine::SizeVector{1, 3, 227, 227}), testing::Values(InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( NetReaderTest, NetReaderTest, params, diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/activation.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/activation.cpp index ff6a32786c8..fb0c8acd71b 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/activation.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/activation.cpp @@ -99,11 +99,11 @@ const auto basicPreluCases = ::testing::Combine( ); -INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic, ActivationLayerTest, basicCases, ActivationLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic_Prelu, ActivationLayerTest, basicPreluCases, ActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation_Basic, ActivationLayerTest, basicCases, ActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation_Basic_Prelu, ActivationLayerTest, basicPreluCases, ActivationLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic, ActivationParamLayerTest, basicPreluCases, ActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation_Basic, ActivationParamLayerTest, basicPreluCases, ActivationLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic, ActivationDynamicLayerTest, basicCases, ActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation_Basic, ActivationDynamicLayerTest, basicCases, ActivationLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/batch_norm.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/batch_norm.cpp index cc1cbf7dff2..3f78aea438b 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/batch_norm.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/batch_norm.cpp @@ -45,7 +45,7 @@ const auto batchNormParams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_BatchNorm_Serialization, BatchNormLayerTest, batchNormParams, diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/binary_convolution.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/binary_convolution.cpp index 4ffae87a570..aa4f5c9eb3f 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/binary_convolution.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/binary_convolution.cpp @@ -37,7 +37,7 @@ const auto binConv2DParams_AutoPadValid = ::testing::Combine( ::testing::Values(ngraph::op::PadType::VALID), ::testing::ValuesIn(pad_values)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_BinaryConvolution2D_Serialization_ExplicitPadding, BinaryConvolutionLayerTest, ::testing::Combine( binConv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -49,7 +49,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(CommonTestUtils::DEVICE_CPU)), BinaryConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_BinaryConvolution2D__Serialization_AutoPadValid, BinaryConvolutionLayerTest, ::testing::Combine( binConv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/broadcast.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/broadcast.cpp index 1e101775319..0bfc51fa983 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/broadcast.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/broadcast.cpp @@ -27,7 +27,7 @@ const auto numpyBroadcastParams1 = ::testing::Combine( ::testing::Values(inShapesNumpy[0]), ::testing::ValuesIn(inputPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU)); -INSTANTIATE_TEST_CASE_P(smoke_Broadcast1Serialization, BroadcastLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Broadcast1Serialization, BroadcastLayerTest, numpyBroadcastParams1, BroadcastLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/clamp.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/clamp.cpp index 607989781e6..7bff8a3359a 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/clamp.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/clamp.cpp @@ -22,7 +22,7 @@ const std::vector netPrecisions = { const std::vector> intervals = { {-20.1, -10.5}, {-10.0, 10.0}, {10.3, 20.4}}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Clamp_Serialization, ClampLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/constant.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/constant.cpp index 4d4cce07bf0..0fc324f2bd6 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/constant.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/constant.cpp @@ -41,13 +41,13 @@ std::vector precisionsWithNegativeValues = { std::vector dataWithNegativeValues = {"1", "-2", "3", "-4", "5", "-6", "7", "-1", "2", "-3", "4", "-5"}; -INSTANTIATE_TEST_CASE_P(smoke_Constant_Serialization, ConstantLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Constant_Serialization, ConstantLayerTest, ::testing::Combine(::testing::ValuesIn(shapes), ::testing::ValuesIn(precisions), ::testing::Values(data), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConstantLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Constant_Serialization_with_negative_values, ConstantLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Constant_Serialization_with_negative_values, ConstantLayerTest, ::testing::Combine(::testing::ValuesIn(shapes), ::testing::ValuesIn(precisionsWithNegativeValues), ::testing::Values(dataWithNegativeValues), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/convert.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/convert.cpp index e6d6bc19ed7..7cc308c41e2 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/convert.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/convert.cpp @@ -25,7 +25,7 @@ TEST_P(ConvertLayerTest, Serialize) { Serialize(); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Serialization_ConvertLayerTest, ConvertLayerTest, ::testing::Combine(::testing::Values(inShape), ::testing::ValuesIn(precisions), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution.cpp index 7e22ba3e388..f68db9c3b08 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution.cpp @@ -36,7 +36,7 @@ const auto conv2DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(dilations), ::testing::ValuesIn(numOutChannels), ::testing::Values(ngraph::op::PadType::VALID)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Convolution2D_Serialization_ExplicitPadding, ConvolutionLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -48,7 +48,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Convolution2D__Serialization_AutoPadValid, ConvolutionLayerTest, ::testing::Combine( conv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution_backprop.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution_backprop.cpp index 2f9383ad914..0e29deb207e 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution_backprop.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/convolution_backprop.cpp @@ -41,7 +41,7 @@ const auto convolutionBackpropData2DParams = ::testing::Combine( ::testing::ValuesIn(dilations), ::testing::ValuesIn(numOutChannels), ::testing::ValuesIn(pad_types), ::testing::ValuesIn(outPadding)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_convolutionBackpropData2D_Serialization, ConvolutionBackpropLayerTest, ::testing::Combine( convolutionBackpropData2DParams, diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/deformable_convolution.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/deformable_convolution.cpp index a73f583f8b8..09107a33cd5 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/deformable_convolution.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/deformable_convolution.cpp @@ -42,7 +42,7 @@ const auto conv2DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(defor_groups), ::testing::ValuesIn(numOutChannels), ::testing::Values(ngraph::op::PadType::VALID)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_DeformableConvolution2D_Serialization_ExplicitPadding, DeformableConvolutionLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -54,7 +54,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(CommonTestUtils::DEVICE_CPU)), DeformableConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_DeformableConvolution2D__Serialization_AutoPadValid, DeformableConvolutionLayerTest, ::testing::Combine( conv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/deformable_psroi_pooling.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/deformable_psroi_pooling.cpp index ffdedd39905..c4606cf7dec 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/deformable_psroi_pooling.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/deformable_psroi_pooling.cpp @@ -30,6 +30,6 @@ namespace { ::testing::Values(InferenceEngine::Precision::FP32), // Net precision ::testing::Values(CommonTestUtils::DEVICE_CPU)); // Device name - INSTANTIATE_TEST_CASE_P(smoke_TestsDeformablePSROIPooling, DeformablePSROIPoolingLayerTest, deformablePSROICases_test_params, + INSTANTIATE_TEST_SUITE_P(smoke_TestsDeformablePSROIPooling, DeformablePSROIPoolingLayerTest, deformablePSROICases_test_params, DeformablePSROIPoolingLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/detection_output.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/detection_output.cpp index e1f66b84c22..00d5382d6fe 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/detection_output.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/detection_output.cpp @@ -66,7 +66,7 @@ namespace { ::testing::Values(objectnessScore), ::testing::Values(CommonTestUtils::DEVICE_CPU)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_DetectionOutput3In, DetectionOutputLayerTest, params3Inputs, diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/elementwise.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/elementwise.cpp index 7d2ac7f47a1..1a131fffaf5 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/elementwise.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/elementwise.cpp @@ -57,7 +57,7 @@ const auto elementiwiseParams = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(additionalConfig)); -INSTANTIATE_TEST_CASE_P(smoke_ElementwiseSerialization, EltwiseLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ElementwiseSerialization, EltwiseLayerTest, elementiwiseParams, EltwiseLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/extractimagepatches.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/extractimagepatches.cpp index 7e48a0ad0e9..6eda8ccde99 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/extractimagepatches.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/extractimagepatches.cpp @@ -27,7 +27,7 @@ const std::vector netPrecision = { InferenceEngine::Precision::FP32 }; -INSTANTIATE_TEST_CASE_P(smoke_ExtractImagePatchesLayerTest, ExtractImagePatchesTest, +INSTANTIATE_TEST_SUITE_P(smoke_ExtractImagePatchesLayerTest, ExtractImagePatchesTest, ::testing::Combine(::testing::ValuesIn(inShapes), ::testing::ValuesIn(kSizes), ::testing::ValuesIn(strides), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/group_convolution.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/group_convolution.cpp index ca080890ee3..66b5ec2684f 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/group_convolution.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/group_convolution.cpp @@ -40,7 +40,7 @@ const auto groupConv2DParams = ::testing::Combine( ::testing::ValuesIn(dilations), ::testing::ValuesIn(numOutChannels), ::testing::ValuesIn(numGroups), ::testing::ValuesIn(pad_types)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_GroupConvolution2D_Serialization, GroupConvolutionLayerTest, ::testing::Combine( groupConv2DParams, ::testing::ValuesIn(precisions), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/group_convolution_backprop_data.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/group_convolution_backprop_data.cpp index d98ff4016e4..df5596e2363 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/group_convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/group_convolution_backprop_data.cpp @@ -40,7 +40,7 @@ const auto groupConvBackpropData2DParams = ::testing::Combine( ::testing::ValuesIn(dilations), ::testing::ValuesIn(numOutChannels), ::testing::ValuesIn(numGroups), ::testing::ValuesIn(pad_types)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_GroupConvBackpropData2D_Serialization, GroupConvBackpropDataLayerTest, ::testing::Combine( groupConvBackpropData2DParams, diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/minimum_maximum.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/minimum_maximum.cpp index 19417dc8e0f..d64b7cf4e61 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/minimum_maximum.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/minimum_maximum.cpp @@ -36,7 +36,7 @@ const std::vector inputType = { ngraph::helpers::InputLayerType::PARAMETER, }; -INSTANTIATE_TEST_CASE_P(smoke_maximum, MaxMinLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_maximum, MaxMinLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes), ::testing::ValuesIn(opType), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/mvn.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/mvn.cpp index cc8f5728d31..b5a3cf828c7 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/mvn.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/mvn.cpp @@ -31,7 +31,7 @@ TEST_P(MvnLayerTest, Serialize) { Serialize(); } -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsMVN, MvnLayerTest, MvnCases, +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsMVN, MvnLayerTest, MvnCases, MvnLayerTest::getTestCaseName); // ------------------- MVN-6 ------------------------------------------------- @@ -47,7 +47,7 @@ TEST_P(Mvn6LayerTest, Serialize) { Serialize(); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_MVN_5D, Mvn6LayerTest, ::testing::Combine(::testing::ValuesIn(std::vector>{ {1, 10, 5, 7, 8}, {1, 3, 8, 9, 49}}), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/non_max_suppression.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/non_max_suppression.cpp index 633b69b02bd..510d8b860e6 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/non_max_suppression.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/non_max_suppression.cpp @@ -52,6 +52,6 @@ namespace { ::testing::ValuesIn(outType), ::testing::Values(CommonTestUtils::DEVICE_CPU)); - INSTANTIATE_TEST_CASE_P(smoke_NmsLayerTest, NmsLayerTest, nmsParams, NmsLayerTest::getTestCaseName); + INSTANTIATE_TEST_SUITE_P(smoke_NmsLayerTest, NmsLayerTest, nmsParams, NmsLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/nonzero.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/nonzero.cpp index 2d0c7453ec9..a10a2c52510 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/nonzero.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/nonzero.cpp @@ -25,7 +25,7 @@ std::vector inputPrecisions = { ConfigMap config; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_NonZeroLayerTest, NonZeroLayerTest, ::testing::Combine(::testing::ValuesIn(inputDims), ::testing::ValuesIn(inputPrecisions), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/normalize_l2.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/normalize_l2.cpp index 68b5ce21bab..cf56b7cbacd 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/normalize_l2.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/normalize_l2.cpp @@ -30,7 +30,7 @@ const std::vector netPrecisions = { Precision::BF16 }; -INSTANTIATE_TEST_CASE_P(smoke_NormalizeL2Serialization, NormalizeL2LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_NormalizeL2Serialization, NormalizeL2LayerTest, testing::Combine( testing::ValuesIn(axes), testing::ValuesIn(eps), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/one_hot.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/one_hot.cpp index 7a013aa7b55..42a80dd60b7 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/one_hot.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/one_hot.cpp @@ -34,6 +34,6 @@ const auto oneHotParams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_OneHotConstSerialization, OneHotLayerTest, oneHotParams, +INSTANTIATE_TEST_SUITE_P(smoke_OneHotConstSerialization, OneHotLayerTest, oneHotParams, OneHotLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/pad.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/pad.cpp index 6a3a9a484ac..6035d38f175 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/pad.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/pad.cpp @@ -35,6 +35,6 @@ const auto pad2DConstparams = testing::Combine( testing::Values(std::vector{13, 5}), testing::Values(CommonTestUtils::DEVICE_CPU)); -INSTANTIATE_TEST_CASE_P(smoke_Pad2DConstSerialization, PadLayerTest, pad2DConstparams, +INSTANTIATE_TEST_SUITE_P(smoke_Pad2DConstSerialization, PadLayerTest, pad2DConstparams, PadLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/pooling.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/pooling.cpp index c1a05395e17..df14f0bac5d 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/pooling.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/pooling.cpp @@ -55,7 +55,7 @@ namespace { ::testing::ValuesIn(padTypes), ::testing::Values(excludePad[0])); - INSTANTIATE_TEST_CASE_P(smoke_AvgPoolExcluePad, PoolingLayerTest, + INSTANTIATE_TEST_SUITE_P(smoke_AvgPoolExcluePad, PoolingLayerTest, ::testing::Combine( avgExcludePadParams, ::testing::ValuesIn(netPrecisions), @@ -77,7 +77,7 @@ namespace { ::testing::ValuesIn(padTypes), ::testing::Values(excludePad[1])); - INSTANTIATE_TEST_CASE_P(smoke_AvgPool, PoolingLayerTest, + INSTANTIATE_TEST_SUITE_P(smoke_AvgPool, PoolingLayerTest, ::testing::Combine( avgPadParams, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/prelu.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/prelu.cpp index d00123b4eb1..35d708bd9a1 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/prelu.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/prelu.cpp @@ -38,6 +38,6 @@ const auto basicCases = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_ActivationPreluSerialization, +INSTANTIATE_TEST_SUITE_P(smoke_ActivationPreluSerialization, ActivationLayerTest, basicCases, ActivationLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/prior_box_clustered.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/prior_box_clustered.cpp index dd0f2d5144d..f59e469660b 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/prior_box_clustered.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/prior_box_clustered.cpp @@ -61,7 +61,7 @@ namespace { ::testing::ValuesIn(offsets), ::testing::ValuesIn(variances)); - INSTANTIATE_TEST_CASE_P(smoke_PriorBoxClustered_Basic, PriorBoxClusteredLayerTest, + INSTANTIATE_TEST_SUITE_P(smoke_PriorBoxClustered_Basic, PriorBoxClusteredLayerTest, ::testing::Combine( layerSpeficParams, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/reduce_ops.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/reduce_ops.cpp index 8f28fc7f72b..61b0353c836 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/reduce_ops.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/reduce_ops.cpp @@ -140,35 +140,35 @@ const auto params_ReductionTypesLogical = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceOneAxis_Serialization, ReduceOpsLayerTest, paramsOneAxis, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceLogicalOneAxis_Serialization, ReduceOpsLayerTest, paramsOneAxisLogical, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceAxes_Serialization, ReduceOpsLayerTest, params_Axes, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Reduce_ReductionTypes_Serialization, ReduceOpsLayerTest, params_ReductionTypes, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceLogical_ReductionTypes_Serialization, ReduceOpsLayerTest, params_ReductionTypesLogical, diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/region_yolo.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/region_yolo.cpp index 228fbb33192..c5bb56e763b 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/region_yolo.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/region_yolo.cpp @@ -33,7 +33,7 @@ namespace { const int start_axis = 1; const int end_axis = 3; - INSTANTIATE_TEST_CASE_P(smoke_RegionYolov3Serialization, RegionYoloLayerTest, + INSTANTIATE_TEST_SUITE_P(smoke_RegionYolov3Serialization, RegionYoloLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes_v3), ::testing::Values(classes[0]), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/reshape.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/reshape.cpp index 9ba9aec704b..96338ae40de 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/reshape.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/reshape.cpp @@ -19,7 +19,7 @@ namespace { InferenceEngine::Precision::FP16 }; - INSTANTIATE_TEST_CASE_P(smoke_ReshapeSerialization, ReshapeLayerTestRevise, + INSTANTIATE_TEST_SUITE_P(smoke_ReshapeSerialization, ReshapeLayerTestRevise, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/result.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/result.cpp index aa7e365bc79..174779da42a 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/result.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/result.cpp @@ -25,7 +25,7 @@ std::vector inputPrecisions = { ConfigMap config; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ResultLayerTest, ResultLayerTest, ::testing::Combine(::testing::ValuesIn(inputDims), ::testing::ValuesIn(inputPrecisions), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/scatter_nd_update.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/scatter_nd_update.cpp index 668eeadcd8a..95fcf541123 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/scatter_nd_update.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/scatter_nd_update.cpp @@ -42,7 +42,7 @@ const auto ScatterNDUpdateCases = ::testing::Combine( ::testing::ValuesIn(idxPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ScatterNDUpdateLayerTestSerialization, ScatterNDUpdateLayerTest, ScatterNDUpdateCases, diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/shuffle_channels.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/shuffle_channels.cpp index e66352547e4..0dc0411d1d7 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/shuffle_channels.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/shuffle_channels.cpp @@ -35,7 +35,7 @@ const auto shuffleChannelsParamsNegativeAxis4D = ::testing::Combine( ::testing::ValuesIn(groups) ); -INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannelsSerialization, ShuffleChannelsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ShuffleChannelsSerialization, ShuffleChannelsLayerTest, ::testing::Combine( shuffleChannelsParams4D, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/space_to_batch.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/space_to_batch.cpp index 1b55e2fbac7..d5293dc5050 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/space_to_batch.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/space_to_batch.cpp @@ -31,7 +31,7 @@ const auto SpaceToBatch4D = ::testing::Combine( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)); -INSTANTIATE_TEST_CASE_P(smoke_spacetobatch4D_Serialization, +INSTANTIATE_TEST_SUITE_P(smoke_spacetobatch4D_Serialization, SpaceToBatchLayerTest, SpaceToBatch4D, SpaceToBatchLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/split.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/split.cpp index 80b1ca17eca..56e56900beb 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/split.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/split.cpp @@ -20,7 +20,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::U16, InferenceEngine::Precision::BOOL}; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Split_Serialization, SplitLayerTest, ::testing::Combine( ::testing::Values(1, 2, 5, 10), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/squeeze.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/squeeze.cpp index 126f01f2a0d..7164d4da8be 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/squeeze.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/squeeze.cpp @@ -32,7 +32,7 @@ const std::vector netPrecisions = { const std::vector opTypes = { ngraph::helpers::SqueezeOpType::SQUEEZE}; -INSTANTIATE_TEST_CASE_P(smoke_Squeeze_Basic, SqueezeUnsqueezeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Squeeze_Basic, SqueezeUnsqueezeLayerTest, ::testing::Combine( ::testing::ValuesIn(CommonTestUtils::combineParams(axesVectors)), ::testing::ValuesIn(opTypes), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/tensor_iterator.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/tensor_iterator.cpp index 5c2ba098b05..b76879ef12f 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/tensor_iterator.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/tensor_iterator.cpp @@ -27,7 +27,7 @@ const std::vector clip = {0.f}; const std::vector direction = { ngraph::op::RecurrentSequenceDirection::FORWARD, ngraph::op::RecurrentSequenceDirection::REVERSE}; -INSTANTIATE_TEST_CASE_P(smoke_TensorIterator, TensorIteratorTest, +INSTANTIATE_TEST_SUITE_P(smoke_TensorIterator, TensorIteratorTest, ::testing::Combine( ::testing::ValuesIn(decompose), ::testing::ValuesIn(sequenceLength), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/transpose.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/transpose.cpp index 4fd458c1244..8b9b2be7bd1 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/transpose.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/transpose.cpp @@ -23,7 +23,7 @@ const std::vector netPrecisions = { std::vector> inputShape2D = {{2, 10}, {10, 2}, {10, 10}}; std::vector> order2D = {{}, {0, 1}, {1, 0}}; -INSTANTIATE_TEST_CASE_P(smoke_Transpose2D, TransposeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Transpose2D, TransposeLayerTest, ::testing::Combine( ::testing::ValuesIn(order2D), ::testing::ValuesIn(netPrecisions), @@ -40,7 +40,7 @@ std::vector> order4D = { {}, {0, 1, 2, 3} }; -INSTANTIATE_TEST_CASE_P(smoke_Transpose4D, TransposeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Transpose4D, TransposeLayerTest, ::testing::Combine( ::testing::ValuesIn(order4D), ::testing::ValuesIn(netPrecisions), @@ -57,7 +57,7 @@ std::vector> order5D = { {}, {0, 1, 2, 3, 4} }; -INSTANTIATE_TEST_CASE_P(smoke_Transpose5D, TransposeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Transpose5D, TransposeLayerTest, ::testing::Combine( ::testing::ValuesIn(order5D), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/unsqueeze.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/unsqueeze.cpp index 2e26a70d627..bd62fd2dcc4 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/unsqueeze.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/unsqueeze.cpp @@ -32,7 +32,7 @@ const std::vector netPrecisions = { const std::vector opTypes = { ngraph::helpers::SqueezeOpType::UNSQUEEZE}; -INSTANTIATE_TEST_CASE_P(smoke_Squeeze_Basic, SqueezeUnsqueezeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Squeeze_Basic, SqueezeUnsqueezeLayerTest, ::testing::Combine( ::testing::ValuesIn(CommonTestUtils::combineParams(axesVectors)), ::testing::ValuesIn(opTypes), diff --git a/inference-engine/tests/functional/inference_engine/serialization/single_layer/variadic_split.cpp b/inference-engine/tests/functional/inference_engine/serialization/single_layer/variadic_split.cpp index 117d7ccbb52..ed8b1edea41 100644 --- a/inference-engine/tests/functional/inference_engine/serialization/single_layer/variadic_split.cpp +++ b/inference-engine/tests/functional/inference_engine/serialization/single_layer/variadic_split.cpp @@ -24,7 +24,7 @@ namespace { {1, 16, 5, 8}, }; - INSTANTIATE_TEST_CASE_P(smoke_VariadicSplitSerialization, VariadicSplitLayerTest, + INSTANTIATE_TEST_SUITE_P(smoke_VariadicSplitSerialization, VariadicSplitLayerTest, ::testing::Combine( ::testing::ValuesIn(numSplits), ::testing::Values(0, 1, 2, 3), diff --git a/inference-engine/tests/functional/inference_engine/task_executor_tests.cpp b/inference-engine/tests/functional/inference_engine/task_executor_tests.cpp index d3ffda26614..c4fe68a87b7 100644 --- a/inference-engine/tests/functional/inference_engine/task_executor_tests.cpp +++ b/inference-engine/tests/functional/inference_engine/task_executor_tests.cpp @@ -198,7 +198,7 @@ static auto Executors = ::testing::Values( } ); -INSTANTIATE_TEST_CASE_P(TaskExecutorTests, TaskExecutorTests, Executors); +INSTANTIATE_TEST_SUITE_P(TaskExecutorTests, TaskExecutorTests, Executors); static auto AsyncExecutors = ::testing::Values( [] { @@ -209,5 +209,5 @@ static auto AsyncExecutors = ::testing::Values( } ); -INSTANTIATE_TEST_CASE_P(ASyncTaskExecutorTests, ASyncTaskExecutorTests, AsyncExecutors); +INSTANTIATE_TEST_SUITE_P(ASyncTaskExecutorTests, ASyncTaskExecutorTests, AsyncExecutors); diff --git a/inference-engine/tests/functional/inference_engine/transformations/broadcast_elementwise_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/broadcast_elementwise_fusion_test.cpp index 324bfae029b..a9667226068 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/broadcast_elementwise_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/broadcast_elementwise_fusion_test.cpp @@ -238,32 +238,32 @@ TEST_P(NoEliminateDynamicBroadcastTest, CompareFunctions) { eliminate_broadcast_test(f, f_ref); } -INSTANTIATE_TEST_CASE_P(EliminateBroadcast, EliminateBroadcastTest, +INSTANTIATE_TEST_SUITE_P(EliminateBroadcast, EliminateBroadcastTest, testing::Values(std::make_tuple(InputShape{1, 2, 3}, InputShape{1, 2, 3}, TargetShape{1, 2, 3}), std::make_tuple(InputShape{DYN, 2, 3}, InputShape{1, 2, 3}, TargetShape{1, 2, 3}), std::make_tuple(InputShape{DYN, DYN, DYN}, InputShape{1, 1, 1}, TargetShape{1, 1, 1}), std::make_tuple(InputShape{1, 2, 3}, InputShape{2, 3}, TargetShape{2, 3}), std::make_tuple(InputShape{1, 2, 1}, InputShape{1}, TargetShape{1}))); -INSTANTIATE_TEST_CASE_P(EliminateBroadcastSwapInputs, EliminateBroadcastSwapInputsTest, +INSTANTIATE_TEST_SUITE_P(EliminateBroadcastSwapInputs, EliminateBroadcastSwapInputsTest, testing::Values(std::make_tuple(InputShape{1, 2, 3}, InputShape{1, 2, 3}, TargetShape{1, 2, 3}), std::make_tuple(InputShape{DYN, 2, 3}, InputShape{1, 2, 3}, TargetShape{1, 2, 3}), std::make_tuple(InputShape{DYN, DYN, DYN}, InputShape{1, 1, 1}, TargetShape{1, 1, 1}), std::make_tuple(InputShape{1, 2, 3}, InputShape{2, 3}, TargetShape{2, 3}), std::make_tuple(InputShape{1, 2, 1}, InputShape{1}, TargetShape{1}))); -INSTANTIATE_TEST_CASE_P(NoEliminateBroadcast, NoEliminateBroadcastTest, +INSTANTIATE_TEST_SUITE_P(NoEliminateBroadcast, NoEliminateBroadcastTest, testing::Values(std::make_tuple(InputShape{1, 2, 1}, InputShape{3}, TargetShape{3}), std::make_tuple(InputShape{DYN, 2, 3}, InputShape{3, 2, 3}, TargetShape{3, 2, 3}), std::make_tuple(InputShape{DYN, DYN, DYN}, InputShape{3, 2, 1}, TargetShape{3, 2, 1}), std::make_tuple(ngraph::PartialShape::dynamic(), InputShape{1, 2, 3}, TargetShape{1, 2, 3}), std::make_tuple(ngraph::PartialShape::dynamic(), ngraph::PartialShape::dynamic(), TargetShape{1, 2, 3}))); -INSTANTIATE_TEST_CASE_P(EliminateDynamicBroadcast, EliminateDynamicBroadcastTest, +INSTANTIATE_TEST_SUITE_P(EliminateDynamicBroadcast, EliminateDynamicBroadcastTest, testing::Values(std::make_tuple(InputShape{2, 2, 4}, InputShape{2, DYN, 4}, InputShape{2, DYN, 4}, InputShape{2, DYN, 4}), std::make_tuple(InputShape{2, 2, 4}, InputShape{DYN, DYN, DYN}, InputShape{DYN, DYN, DYN}, InputShape{DYN, DYN, DYN}), std::make_tuple(InputShape{2, 2, 4}, InputShape{2, 2, 4}, InputShape{2, DYN, 4}, InputShape{2, 2, 4}))); -INSTANTIATE_TEST_CASE_P(NoEliminateDynamicBroadcast, NoEliminateDynamicBroadcastTest, +INSTANTIATE_TEST_SUITE_P(NoEliminateDynamicBroadcast, NoEliminateDynamicBroadcastTest, testing::Values(std::make_tuple(InputShape{2, 1, 4}, InputShape{2, DYN, 4}, InputShape{2, DYN, 4}), std::make_tuple(InputShape{2, DYN, 4}, InputShape{2, DYN, 4}, InputShape{2, DYN, 4}))); diff --git a/inference-engine/tests/functional/inference_engine/transformations/conv_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/conv_fusion_test.cpp index b12a0f6f9de..9610df3e6ba 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/conv_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/conv_fusion_test.cpp @@ -125,7 +125,7 @@ TEST_P(ConvFusionTests, CompareFunctions) { using add = ngraph::opset5::Add; using mul = ngraph::opset5::Multiply; -INSTANTIATE_TEST_CASE_P(ConvAddFusion, ConvFusionTests, +INSTANTIATE_TEST_SUITE_P(ConvAddFusion, ConvFusionTests, testing::Values(std::make_tuple(InputShape{DYN, DYN, DYN, DYN, DYN}, WeightsShape{8, 3, 1, 2, 3}, add::type_info, EltwiseShape{8, 1, 1, 1}, false), std::make_tuple(InputShape{DYN, 3, 64, 64, 64}, WeightsShape{8, 3, 1, 2, 3}, add::type_info, EltwiseShape{8, 1, 1, 1}, false), std::make_tuple(InputShape{2, DYN, 64, 64, 64}, WeightsShape{9, 3, 2, 3, 1}, add::type_info, EltwiseShape{9, 1, 1, 1}, false), @@ -143,12 +143,12 @@ INSTANTIATE_TEST_CASE_P(ConvAddFusion, ConvFusionTests, std::make_tuple(InputShape{2, DYN, 9}, WeightsShape{2, 3, 2}, add::type_info, EltwiseShape{2, 1}, false), std::make_tuple(InputShape{3, 3, DYN}, WeightsShape{1, 3, 3}, add::type_info, EltwiseShape{1, 1}, false))); -INSTANTIATE_TEST_CASE_P(DISABLED_ConvAddFusionNegative, ConvFusionTests, +INSTANTIATE_TEST_SUITE_P(DISABLED_ConvAddFusionNegative, ConvFusionTests, testing::Values(std::make_tuple(InputShape{DYN, DYN, DYN, DYN, DYN}, WeightsShape{8, 3, 1, 2, 3}, add::type_info, EltwiseShape{2, 1}, true), std::make_tuple(InputShape{DYN, 3, 64, 64, 64}, WeightsShape{8, 3, 1, 2, 3}, add::type_info, EltwiseShape{8, 1, 1}, true), std::make_tuple(InputShape{2, DYN, 64, 64, 64}, WeightsShape{9, 3, 2, 3, 1}, add::type_info, EltwiseShape{9, 1, 1, 1, 1}, true))); -INSTANTIATE_TEST_CASE_P(DISABLED_ConvMulFusion, ConvFusionTests, +INSTANTIATE_TEST_SUITE_P(DISABLED_ConvMulFusion, ConvFusionTests, testing::Values(std::make_tuple(InputShape{DYN, DYN, DYN, DYN, DYN}, WeightsShape{8, 3, 1, 2, 3}, mul::type_info, EltwiseShape{8, 1, 1, 1}, false), std::make_tuple(InputShape{DYN, 3, 64, 64, 64}, WeightsShape{8, 3, 1, 2, 3}, mul::type_info, EltwiseShape{8, 1, 1, 1}, false), std::make_tuple(InputShape{2, DYN, 64, 64, 64}, WeightsShape{9, 3, 2, 3, 1}, mul::type_info, EltwiseShape{9, 1, 1, 1}, false), @@ -166,7 +166,7 @@ INSTANTIATE_TEST_CASE_P(DISABLED_ConvMulFusion, ConvFusionTests, std::make_tuple(InputShape{2, DYN, 9}, WeightsShape{2, 3, 2}, mul::type_info, EltwiseShape{2, 1}, false), std::make_tuple(InputShape{3, 3, DYN}, WeightsShape{1, 3, 3}, mul::type_info, EltwiseShape{1, 1}, false))); -INSTANTIATE_TEST_CASE_P(DISABLED_ConvMulFusionNegative, ConvFusionTests, +INSTANTIATE_TEST_SUITE_P(DISABLED_ConvMulFusionNegative, ConvFusionTests, testing::Values(std::make_tuple(InputShape{DYN, DYN, DYN, DYN, DYN}, WeightsShape{8, 3, 1, 2, 3}, mul::type_info, EltwiseShape{2, 1}, true), std::make_tuple(InputShape{DYN, 3, 64, 64}, WeightsShape{8, 3, 1, 2, 3}, mul::type_info, EltwiseShape{8, 1, 1}, true), std::make_tuple(InputShape{2, DYN, 64, 64}, WeightsShape{9, 3, 2, 3, 1}, mul::type_info, EltwiseShape{9, 1, 1, 1, 1}, true))); diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_broadcast3_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_broadcast3_test.cpp index 7058f52eb5c..95b54fe0461 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_broadcast3_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_broadcast3_test.cpp @@ -223,7 +223,7 @@ TEST_P(ConvertBroadcast3BIDIRECTBroadcastLogicalOrTest, CompareFunctions) { convert_broadcast3_test(f, f_ref); } -INSTANTIATE_TEST_CASE_P(ConvertBroadcast3NUMPY, ConvertBroadcast3NUMPYTest, +INSTANTIATE_TEST_SUITE_P(ConvertBroadcast3NUMPY, ConvertBroadcast3NUMPYTest, testing::Values(std::make_tuple(InputShape{DYN, DYN, DYN, DYN, DYN}, TargetShape{1, 2, 3, 4, 5}), std::make_tuple(InputShape{DYN, 3, 64, 64, 64}, TargetShape{8, 3, 64, 64, 64}), std::make_tuple(InputShape{2, DYN, 64, 64, 64}, TargetShape{2, 3, 64, 64, 64}), @@ -241,7 +241,7 @@ INSTANTIATE_TEST_CASE_P(ConvertBroadcast3NUMPY, ConvertBroadcast3NUMPYTest, std::make_tuple(InputShape{2, DYN, 9}, TargetShape{2, 3, 9}), std::make_tuple(InputShape{3, 3, DYN}, TargetShape{3, 3, 3}))); -INSTANTIATE_TEST_CASE_P(ConvertBroadcast3BIDIRECT, ConvertBroadcast3BIDIRECTMulTest, +INSTANTIATE_TEST_SUITE_P(ConvertBroadcast3BIDIRECT, ConvertBroadcast3BIDIRECTMulTest, testing::Values(std::make_tuple(InputShape{DYN, DYN, DYN, DYN, DYN}, TargetShape{1, 2, 3, 4, 5}), std::make_tuple(InputShape{DYN, 3, 64, 64, 64}, TargetShape{1, 3, 64, 64, 64}), std::make_tuple(InputShape{2, DYN, 64, 64, 64}, TargetShape{2, 1, 64, 64, 64}), @@ -261,7 +261,7 @@ INSTANTIATE_TEST_CASE_P(ConvertBroadcast3BIDIRECT, ConvertBroadcast3BIDIRECTMulT std::make_tuple(InputShape{2, DYN, 9}, TargetShape{2, 1, 9}), std::make_tuple(InputShape{3, 3, DYN}, TargetShape{3, 3, 1}))); -INSTANTIATE_TEST_CASE_P(ConvertBroadcast3BIDIRECT, ConvertBroadcast3BIDIRECTBroadcastTest, +INSTANTIATE_TEST_SUITE_P(ConvertBroadcast3BIDIRECT, ConvertBroadcast3BIDIRECTBroadcastTest, testing::Values(std::make_tuple(InputShape{DYN, DYN, DYN, DYN, DYN}, TargetShape{2, 2, 3, 4, 5}, TargetShape{2, 2, 3, 4, 5}), std::make_tuple(InputShape{DYN, 3, 64, 64, 64}, TargetShape{3, 3, 64, 64, 64}, TargetShape{3, 3, 64, 64, 64}), std::make_tuple(InputShape{2, DYN, 64, 64, 64}, TargetShape{2, 3, 64, 64, 1}, TargetShape{2, 3, 64, 64, 64}), @@ -280,7 +280,7 @@ INSTANTIATE_TEST_CASE_P(ConvertBroadcast3BIDIRECT, ConvertBroadcast3BIDIRECTBroa std::make_tuple(InputShape{2, DYN, 9}, TargetShape{2, 2, 1}, TargetShape{2, 2, 9}), std::make_tuple(InputShape{3, 3, DYN}, TargetShape{3}, TargetShape{3, 3, 3}))); -INSTANTIATE_TEST_CASE_P(ConvertBroadcast3BIDIRECT, ConvertBroadcast3BIDIRECTBroadcastMultiplyTest, +INSTANTIATE_TEST_SUITE_P(ConvertBroadcast3BIDIRECT, ConvertBroadcast3BIDIRECTBroadcastMultiplyTest, testing::Values(std::make_tuple(InputShape{DYN, DYN, DYN, DYN, DYN}, TargetShape{5}), std::make_tuple(InputShape{DYN, 3, 64, 64, 64}, TargetShape{4}), std::make_tuple(InputShape{2, DYN, 64, 64, 64}, TargetShape{3}), @@ -296,7 +296,7 @@ INSTANTIATE_TEST_CASE_P(ConvertBroadcast3BIDIRECT, ConvertBroadcast3BIDIRECTBroa std::make_tuple(InputShape{2, DYN, 9}, TargetShape{3}), std::make_tuple(InputShape{3, 3, DYN}, TargetShape{2}))); -INSTANTIATE_TEST_CASE_P(ConvertBroadcast3BIDIRECT, ConvertBroadcast3BIDIRECTBroadcastLogicalOrTest, +INSTANTIATE_TEST_SUITE_P(ConvertBroadcast3BIDIRECT, ConvertBroadcast3BIDIRECTBroadcastLogicalOrTest, testing::Values(std::make_tuple(InputShape{DYN, DYN, DYN, DYN, DYN}, TargetShape{5}), std::make_tuple(InputShape{DYN, 3, 64, 64, 64}, TargetShape{4}), std::make_tuple(InputShape{2, DYN, 64, 64, 64}, TargetShape{3}), diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_convolution_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_convolution_test.cpp index 43bd10eccd1..1a8e196be59 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_convolution_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_convolution_test.cpp @@ -80,7 +80,7 @@ TEST_P(ConvertConvolutionTest, CompareFunctions) { ASSERT_TRUE(orig_shape.same_scheme(f->get_output_partial_shape(0))) << "Shape " << orig_shape << " is not equal to " << f->get_output_partial_shape(0); } -INSTANTIATE_TEST_CASE_P(ConvertConvolution, ConvertConvolutionTest, +INSTANTIATE_TEST_SUITE_P(ConvertConvolution, ConvertConvolutionTest, testing::Values(std::make_tuple(InputShape{DYN, DYN, DYN, DYN, DYN}, WeightsShape{8, 3, 1, 2, 3}), std::make_tuple(InputShape{DYN, 3, 64, 64, 64}, WeightsShape{8, 3, 1, 2, 3}), std::make_tuple(InputShape{2, DYN, 64, 64, 64}, WeightsShape{9, 3, 2, 3, 1}), diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_deconvolution_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_deconvolution_test.cpp index 51f60318f18..3c456c7f083 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_deconvolution_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_deconvolution_test.cpp @@ -76,7 +76,7 @@ TEST_P(ConvertDeconvolutionTest, CompareFunctions) { ASSERT_TRUE(orig_shape.same_scheme(f->get_output_partial_shape(0))) << "Shape " << orig_shape << " is not equal to " << f->get_output_partial_shape(0); } -INSTANTIATE_TEST_CASE_P(ConvertDeconvolution, ConvertDeconvolutionTest, +INSTANTIATE_TEST_SUITE_P(ConvertDeconvolution, ConvertDeconvolutionTest, testing::Values(std::make_tuple(InputShape{DYN, DYN, DYN, DYN, DYN}, WeightsShape{3, 8, 1, 2, 3}), std::make_tuple(InputShape{DYN, 3, 64, 64, 64}, WeightsShape{3, 8, 1, 2, 3}), std::make_tuple(InputShape{2, DYN, 64, 64, 64}, WeightsShape{3, 9, 2, 3, 1}), diff --git a/inference-engine/tests/functional/inference_engine/transformations/convert_reduce_to_pooling_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/convert_reduce_to_pooling_test.cpp index 813fe6a7dbf..34b287a47bc 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/convert_reduce_to_pooling_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/convert_reduce_to_pooling_test.cpp @@ -121,17 +121,17 @@ TEST_P(ConvertReduceToPoolingTests, CompareFunctions) { #define MAX std::make_shared() -INSTANTIATE_TEST_CASE_P(ReduceToMaxPooling, ConvertReduceToPoolingTests, +INSTANTIATE_TEST_SUITE_P(ReduceToMaxPooling, ConvertReduceToPoolingTests, testing::Values(std::make_tuple(MAX, InputShape{2, 3, 64, 64}, ReduceAxes{3}, KeepDims{true}, ReduceToPoolParams({}, {1, 64}, {})), std::make_tuple(MAX, InputShape{2, 3, 64, 64}, ReduceAxes{3, 2}, KeepDims{true}, ReduceToPoolParams({}, {64, 64}, {})))); -INSTANTIATE_TEST_CASE_P(ReduceToReshape, ConvertReduceToPoolingTests, +INSTANTIATE_TEST_SUITE_P(ReduceToReshape, ConvertReduceToPoolingTests, testing::Values(std::make_tuple(MAX, InputShape{2, 3, 64, 1}, ReduceAxes{3}, KeepDims{false}, ReduceToPoolParams({1, 3, 64}, {}, {})), std::make_tuple(MAX, InputShape{2, 3}, ReduceAxes{-2}, KeepDims{false}, ReduceToPoolParams({3}, {}, {})), std::make_tuple(MAX, InputShape{2, 3, 1}, ReduceAxes{2}, KeepDims{false}, ReduceToPoolParams({1, 3}, {}, {})), std::make_tuple(MAX, InputShape{2, 3, 1, 1}, ReduceAxes{0, 3, 2}, KeepDims{false}, ReduceToPoolParams({3}, {}, {})))); -INSTANTIATE_TEST_CASE_P(ReduceToReshapePoolReshape, ConvertReduceToPoolingTests, +INSTANTIATE_TEST_SUITE_P(ReduceToReshapePoolReshape, ConvertReduceToPoolingTests, testing::Values(std::make_tuple(MAX, InputShape{2, 3, 3}, ReduceAxes{1, 2}, KeepDims{false}, ReduceToPoolParams({1, 1, 9, 1}, {9, 1}, {1})), std::make_tuple(MAX, InputShape{2, 9}, ReduceAxes{-1}, KeepDims{true}, ReduceToPoolParams({1, 1, 9, 1}, {9, 1}, {1, 1})), std::make_tuple(MAX, InputShape{2, 3, 4, 1}, ReduceAxes{1, 3, 2}, KeepDims{false}, ReduceToPoolParams({1, 1, 12, 1}, {12, 1}, {1})))); diff --git a/inference-engine/tests/functional/inference_engine/transformations/eliminate_unsqueeze_gather.cpp b/inference-engine/tests/functional/inference_engine/transformations/eliminate_unsqueeze_gather.cpp index 526695879d8..cc91018e155 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/eliminate_unsqueeze_gather.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/eliminate_unsqueeze_gather.cpp @@ -71,7 +71,7 @@ protected: TEST_P(EliminateUnsqueezeGatherTest, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, EliminateUnsqueezeGatherTest, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, EliminateUnsqueezeGatherTest, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32, diff --git a/inference-engine/tests/functional/inference_engine/transformations/fq_decomposition_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/fq_decomposition_test.cpp index d5b49446232..91d218924db 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/fq_decomposition_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/fq_decomposition_test.cpp @@ -186,28 +186,28 @@ const auto broadcast_6D_fq_basic = ::testing::Combine(::testing::ValuesIn(precis ::testing::Values(ngraph::Shape{1, 1, 1, 5, 6, 7}), ::testing::ValuesIn(levels)); -INSTANTIATE_TEST_CASE_P(SimpleFakeQuantize_Decomposition, FakeQuantizeDecompositionTest, +INSTANTIATE_TEST_SUITE_P(SimpleFakeQuantize_Decomposition, FakeQuantizeDecompositionTest, ::testing::Combine( simple_fq_basic, ::testing::ValuesIn(input_ranges_supported), ::testing::Values(true)), FakeQuantizeDecompositionTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(BroadcastFakeQuantize_Decomposition, FakeQuantizeDecompositionTest, +INSTANTIATE_TEST_SUITE_P(BroadcastFakeQuantize_Decomposition, FakeQuantizeDecompositionTest, ::testing::Combine( broadcast_fq_basic, ::testing::ValuesIn(input_ranges_supported), ::testing::Values(true)), FakeQuantizeDecompositionTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(ElementwiseFakeQuantize_Decomposition, FakeQuantizeDecompositionTest, +INSTANTIATE_TEST_SUITE_P(ElementwiseFakeQuantize_Decomposition, FakeQuantizeDecompositionTest, ::testing::Combine( elementwise_fq_basic, ::testing::ValuesIn(input_ranges_supported), ::testing::Values(true)), FakeQuantizeDecompositionTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(FakeQuantize6D_Decomposition, FakeQuantizeDecompositionTest, +INSTANTIATE_TEST_SUITE_P(FakeQuantize6D_Decomposition, FakeQuantizeDecompositionTest, ::testing::Combine( broadcast_6D_fq_basic, ::testing::ValuesIn(input_ranges_supported), @@ -220,28 +220,28 @@ const std::vector> input_ranges_unsupported = { {-5.0f, -5.0f} }; -INSTANTIATE_TEST_CASE_P(SimpleFakeQuantize_NoDecomposition, FakeQuantizeDecompositionTest, +INSTANTIATE_TEST_SUITE_P(SimpleFakeQuantize_NoDecomposition, FakeQuantizeDecompositionTest, ::testing::Combine( simple_fq_basic, ::testing::ValuesIn(input_ranges_unsupported), ::testing::Values(false)), FakeQuantizeDecompositionTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(BroadcastFakeQuantize_NoDecomposition, FakeQuantizeDecompositionTest, +INSTANTIATE_TEST_SUITE_P(BroadcastFakeQuantize_NoDecomposition, FakeQuantizeDecompositionTest, ::testing::Combine( broadcast_fq_basic, ::testing::ValuesIn(input_ranges_unsupported), ::testing::Values(false)), FakeQuantizeDecompositionTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(ElementwiseFakeQuantize_NoDecomposition, FakeQuantizeDecompositionTest, +INSTANTIATE_TEST_SUITE_P(ElementwiseFakeQuantize_NoDecomposition, FakeQuantizeDecompositionTest, ::testing::Combine( elementwise_fq_basic, ::testing::ValuesIn(input_ranges_unsupported), ::testing::Values(false)), FakeQuantizeDecompositionTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(FakeQuantize6D_NoDecomposition, FakeQuantizeDecompositionTest, +INSTANTIATE_TEST_SUITE_P(FakeQuantize6D_NoDecomposition, FakeQuantizeDecompositionTest, ::testing::Combine( broadcast_6D_fq_basic, ::testing::ValuesIn(input_ranges_unsupported), diff --git a/inference-engine/tests/functional/inference_engine/transformations/fq_mul_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/fq_mul_fusion_test.cpp index 920f2aa8954..57135f0285a 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/fq_mul_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/fq_mul_fusion_test.cpp @@ -92,84 +92,84 @@ TEST_P(FQMulFusion, ExpectFusion) { }; namespace { -INSTANTIATE_TEST_CASE_P(ScalarFQParams_C6_4D_channel_0, FQMulFusion, +INSTANTIATE_TEST_SUITE_P(ScalarFQParams_C6_4D_channel_0, FQMulFusion, ::testing::Combine(::testing::Values(ngraph::Shape{64, 3, 7, 7}), ::testing::Values(ngraph::Shape{}), ::testing::Values(ngraph::Shape{}), ::testing::Values(ngraph::Shape{64, 1, 1, 1}), ::testing::Values(ngraph::Shape{64, 1, 1, 1}))); -INSTANTIATE_TEST_CASE_P(ScalarFQParams_C6_4D_channel_1, FQMulFusion, +INSTANTIATE_TEST_SUITE_P(ScalarFQParams_C6_4D_channel_1, FQMulFusion, ::testing::Combine(::testing::Values(ngraph::Shape{64, 3, 7, 7}), ::testing::Values(ngraph::Shape{}), ::testing::Values(ngraph::Shape{}), ::testing::Values(ngraph::Shape{1, 3, 1, 1}), ::testing::Values(ngraph::Shape{1, 3, 1, 1}))); -INSTANTIATE_TEST_CASE_P(ScalarFQParams_C6_scalar, FQMulFusion, +INSTANTIATE_TEST_SUITE_P(ScalarFQParams_C6_scalar, FQMulFusion, ::testing::Combine(::testing::Values(ngraph::Shape{64, 3, 7, 7}), ::testing::Values(ngraph::Shape{}), ::testing::Values(ngraph::Shape{}), ::testing::Values(ngraph::Shape{}), ::testing::Values(ngraph::Shape{}))); -INSTANTIATE_TEST_CASE_P(FQOutputs1D_C6_scalar, FQMulFusion, +INSTANTIATE_TEST_SUITE_P(FQOutputs1D_C6_scalar, FQMulFusion, ::testing::Combine(::testing::Values(ngraph::Shape{64, 3, 7, 7}), ::testing::Values(ngraph::Shape{}), ::testing::Values(ngraph::Shape{1}), ::testing::Values(ngraph::Shape{}), ::testing::Values(ngraph::Shape{1}))); -INSTANTIATE_TEST_CASE_P(FQOutputs_NHWC_C6_scalar, FQMulFusion, +INSTANTIATE_TEST_SUITE_P(FQOutputs_NHWC_C6_scalar, FQMulFusion, ::testing::Combine(::testing::Values(ngraph::Shape{1, 7, 7, 3}), ::testing::Values(ngraph::Shape{}), ::testing::Values(ngraph::Shape{1, 1, 1, 3}), ::testing::Values(ngraph::Shape{}), ::testing::Values(ngraph::Shape{1, 1, 1, 3}))); -INSTANTIATE_TEST_CASE_P(FQOutputs_NCHW_C6_scalar, FQMulFusion, +INSTANTIATE_TEST_SUITE_P(FQOutputs_NCHW_C6_scalar, FQMulFusion, ::testing::Combine(::testing::Values(ngraph::Shape{1, 3, 7, 7}), ::testing::Values(ngraph::Shape{}), ::testing::Values(ngraph::Shape{1, 3, 1, 1}), ::testing::Values(ngraph::Shape{}), ::testing::Values(ngraph::Shape{1, 3, 1, 1}))); -INSTANTIATE_TEST_CASE_P(FQInputs_4D_with_channel_dimension, FQMulFusion, +INSTANTIATE_TEST_SUITE_P(FQInputs_4D_with_channel_dimension, FQMulFusion, ::testing::Combine(::testing::Values(ngraph::Shape{1, 64, 3, 3}), ::testing::Values(ngraph::Shape{1, 1, 1, 1}), ::testing::Values(ngraph::Shape{1, 64, 1, 1}), ::testing::Values(ngraph::Shape{1, 64, 1, 1}), ::testing::Values(ngraph::Shape{1, 64, 1, 1}))); -INSTANTIATE_TEST_CASE_P(FQInputs_4D_per__multiplier_with_channel, FQMulFusion, +INSTANTIATE_TEST_SUITE_P(FQInputs_4D_per__multiplier_with_channel, FQMulFusion, ::testing::Combine(::testing::Values(ngraph::Shape{1, 64, 3, 3}), ::testing::Values(ngraph::Shape{1, 1, 1, 1}), ::testing::Values(ngraph::Shape{1, 1, 1, 1}), ::testing::Values(ngraph::Shape{1, 64, 1, 1}), ::testing::Values(ngraph::Shape{1, 64, 1, 1}))); -INSTANTIATE_TEST_CASE_P(FQInputs_4D_with_channel__multiplier_4D_per_tensor, FQMulFusion, +INSTANTIATE_TEST_SUITE_P(FQInputs_4D_with_channel__multiplier_4D_per_tensor, FQMulFusion, ::testing::Combine(::testing::Values(ngraph::Shape{1, 64, 3, 3}), ::testing::Values(ngraph::Shape{1, 1, 1, 1}), ::testing::Values(ngraph::Shape{1, 64, 1, 1}), ::testing::Values(ngraph::Shape{1, 1, 1, 1}), ::testing::Values(ngraph::Shape{1, 64, 1, 1}))); -INSTANTIATE_TEST_CASE_P(FQInputs_4D__multiplier_channel_3rd_dim, FQMulFusion, +INSTANTIATE_TEST_SUITE_P(FQInputs_4D__multiplier_channel_3rd_dim, FQMulFusion, ::testing::Combine(::testing::Values(ngraph::Shape{1, 64, 3, 3}), ::testing::Values(ngraph::Shape{1, 1, 1, 1}), ::testing::Values(ngraph::Shape{1, 64, 1, 1}), ::testing::Values(ngraph::Shape{1, 1, 3, 1}), ::testing::Values(ngraph::Shape{1, 64, 3, 1}))); -INSTANTIATE_TEST_CASE_P(FQOutputs_1D__multiplier_3D, FQMulFusion, +INSTANTIATE_TEST_SUITE_P(FQOutputs_1D__multiplier_3D, FQMulFusion, ::testing::Combine(::testing::Values(ngraph::Shape{1, 64, 3, 3}), ::testing::Values(ngraph::Shape{1, 64, 1, 1}), ::testing::Values(ngraph::Shape{1}), ::testing::Values(ngraph::Shape{1, 3, 1}), ::testing::Values(ngraph::Shape{1, 3, 1}))); -INSTANTIATE_TEST_CASE_P(FQInOUt_ones__multiplier_4D_with_channel, FQMulFusion, +INSTANTIATE_TEST_SUITE_P(FQInOUt_ones__multiplier_4D_with_channel, FQMulFusion, ::testing::Combine(::testing::Values(ngraph::Shape{1, 64, 3, 3}), ::testing::Values(ngraph::Shape{1, 1, 1, 1}), ::testing::Values(ngraph::Shape{1, 1, 1, 1}), diff --git a/inference-engine/tests/functional/inference_engine/transformations/fq_reshape_fusion.cpp b/inference-engine/tests/functional/inference_engine/transformations/fq_reshape_fusion.cpp index 5fe78681594..4f076092347 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/fq_reshape_fusion.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/fq_reshape_fusion.cpp @@ -113,7 +113,7 @@ TEST_P(nGraphFQReshapeFusionTests, ReshapeMatMul) { ASSERT_TRUE(res.first) << res.second; } -INSTANTIATE_TEST_CASE_P(NGraph, nGraphFQReshapeFusionTests, testing::Values( +INSTANTIATE_TEST_SUITE_P(NGraph, nGraphFQReshapeFusionTests, testing::Values( // positive FQReshapeFusionTestCase{{1, 2, 1, 3}, {2, 1, 1}, {1}, {1, 1}, {1, 2, 1, 1}, {2, 3}, {2, 1}, {1, 1}, DO_NOT_RESHAPE, {2, 1}, false}, FQReshapeFusionTestCase{{1, 2, 1, 3}, {2, 1, 1}, {1}, {1, 1}, {1, 2, 1, 1}, {1, 2, 1, 3}, {1, 2, 1, 1}, {1, 1, 1, 1}, {1, 1, 1, 1}, DO_NOT_RESHAPE, false}, diff --git a/inference-engine/tests/functional/inference_engine/transformations/mul_add_conversion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/mul_add_conversion_test.cpp index 22c18407a07..8da572786cd 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/mul_add_conversion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/mul_add_conversion_test.cpp @@ -176,7 +176,7 @@ TEST_P(MulOrAddConversionTests, CompareFunctions) { #define ELTWISE_SUM MulAddConversionTests::get_eltwise_add_reference #define ELTWISE_PROD MulAddConversionTests::get_eltwise_mul_reference -INSTANTIATE_TEST_CASE_P(MulAddToScaleShift, MulAddConversionTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(MulAddToScaleShift, MulAddConversionTests, testing::Combine( testing::Values(std::make_tuple(InputShape{DYN, 3, 64, 64}, CONST(ngraph::Shape({1, 3, 1, 1}), 0.5), CONST(ngraph::Shape({1, 3, 1, 1}), 0.5), false), @@ -188,7 +188,7 @@ INSTANTIATE_TEST_CASE_P(MulAddToScaleShift, MulAddConversionTests, testing::Comb CONST(ngraph::Shape({1, 3, 1, 1}), 0.5), false)), testing::Values(SCALESHIFT))); -INSTANTIATE_TEST_CASE_P(MulToScaleShift, MulOrAddConversionTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(MulToScaleShift, MulOrAddConversionTests, testing::Combine( testing::Values(std::make_tuple(InputShape{DYN, 3, 64, 64}, CONST(ngraph::Shape({1, 3, 1, 1}), 0.5), NONE, false), @@ -200,7 +200,7 @@ INSTANTIATE_TEST_CASE_P(MulToScaleShift, MulOrAddConversionTests, testing::Combi NONE, false)), testing::Values(SCALESHIFT))); -INSTANTIATE_TEST_CASE_P(AddToScaleShift, MulOrAddConversionTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(AddToScaleShift, MulOrAddConversionTests, testing::Combine( testing::Values(std::make_tuple(InputShape{DYN, 3, 64, 64}, NONE, CONST(ngraph::Shape({1, 3, 1, 1}), 0.5), false), @@ -212,7 +212,7 @@ INSTANTIATE_TEST_CASE_P(AddToScaleShift, MulOrAddConversionTests, testing::Combi CONST(ngraph::Shape({1, 3, 1, 1}), 0.5), false)), testing::Values(SCALESHIFT))); -INSTANTIATE_TEST_CASE_P(MulAddToPower, MulAddConversionTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(MulAddToPower, MulAddConversionTests, testing::Combine( testing::Values(std::make_tuple(InputShape{DYN, 3, 64, 64}, CONST(ngraph::Shape({1}), 0.5), CONST(ngraph::Shape({1}), 0.5), false), @@ -224,7 +224,7 @@ INSTANTIATE_TEST_CASE_P(MulAddToPower, MulAddConversionTests, testing::Combine( CONST(ngraph::Shape({1}), 0.5), false)), testing::Values(POWER))); -INSTANTIATE_TEST_CASE_P(MulToPower, MulOrAddConversionTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(MulToPower, MulOrAddConversionTests, testing::Combine( testing::Values(std::make_tuple(InputShape{DYN, 3, 64, 64}, CONST(ngraph::Shape({1}), 0.5), NONE, false), @@ -236,7 +236,7 @@ INSTANTIATE_TEST_CASE_P(MulToPower, MulOrAddConversionTests, testing::Combine( NONE, false)), testing::Values(POWER))); -INSTANTIATE_TEST_CASE_P(AddToPower, MulOrAddConversionTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(AddToPower, MulOrAddConversionTests, testing::Combine( testing::Values(std::make_tuple(InputShape{DYN, 3, 64, 64}, NONE, CONST(ngraph::Shape({1}), 0.5), false), @@ -249,7 +249,7 @@ INSTANTIATE_TEST_CASE_P(AddToPower, MulOrAddConversionTests, testing::Combine( testing::Values(POWER))); -INSTANTIATE_TEST_CASE_P(MulAddNegative, MulAddConversionTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(MulAddNegative, MulAddConversionTests, testing::Combine( testing::Values(std::make_tuple(InputShape{DYN, 3, DYN}, CONST(ngraph::Shape({1, 1, 3, 1}), 0.5), CONST(ngraph::Shape({3, 1}), 0.5)/*detect broadcast case*/, false), @@ -270,7 +270,7 @@ INSTANTIATE_TEST_CASE_P(MulAddNegative, MulAddConversionTests, testing::Combine( CONST(ngraph::Shape({1, 3, 1, 1}), 0.5), false)), testing::Values(SAME))); -INSTANTIATE_TEST_CASE_P(MulToEltwise, MulOrAddConversionTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(MulToEltwise, MulOrAddConversionTests, testing::Combine( testing::Values(std::make_tuple(InputShape{DYN, 3, 64}, CONST(ngraph::Shape({1, 1, 64}), 0.5), NONE, false), @@ -303,7 +303,7 @@ INSTANTIATE_TEST_CASE_P(MulToEltwise, MulOrAddConversionTests, testing::Combine( NONE, true)), testing::Values(ELTWISE_PROD))); -INSTANTIATE_TEST_CASE_P(AddToEltwise, MulOrAddConversionTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(AddToEltwise, MulOrAddConversionTests, testing::Combine( testing::Values(std::make_tuple(InputShape{DYN, 3, 64}, NONE, CONST(ngraph::Shape({1, 1, 64}), 0.5), false), diff --git a/inference-engine/tests/functional/inference_engine/transformations/shuffle_channels_fusion_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/shuffle_channels_fusion_test.cpp index db379df386f..5819423f176 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/shuffle_channels_fusion_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/shuffle_channels_fusion_test.cpp @@ -127,7 +127,7 @@ const std::vector testValues = { { {128, 720 * 480}, {1, 2, 64, 720 * 480}, {0, 2, 1, 3}, {1, -1, 720, 480}, false, false }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( TransformationTests, ShuffleChannelsFusion, ::testing::ValuesIn(testValues), diff --git a/inference-engine/tests/functional/inference_engine/transformations/softmax_fusion.cpp b/inference-engine/tests/functional/inference_engine/transformations/softmax_fusion.cpp index f8f982cd481..e8d5ad21116 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/softmax_fusion.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/softmax_fusion.cpp @@ -55,7 +55,7 @@ TEST_P(SoftmaxFusionFixture, SoftmaxFusion) { ASSERT_TRUE(res.first) << res.second; } -INSTANTIATE_TEST_CASE_P(SoftmaxFusionTests, SoftmaxFusionFixture, +INSTANTIATE_TEST_SUITE_P(SoftmaxFusionTests, SoftmaxFusionFixture, ::testing::Values( std::make_tuple(1, 1), std::make_tuple(1, -2), @@ -109,7 +109,7 @@ TEST_P(NegativeSoftmaxFusionFixture, NegativeSoftmaxFusion) { ASSERT_TRUE(res.first) << res.second; } -INSTANTIATE_TEST_CASE_P(NegativeSoftmaxFusionTests, NegativeSoftmaxFusionFixture, +INSTANTIATE_TEST_SUITE_P(NegativeSoftmaxFusionTests, NegativeSoftmaxFusionFixture, ::testing::ValuesIn(std::vector, std::vector>>{ std::make_tuple, std::vector>({2}, {1}), std::make_tuple, std::vector>({1}, {-1}), diff --git a/inference-engine/tests/functional/inference_engine/transformations/transpose_sinking_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/transpose_sinking_test.cpp index 7e8db994280..9d0c6fdf715 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/transpose_sinking_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/transpose_sinking_test.cpp @@ -94,7 +94,7 @@ TEST_P(TransposeSinkingFQ, TransposeFQReduce) { } -INSTANTIATE_TEST_CASE_P(TransformationTest, TransposeSinkingFQ, testing::Values( +INSTANTIATE_TEST_SUITE_P(TransformationTest, TransposeSinkingFQ, testing::Values( TransposeFQReduceParams{{1, 3, 240, 140}, {0, 2, 3, 1}, {1}, {3}, {1, 1, 1, 1}, {1, 1, 1, 3}, {1, 2}, true, {1, 1, 1, 1}, {1, 3, 1, 1}, {1, 1, 1, 1}, {1, 3, 1, 1}, {2, 3}, {0, 2, 3, 1}}, TransposeFQReduceParams{{1, 3, 240, 140}, {0, 2, 3, 1}, {1}, {3}, {1, 1, 1, 1}, {1, 1, 1, 3}, {1, 2}, false, @@ -175,7 +175,7 @@ ASSERT_TRUE(res.first) << res.second; } -INSTANTIATE_TEST_CASE_P(TransposeSinkingReduces, TransposeSinking, testing::Combine( +INSTANTIATE_TEST_SUITE_P(TransposeSinkingReduces, TransposeSinking, testing::Combine( testing::Values( TransposeReduceParams{{1, 3, 240, 140}, {0, 2, 3, 1}, {1, 2}, true, {2, 3}, {0, 2, 3, 1}}, TransposeReduceParams{{10, 20, 30, 40, 50, 60, 70}, {0, 6, 1, 5, 2, 4, 3}, {1, 3, 6}, true, {6, 5, 3}, {0, 6, 1, 5, 2, 4, 3}}, @@ -194,7 +194,7 @@ INSTANTIATE_TEST_CASE_P(TransposeSinkingReduces, TransposeSinking, testing::Comb ngraph::opset6::ReduceLogicalAnd::type_info, ngraph::opset6::ReduceLogicalOr::type_info))); -INSTANTIATE_TEST_CASE_P(TransposeSinkingSqueeze, TransposeSinking, testing::Combine( +INSTANTIATE_TEST_SUITE_P(TransposeSinkingSqueeze, TransposeSinking, testing::Combine( testing::Values( TransposeReduceParams{{2, 3, 1, 1}, {0, 2, 3, 1}, {1, 2}, false, {2, 3}, {0, 1}}, TransposeReduceParams{{10, 20, 30, 1, 50, 1, 1}, {0, 6, 1, 5, 2, 4, 3}, {1, 3, 6}, false, {6, 5, 3}, {0, 1, 2, 3}}), diff --git a/inference-engine/tests/functional/inference_engine/transformations/transpose_to_reshape_test.cpp b/inference-engine/tests/functional/inference_engine/transformations/transpose_to_reshape_test.cpp index bd07dd7ef99..154f11e00c1 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/transpose_to_reshape_test.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/transpose_to_reshape_test.cpp @@ -112,7 +112,7 @@ TEST_P(TransposeToReshapeTests, CompareFunctions) { #define EMPTY_FUNCTION ReferenceParams(false, true) #define SHAPE_OF_GATHER ReferenceParams() -INSTANTIATE_TEST_CASE_P(KeepTranspose, TransposeToReshapeTests, +INSTANTIATE_TEST_SUITE_P(KeepTranspose, TransposeToReshapeTests, testing::Values(std::make_tuple(InputShape{1, 3, 64, 64}, TransposeOrder{0, 1, 3, 2}, SAME_FUNCTION), std::make_tuple(InputShape{1, 3, 1, 64}, TransposeOrder{2, 0, 3, 1}, SAME_FUNCTION), std::make_tuple(InputShape{1, 3, 1, 3}, TransposeOrder{3, 0, 2, 1}, SAME_FUNCTION), @@ -121,19 +121,19 @@ INSTANTIATE_TEST_CASE_P(KeepTranspose, TransposeToReshapeTests, std::make_tuple(InputShape{DYN, DYN, 1}, TransposeOrder{2, 1, 0}, SAME_FUNCTION), std::make_tuple(InputShape{DYN, DYN}, TransposeOrder{1, 0}, SAME_FUNCTION))); -INSTANTIATE_TEST_CASE_P(EliminateTranspose, TransposeToReshapeTests, +INSTANTIATE_TEST_SUITE_P(EliminateTranspose, TransposeToReshapeTests, testing::Values(std::make_tuple(InputShape{1, 3, 64, 64}, TransposeOrder{0, 1, 2, 3}, EMPTY_FUNCTION), std::make_tuple(InputShape{1, 1, 1}, TransposeOrder{2, 0, 1}, EMPTY_FUNCTION), std::make_tuple(InputShape{DYN, DYN}, TransposeOrder{0, 1}, EMPTY_FUNCTION))); -INSTANTIATE_TEST_CASE_P(ReshapeWithConstant, TransposeToReshapeTests, +INSTANTIATE_TEST_SUITE_P(ReshapeWithConstant, TransposeToReshapeTests, testing::Values(std::make_tuple(InputShape{1, 3, 64, 1}, TransposeOrder{0, 1, 3, 2}, ReferenceParams({1, 3, 1, 64})), std::make_tuple(InputShape{1, 3, 1, 64}, TransposeOrder{1, 0, 3, 2}, ReferenceParams({3, 1, 64, 1})), std::make_tuple(InputShape{DYN, DYN, 1}, TransposeOrder{0, 2, 1}, ReferenceParams({0, 1, -1})), std::make_tuple(InputShape{1, 1, DYN}, TransposeOrder{2, 1, 0}, ReferenceParams({-1, 0, 1})), std::make_tuple(InputShape{DYN, 1, 64, 1}, TransposeOrder{1, 0, 3, 2}, ReferenceParams({1, -1, 1, 64})))); -INSTANTIATE_TEST_CASE_P(ReshapeWithGather, TransposeToReshapeTests, +INSTANTIATE_TEST_SUITE_P(ReshapeWithGather, TransposeToReshapeTests, testing::Values(std::make_tuple(InputShape{DYN, 1, DYN, 1}, TransposeOrder{1, 0, 3, 2}, SHAPE_OF_GATHER), std::make_tuple(InputShape{1, DYN, DYN, DYN}, TransposeOrder{1, 2, 3, 0}, SHAPE_OF_GATHER))); diff --git a/inference-engine/tests/functional/inference_engine/transformations/weights_dequantize_to_fake_quantize.cpp b/inference-engine/tests/functional/inference_engine/transformations/weights_dequantize_to_fake_quantize.cpp index a860565d532..944456e01f2 100644 --- a/inference-engine/tests/functional/inference_engine/transformations/weights_dequantize_to_fake_quantize.cpp +++ b/inference-engine/tests/functional/inference_engine/transformations/weights_dequantize_to_fake_quantize.cpp @@ -84,7 +84,7 @@ TEST_P(TranslateNewWeightFormatToOldOne, ReshapeMatMul) { ASSERT_TRUE(res.first) << res.second; } -INSTANTIATE_TEST_CASE_P(NGraph, TranslateNewWeightFormatToOldOne, testing::Combine( +INSTANTIATE_TEST_SUITE_P(NGraph, TranslateNewWeightFormatToOldOne, testing::Combine( testing::Values( FQ_as_Mul_Sub_dequantize{-128, 127, 1, 2, (-128 - 1) * 2, (127 - 1) * 2, 256}, FQ_as_Mul_Sub_dequantize{-127, 127, 1, 2, (-127 - 1) * 2, (127 - 1) * 2, 255}, diff --git a/inference-engine/tests/functional/plugin/conformance/test_runner/src/read_ir/read_ir.cpp b/inference-engine/tests/functional/plugin/conformance/test_runner/src/read_ir/read_ir.cpp index 922573884a3..a3e70abb487 100644 --- a/inference-engine/tests/functional/plugin/conformance/test_runner/src/read_ir/read_ir.cpp +++ b/inference-engine/tests/functional/plugin/conformance/test_runner/src/read_ir/read_ir.cpp @@ -16,7 +16,7 @@ std::vector IRFolderPaths = {}; std::vector disabledTests = {}; namespace { -INSTANTIATE_TEST_CASE_P(conformance, +INSTANTIATE_TEST_SUITE_P(conformance, ReadIRTest, ::testing::Combine( ::testing::ValuesIn(CommonTestUtils::getFileListByPatternRecursive(IRFolderPaths, std::regex(R"(.*\.xml)"))), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/bf16_network_restoring.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/bf16_network_restoring.cpp index 6f41e879e7a..33556596198 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/bf16_network_restoring.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/bf16_network_restoring.cpp @@ -201,7 +201,7 @@ TEST_P(BF16NetworkRestore1, CompareWithRefImpl) { }; -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, BF16NetworkRestore1, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, BF16NetworkRestore1, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/bfloat16_helpers.hpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/bfloat16_helpers.hpp index 4c9414e0865..f319b2baf12 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/bfloat16_helpers.hpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/bfloat16_helpers.hpp @@ -120,7 +120,7 @@ typedef std::tuple< * TEST_P(ScaleshiftConv_x3_Eltwise, CompareWithRefImpl) { test(); }; - * 3. INSTANTIATE_TEST_CASE_P(smoke_bfloat16_NoReshape, ScaleshiftConv_x3_Eltwise, + * 3. INSTANTIATE_TEST_SUITE_P(smoke_bfloat16_NoReshape, ScaleshiftConv_x3_Eltwise, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/concat_in_place.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/concat_in_place.cpp index 6e5f1161d4c..d81033f0d2a 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/concat_in_place.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/concat_in_place.cpp @@ -140,7 +140,7 @@ TEST_P(Concat_in_place, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, Concat_in_place, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, Concat_in_place, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -149,7 +149,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, Concat_in_place, ::testing::Values(CommonTestUtils::DEVICE_CPU)), Concat_in_place::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, Concat_in_place, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, Concat_in_place, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_add.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_add.cpp index 7ba4ff64729..510345ca562 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_add.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_add.cpp @@ -121,7 +121,7 @@ TEST_P(ConvAdd, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ConvAdd, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, ConvAdd, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -130,7 +130,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ConvAdd, ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvAdd::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, ConvAdd, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, ConvAdd, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_conv.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_conv.cpp index 8695fdc3e53..bccdaef9862 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_conv.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_conv.cpp @@ -110,7 +110,7 @@ TEST_P(ConvConv, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ConvConv, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, ConvConv, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -119,7 +119,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ConvConv, ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvConv::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, ConvConv, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, ConvConv, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_dwconv_relu.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_dwconv_relu.cpp index 0f6350b5717..6c9180b78ba 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_dwconv_relu.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_dwconv_relu.cpp @@ -129,7 +129,7 @@ TEST_P(ConvDWConvReLU, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ConvDWConvReLU, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, ConvDWConvReLU, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -138,7 +138,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ConvDWConvReLU, ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvDWConvReLU::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, ConvDWConvReLU, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, ConvDWConvReLU, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_eltwise_depthwise.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_eltwise_depthwise.cpp index 224eb3b1c88..a673912fac0 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_eltwise_depthwise.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_eltwise_depthwise.cpp @@ -226,7 +226,7 @@ TEST_P(ConvEltwiseDepthwise, CompareWithRefImpl) { Run_test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_1x1_depthwise_BF16, ConvEltwiseDepthwise, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_1x1_depthwise_BF16, ConvEltwiseDepthwise, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(SizeVector({ 1, 5, 1, 1 })), @@ -236,7 +236,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_1x1_depthwise_BF16, ConvEltwiseDepth ::testing::Values(std::string("jit_avx512_1x1_BF16"))), ConvEltwiseDepthwise::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_gemm_depthwise_BF16, ConvEltwiseDepthwise, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_gemm_depthwise_BF16, ConvEltwiseDepthwise, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(SizeVector({ 1, 3, 10, 10 })), @@ -246,7 +246,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_gemm_depthwise_BF16, ConvEltwiseDept ::testing::Values(std::string("jit_avx512_BF16"))), ConvEltwiseDepthwise::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_conv_depthwise_BF16, ConvEltwiseDepthwise, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_conv_depthwise_BF16, ConvEltwiseDepthwise, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(SizeVector({ 1, 5, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_relu_pool_conv_relu_pool.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_relu_pool_conv_relu_pool.cpp index 536e92a142b..1b83146fca7 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_relu_pool_conv_relu_pool.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/conv_relu_pool_conv_relu_pool.cpp @@ -179,7 +179,7 @@ TEST_P(ConvReLUPoolConvReLUPool, CompareWithRefImpl) { }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ConvReLUPoolConvReLUPool, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, ConvReLUPoolConvReLUPool, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -188,7 +188,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ConvReLUPoolConvReLUPool, ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvReLUPoolConvReLUPool::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, ConvReLUPoolConvReLUPool, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, ConvReLUPoolConvReLUPool, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/elt_max.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/elt_max.cpp index 95eedfc6d81..150c3f71580 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/elt_max.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/elt_max.cpp @@ -132,7 +132,7 @@ TEST_P(Elt_max, CompareWithRefImpl) { }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, Elt_max, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, Elt_max, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -141,7 +141,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, Elt_max, ::testing::Values(CommonTestUtils::DEVICE_CPU)), Elt_max::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, Elt_max, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, Elt_max, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/elt_x3.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/elt_x3.cpp index 53516f32e57..5e71b92b19d 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/elt_x3.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/elt_x3.cpp @@ -189,7 +189,7 @@ TEST_P(Elt_x3, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, Elt_x3, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, Elt_x3, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -198,7 +198,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, Elt_x3, ::testing::Values(CommonTestUtils::DEVICE_CPU)), Elt_x3::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, Elt_x3, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, Elt_x3, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/faster_100_5_1_1_conv.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/faster_100_5_1_1_conv.cpp index 04928f1eed9..93141614abd 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/faster_100_5_1_1_conv.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/faster_100_5_1_1_conv.cpp @@ -117,7 +117,7 @@ TEST_P(Faster100_5_1_1_Conv, CompareWithRefImpl) { }; -INSTANTIATE_TEST_CASE_P(smoke_bfloat16_NoReshape, Faster100_5_1_1_Conv, +INSTANTIATE_TEST_SUITE_P(smoke_bfloat16_NoReshape, Faster100_5_1_1_Conv, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -126,7 +126,7 @@ INSTANTIATE_TEST_CASE_P(smoke_bfloat16_NoReshape, Faster100_5_1_1_Conv, ::testing::Values(CommonTestUtils::DEVICE_CPU)), Faster100_5_1_1_Conv::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, Faster100_5_1_1_Conv, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, Faster100_5_1_1_Conv, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/gather_multiply.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/gather_multiply.cpp index 8436ce73207..e4283a18931 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/gather_multiply.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/gather_multiply.cpp @@ -110,7 +110,7 @@ TEST_P(Gather_multiply, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, Gather_multiply, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, Gather_multiply, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), @@ -119,7 +119,7 @@ INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, Gather_multiply, ::testing::Values(CommonTestUtils::DEVICE_CPU)), Gather_multiply::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, Gather_multiply, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, Gather_multiply, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/gather_x2_add_mul_relu_concat_matmul.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/gather_x2_add_mul_relu_concat_matmul.cpp index 492faef5314..ee0ce7ae308 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/gather_x2_add_mul_relu_concat_matmul.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/gather_x2_add_mul_relu_concat_matmul.cpp @@ -137,7 +137,7 @@ TEST_P(Gather_x2_add_mul_relu_concat_matmul, CompareWithRefImpl) { }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, Gather_x2_add_mul_relu_concat_matmul, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, Gather_x2_add_mul_relu_concat_matmul, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -146,7 +146,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, Gather_x2_add_mul_relu_co ::testing::Values(CommonTestUtils::DEVICE_CPU)), Gather_x2_add_mul_relu_concat_matmul::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, Gather_x2_add_mul_relu_concat_matmul, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, Gather_x2_add_mul_relu_concat_matmul, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/memory_conv.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/memory_conv.cpp index ec754661f9d..fc2cebf3493 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/memory_conv.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/memory_conv.cpp @@ -105,7 +105,7 @@ TEST_P(MemoryConv, CheckTypeConversion) { ASSERT_EQ(ngraph::element::bf16, mem_w->input(0).get_element_type()); } -INSTANTIATE_TEST_CASE_P(smoke_CPU, MemoryConv, +INSTANTIATE_TEST_SUITE_P(smoke_CPU, MemoryConv, ::testing::Combine( ::testing::Values(Precision::BF16, Precision::FP32), ::testing::Values(SizeVector{1, 200}), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/mobilenet_ssd_with_branching.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/mobilenet_ssd_with_branching.cpp index 3215e553e57..1dadf97341b 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/mobilenet_ssd_with_branching.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/mobilenet_ssd_with_branching.cpp @@ -164,7 +164,7 @@ TEST_P(MobileNet_ssd_with_branching, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, MobileNet_ssd_with_branching, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, MobileNet_ssd_with_branching, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -173,7 +173,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, MobileNet_ssd_with_branch ::testing::Values(CommonTestUtils::DEVICE_CPU)), MobileNet_ssd_with_branching::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, MobileNet_ssd_with_branching, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, MobileNet_ssd_with_branching, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_eltwise_conv.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_eltwise_conv.cpp index 98f7ee43614..8b39519ed1b 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_eltwise_conv.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_eltwise_conv.cpp @@ -136,7 +136,7 @@ TEST_P(ScaleshiftConvEltwiseConv, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvEltwiseConv, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvEltwiseConv, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -145,7 +145,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvEltwiseConv ::testing::Values(CommonTestUtils::DEVICE_CPU)), ScaleshiftConvEltwiseConv::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConvEltwiseConv, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConvEltwiseConv, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_eltwise_relu_conv.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_eltwise_relu_conv.cpp index 014ab08e5f0..854ba27949b 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_eltwise_relu_conv.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_eltwise_relu_conv.cpp @@ -141,7 +141,7 @@ TEST_P(ScaleshiftConvEltwiseReluConv, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvEltwiseReluConv, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvEltwiseReluConv, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -150,7 +150,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvEltwiseRelu ::testing::Values(CommonTestUtils::DEVICE_CPU)), ScaleshiftConvEltwiseReluConv::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConvEltwiseReluConv, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConvEltwiseReluConv, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_eltwise_scaleshift.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_eltwise_scaleshift.cpp index 8abb82066de..c47afc8c24d 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_eltwise_scaleshift.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_eltwise_scaleshift.cpp @@ -133,7 +133,7 @@ TEST_P(ScaleshiftConvEltwiseScaleshift, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvEltwiseScaleshift, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvEltwiseScaleshift, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -142,7 +142,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvEltwiseScal ::testing::Values(CommonTestUtils::DEVICE_CPU)), ScaleshiftConvEltwiseScaleshift::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConvEltwiseScaleshift, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConvEltwiseScaleshift, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_elu_conv.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_elu_conv.cpp index f9735e60bc3..825501350d1 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_elu_conv.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_elu_conv.cpp @@ -121,7 +121,7 @@ TEST_P(ScaleshiftConvEluConv, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvEluConv, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvEluConv, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -130,7 +130,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvEluConv, ::testing::Values(CommonTestUtils::DEVICE_CPU)), ScaleshiftConvEluConv::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConvEluConv, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConvEluConv, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_relu.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_relu.cpp index 33d494658ba..bd725c29b90 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_relu.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_relu.cpp @@ -109,7 +109,7 @@ TEST_P(ScaleshiftConvRelu, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvRelu, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvRelu, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -118,7 +118,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConvRelu, ::testing::Values(CommonTestUtils::DEVICE_CPU)), ScaleshiftConvRelu::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConvRelu, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConvRelu, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_concat_relu.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_concat_relu.cpp index d00b5144b0f..aee55af910a 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_concat_relu.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_concat_relu.cpp @@ -126,7 +126,7 @@ TEST_P(ScaleshiftConv_x2_ConcatRelu, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x2_ConcatRelu, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x2_ConcatRelu, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -135,7 +135,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x2_ConcatR ::testing::Values(CommonTestUtils::DEVICE_CPU)), ScaleshiftConv_x2_ConcatRelu::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConv_x2_ConcatRelu, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConv_x2_ConcatRelu, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_eltwise.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_eltwise.cpp index 8a46347e5a7..97d29dd540e 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_eltwise.cpp @@ -119,7 +119,7 @@ TEST_P(ScaleshiftConv_x2_Eltwise, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x2_Eltwise, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x2_Eltwise, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -128,7 +128,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x2_Eltwise ::testing::Values(CommonTestUtils::DEVICE_CPU)), ScaleshiftConv_x2_Eltwise::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConv_x2_Eltwise, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConv_x2_Eltwise, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_mixed1_eltwise.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_mixed1_eltwise.cpp index b517c66a9e0..df17ac9fc02 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_mixed1_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_mixed1_eltwise.cpp @@ -119,7 +119,7 @@ TEST_P(ScaleshiftConv_x2_mixed1_Eltwise, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x2_mixed1_Eltwise, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x2_mixed1_Eltwise, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -128,7 +128,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x2_mixed1_ ::testing::Values(CommonTestUtils::DEVICE_CPU)), ScaleshiftConv_x2_mixed1_Eltwise::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConv_x2_mixed1_Eltwise, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConv_x2_mixed1_Eltwise, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_mixed2_eltwise.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_mixed2_eltwise.cpp index d8601d6f9dd..58f1be475f6 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_mixed2_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x2_mixed2_eltwise.cpp @@ -122,7 +122,7 @@ TEST_P(ScaleshiftConv_x2_mixed2_Eltwise, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x2_mixed2_Eltwise, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x2_mixed2_Eltwise, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -131,7 +131,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x2_mixed2_ ::testing::Values(CommonTestUtils::DEVICE_CPU)), ScaleshiftConv_x2_mixed2_Eltwise::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConv_x2_mixed2_Eltwise, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConv_x2_mixed2_Eltwise, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x3_eltwise.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x3_eltwise.cpp index aba2d02a111..36b8145cb17 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x3_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_conv_x3_eltwise.cpp @@ -155,7 +155,7 @@ TEST_P(ScaleshiftConv_x3_Eltwise, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x3_Eltwise, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x3_Eltwise, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -164,7 +164,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, ScaleshiftConv_x3_Eltwise ::testing::Values(CommonTestUtils::DEVICE_CPU)), ScaleshiftConv_x3_Eltwise::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConv_x3_Eltwise, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, ScaleshiftConv_x3_Eltwise, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_x2_conv_x2_eltwise.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_x2_conv_x2_eltwise.cpp index 043aa6b87a0..c710be46f10 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_x2_conv_x2_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_x2_conv_x2_eltwise.cpp @@ -141,7 +141,7 @@ TEST_P(Scaleshift_x2_Conv_x2_Eltwise, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, Scaleshift_x2_Conv_x2_Eltwise, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, Scaleshift_x2_Conv_x2_Eltwise, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -150,7 +150,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, Scaleshift_x2_Conv_x2_Elt ::testing::Values(CommonTestUtils::DEVICE_CPU)), Scaleshift_x2_Conv_x2_Eltwise::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, Scaleshift_x2_Conv_x2_Eltwise, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, Scaleshift_x2_Conv_x2_Eltwise, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_x3_conv_eltwise_relu.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_x3_conv_eltwise_relu.cpp index a9916754d1e..dbed0feef7d 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_x3_conv_eltwise_relu.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/scaleshift_x3_conv_eltwise_relu.cpp @@ -161,7 +161,7 @@ TEST_P(Scaleshift_x3_ConvEltwiseRelu, CompareWithRefImpl) { test(); }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, Scaleshift_x3_ConvEltwiseRelu, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, Scaleshift_x3_ConvEltwiseRelu, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -170,7 +170,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, Scaleshift_x3_ConvEltwise ::testing::Values(CommonTestUtils::DEVICE_CPU)), Scaleshift_x3_ConvEltwiseRelu::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, Scaleshift_x3_ConvEltwiseRelu, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, Scaleshift_x3_ConvEltwiseRelu, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/tail_fp32_optimization.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/tail_fp32_optimization.cpp index a4dcc9713ca..0d3cea9eef2 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/tail_fp32_optimization.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/tail_fp32_optimization.cpp @@ -124,7 +124,7 @@ TEST_P(PoolingAfterConv, CompareWithRefImpl) { }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, PoolingAfterConv, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, PoolingAfterConv, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -133,7 +133,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, PoolingAfterConv, ::testing::Values(CommonTestUtils::DEVICE_CPU)), PoolingAfterConv::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, PoolingAfterConv, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, PoolingAfterConv, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/bfloat16/topk_inputs_i32.cpp b/inference-engine/tests/functional/plugin/cpu/bfloat16/topk_inputs_i32.cpp index 32912caca0b..fb8d97c2981 100644 --- a/inference-engine/tests/functional/plugin/cpu/bfloat16/topk_inputs_i32.cpp +++ b/inference-engine/tests/functional/plugin/cpu/bfloat16/topk_inputs_i32.cpp @@ -146,7 +146,7 @@ TEST_P(TopKInputsI32, CompareWithRefImpl) { }; -INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, TopKInputsI32, +INSTANTIATE_TEST_SUITE_P(smoke_FP32_bfloat16_NoReshape, TopKInputsI32, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::FP32), @@ -155,7 +155,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FP32_bfloat16_NoReshape, TopKInputsI32, ::testing::Values(CommonTestUtils::DEVICE_CPU)), TopKInputsI32::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BF16_bfloat16_NoReshape, TopKInputsI32, +INSTANTIATE_TEST_SUITE_P(smoke_BF16_bfloat16_NoReshape, TopKInputsI32, ::testing::Combine( ::testing::Values(Precision::FP32), ::testing::Values(Precision::BF16), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/add_output.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/add_output.cpp index 030da02964b..e197301c534 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/add_output.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/add_output.cpp @@ -32,6 +32,6 @@ std::vector testCases = { addOutputsParams(getTargetNetwork(), {"Memory"}, CommonTestUtils::DEVICE_CPU) }; -INSTANTIATE_TEST_CASE_P(smoke_AddOutputBasic, AddOutputsTest, +INSTANTIATE_TEST_SUITE_P(smoke_AddOutputBasic, AddOutputsTest, ::testing::ValuesIn(testCases), AddOutputsTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/caching_tests.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/caching_tests.cpp index c9e4d9c4294..c541f4e21ba 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/caching_tests.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/caching_tests.cpp @@ -22,7 +22,7 @@ namespace { 1, 2 }; - INSTANTIATE_TEST_CASE_P(smoke_CachingSupportCase_CPU, LoadNetworkCacheTestBase, + INSTANTIATE_TEST_SUITE_P(smoke_CachingSupportCase_CPU, LoadNetworkCacheTestBase, ::testing::Combine( ::testing::ValuesIn(LoadNetworkCacheTestBase::getStandardFunctions()), ::testing::ValuesIn(precisionsCPU), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/config.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/config.cpp index e3f0adb1cb6..ffc91dee6d1 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/config.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/config.cpp @@ -45,21 +45,21 @@ namespace { {{InferenceEngine::KEY_AUTO_DEVICE_LIST , CommonTestUtils::DEVICE_CPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CorrectConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CorrectConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(Configs)), CorrectConfigTests::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_MULTI), ::testing::ValuesIn(MultiConfigs)), CorrectConfigTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, CorrectConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, CorrectConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), @@ -90,56 +90,56 @@ namespace { {{InferenceEngine::MultiDeviceConfigParams::KEY_MULTI_DEVICE_PRIORITIES , CommonTestUtils::DEVICE_CPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(conf)), CorrectConfigAPITests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, CorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, CorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiconf)), CorrectConfigAPITests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, CorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, CorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(AutoConfigs)), CorrectConfigAPITests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, IncorrectConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, IncorrectConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(inconfigs)), IncorrectConfigTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, IncorrectConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, IncorrectConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiinconfigs)), 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_CPU), ::testing::ValuesIn(inconfigs)), IncorrectConfigAPITests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, IncorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, IncorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiinconfigs)), IncorrectConfigAPITests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, IncorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, IncorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/core_integration.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/core_integration.cpp index 54fbba129b5..040911489e5 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/core_integration.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/core_integration.cpp @@ -13,15 +13,15 @@ namespace { // IE Class Common tests with // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassCommon, IEClassBasicTestP, ::testing::Values(std::make_pair("MKLDNNPlugin", "CPU"))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassNetworkTestP, IEClassNetworkTestP, ::testing::Values("CPU")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassImportExportTestP, IEClassImportExportTestP, ::testing::Values("HETERO:CPU")); @@ -29,43 +29,43 @@ INSTANTIATE_TEST_CASE_P( // IE Class GetMetric // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricTest, IEClassGetMetricTest_SUPPORTED_CONFIG_KEYS, ::testing::Values("CPU", "MULTI", "HETERO", "AUTO")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricTest, IEClassGetMetricTest_SUPPORTED_METRICS, ::testing::Values("CPU", "MULTI", "HETERO", "AUTO")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricTest, IEClassGetMetricTest_AVAILABLE_DEVICES, ::testing::Values("CPU")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricTest, IEClassGetMetricTest_FULL_DEVICE_NAME, ::testing::Values("CPU", "MULTI", "HETERO", "AUTO")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricTest, IEClassGetMetricTest_OPTIMIZATION_CAPABILITIES, ::testing::Values("CPU", "AUTO")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricTest, IEClassGetMetricTest_RANGE_FOR_ASYNC_INFER_REQUESTS, ::testing::Values("CPU")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricTest, IEClassGetMetricTest_RANGE_FOR_STREAMS, ::testing::Values("CPU")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricTest, IEClassGetMetricTest_ThrowUnsupported, ::testing::Values("CPU", "MULTI", "HETERO", "AUTO")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetConfigTest, IEClassGetConfigTest_ThrowUnsupported, ::testing::Values("CPU", "MULTI", "HETERO", "AUTO")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetAvailableDevices, IEClassGetAvailableDevices, ::testing::Values("CPU")); @@ -73,7 +73,7 @@ INSTANTIATE_TEST_CASE_P( // IE Class GetConfig // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetConfigTest, IEClassGetConfigTest, ::testing::Values("CPU")); @@ -81,23 +81,23 @@ INSTANTIATE_TEST_CASE_P( // Executable Network GetMetric // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS, ::testing::Values("CPU", "MULTI:CPU", "HETERO:CPU", "AUTO:CPU")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_SUPPORTED_METRICS, ::testing::Values("CPU", "MULTI:CPU", "HETERO:CPU", "AUTO:CPU")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_NETWORK_NAME, ::testing::Values("CPU", "MULTI:CPU", "HETERO:CPU", "AUTO:CPU")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_OPTIMAL_NUMBER_OF_INFER_REQUESTS, ::testing::Values("CPU", "MULTI:CPU", "HETERO:CPU", "AUTO:CPU")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_ThrowsUnsupported, ::testing::Values("CPU", "MULTI:CPU", "HETERO:CPU", "AUTO:CPU")); @@ -105,11 +105,11 @@ INSTANTIATE_TEST_CASE_P( // Executable Network GetConfig / SetConfig // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassExecutableNetworkGetConfigTest, IEClassExecutableNetworkGetConfigTest, ::testing::Values("CPU")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassExecutableNetworkSetConfigTest, IEClassExecutableNetworkSetConfigTest, ::testing::Values("CPU")); @@ -117,19 +117,19 @@ INSTANTIATE_TEST_CASE_P( // Hetero Executable Network GetMetric // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassHeteroExecutableNetworkGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS, ::testing::Values("CPU")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassHeteroExecutableNetworkGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_METRICS, ::testing::Values("CPU")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassHeteroExecutableNetworkGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_NETWORK_NAME, ::testing::Values("CPU")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassHeteroExecutableNetworkGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_TARGET_FALLBACK, ::testing::Values("CPU")); @@ -150,13 +150,13 @@ TEST(IEClassBasicTest, smoke_SetConfigAfterCreatedThrow) { // IE Class Query network -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassQueryNetworkTest, IEClassQueryNetworkTest, ::testing::Values("CPU")); // IE Class Load network -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassLoadNetworkTest, IEClassLoadNetworkTest, ::testing::Values("CPU")); } // namespace \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/core_threading_tests.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/core_threading_tests.cpp index 87dc75d3be8..fe294e97075 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/core_threading_tests.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/core_threading_tests.cpp @@ -18,16 +18,16 @@ const Params paramsStreams[] = { }; } // namespace -INSTANTIATE_TEST_CASE_P(CPU, CoreThreadingTests, testing::ValuesIn(params), CoreThreadingTests::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(CPU, CoreThreadingTests, testing::ValuesIn(params), CoreThreadingTests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(CPU, CoreThreadingTestsWithIterations, +INSTANTIATE_TEST_SUITE_P(CPU, CoreThreadingTestsWithIterations, testing::Combine(testing::ValuesIn(params), testing::Values(4), testing::Values(50), testing::Values(ModelClass::Default)), CoreThreadingTestsWithIterations::getTestCaseName); -INSTANTIATE_TEST_CASE_P(CPU_Streams, CoreThreadingTestsWithIterations, +INSTANTIATE_TEST_SUITE_P(CPU_Streams, CoreThreadingTestsWithIterations, testing::Combine(testing::ValuesIn(paramsStreams), testing::Values(4), testing::Values(50), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/cpp_holders.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/cpp_holders.cpp index b71d2e3d0a1..22546c9b74a 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/cpp_holders.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/cpp_holders.cpp @@ -21,7 +21,7 @@ namespace { {0, 1, 3, 2} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, HoldersTest, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, HoldersTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(orders)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/exec_graph_info.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/exec_graph_info.cpp index c54175304f5..ee0bad4bb1f 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/exec_graph_info.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/exec_graph_info.cpp @@ -22,21 +22,21 @@ namespace { {{ InferenceEngine::KEY_AUTO_DEVICE_LIST , CommonTestUtils::DEVICE_CPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, ExecGraphTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, ExecGraphTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(configs)), ExecGraphTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, ExecGraphTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, ExecGraphTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiConfigs)), ExecGraphTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, ExecGraphTests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, ExecGraphTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request.cpp index ced3a3d2210..b5c9180ef84 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request.cpp @@ -28,21 +28,21 @@ namespace { {{ AUTO_CONFIG_KEY(DEVICE_LIST) , CommonTestUtils::DEVICE_CPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(configs)), InferRequestTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferRequestTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(Multiconfigs)), InferRequestTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_AutoPlugin_BehaviorTests, InferRequestTests, + INSTANTIATE_TEST_SUITE_P(smoke_AutoPlugin_BehaviorTests, InferRequestTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_callback.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_callback.cpp index 3033c404bbf..8483b82c3db 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_callback.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_callback.cpp @@ -25,21 +25,21 @@ const std::vector> autoConfigs = { {{ AUTO_CONFIG_KEY(DEVICE_LIST) , CommonTestUtils::DEVICE_CPU}} }; -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CallbackTests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CallbackTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(configs)), CallbackTests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, CallbackTests, +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, CallbackTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiConfigs)), CallbackTests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, CallbackTests, +INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, CallbackTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_cancellation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_cancellation.cpp index 612d9047208..0d2aa9a72fd 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_cancellation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_cancellation.cpp @@ -15,7 +15,7 @@ const std::vector> configs = { {}, }; -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CancellationTests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CancellationTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_config.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_config.cpp index 3db325234cf..1f5e502818a 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_config.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_config.cpp @@ -54,42 +54,42 @@ namespace { {{InferenceEngine::KEY_AUTO_DEVICE_LIST , CommonTestUtils::DEVICE_CPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(configs)), InferConfigTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiConfigs)), InferConfigTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, InferConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(autoConfigs)), InferConfigTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferConfigInTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferConfigInTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(InConfigs)), InferConfigTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferConfigInTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferConfigInTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(MultiInConfigs)), InferConfigInTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, InferConfigInTests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferConfigInTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_input.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_input.cpp index eb988c0043a..73bc9fb8f97 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_input.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_input.cpp @@ -29,21 +29,21 @@ namespace { {{InferenceEngine::KEY_AUTO_DEVICE_LIST , CommonTestUtils::DEVICE_CPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestInputTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestInputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(configs)), InferRequestInputTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferRequestInputTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestInputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiConfigs)), InferRequestInputTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, InferRequestInputTests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestInputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_output.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_output.cpp index a77253f8900..36ad2752244 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_output.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/infer_request_output.cpp @@ -25,21 +25,21 @@ namespace { {{InferenceEngine::KEY_AUTO_DEVICE_LIST , CommonTestUtils::DEVICE_CPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestOutputTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestOutputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(configs)), InferRequestOutputTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferRequestOutputTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestOutputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiConfigs)), InferRequestOutputTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, InferRequestOutputTests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestOutputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/invalid_cases/proposal.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/invalid_cases/proposal.cpp index dd8c3167e12..48fe63eb398 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/invalid_cases/proposal.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/invalid_cases/proposal.cpp @@ -44,7 +44,7 @@ const auto proposalParams = ::testing::Combine( ::testing::ValuesIn(framework_) ); -INSTANTIATE_TEST_CASE_P(invalid, ProposalBehTest, +INSTANTIATE_TEST_SUITE_P(invalid, ProposalBehTest, ::testing::Combine( proposalParams, ::testing::ValuesIn(img_info_invalid), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/layout.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/layout.cpp index 908ec597e0d..f3854504d81 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/layout.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/layout.cpp @@ -26,7 +26,7 @@ namespace { { 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_CPU, "HETERO:CPU"), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/perf_counters.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/perf_counters.cpp index 8bf1a8f95ba..39aff76e6fd 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/perf_counters.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/perf_counters.cpp @@ -14,14 +14,14 @@ namespace { {{ MULTI_CONFIG_KEY(DEVICE_PRIORITIES) , CommonTestUtils::DEVICE_CPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, PerfCountersTest, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, PerfCountersTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(configs)), PerfCountersTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, PerfCountersTest, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, PerfCountersTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_MULTI), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/preprocessing.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/preprocessing.cpp index f4059b46882..657dfe5e947 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/preprocessing.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/preprocessing.cpp @@ -17,7 +17,7 @@ const std::vector> configs = { {} }; -INSTANTIATE_TEST_CASE_P(BehaviourPreprocessingTestsViaSetInput, PreprocessingPrecisionConvertTest, +INSTANTIATE_TEST_SUITE_P(BehaviourPreprocessingTestsViaSetInput, PreprocessingPrecisionConvertTest, ::testing::Combine( ::testing::ValuesIn(inputPrecisions), ::testing::Values(1, 2, 3, 4, 5), // Number of input tensor channels @@ -26,7 +26,7 @@ INSTANTIATE_TEST_CASE_P(BehaviourPreprocessingTestsViaSetInput, PreprocessingPre ::testing::ValuesIn(configs)), PreprocessingPrecisionConvertTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(BehaviourPreprocessingTestsViaGetBlob, PreprocessingPrecisionConvertTest, +INSTANTIATE_TEST_SUITE_P(BehaviourPreprocessingTestsViaGetBlob, PreprocessingPrecisionConvertTest, ::testing::Combine( ::testing::ValuesIn(inputPrecisions), ::testing::Values(4, 5), // Number of input tensor channels (blob_copy only supports 4d and 5d tensors) diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_blob.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_blob.cpp index 923cf62a61c..214e9dc9cb4 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_blob.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_blob.cpp @@ -18,4 +18,4 @@ const auto params = ::testing::Combine(::testing::ValuesIn(precisionSet), ::testing::ValuesIn(typeSet), ::testing::Values(CommonTestUtils::DEVICE_CPU)); -INSTANTIATE_TEST_CASE_P(smoke_SetBlobCPU, SetBlobTest, params, SetBlobTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_SetBlobCPU, SetBlobTest, params, SetBlobTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_blob_of_kind.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_blob_of_kind.cpp index c6814674d3f..0ce335bcfad 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_blob_of_kind.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_blob_of_kind.cpp @@ -19,26 +19,26 @@ const SetBlobOfKindConfig autoConfig{}; const SetBlobOfKindConfig multiConfig{{ MULTI_CONFIG_KEY(DEVICE_PRIORITIES) , CommonTestUtils::DEVICE_CPU}}; const SetBlobOfKindConfig heteroConfig{{ "TARGET_FALLBACK", CommonTestUtils::DEVICE_CPU }}; -INSTANTIATE_TEST_CASE_P(smoke_SetBlobOfKindCPU, SetBlobOfKindTest, +INSTANTIATE_TEST_SUITE_P(smoke_SetBlobOfKindCPU, SetBlobOfKindTest, ::testing::Combine(::testing::ValuesIn(blobKinds), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(cpuConfig)), SetBlobOfKindTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_SetBlobOfKindMULTI, SetBlobOfKindTest, +INSTANTIATE_TEST_SUITE_P(smoke_SetBlobOfKindMULTI, SetBlobOfKindTest, ::testing::Combine(::testing::ValuesIn(blobKinds), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::Values(multiConfig)), SetBlobOfKindTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_SetBlobOfKindAUTO, SetBlobOfKindTest, +INSTANTIATE_TEST_SUITE_P(smoke_SetBlobOfKindAUTO, SetBlobOfKindTest, ::testing::Combine(::testing::ValuesIn(blobKinds), ::testing::Values(CommonTestUtils::DEVICE_AUTO + std::string(":") + CommonTestUtils::DEVICE_CPU), ::testing::Values(autoConfig)), SetBlobOfKindTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_SetBlobOfKindHETERO, SetBlobOfKindTest, +INSTANTIATE_TEST_SUITE_P(smoke_SetBlobOfKindHETERO, SetBlobOfKindTest, ::testing::Combine(::testing::ValuesIn(blobKinds), ::testing::Values(CommonTestUtils::DEVICE_HETERO), ::testing::Values(heteroConfig)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_preprocess.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_preprocess.cpp index 3db386c50c7..d3450e08ee2 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_preprocess.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/set_preprocess.cpp @@ -31,28 +31,28 @@ namespace { {{ InferenceEngine::KEY_AUTO_DEVICE_LIST , CommonTestUtils::DEVICE_CPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, PreprocessTest, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, PreprocessTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(configs)), 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), ::testing::ValuesIn(heteroConfigs)), 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_Auto_BehaviorTests, PreprocessTest, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, PreprocessTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), @@ -74,7 +74,7 @@ namespace { 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), @@ -88,7 +88,7 @@ namespace { ::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(), @@ -102,7 +102,7 @@ namespace { ::testing::ValuesIn(configs)), PreprocessDynamicallyInSetBlobTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Hetero_BehaviorTests, PreprocessConversionTest, + INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, PreprocessConversionTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(ioPrecisions), @@ -116,7 +116,7 @@ namespace { ::testing::ValuesIn(heteroConfigs)), PreprocessConversionTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Hetero_BehaviorTests, PreprocessDynamicallyInSetBlobTest, + INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, PreprocessDynamicallyInSetBlobTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Bool(), @@ -130,7 +130,7 @@ namespace { ::testing::ValuesIn(heteroConfigs)), PreprocessDynamicallyInSetBlobTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, PreprocessConversionTest, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, PreprocessConversionTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(ioPrecisions), @@ -144,7 +144,7 @@ namespace { ::testing::ValuesIn(multiConfigs)), PreprocessConversionTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, PreprocessDynamicallyInSetBlobTest, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, PreprocessDynamicallyInSetBlobTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Bool(), @@ -158,7 +158,7 @@ namespace { ::testing::ValuesIn(multiConfigs)), PreprocessDynamicallyInSetBlobTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, PreprocessConversionTest, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, PreprocessConversionTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(ioPrecisions), @@ -172,7 +172,7 @@ namespace { ::testing::ValuesIn(autoConfigs)), PreprocessConversionTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, PreprocessDynamicallyInSetBlobTest, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, PreprocessDynamicallyInSetBlobTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Bool(), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/test_plugin.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/test_plugin.cpp index da76bc26498..f8728390c9e 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/test_plugin.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/test_plugin.cpp @@ -46,63 +46,63 @@ namespace { }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, BehaviorTestOutput, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, BehaviorTestOutput, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(configsOutput)), BehaviorTestOutput::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, BehaviorTestOutput, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, BehaviorTestOutput, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(MultiConfigsInputOutput)), BehaviorTestOutput::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, BehaviorTestOutput, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, BehaviorTestOutput, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(AutoConfigsInputOutput)), BehaviorTestOutput::getTestCaseName); - 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_CPU), ::testing::ValuesIn(configs)), BehaviorTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, BehaviorTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, BehaviorTests, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(MultiConfigs)), BehaviorTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, BehaviorTests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, BehaviorTests, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(AutoConfigs)), 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_CPU), ::testing::ValuesIn(configsInput)), BehaviorTestInput::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, BehaviorTestInput, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, BehaviorTestInput, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(MultiConfigsInputOutput)), BehaviorTestInput::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, BehaviorTestInput, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, BehaviorTestInput, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/version.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/version.cpp index bcbe9dfaf08..66b5a3c0668 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/version.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/behavior/version.cpp @@ -22,28 +22,28 @@ namespace { {{ HETERO_CONFIG_KEY(DUMP_GRAPH_DOT) , CommonTestUtils::DEVICE_CPU}} }; - 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_CPU), ::testing::ValuesIn(configs)), VersionTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, VersionTest, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, VersionTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(Multiconfigs)), VersionTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, VersionTest, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, VersionTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(Autoconfigs)), VersionTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Hetero_BehaviorTests, VersionTest, + INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, VersionTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_HETERO), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/configuration_tests/configuration_tests.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/configuration_tests/configuration_tests.cpp index dc1e42f28e2..48f4b0bc4d2 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/configuration_tests/configuration_tests.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/configuration_tests/configuration_tests.cpp @@ -13,7 +13,7 @@ auto defaultBindThreadParameter = InferenceEngine::Parameter{std::string{CONFIG_ #else auto defaultBindThreadParameter = InferenceEngine::Parameter{std::string{CONFIG_VALUE(YES)}}; #endif -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Basic, DefaultConfigurationTest, ::testing::Combine( diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/configuration_tests/dynamic_batch.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/configuration_tests/dynamic_batch.cpp index 6c882e13ab7..0b6ff2ae24e 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/configuration_tests/dynamic_batch.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/configuration_tests/dynamic_batch.cpp @@ -19,7 +19,7 @@ std::map additional_config = { } // namespace -INSTANTIATE_TEST_CASE_P(smoke_DynamicBatchTest_async, DynamicBatchTest, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicBatchTest_async, DynamicBatchTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(InferenceEngine::Precision::FP32), @@ -28,7 +28,7 @@ INSTANTIATE_TEST_CASE_P(smoke_DynamicBatchTest_async, DynamicBatchTest, ::testing::Values(additional_config)), DynamicBatchTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_DynamicBatchTest_sync, DynamicBatchTest, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicBatchTest_sync, DynamicBatchTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(InferenceEngine::Precision::FP32), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/exec_graph_serialization.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/exec_graph_serialization.cpp index f8bcd35e9a4..5d0346424a1 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/exec_graph_serialization.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/exec_graph_serialization.cpp @@ -9,7 +9,7 @@ namespace { using namespace ExecutionGraphTests; -INSTANTIATE_TEST_CASE_P(smoke_serialization, ExecGraphSerializationTest, +INSTANTIATE_TEST_SUITE_P(smoke_serialization, ExecGraphSerializationTest, ::testing::Values(CommonTestUtils::DEVICE_CPU), ExecGraphSerializationTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/keep_assign.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/keep_assign.cpp index 83f9808d267..de0da5d1607 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/keep_assign.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/keep_assign.cpp @@ -9,7 +9,7 @@ using namespace ExecutionGraphTests; namespace { -INSTANTIATE_TEST_CASE_P(smoke_KeepAssign, ExecGraphKeepAssignNode, +INSTANTIATE_TEST_SUITE_P(smoke_KeepAssign, ExecGraphKeepAssignNode, ::testing::Values(CommonTestUtils::DEVICE_CPU), ExecGraphKeepAssignNode::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/nms_transformation_for_last_node.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/nms_transformation_for_last_node.cpp index 5d5fbe597f8..8d4d11972d9 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/nms_transformation_for_last_node.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/nms_transformation_for_last_node.cpp @@ -8,6 +8,6 @@ namespace { using namespace ExecutionGraphTests; -INSTANTIATE_TEST_CASE_P(smoke_NmsTransformationLastNode, ExecGraphNmsTransformLastNode, ::testing::Values(CommonTestUtils::DEVICE_CPU), +INSTANTIATE_TEST_SUITE_P(smoke_NmsTransformationLastNode, ExecGraphNmsTransformLastNode, ::testing::Values(CommonTestUtils::DEVICE_CPU), ExecGraphNmsTransformLastNode::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/num_inputs_fusing_bin_conv.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/num_inputs_fusing_bin_conv.cpp index 4ff4c385747..4b311285361 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/num_inputs_fusing_bin_conv.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/num_inputs_fusing_bin_conv.cpp @@ -8,6 +8,6 @@ namespace { using namespace ExecutionGraphTests; -INSTANTIATE_TEST_CASE_P(smoke_inputsNumFusingBinConv, ExecGraphInputsFusingBinConv, ::testing::Values(CommonTestUtils::DEVICE_CPU), +INSTANTIATE_TEST_SUITE_P(smoke_inputsNumFusingBinConv, ExecGraphInputsFusingBinConv, ::testing::Values(CommonTestUtils::DEVICE_CPU), ExecGraphInputsFusingBinConv::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/remove_parameter.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/remove_parameter.cpp index 790a8f91aed..2706e2c3578 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/remove_parameter.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/remove_parameter.cpp @@ -9,7 +9,7 @@ using namespace ExecutionGraphTests; namespace { -INSTANTIATE_TEST_CASE_P(smoke_removeParameter, ExecGraphRemoveParameterNode, +INSTANTIATE_TEST_SUITE_P(smoke_removeParameter, ExecGraphRemoveParameterNode, ::testing::Values(CommonTestUtils::DEVICE_CPU), ExecGraphRemoveParameterNode::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/runtime_precision.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/runtime_precision.cpp index f95ba68b777..6d1272c2c8f 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/runtime_precision.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/runtime_precision.cpp @@ -24,7 +24,7 @@ const std::vector params = { {makeFakeQuantizeBinaryConvolutionFunction, {Precision::FP32}, {{"FakeQuantize", Precision::FP32}, {"BinaryConvolution", Precision::BIN}}}, }; -INSTANTIATE_TEST_CASE_P(smoke_ExecGraph, ExecGraphRuntimePrecision, +INSTANTIATE_TEST_SUITE_P(smoke_ExecGraph, ExecGraphRuntimePrecision, ::testing::Combine( ::testing::ValuesIn(params), ::testing::Values(CommonTestUtils::DEVICE_CPU)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/unique_node_names.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/unique_node_names.cpp index ebd1d57c3ef..d470fc7bc04 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/unique_node_names.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/execution_graph_tests/unique_node_names.cpp @@ -15,7 +15,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::FP32 }; -INSTANTIATE_TEST_CASE_P(smoke_NoReshape, ExecGraphUniqueNodeNames, +INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, ExecGraphUniqueNodeNames, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({1, 2, 5, 5})), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/hetero/query_network.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/hetero/query_network.cpp index ff05d70af9c..0ba1d74c899 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/hetero/query_network.cpp +++ b/inference-engine/tests/functional/plugin/cpu/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("CPU", "HETERO:CPU", "MULTI:CPU"), ::testing::Values(ConvBias)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/hetero/synthetic.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/hetero/synthetic.cpp index 49f4ddda323..8c531cb2c15 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/hetero/synthetic.cpp +++ b/inference-engine/tests/functional/plugin/cpu/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{{"CPU0", "MKLDNNPlugin"}, {"CPU1", "MKLDNNPlugin"}}), ::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{{"CPU0", "MKLDNNPlugin"}, {"CPU1", "MKLDNNPlugin"}}), ::testing::ValuesIn(HeteroTests::HeteroSyntheticTest::_randomMajorNodeFunctions)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp index c90dc6545d6..f575a6cc2ec 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp @@ -68,7 +68,7 @@ const std::vector params = { { {}, {}, false }, { {}, {}, true }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, AddTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, AddTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp index a657058d1fe..6f45a17b352 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp @@ -76,7 +76,7 @@ const std::vector params{ } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ClampTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ClampTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp index be35416515a..60d5e1ff730 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp @@ -49,7 +49,7 @@ const std::vector shapes = { ngraph::Shape({ 4, 3, 16, 16 }) }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConcatTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::ValuesIn(shapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp index 5688483d58b..0141d37d23a 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp @@ -42,7 +42,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConcatWithChildAndOutputTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithChildAndOutputTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 6, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp index fe0cd0b5465..dc7d9936e6a 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp @@ -45,7 +45,7 @@ const std::vector testValues = { const std::vector multiChannel = { true/*, false*/ }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConcatWithDifferentChildrenTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithDifferentChildrenTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 6, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp index c4f984b8e94..8c24e9cec20 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp @@ -31,7 +31,7 @@ const std::vector shapes = { { 4, 3, 16, 16 } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConcatWithIntermediateTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithIntermediateTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(shapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp index 9ece832517f..a0724e1bfe6 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_transformation.cpp @@ -28,7 +28,7 @@ const std::vector shapes = { { 4, 3, 16, 16 } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConcatWithNeighborsGraphTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithNeighborsGraphTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::ValuesIn(shapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp index 4c9d43c124f..f6d2f1c16b7 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp @@ -45,7 +45,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConcatWithSplitTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithSplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 6, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp index 223f9743a61..180ef107e02 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -108,7 +108,7 @@ const std::vector outputShapes = { { 16, 16 } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConvolutionBackpropDataTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConvolutionBackpropDataTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(inputShapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp index fdaae7a35f7..5cb46fc2ee8 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp @@ -238,7 +238,7 @@ const std::vector shapes = { { 4, 3, 4, 4 } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConvolutionQDqTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConvolutionQDqTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(shapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp index 594e645980a..0a574422ae8 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp @@ -101,7 +101,7 @@ const std::vector shapes = { { 4, 3, 16, 16 } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConvolutionTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConvolutionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(shapes), @@ -125,7 +125,7 @@ const std::vector i } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConvolutionWIthIncorrectWeightsTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConvolutionWIthIncorrectWeightsTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp index baf025aefac..d9057f66a92 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp @@ -34,7 +34,7 @@ const auto DepthToSpaceBS2 = ::testing::Combine( ::testing::Values(2) ); -INSTANTIATE_TEST_CASE_P(LPT_BS2, DepthToSpaceTransformation, DepthToSpaceBS2, DepthToSpaceTransformation::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(LPT_BS2, DepthToSpaceTransformation, DepthToSpaceBS2, DepthToSpaceTransformation::getTestCaseName); const std::vector inputShapesBS3 = { {1, 9, 3, 3}, {2, 27, 5, 4} @@ -48,5 +48,5 @@ const auto DepthToSpaceBS3 = ::testing::Combine( ::testing::Values(3) ); -INSTANTIATE_TEST_CASE_P(smoke_LPT_BS3, DepthToSpaceTransformation, DepthToSpaceBS3, DepthToSpaceTransformation::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_LPT_BS3, DepthToSpaceTransformation, DepthToSpaceBS3, DepthToSpaceTransformation::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp index cf86089bfd6..d0f2b614f43 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp @@ -26,7 +26,7 @@ const std::vector fakeQuantizes = // FakeQuantizeOnData -INSTANTIATE_TEST_CASE_P(smoke_LPT, FakeQuantizeAndAvgPoolTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndAvgPoolTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp index fe184eef516..78df11d2f78 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp @@ -26,7 +26,7 @@ const std::vector fakeQuantizes = // FakeQuantizeOnData -INSTANTIATE_TEST_CASE_P(smoke_LPT, FakeQuantizeAndMaxPoolTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndMaxPoolTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp index 29124d9503b..adb79c659ec 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp @@ -28,7 +28,7 @@ const std::vector testValues = } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp index 3b897406957..f2e7df2acde 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp @@ -56,7 +56,7 @@ const std::vector testVa }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FakeQuantizePrecisionSelectionTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizePrecisionSelectionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp index 0208a6b0e72..69ce1065c20 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp @@ -59,7 +59,7 @@ const std::vector fakeQuantizeOnDataValues = { // { 256ul, { 1ul }, { -1.28f} , { 1.27f } } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FakeQuantizeTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index 073e13da0b7..af1a82dcd41 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -101,7 +101,7 @@ const std::vector fakeQuanti } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FakeQuantizeWithNotOptimalTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeWithNotOptimalTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp index e439c53abce..a285b41a536 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp @@ -41,7 +41,7 @@ const std::vector tras LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParams() }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FullyConnectedTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FullyConnectedTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(shapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp index f59e9bcf8e8..8082ecfe96d 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp @@ -31,7 +31,7 @@ const std::vector deqOperat const std::vector constInput = { true, false }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FuseConvertTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FuseConvertTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::ValuesIn(inputAndQuantizationShapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp index 189cc02d14b..8d4b127eb48 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp @@ -33,7 +33,7 @@ const std::vector fakeQuantizeOnD // }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FuseFakeQuantizeAndScaleShiftTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FuseFakeQuantizeAndScaleShiftTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 9, 9 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp index 39a32db4cee..d1d38ed94d7 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp @@ -104,7 +104,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FuseFakeQuantizeTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FuseFakeQuantizeTransformation, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(testValues)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp index 927c64cad19..81674818d6b 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp @@ -31,7 +31,7 @@ const std::vector testValues }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FuseMultiplyToFakeQuantizeTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FuseMultiplyToFakeQuantizeTransformation, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(testValues)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp index 252015a0a42..4a65f1eb27b 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp @@ -31,7 +31,7 @@ const std::vector testValues }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FuseSubtractToFakeQuantizeTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FuseSubtractToFakeQuantizeTransformation, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(testValues)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp index 52e9223f208..242df59cfff 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp @@ -27,7 +27,7 @@ const std::vector trasformationParamValues = { LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8() }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, GemmTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, GemmTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(dimensions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp index 739897ee273..d8a81076d61 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp @@ -97,7 +97,7 @@ const std::vector pa } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, GroupConvolutionTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, GroupConvolutionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp index 54f14fb037d..74c60def9fc 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp @@ -492,7 +492,7 @@ const std::vector shapes = { { 1, 4, 7, 7 } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, GroupConvolutionQDqTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, GroupConvolutionQDqTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(shapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp index d8e2854699e..7954fac1a23 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp @@ -47,5 +47,5 @@ const auto combineValues = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(interpAttrs)); -INSTANTIATE_TEST_CASE_P(smoke_LPT, InterpolateTransformation, combineValues, InterpolateTransformation::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_LPT, InterpolateTransformation, combineValues, InterpolateTransformation::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp index 58caafc62f5..2df46fe0bfc 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp @@ -42,7 +42,7 @@ std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, MatMulTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, MatMulTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(ngraph::Shape({ 1, 384, 1024 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp index 34e2dbf542d..776be228425 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp @@ -96,7 +96,7 @@ std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, MatMulWithConstantTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, MatMulWithConstantTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp index 47d7d6eda91..76ec3422c06 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp @@ -26,7 +26,7 @@ const std::vector> inputShapes = { std::pair({ 1, 16 }, { 16, 10 }) }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, MatMulWithOptimizedConstantFakeQuantizeTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, MatMulWithOptimizedConstantFakeQuantizeTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(inputShapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp index 0a7baea8516..39dc081f402 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp @@ -22,7 +22,7 @@ const std::vector fqOnData = { { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { -12.8f }, { 12.7f } } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, MultiplyToGroupConvolutionTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, MultiplyToGroupConvolutionTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::ValuesIn(inputShapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp index 1814b6830ee..8f791dc2e7c 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp @@ -67,7 +67,7 @@ const std::vector params = { { {}, {}, false }, { {}, {}, true }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, MultiplyTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, MultiplyTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp index efafab0e36e..2c790eb7023 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp @@ -21,7 +21,7 @@ const std::vector values = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, MultiplyWithOneParentTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, MultiplyWithOneParentTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp index fd3811e909e..505fffa8d54 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp @@ -20,7 +20,7 @@ const std::vector reductionAxes = { { 2, 3 }, { 1, 2, 3 } }; const std::vector normalizeVariance = { true, false }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, MVNTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, MVNTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::ValuesIn(inputAndQuantizationShapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp index ed312302d5e..6a88af8938d 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp @@ -29,7 +29,7 @@ const std::vector fuseMultiplyValues = { true, false }; const std::vector shiftValues = { true, false }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, NormalizeL2Transformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, NormalizeL2Transformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::ValuesIn(inputAndQuantizationShapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations.cpp index d2ae271b277..828d9f852bf 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations.cpp @@ -23,7 +23,7 @@ const std::vector trasformationParamValues = { }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, OutputLayersHandlingInTransformations, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, OutputLayersHandlingInTransformations, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat.cpp index ea42b1c8ef3..a8ee6f581f5 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat.cpp @@ -22,7 +22,7 @@ const std::vector trasformationParamValues = { LayerTestsUtils::LayerTransformationParamsFactory::createParamsU8I8() }; -INSTANTIATE_TEST_CASE_P(DISABLED_smoke_LPT, OutputLayersHandlingInTransformationsForConcat, +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_LPT, OutputLayersHandlingInTransformationsForConcat, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.cpp index aa09761dd87..6c0c6ad3fd1 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.cpp @@ -23,7 +23,7 @@ const std::vector trasformationParamValues = { }; // TODO: issue #41231: enable previous LPT version tests -INSTANTIATE_TEST_CASE_P(DISABLED_smoke_LPT, OutputLayersHandlingInTransformationsForConcatMultiChannel, +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_LPT, OutputLayersHandlingInTransformationsForConcatMultiChannel, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp index ac0af770239..bb35f882e62 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp @@ -23,7 +23,7 @@ std::vector testValues = { { { 256ul, ngraph::Shape({}), {-12.8f / 2.f}, {12.7f}, {-12.8f / 2.f}, {12.7f} }, true } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, PReluTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, PReluTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp index d0c33423c17..0d8ca9c2284 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp @@ -70,7 +70,7 @@ const std::vector dequantizationOnWeightElementwiseConstantShapes { ngraph::Shape({1, 16}) } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, PullReshapeThroughDequantizationTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, PullReshapeThroughDequantizationTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(inputShapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp index 6a29b84fb0e..a24ef762ea5 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp @@ -104,7 +104,7 @@ const std::vector params = }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ReduceMaxTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMaxTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp index 7310ca764e6..7c6d1b60c6b 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp @@ -104,7 +104,7 @@ const std::vector params = }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ReduceMeanTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMeanTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp index 5bc4f1f3ba0..af56b057a33 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp @@ -104,7 +104,7 @@ const std::vector params = }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ReduceMinTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMinTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp index 2ab45ce1fb9..cf767b71e4d 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp @@ -90,7 +90,7 @@ const std::vector params = }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ReduceSumTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceSumTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp index 25d7bd0398e..460d050f6aa 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp @@ -24,7 +24,7 @@ std::vector testValues = { { { 256ul, ngraph::Shape({}), {-12.8f / 2.f}, {12.7f}, {-12.8f / 2.f}, {12.7f} }, true } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ReluTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReluTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp index 5a9342ca718..599b3de32e6 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp @@ -52,7 +52,7 @@ const std::vector params = { }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ReshapeTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReshapeTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp index 6d2e97a0008..2a214de6d3a 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp @@ -90,7 +90,7 @@ const std::vector par }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ShuffleChannelsTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ShuffleChannelsTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(inputShapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp index be380eeac09..56f3c7e2f25 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp @@ -84,7 +84,7 @@ const std::vector params = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, SplitTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, SplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp index efe0109ee55..0e608b55c10 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp @@ -45,7 +45,7 @@ namespace { } }; - INSTANTIATE_TEST_CASE_P(smoke_LPT, SqueezeTransformation, + INSTANTIATE_TEST_SUITE_P(smoke_LPT, SqueezeTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp index 273daf6f710..a66106064a1 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp @@ -89,7 +89,7 @@ const std::vector params } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, StridedSliceTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, StridedSliceTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 24, 24 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp index db330136882..6f2c4136e1a 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp @@ -58,7 +58,7 @@ const std::vector testVal }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, SubtractMultiplyToMultiplyAddTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, SubtractMultiplyToMultiplyAddTransformation, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::ValuesIn(testValues)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp index 4b3c6a792c3..3a5d5d6a32f 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp @@ -22,7 +22,7 @@ const std::vector trasformationParamValues = { LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8() }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, SubtractTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, SubtractTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp index f378f4ff487..98eb3cdde77 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp @@ -26,7 +26,7 @@ const std::vector perTensorValues = { true, false }; const std::vector transposeChannelDimValues = { true, false }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, TransposeAfterMatMulTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, TransposeAfterMatMulTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp index 28c09a39454..390daa853c2 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp @@ -41,7 +41,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, TransposeTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, TransposeTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp index b245edb9bec..eb8e47fe08c 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp @@ -50,7 +50,7 @@ namespace { } }; - INSTANTIATE_TEST_CASE_P(smoke_LPT, UnsqueezeTransformation, + INSTANTIATE_TEST_SUITE_P(smoke_LPT, UnsqueezeTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp index 5778caa6fb8..247dce33444 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp @@ -90,7 +90,7 @@ const std::vector param }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, VariadicSplitTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, VariadicSplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/multi/cpu_remote_blob_tests.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/multi/cpu_remote_blob_tests.cpp index 3b0ba475eae..ba5442e158e 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/multi/cpu_remote_blob_tests.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/multi/cpu_remote_blob_tests.cpp @@ -11,5 +11,5 @@ const std::vector device_names_and_support_for_remot {{CPU}, false}, // CPU via MULTI }; -INSTANTIATE_TEST_CASE_P(smoke_RemoteBlobMultiCPU, MultiDevice_SupportTest, +INSTANTIATE_TEST_SUITE_P(smoke_RemoteBlobMultiCPU, MultiDevice_SupportTest, ::testing::ValuesIn(device_names_and_support_for_remote_blobs), MultiDevice_SupportTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/ngraph_conversion_tests/conv_bias_fusion.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/ngraph_conversion_tests/conv_bias_fusion.cpp index 5f8562bfa55..53d8627119c 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/ngraph_conversion_tests/conv_bias_fusion.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/ngraph_conversion_tests/conv_bias_fusion.cpp @@ -9,6 +9,6 @@ using namespace NGraphConversionTestsDefinitions; namespace { -INSTANTIATE_TEST_CASE_P(smoke_Basic, ConvBiasFusion, ::testing::Values("CPU"), ConvBiasFusion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Basic, ConvBiasFusion, ::testing::Values("CPU"), ConvBiasFusion::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/ngraph_conversion_tests/plugin_specific_ngraph_conversion.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/ngraph_conversion_tests/plugin_specific_ngraph_conversion.cpp index 5ba015166dd..d4b2e16b6ee 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/ngraph_conversion_tests/plugin_specific_ngraph_conversion.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/ngraph_conversion_tests/plugin_specific_ngraph_conversion.cpp @@ -9,6 +9,6 @@ using namespace NGraphConversionTestsDefinitions; namespace { -INSTANTIATE_TEST_CASE_P(smoke_Basic, PluginSpecificConversion, ::testing::Values("CPU"), PluginSpecificConversion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Basic, PluginSpecificConversion, ::testing::Values("CPU"), PluginSpecificConversion::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/activation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/activation.cpp index 51e379a67f1..87f986f980f 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/activation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/activation.cpp @@ -124,10 +124,10 @@ const auto basicIntegerOperations = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic, ActivationLayerTest, basicCases, ActivationLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic, ActivationDynamicLayerTest, basicCases, ActivationLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Integer_Activation_Basic, ActivationLayerTest, basicIntegerOperations, ActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation_Basic, ActivationLayerTest, basicCases, ActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation_Basic, ActivationDynamicLayerTest, basicCases, ActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Integer_Activation_Basic, ActivationLayerTest, basicIntegerOperations, ActivationLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic_Prelu_Const, ActivationLayerTest, basicPreluCases, ActivationLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic_Prelu_Param, ActivationParamLayerTest, basicPreluCases, ActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation_Basic_Prelu_Const, ActivationLayerTest, basicPreluCases, ActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation_Basic_Prelu_Param, ActivationParamLayerTest, basicPreluCases, ActivationLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_norm.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_norm.cpp index 753efd3acaa..f765e2d0afe 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_norm.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_norm.cpp @@ -40,7 +40,7 @@ const auto batchNormParams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_BatchNorm, BatchNormLayerTest, batchNormParams, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp index 18a099484ff..ddf930f34b7 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp @@ -49,7 +49,7 @@ batchToSpaceParamsTuple bts_only_test_cases[] = { CommonTestUtils::DEVICE_CPU), }; -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN, BatchToSpaceLayerTest, ::testing::ValuesIn(bts_only_test_cases), +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN, BatchToSpaceLayerTest, ::testing::ValuesIn(bts_only_test_cases), BatchToSpaceLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/binary_convolution.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/binary_convolution.cpp index d451e80b292..369015510d5 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/binary_convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/binary_convolution.cpp @@ -44,7 +44,7 @@ const auto binConv2DParams_ValidPadding = ::testing::Combine( ::testing::Values(ngraph::op::PadType::VALID), ::testing::ValuesIn(padValues)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_BinaryConvolution2D_ExplicitPadding, BinaryConvolutionLayerTest, ::testing::Combine( binConv2DParams_ExplicitPadding, @@ -57,7 +57,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(CommonTestUtils::DEVICE_CPU)), BinaryConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_BinaryConvolution2D_AutoPadValid, BinaryConvolutionLayerTest, ::testing::Combine( binConv2DParams_ValidPadding, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/broadcast.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/broadcast.cpp index 8f69fd6ee4b..d30ba6cd215 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/broadcast.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/broadcast.cpp @@ -38,7 +38,7 @@ const auto numpyBroadcastParams1 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_TestNumpyBroadcast1, BroadcastLayerTest, numpyBroadcastParams1, @@ -54,7 +54,7 @@ const auto numpyBroadcastParams2 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_TestNumpyBroadcast2, BroadcastLayerTest, numpyBroadcastParams2, @@ -84,7 +84,7 @@ const auto bidirectionalBroadcastParams1 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_TestBidirectionalBroadcast1, BroadcastLayerTest, bidirectionalBroadcastParams1, @@ -100,7 +100,7 @@ const auto bidirectionalBroadcastParams2 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_TestBidirectionalBroadcast2, BroadcastLayerTest, bidirectionalBroadcastParams2, @@ -116,7 +116,7 @@ const auto bidirectionalBroadcastParams3 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_TestBidirectionalBroadcast3, BroadcastLayerTest, bidirectionalBroadcastParams3, @@ -149,7 +149,7 @@ const auto explicitBroadcastParams1 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_TestExplicitBroadcast1, BroadcastLayerTest, explicitBroadcastParams1, @@ -165,7 +165,7 @@ const auto explicitBroadcastParams2 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_TestExplicitBroadcast2, BroadcastLayerTest, explicitBroadcastParams2, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/bucketize.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/bucketize.cpp index 6d75dfe3717..6398fa83ef0 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/bucketize.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/bucketize.cpp @@ -52,5 +52,5 @@ const auto test_Bucketize_left_edge = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_TestsBucketize_right, BucketizeLayerTest, test_Bucketize_right_edge, BucketizeLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsBucketize_left, BucketizeLayerTest, test_Bucketize_left_edge, BucketizeLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsBucketize_right, BucketizeLayerTest, test_Bucketize_right_edge, BucketizeLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsBucketize_left, BucketizeLayerTest, test_Bucketize_left_edge, BucketizeLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/clamp.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/clamp.cpp index 200350fd316..9f146ae0dbf 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/clamp.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/clamp.cpp @@ -48,5 +48,5 @@ const auto test_Clamp_unsigned = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_TestsClamp_signed, ClampLayerTest, test_Clamp_signed, ClampLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsClamp_unsigned, ClampLayerTest, test_Clamp_unsigned, ClampLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsClamp_signed, ClampLayerTest, test_Clamp_signed, ClampLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsClamp_unsigned, ClampLayerTest, test_Clamp_unsigned, ClampLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/comparison.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/comparison.cpp index d1602d698a0..ad6c1c897b1 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/comparison.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/comparison.cpp @@ -50,6 +50,6 @@ const auto ComparisonTestParams = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(additional_config)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs, ComparisonLayerTest, ComparisonTestParams, ComparisonLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs, ComparisonLayerTest, ComparisonTestParams, ComparisonLayerTest::getTestCaseName); } // namespace \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/concat.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/concat.cpp index 7c75e31a354..e983d4a65ec 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/concat.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/concat.cpp @@ -24,7 +24,7 @@ std::vector>> inShapes = { std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; -INSTANTIATE_TEST_CASE_P(smoke_NoReshape, ConcatLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, ConcatLayerTest, ::testing::Combine( ::testing::ValuesIn(axes), ::testing::ValuesIn(inShapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/constant.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/constant.cpp index 06ee157d391..5a06250dd6e 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/constant.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/constant.cpp @@ -39,13 +39,13 @@ std::vector precisionsWithNegativeValues{ std::vector dataWithNegativeValues{"1", "-2", "3", "-4", "5", "-6", "7", "-1", "2", "-3", "4", "-5"}; -INSTANTIATE_TEST_CASE_P(smoke_Constant, ConstantLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Constant, ConstantLayerTest, ::testing::Combine(::testing::ValuesIn(shapes), ::testing::ValuesIn(precisions), ::testing::Values(data), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConstantLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Constant_with_negative_values, ConstantLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Constant_with_negative_values, ConstantLayerTest, ::testing::Combine(::testing::ValuesIn(shapes), ::testing::ValuesIn(precisionsWithNegativeValues), ::testing::Values(dataWithNegativeValues), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert.cpp index 3a024a65965..70ed6c6512f 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert.cpp @@ -24,7 +24,7 @@ const std::vector precisions = { Precision::FP32 }; -INSTANTIATE_TEST_CASE_P(smoke_ConvertLayerTest, ConvertLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvertLayerTest, ConvertLayerTest, ::testing::Combine( ::testing::Values(inShape), ::testing::ValuesIn(precisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert_like.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert_like.cpp index abb8d43057e..f9e20dcf0de 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert_like.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convert_like.cpp @@ -19,7 +19,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::I8, }; -INSTANTIATE_TEST_CASE_P(smoke_NoReshape, ConvertLikeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, ConvertLikeLayerTest, ::testing::Combine( ::testing::Values(inShape), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution.cpp index 325636314d7..fbaba32e8d8 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution.cpp @@ -35,7 +35,7 @@ const auto conv1DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(dilations1D), ::testing::ValuesIn(numOutChannels1D), ::testing::Values(ngraph::op::PadType::VALID)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Convolution1D_ExplicitPadding, ConvolutionLayerTest, ::testing::Combine( conv1DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -47,7 +47,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Convolution1D_AutoPadValid, ConvolutionLayerTest, ::testing::Combine( conv1DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -79,7 +79,7 @@ const auto conv2DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(dilations), ::testing::ValuesIn(numOutChannels), ::testing::Values(ngraph::op::PadType::VALID)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Convolution2D_ExplicitPadding, ConvolutionLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -91,7 +91,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Convolution2D_AutoPadValid, ConvolutionLayerTest, ::testing::Combine( conv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -120,7 +120,7 @@ namespace specificWeightLayout { ::testing::Values(numOutChannels), ::testing::Values(ngraph::op::PadType::EXPLICIT)); - INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_SpecificWeightLayout, ConvolutionLayerTest, + INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_SpecificWeightLayout, ConvolutionLayerTest, ::testing::Combine(conv2DParams_WeightLayout, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -151,7 +151,7 @@ const auto conv3DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(dilations3d), ::testing::ValuesIn(numOutChannels3D), ::testing::Values(ngraph::op::PadType::VALID)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Convolution3D_ExplicitPadding, ConvolutionLayerTest, ::testing::Combine( conv3DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -163,7 +163,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Convolution3D_AutoPadValid, ConvolutionLayerTest, ::testing::Combine( conv3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp index 1a5f3885c93..7fe868eccba 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp @@ -51,7 +51,7 @@ const auto conv2DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(emptyOutputPadding) ); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding, ConvolutionBackpropLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -64,7 +64,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding, Convolu ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionBackpropLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_AutoPadValid, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadValid, ConvolutionBackpropLayerTest, ::testing::Combine( conv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -80,7 +80,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_AutoPadValid, Convolutio const std::vector> inputShape2D = {{1, 3, 9, 12}}; const std::vector> outputShapes2D = {{6, 6}, {4, 9}}; -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_OutputShapeDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_OutputShapeDefined, ConvolutionBackpropLayerTest, ::testing::Combine( conv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -117,7 +117,7 @@ const auto conv2DParams_AutoPadValid_output_padding = ::testing::Combine( ::testing::ValuesIn(outputPadding2D) ); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, ::testing::Combine( conv2DParams_AutoPadValid_output_padding, ::testing::ValuesIn(netPrecisions), @@ -130,7 +130,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding_OutputPa ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionBackpropLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding_output_padding, ::testing::ValuesIn(netPrecisions), @@ -174,7 +174,7 @@ const auto conv3DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(emptyOutputPadding) ); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding, ConvolutionBackpropLayerTest, ::testing::Combine( conv3DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -187,7 +187,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding, Convolu ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionBackpropLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_AutoPadValid, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadValid, ConvolutionBackpropLayerTest, ::testing::Combine( conv3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -203,7 +203,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_AutoPadValid, Convolutio const std::vector> inputShape3D = {{1, 3, 10, 10, 10}}; const std::vector> outputShapes3D = {{8, 8, 8}, {10, 10, 10}}; -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_OutputShapeDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_OutputShapeDefined, ConvolutionBackpropLayerTest, ::testing::Combine( conv3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -240,7 +240,7 @@ const auto conv3DParams_AutoPadValid_output_padding = ::testing::Combine( ::testing::ValuesIn(outputPadding3D) ); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, ::testing::Combine( conv3DParams_AutoPadValid_output_padding, ::testing::ValuesIn(netPrecisions), @@ -253,7 +253,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding_OutputPa ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionBackpropLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, ::testing::Combine( conv3DParams_ExplicitPadding_output_padding, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder.cpp index b0ddcd67c89..4b349fc5978 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder.cpp @@ -34,7 +34,7 @@ const auto basicCases = ::testing::Combine( ::testing::ValuesIn(mergeRepeated), ::testing::Values(CommonTestUtils::DEVICE_CPU)); -INSTANTIATE_TEST_CASE_P(smoke_CtcGreedyDecoderBasic, CTCGreedyDecoderLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_CtcGreedyDecoderBasic, CTCGreedyDecoderLayerTest, basicCases, CTCGreedyDecoderLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder_seq_len.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder_seq_len.cpp index 2247dfd7821..f25df60e99a 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder_seq_len.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder_seq_len.cpp @@ -33,11 +33,11 @@ const auto basicCases = ::testing::Combine( ::testing::ValuesIn(mergeRepeated), ::testing::Values(CommonTestUtils::DEVICE_CPU)); -INSTANTIATE_TEST_CASE_P(smoke_set1, CTCGreedyDecoderSeqLenLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_set1, CTCGreedyDecoderSeqLenLayerTest, basicCases, CTCGreedyDecoderSeqLenLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_set2, CTCGreedyDecoderSeqLenLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_set2, CTCGreedyDecoderSeqLenLayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{2, 8, 11}, {4, 10, 55}}), ::testing::ValuesIn(std::vector{5, 100}), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/ctc_loss.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/ctc_loss.cpp index e0609683606..7203f49950c 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/ctc_loss.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/ctc_loss.cpp @@ -35,7 +35,7 @@ const auto ctcLossArgsSubset1 = ::testing::Combine( ::testing::ValuesIn(unique) ); -INSTANTIATE_TEST_CASE_P(smoke_Set1, CTCLossLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Set1, CTCLossLayerTest, ::testing::Combine( ctcLossArgsSubset1, ::testing::ValuesIn(fPrecisions), @@ -56,7 +56,7 @@ const auto ctcLossArgsSubset2 = ::testing::Combine( ::testing::ValuesIn(unique) ); -INSTANTIATE_TEST_CASE_P(smoke_Set2, CTCLossLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Set2, CTCLossLayerTest, ::testing::Combine( ctcLossArgsSubset2, ::testing::ValuesIn(fPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/cum_sum.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/cum_sum.cpp index 9a8325041a6..eef6c655121 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/cum_sum.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/cum_sum.cpp @@ -105,11 +105,11 @@ const auto testCasesAxis_6 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsCumSum_negative_axis, CumSumLayerTest, testCasesNegativeAxis, CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsCumSum_axis_0, CumSumLayerTest, testCasesAxis_0, CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsCumSum_axis_1, CumSumLayerTest, testCasesAxis_1, CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsCumSum_axis_2, CumSumLayerTest, testCasesAxis_2, CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsCumSum_axis_3, CumSumLayerTest, testCasesAxis_3, CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsCumSum_axis_4, CumSumLayerTest, testCasesAxis_4, CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsCumSum_axis_5, CumSumLayerTest, testCasesAxis_5, CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsCumSum_axis_6, CumSumLayerTest, testCasesAxis_6, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsCumSum_negative_axis, CumSumLayerTest, testCasesNegativeAxis, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsCumSum_axis_0, CumSumLayerTest, testCasesAxis_0, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsCumSum_axis_1, CumSumLayerTest, testCasesAxis_1, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsCumSum_axis_2, CumSumLayerTest, testCasesAxis_2, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsCumSum_axis_3, CumSumLayerTest, testCasesAxis_3, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsCumSum_axis_4, CumSumLayerTest, testCasesAxis_4, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsCumSum_axis_5, CumSumLayerTest, testCasesAxis_5, CumSumLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsCumSum_axis_6, CumSumLayerTest, testCasesAxis_6, CumSumLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/deformable_convolution.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/deformable_convolution.cpp index e54812fe516..7bf74fb3a82 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/deformable_convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/deformable_convolution.cpp @@ -54,7 +54,7 @@ const auto deformableConv2DParams_DeformableGroups_AutoPadExplicit = ::testing:: ::testing::ValuesIn(multiple_defor_groups), ::testing::ValuesIn(numOutChannels), ::testing::Values(ngraph::op::PadType::EXPLICIT)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_DeformableConvolution2D_ExplicitPadding, DeformableConvolutionLayerTest, ::testing::Combine( deformableConv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -66,7 +66,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(CommonTestUtils::DEVICE_CPU)), DeformableConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_DeformableConvolution2D_AutoPadValid, DeformableConvolutionLayerTest, ::testing::Combine( deformableConv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -78,7 +78,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(CommonTestUtils::DEVICE_CPU)), DeformableConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_DeformableConvolution2D_DeformableGroups_ExplicitPadding, DeformableConvolutionLayerTest, ::testing::Combine( deformableConv2DParams_DeformableGroups_AutoPadExplicit, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/deformable_psroi_pooling.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/deformable_psroi_pooling.cpp index 4a0a16c3822..8cf39c201df 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/deformable_psroi_pooling.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/deformable_psroi_pooling.cpp @@ -27,7 +27,7 @@ namespace { ::testing::Values(InferenceEngine::Precision::FP32), // Net precision ::testing::Values(CommonTestUtils::DEVICE_CPU)); // Device name - INSTANTIATE_TEST_CASE_P(smoke_TestsDeformablePSROIPooling, DeformablePSROIPoolingLayerTest, deformablePSROICases_test_params, + INSTANTIATE_TEST_SUITE_P(smoke_TestsDeformablePSROIPooling, DeformablePSROIPoolingLayerTest, deformablePSROICases_test_params, DeformablePSROIPoolingLayerTest::getTestCaseName); @@ -47,6 +47,6 @@ namespace { ::testing::Values(InferenceEngine::Precision::FP32), // Net precision ::testing::Values(CommonTestUtils::DEVICE_CPU)); // Device name - INSTANTIATE_TEST_CASE_P(smoke_TestsDeformablePSROIPooling_advanced, DeformablePSROIPoolingLayerTest, deformablePSROICases_test_params_advanced, + INSTANTIATE_TEST_SUITE_P(smoke_TestsDeformablePSROIPooling_advanced, DeformablePSROIPoolingLayerTest, deformablePSROICases_test_params_advanced, DeformablePSROIPoolingLayerTest::getTestCaseName); } // namespace \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/depth_to_space.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/depth_to_space.cpp index d8785579ed6..33955e2e4a1 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/depth_to_space.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/depth_to_space.cpp @@ -36,7 +36,7 @@ const auto DepthToSpaceBS2 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_DepthToSpaceBS2, DepthToSpaceLayerTest, DepthToSpaceBS2, DepthToSpaceLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_DepthToSpaceBS2, DepthToSpaceLayerTest, DepthToSpaceBS2, DepthToSpaceLayerTest::getTestCaseName); const std::vector> inputShapesBS3 = { {1, 9, 1, 1}, {1, 9, 2, 2}, {1, 9, 3, 3}, {2, 36, 3, 3}, {2, 27, 5, 4}, @@ -51,6 +51,6 @@ const auto DepthToSpaceBS3 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_DepthToSpaceBS3, DepthToSpaceLayerTest, DepthToSpaceBS3, DepthToSpaceLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_DepthToSpaceBS3, DepthToSpaceLayerTest, DepthToSpaceBS3, DepthToSpaceLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/detection_output.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/detection_output.cpp index e30c577241f..c40ab0ca365 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/detection_output.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/detection_output.cpp @@ -56,7 +56,7 @@ const auto params3Inputs = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_DetectionOutput3In, DetectionOutputLayerTest, params3Inputs, DetectionOutputLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_DetectionOutput3In, DetectionOutputLayerTest, params3Inputs, DetectionOutputLayerTest::getTestCaseName); /* =============== 5 inputs cases =============== */ @@ -80,6 +80,6 @@ const auto params5Inputs = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_DetectionOutput5In, DetectionOutputLayerTest, params5Inputs, DetectionOutputLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_DetectionOutput5In, DetectionOutputLayerTest, params5Inputs, DetectionOutputLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/dft.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/dft.cpp index 27e5f5051dc..c917b1bd887 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/dft.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/dft.cpp @@ -101,7 +101,7 @@ const auto testCase4D = ::testing::Combine( ); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsDFT_1d, DFTLayerTest, testCase1D, DFTLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsDFT_2d, DFTLayerTest, testCase2D, DFTLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsDFT_3d, DFTLayerTest, testCase3D, DFTLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsDFT_4d, DFTLayerTest, testCase4D, DFTLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsDFT_1d, DFTLayerTest, testCase1D, DFTLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsDFT_2d, DFTLayerTest, testCase2D, DFTLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsDFT_3d, DFTLayerTest, testCase3D, DFTLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsDFT_4d, DFTLayerTest, testCase4D, DFTLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/eltwise.cpp index ea9c438abe2..b0933abc379 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/eltwise.cpp @@ -66,7 +66,7 @@ const auto multiply_params = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(additional_config)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs, EltwiseLayerTest, multiply_params, EltwiseLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs, EltwiseLayerTest, multiply_params, EltwiseLayerTest::getTestCaseName); std::vector>> inShapesSingleThread = { @@ -96,7 +96,7 @@ const auto single_thread_params = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(additional_config_single_thread)); -INSTANTIATE_TEST_CASE_P(smoke_SingleThread, EltwiseLayerTest, single_thread_params, EltwiseLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_SingleThread, EltwiseLayerTest, single_thread_params, EltwiseLayerTest::getTestCaseName); } // namespace \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/embedding_bag_offsets_sum.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/embedding_bag_offsets_sum.cpp index 7bd296bca76..79081a70dfc 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/embedding_bag_offsets_sum.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/embedding_bag_offsets_sum.cpp @@ -39,7 +39,7 @@ const auto embBagOffsetSumArgSet = ::testing::Combine( ::testing::ValuesIn(with_default_index) ); -INSTANTIATE_TEST_CASE_P(smoke, EmbeddingBagOffsetsSumLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke, EmbeddingBagOffsetsSumLayerTest, ::testing::Combine( embBagOffsetSumArgSet, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/embedding_bag_packed_sum.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/embedding_bag_packed_sum.cpp index 805a766f491..47f56866378 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/embedding_bag_packed_sum.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/embedding_bag_packed_sum.cpp @@ -33,7 +33,7 @@ const auto embBagPackedSumArgSet = ::testing::Combine( ::testing::ValuesIn(with_weights) ); -INSTANTIATE_TEST_CASE_P(smoke, EmbeddingBagPackedSumLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke, EmbeddingBagPackedSumLayerTest, ::testing::Combine( embBagPackedSumArgSet, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/embedding_segments_sum.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/embedding_segments_sum.cpp index 70d982c5f33..ad80292245c 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/embedding_segments_sum.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/embedding_segments_sum.cpp @@ -41,7 +41,7 @@ const auto embSegmentsSumArgSet = ::testing::Combine( ::testing::ValuesIn(with_default_index) ); -INSTANTIATE_TEST_CASE_P(smoke, EmbeddingSegmentsSumLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke, EmbeddingSegmentsSumLayerTest, ::testing::Combine( embSegmentsSumArgSet, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp index 14ca4d3e619..32278fb9ade 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp @@ -25,7 +25,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::I64 }; -INSTANTIATE_TEST_CASE_P(smoke_layers_CPU, ExtractImagePatchesTest, +INSTANTIATE_TEST_SUITE_P(smoke_layers_CPU, ExtractImagePatchesTest, ::testing::Combine( ::testing::ValuesIn(inDataShape), ::testing::ValuesIn(kernels), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/fake_quantize.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/fake_quantize.cpp index 3dbb6f5fd53..bc0440b0d87 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/fake_quantize.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/fake_quantize.cpp @@ -33,7 +33,7 @@ const auto fqParams = ::testing::Combine( ::testing::Values(inputParams) ); -INSTANTIATE_TEST_CASE_P(smoke_FakeQuantize, FakeQuantizeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_FakeQuantize, FakeQuantizeLayerTest, ::testing::Combine( fqParams, ::testing::ValuesIn(netPrecisions), @@ -64,7 +64,7 @@ const auto fqParamsPerChannelAxis1 = ::testing::Combine( ::testing::Values(inputParams) ); -INSTANTIATE_TEST_CASE_P(smoke_FakeQuantizePerChannelAxis0, FakeQuantizeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_FakeQuantizePerChannelAxis0, FakeQuantizeLayerTest, ::testing::Combine( fqParamsPerChannelAxis0, ::testing::ValuesIn(netPrecisions), @@ -77,7 +77,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FakeQuantizePerChannelAxis0, FakeQuantizeLayerTest ::testing::Values(config)), FakeQuantizeLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_FakeQuantizePerChannelAxis1, FakeQuantizeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_FakeQuantizePerChannelAxis1, FakeQuantizeLayerTest, ::testing::Combine( fqParamsPerChannelAxis1, ::testing::ValuesIn(netPrecisions), @@ -99,7 +99,7 @@ const auto fqParamsPerChannel2D = ::testing::Combine( ::testing::Values(inputParams) ); -INSTANTIATE_TEST_CASE_P(smoke_FakeQuantizePerChannel2D, FakeQuantizeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_FakeQuantizePerChannel2D, FakeQuantizeLayerTest, ::testing::Combine( fqParamsPerChannel2D, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather.cpp index 32038696be6..d187d5d86cc 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather.cpp @@ -44,7 +44,7 @@ const auto gather7Params_1D = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_Gather7_1D, Gather7LayerTest, gather7Params_1D, Gather7LayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Gather7_1D, Gather7LayerTest, gather7Params_1D, Gather7LayerTest::getTestCaseName); const std::vector> inputShapes_2D = { std::vector{4, 19}, @@ -74,7 +74,7 @@ const auto gather7Params_2D = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_Gather7_2D, Gather7LayerTest, gather7Params_2D, Gather7LayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Gather7_2D, Gather7LayerTest, gather7Params_2D, Gather7LayerTest::getTestCaseName); const std::vector> inputShapes4D = { std::vector{4, 5, 6, 7}, @@ -105,7 +105,7 @@ const auto gather7ParamsSubset_BD0 = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_Gather7_BD0, Gather7LayerTest, gather7ParamsSubset_BD0, Gather7LayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Gather7_BD0, Gather7LayerTest, gather7ParamsSubset_BD0, Gather7LayerTest::getTestCaseName); const std::vector> indicesShapes_BD1 = { std::vector{4, 2}, @@ -132,7 +132,7 @@ const auto gather7ParamsSubset_BD1 = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_Gather7_BD1, Gather7LayerTest, gather7ParamsSubset_BD1, Gather7LayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Gather7_BD1, Gather7LayerTest, gather7ParamsSubset_BD1, Gather7LayerTest::getTestCaseName); const std::vector> indicesShapes_BD2 = { std::vector{4, 5, 4, 3}, @@ -158,7 +158,7 @@ const auto gather7ParamsSubset_BD2 = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_Gather7_BD2, Gather7LayerTest, gather7ParamsSubset_BD2, Gather7LayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Gather7_BD2, Gather7LayerTest, gather7ParamsSubset_BD2, Gather7LayerTest::getTestCaseName); const std::vector> indicesShapes_NegativeBD = { std::vector{4, 5, 4}, @@ -186,6 +186,6 @@ const auto gather7ParamsSubset_NegativeBD = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_Gather7_NegativeBD, Gather7LayerTest, gather7ParamsSubset_NegativeBD, Gather7LayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Gather7_NegativeBD, Gather7LayerTest, gather7ParamsSubset_NegativeBD, Gather7LayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_elements.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_elements.cpp index b07dfe252e1..1ad8bbd0d4c 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_elements.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_elements.cpp @@ -24,7 +24,7 @@ const std::vector iPrecisions = { InferenceEngine::Precision::I64 }; -INSTANTIATE_TEST_CASE_P(smoke_set1, GatherElementsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_set1, GatherElementsLayerTest, ::testing::Combine( ::testing::Values(std::vector({2, 2})), // Data shape ::testing::Values(std::vector({2, 2})), // Indices shape @@ -34,7 +34,7 @@ INSTANTIATE_TEST_CASE_P(smoke_set1, GatherElementsLayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), GatherElementsLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_set2, GatherElementsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_set2, GatherElementsLayerTest, ::testing::Combine( ::testing::Values(std::vector({2, 2, 1})), // Data shape ::testing::Values(std::vector({4, 2, 1})), // Indices shape @@ -44,7 +44,7 @@ INSTANTIATE_TEST_CASE_P(smoke_set2, GatherElementsLayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), GatherElementsLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_set3, GatherElementsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_set3, GatherElementsLayerTest, ::testing::Combine( ::testing::Values(std::vector({2, 2, 3, 5})), // Data shape ::testing::Values(std::vector({2, 2, 3, 7})), // Indices shape @@ -54,7 +54,7 @@ INSTANTIATE_TEST_CASE_P(smoke_set3, GatherElementsLayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), GatherElementsLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_set4, GatherElementsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_set4, GatherElementsLayerTest, ::testing::Combine( ::testing::Values(std::vector({3, 2, 3, 8})), // Data shape ::testing::Values(std::vector({2, 2, 3, 8})), // Indices shape @@ -64,7 +64,7 @@ INSTANTIATE_TEST_CASE_P(smoke_set4, GatherElementsLayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), GatherElementsLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_set5, GatherElementsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_set5, GatherElementsLayerTest, ::testing::Combine( ::testing::Values(std::vector({3, 2, 3, 4, 8})), // Data shape ::testing::Values(std::vector({3, 2, 3, 5, 8})), // Indices shape diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_nd.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_nd.cpp index a467f96ec22..1639dabcb55 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_nd.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_nd.cpp @@ -31,7 +31,7 @@ const auto gatherNDArgsSubset1 = ::testing::Combine( {{2, 1}, {2, 1, 1}})), // Indices shape ::testing::ValuesIn(std::vector({0, 1})) // Batch dims ); -INSTANTIATE_TEST_CASE_P(smoke_Set1, GatherNDLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Set1, GatherNDLayerTest, ::testing::Combine( gatherNDArgsSubset1, ::testing::ValuesIn(dPrecisions), @@ -47,7 +47,7 @@ const auto gatherNDArgsSubset2 = ::testing::Combine( {{15, 12, 2}, {15, 12, 5, 9, 1, 3}})), // Indices shape ::testing::ValuesIn(std::vector({0, 1, 2})) // Batch dims ); -INSTANTIATE_TEST_CASE_P(smoke_Set2, GatherNDLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Set2, GatherNDLayerTest, ::testing::Combine( gatherNDArgsSubset2, ::testing::ValuesIn(dPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_tree.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_tree.cpp index cb19f2e2b3b..0076fd7b8fe 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_tree.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gather_tree.cpp @@ -23,7 +23,7 @@ const std::vector secondaryInputTypes = { ngraph::helpers::InputLayerType::PARAMETER }; -INSTANTIATE_TEST_CASE_P(Basic_smoke, GatherTreeLayerTest, +INSTANTIATE_TEST_SUITE_P(Basic_smoke, GatherTreeLayerTest, ::testing::Combine( ::testing::ValuesIn(inputShapes), ::testing::ValuesIn(secondaryInputTypes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution.cpp index 417ad9d0130..10da188bcb7 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution.cpp @@ -39,7 +39,7 @@ const auto groupConv1DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(numGroups1d), ::testing::Values(ngraph::op::PadType::VALID)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_GroupConvolution1D_ExplicitPadding, GroupConvolutionLayerTest, ::testing::Combine( groupConv1DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -51,7 +51,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(CommonTestUtils::DEVICE_CPU)), GroupConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_GroupConvolution1D_AutoPadValid, GroupConvolutionLayerTest, ::testing::Combine( groupConv1DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -87,7 +87,7 @@ const auto groupConv2DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(numGroups), ::testing::Values(ngraph::op::PadType::VALID)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_GroupConvolution2D_ExplicitPadding, GroupConvolutionLayerTest, ::testing::Combine( groupConv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -99,7 +99,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(CommonTestUtils::DEVICE_CPU)), GroupConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_GroupConvolution2D_AutoPadValid, GroupConvolutionLayerTest, ::testing::Combine( groupConv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -130,7 +130,7 @@ const auto groupConv3DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(dilations3d), ::testing::Values(4), ::testing::Values(2), ::testing::Values(ngraph::op::PadType::VALID)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_GroupConvolution3D_ExplicitPadding, GroupConvolutionLayerTest, ::testing::Combine( groupConv3DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -142,7 +142,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(CommonTestUtils::DEVICE_CPU)), GroupConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_GroupConvolution3D_AutoPadValid, GroupConvolutionLayerTest, ::testing::Combine( groupConv3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp index 70a1151d9ba..2f08be54039 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp @@ -50,7 +50,7 @@ const auto groupConvBackpropData1DParams_AutoPadValid = ::testing::Combine( ::testing::Values(ngraph::op::PadType::VALID) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData1D_ExplicitPadding, GroupConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData1D_ExplicitPadding, GroupConvBackpropDataLayerTest, ::testing::Combine( groupConvBackpropData1DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -62,7 +62,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData1D_ExplicitPadding, GroupConv ::testing::Values(CommonTestUtils::DEVICE_CPU)), GroupConvBackpropDataLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData1D_AutoPadValid, GroupConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData1D_AutoPadValid, GroupConvBackpropDataLayerTest, ::testing::Combine( groupConvBackpropData1DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -104,7 +104,7 @@ const auto groupConvBackpropData2DParams_AutoPadValid = ::testing::Combine( ::testing::Values(ngraph::op::PadType::VALID) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_ExplicitPadding, GroupConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData2D_ExplicitPadding, GroupConvBackpropDataLayerTest, ::testing::Combine( groupConvBackpropData2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -116,7 +116,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_ExplicitPadding, GroupConv ::testing::Values(CommonTestUtils::DEVICE_CPU)), GroupConvBackpropDataLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_AutoPadValid, GroupConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData2D_AutoPadValid, GroupConvBackpropDataLayerTest, ::testing::Combine( groupConvBackpropData2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -158,7 +158,7 @@ const auto groupConvBackpropData3DParams_AutoPadValid = ::testing::Combine( ::testing::Values(ngraph::op::PadType::VALID) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_ExplicitPadding, GroupConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData3D_ExplicitPadding, GroupConvBackpropDataLayerTest, ::testing::Combine( groupConvBackpropData3DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -170,7 +170,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_ExplicitPadding, GroupConv ::testing::Values(CommonTestUtils::DEVICE_CPU)), GroupConvBackpropDataLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_AutoPadValid, GroupConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData3D_AutoPadValid, GroupConvBackpropDataLayerTest, ::testing::Combine( groupConvBackpropData3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gru_cell.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gru_cell.cpp index 51e7dad83ca..350d6dc74f5 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gru_cell.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gru_cell.cpp @@ -21,7 +21,7 @@ namespace { std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; - INSTANTIATE_TEST_CASE_P(smoke_GRUCellCommon, GRUCellTest, + INSTANTIATE_TEST_SUITE_P(smoke_GRUCellCommon, GRUCellTest, ::testing::Combine( ::testing::ValuesIn(should_decompose), ::testing::ValuesIn(batch), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gru_sequence.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gru_sequence.cpp index 5521023a192..884a6e3bd28 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gru_sequence.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/gru_sequence.cpp @@ -34,7 +34,7 @@ namespace { std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; - INSTANTIATE_TEST_CASE_P(smoke_GRUSequenceCommonZeroClip, GRUSequenceTest, + INSTANTIATE_TEST_SUITE_P(smoke_GRUSequenceCommonZeroClip, GRUSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_zero_clip), @@ -49,7 +49,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_CPU)), GRUSequenceTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_GRUSequenceCommonClip, GRUSequenceTest, + INSTANTIATE_TEST_SUITE_P(smoke_GRUSequenceCommonClip, GRUSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_clip_non_zero), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/interpolate.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/interpolate.cpp index 08c52937976..5d617ce9c90 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/interpolate.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/interpolate.cpp @@ -108,7 +108,7 @@ const auto interpolateCases = ::testing::Combine( ::testing::ValuesIn(defaultAxes), ::testing::ValuesIn(defaultScales)); -INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Basic, InterpolateLayerTest, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_Basic, InterpolateLayerTest, ::testing::Combine( interpolateCasesWithoutNearest, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -121,7 +121,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Basic, InterpolateLayerTest, ::testing ::testing::Values(additional_config)), InterpolateLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Nearest, InterpolateLayerTest, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_Nearest, InterpolateLayerTest, ::testing::Combine( interpolateCases, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -166,7 +166,7 @@ const auto interpolateCasesTail = ::testing::Combine( ::testing::ValuesIn(defaultAxes), ::testing::ValuesIn(defaultScalesTailTest)); -INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Basic_Down_Sample_Tail, InterpolateLayerTest, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_Basic_Down_Sample_Tail, InterpolateLayerTest, ::testing::Combine( interpolateCasesWithoutNearestTail, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -179,7 +179,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Basic_Down_Sample_Tail, InterpolateLay ::testing::Values(additional_config)), InterpolateLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Nearest_Down_Sample_Tail, InterpolateLayerTest, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_Nearest_Down_Sample_Tail, InterpolateLayerTest, ::testing::Combine( interpolateCasesTail, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/log_softmax.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/log_softmax.cpp index 37042c8ad7d..2b9a71ddfef 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/log_softmax.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/log_softmax.cpp @@ -37,7 +37,7 @@ const auto params2D = testing::Combine( testing::Values(std::map()) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LogSoftmax2D, LogSoftmaxLayerTest, params2D, @@ -66,7 +66,7 @@ const auto params4D = testing::Combine( testing::Values(std::map()) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LogSoftmax4D, LogSoftmaxLayerTest, params4D, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/logical.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/logical.cpp index 0e252f67538..b90ed72b717 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/logical.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/logical.cpp @@ -74,8 +74,8 @@ const auto LogicalTestParamsNot = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(additional_config)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs, LogicalLayerTest, LogicalTestParams, LogicalLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs, LogicalLayerTest, LogicalTestParams, LogicalLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefsNot, LogicalLayerTest, LogicalTestParamsNot, LogicalLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefsNot, LogicalLayerTest, LogicalTestParamsNot, LogicalLayerTest::getTestCaseName); } // namespace \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/loop.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/loop.cpp index 1a14f9a97e4..505d5f7f29d 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/loop.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/loop.cpp @@ -20,7 +20,7 @@ namespace { std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; - INSTANTIATE_TEST_CASE_P(smoke_LoopCommonZeroClip, LoopTest, + INSTANTIATE_TEST_SUITE_P(smoke_LoopCommonZeroClip, LoopTest, ::testing::Combine( ::testing::ValuesIn(execute_first_iteration), ::testing::ValuesIn(is_body_condition_const), @@ -48,7 +48,7 @@ namespace { using namespace testing; using namespace InferenceEngine; - INSTANTIATE_TEST_CASE_P(smoke_StaticShapeLoop, StaticShapeLoopTest, + INSTANTIATE_TEST_SUITE_P(smoke_StaticShapeLoop, StaticShapeLoopTest, Combine( ValuesIn(std::vector{true, false}), Values(true), @@ -58,7 +58,7 @@ namespace { Values(Precision::FP32, Precision::I32), Values(CommonTestUtils::DEVICE_CPU))); using namespace testing; - INSTANTIATE_TEST_CASE_P(smoke_TrivialLoop, TrivialLoopTest, + INSTANTIATE_TEST_SUITE_P(smoke_TrivialLoop, TrivialLoopTest, Combine( Values(Precision::FP32, Precision::I32), Values({2, 3, 4}), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lrn.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lrn.cpp index 916abf39f4c..4863b993448 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lrn.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lrn.cpp @@ -22,7 +22,7 @@ namespace LRN2D { const std::vector> axes = {{1}}; -INSTANTIATE_TEST_CASE_P(smoke_LrnCheck_2D, LrnLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_LrnCheck_2D, LrnLayerTest, ::testing::Combine(::testing::Values(alpha), ::testing::Values(beta), ::testing::Values(bias), @@ -41,7 +41,7 @@ namespace LRN3D { const std::vector> axes = {{1}, {2}}; -INSTANTIATE_TEST_CASE_P(smoke_LrnCheck_3D, LrnLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_LrnCheck_3D, LrnLayerTest, ::testing::Combine(::testing::Values(alpha), ::testing::Values(beta), ::testing::Values(bias), @@ -60,7 +60,7 @@ namespace LRN4D { const std::vector> axes = {{1}, {2, 3}, {3, 2}}; -INSTANTIATE_TEST_CASE_P(smoke_LrnCheck_4D, LrnLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_LrnCheck_4D, LrnLayerTest, ::testing::Combine(::testing::Values(alpha), ::testing::Values(beta), ::testing::Values(bias), @@ -79,7 +79,7 @@ namespace LRN5D { const std::vector> axes = {{1}, {2, 3, 4}, {4, 2, 3}}; -INSTANTIATE_TEST_CASE_P(smoke_LrnCheck_5D, LrnLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_LrnCheck_5D, LrnLayerTest, ::testing::Combine(::testing::Values(alpha), ::testing::Values(beta), ::testing::Values(bias), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lstm_cell.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lstm_cell.cpp index cc1f0a4fa78..5affa8d67d3 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lstm_cell.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lstm_cell.cpp @@ -21,7 +21,7 @@ namespace { std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; - INSTANTIATE_TEST_CASE_P(smoke_LSTMCellCommon, LSTMCellTest, + INSTANTIATE_TEST_SUITE_P(smoke_LSTMCellCommon, LSTMCellTest, ::testing::Combine( ::testing::ValuesIn(should_decompose), ::testing::ValuesIn(batch), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lstm_sequence.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lstm_sequence.cpp index 3ccbddc8f31..aea38056119 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lstm_sequence.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/lstm_sequence.cpp @@ -34,7 +34,7 @@ namespace { std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; - INSTANTIATE_TEST_CASE_P(smoke_LSTMSequenceCommonZeroClip, LSTMSequenceTest, + INSTANTIATE_TEST_SUITE_P(smoke_LSTMSequenceCommonZeroClip, LSTMSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_zero_clip), @@ -48,7 +48,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_CPU)), LSTMSequenceTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_LSTMSequenceCommonClip, LSTMSequenceTest, + INSTANTIATE_TEST_SUITE_P(smoke_LSTMSequenceCommonClip, LSTMSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_clip_non_zero), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/mat_mul.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/mat_mul.cpp index 4a0d5dcdcbd..680276b2f72 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/mat_mul.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/mat_mul.cpp @@ -44,7 +44,7 @@ std::vector secondaryInputTypes = { std::map additional_config = {}; -INSTANTIATE_TEST_CASE_P(smoke_MatMul, MatMulTest, +INSTANTIATE_TEST_SUITE_P(smoke_MatMul, MatMulTest, ::testing::Combine( ::testing::ValuesIn(shapeRelatedParams), ::testing::ValuesIn(inputPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/memory.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/memory.cpp index 062ea0cad91..c0a0fa3b430 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/memory.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/memory.cpp @@ -32,7 +32,7 @@ const std::vector iterationCount { 10 }; -INSTANTIATE_TEST_CASE_P(smoke_MemoryTest, MemoryTest, +INSTANTIATE_TEST_SUITE_P(smoke_MemoryTest, MemoryTest, ::testing::Combine( ::testing::ValuesIn(transformation), ::testing::ValuesIn(iterationCount), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/minimum_maximum.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/minimum_maximum.cpp index 64c3878736e..e2f5f72497e 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/minimum_maximum.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/minimum_maximum.cpp @@ -35,7 +35,7 @@ const std::vector inputType = { ngraph::helpers::InputLayerType::PARAMETER, }; -INSTANTIATE_TEST_CASE_P(smoke_maximum, MaxMinLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_maximum, MaxMinLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes), ::testing::ValuesIn(opType), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/mvn.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/mvn.cpp index c633c1b6bc8..73fdce483ef 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/mvn.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/mvn.cpp @@ -50,7 +50,7 @@ const auto MvnCases = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsMVN, MvnLayerTest, MvnCases, MvnLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsMVN, MvnLayerTest, MvnCases, MvnLayerTest::getTestCaseName); @@ -73,7 +73,7 @@ const std::vector epsilonF = { 0.0001 }; -INSTANTIATE_TEST_CASE_P(smoke_MVN_5D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MVN_5D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{1, 10, 5, 7, 8}, {1, 3, 8, 9, 49}}), ::testing::ValuesIn(dataPrecisions), @@ -85,7 +85,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MVN_5D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MVN_4D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MVN_4D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{1, 10, 5, 17}, {1, 3, 8, 9}}), ::testing::ValuesIn(dataPrecisions), @@ -97,7 +97,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MVN_4D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MVN_3D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MVN_3D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{1, 32, 17}, {1, 37, 9}}), ::testing::ValuesIn(dataPrecisions), @@ -109,7 +109,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MVN_3D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MVN_2D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MVN_2D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{3, 5}, {2, 55}}), ::testing::ValuesIn(dataPrecisions), @@ -121,7 +121,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MVN_2D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MVN_1D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MVN_1D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{3}, {9}, {55}}), ::testing::ValuesIn(dataPrecisions), @@ -133,7 +133,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MVN_1D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Decomposition_3D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Decomposition_3D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{1, 32, 17}, {1, 37, 9}}), ::testing::ValuesIn(dataPrecisions), @@ -145,7 +145,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Decomposition_3D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Decomposition_4D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Decomposition_4D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{1, 16, 5, 8}, {2, 19, 5, 10}}), ::testing::ValuesIn(dataPrecisions), @@ -157,7 +157,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Decomposition_4D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Decomposition_10D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Decomposition_10D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{1, 3, 5, 4, 2, 6, 5, 3, 2, 1}}), ::testing::ValuesIn(dataPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/non_max_suppression.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/non_max_suppression.cpp index a8d10d65bdf..4bc28cf1b5b 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/non_max_suppression.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/non_max_suppression.cpp @@ -39,4 +39,4 @@ const auto nmsParams = ::testing::Combine(::testing::ValuesIn(inShapeParams), ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_NmsLayerTest, NmsLayerTest, nmsParams, NmsLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_NmsLayerTest, NmsLayerTest, nmsParams, NmsLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/normalize_l2.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/normalize_l2.cpp index 75b2c0a5b49..843609102e4 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/normalize_l2.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/normalize_l2.cpp @@ -34,7 +34,7 @@ const auto normL2params = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( NormalizeL2, NormalizeL2LayerTest, normL2params, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/one_hot.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/one_hot.cpp index 9ab687d76f2..7a14b67f0ea 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/one_hot.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/one_hot.cpp @@ -32,7 +32,7 @@ const auto oneHotParams_IC = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_OneHotIntConst, OneHotLayerTest, oneHotParams_IC, @@ -60,7 +60,7 @@ const auto oneHotParams_Ax = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_OneHotAxrng, OneHotLayerTest, oneHotParams_Ax, @@ -89,7 +89,7 @@ const auto oneHotParams_T = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_OneHotArgType, OneHotLayerTest, oneHotParams_T, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pad.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pad.cpp index 0a760ed69e5..17e9f4e17df 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pad.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pad.cpp @@ -43,7 +43,7 @@ const auto pad1DConstparams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Pad1DConst, PadLayerTest, pad1DConstparams, @@ -63,7 +63,7 @@ const auto pad1Dparams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Pad1D, PadLayerTest, pad1Dparams, @@ -86,7 +86,7 @@ const auto pad2DConstparams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Pad2DConst, PadLayerTest, pad2DConstparams, @@ -106,7 +106,7 @@ const auto pad2Dparams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Pad2D, PadLayerTest, pad2Dparams, @@ -129,7 +129,7 @@ const auto pad4DConstparams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Pad4DConst, PadLayerTest, pad4DConstparams, @@ -149,7 +149,7 @@ const auto pad4Dparams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Pad4D, PadLayerTest, pad4Dparams, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pooling.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pooling.cpp index 0e71de6d4c3..a3053fb6809 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pooling.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/pooling.cpp @@ -54,7 +54,7 @@ const auto maxPool_ExplicitPad_FloorRounding_Params = ::testing::Combine( ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); -INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_FloorRounding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MaxPool_ExplicitPad_FloorRounding, PoolingLayerTest, ::testing::Combine( maxPool_ExplicitPad_FloorRounding_Params, ::testing::ValuesIn(netPrecisions), @@ -78,7 +78,7 @@ const auto maxPool_SameUpperPad_FloorRounding_Params = ::testing::Combine( ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); -INSTANTIATE_TEST_CASE_P(smoke_MaxPool_SameUpperPad_FloorRounding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MaxPool_SameUpperPad_FloorRounding, PoolingLayerTest, ::testing::Combine( maxPool_SameUpperPad_FloorRounding_Params, ::testing::ValuesIn(netPrecisions), @@ -102,7 +102,7 @@ const auto maxPool_SameLowerPad_FloorRounding_Params = ::testing::Combine( ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); -INSTANTIATE_TEST_CASE_P(smoke_MaxPool_SameLowerPad_FloorRounding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MaxPool_SameLowerPad_FloorRounding, PoolingLayerTest, ::testing::Combine( maxPool_SameUpperPad_FloorRounding_Params, ::testing::ValuesIn(netPrecisions), @@ -126,7 +126,7 @@ const auto maxPool_ExplicitPad_FloorRounding_5Dinput_Params = ::testing::Combine ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); -INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_FloorRounding_5Dinput, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MaxPool_ExplicitPad_FloorRounding_5Dinput, PoolingLayerTest, ::testing::Combine( maxPool_ExplicitPad_FloorRounding_5Dinput_Params, ::testing::ValuesIn(netPrecisions), @@ -150,7 +150,7 @@ const auto maxPool_SameUpperPad_FloorRounding_5Dinput_Params = ::testing::Combin ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); -INSTANTIATE_TEST_CASE_P(smoke_MaxPool_SameUpperPad_FloorRounding_5Dinput, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MaxPool_SameUpperPad_FloorRounding_5Dinput, PoolingLayerTest, ::testing::Combine( maxPool_SameUpperPad_FloorRounding_5Dinput_Params, ::testing::ValuesIn(netPrecisions), @@ -174,7 +174,7 @@ const auto maxPool_SameLowerPad_CeilRounding_5Dinput_Params = ::testing::Combine ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); -INSTANTIATE_TEST_CASE_P(smoke_MaxPool_SameLowerPad_CeilRounding_5Dinput, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MaxPool_SameLowerPad_CeilRounding_5Dinput, PoolingLayerTest, ::testing::Combine( maxPool_SameUpperPad_FloorRounding_5Dinput_Params, ::testing::ValuesIn(netPrecisions), @@ -198,7 +198,7 @@ const auto maxPool_ExplicitPad_CeilRounding_Params = ::testing::Combine( ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); -INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_CeilRounding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MaxPool_ExplicitPad_CeilRounding, PoolingLayerTest, ::testing::Combine( maxPool_ExplicitPad_CeilRounding_Params, ::testing::ValuesIn(netPrecisions), @@ -225,7 +225,7 @@ const auto avgPoolExplicitPadCeilRoundingParams = ::testing::Combine( ::testing::Values(true, false) ); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_CeilRounding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_ExplicitPad_CeilRounding, PoolingLayerTest, ::testing::Combine( avgPoolExplicitPadCeilRoundingParams, ::testing::ValuesIn(netPrecisions), @@ -242,7 +242,7 @@ std::vector psParams({poolSpecificParams(ngraph::helpers::Po poolSpecificParams(ngraph::helpers::PoolingTypes::AVG, {7, 7}, {1, 1}, {0, 0}, {1, 1}, ngraph::op::RoundingType::CEIL, ngraph::op::PadType::EXPLICIT, false)}); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_CeilRounding_corner, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_ExplicitPad_CeilRounding_corner, PoolingLayerTest, ::testing::Combine( ::testing::ValuesIn(psParams), ::testing::ValuesIn(netPrecisions), @@ -267,7 +267,7 @@ const auto avgPoolExplicitPadFloorRoundingParams = ::testing::Combine( ); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_FloorRounding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_ExplicitPad_FloorRounding, PoolingLayerTest, ::testing::Combine( avgPoolExplicitPadFloorRoundingParams, ::testing::ValuesIn(netPrecisions), @@ -291,7 +291,7 @@ const auto avgPool_ExplicitPad_FloorRounding_5Dinput_Params = ::testing::Combine ::testing::Values(true, false) ); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_FloorRounding_5Dinput, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_ExplicitPad_FloorRounding_5Dinput, PoolingLayerTest, ::testing::Combine( avgPool_ExplicitPad_FloorRounding_5Dinput_Params, ::testing::ValuesIn(netPrecisions), @@ -315,7 +315,7 @@ const auto avgPool_SameUpperPad_FloorRounding_5Dinput_Params = ::testing::Combin ::testing::Values(true) ); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_SameUpperPad_FloorRounding_5Dinput, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_SameUpperPad_FloorRounding_5Dinput, PoolingLayerTest, ::testing::Combine( avgPool_SameUpperPad_FloorRounding_5Dinput_Params, ::testing::ValuesIn(netPrecisions), @@ -339,7 +339,7 @@ const auto avgPool_SameLowerPad_CeilRounding_5Dinput_Params = ::testing::Combine ::testing::Values(true) ); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_SameLowerPad_CeilRounding_5Dinput, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_SameLowerPad_CeilRounding_5Dinput, PoolingLayerTest, ::testing::Combine( avgPool_SameLowerPad_CeilRounding_5Dinput_Params, ::testing::ValuesIn(netPrecisions), @@ -365,7 +365,7 @@ const auto allPools_ValidPad_Params = ::testing::Combine( ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); -INSTANTIATE_TEST_CASE_P(smoke_MAX_and_AVGPool_ValidPad, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MAX_and_AVGPool_ValidPad, PoolingLayerTest, ::testing::Combine( allPools_ValidPad_Params, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/proposal.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/proposal.cpp index df535260509..a225800b954 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/proposal.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/proposal.cpp @@ -39,7 +39,7 @@ const auto proposalParams = ::testing::Combine( ::testing::ValuesIn(framework_) ); -INSTANTIATE_TEST_CASE_P(smoke_Proposal_tests, ProposalLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Proposal_tests, ProposalLayerTest, ::testing::Combine( proposalParams, ::testing::Values(CommonTestUtils::DEVICE_CPU)), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/psroi_pooling.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/psroi_pooling.cpp index 6c896b56aa8..cca6d83a882 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/psroi_pooling.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/psroi_pooling.cpp @@ -24,7 +24,7 @@ const auto PSROICases_average = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_TestsPSROIPooling_average, PSROIPoolingLayerTest, PSROICases_average, PSROIPoolingLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsPSROIPooling_average, PSROIPoolingLayerTest, PSROICases_average, PSROIPoolingLayerTest::getTestCaseName); const auto PSROICases_bilinear = ::testing::Combine( @@ -40,4 +40,4 @@ const auto PSROICases_bilinear = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_TestsPSROIPooling_bilinear, PSROIPoolingLayerTest, PSROICases_bilinear, PSROIPoolingLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsPSROIPooling_bilinear, PSROIPoolingLayerTest, PSROICases_bilinear, PSROIPoolingLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/range.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/range.cpp index acc17b1142e..c4bfa1f1567 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/range.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/range.cpp @@ -20,7 +20,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::FP16 }; -INSTANTIATE_TEST_CASE_P(smoke_Basic, RangeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Basic, RangeLayerTest, ::testing::Combine( ::testing::ValuesIn(start), ::testing::ValuesIn(stop), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp index f5d96aa0d5d..2608c1bb458 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp @@ -166,56 +166,56 @@ const auto params_ReductionTypesLogical = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceOneAxis, ReduceOpsLayerTest, paramsOneAxis, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceLogicalOneAxis, ReduceOpsLayerTest, paramsOneAxisLogical, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Reduce_Precisions, ReduceOpsLayerTest, params_Precisions, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Reduce_InputShapes, ReduceOpsLayerTest, params_InputShapes, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Reduce_Axes, ReduceOpsLayerTest, params_Axes, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Reduce_ReductionTypes, ReduceOpsLayerTest, params_ReductionTypes, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceLogical_ReductionTypes, ReduceOpsLayerTest, params_ReductionTypesLogical, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Reduce, ReduceOpsLayerWithSpecificInputTest, testing::Combine( diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/region_yolo.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/region_yolo.cpp index ac4e3b38403..8961b4a9188 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/region_yolo.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/region_yolo.cpp @@ -80,6 +80,6 @@ const auto testCase_yolov2_caffe = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_TestsRegionYolov3, RegionYoloLayerTest, testCase_yolov3, RegionYoloLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsRegionYoloMxnet, RegionYoloLayerTest, testCase_yolov3_mxnet, RegionYoloLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsRegionYoloCaffe, RegionYoloLayerTest, testCase_yolov2_caffe, RegionYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsRegionYolov3, RegionYoloLayerTest, testCase_yolov3, RegionYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsRegionYoloMxnet, RegionYoloLayerTest, testCase_yolov3_mxnet, RegionYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsRegionYoloCaffe, RegionYoloLayerTest, testCase_yolov2_caffe, RegionYoloLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reorg_yolo.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reorg_yolo.cpp index 32a1f934968..c288688cd54 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reorg_yolo.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reorg_yolo.cpp @@ -67,9 +67,9 @@ const auto testCase_batch_2 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_TestsReorgYolo_caffe_YoloV2, ReorgYoloLayerTest, testCase_caffe_yolov2, ReorgYoloLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsReorgYolo_stride_2_smallest, ReorgYoloLayerTest, testCase_smallest, ReorgYoloLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsReorgYolo_stride_2, ReorgYoloLayerTest, testCase_stride_2, ReorgYoloLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsReorgYolo_stride_3, ReorgYoloLayerTest, testCase_stride_3, ReorgYoloLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsReorgYolo_smaller_h, ReorgYoloLayerTest, testCase_smaller_h, ReorgYoloLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsReorgYolo_batch_2, ReorgYoloLayerTest, testCase_batch_2, ReorgYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsReorgYolo_caffe_YoloV2, ReorgYoloLayerTest, testCase_caffe_yolov2, ReorgYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsReorgYolo_stride_2_smallest, ReorgYoloLayerTest, testCase_smallest, ReorgYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsReorgYolo_stride_2, ReorgYoloLayerTest, testCase_stride_2, ReorgYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsReorgYolo_stride_3, ReorgYoloLayerTest, testCase_stride_3, ReorgYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsReorgYolo_smaller_h, ReorgYoloLayerTest, testCase_smaller_h, ReorgYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsReorgYolo_batch_2, ReorgYoloLayerTest, testCase_batch_2, ReorgYoloLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reshape.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reshape.cpp index 28419ec971f..6baed1f21fc 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reshape.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reshape.cpp @@ -15,7 +15,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::FP16 }; -INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheckDynBatch, ReshapeLayerTestRevise, +INSTANTIATE_TEST_SUITE_P(smoke_ReshapeCheckDynBatch, ReshapeLayerTestRevise, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), @@ -29,7 +29,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheckDynBatch, ReshapeLayerTestRevise, ::testing::Values(std::map({{CONFIG_KEY(DYN_BATCH_ENABLED), CONFIG_VALUE(YES)}}))), ReshapeLayerTestRevise::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheck, ReshapeLayerTestRevise, +INSTANTIATE_TEST_SUITE_P(smoke_ReshapeCheck, ReshapeLayerTestRevise, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), @@ -43,7 +43,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheck, ReshapeLayerTestRevise, ::testing::Values(std::map({}))), ReshapeLayerTestRevise::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheckNegative, ReshapeLayerTestRevise, +INSTANTIATE_TEST_SUITE_P(smoke_ReshapeCheckNegative, ReshapeLayerTestRevise, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/result.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/result.cpp index fd30ef30a0a..f352eacaa39 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/result.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/result.cpp @@ -21,7 +21,7 @@ std::vector inputPrecisions = { ConfigMap config; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ResultLayerTest, ResultLayerTest, ::testing::Combine(::testing::ValuesIn(inputDims), ::testing::ValuesIn(inputPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reverse_sequence.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reverse_sequence.cpp index 91e0fc5bf5f..b1f864d12ae 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reverse_sequence.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/reverse_sequence.cpp @@ -33,7 +33,7 @@ const std::vector secondaryInputTypes = { ngraph::helpers::InputLayerType::PARAMETER }; -INSTANTIATE_TEST_CASE_P(Basic_smoke, ReverseSequenceLayerTest, +INSTANTIATE_TEST_SUITE_P(Basic_smoke, ReverseSequenceLayerTest, ::testing::Combine( ::testing::ValuesIn(batchAxisIndices), ::testing::ValuesIn(seqAxisIndices), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/rnn_cell.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/rnn_cell.cpp index db9c450dba8..e730cc0d2f9 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/rnn_cell.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/rnn_cell.cpp @@ -19,7 +19,7 @@ namespace { std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; - INSTANTIATE_TEST_CASE_P(smoke_RNNCellCommon, RNNCellTest, + INSTANTIATE_TEST_SUITE_P(smoke_RNNCellCommon, RNNCellTest, ::testing::Combine( ::testing::ValuesIn(should_decompose), ::testing::ValuesIn(batch), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/rnn_sequence.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/rnn_sequence.cpp index 3db31d471c5..e5f7b821564 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/rnn_sequence.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/rnn_sequence.cpp @@ -31,7 +31,7 @@ namespace { }; std::vector netPrecisions = {InferenceEngine::Precision::FP32}; - INSTANTIATE_TEST_CASE_P(smoke_RNNSequenceCommonZeroClip, RNNSequenceTest, + INSTANTIATE_TEST_SUITE_P(smoke_RNNSequenceCommonZeroClip, RNNSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_zero_clip), @@ -45,7 +45,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_CPU)), RNNSequenceTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_RNNSequenceCommonClip, RNNSequenceTest, + INSTANTIATE_TEST_SUITE_P(smoke_RNNSequenceCommonClip, RNNSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_clip_non_zero), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/roi_align.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/roi_align.cpp index 38c97de0ffb..b4cb181519c 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/roi_align.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/roi_align.cpp @@ -31,7 +31,7 @@ const auto ROIAlignCases_average = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_TestsROIAlign_average, ROIAlignLayerTest, ROIAlignCases_average, ROIAlignLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsROIAlign_average, ROIAlignLayerTest, ROIAlignCases_average, ROIAlignLayerTest::getTestCaseName); const auto ROIAlignCases_max = ::testing::Combine( ::testing::ValuesIn( @@ -49,4 +49,4 @@ const auto ROIAlignCases_max = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_TestsROIAlign_max, ROIAlignLayerTest, ROIAlignCases_max, ROIAlignLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsROIAlign_max, ROIAlignLayerTest, ROIAlignCases_max, ROIAlignLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/roi_pooling.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/roi_pooling.cpp index 8387a754b43..279f5333e22 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/roi_pooling.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/roi_pooling.cpp @@ -61,5 +61,5 @@ const auto test_ROIPooling_bilinear = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_TestsROIPooling_max, ROIPoolingLayerTest, test_ROIPooling_max, ROIPoolingLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsROIPooling_bilinear, ROIPoolingLayerTest, test_ROIPooling_bilinear, ROIPoolingLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsROIPooling_max, ROIPoolingLayerTest, test_ROIPooling_max, ROIPoolingLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsROIPooling_bilinear, ROIPoolingLayerTest, test_ROIPooling_bilinear, ROIPoolingLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/roll.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/roll.cpp index f47d29704de..af67f1eb431 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/roll.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/roll.cpp @@ -84,13 +84,13 @@ const auto testCaseUnordNegAxesAndShifts10D = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsRoll_2d_zero_shifts, RollLayerTest, testCase2DZeroShifts, RollLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsRoll_1d, RollLayerTest, testCase1D, RollLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsRoll_2d, RollLayerTest, testCase2D, RollLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsRoll_3d, RollLayerTest, testCase3D, RollLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsRoll_negative_unordered_axes_4d, RollLayerTest, testCaseNegativeUnorderedAxes4D, RollLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsRoll_negative_unordered_axes_5d, RollLayerTest, testCaseRepeatingAxes5D, RollLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsRoll_negative_shifts_6d, RollLayerTest, testCaseNegativeShifts6D, RollLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsRoll_unord_neg_shifts_and_axes_10d, RollLayerTest, testCaseUnordNegAxesAndShifts10D, RollLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsRoll_2d_zero_shifts, RollLayerTest, testCase2DZeroShifts, RollLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsRoll_1d, RollLayerTest, testCase1D, RollLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsRoll_2d, RollLayerTest, testCase2D, RollLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsRoll_3d, RollLayerTest, testCase3D, RollLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsRoll_negative_unordered_axes_4d, RollLayerTest, testCaseNegativeUnorderedAxes4D, RollLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsRoll_negative_unordered_axes_5d, RollLayerTest, testCaseRepeatingAxes5D, RollLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsRoll_negative_shifts_6d, RollLayerTest, testCaseNegativeShifts6D, RollLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsRoll_unord_neg_shifts_and_axes_10d, RollLayerTest, testCaseUnordNegAxesAndShifts10D, RollLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/scatter_ND_update.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/scatter_ND_update.cpp index 081d0734534..cbccbd3793b 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/scatter_ND_update.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/scatter_ND_update.cpp @@ -36,6 +36,6 @@ const auto ScatterNDUpdateCases = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_ScatterNDUpdate, ScatterNDUpdateLayerTest, ScatterNDUpdateCases, ScatterNDUpdateLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_ScatterNDUpdate, ScatterNDUpdateLayerTest, ScatterNDUpdateCases, ScatterNDUpdateLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/scatter_elements_update.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/scatter_elements_update.cpp index 15b8852b101..64c808b260a 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/scatter_elements_update.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/scatter_elements_update.cpp @@ -42,7 +42,7 @@ const auto ScatterEltUpdateCases = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_ScatterEltsUpdate, ScatterElementsUpdateLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ScatterEltsUpdate, ScatterElementsUpdateLayerTest, ScatterEltUpdateCases, ScatterElementsUpdateLayerTest::getTestCaseName); } // namespace \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/scatter_update.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/scatter_update.cpp index b9ef4bbbfc9..31362e0b264 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/scatter_update.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/scatter_update.cpp @@ -41,6 +41,6 @@ const auto ScatterUpdateCase = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_ScatterUpdate, ScatterUpdateLayerTest, ScatterUpdateCase, ScatterUpdateLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_ScatterUpdate, ScatterUpdateLayerTest, ScatterUpdateCase, ScatterUpdateLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/select.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/select.cpp index 315c3331db9..424f692b1ef 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/select.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/select.cpp @@ -81,6 +81,6 @@ const auto numpyCases = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsSelect_none, SelectLayerTest, noneCases, SelectLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsSelect_none, SelectLayerTest, noneCases, SelectLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MKLDNN_TestsSelect_numpy, SelectLayerTest, numpyCases, SelectLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_MKLDNN_TestsSelect_numpy, SelectLayerTest, numpyCases, SelectLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/shape_of.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/shape_of.cpp index 9dbd9a6abbf..814d3c64f7f 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/shape_of.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/shape_of.cpp @@ -14,7 +14,7 @@ namespace { InferenceEngine::Precision::I32 }; - INSTANTIATE_TEST_CASE_P(smoke_Check, ShapeOfLayerTest, + INSTANTIATE_TEST_SUITE_P(smoke_Check, ShapeOfLayerTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(std::vector({10, 10, 10})), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp index b338d02efc1..dfc51edd9ca 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp @@ -24,7 +24,7 @@ const auto shuffleChannelsParams4D = ::testing::Combine( ::testing::ValuesIn(groups) ); -INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels4D, ShuffleChannelsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ShuffleChannels4D, ShuffleChannelsLayerTest, ::testing::Combine( shuffleChannelsParams4D, ::testing::ValuesIn(netPrecisions), @@ -37,7 +37,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels4D, ShuffleChannelsLayerTest, ShuffleChannelsLayerTest::getTestCaseName); // ND support tests -INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels6D, ShuffleChannelsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ShuffleChannels6D, ShuffleChannelsLayerTest, ::testing::Combine( ::testing::Values(std::tuple(2, 3)), ::testing::ValuesIn(netPrecisions), @@ -49,7 +49,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels6D, ShuffleChannelsLayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), ShuffleChannelsLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels5D, ShuffleChannelsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ShuffleChannels5D, ShuffleChannelsLayerTest, ::testing::Combine( ::testing::Values(std::tuple(2, 3)), ::testing::ValuesIn(netPrecisions), @@ -61,7 +61,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels5D, ShuffleChannelsLayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), ShuffleChannelsLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels3D, ShuffleChannelsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ShuffleChannels3D, ShuffleChannelsLayerTest, ::testing::Combine( ::testing::Values(std::tuple(1, 3)), ::testing::ValuesIn(netPrecisions), @@ -73,7 +73,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels3D, ShuffleChannelsLayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), ShuffleChannelsLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels2D, ShuffleChannelsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ShuffleChannels2D, ShuffleChannelsLayerTest, ::testing::Combine( ::testing::Values(std::tuple(1, 3)), ::testing::ValuesIn(netPrecisions), @@ -85,7 +85,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels2D, ShuffleChannelsLayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), ShuffleChannelsLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels1D, ShuffleChannelsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ShuffleChannels1D, ShuffleChannelsLayerTest, ::testing::Combine( ::testing::Values(std::tuple(0, 3)), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp index 4c90f92d98b..23d4c6555da 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/softmax.cpp @@ -41,7 +41,7 @@ const auto params2D = testing::Combine( testing::Values(std::map()) ); -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()) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_SoftMax4D, SoftMaxLayerTest, params4D, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp index 884440c7bde..f6afb616f60 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp @@ -37,7 +37,7 @@ const auto SpaceToBatch4D = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_spacetobatch4D, SpaceToBatchLayerTest, SpaceToBatch4D, SpaceToBatchLayerTest::getTestCaseName); @@ -67,7 +67,7 @@ const auto SpaceToBatch5D = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_spacetobatch5D, SpaceToBatchLayerTest, SpaceToBatch5D, SpaceToBatchLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/space_to_depth.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/space_to_depth.cpp index ff7e33e495e..29d2af87ea4 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/space_to_depth.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/space_to_depth.cpp @@ -36,7 +36,7 @@ const auto SpaceToDepthBS2 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_SpaceToDepthBS2, SpaceToDepthLayerTest, SpaceToDepthBS2, SpaceToDepthLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_SpaceToDepthBS2, SpaceToDepthLayerTest, SpaceToDepthBS2, SpaceToDepthLayerTest::getTestCaseName); const std::vector> inputShapesBS3 = { {1, 1, 3, 3}, {1, 1, 6, 6}, {1, 1, 9, 9}, {2, 4, 9, 9}, {2, 3, 15, 12}, @@ -51,6 +51,6 @@ const auto SpaceToDepthBS3 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_SpaceToDepthBS3, SpaceToDepthLayerTest, SpaceToDepthBS3, SpaceToDepthLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_SpaceToDepthBS3, SpaceToDepthLayerTest, SpaceToDepthBS3, SpaceToDepthLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/split.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/split.cpp index 35d3149dcc3..7c12638fd6d 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/split.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/split.cpp @@ -18,7 +18,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::U8 }; -INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, SplitLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_NumSplitsCheck, SplitLayerTest, ::testing::Combine( ::testing::Values(1, 2, 3, 5), ::testing::Values(0, 1, 2, 3), @@ -32,7 +32,7 @@ INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, SplitLayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), SplitLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_splitWithUnusedOutputsTest, SplitLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_splitWithUnusedOutputsTest, SplitLayerTest, ::testing::Combine( ::testing::Values(5), ::testing::Values(0), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp index a5a8f35a350..2145c5d37ea 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp @@ -38,7 +38,7 @@ const std::vector opTypes = { ngraph::helpers::SqueezeOpType::UNSQUEEZE }; -INSTANTIATE_TEST_CASE_P(smoke_Basic, SqueezeUnsqueezeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Basic, SqueezeUnsqueezeLayerTest, ::testing::Combine( ::testing::ValuesIn(CommonTestUtils::combineParams(axesVectors)), ::testing::ValuesIn(opTypes), @@ -50,7 +50,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Basic, SqueezeUnsqueezeLayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), SqueezeUnsqueezeLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Basic_emptyAxes, SqueezeUnsqueezeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Basic_emptyAxes, SqueezeUnsqueezeLayerTest, ::testing::Combine( ::testing::ValuesIn(CommonTestUtils::combineParams(emptyAxesVectors)), ::testing::Values(ngraph::helpers::SqueezeOpType::SQUEEZE), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/strided_slice.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/strided_slice.cpp index 9897df6a830..bd749a0b51c 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/strided_slice.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/strided_slice.cpp @@ -116,7 +116,7 @@ std::vector ss_only_test_cases = { { 1, 1, 1, 0, 1 }, { 1, 1, 1, 0, 1 }, { }, { 0, 1, 0, 0, 0 }, { } }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_MKLDNN, StridedSliceLayerTest, ::testing::Combine( ::testing::ValuesIn(ss_only_test_cases), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/tensor_iterator.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/tensor_iterator.cpp index 2a551b695f9..279e4e98495 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/tensor_iterator.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/tensor_iterator.cpp @@ -28,7 +28,7 @@ namespace { std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; - INSTANTIATE_TEST_CASE_P(smoke_TensorIteratorCommon, TensorIteratorTest, + INSTANTIATE_TEST_SUITE_P(smoke_TensorIteratorCommon, TensorIteratorTest, ::testing::Combine( ::testing::ValuesIn(should_decompose), ::testing::ValuesIn(seq_lengths_zero_clip), @@ -43,7 +43,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_CPU)), TensorIteratorTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_TensorIteratorCommonClip, TensorIteratorTest, + INSTANTIATE_TEST_SUITE_P(smoke_TensorIteratorCommonClip, TensorIteratorTest, ::testing::Combine( ::testing::ValuesIn(should_decompose), ::testing::ValuesIn(seq_lengths_clip_non_zero), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/tile.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/tile.cpp index 5894b1c1ec6..bff906dd101 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/tile.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/tile.cpp @@ -22,7 +22,7 @@ const std::vector> repeats3D = { {1, 1, 1} }; -INSTANTIATE_TEST_CASE_P(smoke_Tile, TileLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Tile, TileLayerTest, ::testing::Combine( ::testing::ValuesIn(repeats3D), ::testing::ValuesIn(netPrecisions), @@ -39,7 +39,7 @@ const std::vector> repeats6D = { {1, 1, 1, 1, 1, 1} }; -INSTANTIATE_TEST_CASE_P(smoke_Tile6d, TileLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Tile6d, TileLayerTest, ::testing::Combine( ::testing::ValuesIn(repeats6D), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/topk.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/topk.cpp index d3da99f6369..dfb717a6b64 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/topk.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/topk.cpp @@ -38,7 +38,7 @@ const std::vector sortTypes = { }; -INSTANTIATE_TEST_CASE_P(smoke_TopK, TopKLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_TopK, TopKLayerTest, ::testing::Combine( ::testing::ValuesIn(k), ::testing::ValuesIn(axes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/transpose.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/transpose.cpp index 044448b7843..0575fc345b7 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/transpose.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/transpose.cpp @@ -23,7 +23,7 @@ const std::vector netPrecisions = { std::vector> inputShape2D = {{2, 10}, {10, 2}, {10, 10}}; std::vector> order2D = {{}, {0, 1}, {1, 0}}; -INSTANTIATE_TEST_CASE_P(smoke_Transpose2D, TransposeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Transpose2D, TransposeLayerTest, ::testing::Combine( ::testing::ValuesIn(order2D), ::testing::ValuesIn(netPrecisions), @@ -43,7 +43,7 @@ std::vector> order4D = { {3, 0, 1, 2}, {3, 0, 2, 1}, {3, 1, 0, 2}, {3, 1, 2, 0}, {3, 2, 0, 1}, {3, 2, 1, 0} }; -INSTANTIATE_TEST_CASE_P(smoke_Transpose4D, TransposeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Transpose4D, TransposeLayerTest, ::testing::Combine( ::testing::ValuesIn(order4D), ::testing::ValuesIn(netPrecisions), @@ -61,7 +61,7 @@ std::vector> order5D = { {1, 4, 2, 3, 0}, {2, 4, 1, 0, 3}, {3, 0, 2, 1, 4}, {4, 1, 0, 3, 2}, {0, 4, 1, 2, 3}, }; -INSTANTIATE_TEST_CASE_P(smoke_Transpose5D, TransposeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Transpose5D, TransposeLayerTest, ::testing::Combine( ::testing::ValuesIn(order5D), ::testing::ValuesIn(netPrecisions), @@ -79,7 +79,7 @@ std::vector> order6D = { {1, 5, 4, 2, 3, 0}, {2, 5, 4, 1, 0, 3}, {3, 0, 2, 1, 4, 5}, {5, 1, 0, 4, 3, 2}, {0, 5, 1, 2, 3, 4}, }; -INSTANTIATE_TEST_CASE_P(smoke_Transpose6D, TransposeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Transpose6D, TransposeLayerTest, ::testing::Combine( ::testing::ValuesIn(order6D), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/variadic_split.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/variadic_split.cpp index db0c9e156e6..7b9af2bbae2 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/variadic_split.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/single_layer_tests/variadic_split.cpp @@ -25,7 +25,7 @@ namespace { {4, 11, 6, 9} }; - INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, VariadicSplitLayerTest, + INSTANTIATE_TEST_SUITE_P(smoke_NumSplitsCheck, VariadicSplitLayerTest, ::testing::Combine( ::testing::ValuesIn(numSplits), ::testing::Values(0, 1, 2, 3), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/codegen_add.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/codegen_add.cpp index 72c50bce2a4..940aa4bf5c8 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/codegen_add.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/codegen_add.cpp @@ -16,7 +16,7 @@ namespace { InferenceEngine::Precision::FP32 }; - INSTANTIATE_TEST_CASE_P(NoReshape, CodegenAdd, + INSTANTIATE_TEST_SUITE_P(NoReshape, CodegenAdd, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({1, 42, 16, 64})), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/codegen_bert.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/codegen_bert.cpp index 97b3737d693..ea76ba4d7df 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/codegen_bert.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/codegen_bert.cpp @@ -16,7 +16,7 @@ namespace { InferenceEngine::Precision::FP32 }; - INSTANTIATE_TEST_CASE_P(NoReshape, CodegenBert, + INSTANTIATE_TEST_SUITE_P(NoReshape, CodegenBert, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({1, 42, 16, 64})), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/codegen_gelu.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/codegen_gelu.cpp index 81b03911dab..c7e9a5664b7 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/codegen_gelu.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/codegen_gelu.cpp @@ -16,7 +16,7 @@ namespace { InferenceEngine::Precision::FP32 }; - INSTANTIATE_TEST_CASE_P(NoReshape, CodegenGelu, + INSTANTIATE_TEST_SUITE_P(NoReshape, CodegenGelu, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({1, 384, 4096})), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/constant_result.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/constant_result.cpp index 19dcaacecda..10fb3563eee 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/constant_result.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/constant_result.cpp @@ -34,7 +34,7 @@ const std::vector precisions = { Precision::BOOL }; -INSTANTIATE_TEST_CASE_P(smoke_Check, ConstantResultSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_Check, ConstantResultSubgraphTest, ::testing::Combine( ::testing::ValuesIn(types), ::testing::ValuesIn(shapes), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/conv_eltwise_fusion.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/conv_eltwise_fusion.cpp index 920891a726a..fe598de71ba 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/conv_eltwise_fusion.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/conv_eltwise_fusion.cpp @@ -16,7 +16,7 @@ namespace { #define ADD(X) std::tuple(ngraph::opset4::Add::type_info, X) #define IN std::vector> - INSTANTIATE_TEST_CASE_P(smoke_Convolution_1D, ConvEltwiseFusion, + INSTANTIATE_TEST_SUITE_P(smoke_Convolution_1D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::Convolution::type_info), ::testing::ValuesIn(IN({MUL(4), ADD(5)})), @@ -27,7 +27,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvEltwiseFusion::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution_1D, ConvEltwiseFusion, + INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution_1D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::GroupConvolution::type_info), ::testing::ValuesIn(IN({MUL(4), ADD(5)})), @@ -38,7 +38,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvEltwiseFusion::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData_1D, ConvEltwiseFusion, + INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData_1D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::ConvolutionBackpropData::type_info), ::testing::ValuesIn(IN({MUL(4), ADD(5)})), @@ -49,7 +49,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvEltwiseFusion::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackpropData_1D, ConvEltwiseFusion, + INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolutionBackpropData_1D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::GroupConvolutionBackpropData::type_info), ::testing::ValuesIn(IN({MUL(4), ADD(5)})), @@ -68,7 +68,7 @@ namespace { {1, 1, 1, 1} }; - INSTANTIATE_TEST_CASE_P(smoke_Convolution_2D, ConvEltwiseFusion, + INSTANTIATE_TEST_SUITE_P(smoke_Convolution_2D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::Convolution::type_info), ::testing::ValuesIn(IN({MUL(4), ADD(5)})), @@ -79,7 +79,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvEltwiseFusion::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution_2D, ConvEltwiseFusion, + INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution_2D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::GroupConvolution::type_info), ::testing::ValuesIn(IN({MUL(4), ADD(5)})), @@ -90,7 +90,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvEltwiseFusion::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData_2D, ConvEltwiseFusion, + INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData_2D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::ConvolutionBackpropData::type_info), ::testing::ValuesIn(IN({MUL(4), ADD(5)})), @@ -101,7 +101,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvEltwiseFusion::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackpropData_2D, ConvEltwiseFusion, + INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolutionBackpropData_2D, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::GroupConvolutionBackpropData::type_info), ::testing::ValuesIn(IN({MUL(4), ADD(5)})), @@ -117,7 +117,7 @@ namespace { {3}, {3, 1}, {3, 1, 1, 1} }; - INSTANTIATE_TEST_CASE_P(smoke_Convolution_2D_Negative, ConvEltwiseFusion, + INSTANTIATE_TEST_SUITE_P(smoke_Convolution_2D_Negative, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::Convolution::type_info), ::testing::ValuesIn(IN({MUL(6), ADD(6)})), @@ -128,7 +128,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvEltwiseFusion::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution_2D_Negative, ConvEltwiseFusion, + INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution_2D_Negative, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::GroupConvolution::type_info), ::testing::ValuesIn(IN({MUL(6), ADD(6)})), @@ -139,7 +139,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvEltwiseFusion::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData_2D_Negative, ConvEltwiseFusion, + INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData_2D_Negative, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::ConvolutionBackpropData::type_info), ::testing::ValuesIn(IN({MUL(6), ADD(6)})), @@ -150,7 +150,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvEltwiseFusion::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackpropData_2D_Negative, ConvEltwiseFusion, + INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolutionBackpropData_2D_Negative, ConvEltwiseFusion, ::testing::Combine( ::testing::Values(ngraph::opset4::GroupConvolutionBackpropData::type_info), ::testing::ValuesIn(IN({MUL(6), ADD(6)})), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/convert_pad_to_group_conv.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/convert_pad_to_group_conv.cpp index 2ab868e8ca0..556eafd6aaf 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/convert_pad_to_group_conv.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/convert_pad_to_group_conv.cpp @@ -16,7 +16,7 @@ namespace { const std::vector values{0., 1.}; - INSTANTIATE_TEST_CASE_P(smoke_Pad_1D, ConvertPadToConvTests, + INSTANTIATE_TEST_SUITE_P(smoke_Pad_1D, ConvertPadToConvTests, ::testing::Combine( ::testing::Values(ngraph::Shape{1, 8, 64}), ::testing::ValuesIn(pads_1d), @@ -31,7 +31,7 @@ namespace { {0, 0, 10, 10}, {0, 0, 0, 4}, {0, 0, 4, 0} }; - INSTANTIATE_TEST_CASE_P(smoke_Pad_2D, ConvertPadToConvTests, + INSTANTIATE_TEST_SUITE_P(smoke_Pad_2D, ConvertPadToConvTests, ::testing::Combine( ::testing::Values(ngraph::Shape{1, 8, 64, 16}), ::testing::ValuesIn(pads_2d), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/get_output_before_activation.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/get_output_before_activation.cpp index 6f47cf9d7d9..33749070679 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/get_output_before_activation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/get_output_before_activation.cpp @@ -23,7 +23,7 @@ namespace { std::map additional_config = {}; } // namespace -INSTANTIATE_TEST_CASE_P(OutputBeforeActivation, OutputBeforeActivation, +INSTANTIATE_TEST_SUITE_P(OutputBeforeActivation, OutputBeforeActivation, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(InferenceEngine::Precision::FP32), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp index 9cab6afd9fb..ac319247600 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp @@ -36,7 +36,7 @@ std::vector output_sizes = { 8 }; -INSTANTIATE_TEST_CASE_P(smoke_MatmulSqueezeAdd, MatmulSqueezeAddTest, +INSTANTIATE_TEST_SUITE_P(smoke_MatmulSqueezeAdd, MatmulSqueezeAddTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/memory_LSTMCell.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/memory_LSTMCell.cpp index 8e975434347..2d7af0c03d3 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/memory_LSTMCell.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/memory_LSTMCell.cpp @@ -33,7 +33,7 @@ namespace SubgraphTestsDefinitions { std::map additional_config = { }; - INSTANTIATE_TEST_CASE_P(smoke_MemoryLSTMCellTest, MemoryLSTMCellTest, + INSTANTIATE_TEST_SUITE_P(smoke_MemoryLSTMCellTest, MemoryLSTMCellTest, ::testing::Combine( ::testing::ValuesIn(transformation), ::testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/multiple_LSTMCell.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/multiple_LSTMCell.cpp index 4c18ee6ea05..f0f8e6c6895 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/multiple_LSTMCell.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/multiple_LSTMCell.cpp @@ -35,7 +35,7 @@ std::map additional_config = { } // namespace -INSTANTIATE_TEST_CASE_P(MultipleLSTMCellTest, MultipleLSTMCellTest, +INSTANTIATE_TEST_SUITE_P(MultipleLSTMCellTest, MultipleLSTMCellTest, ::testing::Combine( ::testing::ValuesIn(transformation), ::testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/multiply_add.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/multiply_add.cpp index 37df66d8b6b..73145968aa7 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/multiply_add.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/multiply_add.cpp @@ -22,7 +22,7 @@ const std::vector> inputShapes = { {1, 3, 2, 2, 2, 2, 2, 2, 4, 5}, }; -INSTANTIATE_TEST_CASE_P(smoke_MultipleAdd_Nd, MultiplyAddLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MultipleAdd_Nd, MultiplyAddLayerTest, ::testing::Combine( ::testing::ValuesIn(inputShapes), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/mvn_multiply_add.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/mvn_multiply_add.cpp index 3150926b2a9..58087839db2 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/mvn_multiply_add.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/mvn_multiply_add.cpp @@ -55,7 +55,7 @@ const std::vector> shapes_3D = { std::pair{ SizeVector{2, 3, 3}, SizeVector{2, 3, 3}}, }; -INSTANTIATE_TEST_CASE_P(smoke_MVNMultiplyAdd_1D, MVNMultiplyAdd, +INSTANTIATE_TEST_SUITE_P(smoke_MVNMultiplyAdd_1D, MVNMultiplyAdd, ::testing::Combine( ::testing::ValuesIn(shapes_1D), ::testing::ValuesIn(netPrecision), @@ -67,7 +67,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MVNMultiplyAdd_1D, MVNMultiplyAdd, ::testing::Values(CommonTestUtils::DEVICE_CPU)), MVNMultiplyAdd::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MVNMultiplyAdd_2D, MVNMultiplyAdd, +INSTANTIATE_TEST_SUITE_P(smoke_MVNMultiplyAdd_2D, MVNMultiplyAdd, ::testing::Combine( ::testing::ValuesIn(shapes_2D), ::testing::ValuesIn(netPrecision), @@ -79,7 +79,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MVNMultiplyAdd_2D, MVNMultiplyAdd, ::testing::Values(CommonTestUtils::DEVICE_CPU)), MVNMultiplyAdd::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MVNMultiplyAdd_3D, MVNMultiplyAdd, +INSTANTIATE_TEST_SUITE_P(smoke_MVNMultiplyAdd_3D, MVNMultiplyAdd, ::testing::Combine( ::testing::ValuesIn(shapes_3D), ::testing::ValuesIn(netPrecision), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/parameter_result.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/parameter_result.cpp index 7eb8265150c..3da2e776949 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/parameter_result.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/parameter_result.cpp @@ -8,7 +8,7 @@ using namespace SubgraphTestsDefinitions; namespace { - INSTANTIATE_TEST_CASE_P(smoke_Check, ParameterResultSubgraphTest, + INSTANTIATE_TEST_SUITE_P(smoke_Check, ParameterResultSubgraphTest, ::testing::Values(CommonTestUtils::DEVICE_CPU), ParameterResultSubgraphTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp index da0b67cd8c4..01192fdffd5 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp @@ -31,7 +31,7 @@ std::map additional_config = { } // namespace namespace SubgraphTestsDefinitions { -INSTANTIATE_TEST_CASE_P(smoke_basic, PermConvPermConcat, +INSTANTIATE_TEST_SUITE_P(smoke_basic, PermConvPermConcat, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp index 0413002c096..2d35a470247 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp @@ -42,7 +42,7 @@ const auto quantConvBackpropData2DParams = ::testing::Combine( ::testing::ValuesIn(granularity) ); -INSTANTIATE_TEST_CASE_P(smoke_QuantConvBackpropData2D, QuantConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_QuantConvBackpropData2D, QuantConvBackpropDataLayerTest, ::testing::Combine( quantConvBackpropData2DParams, ::testing::ValuesIn(netPrecisions), @@ -70,7 +70,7 @@ const auto quantConvBackpropData3DParams = ::testing::Combine( ::testing::ValuesIn(granularity) ); -INSTANTIATE_TEST_CASE_P(smoke_QuantConvBackpropData3D, QuantConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_QuantConvBackpropData3D, QuantConvBackpropDataLayerTest, ::testing::Combine( quantConvBackpropData3DParams, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution.cpp index 33c010dc36c..7627c3730dd 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution.cpp @@ -46,7 +46,7 @@ const auto quantGroupConv2DParams = ::testing::Combine( ::testing::ValuesIn(quantizeWeights) ); -INSTANTIATE_TEST_CASE_P(smoke_QuantGroupConv2D, QuantGroupConvLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_QuantGroupConv2D, QuantGroupConvLayerTest, ::testing::Combine( quantGroupConv2DParams, ::testing::ValuesIn(netPrecisions), @@ -75,7 +75,7 @@ const auto quantGroupConv3DParams = ::testing::Combine( ::testing::ValuesIn(quantizeWeights) ); -INSTANTIATE_TEST_CASE_P(smoke_QuantGroupConv3D, QuantGroupConvLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_QuantGroupConv3D, QuantGroupConvLayerTest, ::testing::Combine( quantGroupConv3DParams, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp index bc64dd43041..ef002cc8ee5 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp @@ -44,7 +44,7 @@ const auto quantGroupConvBackpropData2DParams = ::testing::Combine( ::testing::ValuesIn(granularity) ); -INSTANTIATE_TEST_CASE_P(smoke_QuantGroupConvBackpropData2D, QuantGroupConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_QuantGroupConvBackpropData2D, QuantGroupConvBackpropDataLayerTest, ::testing::Combine( quantGroupConvBackpropData2DParams, ::testing::ValuesIn(netPrecisions), @@ -73,7 +73,7 @@ const auto quantGroupConvBackpropData3DParams = ::testing::Combine( ::testing::ValuesIn(granularity) ); -INSTANTIATE_TEST_CASE_P(smoke_QuantGroupConvBackpropData3D, QuantGroupConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_QuantGroupConvBackpropData3D, QuantGroupConvBackpropDataLayerTest, ::testing::Combine( quantGroupConvBackpropData3DParams, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_mat_mul.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_mat_mul.cpp index 3af9da8f49c..7914371a463 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_mat_mul.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/quantized_mat_mul.cpp @@ -77,7 +77,7 @@ const auto quantParams_i32 = ::testing::Combine( ::testing::Values(InferenceEngine::Precision::I32) ); -INSTANTIATE_TEST_CASE_P(smoke_QuantMatMul_i8i8, QuantMatMulTest, +INSTANTIATE_TEST_SUITE_P(smoke_QuantMatMul_i8i8, QuantMatMulTest, ::testing::Combine( quantParams_i8, quantParams_i8, @@ -87,7 +87,7 @@ INSTANTIATE_TEST_CASE_P(smoke_QuantMatMul_i8i8, QuantMatMulTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), QuantMatMulTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_QuantMatMul_u8i8, QuantMatMulTest, +INSTANTIATE_TEST_SUITE_P(smoke_QuantMatMul_u8i8, QuantMatMulTest, ::testing::Combine( quantParams_u8, quantParams_i8, @@ -97,7 +97,7 @@ INSTANTIATE_TEST_CASE_P(smoke_QuantMatMul_u8i8, QuantMatMulTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), QuantMatMulTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_QuantMatMul_i16i32, QuantMatMulTest, +INSTANTIATE_TEST_SUITE_P(smoke_QuantMatMul_i16i32, QuantMatMulTest, ::testing::Combine( quantParams_i16, quantParams_i32, diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/range_add.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/range_add.cpp index 9a53c864dd9..35e388f328e 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/range_add.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/range_add.cpp @@ -30,7 +30,7 @@ const std::vector netPrecisions = { // ------------------------------ V0 ------------------------------ -INSTANTIATE_TEST_CASE_P(smoke_BasicPositive, RangeAddSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_BasicPositive, RangeAddSubgraphTest, ::testing::Combine( ::testing::ValuesIn(positiveStart), ::testing::ValuesIn(positiveStop), @@ -43,7 +43,7 @@ INSTANTIATE_TEST_CASE_P(smoke_BasicPositive, RangeAddSubgraphTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), RangeAddSubgraphTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BasicNegative, RangeAddSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_BasicNegative, RangeAddSubgraphTest, ::testing::Combine( ::testing::ValuesIn(negativeStart), ::testing::ValuesIn(negativeStop), @@ -57,7 +57,7 @@ INSTANTIATE_TEST_CASE_P(smoke_BasicNegative, RangeAddSubgraphTest, RangeAddSubgraphTest::getTestCaseName); // ------------------------------ V4 ------------------------------ -INSTANTIATE_TEST_CASE_P(smoke_BasicPositive, RangeNumpyAddSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_BasicPositive, RangeNumpyAddSubgraphTest, ::testing::Combine( ::testing::ValuesIn(positiveStart), ::testing::ValuesIn(positiveStop), @@ -70,7 +70,7 @@ INSTANTIATE_TEST_CASE_P(smoke_BasicPositive, RangeNumpyAddSubgraphTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), RangeNumpyAddSubgraphTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BasicNegative, RangeNumpyAddSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_BasicNegative, RangeNumpyAddSubgraphTest, ::testing::Combine( ::testing::ValuesIn(negativeStart), ::testing::ValuesIn(negativeStop), @@ -83,7 +83,7 @@ INSTANTIATE_TEST_CASE_P(smoke_BasicNegative, RangeNumpyAddSubgraphTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), RangeNumpyAddSubgraphTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BasicTruncateInputs, RangeNumpyAddSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_BasicTruncateInputs, RangeNumpyAddSubgraphTest, ::testing::Combine( ::testing::ValuesIn(trunc_start), ::testing::ValuesIn(trunc_stop), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/relu_shape_of.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/relu_shape_of.cpp index 917cb6932c0..a1618c3d2fb 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/relu_shape_of.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/relu_shape_of.cpp @@ -14,7 +14,7 @@ namespace { InferenceEngine::Precision::I32 }; - INSTANTIATE_TEST_CASE_P(smoke_Check, ReluShapeOfSubgraphTest, + INSTANTIATE_TEST_SUITE_P(smoke_Check, ReluShapeOfSubgraphTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(std::vector({20, 10, 10, 10})), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp index 1e4666b523b..8645cb95325 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp @@ -38,7 +38,7 @@ namespace { ngraph::helpers::SqueezeOpType::UNSQUEEZE }; - INSTANTIATE_TEST_CASE_P(smoke_reshape_squeeze_reshape_relu, ReshapeSqueezeReshapeRelu, + INSTANTIATE_TEST_SUITE_P(smoke_reshape_squeeze_reshape_relu, ReshapeSqueezeReshapeRelu, ::testing::Combine( ::testing::ValuesIn(inputs), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_concat_memory.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_concat_memory.cpp index a5c93c9ac9c..8fdf19bcb58 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_concat_memory.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_concat_memory.cpp @@ -26,7 +26,7 @@ const std::vector shapes = { {3, 8}, }; -INSTANTIATE_TEST_CASE_P(smoke_CPU, SplitConcatMemory, +INSTANTIATE_TEST_SUITE_P(smoke_CPU, SplitConcatMemory, ::testing::Combine( ::testing::ValuesIn(shapes), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp index 12dedadc265..b156873f470 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp @@ -16,7 +16,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::FP16 }; -INSTANTIATE_TEST_CASE_P(smoke_NoReshape, SplitConvConcat, +INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, SplitConvConcat, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({1, 6, 40, 40})), diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/tensor_names.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/tensor_names.cpp index e5d104920cb..8e4e93ceb63 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/tensor_names.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/tensor_names.cpp @@ -10,7 +10,7 @@ using namespace SubgraphTestsDefinitions; namespace { - INSTANTIATE_TEST_CASE_P(smoke_Check, TensorNamesTest, + INSTANTIATE_TEST_SUITE_P(smoke_Check, TensorNamesTest, ::testing::Values(CommonTestUtils::DEVICE_CPU), TensorNamesTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/variadic_split_pad.cpp b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/variadic_split_pad.cpp index 3e73dbeccf8..8f188589344 100644 --- a/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/variadic_split_pad.cpp +++ b/inference-engine/tests/functional/plugin/cpu/shared_tests_instances/subgraph_tests/variadic_split_pad.cpp @@ -48,7 +48,7 @@ const std::vector padMode = { ngraph::helpers::PadMode::SYMMETRIC }; -INSTANTIATE_TEST_CASE_P(smoke_CPU, VariadicSplitPad, +INSTANTIATE_TEST_SUITE_P(smoke_CPU, VariadicSplitPad, ::testing::Combine( ::testing::ValuesIn(shapes), ::testing::Values(1), diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/activation.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/activation.cpp index d473bbde6e2..f2e5a76e33c 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/activation.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/activation.cpp @@ -128,7 +128,7 @@ const auto basicCases4D = ::testing::Combine( ::testing::ValuesIn(filterCPUSpecificParams(cpuParams_4D)) ); -INSTANTIATE_TEST_CASE_P(smoke_Activation4D_Eltwise_CPU_BF16, ActivationLayerCPUTest, basicCases4D, ActivationLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation4D_Eltwise_CPU_BF16, ActivationLayerCPUTest, basicCases4D, ActivationLayerCPUTest::getTestCaseName); std::vector cpuParams_5D = { CPUSpecificParams({nCdhw16c}, {nCdhw16c}, {}, {}), @@ -154,6 +154,6 @@ const auto basicCases5D = ::testing::Combine( ::testing::ValuesIn(filterCPUSpecificParams(cpuParams_5D)) ); -INSTANTIATE_TEST_CASE_P(smoke_Activation5D_Eltwise_CPU_BF16, ActivationLayerCPUTest, basicCases5D, ActivationLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation5D_Eltwise_CPU_BF16, ActivationLayerCPUTest, basicCases5D, ActivationLayerCPUTest::getTestCaseName); } // namespace } // namespace CPULayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/batch_to_space.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/batch_to_space.cpp index 82c97a51166..a1c583adfcc 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/batch_to_space.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/batch_to_space.cpp @@ -120,10 +120,10 @@ const auto batchToSpaceParamsSet4D2 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(cpuParams_4D)); -INSTANTIATE_TEST_CASE_P(smoke_BatchToSpaceCPULayerTestCase1_4D, BatchToSpaceCPULayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_BatchToSpaceCPULayerTestCase1_4D, BatchToSpaceCPULayerTest, batchToSpaceParamsSet4D1, BatchToSpaceCPULayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BatchToSpaceCPULayerTestCase2_4D, BatchToSpaceCPULayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_BatchToSpaceCPULayerTestCase2_4D, BatchToSpaceCPULayerTest, batchToSpaceParamsSet4D2, BatchToSpaceCPULayerTest::getTestCaseName); const std::vector> blockShape5D1 = {{1, 1, 2, 2, 1}, {1, 2, 1, 2, 2}}; @@ -169,10 +169,10 @@ const auto batchToSpaceParamsSet5D2 = ::testing::Combine( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(cpuParams_5D)); -INSTANTIATE_TEST_CASE_P(smoke_BatchToSpaceCPULayerTestCase1_5D, BatchToSpaceCPULayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_BatchToSpaceCPULayerTestCase1_5D, BatchToSpaceCPULayerTest, batchToSpaceParamsSet5D1, BatchToSpaceCPULayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BatchToSpaceCPULayerTestCase2_5D, BatchToSpaceCPULayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_BatchToSpaceCPULayerTestCase2_5D, BatchToSpaceCPULayerTest, batchToSpaceParamsSet5D2, BatchToSpaceCPULayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/concat.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/concat.cpp index 32b7b6d6091..11c20c7cd01 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/concat.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/concat.cpp @@ -96,7 +96,7 @@ const std::vector netPrecisions = { Precision::BF16 }; -INSTANTIATE_TEST_CASE_P(concat_Concat4D_CPU_Block8inPlace, ConcatLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(concat_Concat4D_CPU_Block8inPlace, ConcatLayerCPUTest, ::testing::Combine( ::testing::Values(1), ::testing::Values(std::vector>{{1, 8, 3, 5}, @@ -106,7 +106,7 @@ INSTANTIATE_TEST_CASE_P(concat_Concat4D_CPU_Block8inPlace, ConcatLayerCPUTest, ::testing::Values(planar_4D, planarChannels_4D, blocked8_4D)), ConcatLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Concat4D_CPU_Block8, ConcatLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Concat4D_CPU_Block8, ConcatLayerCPUTest, ::testing::Combine( ::testing::Values(0, 2, 3), ::testing::Values(std::vector>{{2, 16, 3, 5}, @@ -116,7 +116,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Concat4D_CPU_Block8, ConcatLayerCPUTest, ::testing::Values(planar_4D_ref, planarChannels_4D, blocked8_4D_ref)), ConcatLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Concat4D_CPU_Block16inPlace, ConcatLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Concat4D_CPU_Block16inPlace, ConcatLayerCPUTest, ::testing::Combine( ::testing::Values(1), ::testing::Values(std::vector>{{2, 16, 3, 5}, @@ -126,7 +126,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Concat4D_CPU_Block16inPlace, ConcatLayerCPUTest, ::testing::Values(blocked16_4D)), ConcatLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Concat4D_CPU_Block16, ConcatLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Concat4D_CPU_Block16, ConcatLayerCPUTest, ::testing::Combine( ::testing::Values(0, 2, 3), ::testing::Values(std::vector>{{2, 32, 3, 5}, @@ -136,7 +136,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Concat4D_CPU_Block16, ConcatLayerCPUTest, ::testing::Values(blocked16_4D_ref)), ConcatLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(concat_Concat5D_CPU_Block8inPlace, ConcatLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(concat_Concat5D_CPU_Block8inPlace, ConcatLayerCPUTest, ::testing::Combine( ::testing::Values(1), ::testing::Values(std::vector>{{1, 8, 3, 5, 7}, @@ -146,7 +146,7 @@ INSTANTIATE_TEST_CASE_P(concat_Concat5D_CPU_Block8inPlace, ConcatLayerCPUTest, ::testing::Values(planar_5D, planarChannels_5D, blocked8_5D)), ConcatLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Concat5D_CPU_Block8, ConcatLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Concat5D_CPU_Block8, ConcatLayerCPUTest, ::testing::Combine( ::testing::Values(0, 2, 3, 4), ::testing::Values(std::vector>{{2, 16, 3, 5, 7}, @@ -156,7 +156,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Concat5D_CPU_Block8, ConcatLayerCPUTest, ::testing::Values(planar_5D_ref, planarChannels_5D, blocked8_5D_ref)), ConcatLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Concat5D_CPU_Block16inPlace, ConcatLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Concat5D_CPU_Block16inPlace, ConcatLayerCPUTest, ::testing::Combine( ::testing::Values(1), ::testing::Values(std::vector>{{2, 16, 3, 5, 7}, @@ -166,7 +166,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Concat5D_CPU_Block16inPlace, ConcatLayerCPUTest, ::testing::Values(blocked16_5D)), ConcatLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Concat5D_CPU_Block16, ConcatLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Concat5D_CPU_Block16, ConcatLayerCPUTest, ::testing::Combine( ::testing::Values(0, 2, 3, 4), ::testing::Values(std::vector>{{2, 32, 3, 5, 7}, @@ -177,7 +177,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Concat5D_CPU_Block16, ConcatLayerCPUTest, ConcatLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Concat_inPlace, ConcatLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Concat_inPlace, ConcatLayerCPUTest, ::testing::Combine( ::testing::Values(1), ::testing::Values(std::vector>{{2, 3, 5}, @@ -189,7 +189,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Concat_inPlace, ConcatLayerCPUTest, ::testing::Values(CPUSpecificParams{{}, {}, {}, "unknown"})), ConcatLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Concat3D, ConcatLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Concat3D, ConcatLayerCPUTest, ::testing::Combine( ::testing::Values(0, 2), ::testing::Values(std::vector>{{2, 4, 5}, @@ -199,7 +199,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Concat3D, ConcatLayerCPUTest, ::testing::Values(CPUSpecificParams{{}, {}, {}, "ref"})), ConcatLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Concat_1D_2D, ConcatLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Concat_1D_2D, ConcatLayerCPUTest, ::testing::Combine( ::testing::Values(0), ::testing::Values(std::vector>{{2, 4}, diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert.cpp index e0ef6bfee15..3a8d3a920e2 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert.cpp @@ -33,7 +33,7 @@ const std::vector precisions = { Precision::BF16 }; -INSTANTIATE_TEST_CASE_P(smoke_ConvertLayerTest_From_BF16, ConvertCPULayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvertLayerTest_From_BF16, ConvertCPULayerTest, ::testing::Combine( ::testing::Values(inShape), ::testing::Values(Precision::BF16), @@ -43,7 +43,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvertLayerTest_From_BF16, ConvertCPULayerTest, ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvertLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ConvertLayerTest_To_BF16, ConvertCPULayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvertLayerTest_To_BF16, ConvertCPULayerTest, ::testing::Combine( ::testing::Values(inShape), ::testing::ValuesIn(precisions), diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert_to_plugin_specific_node.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert_to_plugin_specific_node.cpp index a59b7f6fc3b..204cf031f02 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert_to_plugin_specific_node.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convert_to_plugin_specific_node.cpp @@ -104,7 +104,7 @@ const auto testParamsEltwise = ::testing::Combine(::testing::ValuesIn(nonConstIS ::testing::ValuesIn(port), ::testing::Values(0)); -INSTANTIATE_TEST_CASE_P(smoke_CheckEltwise, ConvertToPluginSpecificNode, testParamsEltwise, ConvertToPluginSpecificNode::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CheckEltwise, ConvertToPluginSpecificNode, testParamsEltwise, ConvertToPluginSpecificNode::getTestCaseName); const auto testParamsPower = ::testing::Combine(::testing::ValuesIn(nonConstIS), ::testing::ValuesIn(constIS), @@ -113,7 +113,7 @@ const auto testParamsPower = ::testing::Combine(::testing::ValuesIn(nonConstIS), ::testing::Values(1), ::testing::Values(0)); -INSTANTIATE_TEST_CASE_P(smoke_CheckPower, ConvertToPluginSpecificNode, testParamsPower, ConvertToPluginSpecificNode::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CheckPower, ConvertToPluginSpecificNode, testParamsPower, ConvertToPluginSpecificNode::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution.cpp index 9be9a270ec7..b8d447d5a27 100755 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution.cpp @@ -220,7 +220,7 @@ const std::vector CPUParams_GEMM_2D = { conv_gemm_2D_nspc }; -INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_GEMM_FP32, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_GEMM_FP32, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_GEMM_2D, @@ -236,7 +236,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_GEMM_FP32, ConvolutionLayerCPUTest, ::testing::Values(cpuEmptyPluginConfig)), ConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_GEMM_BF16, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_GEMM_BF16, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_GEMM_2D, @@ -252,7 +252,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_GEMM_BF16, ConvolutionLayerCPUTest, ::testing::Values(cpuBF16PluginConfig)), ConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_GEMM_I8, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_GEMM_I8, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_GEMM_2D, @@ -284,7 +284,7 @@ const std::vector CPUParams_GEMM_3D = { conv_gemm_3D_nspc }; -INSTANTIATE_TEST_CASE_P(smoke_Conv_3D_GEMM_FP32, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_3D_GEMM_FP32, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_GEMM_3D, @@ -300,7 +300,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Conv_3D_GEMM_FP32, ConvolutionLayerCPUTest, ::testing::Values(cpuEmptyPluginConfig)), ConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Conv_3D_GEMM_BF16, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_3D_GEMM_BF16, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_GEMM_3D, @@ -316,7 +316,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Conv_3D_GEMM_BF16, ConvolutionLayerCPUTest, ::testing::Values(cpuBF16PluginConfig)), ConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Conv_3D_GEMM_I8, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_3D_GEMM_I8, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_GEMM_3D, @@ -352,7 +352,7 @@ const std::vector CPUParams_2D = { conv_avx512_2D_nspc }; -INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_FP32, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_FP32, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_2D, @@ -368,7 +368,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_FP32, ConvolutionLayerCPUTest, ::testing::Values(cpuEmptyPluginConfig)), ConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_BF16, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_BF16, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_2D, @@ -384,7 +384,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_BF16, ConvolutionLayerCPUTest, ::testing::Values(cpuBF16PluginConfig)), ConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_I8, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_I8, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_2D, @@ -406,7 +406,7 @@ const std::vector CPUParams_2D_plain_to_blocked = { conv_avx512_plain_to_blocked_2D, }; -INSTANTIATE_TEST_CASE_P(smoke_Conv_PlainToBlocked_2D_FP32, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_PlainToBlocked_2D_FP32, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_2D, @@ -422,7 +422,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Conv_PlainToBlocked_2D_FP32, ConvolutionLayerCPUTe ::testing::Values(cpuEmptyPluginConfig)), ConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Conv_PlainToBlocked_2D_BF16, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_PlainToBlocked_2D_BF16, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_2D, @@ -457,7 +457,7 @@ const std::vector CPUParams_3D = { conv_avx512_3D_nspc }; -INSTANTIATE_TEST_CASE_P(smoke_Conv_3D_FP32, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_3D_FP32, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_3D, @@ -473,7 +473,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Conv_3D_FP32, ConvolutionLayerCPUTest, ::testing::Values(cpuEmptyPluginConfig)), ConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Conv_3D_BF16, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_3D_BF16, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_3D, @@ -489,7 +489,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Conv_3D_BF16, ConvolutionLayerCPUTest, ::testing::Values(cpuBF16PluginConfig)), ConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Conv_3D_I8, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_3D_I8, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_3D, @@ -510,7 +510,7 @@ const std::vector CPUParams_3D_plain_to_blocked = { conv_avx512_plain_to_blocked_3D, }; -INSTANTIATE_TEST_CASE_P(smoke_Conv_PlainToBlocked_3D_FP32, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_PlainToBlocked_3D_FP32, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_3D, @@ -526,7 +526,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Conv_PlainToBlocked_3D_FP32, ConvolutionLayerCPUTe ::testing::Values(cpuEmptyPluginConfig)), ConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Conv_PlainToBlocked_3D_BF16, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_PlainToBlocked_3D_BF16, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_3D, @@ -563,7 +563,7 @@ const std::vector CPUParams_1x1_2D = { conv_avx512_2D_1x1_nspc }; -INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_1x1_FP32, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_1x1_FP32, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_1x1_2D, @@ -579,7 +579,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_1x1_FP32, ConvolutionLayerCPUTest, ::testing::Values(cpuEmptyPluginConfig)), ConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_1x1_BF16, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_1x1_BF16, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_1x1_2D, @@ -595,7 +595,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_1x1_BF16, ConvolutionLayerCPUTest, ::testing::Values(cpuBF16PluginConfig)), ConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Conv_2D_1x1_I8, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_2D_1x1_I8, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_1x1_2D, @@ -635,7 +635,7 @@ const std::vector CPUParams_1D = { conv_avx512_1D }; -INSTANTIATE_TEST_CASE_P(smoke_Conv_1D, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_1D, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_1D, @@ -670,7 +670,7 @@ const auto convParams_Planar_ExplicitPadding_2D = ::testing::Combine( ::testing::Values(ngraph::op::PadType::EXPLICIT) ); -INSTANTIATE_TEST_CASE_P(smoke_Conv_Jit_Planar_2D_FP32, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_Jit_Planar_2D_FP32, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_Planar_ExplicitPadding_2D, @@ -703,7 +703,7 @@ const auto convParams_Planar_ExplicitPadding_3D = ::testing::Combine( ::testing::Values(ngraph::op::PadType::EXPLICIT) ); -INSTANTIATE_TEST_CASE_P(smoke_Conv_Jit_Planar_3D_FP32, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_Jit_Planar_3D_FP32, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_Planar_ExplicitPadding_3D, @@ -752,7 +752,7 @@ const auto convParams_2D = ::testing::Combine( ::testing::Values(ngraph::op::PadType::EXPLICIT) ); -INSTANTIATE_TEST_CASE_P(smoke_Conv_winograd, ConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Conv_winograd, ConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_2D, diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution_backprop_data.cpp index f1d144f666e..69544f12e1f 100755 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/convolution_backprop_data.cpp @@ -152,7 +152,7 @@ const auto convParams_ExplicitPadding_Planar_2D = ::testing::Combine( ::testing::ValuesIn(emptyOutputPadding) ); -INSTANTIATE_TEST_CASE_P(smoke_Deconv_2D_Planar_FP32, DeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Deconv_2D_Planar_FP32, DeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_Planar_2D, @@ -169,7 +169,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Deconv_2D_Planar_FP32, DeconvolutionLayerCPUTest, ::testing::Values(cpuEmptyPluginConfig)), DeconvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Deconv_2D_Planar_BF16, DeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Deconv_2D_Planar_BF16, DeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_Planar_2D, @@ -198,7 +198,7 @@ const auto convParams_ExplicitPadding_Planar_3D = ::testing::Combine( ::testing::ValuesIn(emptyOutputPadding) ); -INSTANTIATE_TEST_CASE_P(smoke_Deconv_3D_Planar_FP32, DeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Deconv_3D_Planar_FP32, DeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_Planar_3D, @@ -215,7 +215,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Deconv_3D_Planar_FP32, DeconvolutionLayerCPUTest, ::testing::Values(cpuEmptyPluginConfig)), DeconvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Deconv_3D_Planar_BF16, DeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Deconv_3D_Planar_BF16, DeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_Planar_3D, @@ -244,7 +244,7 @@ const auto convParams_ExplicitPadding_Blocked_2D = ::testing::Combine( ::testing::ValuesIn(emptyOutputPadding) ); -INSTANTIATE_TEST_CASE_P(smoke_Deconv_2D_Blocked_FP32, DeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Deconv_2D_Blocked_FP32, DeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_Blocked_2D, @@ -261,7 +261,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Deconv_2D_Blocked_FP32, DeconvolutionLayerCPUTest, ::testing::Values(cpuEmptyPluginConfig)), DeconvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Deconv_2D_Blocked_BF16, DeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Deconv_2D_Blocked_BF16, DeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_Blocked_2D, @@ -290,7 +290,7 @@ const auto convParams_ExplicitPadding_Blocked_3D = ::testing::Combine( ::testing::ValuesIn(emptyOutputPadding) ); -INSTANTIATE_TEST_CASE_P(smoke_Deconv_3D_Blocked_FP32, DeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Deconv_3D_Blocked_FP32, DeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_Blocked_3D, @@ -307,7 +307,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Deconv_3D_Blocked_FP32, DeconvolutionLayerCPUTest, ::testing::Values(cpuEmptyPluginConfig)), DeconvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Deconv_3D_Blocked_BF16, DeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Deconv_3D_Blocked_BF16, DeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_Blocked_3D, @@ -337,7 +337,7 @@ const auto convParams_ExplicitPadding_1x1_2D = ::testing::Combine( ::testing::ValuesIn(emptyOutputPadding) ); -INSTANTIATE_TEST_CASE_P(smoke_Deconv_2D_1x1_FP32, DeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Deconv_2D_1x1_FP32, DeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_1x1_2D, @@ -354,7 +354,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Deconv_2D_1x1_FP32, DeconvolutionLayerCPUTest, ::testing::Values(cpuEmptyPluginConfig)), DeconvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Deconv_2D_1x1_BF16, DeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Deconv_2D_1x1_BF16, DeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_ExplicitPadding_1x1_2D, diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/depth_to_space.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/depth_to_space.cpp index 8588d9d2658..a5e54532001 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/depth_to_space.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/depth_to_space.cpp @@ -124,7 +124,7 @@ const auto depthToSpaceBS2_4DParams = testing::Combine( testing::ValuesIn(filterCPUInfoForDevice(CPUParamsBS2_4D)) ); -INSTANTIATE_TEST_CASE_P(smoke_CPUDepthToSpaceBS2_4D, DepthToSpaceLayerCPUTest, depthToSpaceBS2_4DParams, DepthToSpaceLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CPUDepthToSpaceBS2_4D, DepthToSpaceLayerCPUTest, depthToSpaceBS2_4DParams, DepthToSpaceLayerCPUTest::getTestCaseName); const std::vector CPUParamsBS3_4D = { cpuParams_nhwc_avx2, @@ -142,7 +142,7 @@ const auto depthToSpaceBS3_4DParams = testing::Combine( ::testing::ValuesIn(filterCPUInfoForDevice(CPUParamsBS3_4D)) ); -INSTANTIATE_TEST_CASE_P(smoke_CPUDepthToSpaceBS3_4D, DepthToSpaceLayerCPUTest, depthToSpaceBS3_4DParams, DepthToSpaceLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CPUDepthToSpaceBS3_4D, DepthToSpaceLayerCPUTest, depthToSpaceBS3_4DParams, DepthToSpaceLayerCPUTest::getTestCaseName); const std::vector> inputShapesBS2_5D = { {1, 128, 1, 1, 1}, {1, 128, 2, 1, 2}, {1, 256, 2, 1, 3}, {2, 256, 3, 1, 1}, {1, 384, 1, 2, 2}, {2, 512, 1, 2, 1} @@ -171,7 +171,7 @@ const auto depthToSpaceBS2_5DParams = testing::Combine( ::testing::ValuesIn(filterCPUInfoForDevice(CPUParamsBS2_5D)) ); -INSTANTIATE_TEST_CASE_P(smoke_CPUDepthToSpaceBS2_5D, DepthToSpaceLayerCPUTest, depthToSpaceBS2_5DParams, DepthToSpaceLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CPUDepthToSpaceBS2_5D, DepthToSpaceLayerCPUTest, depthToSpaceBS2_5DParams, DepthToSpaceLayerCPUTest::getTestCaseName); const std::vector CPUParamsBS3_5D = { cpuParams_ndhwc_avx2, @@ -189,7 +189,7 @@ const auto depthToSpaceBS3_5DParams = testing::Combine( ::testing::ValuesIn(filterCPUInfoForDevice(CPUParamsBS3_5D)) ); -INSTANTIATE_TEST_CASE_P(smoke_CPUDepthToSpaceBS3_5D, DepthToSpaceLayerCPUTest, depthToSpaceBS3_5DParams, DepthToSpaceLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CPUDepthToSpaceBS3_5D, DepthToSpaceLayerCPUTest, depthToSpaceBS3_5DParams, DepthToSpaceLayerCPUTest::getTestCaseName); } // namespace } // namespace CPULayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/eltwise.cpp index 0deb0efc300..3932b9349bb 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/eltwise.cpp @@ -167,7 +167,7 @@ const auto params_4D = ::testing::Combine( ::testing::Values(additional_config)), ::testing::ValuesIn(filterCPUSpecificParams(cpuParams_4D))); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_4D_MemOrder, EltwiseLayerCPUTest, params_4D, EltwiseLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_4D_MemOrder, EltwiseLayerCPUTest, params_4D, EltwiseLayerCPUTest::getTestCaseName); const auto params_4D_emptyCPUSpec = ::testing::Combine( ::testing::Combine( @@ -183,7 +183,7 @@ const auto params_4D_emptyCPUSpec = ::testing::Combine( ::testing::Values(additional_config)), ::testing::Values(emptyCPUSpec)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_4D_emptyCPUSpec, EltwiseLayerCPUTest, params_4D_emptyCPUSpec, EltwiseLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_4D_emptyCPUSpec, EltwiseLayerCPUTest, params_4D_emptyCPUSpec, EltwiseLayerCPUTest::getTestCaseName); std::vector>> inShapes_5D = { {{2, 4, 3, 4, 1}}, @@ -212,7 +212,7 @@ const auto params_5D = ::testing::Combine( ::testing::Values(additional_config)), ::testing::ValuesIn(filterCPUSpecificParams(cpuParams_5D))); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_5D_MemOrder, EltwiseLayerCPUTest, params_5D, EltwiseLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_5D_MemOrder, EltwiseLayerCPUTest, params_5D, EltwiseLayerCPUTest::getTestCaseName); const auto params_5D_emptyCPUSpec = ::testing::Combine( ::testing::Combine( @@ -228,7 +228,7 @@ const auto params_5D_emptyCPUSpec = ::testing::Combine( ::testing::Values(additional_config)), ::testing::Values(emptyCPUSpec)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_5D, EltwiseLayerCPUTest, params_5D_emptyCPUSpec, EltwiseLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_5D, EltwiseLayerCPUTest, params_5D_emptyCPUSpec, EltwiseLayerCPUTest::getTestCaseName); std::vector>> inShapes_4D_Blocked_Planar = { {{2, 17, 31, 3}, {2, 1, 31, 3}}, @@ -253,7 +253,7 @@ const auto params_4D_Blocked_Planar = ::testing::Combine( ::testing::Values(additional_config)), ::testing::ValuesIn(filterCPUSpecificParams(cpuParams_4D_Blocked_Planar))); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_4D_Blocked_Planar, EltwiseLayerCPUTest, params_4D_Blocked_Planar, EltwiseLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_4D_Blocked_Planar, EltwiseLayerCPUTest, params_4D_Blocked_Planar, EltwiseLayerCPUTest::getTestCaseName); std::vector>> inShapes_4D_Planar_Blocked = { @@ -279,7 +279,7 @@ const auto params_4D_Planar_Blocked = ::testing::Combine( ::testing::Values(additional_config)), ::testing::ValuesIn(filterCPUSpecificParams(cpuParams_4D_Planar_Blocked))); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_4D_Planar_Blocked, EltwiseLayerCPUTest, params_4D_Planar_Blocked, EltwiseLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_4D_Planar_Blocked, EltwiseLayerCPUTest, params_4D_Planar_Blocked, EltwiseLayerCPUTest::getTestCaseName); std::vector>> inShapes_5D_Blocked_Planar = { @@ -305,7 +305,7 @@ const auto params_5D_Blocked_Planar = ::testing::Combine( ::testing::Values(additional_config)), ::testing::ValuesIn(filterCPUSpecificParams(cpuParams_5D_Blocked_Planar))); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_5D_Blocked_Planar, EltwiseLayerCPUTest, params_5D_Blocked_Planar, EltwiseLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_5D_Blocked_Planar, EltwiseLayerCPUTest, params_5D_Blocked_Planar, EltwiseLayerCPUTest::getTestCaseName); std::vector>> inShapes_5D_Planar_Blocked = { @@ -331,7 +331,7 @@ const auto params_5D_Planar_Blocked = ::testing::Combine( ::testing::Values(additional_config)), ::testing::ValuesIn(filterCPUSpecificParams(cpuParams_5D_Planar_Blocked))); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_5D_Planar_Blocked, EltwiseLayerCPUTest, params_5D_Planar_Blocked, EltwiseLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_5D_Planar_Blocked, EltwiseLayerCPUTest, params_5D_Planar_Blocked, EltwiseLayerCPUTest::getTestCaseName); std::vector>> inShapes_4D_1D = { @@ -359,7 +359,7 @@ const auto params_4D_1D = ::testing::Combine( ::testing::Values(additional_config)), ::testing::ValuesIn(filterCPUSpecificParams(cpuParams_4D_1D))); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_4D_1D, EltwiseLayerCPUTest, params_4D_1D, EltwiseLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_4D_1D, EltwiseLayerCPUTest, params_4D_1D, EltwiseLayerCPUTest::getTestCaseName); std::vector>> inShapes_5D_1D = { {{2, 17, 5, 4, 10}, {10}}, @@ -386,7 +386,7 @@ const auto params_5D_1D = ::testing::Combine( ::testing::Values(additional_config)), ::testing::ValuesIn(filterCPUSpecificParams(cpuParams_5D_1D))); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_5D_1D, EltwiseLayerCPUTest, params_5D_1D, EltwiseLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_5D_1D, EltwiseLayerCPUTest, params_5D_1D, EltwiseLayerCPUTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/extract_image_patches.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/extract_image_patches.cpp index 028cd9118d8..20edee2aad7 100755 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/extract_image_patches.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/extract_image_patches.cpp @@ -84,7 +84,7 @@ const auto Layer_params = ::testing::Combine( ::testing::Values(InferenceEngine::Layout::ANY), ::testing::Values(CommonTestUtils::DEVICE_CPU)); -INSTANTIATE_TEST_CASE_P(smoke_ExtractImagePatches_CPU, ExtractImagePatchesLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_ExtractImagePatches_CPU, ExtractImagePatchesLayerCPUTest, ::testing::Combine(Layer_params, ::testing::Values(CPUParams)), ExtractImagePatchesLayerCPUTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/fake_quantize.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/fake_quantize.cpp index a5832b40835..09bc5f27a62 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/fake_quantize.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/fake_quantize.cpp @@ -174,7 +174,7 @@ const auto testParams4D_jit = ::testing::Combine(specificParams4D_jit, ::testing::ValuesIn(input_ranges), ::testing::Values(false), ::testing::ValuesIn(filterCPUSpecificParams(memForm4D_jit))); -INSTANTIATE_TEST_CASE_P(smoke_FakeQuantizeLayerCPUTest_4D_jit, FakeQuantizeLayerCPUTest, testParams4D_jit, FakeQuantizeLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_FakeQuantizeLayerCPUTest_4D_jit, FakeQuantizeLayerCPUTest, testParams4D_jit, FakeQuantizeLayerCPUTest::getTestCaseName); std::vector memForm4D_ref = { @@ -197,7 +197,7 @@ const auto testParams4D_ref = ::testing::Combine(specificParams4D_ref, ::testing::ValuesIn(input_ranges), ::testing::Values(false), ::testing::ValuesIn(memForm4D_ref)); -INSTANTIATE_TEST_CASE_P(smoke_FakeQuantizeLayerCPUTest_4D_ref, FakeQuantizeLayerCPUTest, testParams4D_ref, FakeQuantizeLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_FakeQuantizeLayerCPUTest_4D_ref, FakeQuantizeLayerCPUTest, testParams4D_ref, FakeQuantizeLayerCPUTest::getTestCaseName); std::vector memForm5D_jit = { @@ -224,7 +224,7 @@ const auto testParams5D_jit = ::testing::Combine(specificParams5D_jit, ::testing::Values(false), ::testing::ValuesIn(filterCPUSpecificParams(memForm5D_jit))); -INSTANTIATE_TEST_CASE_P(smoke_FakeQuantizeLayerCPUTest_5D_jit, FakeQuantizeLayerCPUTest, testParams5D_jit, FakeQuantizeLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_FakeQuantizeLayerCPUTest_5D_jit, FakeQuantizeLayerCPUTest, testParams5D_jit, FakeQuantizeLayerCPUTest::getTestCaseName); std::vector memForm5D_ref = { @@ -248,7 +248,7 @@ const auto testParams5D_ref = ::testing::Combine(specificParams5D_ref, ::testing::Values(false), ::testing::ValuesIn(memForm5D_ref)); -INSTANTIATE_TEST_CASE_P(smoke_FakeQuantizeLayerCPUTest_5D_ref, FakeQuantizeLayerCPUTest, testParams5D_ref, FakeQuantizeLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_FakeQuantizeLayerCPUTest_5D_ref, FakeQuantizeLayerCPUTest, testParams5D_ref, FakeQuantizeLayerCPUTest::getTestCaseName); } // namespace fqImpl @@ -281,7 +281,7 @@ const auto testParams = ::testing::Combine(specificParams, ::testing::Values(true), ::testing::Values(CPUSpecificParams{})); -INSTANTIATE_TEST_CASE_P(smoke_FakeQuantizeLayerCPUTest_Decompos, FakeQuantizeLayerCPUTest, testParams, FakeQuantizeLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_FakeQuantizeLayerCPUTest_Decompos, FakeQuantizeLayerCPUTest, testParams, FakeQuantizeLayerCPUTest::getTestCaseName); } // namespace fqDecompos diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/gather_elements.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/gather_elements.cpp index 7ea6cb505ba..32b6b04ad69 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/gather_elements.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/gather_elements.cpp @@ -76,7 +76,7 @@ std::vector cpuParams_4D = { CPUSpecificParams({nchw}, {nchw}, {}, {}) }; -INSTANTIATE_TEST_CASE_P(smoke_set1, GatherElementsCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_set1, GatherElementsCPUTest, ::testing::Combine( ::testing::Combine( ::testing::Values(std::vector({2, 3, 5, 7})), // Data shape diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution.cpp index 5e18a0f3ba0..1f75554b1b4 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution.cpp @@ -218,7 +218,7 @@ const std::vector CPUParams_Gemm_2D = { conv_gemm_2D_nspc }; -INSTANTIATE_TEST_CASE_P(smoke_GroupConv_2D_Gemm_FP32, GroupConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConv_2D_Gemm_FP32, GroupConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_Gemm_2D, @@ -233,7 +233,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConv_2D_Gemm_FP32, GroupConvolutionLayerCPUTe ::testing::ValuesIn(fusingParamsSet)), GroupConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupConv_2D_Gemm_BF16, GroupConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConv_2D_Gemm_BF16, GroupConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_Gemm_2D, @@ -265,7 +265,7 @@ const std::vector CPUParams_Gemm_3D = { conv_gemm_3D_nspc }; -INSTANTIATE_TEST_CASE_P(smoke_GroupConv_3D_Gemm_FP32, GroupConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConv_3D_Gemm_FP32, GroupConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_Gemm_3D, @@ -280,7 +280,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConv_3D_Gemm_FP32, GroupConvolutionLayerCPUTe ::testing::ValuesIn(fusingParamsSet)), GroupConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupConv_3D_Gemm_BF16, GroupConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConv_3D_Gemm_BF16, GroupConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_Gemm_3D, @@ -316,7 +316,7 @@ const std::vector CPUParams_2D = { conv_avx512_2D_nspc }; -INSTANTIATE_TEST_CASE_P(smoke_GroupConv_2D_FP32, GroupConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConv_2D_FP32, GroupConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_2D, @@ -331,7 +331,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConv_2D_FP32, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(fusingParamsSet)), GroupConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupConv_2D_BF16, GroupConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConv_2D_BF16, GroupConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_2D, @@ -366,7 +366,7 @@ const std::vector CPUParams_3D = { conv_avx512_3D_nspc }; -INSTANTIATE_TEST_CASE_P(smoke_GroupConv_3D_FP32, GroupConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConv_3D_FP32, GroupConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_3D, @@ -381,7 +381,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConv_3D_FP32, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(fusingParamsSet)), GroupConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupConv_3D_BF16, GroupConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConv_3D_BF16, GroupConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_3D, @@ -417,7 +417,7 @@ const std::vector CPUParams_DW_2D = { conv_avx512_dw_2D_nspc }; -INSTANTIATE_TEST_CASE_P(smoke_GroupConv_2D_DW_FP32, GroupConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConv_2D_DW_FP32, GroupConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_DW_2D, @@ -433,7 +433,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConv_2D_DW_FP32, GroupConvolutionLayerCPUTest GroupConvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupConv_2D_DW_BF16, GroupConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConv_2D_DW_BF16, GroupConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_DW_2D, @@ -469,7 +469,7 @@ const std::vector CPUParams_DW_3D = { conv_avx512_dw_3D_nspc }; -INSTANTIATE_TEST_CASE_P(smoke_GroupConv_3D_DW_FP32, GroupConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConv_3D_DW_FP32, GroupConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_DW_3D, @@ -586,7 +586,7 @@ const std::vector gemmGroupConvTestCases = gener 2, 1, {10, 10, 10}, 3, 3, CPUParams_Gemm_3D, vecPrcConnectParams) ); -INSTANTIATE_TEST_CASE_P(smoke_GEMM_GroupConv, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(filterParamsSetForDevice(gemmGroupConvTestCases)), +INSTANTIATE_TEST_SUITE_P(smoke_GEMM_GroupConv, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(filterParamsSetForDevice(gemmGroupConvTestCases)), GroupConvolutionLayerCPUTest::getTestCaseName); /* ============= JIT SSE42 GroupConvolution ============= */ @@ -637,7 +637,7 @@ const std::vector JIT_SSE42_GroupConvTestCases = // 2, 1, {10, 10, 10}, 8, 8, cpuParams_sse42_3D), ); -INSTANTIATE_TEST_CASE_P(smoke_JIT_SSE42_GroupConv, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(filterParamsSetForDevice(JIT_SSE42_GroupConvTestCases)), +INSTANTIATE_TEST_SUITE_P(smoke_JIT_SSE42_GroupConv, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(filterParamsSetForDevice(JIT_SSE42_GroupConvTestCases)), GroupConvolutionLayerCPUTest::getTestCaseName); /* ============= JIT AVX2 GroupConvolution ============= */ @@ -687,7 +687,7 @@ const std::vector JIT_AVX2_GroupConvTestCases = 2, 1, {10, 10, 10}, 8, 8, avx2_GroupConv_3D, vecPrcConnectParamsFP32) ); -INSTANTIATE_TEST_CASE_P(smoke_JIT_AVX2_GroupConv, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(filterParamsSetForDevice(JIT_AVX2_GroupConvTestCases)), +INSTANTIATE_TEST_SUITE_P(smoke_JIT_AVX2_GroupConv, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(filterParamsSetForDevice(JIT_AVX2_GroupConvTestCases)), GroupConvolutionLayerCPUTest::getTestCaseName); /* ============= JIT AVX512 GroupConvolution ============= */ @@ -718,7 +718,7 @@ const std::vector JIT_AVX512_GroupConvTestCases 2, 1, {10, 10, 10}, 16, 16, avx512_GroupConv_3D, vecPrcConnectParams) ); -INSTANTIATE_TEST_CASE_P(smoke_JIT_AVX512_GroupConv, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(filterParamsSetForDevice(JIT_AVX512_GroupConvTestCases)), +INSTANTIATE_TEST_SUITE_P(smoke_JIT_AVX512_GroupConv, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(filterParamsSetForDevice(JIT_AVX512_GroupConvTestCases)), GroupConvolutionLayerCPUTest::getTestCaseName); /* ============= JIT SSE42 DW GroupConvolution ============= */ @@ -754,7 +754,7 @@ const std::vector JIT_SSE42_DW_GroupConvTestCase 8, 1, {10, 10, 10}, 1, 1, sse42_DW_3D, vecPrcConnectParamsFP32) ); -INSTANTIATE_TEST_CASE_P(smoke_JIT_SSE42_DW_GroupConv, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(filterParamsSetForDevice +INSTANTIATE_TEST_SUITE_P(smoke_JIT_SSE42_DW_GroupConv, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(filterParamsSetForDevice (JIT_SSE42_DW_GroupConvTestCases)), GroupConvolutionLayerCPUTest::getTestCaseName); /* ============= JIT AVX2 DW GroupConvolution ============= */ @@ -790,7 +790,7 @@ const std::vector JIT_AVX2_DW_GroupConvTestCases 8, 1, {10, 10, 10}, 1, 1, avx2_DW_3D, vecPrcConnectParamsFP32) ); -INSTANTIATE_TEST_CASE_P(smoke_JIT_AVX2_DW_GroupConv, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(filterParamsSetForDevice +INSTANTIATE_TEST_SUITE_P(smoke_JIT_AVX2_DW_GroupConv, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(filterParamsSetForDevice (JIT_AVX2_DW_GroupConvTestCases)), GroupConvolutionLayerCPUTest::getTestCaseName); /* ============= JIT AVX512 DW GroupConvolution ============= */ @@ -825,7 +825,7 @@ const std::vector JIT_AVX512_DW_GroupConvTestCas 16, 1, {10, 10, 10}, 1, 1, avx512_DW_3D, vecPrcConnectParams) ); -INSTANTIATE_TEST_CASE_P(smoke_JIT_AVX512_DW_GroupConv, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(filterParamsSetForDevice +INSTANTIATE_TEST_SUITE_P(smoke_JIT_AVX512_DW_GroupConv, GroupConvolutionLayerCPUTest, ::testing::ValuesIn(filterParamsSetForDevice (JIT_AVX512_DW_GroupConvTestCases)), GroupConvolutionLayerCPUTest::getTestCaseName); /* ============= JIT SSE42 1x1 Convolution (not supported with groups) ============= */ @@ -860,7 +860,7 @@ const std::vector CPUParams_1D = { conv_avx512_1D }; -INSTANTIATE_TEST_CASE_P(smoke_GroupConv_1D, GroupConvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConv_1D, GroupConvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( convParams_1D, diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution_backprop_data.cpp index 8645f0e21be..8ceff946d14 100755 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/group_convolution_backprop_data.cpp @@ -169,7 +169,7 @@ const auto groupConvParams_ExplicitPadding_Planar_2D = ::testing::Combine( ::testing::Values(ngraph::op::PadType::EXPLICIT) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_2D_Planar_FP32, GroupDeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupDeconv_2D_Planar_FP32, GroupDeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_Planar_2D, @@ -185,7 +185,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_2D_Planar_FP32, GroupDeconvolutionLaye ::testing::Values(cpuEmptyPluginConfig)), GroupDeconvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_2D_Planar_BF16, GroupDeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupDeconv_2D_Planar_BF16, GroupDeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_Planar_2D, @@ -213,7 +213,7 @@ const auto groupConvParams_ExplicitPadding_Planar_3D = ::testing::Combine( ::testing::Values(ngraph::op::PadType::EXPLICIT) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_3D_Planar_FP32, GroupDeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupDeconv_3D_Planar_FP32, GroupDeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_Planar_3D, @@ -229,7 +229,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_3D_Planar_FP32, GroupDeconvolutionLaye ::testing::Values(cpuEmptyPluginConfig)), GroupDeconvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_3D_Planar_BF16, GroupDeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupDeconv_3D_Planar_BF16, GroupDeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_Planar_3D, @@ -257,7 +257,7 @@ const auto groupConvParams_ExplicitPadding_Blocked_2D = ::testing::Combine( ::testing::Values(ngraph::op::PadType::EXPLICIT) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_2D_Blocked_FP32, GroupDeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupDeconv_2D_Blocked_FP32, GroupDeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_Blocked_2D, @@ -273,7 +273,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_2D_Blocked_FP32, GroupDeconvolutionLay ::testing::Values(cpuEmptyPluginConfig)), GroupDeconvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_2D_Blocked_BF16, GroupDeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupDeconv_2D_Blocked_BF16, GroupDeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_Blocked_2D, @@ -301,7 +301,7 @@ const auto groupConvParams_ExplicitPadding_Blocked_3D = ::testing::Combine( ::testing::Values(ngraph::op::PadType::EXPLICIT) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_3D_Blocked_FP32, GroupDeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupDeconv_3D_Blocked_FP32, GroupDeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_Blocked_3D, @@ -317,7 +317,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_3D_Blocked_FP32, GroupDeconvolutionLay ::testing::Values(cpuEmptyPluginConfig)), GroupDeconvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_3D_Blocked_BF16, GroupDeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupDeconv_3D_Blocked_BF16, GroupDeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_Blocked_3D, @@ -345,7 +345,7 @@ const auto groupConvParams_ExplicitPadding_DW_2D = ::testing::Combine( ::testing::Values(ngraph::op::PadType::EXPLICIT) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_2D_DW_FP32, GroupDeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupDeconv_2D_DW_FP32, GroupDeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_DW_2D, @@ -361,7 +361,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_2D_DW_FP32, GroupDeconvolutionLayerCPU ::testing::Values(cpuEmptyPluginConfig)), GroupDeconvolutionLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupDeconv_2D_DW_BF16, GroupDeconvolutionLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupDeconv_2D_DW_BF16, GroupDeconvolutionLayerCPUTest, ::testing::Combine( ::testing::Combine( groupConvParams_ExplicitPadding_DW_2D, diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/gru_cell.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/gru_cell.cpp index 6f58eeda2f4..1e5a3602765 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/gru_cell.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/gru_cell.cpp @@ -117,7 +117,7 @@ std::vector clip = {0.f}; std::vector linear_before_reset = {true, false}; std::vector netPrecisions = {InferenceEngine::Precision::FP32}; -INSTANTIATE_TEST_CASE_P(smoke_GRUCellCPU, +INSTANTIATE_TEST_SUITE_P(smoke_GRUCellCPU, GRUCellCPUTest, ::testing::Combine(::testing::Combine(::testing::ValuesIn(should_decompose), ::testing::ValuesIn(batch), diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/gru_sequence.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/gru_sequence.cpp index 55ece3f0a66..799f7516887 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/gru_sequence.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/gru_sequence.cpp @@ -186,7 +186,7 @@ std::vector direction = {ngraph::op::Rec std::vector netPrecisions = {InferenceEngine::Precision::FP32}; -INSTANTIATE_TEST_CASE_P(smoke_GRUSequenceCPU, +INSTANTIATE_TEST_SUITE_P(smoke_GRUSequenceCPU, GRUSequenceCPUTest, ::testing::Combine(::testing::Combine(::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_zero_clip), @@ -202,7 +202,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GRUSequenceCPU, ::testing::ValuesIn(additionalConfig)), GRUSequenceCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GRUSequenceCPUBatchSizeOne, +INSTANTIATE_TEST_SUITE_P(smoke_GRUSequenceCPUBatchSizeOne, GRUSequenceCPUTest, ::testing::Combine(::testing::Combine(::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_zero_clip), diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/interpolate.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/interpolate.cpp index 55863095e75..05783b6b122 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/interpolate.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/interpolate.cpp @@ -260,7 +260,7 @@ std::vector> filterAdditionalConfig() { } } -INSTANTIATE_TEST_CASE_P(smoke_InterpolateNN_Layout_Test, InterpolateLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_InterpolateNN_Layout_Test, InterpolateLayerCPUTest, ::testing::Combine( ::testing::Combine( interpolateCasesNN, @@ -278,7 +278,7 @@ INSTANTIATE_TEST_CASE_P(smoke_InterpolateNN_Layout_Test, InterpolateLayerCPUTest ::testing::ValuesIn(filterAdditionalConfig())), InterpolateLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_InterpolateLinearOnnx_Layout_Test, InterpolateLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_InterpolateLinearOnnx_Layout_Test, InterpolateLayerCPUTest, ::testing::Combine( ::testing::Combine( interpolateCasesLinearOnnx, @@ -296,7 +296,7 @@ INSTANTIATE_TEST_CASE_P(smoke_InterpolateLinearOnnx_Layout_Test, InterpolateLaye ::testing::ValuesIn(filterAdditionalConfig())), InterpolateLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_InterpolateLinear_Layout_Test, InterpolateLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_InterpolateLinear_Layout_Test, InterpolateLayerCPUTest, ::testing::Combine( ::testing::Combine( interpolateCasesLinear, @@ -314,7 +314,7 @@ INSTANTIATE_TEST_CASE_P(smoke_InterpolateLinear_Layout_Test, InterpolateLayerCPU ::testing::ValuesIn(filterAdditionalConfig())), InterpolateLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_InterpolateCubic_Layout_Test, InterpolateLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_InterpolateCubic_Layout_Test, InterpolateLayerCPUTest, ::testing::Combine( ::testing::Combine( interpolateCasesCubic, @@ -387,7 +387,7 @@ const auto interpolateCasesNN5D = ::testing::Combine( ::testing::ValuesIn(defaultAxes5D), ::testing::ValuesIn(defaultScales5D)); -INSTANTIATE_TEST_CASE_P(smoke_InterpolateLinearOnnx5D_Layout_Test, InterpolateLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_InterpolateLinearOnnx5D_Layout_Test, InterpolateLayerCPUTest, ::testing::Combine( ::testing::Combine( interpolateCasesLinearOnnx5D, @@ -405,7 +405,7 @@ INSTANTIATE_TEST_CASE_P(smoke_InterpolateLinearOnnx5D_Layout_Test, InterpolateLa ::testing::ValuesIn(filterAdditionalConfig())), InterpolateLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_InterpolateNN5D_Layout_Test, InterpolateLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_InterpolateNN5D_Layout_Test, InterpolateLayerCPUTest, ::testing::Combine( ::testing::Combine( interpolateCasesNN5D, diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/logical.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/logical.cpp index 6e423ca669f..d9bcddab858 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/logical.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/logical.cpp @@ -150,9 +150,9 @@ const auto LogicalTestParamsNot = ::testing::Combine( ::testing::Values(emptyCPUSpec)); -INSTANTIATE_TEST_CASE_P(smoke_Logical_Eltwise_CPU_BF16, LogicalLayerCPUTest, LogicalTestParams, LogicalLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Logical_Eltwise_CPU_BF16, LogicalLayerCPUTest, LogicalTestParams, LogicalLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Logical_Not_Eltwise_CPU_BF16, LogicalLayerCPUTest, LogicalTestParamsNot, LogicalLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Logical_Not_Eltwise_CPU_BF16, LogicalLayerCPUTest, LogicalTestParamsNot, LogicalLayerCPUTest::getTestCaseName); } // namespace } // namespace CPULayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/lstm_cell.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/lstm_cell.cpp index 4ee12f62ea9..32ab7da1004 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/lstm_cell.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/lstm_cell.cpp @@ -115,7 +115,7 @@ std::vector> activations = {{"sigmoid", "tanh", "tanh"} std::vector clip{0.f}; std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::BF16}; -INSTANTIATE_TEST_CASE_P(smoke_LSTMCellCPU, +INSTANTIATE_TEST_SUITE_P(smoke_LSTMCellCPU, LSTMCellLayerCPUTest, ::testing::Combine(::testing::Combine(::testing::ValuesIn(should_decompose), ::testing::ValuesIn(batch), diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/lstm_sequence.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/lstm_sequence.cpp index 234a579085c..959d5e0c89d 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/lstm_sequence.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/lstm_sequence.cpp @@ -195,7 +195,7 @@ std::vector clip{0.f}; std::vector direction = {ngraph::op::RecurrentSequenceDirection::FORWARD}; std::vector netPrecisions = {InferenceEngine::Precision::FP32}; -INSTANTIATE_TEST_CASE_P(smoke_LSTMSequenceCPU, +INSTANTIATE_TEST_SUITE_P(smoke_LSTMSequenceCPU, LSTMSequenceCPUTest, ::testing::Combine(::testing::Combine(::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_zero_clip), @@ -211,7 +211,7 @@ INSTANTIATE_TEST_CASE_P(smoke_LSTMSequenceCPU, ::testing::ValuesIn(additionalConfig)), LSTMSequenceCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_LSTMSequenceCPUbatchSizeOne, +INSTANTIATE_TEST_SUITE_P(smoke_LSTMSequenceCPUbatchSizeOne, LSTMSequenceCPUTest, ::testing::Combine(::testing::Combine(::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_zero_clip), diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/mat_mul.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/mat_mul.cpp index 020d9ffc3bf..c2285e5f8cf 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/mat_mul.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/mat_mul.cpp @@ -149,7 +149,7 @@ const auto testParams2D = ::testing::Combine(fullyConnectedParams2D, ::testing::Values(MatMulNodeType::FullyConnected), ::testing::ValuesIn(fusingParamsSet2D)); -INSTANTIATE_TEST_CASE_P(smoke_Check_2D, MatMulLayerCPUTest, testParams2D, MatMulLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Check_2D, MatMulLayerCPUTest, testParams2D, MatMulLayerCPUTest::getTestCaseName); const std::vector> IS3D = { {{1, 32, 120}, {120, 5}}, @@ -171,7 +171,7 @@ const auto testParams3D = ::testing::Combine(fullyConnectedParams3D, ::testing::Values(MatMulNodeType::FullyConnected), ::testing::ValuesIn(fusingParamsSet3D)); -INSTANTIATE_TEST_CASE_P(smoke_Check_3D, MatMulLayerCPUTest, testParams3D, MatMulLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Check_3D, MatMulLayerCPUTest, testParams3D, MatMulLayerCPUTest::getTestCaseName); }; // namespace fullyConnected @@ -196,7 +196,7 @@ const auto testParams = ::testing::Combine(gemmParams, ::testing::Values(MatMulNodeType::MatMul), ::testing::Values(emptyFusingSpec)); -INSTANTIATE_TEST_CASE_P(smoke_Check, MatMulLayerCPUTest, testParams, MatMulLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Check, MatMulLayerCPUTest, testParams, MatMulLayerCPUTest::getTestCaseName); }; // namespace gemm diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/mvn.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/mvn.cpp index f89e302c539..6b877960e7f 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/mvn.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/mvn.cpp @@ -171,7 +171,7 @@ const auto Mvn3D = ::testing::Combine( ::testing::ValuesIn(inpPrc), ::testing::ValuesIn(outPrc)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_Mvn3D, MvnLayerCPUTest, Mvn3D, MvnLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Mvn3D, MvnLayerCPUTest, Mvn3D, MvnLayerCPUTest::getTestCaseName); const auto Mvn4D = ::testing::Combine( ::testing::Combine( @@ -186,7 +186,7 @@ const auto Mvn4D = ::testing::Combine( ::testing::ValuesIn(inpPrc), ::testing::ValuesIn(outPrc)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_Mvn4D, MvnLayerCPUTest, Mvn4D, MvnLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Mvn4D, MvnLayerCPUTest, Mvn4D, MvnLayerCPUTest::getTestCaseName); const auto Mvn5D = ::testing::Combine( ::testing::Combine( @@ -201,7 +201,7 @@ const auto Mvn5D = ::testing::Combine( ::testing::ValuesIn(inpPrc), ::testing::ValuesIn(outPrc)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_Mvn5D, MvnLayerCPUTest, Mvn5D, MvnLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Mvn5D, MvnLayerCPUTest, Mvn5D, MvnLayerCPUTest::getTestCaseName); // 1D 2D case std::vector fusingUnaryEltwiseParamsSet { @@ -225,7 +225,7 @@ const auto Mvn1D = ::testing::Combine( ::testing::ValuesIn(inpPrc), ::testing::ValuesIn(outPrc)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_Mvn1D, MvnLayerCPUTest, Mvn1D, MvnLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Mvn1D, MvnLayerCPUTest, Mvn1D, MvnLayerCPUTest::getTestCaseName); // 2D no transformed const auto Mvn2D = ::testing::Combine( @@ -241,7 +241,7 @@ const auto Mvn2D = ::testing::Combine( ::testing::ValuesIn(inpPrc), ::testing::ValuesIn(outPrc)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_Mvn2D, MvnLayerCPUTest, Mvn2D, MvnLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Mvn2D, MvnLayerCPUTest, Mvn2D, MvnLayerCPUTest::getTestCaseName); // 2d transformed const auto Mvn2DTrans = ::testing::Combine( @@ -257,7 +257,7 @@ const auto Mvn2DTrans = ::testing::Combine( ::testing::ValuesIn(inpPrc), ::testing::ValuesIn(outPrc)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_MVN2DTrans, MvnLayerCPUTest, Mvn2DTrans, MvnLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_MVN2DTrans, MvnLayerCPUTest, Mvn2DTrans, MvnLayerCPUTest::getTestCaseName); } // namespace } // namespace CPULayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/normalize.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/normalize.cpp index 74b265d1935..17e9b24f76b 100755 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/normalize.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/normalize.cpp @@ -119,7 +119,7 @@ const auto testParams_2D = ::testing::Combine(normalizeParams_2D, ::testing::Values(CPUSpecificParams{}), ::testing::ValuesIn(fusingParamsSet)); -INSTANTIATE_TEST_CASE_P(smoke_2D, NormalizeL2LayerCPUTest, testParams_2D, NormalizeL2LayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_2D, NormalizeL2LayerCPUTest, testParams_2D, NormalizeL2LayerCPUTest::getTestCaseName); /* ============= 3D ============= */ const std::vector> inputShape_3D = { @@ -144,7 +144,7 @@ const auto testParams_3D = ::testing::Combine(normalizeParams_3D, ::testing::Values(CPUSpecificParams{}), ::testing::ValuesIn(fusingParamsSet)); -INSTANTIATE_TEST_CASE_P(smoke_3D, NormalizeL2LayerCPUTest, testParams_3D, NormalizeL2LayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_3D, NormalizeL2LayerCPUTest, testParams_3D, NormalizeL2LayerCPUTest::getTestCaseName); /* ============= 4D ============= */ const std::vector> inputShape_4D = { @@ -183,7 +183,7 @@ const auto testParams_4D = ::testing::Combine(normalizeParams_4D, ::testing::ValuesIn(getCPUSpecificParams()), ::testing::ValuesIn(fusingParamsSet)); -INSTANTIATE_TEST_CASE_P(smoke_4D, NormalizeL2LayerCPUTest, testParams_4D, NormalizeL2LayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_4D, NormalizeL2LayerCPUTest, testParams_4D, NormalizeL2LayerCPUTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/one_hot.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/one_hot.cpp index 4e966d6c0f9..e3f083e7460 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/one_hot.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/one_hot.cpp @@ -100,7 +100,7 @@ const auto testCase_1d = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(emptyCPUSpec) ); -INSTANTIATE_TEST_CASE_P(smoke_OneHotCPU_1D, OneHotLayerCPUTest, testCase_1d, OneHotLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_OneHotCPU_1D, OneHotLayerCPUTest, testCase_1d, OneHotLayerCPUTest::getTestCaseName); // 1d -> 2d, axis default @@ -116,7 +116,7 @@ const auto testCase_2d = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(emptyCPUSpec) ); -INSTANTIATE_TEST_CASE_P(smoke_OneHotCPU_2D, OneHotLayerCPUTest, testCase_2d, OneHotLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_OneHotCPU_2D, OneHotLayerCPUTest, testCase_2d, OneHotLayerCPUTest::getTestCaseName); // 2d -> 3d, on_value, off_value const auto testCase_3d = ::testing::Combine( @@ -131,7 +131,7 @@ const auto testCase_3d = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(emptyCPUSpec) ); -INSTANTIATE_TEST_CASE_P(smoke_OneHotCPU_3D, OneHotLayerCPUTest, testCase_3d, OneHotLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_OneHotCPU_3D, OneHotLayerCPUTest, testCase_3d, OneHotLayerCPUTest::getTestCaseName); // 3d -> 4d const auto testCase_4d = ::testing::Combine( @@ -146,7 +146,7 @@ const auto testCase_4d = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(emptyCPUSpec) ); -INSTANTIATE_TEST_CASE_P(smoke_OneHotCPU_4D, OneHotLayerCPUTest, testCase_4d, OneHotLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_OneHotCPU_4D, OneHotLayerCPUTest, testCase_4d, OneHotLayerCPUTest::getTestCaseName); // 4d -> 5d const auto testCase_5d = ::testing::Combine( @@ -161,7 +161,7 @@ const auto testCase_5d = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU), ::testing::Values(emptyCPUSpec) ); -INSTANTIATE_TEST_CASE_P(smoke_OneHotCPU_5D, OneHotLayerCPUTest, testCase_5d, OneHotLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_OneHotCPU_5D, OneHotLayerCPUTest, testCase_5d, OneHotLayerCPUTest::getTestCaseName); } // namespace } // namespace CPULayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/pad.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/pad.cpp index 82bdc0971a6..b528e9f644f 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/pad.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/pad.cpp @@ -122,7 +122,7 @@ const auto pad4DConstParamsBlocked = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_CPUPad4DConstBlocked, PadLayerCPUTest, ::testing::Combine( @@ -145,7 +145,7 @@ const auto pad4DConstParams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_CPUPad4DConst, PadLayerCPUTest, ::testing::Combine( @@ -167,7 +167,7 @@ const auto pad4DParamsBlocked = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_CPUPad4DBlocked, PadLayerCPUTest, ::testing::Combine( @@ -189,7 +189,7 @@ const auto pad4DParams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_CPUPad4D, PadLayerCPUTest, ::testing::Combine( @@ -225,7 +225,7 @@ const auto pad5DConstParamsBlocked = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_CPUPad5DConstBlocked, PadLayerCPUTest, ::testing::Combine( @@ -247,7 +247,7 @@ const auto pad5DConstParams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_CPUPad5DConst, PadLayerCPUTest, ::testing::Combine( @@ -269,7 +269,7 @@ const auto pad5DParamsBlocked = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_CPUPad5DBlocked, PadLayerCPUTest, ::testing::Combine( @@ -291,7 +291,7 @@ const auto pad5DParams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_CPUPad5D, PadLayerCPUTest, ::testing::Combine( diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/pooling.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/pooling.cpp index 6fb1f7d1169..0021a43dbb9 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/pooling.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/pooling.cpp @@ -144,7 +144,7 @@ const std::vector paramsAvg4D_RefOnly = { ngraph::op::RoundingType::CEIL, ngraph::op::PadType::EXPLICIT, false }, }; -INSTANTIATE_TEST_CASE_P(smoke_MaxPool_CPU_4D, PoolingLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_MaxPool_CPU_4D, PoolingLayerCPUTest, ::testing::Combine( ::testing::Combine( ::testing::ValuesIn(paramsMax4D), @@ -159,7 +159,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MaxPool_CPU_4D, PoolingLayerCPUTest, ::testing::Values(emptyFusingSpec)), PoolingLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_CPU_4D, PoolingLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_CPU_4D, PoolingLayerCPUTest, ::testing::Combine( ::testing::Combine( ::testing::ValuesIn(paramsAvg4D), @@ -174,7 +174,7 @@ INSTANTIATE_TEST_CASE_P(smoke_AvgPool_CPU_4D, PoolingLayerCPUTest, ::testing::Values(emptyFusingSpec)), PoolingLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_CPU_4D_NotOptimized, PoolingLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_CPU_4D_NotOptimized, PoolingLayerCPUTest, ::testing::Combine( ::testing::Combine( ::testing::ValuesIn(paramsAvg4D_RefOnly), @@ -214,7 +214,7 @@ const std::vector paramsAvg5D_RefOnly = { ngraph::op::RoundingType::CEIL, ngraph::op::PadType::EXPLICIT, false }, }; -INSTANTIATE_TEST_CASE_P(smoke_MaxPool_CPU_5D, PoolingLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_MaxPool_CPU_5D, PoolingLayerCPUTest, ::testing::Combine( ::testing::Combine( ::testing::ValuesIn(paramsMax5D), @@ -229,7 +229,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MaxPool_CPU_5D, PoolingLayerCPUTest, ::testing::Values(emptyFusingSpec)), PoolingLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_CPU_5D, PoolingLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_CPU_5D, PoolingLayerCPUTest, ::testing::Combine( ::testing::Combine( ::testing::ValuesIn(paramsAvg5D), @@ -244,7 +244,7 @@ INSTANTIATE_TEST_CASE_P(smoke_AvgPool_CPU_5D, PoolingLayerCPUTest, ::testing::Values(emptyFusingSpec)), PoolingLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_CPU_5D_NotOptimized, PoolingLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_CPU_5D_NotOptimized, PoolingLayerCPUTest, ::testing::Combine( ::testing::Combine( ::testing::ValuesIn(paramsAvg5D_RefOnly), @@ -279,7 +279,7 @@ std::vector fusingParamsSet { fusingFakeQuantizePerChannel, }; -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_CPU_4D_I8, PoolingLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_CPU_4D_I8, PoolingLayerCPUTest, ::testing::Combine( ::testing::Combine( ::testing::ValuesIn(paramsAvg4D), @@ -294,7 +294,7 @@ INSTANTIATE_TEST_CASE_P(smoke_AvgPool_CPU_4D_I8, PoolingLayerCPUTest, ::testing::ValuesIn(fusingParamsSet)), PoolingLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_CPU_5D_I8, PoolingLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_CPU_5D_I8, PoolingLayerCPUTest, ::testing::Combine( ::testing::Combine( ::testing::ValuesIn(paramsAvg5D), diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/psroi_pooling.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/psroi_pooling.cpp index 5327e72a6a2..01131bf0b24 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/psroi_pooling.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/psroi_pooling.cpp @@ -163,7 +163,7 @@ const auto psroiPoolingBilinearParams = ::testing::Combine( ::testing::Values("bilinear") ); -INSTANTIATE_TEST_CASE_P(smoke_PSROIPoolingAverageLayoutTest, PSROIPoolingLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_PSROIPoolingAverageLayoutTest, PSROIPoolingLayerCPUTest, ::testing::Combine( ::testing::Combine( psroiPoolingAverageParams, @@ -172,7 +172,7 @@ INSTANTIATE_TEST_CASE_P(smoke_PSROIPoolingAverageLayoutTest, PSROIPoolingLayerCP ::testing::ValuesIn(filterCPUSpecificParams(resCPUParams))), PSROIPoolingLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_PSROIPoolingBilinearLayoutTest, PSROIPoolingLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_PSROIPoolingBilinearLayoutTest, PSROIPoolingLayerCPUTest, ::testing::Combine( ::testing::Combine( psroiPoolingBilinearParams, diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/reduce_ops.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/reduce_ops.cpp index dc528b82fad..222651e51ff 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/reduce_ops.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/reduce_ops.cpp @@ -282,56 +282,56 @@ const auto params_MultiAxisLogical5D = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU)), testing::ValuesIn(filterCPUSpecificParams(cpuParams_5D))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceOneAxis_CPU, ReduceCPULayerTest, paramsOneAxis, ReduceCPULayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceLogicalOneAxis_CPU, ReduceCPULayerTest, paramsOneAxisLogical, ReduceCPULayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Reduce_ReductionTypes_CPU, ReduceCPULayerTest, params_MultiAxis, ReduceCPULayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Reduce_ReductionTypes4D_CPU, ReduceCPULayerTest, params_MultiAxis_4D, ReduceCPULayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Reduce_ReductionTypes5D_CPU, ReduceCPULayerTest, params_MultiAxis_5D, ReduceCPULayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceLogical_ReductionTypes_CPU, ReduceCPULayerTest, params_MultiAxisLogical, ReduceCPULayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceLogical4D_ReductionTypes_CPU, ReduceCPULayerTest, params_MultiAxisLogical4D, ReduceCPULayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceLogical5D_ReductionTypes_CPU, ReduceCPULayerTest, params_MultiAxisLogical5D, diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/region_yolo.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/region_yolo.cpp index 4c88cf8d884..e5a00a813f7 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/region_yolo.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/region_yolo.cpp @@ -160,8 +160,8 @@ const auto testCase_yolov2_caffe = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU) ); -INSTANTIATE_TEST_CASE_P(smoke_TestsRegionYolov3CPU, RegionYoloCPULayerTest, testCase_yolov3, RegionYoloCPULayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsRegionYoloMxnetCPU, RegionYoloCPULayerTest, testCase_yolov3_mxnet, RegionYoloCPULayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsRegionYoloCaffeCPU, RegionYoloCPULayerTest, testCase_yolov2_caffe, RegionYoloCPULayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsRegionYolov3CPU, RegionYoloCPULayerTest, testCase_yolov3, RegionYoloCPULayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsRegionYoloMxnetCPU, RegionYoloCPULayerTest, testCase_yolov3_mxnet, RegionYoloCPULayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsRegionYoloCaffeCPU, RegionYoloCPULayerTest, testCase_yolov2_caffe, RegionYoloCPULayerTest::getTestCaseName); } // namespace } // namespace CPULayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/rnn_cell.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/rnn_cell.cpp index 381bdfecf36..59b23396c38 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/rnn_cell.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/rnn_cell.cpp @@ -107,7 +107,7 @@ std::vector> activations = {{"relu"}, {"sigmoid"}, {"ta std::vector clip = {0.f}; std::vector netPrecisions = {InferenceEngine::Precision::FP32}; -INSTANTIATE_TEST_CASE_P(smoke_RNNCellCPU, +INSTANTIATE_TEST_SUITE_P(smoke_RNNCellCPU, RNNCellCPUTest, ::testing::Combine(::testing::Combine(::testing::ValuesIn(should_decompose), ::testing::ValuesIn(batch), diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/rnn_sequence.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/rnn_sequence.cpp index 6c7f873cc95..e1e66a66050 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/rnn_sequence.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/rnn_sequence.cpp @@ -167,7 +167,7 @@ std::vector direction{ngraph::op::Recurr std::vector netPrecisions = {InferenceEngine::Precision::FP32}; -INSTANTIATE_TEST_CASE_P(smoke_RNNSequenceCPU, +INSTANTIATE_TEST_SUITE_P(smoke_RNNSequenceCPU, RNNSequenceCPUTest, ::testing::Combine(::testing::Combine(::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_zero_clip), @@ -183,7 +183,7 @@ INSTANTIATE_TEST_CASE_P(smoke_RNNSequenceCPU, ::testing::ValuesIn(additionalConfig)), RNNSequenceCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_RNNSequenceCPUBatchSizeOne, +INSTANTIATE_TEST_SUITE_P(smoke_RNNSequenceCPUBatchSizeOne, RNNSequenceCPUTest, ::testing::Combine(::testing::Combine(::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_zero_clip), diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/roi_pooling.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/roi_pooling.cpp index 7422befc949..094a9f4b507 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/roi_pooling.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/roi_pooling.cpp @@ -186,14 +186,14 @@ const auto test_ROIPooling_bilinear = ::testing::Combine(::testing::ValuesIn(inS ::testing::ValuesIn(netPRCs), ::testing::Values(CommonTestUtils::DEVICE_CPU)); -INSTANTIATE_TEST_CASE_P(smoke_ROIPoolingCPU_max, +INSTANTIATE_TEST_SUITE_P(smoke_ROIPoolingCPU_max, ROIPoolingCPULayerTest, ::testing::Combine(test_ROIPooling_max, ::testing::ValuesIn(selectCPUInfoForDevice()), ::testing::ValuesIn(additionalConfig)), ROIPoolingCPULayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ROIPoolingCPU_bilinear, +INSTANTIATE_TEST_SUITE_P(smoke_ROIPoolingCPU_bilinear, ROIPoolingCPULayerTest, ::testing::Combine(test_ROIPooling_bilinear, ::testing::ValuesIn(selectCPUInfoForDevice()), diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/roialign.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/roialign.cpp index aac49d69274..78a6fdcd0cb 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/roialign.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/roialign.cpp @@ -163,7 +163,7 @@ const auto roiAlignParams = ::testing::Combine( ::testing::ValuesIn(inputShapeVector) // feature map shape ); -INSTANTIATE_TEST_CASE_P(smoke_ROIAlignLayoutTest, ROIAlignLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_ROIAlignLayoutTest, ROIAlignLayerCPUTest, ::testing::Combine( ::testing::Combine( roiAlignParams, diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/shuffle_channels.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/shuffle_channels.cpp index 0548aad8c5e..bb06d40a551 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/shuffle_channels.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/shuffle_channels.cpp @@ -151,7 +151,7 @@ const auto shuffleChannelsParams5D = ::testing::Combine( ::testing::ValuesIn(std::vector{1, 2, 3, 6}) ); -INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels4D, ShuffleChannelsLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_ShuffleChannels4D, ShuffleChannelsLayerCPUTest, ::testing::Combine( ::testing::Combine( shuffleChannelsParams4D, @@ -165,7 +165,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels4D, ShuffleChannelsLayerCPUTest, ::testing::ValuesIn(filterCPUInfoForDevice4D())), ShuffleChannelsLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels5D, ShuffleChannelsLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_ShuffleChannels5D, ShuffleChannelsLayerCPUTest, ::testing::Combine( ::testing::Combine( shuffleChannelsParams5D, @@ -189,7 +189,7 @@ const auto shuffleChannelsParams5DBlock = ::testing::Combine( ::testing::ValuesIn(std::vector{1, 2, 3, 6}) ); -INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels4DBlock, ShuffleChannelsLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_ShuffleChannels4DBlock, ShuffleChannelsLayerCPUTest, ::testing::Combine( ::testing::Combine( shuffleChannelsParams4DBlock, @@ -203,7 +203,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels4DBlock, ShuffleChannelsLayerCPUTes ::testing::ValuesIn(filterCPUInfoForDevice4DBlock())), ShuffleChannelsLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels5DBlock, ShuffleChannelsLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_ShuffleChannels5DBlock, ShuffleChannelsLayerCPUTest, ::testing::Combine( ::testing::Combine( shuffleChannelsParams5DBlock, diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/softmax.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/softmax.cpp index d672629ab0c..2877a64c44a 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/softmax.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/softmax.cpp @@ -118,7 +118,7 @@ const auto OptimizedParams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU), testing::Values(emptyCPUSpec)); -INSTANTIATE_TEST_CASE_P(smoke_SoftMax_Optimized_CPU, SoftMaxLayerCPUTest, OptimizedParams, SoftMaxLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_SoftMax_Optimized_CPU, SoftMaxLayerCPUTest, OptimizedParams, SoftMaxLayerCPUTest::getTestCaseName); const auto NotOptimizedParams = testing::Combine( testing::Values(Precision::FP32, Precision::BF16), @@ -126,7 +126,7 @@ const auto NotOptimizedParams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_CPU), testing::Values(notOptimizedCPUSpec)); -INSTANTIATE_TEST_CASE_P(smoke_SoftMax_CPU, SoftMaxLayerCPUTest, NotOptimizedParams, SoftMaxLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_SoftMax_CPU, SoftMaxLayerCPUTest, NotOptimizedParams, SoftMaxLayerCPUTest::getTestCaseName); } // namespace } // namespace CPULayerTestsDefinitions \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/space_to_batch.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/space_to_batch.cpp index 64dd742000c..61301aebba7 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/space_to_batch.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/space_to_batch.cpp @@ -125,10 +125,10 @@ const auto spaceToBatchParamsSet4D2 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(cpuParams_4D)); -INSTANTIATE_TEST_CASE_P(smoke_SpaceToBatchCPULayerTestCase1_4D, SpaceToBatchCPULayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_SpaceToBatchCPULayerTestCase1_4D, SpaceToBatchCPULayerTest, spaceToBatchParamsSet4D1, SpaceToBatchCPULayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_SpaceToBatchCPULayerTestCase2_4D, SpaceToBatchCPULayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_SpaceToBatchCPULayerTestCase2_4D, SpaceToBatchCPULayerTest, spaceToBatchParamsSet4D2, SpaceToBatchCPULayerTest::getTestCaseName); const std::vector> blockShape5D = {{1, 1, 2, 2, 1}, {1, 2, 4, 1, 3}}; @@ -157,7 +157,7 @@ const auto spaceToBatchParamsSet5D = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_CPU)), ::testing::ValuesIn(cpuParams_5D)); -INSTANTIATE_TEST_CASE_P(smoke_SpaceToBatchCPULayerTestCase_5D, SpaceToBatchCPULayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_SpaceToBatchCPULayerTestCase_5D, SpaceToBatchCPULayerTest, spaceToBatchParamsSet5D, SpaceToBatchCPULayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/space_to_depth.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/space_to_depth.cpp index a080146064f..4c3bdbbba8d 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/space_to_depth.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/space_to_depth.cpp @@ -124,7 +124,7 @@ const auto spaceToDepthBS2_4DParams = testing::Combine( testing::ValuesIn(filterCPUInfoForDevice(CPUParamsBS2_4D)) ); -INSTANTIATE_TEST_CASE_P(smoke_CPUSpaceToDepthBS2_4D, SpaceToDepthLayerCPUTest, spaceToDepthBS2_4DParams, SpaceToDepthLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CPUSpaceToDepthBS2_4D, SpaceToDepthLayerCPUTest, spaceToDepthBS2_4DParams, SpaceToDepthLayerCPUTest::getTestCaseName); const std::vector CPUParamsBS3_4D = { cpuParams_nhwc_avx2, @@ -142,7 +142,7 @@ const auto spaceToDepthBS3_4DParams = testing::Combine( ::testing::ValuesIn(filterCPUInfoForDevice(CPUParamsBS3_4D)) ); -INSTANTIATE_TEST_CASE_P(smoke_CPUSpaceToDepthBS3_4D, SpaceToDepthLayerCPUTest, spaceToDepthBS3_4DParams, SpaceToDepthLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CPUSpaceToDepthBS3_4D, SpaceToDepthLayerCPUTest, spaceToDepthBS3_4DParams, SpaceToDepthLayerCPUTest::getTestCaseName); const std::vector> inputShapesBS2_5D = { {1, 16, 2, 2, 2}, {1, 16, 4, 4, 2}, {1, 32, 2, 6, 2}, {2, 32, 4, 2, 2}, {1, 48, 6, 2, 2}, {2, 64, 2, 2, 6} @@ -171,7 +171,7 @@ const auto spaceToDepthBS2_5DParams = testing::Combine( ::testing::ValuesIn(filterCPUInfoForDevice(CPUParamsBS2_5D)) ); -INSTANTIATE_TEST_CASE_P(smoke_CPUSpaceToDepthBS2_5D, SpaceToDepthLayerCPUTest, spaceToDepthBS2_5DParams, SpaceToDepthLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CPUSpaceToDepthBS2_5D, SpaceToDepthLayerCPUTest, spaceToDepthBS2_5DParams, SpaceToDepthLayerCPUTest::getTestCaseName); const std::vector CPUParamsBS3_5D = { cpuParams_ndhwc_avx2, @@ -189,7 +189,7 @@ const auto spaceToDepthBS3_5DParams = testing::Combine( ::testing::ValuesIn(filterCPUInfoForDevice(CPUParamsBS3_5D)) ); -INSTANTIATE_TEST_CASE_P(smoke_CPUSpaceToDepthBS3_5D, SpaceToDepthLayerCPUTest, spaceToDepthBS3_5DParams, SpaceToDepthLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CPUSpaceToDepthBS3_5D, SpaceToDepthLayerCPUTest, spaceToDepthBS3_5DParams, SpaceToDepthLayerCPUTest::getTestCaseName); } // namespace } // namespace CPULayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/split.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/split.cpp index 7129ee4c4ae..14b83c08ae0 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/split.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/split.cpp @@ -126,7 +126,7 @@ const std::vector> outIndices3 = {{0, 1, 2}, {0, 1, 1, 0, 2} const std::vector> outIndices4 = {{0, 1, 2, 3}, {0, 1, 1, 0, 2, 3}, {0, 0, 0, 2, 3}}; -INSTANTIATE_TEST_CASE_P(smoke_Split4D_CPU_Nspc2NcspSpecial, SplitLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Split4D_CPU_Nspc2NcspSpecial, SplitLayerCPUTest, ::testing::Combine( ::testing::Values(4), ::testing::Values(1), @@ -137,7 +137,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Split4D_CPU_Nspc2NcspSpecial, SplitLayerCPUTest, ::testing::Values(perChannelsToPlanar_4D)), SplitLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Split5D_CPU_Nspc2NcspSpecial, SplitLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Split5D_CPU_Nspc2NcspSpecial, SplitLayerCPUTest, ::testing::Combine( ::testing::Values(3), ::testing::Values(1), @@ -148,7 +148,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Split5D_CPU_Nspc2NcspSpecial, SplitLayerCPUTest, ::testing::Values(perChannelsToPlanar_5D)), SplitLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Split4D_CPU_Block8inPlace, SplitLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Split4D_CPU_Block8inPlace, SplitLayerCPUTest, ::testing::Combine( ::testing::Values(3), ::testing::Values(0, 1), @@ -159,7 +159,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Split4D_CPU_Block8inPlace, SplitLayerCPUTest, ::testing::Values(planar_4D, planar_4D_ref, perChannels_4D, blocked8_4D)), SplitLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Split4D_CPU_Block8, SplitLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Split4D_CPU_Block8, SplitLayerCPUTest, ::testing::Combine( ::testing::Values(3), ::testing::Values(2, 3), @@ -170,7 +170,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Split4D_CPU_Block8, SplitLayerCPUTest, ::testing::Values(planar_4D, planar_4D_ref, perChannels_4D, blocked8_4D_ref)), SplitLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Split4D_CPU_Block16inPlace, SplitLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Split4D_CPU_Block16inPlace, SplitLayerCPUTest, ::testing::Combine( ::testing::Values(4), ::testing::Values(0, 1), @@ -181,7 +181,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Split4D_CPU_Block16inPlace, SplitLayerCPUTest, ::testing::Values(blocked16_4D)), SplitLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Split4D_CPU_Block16, SplitLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Split4D_CPU_Block16, SplitLayerCPUTest, ::testing::Combine( ::testing::Values(4), ::testing::Values(2, 3), @@ -192,7 +192,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Split4D_CPU_Block16, SplitLayerCPUTest, ::testing::Values(blocked16_4D_ref)), SplitLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Split5D_CPU_Block8inPlace, SplitLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Split5D_CPU_Block8inPlace, SplitLayerCPUTest, ::testing::Combine( ::testing::Values(3), ::testing::Values(0, 1), @@ -203,7 +203,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Split5D_CPU_Block8inPlace, SplitLayerCPUTest, ::testing::Values(planar_5D, planar_5D_ref, perChannels_5D, blocked8_5D)), SplitLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Split5D_CPU_Block8, SplitLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Split5D_CPU_Block8, SplitLayerCPUTest, ::testing::Combine( ::testing::Values(3), ::testing::Values(2, 3, 4), @@ -214,7 +214,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Split5D_CPU_Block8, SplitLayerCPUTest, ::testing::Values(planar_5D, planar_5D_ref, perChannels_5D, blocked8_5D_ref)), SplitLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Split5D_CPU_Block16inPlace, SplitLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Split5D_CPU_Block16inPlace, SplitLayerCPUTest, ::testing::Combine( ::testing::Values(4), ::testing::Values(0, 1), @@ -225,7 +225,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Split5D_CPU_Block16inPlace, SplitLayerCPUTest, ::testing::Values(blocked16_5D)), SplitLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Split5D_CPU_Block16, SplitLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Split5D_CPU_Block16, SplitLayerCPUTest, ::testing::Combine( ::testing::Values(4), ::testing::Values(2, 3, 4), @@ -236,7 +236,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Split5D_CPU_Block16, SplitLayerCPUTest, ::testing::Values(blocked16_5D_ref)), SplitLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Split3D, SplitLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Split3D, SplitLayerCPUTest, ::testing::Combine( ::testing::Values(7), ::testing::Values(0, 1, 2), @@ -247,7 +247,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Split3D, SplitLayerCPUTest, ::testing::Values(CPUSpecificParams{{}, {}, {}, "unknown"}, CPUSpecificParams{{}, {}, {"ref"}, "ref"})), SplitLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Split2D, SplitLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Split2D, SplitLayerCPUTest, ::testing::Combine( ::testing::Values(2), ::testing::Values(0, 1), @@ -258,7 +258,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Split2D, SplitLayerCPUTest, ::testing::Values(CPUSpecificParams{{}, {}, {}, "unknown"}, CPUSpecificParams{{}, {}, {"ref"}, "ref"})), SplitLayerCPUTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Split1D, SplitLayerCPUTest, +INSTANTIATE_TEST_SUITE_P(smoke_Split1D, SplitLayerCPUTest, ::testing::Combine( ::testing::Values(5), ::testing::Values(0), diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/strided_slice.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/strided_slice.cpp index c4746897552..b01e2455a29 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/strided_slice.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/strided_slice.cpp @@ -121,7 +121,7 @@ const auto StridedSliceParamsPlain2D = ::testing::Combine( ::testing::Values(additional_config), ::testing::Values(emptyCPUSpec)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_Plain_2D, StridedSliceLayerCPUTest, StridedSliceParamsPlain2D, StridedSliceLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Plain_2D, StridedSliceLayerCPUTest, StridedSliceParamsPlain2D, StridedSliceLayerCPUTest::getTestCaseName); const std::vector testCasesCommon4D = { StridedSliceSpecificParams{ { 1, 5, 32, 32 }, { 0, 2, 5, 4 }, { 1, 4, 28, 27 }, { 1, 1, 1, 1 }, @@ -162,7 +162,7 @@ const auto StridedSliceParamsCommon4D = ::testing::Combine( ::testing::Values(additional_config), ::testing::ValuesIn(CPUParamsCommon4D)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_Common_4D, StridedSliceLayerCPUTest, StridedSliceParamsCommon4D, StridedSliceLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Common_4D, StridedSliceLayerCPUTest, StridedSliceParamsCommon4D, StridedSliceLayerCPUTest::getTestCaseName); const std::vector testCasesBlocked4D = { StridedSliceSpecificParams{ { 1, 16, 32, 32 }, { 0, 0, 5, 4 }, { 1, 16, 28, 27 }, { 1, 1, 1, 1 }, @@ -207,7 +207,7 @@ const auto StridedSliceParamsBlocked4D = ::testing::Combine( ::testing::Values(additional_config), ::testing::ValuesIn(CPUParamsBlocked4D)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_Blocked_4D, StridedSliceLayerCPUTest, StridedSliceParamsBlocked4D, StridedSliceLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Blocked_4D, StridedSliceLayerCPUTest, StridedSliceParamsBlocked4D, StridedSliceLayerCPUTest::getTestCaseName); const std::vector testCasesCommon5D = { StridedSliceSpecificParams{ { 1, 5, 20, 32, 32 }, { 0, 2, 0, 5, 4 }, { 1, 4, 5, 28, 27 }, { 1, 1, 1, 1, 1 }, @@ -250,7 +250,7 @@ const auto StridedSliceParamsCommon5D = ::testing::Combine( ::testing::Values(additional_config), ::testing::ValuesIn(CPUParamsCommon5D)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_Common_5D, StridedSliceLayerCPUTest, StridedSliceParamsCommon5D, StridedSliceLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Common_5D, StridedSliceLayerCPUTest, StridedSliceParamsCommon5D, StridedSliceLayerCPUTest::getTestCaseName); const std::vector testCasesBlocked5D = { StridedSliceSpecificParams{ { 1, 16, 20, 32, 32 }, { 0, 0, 0, 5, 4 }, { 1, 16, 5, 28, 27 }, { 1, 1, 1, 1, 1 }, @@ -297,7 +297,7 @@ const auto StridedSliceParamsBlocked5D = ::testing::Combine( ::testing::Values(additional_config), ::testing::ValuesIn(CPUParamsBlocked5D)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs_Blocked_5D, StridedSliceLayerCPUTest, StridedSliceParamsBlocked5D, StridedSliceLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs_Blocked_5D, StridedSliceLayerCPUTest, StridedSliceParamsBlocked5D, StridedSliceLayerCPUTest::getTestCaseName); } // namespace } // namespace CPULayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/transpose.cpp b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/transpose.cpp index 053ba0ebeae..9708b8d50ec 100644 --- a/inference-engine/tests/functional/plugin/cpu/single_layer_tests/transpose.cpp +++ b/inference-engine/tests/functional/plugin/cpu/single_layer_tests/transpose.cpp @@ -136,7 +136,7 @@ const auto params4D = ::testing::Combine( ::testing::Values(additional_config), ::testing::ValuesIn(CPUParams4D)); -INSTANTIATE_TEST_CASE_P(smoke_Transpose4D_CPU, TransposeLayerCPUTest, params4D, TransposeLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Transpose4D_CPU, TransposeLayerCPUTest, params4D, TransposeLayerCPUTest::getTestCaseName); const auto paramsPerChannels4D = ::testing::Combine( ::testing::ValuesIn(inputOrderPerChannels4D), @@ -146,7 +146,7 @@ const auto paramsPerChannels4D = ::testing::Combine( ::testing::Values(additional_config), ::testing::Values(cpuParams_nhwc)); -INSTANTIATE_TEST_CASE_P(smoke_PermutePerChannels4D_CPU, TransposeLayerCPUTest, paramsPerChannels4D, TransposeLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_PermutePerChannels4D_CPU, TransposeLayerCPUTest, paramsPerChannels4D, TransposeLayerCPUTest::getTestCaseName); const std::vector> inputShapes5D = { {2, 32, 5, 10, 20} @@ -189,7 +189,7 @@ const auto params5D = ::testing::Combine( ::testing::Values(additional_config), ::testing::ValuesIn(CPUParams5D)); -INSTANTIATE_TEST_CASE_P(smoke_Transpose5D_CPU, TransposeLayerCPUTest, params5D, TransposeLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Transpose5D_CPU, TransposeLayerCPUTest, params5D, TransposeLayerCPUTest::getTestCaseName); const auto paramsPerChannels5D = ::testing::Combine( ::testing::ValuesIn(inputOrderPerChannels5D), @@ -199,7 +199,7 @@ const auto paramsPerChannels5D = ::testing::Combine( ::testing::Values(additional_config), ::testing::Values(cpuParams_ndhwc)); -INSTANTIATE_TEST_CASE_P(smoke_PermutePerChannels5D_CPU, TransposeLayerCPUTest, paramsPerChannels5D, TransposeLayerCPUTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_PermutePerChannels5D_CPU, TransposeLayerCPUTest, paramsPerChannels5D, TransposeLayerCPUTest::getTestCaseName); } // namespace } // namespace CPULayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv3d_reshape.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv3d_reshape.cpp index 80ff36aeeae..fd65019e6ac 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv3d_reshape.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv3d_reshape.cpp @@ -91,7 +91,7 @@ const std::vector numOut = { 1, 2, 5 }; const auto conv3dReshapeParams = ::testing::Combine(::testing::ValuesIn(convType), ::testing::ValuesIn(numOut)); -INSTANTIATE_TEST_CASE_P(smoke_Conv3dReshapeTest, Conv3dReshapeTest, conv3dReshapeParams, Conv3dReshapeTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Conv3dReshapeTest, Conv3dReshapeTest, conv3dReshapeParams, Conv3dReshapeTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv_concat.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv_concat.cpp index be03883ed6e..aef68679e83 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv_concat.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv_concat.cpp @@ -160,7 +160,7 @@ const auto params2DConv = ::testing::Combine( ::testing::Values(axis) ); -INSTANTIATE_TEST_CASE_P(smoke_Convolution2D1x1, ConvConcatSubgraphTest, params2DConv, ConvConcatSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D1x1, ConvConcatSubgraphTest, params2DConv, ConvConcatSubgraphTest::getTestCaseName); const std::vector CPUParams2DDeconv = { conv_avx2_2D_1x1, @@ -175,7 +175,7 @@ const auto params2DDeconv = ::testing::Combine( ::testing::Values(axis) ); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D1x1, ConvConcatSubgraphTest, params2DDeconv, ConvConcatSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D1x1, ConvConcatSubgraphTest, params2DDeconv, ConvConcatSubgraphTest::getTestCaseName); } // namespace Kernel_1x1 @@ -198,7 +198,7 @@ const auto params2D = ::testing::Combine( ::testing::Values(axis) ); -INSTANTIATE_TEST_CASE_P(smoke_DWGroupConvolutionBackpropData2D, ConvConcatSubgraphTest, params2D, ConvConcatSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_DWGroupConvolutionBackpropData2D, ConvConcatSubgraphTest, params2D, ConvConcatSubgraphTest::getTestCaseName); } // namespace GroupConvolutionBackpropDataDWConcat @@ -221,7 +221,7 @@ const auto params2D = ::testing::Combine( ::testing::Values(axis) ); -INSTANTIATE_TEST_CASE_P(smoke_DWGroupConvolution2D, ConvConcatSubgraphTest, params2D, ConvConcatSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_DWGroupConvolution2D, ConvConcatSubgraphTest, params2D, ConvConcatSubgraphTest::getTestCaseName); /* ============= GroupConvolution (DW 3D) ============= */ commonConvParams dwConvParams3D = commonConvParams{kernelSize3D, strides3D, padBegin3D, padEnd3D, dilation3D, numOutChannels, paddingType, numOutChannels}; @@ -240,7 +240,7 @@ const auto params3D = ::testing::Combine( ::testing::Values(axis) ); -INSTANTIATE_TEST_CASE_P(smoke_DWGroupConvolution3D, ConvConcatSubgraphTest, params3D, ConvConcatSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_DWGroupConvolution3D, ConvConcatSubgraphTest, params3D, ConvConcatSubgraphTest::getTestCaseName); } // namespace GroupConvolutionDWConcat @@ -261,7 +261,7 @@ const auto params2D = ::testing::Combine( ::testing::Values(axis) ); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D, ConvConcatSubgraphTest, params2D, ConvConcatSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D, ConvConcatSubgraphTest, params2D, ConvConcatSubgraphTest::getTestCaseName); /* ============= ConvolutionBackpropData (3D) ============= */ const std::vector CPUParams3D = { @@ -278,7 +278,7 @@ const auto params3D = ::testing::Combine( ::testing::Values(axis) ); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D, ConvConcatSubgraphTest, params3D, ConvConcatSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D, ConvConcatSubgraphTest, params3D, ConvConcatSubgraphTest::getTestCaseName); } // namespace ConvolutionBackpropDataConcat @@ -301,7 +301,7 @@ const auto params2D = ::testing::Combine( ::testing::Values(axis) ); -INSTANTIATE_TEST_CASE_P(smoke_Convolution2D, ConvConcatSubgraphTest, params2D, ConvConcatSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D, ConvConcatSubgraphTest, params2D, ConvConcatSubgraphTest::getTestCaseName); /* ============= Convolution (3D) ============= */ const std::vector CPUParams3D = { @@ -319,7 +319,7 @@ const auto params3D = ::testing::Combine( ::testing::Values(axis) ); -INSTANTIATE_TEST_CASE_P(smoke_Convolution3D, ConvConcatSubgraphTest, params3D, ConvConcatSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Convolution3D, ConvConcatSubgraphTest, params3D, ConvConcatSubgraphTest::getTestCaseName); } // namespace ConvolutionConact @@ -342,7 +342,7 @@ const auto params2D = ::testing::Combine( ::testing::Values(axis) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution2D, ConvConcatSubgraphTest, params2D, ConvConcatSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution2D, ConvConcatSubgraphTest, params2D, ConvConcatSubgraphTest::getTestCaseName); /* ============= GroupConvolution (3D) ============= */ const std::vector CPUParams3D = { @@ -360,7 +360,7 @@ const auto params3D = ::testing::Combine( ::testing::Values(axis) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution3D, ConvConcatSubgraphTest, params3D, ConvConcatSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution3D, ConvConcatSubgraphTest, params3D, ConvConcatSubgraphTest::getTestCaseName); } // namespace GroupConvolutionConcat @@ -382,7 +382,7 @@ const auto params2D = ::testing::Combine( ::testing::Values(axis) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackpropData2D, ConvConcatSubgraphTest, params2D, ConvConcatSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolutionBackpropData2D, ConvConcatSubgraphTest, params2D, ConvConcatSubgraphTest::getTestCaseName); /* ============= GroupConvolutionBackpropData (3D) ============= */ const std::vector CPUParams3D = { @@ -399,7 +399,7 @@ const auto params3D = ::testing::Combine( ::testing::Values(axis) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvolutionBackpropData3D, ConvConcatSubgraphTest, params3D, ConvConcatSubgraphTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolutionBackpropData3D, ConvConcatSubgraphTest, params3D, ConvConcatSubgraphTest::getTestCaseName); } // namespace GroupConvolutionBackpropDataConcat diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv_maxpool_activ.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv_maxpool_activ.cpp index 632fc25d1dd..bc8600fd853 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv_maxpool_activ.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/conv_maxpool_activ.cpp @@ -78,7 +78,7 @@ const std::vector fusingParamsSet { fusingSigmoid }; -INSTANTIATE_TEST_CASE_P(smoke_Check, ConvPoolActivTest, ::testing::ValuesIn(fusingParamsSet), ConvPoolActivTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Check, ConvPoolActivTest, ::testing::ValuesIn(fusingParamsSet), ConvPoolActivTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/eltwise_chain.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/eltwise_chain.cpp index 25c109b5c05..8179b0867b4 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/eltwise_chain.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/eltwise_chain.cpp @@ -140,7 +140,7 @@ std::vector> eltwiseOps = { { EltwiseTypes::DIVIDE, EltwiseTypes::SQUARED_DIFF, EltwiseTypes::ADD }, }; -INSTANTIATE_TEST_CASE_P(smoke_EltwiseChain, EltwiseChainTest, +INSTANTIATE_TEST_SUITE_P(smoke_EltwiseChain, EltwiseChainTest, ::testing::Combine( ::testing::ValuesIn(inputShapes), ::testing::ValuesIn(inputPrecisions), @@ -172,7 +172,7 @@ std::vector> inputPrecisionsFQ { { Precision::FP32, Precision::FP32, Precision::FP32, Precision::FP32 } }; -INSTANTIATE_TEST_CASE_P(smoke_EltwiseChainWithFQ, EltwiseChainTest, +INSTANTIATE_TEST_SUITE_P(smoke_EltwiseChainWithFQ, EltwiseChainTest, ::testing::Combine( ::testing::ValuesIn(inputShapesFQ), ::testing::ValuesIn(inputPrecisionsFQ), diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_muladd_ewsimple.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_muladd_ewsimple.cpp index c48947dfa70..76e9e453ce4 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_muladd_ewsimple.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_muladd_ewsimple.cpp @@ -59,7 +59,7 @@ TEST_P(FuseMulAddAndEwSimpleTest1, CompareWithRefs) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_Basic, FuseMulAddAndEwSimpleTest1, mulAddAndEwSimpleCommonParams, FuseMulAddAndEwSimpleTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Basic, FuseMulAddAndEwSimpleTest1, mulAddAndEwSimpleCommonParams, FuseMulAddAndEwSimpleTest::getTestCaseName); // Fused EltwiseAndSimple comes on the 2nd input into MulAdd @@ -84,7 +84,7 @@ TEST_P(FuseMulAddAndEwSimpleTest2, CompareWithRefs) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_Basic, FuseMulAddAndEwSimpleTest2, mulAddAndEwSimpleCommonParams, FuseMulAddAndEwSimpleTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Basic, FuseMulAddAndEwSimpleTest2, mulAddAndEwSimpleCommonParams, FuseMulAddAndEwSimpleTest::getTestCaseName); // Fused MulAdd with more than 3 inputs @@ -108,5 +108,5 @@ TEST_P(FuseMulAddAndEwSimpleTest3, CompareWithRefs) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_Basic, FuseMulAddAndEwSimpleTest3, mulAddAndEwSimpleCommonParams, FuseMulAddAndEwSimpleTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Basic, FuseMulAddAndEwSimpleTest3, mulAddAndEwSimpleCommonParams, FuseMulAddAndEwSimpleTest::getTestCaseName); } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_scaleshift_and_fakequantize.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_scaleshift_and_fakequantize.cpp index 871d93ab688..7c2dadd9f52 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_scaleshift_and_fakequantize.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_scaleshift_and_fakequantize.cpp @@ -109,7 +109,7 @@ std::vector>> quantizes { { {0.f}, {2.55f}, {0.f}, {2.55f} }, }; -INSTANTIATE_TEST_CASE_P(smoke_FuseScaleShiftAndFakeQuantize, FuseScaleShiftAndFakeQuantizeTest, +INSTANTIATE_TEST_SUITE_P(smoke_FuseScaleShiftAndFakeQuantize, FuseScaleShiftAndFakeQuantizeTest, ::testing::Combine( ::testing::ValuesIn(inputShapes), ::testing::Values(element::f32), diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_transpose_reorder.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_transpose_reorder.cpp index 3c07843a39c..3f8eab0dd93 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_transpose_reorder.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/fuse_transpose_reorder.cpp @@ -97,7 +97,7 @@ TEST_P(FuseTransposeAndReorderTest, CompareWithRefs) { CheckTransposeCount(0); } -INSTANTIATE_TEST_CASE_P(smoke_Basic, FuseTransposeAndReorderTest, fuseTransposeAndReorderCommonParams, FuseTransposeAndReorderTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Basic, FuseTransposeAndReorderTest, fuseTransposeAndReorderCommonParams, FuseTransposeAndReorderTest::getTestCaseName); /* FuseTransposeAndReorderTest1 graph @@ -174,7 +174,7 @@ TEST_P(FuseTransposeAndReorderTest1, DISABLED_CompareWithRefs) { CheckTransposeCount(2); } -INSTANTIATE_TEST_CASE_P(smoke_Basic, FuseTransposeAndReorderTest1, fuseTransposeAndReorderCommonParams, FuseTransposeAndReorderTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Basic, FuseTransposeAndReorderTest1, fuseTransposeAndReorderCommonParams, FuseTransposeAndReorderTest::getTestCaseName); /* FuseTransposeAndReorderTest2 graph @@ -236,6 +236,6 @@ TEST_P(FuseTransposeAndReorderTest2, CompareWithRefs) { CheckTransposeCount(1); } -INSTANTIATE_TEST_CASE_P(smoke_Basic, FuseTransposeAndReorderTest2, fuseTransposeAndReorderCommonParams, FuseTransposeAndReorderTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Basic, FuseTransposeAndReorderTest2, fuseTransposeAndReorderCommonParams, FuseTransposeAndReorderTest::getTestCaseName); } // namespace SubgraphTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/param_result_custom_blob.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/param_result_custom_blob.cpp index 85d7e4787ce..020bcac5756 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/param_result_custom_blob.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/param_result_custom_blob.cpp @@ -53,7 +53,7 @@ TEST_P(ParameterResultCustomBlobTest, CompareWithRefs) { Run(); } namespace { - INSTANTIATE_TEST_CASE_P(smoke_Check_Custom_Blob, ParameterResultCustomBlobTest, + INSTANTIATE_TEST_SUITE_P(smoke_Check_Custom_Blob, ParameterResultCustomBlobTest, ::testing::Values(CommonTestUtils::DEVICE_CPU), ParameterResultSubgraphTest::getTestCaseName); } // namespace @@ -79,7 +79,7 @@ TEST_P(ParameterResultSameBlobTest, CompareWithRefs) { Run(); } namespace { - INSTANTIATE_TEST_CASE_P(smoke_Check_Same_Blob, ParameterResultSameBlobTest, + INSTANTIATE_TEST_SUITE_P(smoke_Check_Same_Blob, ParameterResultSameBlobTest, ::testing::Values(CommonTestUtils::DEVICE_CPU), ParameterResultSubgraphTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/reshape_fc.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/reshape_fc.cpp index 1ed41cb5b2b..50a6218f63f 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/reshape_fc.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/reshape_fc.cpp @@ -91,7 +91,7 @@ const auto reshapeFCParams = ::testing::Combine(::testing::ValuesIn(isFC), ::testing::ValuesIn(transpose), ::testing::ValuesIn(fusingParamsSet)); -INSTANTIATE_TEST_CASE_P(smoke_Check, ReshapeFCTest, reshapeFCParams, ReshapeFCTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Check, ReshapeFCTest, reshapeFCParams, ReshapeFCTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/reshape_permute_conv_permute_reshape_act.cpp b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/reshape_permute_conv_permute_reshape_act.cpp index b389e2bc3fb..a54bd62b429 100644 --- a/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/reshape_permute_conv_permute_reshape_act.cpp +++ b/inference-engine/tests/functional/plugin/cpu/subgraph_tests/src/reshape_permute_conv_permute_reshape_act.cpp @@ -32,7 +32,7 @@ std::vector netPrecisions = { std::map additional_config = { }; namespace SubgraphTestsDefinitions { - INSTANTIATE_TEST_CASE_P(smoke_basic, ConvReshapeAct, + INSTANTIATE_TEST_SUITE_P(smoke_basic, ConvReshapeAct, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_CPU), diff --git a/inference-engine/tests/functional/plugin/gna/Import_export_tests/import_export_act_conv_act.cpp b/inference-engine/tests/functional/plugin/gna/Import_export_tests/import_export_act_conv_act.cpp index e5abadfb1cc..18feccd8cbc 100644 --- a/inference-engine/tests/functional/plugin/gna/Import_export_tests/import_export_act_conv_act.cpp +++ b/inference-engine/tests/functional/plugin/gna/Import_export_tests/import_export_act_conv_act.cpp @@ -165,7 +165,7 @@ const std::vector> importConfigs = { } }; -INSTANTIATE_TEST_CASE_P(smoke_ImportActConvAct, ImportActConvActTest, +INSTANTIATE_TEST_SUITE_P(smoke_ImportActConvAct, ImportActConvActTest, ::testing::Combine( ::testing::ValuesIn(inputShape), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/Import_export_tests/import_export_memory_layer.cpp b/inference-engine/tests/functional/plugin/gna/Import_export_tests/import_export_memory_layer.cpp index c3f7a0c78ae..f0deafaf071 100644 --- a/inference-engine/tests/functional/plugin/gna/Import_export_tests/import_export_memory_layer.cpp +++ b/inference-engine/tests/functional/plugin/gna/Import_export_tests/import_export_memory_layer.cpp @@ -130,7 +130,7 @@ const std::vector> importConfigs = { }, }; -INSTANTIATE_TEST_CASE_P(smoke_ImportNetworkMemoryCase, ImportMemoryTest, +INSTANTIATE_TEST_SUITE_P(smoke_ImportNetworkMemoryCase, ImportMemoryTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/4d_eltwise.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/4d_eltwise.cpp index 37cb4a82569..00f32649eb9 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/4d_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/4d_eltwise.cpp @@ -157,7 +157,7 @@ protected: ngraph::helpers::EltwiseTypes::ADD }; - INSTANTIATE_TEST_CASE_P(smoke_Eltwise4d, Eltwise4dBroadcast, + INSTANTIATE_TEST_SUITE_P(smoke_Eltwise4d, Eltwise4dBroadcast, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), @@ -165,7 +165,7 @@ protected: ::testing::ValuesIn(eltwiseOpTypes)), Eltwise4dBroadcast::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Eltwise4d, Eltwise4dMultipleInput, + INSTANTIATE_TEST_SUITE_P(smoke_Eltwise4d, Eltwise4dMultipleInput, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/act_maxpool_reordering.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/act_maxpool_reordering.cpp index 36b7d209aa2..eea2de7d6e4 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/act_maxpool_reordering.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/act_maxpool_reordering.cpp @@ -125,7 +125,7 @@ const std::vector activationTypes = { ngraph::helpers::ActivationTypes::Abs }; -INSTANTIATE_TEST_CASE_P(smoke_act_maxpool_reordering, ActMaxpoolReordering, +INSTANTIATE_TEST_SUITE_P(smoke_act_maxpool_reordering, ActMaxpoolReordering, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/broadcast_const_with_fq.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/broadcast_const_with_fq.cpp index 7c5f24cf3e8..085d69999f2 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/broadcast_const_with_fq.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/broadcast_const_with_fq.cpp @@ -80,7 +80,7 @@ const std::vector> configs = { { {"GNA_DEVICE_MODE", "GNA_SW_EXACT"} } }; -INSTANTIATE_TEST_CASE_P(smoke_broadcast_const_with_fq, BroadcastConstWithFq, +INSTANTIATE_TEST_SUITE_P(smoke_broadcast_const_with_fq, BroadcastConstWithFq, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(inputShapes1), diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/convert_matmul_to_fullyconnected.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/convert_matmul_to_fullyconnected.cpp index f4a74fe58c8..4cd9a227cbf 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/convert_matmul_to_fullyconnected.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/convert_matmul_to_fullyconnected.cpp @@ -103,7 +103,7 @@ const std::vector>> input_shapes = { }; -INSTANTIATE_TEST_CASE_P(smoke_convert_matmul_to_fc, ConvertMatmulToFcPass, +INSTANTIATE_TEST_SUITE_P(smoke_convert_matmul_to_fc, ConvertMatmulToFcPass, ::testing::Combine( ::testing::ValuesIn(input_shapes), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/convert_matmul_to_pointwise_conv.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/convert_matmul_to_pointwise_conv.cpp index 86bfe5e25c0..2065ed394d2 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/convert_matmul_to_pointwise_conv.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/convert_matmul_to_pointwise_conv.cpp @@ -209,7 +209,7 @@ const std::vector> fqStats = { {-0.5, 0.5} }; -INSTANTIATE_TEST_CASE_P(smoke_ConvertMatmulToPointwiseConvTest, ConvertMatmulToPointwiseConv, +INSTANTIATE_TEST_SUITE_P(smoke_ConvertMatmulToPointwiseConvTest, ConvertMatmulToPointwiseConv, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), @@ -217,7 +217,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvertMatmulToPointwiseConvTest, ConvertMatmulToP ::testing::ValuesIn(inputShape)), ConvertMatmulToPointwiseConv::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ConvertMatmulToPointwiseConvTest, ConvertMatmulToPointwiseConvWithFq, +INSTANTIATE_TEST_SUITE_P(smoke_ConvertMatmulToPointwiseConvTest, ConvertMatmulToPointwiseConvWithFq, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/eltwise_split_over_channels_pass.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/eltwise_split_over_channels_pass.cpp index f4c6cc98d34..5f69ab02615 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/eltwise_split_over_channels_pass.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/eltwise_split_over_channels_pass.cpp @@ -80,7 +80,7 @@ const std::vector> inputShape = { {1, 500000} }; -INSTANTIATE_TEST_CASE_P(smoke_EltwiseSplitOverChennels, EltwiseSplitOverChannelsPassTest, +INSTANTIATE_TEST_SUITE_P(smoke_EltwiseSplitOverChennels, EltwiseSplitOverChannelsPassTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/fq_activation.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/fq_activation.cpp index ff0495f756e..9299fceb643 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/fq_activation.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/fq_activation.cpp @@ -122,7 +122,7 @@ const std::vector levels = { 65535, }; -INSTANTIATE_TEST_CASE_P(smoke_fq_activation, FQActivation, +INSTANTIATE_TEST_SUITE_P(smoke_fq_activation, FQActivation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/fq_fusion_with_multiple_weights.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/fq_fusion_with_multiple_weights.cpp index d65a94eaca6..a4a26ba18d0 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/fq_fusion_with_multiple_weights.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/fq_fusion_with_multiple_weights.cpp @@ -129,7 +129,7 @@ const std::vector levels = { 65535, }; -INSTANTIATE_TEST_CASE_P(smoke_fq_fusion, FQFusionWithMultipleWeights, +INSTANTIATE_TEST_SUITE_P(smoke_fq_fusion, FQFusionWithMultipleWeights, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/fq_maxpool_reordering.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/fq_maxpool_reordering.cpp index 316df2ca9d7..a8c5e52d30d 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/fq_maxpool_reordering.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/fq_maxpool_reordering.cpp @@ -136,7 +136,7 @@ const std::vector levels = { 65535, }; -INSTANTIATE_TEST_CASE_P(smoke_fq_maxpool_reordering, FQMaxpoolReordering, +INSTANTIATE_TEST_SUITE_P(smoke_fq_maxpool_reordering, FQMaxpoolReordering, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/insert_copy_layer_before_self_concat.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/insert_copy_layer_before_self_concat.cpp index 5c01537be7d..421280a7189 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/insert_copy_layer_before_self_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/insert_copy_layer_before_self_concat.cpp @@ -103,7 +103,7 @@ std::vector concatsNum = {1, 2, 3, 4}; std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; -INSTANTIATE_TEST_CASE_P(smoke_InsertCopy, InsertCopyBeforeSelfConcatTest, +INSTANTIATE_TEST_SUITE_P(smoke_InsertCopy, InsertCopyBeforeSelfConcatTest, ::testing::Combine( ::testing::ValuesIn(axes), ::testing::ValuesIn(inShapes), diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/insert_transpose_before_matmul.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/insert_transpose_before_matmul.cpp index eb867e05e31..2c4298c9e97 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/insert_transpose_before_matmul.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/insert_transpose_before_matmul.cpp @@ -120,7 +120,7 @@ const std::vector inputShape = { const std::vector firstInputConst = {false, true}; -INSTANTIATE_TEST_CASE_P(smoke_InsertTransposeBeforeMatmulTest, InsertTransposeBeforeMatmul, +INSTANTIATE_TEST_SUITE_P(smoke_InsertTransposeBeforeMatmulTest, InsertTransposeBeforeMatmul, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/insert_transpose_between_convs.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/insert_transpose_between_convs.cpp index 6e63962504c..578eecb33ac 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/insert_transpose_between_convs.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/insert_transpose_between_convs.cpp @@ -209,7 +209,7 @@ const std::vector> inputShape = { {1, 4, 1, 128} }; -INSTANTIATE_TEST_CASE_P(smoke_InsertTransposeBetweenConvsTest, InsertTransposeBetweenConvs, +INSTANTIATE_TEST_SUITE_P(smoke_InsertTransposeBetweenConvsTest, InsertTransposeBetweenConvs, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), @@ -217,7 +217,7 @@ INSTANTIATE_TEST_CASE_P(smoke_InsertTransposeBetweenConvsTest, InsertTransposeBe ::testing::ValuesIn(inputShape)), InsertTransposeBetweenConvs::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_InsertTransposeBetweenConvsWithPoolTest, InsertTransposeBetweenConvsWithPool, +INSTANTIATE_TEST_SUITE_P(smoke_InsertTransposeBetweenConvsWithPoolTest, InsertTransposeBetweenConvsWithPool, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/layers_restrictions.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/layers_restrictions.cpp index fc7f15994d2..15d2075f5ba 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/layers_restrictions.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/layers_restrictions.cpp @@ -100,14 +100,14 @@ const std::vector> configs = { { {"GNA_DEVICE_MODE", "GNA_SW_EXACT"} } }; -INSTANTIATE_TEST_CASE_P(smoke_layers_restrictions, LayersRestrictionsFullyConnectedBatchSizeMoreThan8, +INSTANTIATE_TEST_SUITE_P(smoke_layers_restrictions, LayersRestrictionsFullyConnectedBatchSizeMoreThan8, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(configs), ::testing::Values(CommonTestUtils::DEVICE_GNA)), LayersRestrictionsFullyConnectedBatchSizeMoreThan8::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_layers_restrictions, LayersRestrictionsFullyConnectedBatchSizeLessThanOrEqual8, +INSTANTIATE_TEST_SUITE_P(smoke_layers_restrictions, LayersRestrictionsFullyConnectedBatchSizeLessThanOrEqual8, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(configs), diff --git a/inference-engine/tests/functional/plugin/gna/pass_tests/remove_permutations_NHWC_to_NCHW_pass.cpp b/inference-engine/tests/functional/plugin/gna/pass_tests/remove_permutations_NHWC_to_NCHW_pass.cpp index d5cd3fc58f8..326d2cbb8ef 100644 --- a/inference-engine/tests/functional/plugin/gna/pass_tests/remove_permutations_NHWC_to_NCHW_pass.cpp +++ b/inference-engine/tests/functional/plugin/gna/pass_tests/remove_permutations_NHWC_to_NCHW_pass.cpp @@ -471,7 +471,7 @@ class RemovePermutationsWithEltwiseTest : public testing::WithParamInterface{false, true})), // with activation RemovePermutationsWithPoolAndActTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_PermutationPass, RemovePermutationsWithTwoConvTest, + INSTANTIATE_TEST_SUITE_P(smoke_PermutationPass, RemovePermutationsWithTwoConvTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), @@ -504,7 +504,7 @@ class RemovePermutationsWithEltwiseTest : public testing::WithParamInterface testCases = { addOutputsParams(getTargetNetwork(), {"Memory_1"}, CommonTestUtils::DEVICE_GNA) }; -INSTANTIATE_TEST_CASE_P(smoke_AddOutputBasic, AddOutputsTest, +INSTANTIATE_TEST_SUITE_P(smoke_AddOutputBasic, AddOutputsTest, ::testing::ValuesIn(testCases), AddOutputsTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/caching_tests.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/caching_tests.cpp index 5d956898897..620e6285cd9 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/caching_tests.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/caching_tests.cpp @@ -17,7 +17,7 @@ namespace { 1, 2 }; - INSTANTIATE_TEST_CASE_P(smoke_CachingSupportCase_GNA, LoadNetworkCacheTestBase, + INSTANTIATE_TEST_SUITE_P(smoke_CachingSupportCase_GNA, LoadNetworkCacheTestBase, ::testing::Combine( ::testing::ValuesIn(LoadNetworkCacheTestBase::getStandardFunctions()), ::testing::ValuesIn(precisionsGNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/config.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/config.cpp index 2c74871bd32..13b8f62c966 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/config.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/config.cpp @@ -22,7 +22,7 @@ namespace { {{InferenceEngine::GNAConfigParams::KEY_GNA_COMPACT_MODE, "ON"}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, IncorrectConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, IncorrectConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), @@ -38,7 +38,7 @@ namespace { }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, IncorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, IncorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), @@ -51,7 +51,7 @@ namespace { {} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/core_integration.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/core_integration.cpp index 52efa7af27b..c2b9a62b049 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/core_integration.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/core_integration.cpp @@ -13,12 +13,12 @@ namespace { // IE Class Common tests with // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassBasicTestP, IEClassBasicTestP, ::testing::Values(std::make_pair("GNAPlugin", "GNA"))); // TODO -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassNetworkTestP, IEClassNetworkTestP, ::testing::Values("GNA")); @@ -26,41 +26,41 @@ INSTANTIATE_TEST_CASE_P( // IE Class GetMetric // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_SUPPORTED_CONFIG_KEYS, ::testing::Values("GNA", "MULTI", "HETERO")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_SUPPORTED_METRICS, ::testing::Values("GNA", "MULTI", "HETERO")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_AVAILABLE_DEVICES, ::testing::Values("GNA")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_FULL_DEVICE_NAME, ::testing::Values("GNA", "MULTI", "HETERO")); // TODO: Issue: 30198 -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassGetMetricTest, IEClassGetMetricTest_OPTIMIZATION_CAPABILITIES, ::testing::Values("GNA")); // TODO: Issue: 30199 -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassGetMetricTest, IEClassGetMetricTest_RANGE_FOR_ASYNC_INFER_REQUESTS, ::testing::Values("GNA")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_ThrowUnsupported, ::testing::Values("GNA", "MULTI", "HETERO")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetConfigTest, IEClassGetConfigTest_ThrowUnsupported, ::testing::Values("GNA", "MULTI", "HETERO")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetAvailableDevices, IEClassGetAvailableDevices, ::testing::Values("GNA")); @@ -68,7 +68,7 @@ INSTANTIATE_TEST_CASE_P( // IE Class GetConfig // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetConfigTest, IEClassGetConfigTest, ::testing::Values("GNA")); @@ -77,27 +77,27 @@ INSTANTIATE_TEST_CASE_P( // // TODO: Convolution with 3D input is not supported on GNA -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS, ::testing::Values("GNA" /*, "MULTI:GNA", "HETERO:GNA" */)); // TODO: Convolution with 3D input is not supported on GNA -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_SUPPORTED_METRICS, ::testing::Values("GNA" /*, "MULTI:GNA", "HETERO:GNA" */)); // TODO: this metric is not supported by the plugin -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_NETWORK_NAME, ::testing::Values("GNA", "MULTI:GNA", "HETERO:GNA")); // TODO: Convolution with 3D input is not supported on GNA -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_OPTIMAL_NUMBER_OF_INFER_REQUESTS, ::testing::Values("GNA"/*, "MULTI:GNA", "HETERO:GNA" */)); // TODO: Convolution with 3D input is not supported on GNA -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_ThrowsUnsupported, ::testing::Values("GNA", /* "MULTI:GNA", */ "HETERO:GNA")); @@ -106,17 +106,17 @@ INSTANTIATE_TEST_CASE_P( // // TODO: Convolution with 3D input is not supported on GNA -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassExecutableNetworkGetConfigTest, IEClassExecutableNetworkGetConfigTest, ::testing::Values("GNA")); // TODO: Convolution with 3D input is not supported on GNA -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassExecutableNetworkSetConfigTest, IEClassExecutableNetworkSetConfigTest, ::testing::Values("GNA")); // TODO: Convolution with 3D input is not supported on GNA -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassExecutableNetworkSupportedConfigTest, IEClassExecutableNetworkSupportedConfigTest, ::testing::Combine(::testing::Values("GNA"), ::testing::Values(std::make_pair(GNA_CONFIG_KEY(DEVICE_MODE), GNAConfigParams::GNA_HW), @@ -125,7 +125,7 @@ INSTANTIATE_TEST_CASE_P( std::make_pair(GNA_CONFIG_KEY(DEVICE_MODE), GNAConfigParams::GNA_AUTO)))); // TODO: Convolution with 3D input is not supported on GNA -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassExecutableNetworkUnsupportedConfigTest, IEClassExecutableNetworkUnsupportedConfigTest, ::testing::Combine(::testing::Values("GNA"), ::testing::Values(std::make_pair(GNA_CONFIG_KEY(DEVICE_MODE), GNAConfigParams::GNA_SW_FP32), @@ -146,7 +146,7 @@ TEST_P(IEClassExecutableNetworkSetConfigFromFp32Test, SetConfigFromFp32Throws) { } // TODO: Convolution with 3D input is not supported on GNA -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassExecutableNetworkSetConfigFromFp32Test, IEClassExecutableNetworkSetConfigFromFp32Test, ::testing::Combine(::testing::Values("GNA"), ::testing::Values(std::make_pair(GNA_CONFIG_KEY(DEVICE_MODE), GNAConfigParams::GNA_HW), @@ -157,13 +157,13 @@ INSTANTIATE_TEST_CASE_P( // IE Class Query network -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassQueryNetworkTest, IEClassQueryNetworkTest, ::testing::Values("GNA")); // IE Class Load network -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassLoadNetworkTest, IEClassLoadNetworkTest, ::testing::Values("GNA")); @@ -172,21 +172,21 @@ INSTANTIATE_TEST_CASE_P( // // TODO: verify hetero interop -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS, ::testing::Values("GNA")); // TODO: verify hetero interop -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_METRICS, ::testing::Values("GNA")); // TODO: verify hetero interop -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_smoke_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_NETWORK_NAME, ::testing::Values("GNA")); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_TARGET_FALLBACK, ::testing::Values("GNA")); } // namespace diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/core_threading_tests.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/core_threading_tests.cpp index f1cb21ac6b5..690ec0a0bfb 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/core_threading_tests.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/core_threading_tests.cpp @@ -14,9 +14,9 @@ Params params[] = { std::vector< std::tuple > paramsWithIterations{ params[0], params[2] }; } // namespace -INSTANTIATE_TEST_CASE_P(GNA, CoreThreadingTests, testing::ValuesIn(params), CoreThreadingTests::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(GNA, CoreThreadingTests, testing::ValuesIn(params), CoreThreadingTests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(GNA, CoreThreadingTestsWithIterations, +INSTANTIATE_TEST_SUITE_P(GNA, CoreThreadingTestsWithIterations, testing::Combine(testing::ValuesIn(paramsWithIterations), testing::Values(3), testing::Values(4), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/cpp_holders.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/cpp_holders.cpp index 433d4adf933..38ac8bf5f13 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/cpp_holders.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/cpp_holders.cpp @@ -21,19 +21,19 @@ namespace { {0, 1, 3, 2} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, HoldersTest, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, HoldersTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GNA), ::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_GNA), ::testing::ValuesIn(orders)), HoldersTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, HoldersTestOnImportedNetwork, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, HoldersTestOnImportedNetwork, ::testing::Values(CommonTestUtils::DEVICE_GNA), HoldersTestOnImportedNetwork::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/exec_graph_info.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/exec_graph_info.cpp index d8cb26b4499..84b86f47f04 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/exec_graph_info.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/exec_graph_info.cpp @@ -15,7 +15,7 @@ namespace { {}, }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, ExecGraphTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, ExecGraphTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request.cpp index 9d67255fafc..055c23f047a 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request.cpp @@ -10,14 +10,14 @@ const std::vector netPrecisions = { InferenceEngine::Precision::FP32 }; -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestTests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::Values(std::map({}))), InferRequestTests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestTestsResultNotReady, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestTestsResultNotReady, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_callback.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_callback.cpp index 6b7c64fe39f..9336cb7efa3 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_callback.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_callback.cpp @@ -20,14 +20,14 @@ const std::vector> multiConfigs = { }; -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CallbackTests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CallbackTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::ValuesIn(configs)), CallbackTests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, CallbackTests, +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, CallbackTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_config.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_config.cpp index 62d2a94ffa8..c21747bd335 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_config.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_config.cpp @@ -29,14 +29,14 @@ namespace { {{InferenceEngine::GNAConfigParams::KEY_GNA_COMPACT_MODE, InferenceEngine::PluginConfigParams::NO}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::ValuesIn(configs)), InferConfigTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferConfigInTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferConfigInTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_input.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_input.cpp index 81620660e0f..6aa0825d34d 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_input.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_input.cpp @@ -15,7 +15,7 @@ namespace { {} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestInputTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestInputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_output.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_output.cpp index da5b0b42611..a8c4ed86f3e 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_output.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/infer_request_output.cpp @@ -14,7 +14,7 @@ namespace { {} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestOutputTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestOutputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/layout.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/layout.cpp index 2d5f773bf41..ccbab8aecb4 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/layout.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/layout.cpp @@ -22,7 +22,7 @@ namespace { { 1, 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_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/memory_states.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/memory_states.cpp index 475b7693c41..c2db36ff9f3 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/memory_states.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/memory_states.cpp @@ -127,6 +127,6 @@ std::vector memoryStateTestCases = { memoryStateParams(getNetwork(), {"c_1-3", "r_1-3"}, CommonTestUtils::DEVICE_GNA) }; -INSTANTIATE_TEST_CASE_P(smoke_VariableStateBasic, VariableStateTest, +INSTANTIATE_TEST_SUITE_P(smoke_VariableStateBasic, VariableStateTest, ::testing::ValuesIn(memoryStateTestCases), VariableStateTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/test_plugin.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/test_plugin.cpp index 4ee7a5a8761..8c5e79825f5 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/test_plugin.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/test_plugin.cpp @@ -16,21 +16,21 @@ namespace { {} }; - 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_GNA), ::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_GNA), ::testing::ValuesIn(configs)), BehaviorTestInput::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, BehaviorTestOutput, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, BehaviorTestOutput, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/version.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/version.cpp index 74850f0129b..e9c9c12d292 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/version.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/behavior/version.cpp @@ -14,14 +14,14 @@ namespace { {{ HETERO_CONFIG_KEY(DUMP_GRAPH_DOT) , CommonTestUtils::DEVICE_GNA}} }; - 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_GNA), ::testing::ValuesIn(configs)), VersionTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Hetero_BehaviorTests, VersionTest, + INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, VersionTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_HETERO), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/import_export_tests/import_reshape_permute_conv.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/import_export_tests/import_reshape_permute_conv.cpp index 442cb116f5d..0d824402305 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/import_export_tests/import_reshape_permute_conv.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/import_export_tests/import_reshape_permute_conv.cpp @@ -74,7 +74,7 @@ const std::vector appHeaders = { "APPLICATION_HEADER" }; -INSTANTIATE_TEST_CASE_P(smoke_ImportNetworkCase, ImportReshapePermuteConvGNA, +INSTANTIATE_TEST_SUITE_P(smoke_ImportNetworkCase, ImportReshapePermuteConvGNA, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/activation.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/activation.cpp index 8e800d1b1c8..9de08e5f84f 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/activation.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/activation.cpp @@ -61,6 +61,6 @@ const auto basicCases = ::testing::Combine( ); -INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic, ActivationLayerTest, basicCases, ActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation_Basic, ActivationLayerTest, basicCases, ActivationLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/concat.cpp index 022898dd3c7..68107baee29 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/concat.cpp @@ -22,7 +22,7 @@ std::vector>> inShapes = { std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; // TODO: Issue: 26421 -INSTANTIATE_TEST_CASE_P(smoke_NoReshape, ConcatLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, ConcatLayerTest, ::testing::Combine( ::testing::ValuesIn(axes), ::testing::ValuesIn(inShapes), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution.cpp index 6605857612a..7231ec975f4 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution.cpp @@ -147,7 +147,7 @@ const auto conv2DParams_AutoPadValid_MapTo1d = ::testing::Combine( ); // TODO: padding isn't currently supported in GNA -INSTANTIATE_TEST_CASE_P(DISABLED_smoke_Convolution2D_ExplicitPadding_Height1, ConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_Convolution2D_ExplicitPadding_Height1, ConvolutionLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding_Height1, ::testing::ValuesIn(netPrecisions), @@ -159,7 +159,7 @@ INSTANTIATE_TEST_CASE_P(DISABLED_smoke_Convolution2D_ExplicitPadding_Height1, Co ::testing::Values(CommonTestUtils::DEVICE_GNA)), ConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(DISABLED_smoke_Convolution2D_ExplicitPadding_Width1, ConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_Convolution2D_ExplicitPadding_Width1, ConvolutionLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding_Width1, ::testing::ValuesIn(netPrecisions), @@ -171,7 +171,7 @@ INSTANTIATE_TEST_CASE_P(DISABLED_smoke_Convolution2D_ExplicitPadding_Width1, Con ::testing::Values(CommonTestUtils::DEVICE_GNA)), ConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AutoPadValid_Height1, ConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_AutoPadValid_Height1, ConvolutionLayerTest, ::testing::Combine( conv2DParams_AutoPadValid_Height1, ::testing::ValuesIn(netPrecisions), @@ -183,7 +183,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AutoPadValid_Height1, ConvolutionLay ::testing::Values(CommonTestUtils::DEVICE_GNA)), ConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AutoPadValid_Width1, ConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_AutoPadValid_Width1, ConvolutionLayerTest, ::testing::Combine( conv2DParams_AutoPadValid_Width1, ::testing::ValuesIn(netPrecisions), @@ -195,7 +195,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AutoPadValid_Width1, ConvolutionLaye ::testing::Values(CommonTestUtils::DEVICE_GNA)), ConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AutoPadValid_MapTo1d, ConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_AutoPadValid_MapTo1d, ConvolutionLayerTest, ::testing::Combine( conv2DParams_AutoPadValid_MapTo1d, ::testing::ValuesIn(netPrecisions), @@ -207,7 +207,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AutoPadValid_MapTo1d, ConvolutionLay ::testing::Values(CommonTestUtils::DEVICE_GNA)), ConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_Kernels2D, GnaConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_Kernels2D, GnaConvolutionLayerTest, ::testing::Combine( conv2DParams_Kernels2D, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution_negative.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution_negative.cpp index aa4975e602f..2235a2b90fa 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution_negative.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/convolution_negative.cpp @@ -151,7 +151,7 @@ struct GnaConv2DNegativeTest##whats_wrong : GnaConv2DNegativeTest { TEST_P(GnaConv2DNegativeTest##whats_wrong, ThrowAsNotSupported) { \ Run(); \ } \ -INSTANTIATE_TEST_CASE_P(smoke_GnaConv2DNegativeTestInvalid##whats_wrong, GnaConv2DNegativeTest##whats_wrong, \ +INSTANTIATE_TEST_SUITE_P(smoke_GnaConv2DNegativeTestInvalid##whats_wrong, GnaConv2DNegativeTest##whats_wrong, \ ::testing::Combine( \ conv2DParameters##suffix_params, \ ::testing::ValuesIn(netPrecisions), \ diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/eltwise.cpp index 13430d921e7..6c13b86e434 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/eltwise.cpp @@ -59,5 +59,5 @@ const auto multiply_params = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::Values(additional_config)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs, EltwiseLayerTest, multiply_params, EltwiseLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs, EltwiseLayerTest, multiply_params, EltwiseLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/fake_quantize.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/fake_quantize.cpp index 31ec8bc4a62..4a50e05ce08 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/fake_quantize.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/fake_quantize.cpp @@ -84,7 +84,7 @@ const auto fqParams = ::testing::Combine( ::testing::ValuesIn(inputParams) ); -INSTANTIATE_TEST_CASE_P(smoke_FakeQuantize, FakeQuantizeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_FakeQuantize, FakeQuantizeLayerTest, ::testing::Combine( fqParams, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/low_precision.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/low_precision.cpp index 04853e09860..9d68c1cea94 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/low_precision.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/low_precision.cpp @@ -58,7 +58,7 @@ const std::vector>> co {"sw_exact_i8", config_i8}, }; -INSTANTIATE_TEST_CASE_P(DISABLED_smoke_LowPrecision, GnaLowPrecisionTest, +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_LowPrecision, GnaLowPrecisionTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/mat_mul.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/mat_mul.cpp index f8ad9761689..f502d0ed3cb 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/mat_mul.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/mat_mul.cpp @@ -27,7 +27,7 @@ std::vector secondaryInputTypes = { std::map additional_config = {{"GNA_DEVICE_MODE", "GNA_SW_EXACT"}}; -INSTANTIATE_TEST_CASE_P(smoke_MatMul, MatMulTest, +INSTANTIATE_TEST_SUITE_P(smoke_MatMul, MatMulTest, ::testing::Combine( ::testing::ValuesIn(shapeRelatedParams), ::testing::ValuesIn(inputPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/memory.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/memory.cpp index c04b76705cc..3e3c053f192 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/memory.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/memory.cpp @@ -34,7 +34,7 @@ const std::vector iterationCount { 10 }; -INSTANTIATE_TEST_CASE_P(smoke_MemoryTest, MemoryTest, +INSTANTIATE_TEST_SUITE_P(smoke_MemoryTest, MemoryTest, ::testing::Combine( ::testing::ValuesIn(transformation), ::testing::ValuesIn(iterationCount), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/pooling.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/pooling.cpp index cd5af6385d2..880a3f95bb6 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/pooling.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/pooling.cpp @@ -40,7 +40,7 @@ const auto maxPool_ExplicitPad_FloorRounding_Params = ::testing::Combine( ); // TODO: Issue: 26503 -INSTANTIATE_TEST_CASE_P(DISABLED_smoke_MaxPool_ExplicitPad_FloorRpunding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_MaxPool_ExplicitPad_FloorRpunding, PoolingLayerTest, ::testing::Combine( maxPool_ExplicitPad_FloorRounding_Params, ::testing::ValuesIn(netPrecisions), @@ -65,7 +65,7 @@ const auto maxPool_ExplicitPad_CeilRounding_Params = ::testing::Combine( ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); // TODO: Issue: 26503 -INSTANTIATE_TEST_CASE_P(DISABLED_smoke_MaxPool_ExplicitPad_CeilRpunding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_MaxPool_ExplicitPad_CeilRpunding, PoolingLayerTest, ::testing::Combine( maxPool_ExplicitPad_CeilRounding_Params, ::testing::ValuesIn(netPrecisions), @@ -93,7 +93,7 @@ const auto avgPoolExplicitPadCeilRoundingParams = ::testing::Combine( ::testing::Values(true, false) ); // TODO: Issue: 26503 -INSTANTIATE_TEST_CASE_P(DISABLED_smoke_AvgPool_ExplicitPad_CeilRounding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_AvgPool_ExplicitPad_CeilRounding, PoolingLayerTest, ::testing::Combine( avgPoolExplicitPadCeilRoundingParams, ::testing::ValuesIn(netPrecisions), @@ -118,7 +118,7 @@ const auto avgPoolExplicitPadFloorRoundingParams = ::testing::Combine( ); // TODO: Issue: 26503 -INSTANTIATE_TEST_CASE_P(DISABLED_smoke_AvgPool_ExplicitPad_FloorRounding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_AvgPool_ExplicitPad_FloorRounding, PoolingLayerTest, ::testing::Combine( avgPoolExplicitPadFloorRoundingParams, ::testing::ValuesIn(netPrecisions), @@ -144,7 +144,7 @@ const auto allPools_ValidPad_Params = ::testing::Combine( ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); // TODO: Issue: 26503 -INSTANTIATE_TEST_CASE_P(DISABLED_smoke_MAX_and_AVGPool_ValidPad, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_MAX_and_AVGPool_ValidPad, PoolingLayerTest, ::testing::Combine( allPools_ValidPad_Params, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/power.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/power.cpp index 1c67b1b35ce..892e96670f6 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/power.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/power.cpp @@ -36,7 +36,7 @@ namespace { InferenceEngine::Precision::FP16, }; - INSTANTIATE_TEST_CASE_P(smoke_power, PowerLayerTest, + INSTANTIATE_TEST_SUITE_P(smoke_power, PowerLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/split.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/split.cpp index a2740dd8ea7..80f784e5cf4 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/split.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/split.cpp @@ -16,7 +16,7 @@ const std::vector netPrecisions = { }; // TODO: Issue: 26411 -INSTANTIATE_TEST_CASE_P(DISABLED_smoke_NumSplitsCheck, SplitLayerTest, +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_NumSplitsCheck, SplitLayerTest, ::testing::Combine( ::testing::Values(1), ::testing::Values(0, 1), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/tensor_iterator.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/tensor_iterator.cpp index 64cb0d1d776..55e72e2b819 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/tensor_iterator.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/single_layer_tests/tensor_iterator.cpp @@ -21,7 +21,7 @@ namespace { InferenceEngine::Precision::FP16 }; - INSTANTIATE_TEST_CASE_P(smoke_TensorIterator, TensorIteratorTest, + INSTANTIATE_TEST_SUITE_P(smoke_TensorIterator, TensorIteratorTest, ::testing::Combine( ::testing::ValuesIn(should_decompose), ::testing::ValuesIn(seqLengths), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/activation_concats_eltwise.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/activation_concats_eltwise.cpp index f08ef63d0b9..e3c190cc176 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/activation_concats_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/activation_concats_eltwise.cpp @@ -31,7 +31,7 @@ const std::vector netPrecisions = { std::map additional_config = {}; -INSTANTIATE_TEST_CASE_P(smoke_CompareRefs, ActivationConcatsEltwise, +INSTANTIATE_TEST_SUITE_P(smoke_CompareRefs, ActivationConcatsEltwise, ::testing::Combine( ::testing::ValuesIn(input_sizes), ::testing::ValuesIn(concat_const_sizes), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/activation_fq.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/activation_fq.cpp index 223b243768b..e3f51c28d76 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/activation_fq.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/activation_fq.cpp @@ -67,7 +67,7 @@ const std::vector activations = { ngraph::helpers::ActivationTypes::Exp }; -INSTANTIATE_TEST_CASE_P(smoke_ActivationFQSubgraph, ActivationFakeQuantizeSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_ActivationFQSubgraph, ActivationFakeQuantizeSubgraphTest, ::testing::Combine( fqParams, ::testing::ValuesIn(activations), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/basic_lstm.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/basic_lstm.cpp index ff5633c0d86..5b6530090c0 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/basic_lstm.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/basic_lstm.cpp @@ -29,7 +29,7 @@ const std::vector> size_params = { const std::vector decompose = { false, true }; -INSTANTIATE_TEST_CASE_P(smoke_BasicLSTM, Basic_LSTM_S, +INSTANTIATE_TEST_SUITE_P(smoke_BasicLSTM, Basic_LSTM_S, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/broadcast_power.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/broadcast_power.cpp index 252e64cb275..5cabf80e6ad 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/broadcast_power.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/broadcast_power.cpp @@ -39,7 +39,7 @@ const std::vector>> input_shapes { }; -INSTANTIATE_TEST_CASE_P(PowerBroadcast, BroadcastPowerTest, +INSTANTIATE_TEST_SUITE_P(PowerBroadcast, BroadcastPowerTest, ::testing::Combine( ::testing::ValuesIn(input_shapes), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/cascade_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/cascade_concat.cpp index fc408535b6d..f4a68244df0 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/cascade_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/cascade_concat.cpp @@ -43,7 +43,7 @@ namespace { {"GNA_SCALE_FACTOR_2", "1"} }; - INSTANTIATE_TEST_CASE_P(smoke_cascade_concat, CascadeConcat, + INSTANTIATE_TEST_SUITE_P(smoke_cascade_concat, CascadeConcat, ::testing::Combine( ::testing::ValuesIn(shape1), ::testing::ValuesIn(shape2), @@ -54,7 +54,7 @@ namespace { ::testing::Values(additional_config)), CascadeConcat::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_cascade_concat_multioutput, CascadeConcat, + INSTANTIATE_TEST_SUITE_P(smoke_cascade_concat_multioutput, CascadeConcat, ::testing::Combine( ::testing::ValuesIn(shape1), ::testing::ValuesIn(shape2), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/clamp_fq.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/clamp_fq.cpp index 2a53f88a83a..bf0a38ee4bc 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/clamp_fq.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/clamp_fq.cpp @@ -72,7 +72,7 @@ const auto fqParams = ::testing::Combine( ); -INSTANTIATE_TEST_CASE_P(smoke_Clamp_FQ_subgraph, ClampFakeQuantizeSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_Clamp_FQ_subgraph, ClampFakeQuantizeSubgraphTest, ::testing::Combine( fqParams, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_conv.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_conv.cpp index 4b657aec21e..2087e98dfe1 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_conv.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_conv.cpp @@ -39,7 +39,7 @@ std::vector outputChannels = { 8 }; -INSTANTIATE_TEST_CASE_P(smoke_ConcatConvTest, ConcatConvTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConcatConvTest, ConcatConvTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_multi_input.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_multi_input.cpp index c748d53a83f..0a153590268 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_multi_input.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_multi_input.cpp @@ -32,7 +32,7 @@ std::map additional_config = { {"GNA_PRECISION", "I16"}, }; -INSTANTIATE_TEST_CASE_P(smoke_concat_multi_input, ConcatMultiInput, +INSTANTIATE_TEST_SUITE_P(smoke_concat_multi_input, ConcatMultiInput, ::testing::Combine( ::testing::ValuesIn(inShapes), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_quantization.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_quantization.cpp index 01db9ae551f..90e6961b404 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_quantization.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_quantization.cpp @@ -21,7 +21,7 @@ const std::vector> configs = { } }; -INSTANTIATE_TEST_CASE_P(smoke_ConcatQuantization, ConcatQuantization, +INSTANTIATE_TEST_SUITE_P(smoke_ConcatQuantization, ConcatQuantization, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_quantization_during_memory_requantization.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_quantization_during_memory_requantization.cpp index 32df9109d6a..0357c545f57 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_quantization_during_memory_requantization.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/concat_quantization_during_memory_requantization.cpp @@ -31,7 +31,7 @@ namespace { 32 }; - INSTANTIATE_TEST_CASE_P(smoke_concat_quant_memory_requant, ConcatQuantDuringMemoryRequantTest, + INSTANTIATE_TEST_SUITE_P(smoke_concat_quant_memory_requant, ConcatQuantDuringMemoryRequantTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/connect_split_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/connect_split_concat.cpp index 47bb9adda01..3322d3f0800 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/connect_split_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/connect_split_concat.cpp @@ -17,14 +17,14 @@ std::map additional_config = { {"GNA_COMPACT_MODE", "NO"} }; -INSTANTIATE_TEST_CASE_P(multiple_connect_split_concat, MultipleConnectSplitConcatTest, +INSTANTIATE_TEST_SUITE_P(multiple_connect_split_concat, MultipleConnectSplitConcatTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::Values(additional_config)), MultipleConnectSplitConcatTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(connect_split_concat_concat, SplitConcatConcatTest, +INSTANTIATE_TEST_SUITE_P(connect_split_concat_concat, SplitConcatConcatTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/const_conv_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/const_conv_concat.cpp index 48224037b2a..3a03f5c7cbc 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/const_conv_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/const_conv_concat.cpp @@ -44,7 +44,7 @@ std::vector outputChannels = { 64 }; -INSTANTIATE_TEST_CASE_P(smoke_ConstConvConcatTest, ConstConvConcatTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConstConvConcatTest, ConstConvConcatTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/const_strided_slice_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/const_strided_slice_concat.cpp index 06fec972d17..35d42981e8f 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/const_strided_slice_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/const_strided_slice_concat.cpp @@ -39,7 +39,7 @@ std::vector constChunksNumber = { 1, 3 }; -INSTANTIATE_TEST_CASE_P(smoke_ConstStridedSliceConcatTest, ConstStridedSliceConcatTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConstStridedSliceConcatTest, ConstStridedSliceConcatTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/constant_result.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/constant_result.cpp index 3c3c7978fe2..8c9f9ab1d03 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/constant_result.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/constant_result.cpp @@ -34,7 +34,7 @@ const std::vector precisions = { Precision::BOOL }; -INSTANTIATE_TEST_CASE_P(smoke_Check, ConstantResultSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_Check, ConstantResultSubgraphTest, ::testing::Combine( ::testing::ValuesIn(types), ::testing::ValuesIn(shapes), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/conv_fq_eltwise.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/conv_fq_eltwise.cpp index 0a09c33f6df..f9358fee19f 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/conv_fq_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/conv_fq_eltwise.cpp @@ -46,7 +46,7 @@ const auto convParams = ::testing::Combine( ::testing::ValuesIn(outputChannels) ); -INSTANTIATE_TEST_CASE_P(smoke_ConvFqEltwiseTest, ConvFqEltwiseTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvFqEltwiseTest, ConvFqEltwiseTest, ::testing::Combine( fqParams, convParams, diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/conv_fq_relu.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/conv_fq_relu.cpp index 2a2296950e6..ebb96d8aa17 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/conv_fq_relu.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/conv_fq_relu.cpp @@ -46,7 +46,7 @@ const auto convParams = ::testing::Combine( ::testing::ValuesIn(outputChannels) ); -INSTANTIATE_TEST_CASE_P(smoke_ConvFqReluTest, ConvFqReluTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvFqReluTest, ConvFqReluTest, ::testing::Combine( fqParams, convParams, diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/convolution_relu_sequence.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/convolution_relu_sequence.cpp index 7600e34a7fb..8169ac44bee 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/convolution_relu_sequence.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/convolution_relu_sequence.cpp @@ -190,7 +190,7 @@ const std::vector > configs = { }; // Enable when using GNA 2.1 library -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionReluSequenceTest, GnaConvolutionReluSequenceTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionReluSequenceTest, GnaConvolutionReluSequenceTest, ::testing::Combine( ::testing::ValuesIn(convReluSpecificParamsAllAll), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/copy_before_squeeze.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/copy_before_squeeze.cpp index 3e82d4f0e8b..6e3d9486470 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/copy_before_squeeze.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/copy_before_squeeze.cpp @@ -26,7 +26,7 @@ namespace { {1, 640} }; - INSTANTIATE_TEST_CASE_P(smoke_copy_before_squeeze, CopyBeforeSqueezeTest, + INSTANTIATE_TEST_SUITE_P(smoke_copy_before_squeeze, CopyBeforeSqueezeTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/crop4d.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/crop4d.cpp index 7e390c38158..335c15ff2e8 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/crop4d.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/crop4d.cpp @@ -30,7 +30,7 @@ const std::vector> configs = { } }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_crop4d_gna, Crop4dTest, ::testing::Combine( ::testing::ValuesIn(ss_only_test_cases), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/delayed_copy_layer.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/delayed_copy_layer.cpp index 41a8c1d68e0..3f3cfa1f063 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/delayed_copy_layer.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/delayed_copy_layer.cpp @@ -17,7 +17,7 @@ namespace { {"GNA_COMPACT_MODE", "NO"} }; - INSTANTIATE_TEST_CASE_P(delayed_copy_layer, DelayedCopyTest, + INSTANTIATE_TEST_SUITE_P(delayed_copy_layer, DelayedCopyTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/eltwise_conv_eltwise.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/eltwise_conv_eltwise.cpp index bacdd0d9006..ae29ad27bae 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/eltwise_conv_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/eltwise_conv_eltwise.cpp @@ -45,7 +45,7 @@ std::vector outputChannels = { 8 }; -INSTANTIATE_TEST_CASE_P(smoke_EltwiseAfterConvTest, EltwiseAfterConvTest, +INSTANTIATE_TEST_SUITE_P(smoke_EltwiseAfterConvTest, EltwiseAfterConvTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), @@ -55,7 +55,7 @@ INSTANTIATE_TEST_CASE_P(smoke_EltwiseAfterConvTest, EltwiseAfterConvTest, ::testing::ValuesIn(outputChannels)), EltwiseAfterConvTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_EltwiseBeforeConvTest, EltwiseBeforeConvTest, +INSTANTIATE_TEST_SUITE_P(smoke_EltwiseBeforeConvTest, EltwiseBeforeConvTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), @@ -65,7 +65,7 @@ INSTANTIATE_TEST_CASE_P(smoke_EltwiseBeforeConvTest, EltwiseBeforeConvTest, ::testing::ValuesIn(outputChannels)), EltwiseBeforeConvTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_EltwiseWithTwoConvsAsInputsTest, EltwiseWithTwoConvsAsInputsTest, +INSTANTIATE_TEST_SUITE_P(smoke_EltwiseWithTwoConvsAsInputsTest, EltwiseWithTwoConvsAsInputsTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/eltwise_reshape_activation.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/eltwise_reshape_activation.cpp index 332da49fb38..8e7af93c892 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/eltwise_reshape_activation.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/eltwise_reshape_activation.cpp @@ -30,7 +30,7 @@ std::vector> additional_config = { } }; -INSTANTIATE_TEST_CASE_P(smoke_EltwiseReshapeActivationTest, EltwiseReshapeActivation, +INSTANTIATE_TEST_SUITE_P(smoke_EltwiseReshapeActivationTest, EltwiseReshapeActivation, ::testing::Combine( ::testing::ValuesIn(shapes), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/fc_conv_fc.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/fc_conv_fc.cpp index db70b15fd5c..069398cd7d5 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/fc_conv_fc.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/fc_conv_fc.cpp @@ -45,7 +45,7 @@ std::vector outputChannels = { 8 }; -INSTANTIATE_TEST_CASE_P(smoke_FcAfterConvTest, FcAfterConvTest, +INSTANTIATE_TEST_SUITE_P(smoke_FcAfterConvTest, FcAfterConvTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), @@ -55,7 +55,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FcAfterConvTest, FcAfterConvTest, ::testing::ValuesIn(outputChannels)), FcAfterConvTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_FcBeforeConvTest, FcBeforeConvTest, +INSTANTIATE_TEST_SUITE_P(smoke_FcBeforeConvTest, FcBeforeConvTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), @@ -65,7 +65,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FcBeforeConvTest, FcBeforeConvTest, ::testing::ValuesIn(outputChannels)), FcBeforeConvTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_FcBetweenConvsTest, FcBetweenConvsTest, +INSTANTIATE_TEST_SUITE_P(smoke_FcBetweenConvsTest, FcBetweenConvsTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/first_connect_input_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/first_connect_input_concat.cpp index 3a7bdf8935d..e62bdd99cfc 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/first_connect_input_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/first_connect_input_concat.cpp @@ -27,7 +27,7 @@ std::map additional_config = { {"GNA_COMPACT_MODE", "NO"}, }; -INSTANTIATE_TEST_CASE_P(smoke_concat_first_input, ConcatFirstInputTest, +INSTANTIATE_TEST_SUITE_P(smoke_concat_first_input, ConcatFirstInputTest, ::testing::Combine( ::testing::ValuesIn(inShapes), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/fq_conv_fq_affine.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/fq_conv_fq_affine.cpp index e48d4ad12c0..34957dc3da7 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/fq_conv_fq_affine.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/fq_conv_fq_affine.cpp @@ -48,7 +48,7 @@ const auto convParams = ::testing::Combine( const std::vector permute = {false, true}; -INSTANTIATE_TEST_CASE_P(smoke_FqConvFqAffineTest, FqConvFqAffineTest, +INSTANTIATE_TEST_SUITE_P(smoke_FqConvFqAffineTest, FqConvFqAffineTest, ::testing::Combine( fqParams, convParams, diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/get_output_before_activation.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/get_output_before_activation.cpp index 7588776f73b..f7b2e5fd5eb 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/get_output_before_activation.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/get_output_before_activation.cpp @@ -28,7 +28,7 @@ std::map additional_config = { }; } // namespace -INSTANTIATE_TEST_CASE_P(OutputBeforeActivation, OutputBeforeActivation, +INSTANTIATE_TEST_SUITE_P(OutputBeforeActivation, OutputBeforeActivation, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::Values(InferenceEngine::Precision::FP32), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/handling_orientation_conv.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/handling_orientation_conv.cpp index f752ba54f1d..ed51ceb4c59 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/handling_orientation_conv.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/handling_orientation_conv.cpp @@ -21,7 +21,7 @@ const std::vector> configs = { } }; -INSTANTIATE_TEST_CASE_P(smoke_handling_orientation, HandlingOrientationClass, +INSTANTIATE_TEST_SUITE_P(smoke_handling_orientation, HandlingOrientationClass, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/input_conv.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/input_conv.cpp index 3fad3b60d27..9b15275b91d 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/input_conv.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/input_conv.cpp @@ -46,7 +46,7 @@ std::vector addReshape = { false }; -INSTANTIATE_TEST_CASE_P(smoke_InputConv, InputConvTest, +INSTANTIATE_TEST_SUITE_P(smoke_InputConv, InputConvTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/input_split_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/input_split_concat.cpp index 2e667336fec..873b8518a79 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/input_split_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/input_split_concat.cpp @@ -30,7 +30,7 @@ const std::vector> inputShapes = { {1, 320} }; -INSTANTIATE_TEST_CASE_P(smoke_InputSplitConcat, InputSplitConcatTest, +INSTANTIATE_TEST_SUITE_P(smoke_InputSplitConcat, InputSplitConcatTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp index 17afb8cd5a8..2b638fad70e 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp @@ -39,7 +39,7 @@ std::vector output_sizes = { 8 }; -INSTANTIATE_TEST_CASE_P(smoke_MatmulSqueezeAdd, MatmulSqueezeAddTest, +INSTANTIATE_TEST_SUITE_P(smoke_MatmulSqueezeAdd, MatmulSqueezeAddTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/memory_LSTMCell.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/memory_LSTMCell.cpp index 5818a40d4ec..db2ca0e8f74 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/memory_LSTMCell.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/memory_LSTMCell.cpp @@ -36,7 +36,7 @@ namespace SubgraphTestsDefinitions { {"GNA_SCALE_FACTOR_0", "1638.4"}, }; - INSTANTIATE_TEST_CASE_P(smoke_MemoryLSTMCellTest, MemoryLSTMCellTest, + INSTANTIATE_TEST_SUITE_P(smoke_MemoryLSTMCellTest, MemoryLSTMCellTest, ::testing::Combine( ::testing::ValuesIn(transformation), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/memory_eltwise_reshape_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/memory_eltwise_reshape_concat.cpp index bf287286ac5..13264c36b31 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/memory_eltwise_reshape_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/memory_eltwise_reshape_concat.cpp @@ -26,7 +26,7 @@ std::map additional_config = { }; } // namespace -INSTANTIATE_TEST_CASE_P(smoke_MemoryEltwiseReshapeConcatTest, MemoryEltwiseReshapeConcatTest, +INSTANTIATE_TEST_SUITE_P(smoke_MemoryEltwiseReshapeConcatTest, MemoryEltwiseReshapeConcatTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::Values(InferenceEngine::Precision::FP32), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multioutput_eltwise_squeeze_eltwise.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multioutput_eltwise_squeeze_eltwise.cpp index 0055e18c95b..b937e07b93a 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multioutput_eltwise_squeeze_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multioutput_eltwise_squeeze_eltwise.cpp @@ -31,7 +31,7 @@ namespace { InferenceEngine::Precision::FP16, }; - INSTANTIATE_TEST_CASE_P(smoke_multioutput_eltwise_identity, MultioutputEltwiseReshapeEltwise, + INSTANTIATE_TEST_SUITE_P(smoke_multioutput_eltwise_identity, MultioutputEltwiseReshapeEltwise, ::testing::Combine( ::testing::ValuesIn(inputs), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multiple_LSTMCell.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multiple_LSTMCell.cpp index d59c023773b..3f695bd1bff 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multiple_LSTMCell.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multiple_LSTMCell.cpp @@ -38,7 +38,7 @@ std::map additional_config = { } // namespace -INSTANTIATE_TEST_CASE_P(MultipleLSTMCellTest, MultipleLSTMCellTest, +INSTANTIATE_TEST_SUITE_P(MultipleLSTMCellTest, MultipleLSTMCellTest, ::testing::Combine( ::testing::ValuesIn(transformation), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multiple_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multiple_concat.cpp index 0cb64714ffb..2cd3e96ee99 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multiple_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/multiple_concat.cpp @@ -34,7 +34,7 @@ std::map additional_config = { }; } // namespace -INSTANTIATE_TEST_CASE_P(I_aligned_C_aligned, MultipleConcatTest, +INSTANTIATE_TEST_SUITE_P(I_aligned_C_aligned, MultipleConcatTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::Values(InferenceEngine::Precision::FP32), @@ -43,7 +43,7 @@ INSTANTIATE_TEST_CASE_P(I_aligned_C_aligned, MultipleConcatTest, ::testing::Values(additional_config)), MultipleConcatTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(I_aligned_C_unaligned, MultipleConcatTest, +INSTANTIATE_TEST_SUITE_P(I_aligned_C_unaligned, MultipleConcatTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::Values(InferenceEngine::Precision::FP32), @@ -52,7 +52,7 @@ INSTANTIATE_TEST_CASE_P(I_aligned_C_unaligned, MultipleConcatTest, ::testing::Values(additional_config)), MultipleConcatTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(I_unaligned_C_aligned, MultipleConcatTest, +INSTANTIATE_TEST_SUITE_P(I_unaligned_C_aligned, MultipleConcatTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::Values(InferenceEngine::Precision::FP32), @@ -61,7 +61,7 @@ INSTANTIATE_TEST_CASE_P(I_unaligned_C_aligned, MultipleConcatTest, ::testing::Values(additional_config)), MultipleConcatTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(I_unaligned_C_unaligned, MultipleConcatTest, +INSTANTIATE_TEST_SUITE_P(I_unaligned_C_unaligned, MultipleConcatTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GNA), ::testing::Values(InferenceEngine::Precision::FP32), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/negative_memory_layer_offset.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/negative_memory_layer_offset.cpp index 36b530e4469..c1d038f0463 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/negative_memory_layer_offset.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/negative_memory_layer_offset.cpp @@ -32,7 +32,7 @@ namespace { 100 }; - INSTANTIATE_TEST_CASE_P(smoke_negative_memory_layer_offset, NegativeMemoryOffsetTest, + INSTANTIATE_TEST_SUITE_P(smoke_negative_memory_layer_offset, NegativeMemoryOffsetTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp index e6fd385f5f8..f5a812e40ea 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp @@ -32,7 +32,7 @@ std::map additional_config = { } // namespace namespace SubgraphTestsDefinitions { - INSTANTIATE_TEST_CASE_P(smoke_basic, PermConvPermConcat, + INSTANTIATE_TEST_SUITE_P(smoke_basic, PermConvPermConcat, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp index a07908927c1..08a665e4e06 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp @@ -35,7 +35,7 @@ std::map additional_config = { }; namespace SubgraphTestsDefinitions { - INSTANTIATE_TEST_CASE_P(smoke_basic, ConvReshapeAct, + INSTANTIATE_TEST_SUITE_P(smoke_basic, ConvReshapeAct, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp index 5cf777fe654..e9163914719 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp @@ -38,7 +38,7 @@ namespace { ngraph::helpers::SqueezeOpType::UNSQUEEZE }; - INSTANTIATE_TEST_CASE_P(smoke_reshape_squeeze_reshape_relu, ReshapeSqueezeReshapeRelu, + INSTANTIATE_TEST_SUITE_P(smoke_reshape_squeeze_reshape_relu, ReshapeSqueezeReshapeRelu, ::testing::Combine( ::testing::ValuesIn(inputs), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshapre_permute_reshape.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshapre_permute_reshape.cpp index 27c9b22c0e8..f74add45bfb 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshapre_permute_reshape.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/reshapre_permute_reshape.cpp @@ -22,7 +22,7 @@ namespace { InferenceEngine::Precision::FP16, }; - INSTANTIATE_TEST_CASE_P(smoke_reshape_permute_reshape, ReshapePermuteReshape, + INSTANTIATE_TEST_SUITE_P(smoke_reshape_permute_reshape, ReshapePermuteReshape, ::testing::Combine( ::testing::ValuesIn(inputs), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/scale_shift.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/scale_shift.cpp index 759413f8bd5..c5856c9fca5 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/scale_shift.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/scale_shift.cpp @@ -42,7 +42,7 @@ namespace { InferenceEngine::Precision::FP16, }; - INSTANTIATE_TEST_CASE_P(smoke_scale_shift, ScaleShiftLayerTest, + INSTANTIATE_TEST_SUITE_P(smoke_scale_shift, ScaleShiftLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/scaleshift_conv_scaleshift.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/scaleshift_conv_scaleshift.cpp index 2e476ac1f87..2a823babc5e 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/scaleshift_conv_scaleshift.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/scaleshift_conv_scaleshift.cpp @@ -45,7 +45,7 @@ std::vector outputChannels = { 8 }; -INSTANTIATE_TEST_CASE_P(smoke_ScaleShiftAfterConvTest, ScaleShiftAfterConvTest, +INSTANTIATE_TEST_SUITE_P(smoke_ScaleShiftAfterConvTest, ScaleShiftAfterConvTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), @@ -55,7 +55,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ScaleShiftAfterConvTest, ScaleShiftAfterConvTest, ::testing::ValuesIn(outputChannels)), ScaleShiftAfterConvTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ScaleShiftBeforeConvTest, ScaleShiftBeforeConvTest, +INSTANTIATE_TEST_SUITE_P(smoke_ScaleShiftBeforeConvTest, ScaleShiftBeforeConvTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/softsign.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/softsign.cpp index 58c987151c0..00333131e3b 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/softsign.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/softsign.cpp @@ -33,7 +33,7 @@ std::vector> input_shapes = { {1, 1, 1, 100} }; -INSTANTIATE_TEST_CASE_P(smoke_Softsign, SoftsignTest, +INSTANTIATE_TEST_SUITE_P(smoke_Softsign, SoftsignTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_conv.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_conv.cpp index bf71c5e2c9d..0b508c3b1fd 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_conv.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_conv.cpp @@ -42,7 +42,7 @@ std::vector outputChannels = { 8 }; -INSTANTIATE_TEST_CASE_P(smoke_SplitConvTest, SplitConvTest, +INSTANTIATE_TEST_SUITE_P(smoke_SplitConvTest, SplitConvTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_conv_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_conv_concat.cpp index 3a3c4e3bbba..755613335b3 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_conv_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_conv_concat.cpp @@ -19,7 +19,7 @@ std::vector> inputShapes = { {1, 32, 1, 1026} }; -INSTANTIATE_TEST_CASE_P(smoke_SplitConvConcat, SplitConvConcat, +INSTANTIATE_TEST_SUITE_P(smoke_SplitConvConcat, SplitConvConcat, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(inputShapes), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_relu.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_relu.cpp index b9764b919fc..69a5e053f72 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_relu.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_relu.cpp @@ -47,7 +47,7 @@ namespace { {std::string(GNA_CONFIG_KEY(COMPACT_MODE)), "NO"} }; - INSTANTIATE_TEST_CASE_P(smoke_split_connected, SplitRelu, + INSTANTIATE_TEST_SUITE_P(smoke_split_connected, SplitRelu, ::testing::Combine( ::testing::ValuesIn(inputs), ::testing::ValuesIn(connect_index), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_trivial_permute_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_trivial_permute_concat.cpp index 49047d3cf83..1982001ed9d 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_trivial_permute_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/split_trivial_permute_concat.cpp @@ -27,7 +27,7 @@ namespace { std::vector split_axes = { 1 }; // only channels split is currently supported by gna for 4d inputs std::vector concat_axes = { 1 }; // only channels concat is currently supported by gna for 4d inputs - INSTANTIATE_TEST_CASE_P(smoke_split_trivial_permute_concat, SplitTrivialPermuteConcatTest, + INSTANTIATE_TEST_SUITE_P(smoke_split_trivial_permute_concat, SplitTrivialPermuteConcatTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/stridedslice_conv.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/stridedslice_conv.cpp index 4517005f3d7..c0894a2e6b4 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/stridedslice_conv.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/stridedslice_conv.cpp @@ -36,7 +36,7 @@ std::vector outputChannels = { 8 }; -INSTANTIATE_TEST_CASE_P(smoke_SliceConvTest, SliceConvTest, +INSTANTIATE_TEST_SUITE_P(smoke_SliceConvTest, SliceConvTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GNA), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/tensor_names.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/tensor_names.cpp index 5ef074f3496..8a1489aebbb 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/tensor_names.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/tensor_names.cpp @@ -10,7 +10,7 @@ using namespace SubgraphTestsDefinitions; namespace { - INSTANTIATE_TEST_CASE_P(smoke_Check, TensorNamesTest, + INSTANTIATE_TEST_SUITE_P(smoke_Check, TensorNamesTest, ::testing::Values(CommonTestUtils::DEVICE_GNA), TensorNamesTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/trivial_concat.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/trivial_concat.cpp index 866080faa2a..aed6bf9b9eb 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/trivial_concat.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/trivial_concat.cpp @@ -27,7 +27,7 @@ std::map additional_config = { {"GNA_SCALE_FACTOR_0", "2000.0"}, }; -INSTANTIATE_TEST_CASE_P(smoke_trivial_concat_Basic, TrivialConcatLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_trivial_concat_Basic, TrivialConcatLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/two_fake_quantize_to_fullyconnected.cpp b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/two_fake_quantize_to_fullyconnected.cpp index 5de8e1813aa..fb85c4334ca 100644 --- a/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/two_fake_quantize_to_fullyconnected.cpp +++ b/inference-engine/tests/functional/plugin/gna/shared_tests_instances/subgraph_tests/two_fake_quantize_to_fullyconnected.cpp @@ -80,7 +80,7 @@ const auto fqParams_I16 = ::testing::Combine( ::testing::ValuesIn(inputParams_I8) ); -INSTANTIATE_TEST_CASE_P(smoke_FakeQuantize_subgraph, FakeQuantizeSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_FakeQuantize_subgraph, FakeQuantizeSubgraphTest, ::testing::Combine( fqParams, ::testing::ValuesIn(netPrecisions), @@ -94,7 +94,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FakeQuantize_subgraph, FakeQuantizeSubgraphTest, ::testing::ValuesIn(biases)), FakeQuantizeSubgraphTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_FakeQuantize_subgraph_U8, FakeQuantizeSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_FakeQuantize_subgraph_U8, FakeQuantizeSubgraphTest, ::testing::Combine( fqParams_I8, ::testing::ValuesIn(netPrecisions), @@ -108,7 +108,7 @@ INSTANTIATE_TEST_CASE_P(smoke_FakeQuantize_subgraph_U8, FakeQuantizeSubgraphTest ::testing::ValuesIn(biases)), FakeQuantizeSubgraphTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_FakeQuantize_subgraph_I16, FakeQuantizeSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_FakeQuantize_subgraph_I16, FakeQuantizeSubgraphTest, ::testing::Combine( fqParams_I16, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/remote_blob_tests/cldnn_remote_blob_tests.cpp b/inference-engine/tests/functional/plugin/gpu/remote_blob_tests/cldnn_remote_blob_tests.cpp index 6837c0b84c3..30b740464a6 100644 --- a/inference-engine/tests/functional/plugin/gpu/remote_blob_tests/cldnn_remote_blob_tests.cpp +++ b/inference-engine/tests/functional/plugin/gpu/remote_blob_tests/cldnn_remote_blob_tests.cpp @@ -269,7 +269,7 @@ TEST_P(BatchedBlob_Test, canInputNV12) { const std::vector num_batches{1, 2, 4}; -INSTANTIATE_TEST_CASE_P(smoke_RemoteBlob, BatchedBlob_Test, ::testing::ValuesIn(num_batches), BatchedBlob_Test::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_RemoteBlob, BatchedBlob_Test, ::testing::ValuesIn(num_batches), BatchedBlob_Test::getTestCaseName); class TwoNets_Test : public CommonTestUtils::TestsCommon, public testing::WithParamInterface { void SetUp() override { @@ -357,4 +357,4 @@ TEST_P(TwoNets_Test, canInferTwoExecNets) { const std::vector num_streams{1, 2}; -INSTANTIATE_TEST_CASE_P(smoke_RemoteBlob, TwoNets_Test, ::testing::ValuesIn(num_streams), TwoNets_Test::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_RemoteBlob, TwoNets_Test, ::testing::ValuesIn(num_streams), TwoNets_Test::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/caching_tests.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/caching_tests.cpp index e840f2aa797..247d1482e76 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/caching_tests.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/caching_tests.cpp @@ -22,7 +22,7 @@ namespace { 1, 2 }; - INSTANTIATE_TEST_CASE_P(smoke_CachingSupportCase_GPU, LoadNetworkCacheTestBase, + INSTANTIATE_TEST_SUITE_P(smoke_CachingSupportCase_GPU, LoadNetworkCacheTestBase, ::testing::Combine( ::testing::ValuesIn(LoadNetworkCacheTestBase::getStandardFunctions()), ::testing::ValuesIn(precisionsGPU), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/config.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/config.cpp index a8c039e4391..235e82475c1 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/config.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/config.cpp @@ -50,21 +50,21 @@ namespace { }; IE_SUPPRESS_DEPRECATED_END - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, IncorrectConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, IncorrectConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(inconfigs)), IncorrectConfigTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, IncorrectConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, IncorrectConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiinconfigs)), IncorrectConfigTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, IncorrectConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, IncorrectConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), @@ -111,63 +111,63 @@ namespace { {{InferenceEngine::KEY_AUTO_DEVICE_LIST , std::string(CommonTestUtils::DEVICE_CPU) + "," + CommonTestUtils::DEVICE_GPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(conf)), CorrectConfigAPITests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_GPU_BehaviorTests, CorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_GPU_BehaviorTests, CorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(conf_gpu)), CorrectConfigAPITests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, CorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, CorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiconf)), CorrectConfigAPITests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, CorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, CorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(autoconf)), CorrectConfigAPITests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_AutoCG_BehaviorTests, CorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_AutoCG_BehaviorTests, CorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(auto_cpu_gpu_conf)), CorrectConfigAPITests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, IncorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, IncorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(conf)), IncorrectConfigAPITests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, IncorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, IncorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiconf)), IncorrectConfigAPITests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, IncorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, IncorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(autoinconfigs)), IncorrectConfigAPITests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_AutoCG_BehaviorTests, IncorrectConfigAPITests, + INSTANTIATE_TEST_SUITE_P(smoke_AutoCG_BehaviorTests, IncorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/core_integration.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/core_integration.cpp index 68b23831e47..a260d3a28d3 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/core_integration.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/core_integration.cpp @@ -19,12 +19,12 @@ namespace { // IE Class Common tests with // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassCommon, IEClassBasicTestP, ::testing::Values(std::make_pair("clDNNPlugin", "GPU")) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassNetworkTestP, IEClassNetworkTestP, ::testing::Values("GPU") ); @@ -33,62 +33,62 @@ INSTANTIATE_TEST_CASE_P( // IE Class GetMetric // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_SUPPORTED_CONFIG_KEYS, ::testing::Values("GPU", "MULTI", "HETERO", "AUTO") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_SUPPORTED_METRICS, ::testing::Values("GPU", "MULTI", "HETERO", "AUTO") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_AVAILABLE_DEVICES, ::testing::Values("GPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_FULL_DEVICE_NAME, ::testing::Values("GPU", "MULTI", "HETERO", "AUTO") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_OPTIMIZATION_CAPABILITIES, ::testing::Values("GPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_DEVICE_GOPS, ::testing::Values("GPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_DEVICE_TYPE, ::testing::Values("GPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_RANGE_FOR_ASYNC_INFER_REQUESTS, ::testing::Values("GPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_RANGE_FOR_STREAMS, ::testing::Values("GPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_ThrowUnsupported, ::testing::Values("GPU", "MULTI", "HETERO", "AUTO") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetConfigTest, IEClassGetConfigTest_ThrowUnsupported, ::testing::Values("GPU", "MULTI", "HETERO", "AUTO") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetAvailableDevices, IEClassGetAvailableDevices, ::testing::Values("GPU") ); @@ -110,7 +110,7 @@ TEST_P(IEClassGetMetricTest_GPU_DEVICE_TOTAL_MEM_SIZE, GetMetricAndPrintNoThrow) ASSERT_METRIC_SUPPORTED(GPU_METRIC_KEY(DEVICE_TOTAL_MEM_SIZE)); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_GPU_DEVICE_TOTAL_MEM_SIZE, ::testing::Values("GPU") ); @@ -129,7 +129,7 @@ TEST_P(IEClassGetMetricTest_GPU_UARCH_VERSION, GetMetricAndPrintNoThrow) { ASSERT_METRIC_SUPPORTED(GPU_METRIC_KEY(UARCH_VERSION)); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_GPU_UARCH_VERSION, ::testing::Values("GPU") ); @@ -148,7 +148,7 @@ TEST_P(IEClassGetMetricTest_GPU_EXECUTION_UNITS_COUNT, GetMetricAndPrintNoThrow) ASSERT_METRIC_SUPPORTED(GPU_METRIC_KEY(EXECUTION_UNITS_COUNT)); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetMetricTest, IEClassGetMetricTest_GPU_EXECUTION_UNITS_COUNT, ::testing::Values("GPU") ); @@ -157,7 +157,7 @@ INSTANTIATE_TEST_CASE_P( // IE Class GetConfig // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassGetConfigTest, IEClassGetConfigTest, ::testing::Values("GPU") ); @@ -166,27 +166,27 @@ INSTANTIATE_TEST_CASE_P( // Executable Network GetMetric // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_OPTIMAL_NUMBER_OF_INFER_REQUESTS, ::testing::Values("GPU", "MULTI:GPU", "HETERO:GPU", "AUTO:GPU,CPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS, ::testing::Values("GPU", "MULTI:GPU", "HETERO:GPU", "AUTO:GPU,CPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_SUPPORTED_METRICS, ::testing::Values("GPU", "MULTI:GPU", "HETERO:GPU", "AUTO:GPU,CPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_NETWORK_NAME, ::testing::Values("GPU", "MULTI:GPU", "HETERO:GPU", "AUTO:GPU,CPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassExecutableNetworkGetMetricTest, IEClassExecutableNetworkGetMetricTest_ThrowsUnsupported, ::testing::Values("GPU", "MULTI:GPU", "HETERO:GPU", "AUTO:GPU,CPU") ); @@ -195,12 +195,12 @@ INSTANTIATE_TEST_CASE_P( // Executable Network GetConfig / SetConfig // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassExecutableNetworkGetConfigTest, IEClassExecutableNetworkGetConfigTest, ::testing::Values("GPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassExecutableNetworkSetConfigTest, IEClassExecutableNetworkSetConfigTest, ::testing::Values("GPU") ); @@ -209,41 +209,41 @@ INSTANTIATE_TEST_CASE_P( // Hetero Executable Network GetMetric // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS, ::testing::Values("GPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_SUPPORTED_METRICS, ::testing::Values("GPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_NETWORK_NAME, ::testing::Values("GPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nightly_IEClassHeteroExecutableNetworlGetMetricTest, IEClassHeteroExecutableNetworkGetMetricTest_TARGET_FALLBACK, ::testing::Values("GPU") ); // IE Class Query network -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassQueryNetworkTest, IEClassQueryNetworkTest, ::testing::Values("GPU") ); // IE Class Load network -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassLoadNetworkTest, IEClassLoadNetworkTest, ::testing::Values("GPU") ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassHeteroExecutableNetworkGetMetricTest, IEClassLoadNetworkAfterCoreRecreateTest, ::testing::Values("GPU") ); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/core_threading_tests.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/core_threading_tests.cpp index db06501a896..779e0212d0f 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/core_threading_tests.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/core_threading_tests.cpp @@ -39,9 +39,9 @@ TEST_P(CoreThreadingTestsWithIterations, smoke_LoadNetwork_RemoteContext) { }, numIterations, numThreads); } -INSTANTIATE_TEST_CASE_P(smoke_GPU, CoreThreadingTests, testing::ValuesIn(params), CoreThreadingTests::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_GPU, CoreThreadingTests, testing::ValuesIn(params), CoreThreadingTests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GPU, CoreThreadingTestsWithIterations, +INSTANTIATE_TEST_SUITE_P(smoke_GPU, CoreThreadingTestsWithIterations, testing::Combine(testing::ValuesIn(params), testing::Values(4), testing::Values(20), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/cpp_holders.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/cpp_holders.cpp index 329db9f216d..12ad85d05be 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/cpp_holders.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/cpp_holders.cpp @@ -18,7 +18,7 @@ namespace { {2, 1, 0} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, HoldersTest, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, HoldersTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(orders)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/exec_graph_info.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/exec_graph_info.cpp index 1a3ca13252c..8b220fad032 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/exec_graph_info.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/exec_graph_info.cpp @@ -15,7 +15,7 @@ namespace { {}, }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, ExecGraphTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, ExecGraphTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request.cpp index 866f4b1cb68..c04aeffd48b 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request.cpp @@ -26,28 +26,28 @@ namespace { {{InferenceEngine::KEY_AUTO_DEVICE_LIST , std::string(CommonTestUtils::DEVICE_CPU) + "," + CommonTestUtils::DEVICE_GPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::Values(std::map({}))), InferRequestTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferRequestTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(configs)), InferRequestTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, InferRequestTests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(autoconfigs)), InferRequestTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_AutoCG_BehaviorTests, InferRequestTests, + INSTANTIATE_TEST_SUITE_P(smoke_AutoCG_BehaviorTests, InferRequestTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_callback.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_callback.cpp index 3d9963a41d7..a0108e84339 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_callback.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_callback.cpp @@ -27,28 +27,28 @@ const std::vector> auto_cpu_gpu_conf = { {{InferenceEngine::KEY_AUTO_DEVICE_LIST , std::string(CommonTestUtils::DEVICE_CPU) + "," + CommonTestUtils::DEVICE_GPU}} }; -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CallbackTests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CallbackTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(configs)), CallbackTests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, CallbackTests, +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, CallbackTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiConfigs)), CallbackTests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, CallbackTests, +INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, CallbackTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(autoConfigs)), CallbackTests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_AutoCG_BehaviorTests, CallbackTests, +INSTANTIATE_TEST_SUITE_P(smoke_AutoCG_BehaviorTests, CallbackTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_config.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_config.cpp index 0072369d920..f48cd8451a7 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_config.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_config.cpp @@ -27,28 +27,28 @@ namespace { {{InferenceEngine::KEY_AUTO_DEVICE_LIST , std::string(CommonTestUtils::DEVICE_CPU) + "," + CommonTestUtils::DEVICE_GPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(configs)), InferConfigTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiConfigs)), InferConfigTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, InferConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(autoConfigs)), InferConfigTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_AutoCG_BehaviorTests, InferConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_AutoCG_BehaviorTests, InferConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_input.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_input.cpp index 59f4dd21677..f63be4c8854 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_input.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_input.cpp @@ -33,28 +33,28 @@ namespace { {{InferenceEngine::KEY_AUTO_DEVICE_LIST , std::string(CommonTestUtils::DEVICE_CPU) + "," + CommonTestUtils::DEVICE_GPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestInputTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestInputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(configs)), InferRequestInputTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferRequestInputTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestInputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiConfigs)), InferRequestInputTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, InferRequestInputTests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestInputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(autoConfigs)), InferRequestInputTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_AutoCG_BehaviorTests, InferRequestInputTests, + INSTANTIATE_TEST_SUITE_P(smoke_AutoCG_BehaviorTests, InferRequestInputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_output.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_output.cpp index 1135f6d9f7d..638106e6a75 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_output.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/infer_request_output.cpp @@ -29,28 +29,28 @@ namespace { {{InferenceEngine::KEY_AUTO_DEVICE_LIST , std::string(CommonTestUtils::DEVICE_CPU) + "," + CommonTestUtils::DEVICE_GPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestOutputTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestOutputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(configs)), InferRequestOutputTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferRequestOutputTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestOutputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiConfigs)), InferRequestOutputTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, InferRequestOutputTests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, InferRequestOutputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(autoConfigs)), InferRequestOutputTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_AutoCG_BehaviorTests, InferRequestOutputTests, + INSTANTIATE_TEST_SUITE_P(smoke_AutoCG_BehaviorTests, InferRequestOutputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/layout.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/layout.cpp index 6748fc58c50..c705c3a9d76 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/layout.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/layout.cpp @@ -20,7 +20,7 @@ namespace { { 1, 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_GPU), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/perf_counters.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/perf_counters.cpp index d8a89ef317d..cc6a2a14a24 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/perf_counters.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/perf_counters.cpp @@ -14,14 +14,14 @@ namespace { {{ MULTI_CONFIG_KEY(DEVICE_PRIORITIES) , CommonTestUtils::DEVICE_GPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, PerfCountersTest, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, PerfCountersTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(configs)), PerfCountersTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, PerfCountersTest, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, PerfCountersTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_MULTI), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/set_blob_of_kind.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/set_blob_of_kind.cpp index 936abfe826d..f055c0b0ec9 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/set_blob_of_kind.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/set_blob_of_kind.cpp @@ -17,7 +17,7 @@ const std::vector blobKinds = { const SetBlobOfKindConfig gpuConfig{}; //nothing special -INSTANTIATE_TEST_CASE_P(smoke_SetBlobOfKindGPU, SetBlobOfKindTest, +INSTANTIATE_TEST_SUITE_P(smoke_SetBlobOfKindGPU, SetBlobOfKindTest, ::testing::Combine(::testing::ValuesIn(blobKinds), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::Values(gpuConfig)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/set_preprocess.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/set_preprocess.cpp index 80c1fdccca9..136cb96436c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/set_preprocess.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/set_preprocess.cpp @@ -30,28 +30,28 @@ namespace { {{InferenceEngine::KEY_AUTO_DEVICE_LIST , std::string(CommonTestUtils::DEVICE_CPU) + "," + CommonTestUtils::DEVICE_GPU}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, PreprocessTest, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, PreprocessTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::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_Auto_BehaviorTests, PreprocessTest, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, PreprocessTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(autoConfigs)), PreprocessTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_AutoCG_BehaviorTests, PreprocessTest, + INSTANTIATE_TEST_SUITE_P(smoke_AutoCG_BehaviorTests, PreprocessTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), @@ -73,7 +73,7 @@ namespace { 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), @@ -87,7 +87,7 @@ namespace { ::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(), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/test_plugin.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/test_plugin.cpp index 729bf57c64a..36790623b48 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/test_plugin.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/test_plugin.cpp @@ -47,84 +47,84 @@ namespace { {{InferenceEngine::PluginConfigParams::KEY_GPU_THROUGHPUT_STREAMS, InferenceEngine::PluginConfigParams::GPU_THROUGHPUT_AUTO}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, BehaviorTestOutput, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, BehaviorTestOutput, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(configsOutput)), BehaviorTestOutput::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, BehaviorTestOutput, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, BehaviorTestOutput, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(MultiConfigsInputOutput)), BehaviorTestOutput::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, BehaviorTestOutput, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, BehaviorTestOutput, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(AutoConfigs)), BehaviorTestOutput::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_AutoCG_BehaviorTests, BehaviorTestOutput, + INSTANTIATE_TEST_SUITE_P(smoke_AutoCG_BehaviorTests, BehaviorTestOutput, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(auto_cpu_gpu_conf)), BehaviorTestOutput::getTestCaseName); - 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_GPU), ::testing::ValuesIn(configs)), BehaviorTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, BehaviorTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, BehaviorTests, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(MultiConfigs)), BehaviorTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, BehaviorTests, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, BehaviorTests, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(AutoConfigs)), BehaviorTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_AutoCG_BehaviorTests, BehaviorTests, + INSTANTIATE_TEST_SUITE_P(smoke_AutoCG_BehaviorTests, BehaviorTests, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(auto_cpu_gpu_conf)), 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_GPU), ::testing::ValuesIn(configsInput)), BehaviorTestInput::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, BehaviorTestInput, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, BehaviorTestInput, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(MultiConfigsInputOutput)), BehaviorTestInput::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, BehaviorTestInput, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, BehaviorTestInput, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(AutoConfigs)), BehaviorTestInput::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_AutoCG_BehaviorTests, BehaviorTestInput, + INSTANTIATE_TEST_SUITE_P(smoke_AutoCG_BehaviorTests, BehaviorTestInput, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_AUTO), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/version.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/version.cpp index 81ec5b808d3..6b69c22855e 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/version.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/behavior/version.cpp @@ -26,35 +26,35 @@ namespace { {{ HETERO_CONFIG_KEY(DUMP_GRAPH_DOT) , CommonTestUtils::DEVICE_GPU}} }; - 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_GPU), ::testing::ValuesIn(configs)), VersionTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, VersionTest, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, VersionTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(Multiconfigs)), VersionTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Auto_BehaviorTests, VersionTest, + INSTANTIATE_TEST_SUITE_P(smoke_Auto_BehaviorTests, VersionTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(Autoconfigs)), VersionTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_AutoCG_BehaviorTests, VersionTest, + INSTANTIATE_TEST_SUITE_P(smoke_AutoCG_BehaviorTests, VersionTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_AUTO), ::testing::ValuesIn(auto_cpu_gpu_conf)), VersionTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Hetero_BehaviorTests, VersionTest, + INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, VersionTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_HETERO), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/configuration_tests/dynamic_batch.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/configuration_tests/dynamic_batch.cpp index 6f3cac60cfb..36a13d4ea5f 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/configuration_tests/dynamic_batch.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/configuration_tests/dynamic_batch.cpp @@ -20,7 +20,7 @@ std::map additional_config = { } // namespace -INSTANTIATE_TEST_CASE_P(smoke_DynamicBatchTest_async, DynamicBatchTest, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicBatchTest_async, DynamicBatchTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::Values(InferenceEngine::Precision::FP32), @@ -29,7 +29,7 @@ INSTANTIATE_TEST_CASE_P(smoke_DynamicBatchTest_async, DynamicBatchTest, ::testing::Values(additional_config)), DynamicBatchTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_DynamicBatchTest_sync, DynamicBatchTest, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicBatchTest_sync, DynamicBatchTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::Values(InferenceEngine::Precision::FP32), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/execution_graph_tests/unique_node_names.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/execution_graph_tests/unique_node_names.cpp index d3689b4492c..275d8f179fb 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/execution_graph_tests/unique_node_names.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/execution_graph_tests/unique_node_names.cpp @@ -15,7 +15,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::FP32 }; -INSTANTIATE_TEST_CASE_P(smoke_NoReshape, ExecGraphUniqueNodeNames, +INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, ExecGraphUniqueNodeNames, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({1, 2, 5, 5})), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/hetero/query_network.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/hetero/query_network.cpp index a23cf6b936b..893f1fce09b 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/hetero/query_network.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/hetero/query_network.cpp @@ -15,7 +15,7 @@ auto ConvBias = ngraph::builder::subgraph::makeConvBias(); auto SplitConvConcat = ngraph::builder::subgraph::makeNestedSplitConvConcat(); auto BranchSplitConvConcat = ngraph::builder::subgraph::makeSplitConvConcatNestedInBranch(); -INSTANTIATE_TEST_CASE_P(smoke_FullySupportedTopologies, QueryNetworkTest, +INSTANTIATE_TEST_SUITE_P(smoke_FullySupportedTopologies, QueryNetworkTest, ::testing::Combine( ::testing::Values("GPU", "HETERO:GPU,CPU", "MULTI:GPU,CPU"), ::testing::Values(ConvBias, SplitConvConcat, BranchSplitConvConcat)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp index 8a33dacde43..7b51e051339 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/add_transformation.cpp @@ -68,7 +68,7 @@ const std::vector params = { { {}, {}, false }, { {}, {}, true }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, AddTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, AddTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp index 078146f1819..408cbb55071 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/clamp_transformation.cpp @@ -76,7 +76,7 @@ const std::vector params = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ClampTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ClampTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp index 57cca361812..f22eb9f63a1 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_transformation.cpp @@ -39,7 +39,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConcatTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp index b5702fe2431..f53eb289438 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_child_and_output.cpp @@ -42,7 +42,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConcatWithChildAndOutputTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithChildAndOutputTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 6, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp index 0b283483716..d7605440afe 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_different_precision_on_children.cpp @@ -45,7 +45,7 @@ const std::vector testValues = { const std::vector multiChannel = { true/*, false*/ }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConcatWithDifferentChildrenTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithDifferentChildrenTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp index 16daf1cbc1d..00f5467b33c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_intermediate_transformation.cpp @@ -26,7 +26,7 @@ const std::vector tras const std::vector transparentIntermediateValues = { true, false }; const std::vector multiChannelValues = { /*true,*/ false }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConcatWithIntermediateTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithIntermediateTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp index c009d2694f0..2dc3a2b4fde 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_neighbors_graph_transformation.cpp @@ -23,7 +23,7 @@ const std::vector tras LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsU8I8() }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConcatWithNeighborsGraphTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithNeighborsGraphTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp index cf789286f7f..2c969a1775f 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/concat_with_split_transformation.cpp @@ -45,7 +45,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConcatWithSplitTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConcatWithSplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 6, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp index 697059e3ce2..e656b6f3ff5 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_backprop_data_transformation.cpp @@ -111,7 +111,7 @@ const std::vector outputShapes = { { 16, 16 } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConvolutionBackpropDataTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConvolutionBackpropDataTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(inputShapes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp index 43928a7ec1c..bb1bd0cb8dc 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_qdq_transformation.cpp @@ -238,7 +238,7 @@ const std::vector shapes = { { 4, 3, 4, 4 } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConvolutionQDqTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConvolutionQDqTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(shapes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp index 2a0c8ff14fc..6b76d8a9eaa 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/convolution_transformation.cpp @@ -64,7 +64,7 @@ const std::vector params } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConvolutionTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConvolutionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), @@ -88,7 +88,7 @@ const std::vector i } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ConvolutionWIthIncorrectWeightsTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ConvolutionWIthIncorrectWeightsTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp index 2075bfe18d7..85e076155cc 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/depth_to_space_transformation.cpp @@ -34,7 +34,7 @@ const auto DepthToSpaceBS2 = ::testing::Combine( ::testing::Values(2) ); -INSTANTIATE_TEST_CASE_P(LPT_BS2, DepthToSpaceTransformation, DepthToSpaceBS2, DepthToSpaceTransformation::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(LPT_BS2, DepthToSpaceTransformation, DepthToSpaceBS2, DepthToSpaceTransformation::getTestCaseName); const std::vector inputShapesBS3 = { {1, 9, 3, 3}, {2, 27, 5, 4} @@ -48,5 +48,5 @@ const auto DepthToSpaceBS3 = ::testing::Combine( ::testing::Values(3) ); -INSTANTIATE_TEST_CASE_P(LPT_BS3, DepthToSpaceTransformation, DepthToSpaceBS3, DepthToSpaceTransformation::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(LPT_BS3, DepthToSpaceTransformation, DepthToSpaceBS3, DepthToSpaceTransformation::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp index 45ca8e01a7d..ea2587340ff 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_avg_pool_transformation.cpp @@ -27,7 +27,7 @@ const std::vector fakeQuantizes = // FakeQuantizeOnData -INSTANTIATE_TEST_CASE_P(smoke_LPT, FakeQuantizeAndAvgPoolTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndAvgPoolTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp index 56e2ecd29a9..ba1bc5bb20a 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_max_pool_transformation.cpp @@ -27,7 +27,7 @@ const std::vector fakeQuantizes = // FakeQuantizeOnData -INSTANTIATE_TEST_CASE_P(smoke_LPT, FakeQuantizeAndMaxPoolTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndMaxPoolTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp index dc48bcb9941..fa47c845378 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_and_two_output_branches_with_convolution.cpp @@ -28,7 +28,7 @@ const std::vector testValues = } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeAndTwoOutputBranchesWithConvolutionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp index f70b1cdde5f..2b67ce0720c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_precision_selection_transformation.cpp @@ -57,7 +57,7 @@ const std::vector testVa }; // GPU issue -INSTANTIATE_TEST_CASE_P(DISABLED_LPT, FakeQuantizePrecisionSelectionTransformation, +INSTANTIATE_TEST_SUITE_P(DISABLED_LPT, FakeQuantizePrecisionSelectionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp index 62fb144c785..fe2ae3c55d6 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_transformation.cpp @@ -59,7 +59,7 @@ const std::vector fakeQuantizeOnDataValues = { // { 256ul, { 1ul }, { -1.28f} , { 1.27f } } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FakeQuantizeTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 32, 72, 48 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp index 963b6e6f28a..6e780a94ed2 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fake_quantize_with_dq_not_optimal_transformation.cpp @@ -101,7 +101,7 @@ const std::vector fakeQuanti } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FakeQuantizeWithNotOptimalTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FakeQuantizeWithNotOptimalTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp index db3665f6aaf..45bf73121d2 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fully_connected_transformation.cpp @@ -41,7 +41,7 @@ const std::vector tras LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParams() }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FullyConnectedTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FullyConnectedTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(shapes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp index 01013dd4147..537f95363e1 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_convert_transformation.cpp @@ -32,7 +32,7 @@ const std::vector deqOperat const std::vector constInput = { true, false }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FuseConvertTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FuseConvertTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::ValuesIn(inputAndQuantizationShapes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp index 175141ef885..f78feda5ce6 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_and_scale_shift_transformation.cpp @@ -34,7 +34,7 @@ const std::vector fakeQuantizeOnD // }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FuseFakeQuantizeAndScaleShiftTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FuseFakeQuantizeAndScaleShiftTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 9, 9 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp index 3125575ec5f..07b0f0a8ad8 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_fake_quantize_transformation.cpp @@ -104,7 +104,7 @@ const std::vector testValues = { }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, FuseFakeQuantizeTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, FuseFakeQuantizeTransformation, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(testValues)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp index 2cc508be12b..58fee1528c2 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_multiply_to_fake_quantize_transformation.cpp @@ -30,7 +30,7 @@ namespace { }, }; - INSTANTIATE_TEST_CASE_P(smoke_LPT, FuseMultiplyToFakeQuantizeTransformation, + INSTANTIATE_TEST_SUITE_P(smoke_LPT, FuseMultiplyToFakeQuantizeTransformation, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(testValues)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp index 35861a9830a..0b25acfc569 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/fuse_subtract_to_fake_quantize_transformation.cpp @@ -30,7 +30,7 @@ namespace { }, }; - INSTANTIATE_TEST_CASE_P(smoke_LPT, FuseSubtractToFakeQuantizeTransformation, + INSTANTIATE_TEST_SUITE_P(smoke_LPT, FuseSubtractToFakeQuantizeTransformation, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(testValues)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp index ca0f60b35f4..cd2b40ceb26 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/gemm_transformation.cpp @@ -24,7 +24,7 @@ const std::vector trasformationParamValues = { LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParamsI8I8() }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, GemmTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, GemmTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(dimensions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp index 624d933188b..18325c824f4 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/group_convolution_transformation.cpp @@ -97,7 +97,7 @@ const std::vector pa } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, GroupConvolutionTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, GroupConvolutionTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp index 5f07e42d4b2..b95d0e7f8c6 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/groupconvolution_qdq_transformation.cpp @@ -492,7 +492,7 @@ const std::vector shapes = { { 1, 4, 7, 7 } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, GroupConvolutionQDqTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, GroupConvolutionQDqTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(shapes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp index c00f6bf695e..33135bb451a 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/interpolate_transformation.cpp @@ -48,5 +48,5 @@ const auto combineValues = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(interpAttrs)); -INSTANTIATE_TEST_CASE_P(smoke_LPT, InterpolateTransformation, combineValues, InterpolateTransformation::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_LPT, InterpolateTransformation, combineValues, InterpolateTransformation::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp index 5afaefb92be..6d0df41c7f4 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_transformation.cpp @@ -30,7 +30,7 @@ std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, MatMulTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, MatMulTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(ngraph::Shape({ 1, 384, 1024 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp index bff6d09467b..919f2dd9388 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_with_constant_transformation.cpp @@ -91,7 +91,7 @@ std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, MatMulWithConstantTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, MatMulWithConstantTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp index a3d2c4eac12..8759d2903bc 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mat_mul_with_optimized_constant_fake_quantize_transformation.cpp @@ -27,7 +27,7 @@ const std::vector> inputShapes = { std::pair({ 1, 16 }, { 16, 10 }) }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, MatMulWithOptimizedConstantFakeQuantizeTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, MatMulWithOptimizedConstantFakeQuantizeTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(inputShapes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp index 2bb1abfb9ed..4f60cc1a3bb 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_to_group_convolution_transformation.cpp @@ -23,7 +23,7 @@ const std::vector fqOnData = { { 256ul, ngraph::Shape { 1, 1, 1, 1 }, { 0.f }, { 25.5f }, { -12.8f }, { 12.7f } } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, MultiplyToGroupConvolutionTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, MultiplyToGroupConvolutionTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::ValuesIn(inputShapes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp index b107cff023f..6c294cb6d9c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_transformation.cpp @@ -67,7 +67,7 @@ const std::vector params = { { {}, {}, false }, { {}, {}, true }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, MultiplyTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, MultiplyTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp index dba8fb64ad7..083b4e8357b 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/multiply_with_one_parent_transformation.cpp @@ -21,7 +21,7 @@ const std::vector values = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, MultiplyWithOneParentTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, MultiplyWithOneParentTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp index 7599e34484d..da5fbff9e91 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/mvn_transformation.cpp @@ -21,7 +21,7 @@ namespace { const std::vector normalizeVariance = { true, false }; - INSTANTIATE_TEST_CASE_P(smoke_LPT, MVNTransformation, + INSTANTIATE_TEST_SUITE_P(smoke_LPT, MVNTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::ValuesIn(inputAndQuantizationShapes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp index 0fa6be4ada6..fe30318107a 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/normalize_transformation.cpp @@ -29,7 +29,7 @@ const std::vector fuseMultiplyValues = { true, false }; const std::vector shiftValues = { true, false }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, NormalizeL2Transformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, NormalizeL2Transformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::ValuesIn(inputAndQuantizationShapes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations.cpp index 487a99a379d..ebbc0ce2003 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations.cpp @@ -19,7 +19,7 @@ const std::vector trasformationParamValues = { LayerTestsUtils::LayerTransformationParamsFactory::createParams() }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, OutputLayersHandlingInTransformations, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, OutputLayersHandlingInTransformations, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat.cpp index 1901cc4a219..dfc77a5cc4c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat.cpp @@ -19,7 +19,7 @@ const std::vector trasformationParamValues = { LayerTestsUtils::LayerTransformationParamsFactory::createParams() }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, OutputLayersHandlingInTransformationsForConcat, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, OutputLayersHandlingInTransformationsForConcat, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.cpp index cbf5ccb423c..98ea4e33405 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/output_layers_handling_in_transformations_for_concat_multi_channel.cpp @@ -19,7 +19,7 @@ const std::vector trasformationParamValues = { LayerTestsUtils::LayerTransformationParamsFactory::createParams() }; -INSTANTIATE_TEST_CASE_P(DISABLED_smoke_LPT, OutputLayersHandlingInTransformationsForConcatMultiChannel, +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_LPT, OutputLayersHandlingInTransformationsForConcatMultiChannel, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::SizeVector({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp index e65229a9f81..aea8e1be969 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/prelu_transformation.cpp @@ -25,7 +25,7 @@ std::vector testValues = { }; // PRelu in low precision is not supported in GPU -INSTANTIATE_TEST_CASE_P(DISABLED_LPT, PReluTransformation, +INSTANTIATE_TEST_SUITE_P(DISABLED_LPT, PReluTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp index aecad435daa..04c82dfaff6 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/pull_reshape_through_dequantization_transformation.cpp @@ -70,7 +70,7 @@ const std::vector dequantizationOnWeightElementwiseConstantShapes { ngraph::Shape({1, 16}) } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, PullReshapeThroughDequantizationTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, PullReshapeThroughDequantizationTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(inputShapes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp index 8e4d6d49682..f53880f5df7 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_max_transformation.cpp @@ -88,7 +88,7 @@ const std::vector params = }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ReduceMaxTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMaxTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp index 13811749874..5b343f98747 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_mean_transformation.cpp @@ -88,7 +88,7 @@ const std::vector params = }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ReduceMeanTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMeanTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp index 3fcc88fdecd..89aeb83f875 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_min_transformation.cpp @@ -88,7 +88,7 @@ const std::vector params = }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ReduceMinTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceMinTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp index 9b2d2fa9341..46cd094fcc1 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reduce_sum_transformation.cpp @@ -78,7 +78,7 @@ const std::vector params = }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ReduceSumTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReduceSumTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 10, 10 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp index 219a64f9c00..a1d65bbf658 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/relu_transformation.cpp @@ -24,7 +24,7 @@ std::vector testValues = { { { 256ul, ngraph::Shape({}), {-12.8f / 2.f}, {12.7f}, {-12.8f / 2.f}, {12.7f} }, true } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ReluTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReluTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp index 46ca94e9cb7..a8d40ca957f 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/reshape_transformation.cpp @@ -52,7 +52,7 @@ const std::vector params = { }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ReshapeTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ReshapeTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp index e1fae4213e9..19a0cfbd015 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/shuffle_channels_transformation.cpp @@ -77,7 +77,7 @@ const std::vector par }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, ShuffleChannelsTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, ShuffleChannelsTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(inputShapes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp index 9f9ce9f544b..18535a437da 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/split_transformation.cpp @@ -84,7 +84,7 @@ const std::vector params = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, SplitTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, SplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp index 36512fd4e58..586a1ac9695 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/squeeze_transformation.cpp @@ -46,7 +46,7 @@ namespace { } }; - INSTANTIATE_TEST_CASE_P(smoke_LPT, SqueezeTransformation, + INSTANTIATE_TEST_SUITE_P(smoke_LPT, SqueezeTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp index bc974c50570..477fb83a158 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/strided_slice_transformation.cpp @@ -86,7 +86,7 @@ const std::vector params } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, StridedSliceTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, StridedSliceTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 24, 24 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp index 41d4109cb5b..b9a63e37cfb 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/subtract_multiply_to_multiply_add_transformation.cpp @@ -57,7 +57,7 @@ const std::vector testVal }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, SubtractMultiplyToMultiplyAddTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, SubtractMultiplyToMultiplyAddTransformation, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::ValuesIn(testValues)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp index 4bdb067f4b9..f58f01d8fc5 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/subtract_transformation.cpp @@ -20,7 +20,7 @@ const std::vector trasformationParamValues = { LayerTestsUtils::LayerTransformationParamsNGraphFactory::createParams() }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, SubtractTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, SubtractTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp index e3cdb1f93ff..7377d54b6cd 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_after_matmul_transformation.cpp @@ -24,7 +24,7 @@ const std::vector perTensorValues = { true, false }; const std::vector transposeChannelDimValues = { true, false }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, TransposeAfterMatMulTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, TransposeAfterMatMulTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp index e35f3cde45a..b1913f592d1 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/transpose_transformation.cpp @@ -41,7 +41,7 @@ const std::vector testValues = { } }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, TransposeTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, TransposeTransformation, ::testing::Combine( ::testing::ValuesIn(precisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp index 9397d7482eb..5bb19861240 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/unsqueeze_transformation.cpp @@ -51,7 +51,7 @@ namespace { } }; - INSTANTIATE_TEST_CASE_P(smoke_LPT, UnsqueezeTransformation, + INSTANTIATE_TEST_SUITE_P(smoke_LPT, UnsqueezeTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp index 6b83a4a0bf4..95f4e4487aa 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/low_precision_transformations/variadic_split_transformation.cpp @@ -90,7 +90,7 @@ const std::vector param }, }; -INSTANTIATE_TEST_CASE_P(smoke_LPT, VariadicSplitTransformation, +INSTANTIATE_TEST_SUITE_P(smoke_LPT, VariadicSplitTransformation, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(ngraph::Shape({ 1, 3, 16, 16 })), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/multi/gpu_remote_blob_tests.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/multi/gpu_remote_blob_tests.cpp index 4fffb2cad6e..26e2655607d 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/multi/gpu_remote_blob_tests.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/multi/gpu_remote_blob_tests.cpp @@ -16,7 +16,7 @@ const std::vector device_names_and_support_for_remot #endif }; -INSTANTIATE_TEST_CASE_P(smoke_RemoteBlobMultiGPU, MultiDevice_SupportTest, +INSTANTIATE_TEST_SUITE_P(smoke_RemoteBlobMultiGPU, MultiDevice_SupportTest, ::testing::ValuesIn(device_names_and_support_for_remote_blobs), MultiDevice_SupportTest::getTestCaseName); TEST_P(MultiDevice_Test, cannotInferRemoteBlobIfNotInitializedForDevice) { @@ -53,5 +53,5 @@ const std::vector device_names_and_support_for_remote_blobs2 { {"GPU.1"}, // another GPU (the test will test its presence), different OCL contexts }; -INSTANTIATE_TEST_CASE_P(smoke_RemoteBlobMultiInitializedWithoutGPU, MultiDevice_Test, +INSTANTIATE_TEST_SUITE_P(smoke_RemoteBlobMultiInitializedWithoutGPU, MultiDevice_Test, ::testing::ValuesIn(device_names_and_support_for_remote_blobs2), MultiDevice_Test::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/ngraph_conversion_tests/conv_bias_fusion.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/ngraph_conversion_tests/conv_bias_fusion.cpp index 37471e8cc67..fe6a2dda213 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/ngraph_conversion_tests/conv_bias_fusion.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/ngraph_conversion_tests/conv_bias_fusion.cpp @@ -9,6 +9,6 @@ using namespace NGraphConversionTestsDefinitions; namespace { -INSTANTIATE_TEST_CASE_P(smoke_Basic, ConvBiasFusion, ::testing::Values(CommonTestUtils::DEVICE_GPU), ConvBiasFusion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Basic, ConvBiasFusion, ::testing::Values(CommonTestUtils::DEVICE_GPU), ConvBiasFusion::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/ngraph_conversion_tests/plugin_specific_ngraph_conversion.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/ngraph_conversion_tests/plugin_specific_ngraph_conversion.cpp index bbfc01e3f18..3774936fe78 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/ngraph_conversion_tests/plugin_specific_ngraph_conversion.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/ngraph_conversion_tests/plugin_specific_ngraph_conversion.cpp @@ -9,6 +9,6 @@ using namespace NGraphConversionTestsDefinitions; namespace { -INSTANTIATE_TEST_CASE_P(smoke_Basic, PluginSpecificConversion, ::testing::Values("GPU"), PluginSpecificConversion::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Basic, PluginSpecificConversion, ::testing::Values("GPU"), PluginSpecificConversion::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/activation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/activation.cpp index e7e1f8a6344..c62641c0b4c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/activation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/activation.cpp @@ -95,9 +95,9 @@ const auto basicPreluCases = ::testing::Combine( ); -INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic, ActivationLayerTest, basicCases, ActivationLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic_Prelu, ActivationLayerTest, basicPreluCases, ActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation_Basic, ActivationLayerTest, basicCases, ActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation_Basic_Prelu, ActivationLayerTest, basicPreluCases, ActivationLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic, ActivationParamLayerTest, basicPreluCases, ActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation_Basic, ActivationParamLayerTest, basicPreluCases, ActivationLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/batch_norm.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/batch_norm.cpp index 94c15c93018..fe89b264d9a 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/batch_norm.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/batch_norm.cpp @@ -39,7 +39,7 @@ const auto batchNormParams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_BatchNorm, BatchNormLayerTest, batchNormParams, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp index 7194d632344..1a05db98a6a 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/batch_to_space.cpp @@ -119,6 +119,6 @@ batchToSpaceParamsTuple bts_only_test_cases[] = { CommonTestUtils::DEVICE_GPU) }; -INSTANTIATE_TEST_CASE_P(smoke_CLDNN, BatchToSpaceLayerTest, ::testing::ValuesIn(bts_only_test_cases), +INSTANTIATE_TEST_SUITE_P(smoke_CLDNN, BatchToSpaceLayerTest, ::testing::ValuesIn(bts_only_test_cases), BatchToSpaceLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/broadcast.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/broadcast.cpp index aa055e9b528..979552b9933 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/broadcast.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/broadcast.cpp @@ -38,7 +38,7 @@ const auto numpyBroadcastParams1 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_TestNumpyBroadcast1, BroadcastLayerTest, numpyBroadcastParams1, @@ -54,7 +54,7 @@ const auto numpyBroadcastParams2 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_TestNumpyBroadcast2, BroadcastLayerTest, numpyBroadcastParams2, @@ -84,7 +84,7 @@ const auto bidirectionalBroadcastParams1 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_TestBidirectionalBroadcast1, BroadcastLayerTest, bidirectionalBroadcastParams1, @@ -100,7 +100,7 @@ const auto bidirectionalBroadcastParams2 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_TestBidirectionalBroadcast2, BroadcastLayerTest, bidirectionalBroadcastParams2, @@ -116,7 +116,7 @@ const auto bidirectionalBroadcastParams3 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_TestBidirectionalBroadcast3, BroadcastLayerTest, bidirectionalBroadcastParams3, @@ -149,7 +149,7 @@ const auto explicitBroadcastParams1 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_TestExplicitBroadcast1, BroadcastLayerTest, explicitBroadcastParams1, @@ -165,7 +165,7 @@ const auto explicitBroadcastParams2 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_TestExplicitBroadcast2, BroadcastLayerTest, explicitBroadcastParams2, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/comparison.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/comparison.cpp index 877bd366e0e..e92cdf4f417 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/comparison.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/comparison.cpp @@ -50,6 +50,6 @@ const auto ComparisonTestParams = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::Values(additional_config)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs, ComparisonLayerTest, ComparisonTestParams, ComparisonLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs, ComparisonLayerTest, ComparisonTestParams, ComparisonLayerTest::getTestCaseName); } // namespace \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/concat.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/concat.cpp index bde5e2fc19b..a57887e900f 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/concat.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/concat.cpp @@ -24,7 +24,7 @@ std::vector netPrecisions = {InferenceEngine::Precis InferenceEngine::Precision::I64}; -INSTANTIATE_TEST_CASE_P(smoke_NoReshape, ConcatLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, ConcatLayerTest, ::testing::Combine( ::testing::ValuesIn(axes), ::testing::ValuesIn(inShapes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert.cpp index 130360d4cdf..e404be39af6 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert.cpp @@ -19,7 +19,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::I8, }; -INSTANTIATE_TEST_CASE_P(smoke_NoReshape, ConvertLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, ConvertLayerTest, ::testing::Combine( ::testing::Values(inShape), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert_like.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert_like.cpp index 8b0208ea8cc..c55dc9d85bd 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert_like.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convert_like.cpp @@ -19,7 +19,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::I8, }; -INSTANTIATE_TEST_CASE_P(smoke_NoReshape, ConvertLikeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, ConvertLikeLayerTest, ::testing::Combine( ::testing::Values(inShape), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution.cpp index 6b4c1bea5cf..94e77a1a4a7 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution.cpp @@ -50,7 +50,7 @@ const auto conv2DParams_AutoPadValid = ::testing::Combine( ::testing::Values(ngraph::op::PadType::VALID) ); -INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPadding, ConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_ExplicitPadding, ConvolutionLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -62,7 +62,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPadding, ConvolutionLayerTes ::testing::Values(CommonTestUtils::DEVICE_GPU)), ConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AutoPadValid, ConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_AutoPadValid, ConvolutionLayerTest, ::testing::Combine( conv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -97,7 +97,7 @@ const auto conv3DParams = ::testing::Combine( ::testing::Values(ngraph::op::PadType::EXPLICIT) ); -INSTANTIATE_TEST_CASE_P(smoke_Convolution3D_Basic1, ConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Convolution3D_Basic1, ConvolutionLayerTest, ::testing::Combine( conv3DParams, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp index f404d932bc8..a34a5b75e1b 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/convolution_backprop_data.cpp @@ -56,7 +56,7 @@ const auto conv2DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(emptyOutputPadding) ); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding, ConvolutionBackpropLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions2D), @@ -69,7 +69,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding, Convolu ::testing::Values(CommonTestUtils::DEVICE_GPU)), ConvolutionBackpropLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_AutoPadValid, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadValid, ConvolutionBackpropLayerTest, ::testing::Combine( conv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions2D), @@ -106,7 +106,7 @@ const auto conv2DParams_AutoPadValid_output_padding = ::testing::Combine( ::testing::ValuesIn(outputPadding2D) ); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, ::testing::Combine( conv2DParams_AutoPadValid_output_padding, ::testing::ValuesIn(netPrecisions), @@ -119,7 +119,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_ExplicitPadding_OutputPa ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionBackpropLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData2D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData2D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding_output_padding, ::testing::ValuesIn(netPrecisions), @@ -166,7 +166,7 @@ const auto conv3DParams_AutoPadValid = ::testing::Combine( ::testing::ValuesIn(emptyOutputPadding) ); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding, ConvolutionBackpropLayerTest, ::testing::Combine( conv3DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions3D), @@ -179,7 +179,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding, Convolu ::testing::Values(CommonTestUtils::DEVICE_GPU)), ConvolutionBackpropLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_AutoPadValid, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadValid, ConvolutionBackpropLayerTest, ::testing::Combine( conv3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions3D), @@ -216,7 +216,7 @@ const auto conv3DParams_AutoPadValid_output_padding = ::testing::Combine( ::testing::ValuesIn(outputPadding3D) ); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, ::testing::Combine( conv3DParams_AutoPadValid_output_padding, ::testing::ValuesIn(netPrecisions), @@ -229,7 +229,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_ExplicitPadding_OutputPa ::testing::Values(CommonTestUtils::DEVICE_CPU)), ConvolutionBackpropLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ConvolutionBackpropData3D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ConvolutionBackpropData3D_AutoPadding_OutputPaddingDefined, ConvolutionBackpropLayerTest, ::testing::Combine( conv3DParams_ExplicitPadding_output_padding, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder.cpp index a9faeddaa46..3c423614217 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder.cpp @@ -34,7 +34,7 @@ const auto basicCases = ::testing::Combine( ::testing::ValuesIn(mergeRepeated), ::testing::Values(CommonTestUtils::DEVICE_GPU)); -INSTANTIATE_TEST_CASE_P(smoke_CtcGreedyDecoderBasic, CTCGreedyDecoderLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_CtcGreedyDecoderBasic, CTCGreedyDecoderLayerTest, basicCases, CTCGreedyDecoderLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder_seq_len.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder_seq_len.cpp index 497686924b2..04042aa4de5 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder_seq_len.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/ctc_greedy_decoder_seq_len.cpp @@ -33,11 +33,11 @@ const auto basicCases = ::testing::Combine( ::testing::ValuesIn(mergeRepeated), ::testing::Values(CommonTestUtils::DEVICE_GPU)); -INSTANTIATE_TEST_CASE_P(smoke_set1, CTCGreedyDecoderSeqLenLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_set1, CTCGreedyDecoderSeqLenLayerTest, basicCases, CTCGreedyDecoderSeqLenLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_set2, CTCGreedyDecoderSeqLenLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_set2, CTCGreedyDecoderSeqLenLayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{2, 8, 11}, {4, 10, 55}}), ::testing::ValuesIn(std::vector{5, 100}), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/cum_sum.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/cum_sum.cpp index b92a453693f..12cebb9f8d4 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/cum_sum.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/cum_sum.cpp @@ -26,7 +26,7 @@ std::vector precisions = {InferenceEngine::Precision std::vector> shape1d = {{10}}; std::vector axis1d = {0}; -INSTANTIATE_TEST_CASE_P(smoke_CumSum1D, CumSumLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_CumSum1D, CumSumLayerTest, ::testing::Combine( ::testing::ValuesIn(shape1d), ::testing::ValuesIn(precisions), @@ -36,7 +36,7 @@ INSTANTIATE_TEST_CASE_P(smoke_CumSum1D, CumSumLayerTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), CumSumLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_CumSum, CumSumLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_CumSum, CumSumLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes), ::testing::ValuesIn(precisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/depth_to_space.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/depth_to_space.cpp index 4e42493d567..89b8bc7de84 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/depth_to_space.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/depth_to_space.cpp @@ -34,7 +34,7 @@ const auto DepthToSpaceBS2 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P(smoke_DepthToSpaceBS2, DepthToSpaceLayerTest, DepthToSpaceBS2, DepthToSpaceLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_DepthToSpaceBS2, DepthToSpaceLayerTest, DepthToSpaceBS2, DepthToSpaceLayerTest::getTestCaseName); const std::vector> inputShapesBS3 = { {1, 9, 1, 1}, {1, 9, 2, 2}, {1, 9, 3, 3}, {2, 36, 3, 3}, {2, 27, 5, 4}, @@ -48,6 +48,6 @@ const auto DepthToSpaceBS3 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P(smoke_DepthToSpaceBS3, DepthToSpaceLayerTest, DepthToSpaceBS3, DepthToSpaceLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_DepthToSpaceBS3, DepthToSpaceLayerTest, DepthToSpaceBS3, DepthToSpaceLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/detection_output.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/detection_output.cpp index e12fdbc6ea2..7be886fbaad 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/detection_output.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/detection_output.cpp @@ -56,7 +56,7 @@ const auto params3Inputs = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P(smoke_DetectionOutput3In, DetectionOutputLayerTest, params3Inputs, DetectionOutputLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_DetectionOutput3In, DetectionOutputLayerTest, params3Inputs, DetectionOutputLayerTest::getTestCaseName); /* =============== 5 inputs cases =============== */ @@ -80,6 +80,6 @@ const auto params5Inputs = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P(smoke_DetectionOutput5In, DetectionOutputLayerTest, params5Inputs, DetectionOutputLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_DetectionOutput5In, DetectionOutputLayerTest, params5Inputs, DetectionOutputLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/eltwise.cpp index 3cd2feebf58..fc411847cb9 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/eltwise.cpp @@ -66,7 +66,7 @@ const auto multiply_params = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::Values(additional_config)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs, EltwiseLayerTest, multiply_params, EltwiseLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs, EltwiseLayerTest, multiply_params, EltwiseLayerTest::getTestCaseName); std::vector>> inShapesSingleThread = { diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/embedding_bag_offsets_sum.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/embedding_bag_offsets_sum.cpp index afb5945fa19..cc88c9527bd 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/embedding_bag_offsets_sum.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/embedding_bag_offsets_sum.cpp @@ -49,7 +49,7 @@ const auto embBagOffsetSumArgSet = ::testing::Combine( ::testing::ValuesIn(offsets), ::testing::ValuesIn(default_index), ::testing::ValuesIn(with_weights), ::testing::ValuesIn(with_default_index)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke, EmbeddingBagOffsetsSumLayerTest, ::testing::Combine(embBagOffsetSumArgSet, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/embedding_bag_packed_sum.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/embedding_bag_packed_sum.cpp index 2981ac86266..c7379c8bb8f 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/embedding_bag_packed_sum.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/embedding_bag_packed_sum.cpp @@ -39,7 +39,7 @@ const auto embBagPackedSumArgSet = ::testing::Combine( ::testing::ValuesIn(emb_table_shape), ::testing::ValuesIn(indices), ::testing::ValuesIn(with_weights)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke, EmbeddingBagPackedSumLayerTest, ::testing::Combine(embBagPackedSumArgSet, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/embedding_segments_sum.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/embedding_segments_sum.cpp index 34caed6822d..5239daf6820 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/embedding_segments_sum.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/embedding_segments_sum.cpp @@ -45,7 +45,7 @@ const auto embSegmentsSumArgSet = ::testing::Combine( ::testing::ValuesIn(default_index), ::testing::ValuesIn(with_weights), ::testing::ValuesIn(with_default_index)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke, EmbeddingSegmentsSumLayerTest, ::testing::Combine(embSegmentsSumArgSet, ::testing::ValuesIn(netPrecisions), ::testing::ValuesIn(indPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp index 1749c0db096..ca6db637084 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/extract_image_patches.cpp @@ -56,7 +56,7 @@ const auto extractImagePatchesParamsSet = ::testing::Combine( ::testing::ValuesIn(autoPads) ); -INSTANTIATE_TEST_CASE_P(smoke_layers_GPU, ExtractImagePatchesTest, +INSTANTIATE_TEST_SUITE_P(smoke_layers_GPU, ExtractImagePatchesTest, ::testing::Combine( ::testing::ValuesIn(inDataShape), ::testing::ValuesIn(kernels), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/fake_quantize.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/fake_quantize.cpp index ba1e5a6ca67..a5223cb641c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/fake_quantize.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/fake_quantize.cpp @@ -32,7 +32,7 @@ const auto fqParams = ::testing::Combine( ::testing::Values(inputParams) ); -INSTANTIATE_TEST_CASE_P(smoke_FakeQuantize, FakeQuantizeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_FakeQuantize, FakeQuantizeLayerTest, ::testing::Combine( fqParams, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather.cpp index 2d98eba92b5..6af03cf397d 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather.cpp @@ -126,28 +126,28 @@ const auto GatherAxes4i8b2 = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Gather7Axes4i4b1, Gather7LayerTest, GatherAxes4i4b1, Gather7LayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Gather7Axes4i4b2, Gather7LayerTest, GatherAxes4i4b1, Gather7LayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Gather7Axes4i8b1, Gather7LayerTest, GatherAxes4i8b1, Gather7LayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Gather7Axes4i8b2, Gather7LayerTest, GatherAxes4i8b2, @@ -232,7 +232,7 @@ const auto GatherAxes4 = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_GatherAxes4, GatherLayerTest, GatherAxes4, @@ -252,7 +252,7 @@ const auto Gather6dAxes4 = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Gather6dAxes4, GatherLayerTest, Gather6dAxes4, @@ -300,7 +300,7 @@ const auto GatherAxes3 = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_GatherAxes3, GatherLayerTest, GatherAxes3, @@ -320,7 +320,7 @@ const auto Gather6dAxes3 = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Gather6dAxes3, GatherLayerTest, Gather6dAxes3, @@ -369,7 +369,7 @@ const auto GatherAxes2 = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_GatherAxes2, GatherLayerTest, GatherAxes2, @@ -389,7 +389,7 @@ const auto Gather6dAxes2 = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Gather6dAxes2, GatherLayerTest, Gather6dAxes2, @@ -439,7 +439,7 @@ const auto GatherAxes1 = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_GatherAxes1, GatherLayerTest, GatherAxes1, @@ -459,7 +459,7 @@ const auto Gather6dAxes1 = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Gather6dAxes1, GatherLayerTest, Gather6dAxes1, @@ -510,7 +510,7 @@ const auto GatherAxes0 = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_GatherAxes0, GatherLayerTest, GatherAxes0, @@ -530,7 +530,7 @@ const auto Gather6dAxes0 = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Gather6dAxes0, GatherLayerTest, Gather6dAxes0, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather_nd.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather_nd.cpp index be599acaef4..83cd3619653 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather_nd.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather_nd.cpp @@ -33,7 +33,7 @@ const auto gatherNDArgsSubset1 = ::testing::Combine( ::testing::ValuesIn(std::vector({ 0, 1 })) // Batch dims ); -INSTANTIATE_TEST_CASE_P(smoke_GatherND_set1, GatherNDLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GatherND_set1, GatherNDLayerTest, ::testing::Combine( gatherNDArgsSubset1, ::testing::ValuesIn(inputPrecisions), @@ -51,7 +51,7 @@ const auto gatherNDArgsSubset2 = ::testing::Combine( ::testing::ValuesIn(std::vector({ 1, 2 })) // Batch dims ); -INSTANTIATE_TEST_CASE_P(smoke_GatherND_set2, GatherNDLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GatherND_set2, GatherNDLayerTest, ::testing::Combine( gatherNDArgsSubset2, ::testing::ValuesIn(inputPrecisions), @@ -69,7 +69,7 @@ const auto gatherNDArgsSubset3 = ::testing::Combine( ::testing::ValuesIn(std::vector({ 3, 4 })) // Batch dims ); -INSTANTIATE_TEST_CASE_P(smoke_GatherND_set3, GatherNDLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GatherND_set3, GatherNDLayerTest, ::testing::Combine( gatherNDArgsSubset3, ::testing::ValuesIn(inputPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather_tree.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather_tree.cpp index ee09b1fa36a..a1b5488a1b6 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather_tree.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gather_tree.cpp @@ -23,7 +23,7 @@ const std::vector secondaryInputTypes = { ngraph::helpers::InputLayerType::PARAMETER }; -INSTANTIATE_TEST_CASE_P(Basic_smoke, GatherTreeLayerTest, +INSTANTIATE_TEST_SUITE_P(Basic_smoke, GatherTreeLayerTest, ::testing::Combine( ::testing::ValuesIn(inputShapes), ::testing::ValuesIn(secondaryInputTypes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/grn.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/grn.cpp index 52c0ed6c59b..84dd2994e85 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/grn.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/grn.cpp @@ -27,7 +27,7 @@ namespace { ::testing::Values(0.33f, 1.1f), ::testing::Values(CommonTestUtils::DEVICE_GPU)); - INSTANTIATE_TEST_CASE_P(smoke_Grn_Basic, GrnLayerTest, + INSTANTIATE_TEST_SUITE_P(smoke_Grn_Basic, GrnLayerTest, basicCases, GrnLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/group_convolution.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/group_convolution.cpp index 75a28f94315..603433d1bfd 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/group_convolution.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/group_convolution.cpp @@ -45,7 +45,7 @@ const auto groupConv2DParams_AutoPadValid = ::testing::Combine( ::testing::Values(ngraph::op::PadType::VALID) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution2D_ExplicitPadding, GroupConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution2D_ExplicitPadding, GroupConvolutionLayerTest, ::testing::Combine( groupConv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -57,7 +57,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution2D_ExplicitPadding, GroupConvoluti ::testing::Values(CommonTestUtils::DEVICE_GPU)), GroupConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution2D_AutoPadValid, GroupConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution2D_AutoPadValid, GroupConvolutionLayerTest, ::testing::Combine( groupConv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -97,7 +97,7 @@ const auto groupConv3DParams_AutoPadValid = ::testing::Combine( ::testing::Values(ngraph::op::PadType::VALID) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution3D_ExplicitPadding, GroupConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution3D_ExplicitPadding, GroupConvolutionLayerTest, ::testing::Combine( groupConv3DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -109,7 +109,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution3D_ExplicitPadding, GroupConvoluti ::testing::Values(CommonTestUtils::DEVICE_GPU)), GroupConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvolution3D_AutoPadValid, GroupConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvolution3D_AutoPadValid, GroupConvolutionLayerTest, ::testing::Combine( groupConv3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp index 40e751e817a..5e4b6db1501 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/group_convolution_backprop_data.cpp @@ -48,7 +48,7 @@ const auto groupConvBackpropData2DParams_AutoPadValid = ::testing::Combine( ::testing::Values(ngraph::op::PadType::VALID) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_ExplicitPadding, GroupConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData2D_ExplicitPadding, GroupConvBackpropDataLayerTest, ::testing::Combine( groupConvBackpropData2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -60,7 +60,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_ExplicitPadding, GroupConv ::testing::Values(CommonTestUtils::DEVICE_GPU)), GroupConvBackpropDataLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData2D_AutoPadValid, GroupConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData2D_AutoPadValid, GroupConvBackpropDataLayerTest, ::testing::Combine( groupConvBackpropData2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -102,7 +102,7 @@ const auto groupConvBackpropData3DParams_AutoPadValid = ::testing::Combine( ::testing::Values(ngraph::op::PadType::VALID) ); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_ExplicitPadding, GroupConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData3D_ExplicitPadding, GroupConvBackpropDataLayerTest, ::testing::Combine( groupConvBackpropData3DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -114,7 +114,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_ExplicitPadding, GroupConv ::testing::Values(CommonTestUtils::DEVICE_GPU)), GroupConvBackpropDataLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GroupConvBackpropData3D_AutoPadValid, GroupConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GroupConvBackpropData3D_AutoPadValid, GroupConvBackpropDataLayerTest, ::testing::Combine( groupConvBackpropData3DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gru_cell.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gru_cell.cpp index 7224b098c9f..0188040bfbd 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gru_cell.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gru_cell.cpp @@ -21,7 +21,7 @@ namespace { std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; - INSTANTIATE_TEST_CASE_P(GRUCellCommon, GRUCellTest, + INSTANTIATE_TEST_SUITE_P(GRUCellCommon, GRUCellTest, ::testing::Combine( ::testing::ValuesIn(should_decompose), ::testing::ValuesIn(batch), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gru_sequence.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gru_sequence.cpp index d0033f4f473..7b613dadc91 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gru_sequence.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/gru_sequence.cpp @@ -34,7 +34,7 @@ namespace { std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; - INSTANTIATE_TEST_CASE_P(GRUSequenceCommonZeroClip, GRUSequenceTest, + INSTANTIATE_TEST_SUITE_P(GRUSequenceCommonZeroClip, GRUSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_zero_clip), @@ -49,7 +49,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_GPU)), GRUSequenceTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(GRUSequenceCommonClip, GRUSequenceTest, + INSTANTIATE_TEST_SUITE_P(GRUSequenceCommonClip, GRUSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_clip_non_zero), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/interpolate.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/interpolate.cpp index 0b210ebef2e..c26f168d628 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/interpolate.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/interpolate.cpp @@ -108,7 +108,7 @@ const auto interpolateCasesNearesMode = ::testing::Combine( ::testing::ValuesIn(defaultAxes), ::testing::ValuesIn(defaultScales)); -INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Basic, InterpolateLayerTest, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_Basic, InterpolateLayerTest, ::testing::Combine( interpolateCasesWithoutNearest, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -121,7 +121,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Basic, InterpolateLayerTest, ::testing ::testing::Values(additional_config)), InterpolateLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Interpolate_Nearest, InterpolateLayerTest, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_Nearest, InterpolateLayerTest, ::testing::Combine( interpolateCasesNearesMode, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/log_softmax.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/log_softmax.cpp index eb62a641280..b84f9736077 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/log_softmax.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/log_softmax.cpp @@ -37,7 +37,7 @@ const auto params2D = testing::Combine( testing::Values(std::map()) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LogSoftmax2D, LogSoftmaxLayerTest, params2D, @@ -66,7 +66,7 @@ const auto params4D = testing::Combine( testing::Values(std::map()) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_LogSoftmax4D, LogSoftmaxLayerTest, params4D, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/logical.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/logical.cpp index c8dd9db4c2e..588cebf8a39 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/logical.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/logical.cpp @@ -74,8 +74,8 @@ const auto LogicalTestParamsNot = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::Values(additional_config)); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefs, LogicalLayerTest, LogicalTestParams, LogicalLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefs, LogicalLayerTest, LogicalTestParams, LogicalLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_CompareWithRefsNot, LogicalLayerTest, LogicalTestParamsNot, LogicalLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CompareWithRefsNot, LogicalLayerTest, LogicalTestParamsNot, LogicalLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lrn.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lrn.cpp index b513e61a137..d9b7099399d 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lrn.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lrn.cpp @@ -21,7 +21,7 @@ const double beta = 2; const double bias = 1.0; const size_t size = 5; -INSTANTIATE_TEST_CASE_P(smoke_LrnCheck, LrnLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_LrnCheck, LrnLayerTest, ::testing::Combine(::testing::Values(alpha), ::testing::Values(beta), ::testing::Values(bias), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lstm_cell.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lstm_cell.cpp index b9267eb552d..855a0e43262 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lstm_cell.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lstm_cell.cpp @@ -23,7 +23,7 @@ std::vector clip{0.f, 0.7f}; std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; -INSTANTIATE_TEST_CASE_P(LSTMCellCommon, LSTMCellTest, +INSTANTIATE_TEST_SUITE_P(LSTMCellCommon, LSTMCellTest, ::testing::Combine( ::testing::ValuesIn(should_decompose), ::testing::ValuesIn(batch), @@ -35,7 +35,7 @@ INSTANTIATE_TEST_CASE_P(LSTMCellCommon, LSTMCellTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), LSTMCellTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_LSTMCellCommon, LSTMCellTest, +INSTANTIATE_TEST_SUITE_P(smoke_LSTMCellCommon, LSTMCellTest, ::testing::Combine( ::testing::ValuesIn(should_decompose), ::testing::ValuesIn(batch), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lstm_sequence.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lstm_sequence.cpp index d79cee69eea..604931349ec 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lstm_sequence.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/lstm_sequence.cpp @@ -36,7 +36,7 @@ std::vector direction = {ngraph::op::Rec std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; -INSTANTIATE_TEST_CASE_P(LSTMSequenceCommonZeroClip, LSTMSequenceTest, +INSTANTIATE_TEST_SUITE_P(LSTMSequenceCommonZeroClip, LSTMSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_zero_clip), @@ -50,7 +50,7 @@ INSTANTIATE_TEST_CASE_P(LSTMSequenceCommonZeroClip, LSTMSequenceTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), LSTMSequenceTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(LSTMSequenceCommonClip, LSTMSequenceTest, +INSTANTIATE_TEST_SUITE_P(LSTMSequenceCommonClip, LSTMSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_clip_non_zero), @@ -64,7 +64,7 @@ INSTANTIATE_TEST_CASE_P(LSTMSequenceCommonClip, LSTMSequenceTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), LSTMSequenceTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_LSTMSequenceCommonClip, LSTMSequenceTest, +INSTANTIATE_TEST_SUITE_P(smoke_LSTMSequenceCommonClip, LSTMSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_clip_non_zero), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/mat_mul.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/mat_mul.cpp index 88a05601e22..757bd2955b2 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/mat_mul.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/mat_mul.cpp @@ -26,7 +26,7 @@ std::vector secondaryInputTypes = { std::map additional_config = {}; -INSTANTIATE_TEST_CASE_P(smoke_MatMul, MatMulTest, +INSTANTIATE_TEST_SUITE_P(smoke_MatMul, MatMulTest, ::testing::Combine( ::testing::ValuesIn(shapeRelatedParams), ::testing::ValuesIn(inputPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/minimum_maximum.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/minimum_maximum.cpp index 8c1ba19aa05..e2af2e0d970 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/minimum_maximum.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/minimum_maximum.cpp @@ -35,7 +35,7 @@ const std::vector inputType = { ngraph::helpers::InputLayerType::PARAMETER, }; -INSTANTIATE_TEST_CASE_P(smoke_maximum, MaxMinLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_maximum, MaxMinLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes), ::testing::ValuesIn(opType), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/mvn.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/mvn.cpp index 97d1335c813..a4e83dc9873 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/mvn.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/mvn.cpp @@ -47,7 +47,7 @@ const auto MvnCases = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P(smoke_CLDNN_TestsMVN, MvnLayerTest, MvnCases, MvnLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CLDNN_TestsMVN, MvnLayerTest, MvnCases, MvnLayerTest::getTestCaseName); std::vector dataPrecisions = { InferenceEngine::Precision::FP32, @@ -68,7 +68,7 @@ const std::vector epsilonF = { 0.0001 }; -INSTANTIATE_TEST_CASE_P(smoke_MVN_5D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MVN_5D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{1, 10, 5, 7, 8}, {1, 3, 8, 9, 49}}), ::testing::ValuesIn(dataPrecisions), @@ -80,7 +80,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MVN_5D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MVN_4D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MVN_4D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{1, 10, 5, 17}, {1, 3, 8, 9}}), ::testing::ValuesIn(dataPrecisions), @@ -92,7 +92,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MVN_4D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MVN_3D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MVN_3D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{1, 32, 17}, {1, 37, 9}}), ::testing::ValuesIn(dataPrecisions), @@ -104,7 +104,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MVN_3D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MVN_2D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MVN_2D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{3, 5}, {2, 55}}), ::testing::ValuesIn(dataPrecisions), @@ -116,7 +116,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MVN_2D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Decomposition_1D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Decomposition_1D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{3}, {9}, {55}}), ::testing::ValuesIn(dataPrecisions), @@ -128,7 +128,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Decomposition_1D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Decomposition_3D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Decomposition_3D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{1, 32, 17}, {1, 37, 9}}), ::testing::ValuesIn(dataPrecisions), @@ -140,7 +140,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Decomposition_3D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Decomposition_4D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Decomposition_4D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{1, 16, 5, 8}, {2, 19, 5, 10}}), ::testing::ValuesIn(dataPrecisions), @@ -152,7 +152,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Decomposition_4D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Decomposition_6D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Decomposition_6D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(std::vector>{{1, 3, 5, 4, 2, 6}}), ::testing::ValuesIn(dataPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/non_max_suppression.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/non_max_suppression.cpp index 47abf07e3ce..c402ba66ec4 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/non_max_suppression.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/non_max_suppression.cpp @@ -39,4 +39,4 @@ const auto nmsParams = ::testing::Combine(::testing::ValuesIn(inShapeParams), ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P(smoke_NmsLayerTest, NmsLayerTest, nmsParams, NmsLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_NmsLayerTest, NmsLayerTest, nmsParams, NmsLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/normalize_l2.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/normalize_l2.cpp index 438e26ed039..6a3632f00f0 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/normalize_l2.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/normalize_l2.cpp @@ -34,7 +34,7 @@ const auto normL2params = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_NormalizeL2, NormalizeL2LayerTest, normL2params, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/pad.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/pad.cpp index 1d2d3ab6791..8e8a3f018aa 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/pad.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/pad.cpp @@ -36,7 +36,7 @@ const auto pad2DConstparams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Pad2DConst, PadLayerTest, pad2DConstparams, @@ -56,7 +56,7 @@ const auto pad2Dparams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Pad2D, PadLayerTest, pad2Dparams, @@ -79,7 +79,7 @@ const auto pad4DConstparams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Pad4DConst, PadLayerTest, pad4DConstparams, @@ -99,7 +99,7 @@ const auto pad4Dparams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Pad4D, PadLayerTest, pad4Dparams, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/pooling.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/pooling.cpp index ff326a2d0a4..bf4c365ae95 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/pooling.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/pooling.cpp @@ -40,7 +40,7 @@ const auto maxPool_ExplicitPad_FloorRounding_Params = ::testing::Combine( ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); -INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_FloorRpunding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MaxPool_ExplicitPad_FloorRpunding, PoolingLayerTest, ::testing::Combine( maxPool_ExplicitPad_FloorRounding_Params, ::testing::ValuesIn(netPrecisions), @@ -65,7 +65,7 @@ const auto maxPool_ExplicitPad_CeilRounding_Params = ::testing::Combine( ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); -INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_CeilRpunding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MaxPool_ExplicitPad_CeilRpunding, PoolingLayerTest, ::testing::Combine( maxPool_ExplicitPad_CeilRounding_Params, ::testing::ValuesIn(netPrecisions), @@ -92,7 +92,7 @@ const auto avgPoolExplicitPadCeilRoundingParams = ::testing::Combine( ::testing::Values(true, false) ); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_CeilRounding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_ExplicitPad_CeilRounding, PoolingLayerTest, ::testing::Combine( avgPoolExplicitPadCeilRoundingParams, ::testing::ValuesIn(netPrecisions), @@ -117,7 +117,7 @@ const auto avgPoolExplicitPadFloorRoundingParams = ::testing::Combine( ); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_FloorRounding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_ExplicitPad_FloorRounding, PoolingLayerTest, ::testing::Combine( avgPoolExplicitPadFloorRoundingParams, ::testing::ValuesIn(netPrecisions), @@ -143,7 +143,7 @@ const auto allPools_ValidPad_Params = ::testing::Combine( ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); -INSTANTIATE_TEST_CASE_P(smoke_MAX_and_AVGPool_ValidPad, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MAX_and_AVGPool_ValidPad, PoolingLayerTest, ::testing::Combine( allPools_ValidPad_Params, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/power.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/power.cpp index 288b641754e..f66634b7782 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/power.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/power.cpp @@ -34,7 +34,7 @@ namespace { InferenceEngine::Precision::FP16, }; - INSTANTIATE_TEST_CASE_P(smoke_power, PowerLayerTest, + INSTANTIATE_TEST_SUITE_P(smoke_power, PowerLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/prior_box_clustered.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/prior_box_clustered.cpp index 171b85bc774..108deb8d3f2 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/prior_box_clustered.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/prior_box_clustered.cpp @@ -56,7 +56,7 @@ const auto layerSpeficParams = ::testing::Combine( ::testing::ValuesIn(variances) ); -INSTANTIATE_TEST_CASE_P(smoke_PriorBoxClustered_Basic, PriorBoxClusteredLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_PriorBoxClustered_Basic, PriorBoxClusteredLayerTest, ::testing::Combine( layerSpeficParams, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/proposal.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/proposal.cpp index 7562964b5e8..4983c5a4b8f 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/proposal.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/proposal.cpp @@ -39,7 +39,7 @@ const auto proposalParams = ::testing::Combine( ::testing::ValuesIn(framework_) ); -INSTANTIATE_TEST_CASE_P(smoke_Proposal_tests, ProposalLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Proposal_tests, ProposalLayerTest, ::testing::Combine( proposalParams, ::testing::Values(CommonTestUtils::DEVICE_GPU)), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp index 041f1040403..0641408588c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reduce_ops.cpp @@ -169,56 +169,56 @@ const auto params_ReductionTypesLogical = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceOneAxis, ReduceOpsLayerTest, paramsOneAxis, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceLogicalOneAxis, ReduceOpsLayerTest, paramsOneAxisLogical, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Reduce_Precisions, ReduceOpsLayerTest, params_Precisions, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Reduce_InputShapes, ReduceOpsLayerTest, params_InputShapes, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Reduce_Axes, ReduceOpsLayerTest, params_Axes, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Reduce_ReductionTypes, ReduceOpsLayerTest, params_ReductionTypes, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_ReduceLogical_ReductionTypes, ReduceOpsLayerTest, params_ReductionTypesLogical, ReduceOpsLayerTest::getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Reduce, ReduceOpsLayerWithSpecificInputTest, testing::Combine( diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/region_yolo.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/region_yolo.cpp index 395210d020e..cbcba098db0 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/region_yolo.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/region_yolo.cpp @@ -80,6 +80,6 @@ const auto testCase_yolov2_caffe = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P(smoke_TestsRegionYolov3, RegionYoloLayerTest, testCase_yolov3, RegionYoloLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsRegionYoloMxnet, RegionYoloLayerTest, testCase_yolov3_mxnet, RegionYoloLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsRegionYoloCaffe, RegionYoloLayerTest, testCase_yolov2_caffe, RegionYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsRegionYolov3, RegionYoloLayerTest, testCase_yolov3, RegionYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsRegionYoloMxnet, RegionYoloLayerTest, testCase_yolov3_mxnet, RegionYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsRegionYoloCaffe, RegionYoloLayerTest, testCase_yolov2_caffe, RegionYoloLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reorg_yolo.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reorg_yolo.cpp index e0294010774..566e4f36169 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reorg_yolo.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reorg_yolo.cpp @@ -67,9 +67,9 @@ const auto testCase_batch_2 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P(smoke_TestsReorgYolo_caffe_YoloV2, ReorgYoloLayerTest, testCase_caffe_yolov2, ReorgYoloLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsReorgYolo_stride_2_smallest, ReorgYoloLayerTest, testCase_smallest, ReorgYoloLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsReorgYolo_stride_2, ReorgYoloLayerTest, testCase_stride_2, ReorgYoloLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsReorgYolo_stride_3, ReorgYoloLayerTest, testCase_stride_3, ReorgYoloLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsReorgYolo_smaller_h, ReorgYoloLayerTest, testCase_smaller_h, ReorgYoloLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsReorgYolo_batch_2, ReorgYoloLayerTest, testCase_batch_2, ReorgYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsReorgYolo_caffe_YoloV2, ReorgYoloLayerTest, testCase_caffe_yolov2, ReorgYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsReorgYolo_stride_2_smallest, ReorgYoloLayerTest, testCase_smallest, ReorgYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsReorgYolo_stride_2, ReorgYoloLayerTest, testCase_stride_2, ReorgYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsReorgYolo_stride_3, ReorgYoloLayerTest, testCase_stride_3, ReorgYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsReorgYolo_smaller_h, ReorgYoloLayerTest, testCase_smaller_h, ReorgYoloLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsReorgYolo_batch_2, ReorgYoloLayerTest, testCase_batch_2, ReorgYoloLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reshape.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reshape.cpp index 84d30807341..831c4a4d7e5 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reshape.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reshape.cpp @@ -16,7 +16,7 @@ const std::vector netPrecisions = { }; //TODO: Issue : - 28981 -INSTANTIATE_TEST_CASE_P(DISABLE_smoke_ReshapeCheckDynBatch, ReshapeLayerTestRevise, +INSTANTIATE_TEST_SUITE_P(DISABLE_smoke_ReshapeCheckDynBatch, ReshapeLayerTestRevise, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), @@ -30,7 +30,7 @@ INSTANTIATE_TEST_CASE_P(DISABLE_smoke_ReshapeCheckDynBatch, ReshapeLayerTestRevi ::testing::Values(std::map({{CONFIG_KEY(DYN_BATCH_ENABLED), CONFIG_VALUE(YES)}}))), ReshapeLayerTestRevise::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheck, ReshapeLayerTestRevise, +INSTANTIATE_TEST_SUITE_P(smoke_ReshapeCheck, ReshapeLayerTestRevise, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), @@ -44,7 +44,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheck, ReshapeLayerTestRevise, ::testing::Values(std::map({}))), ReshapeLayerTestRevise::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ReshapeCheckNegative, ReshapeLayerTestRevise, +INSTANTIATE_TEST_SUITE_P(smoke_ReshapeCheckNegative, ReshapeLayerTestRevise, ::testing::Combine( ::testing::Values(true), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reverse_sequence.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reverse_sequence.cpp index aa4054030a6..fb3d9786c83 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reverse_sequence.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/reverse_sequence.cpp @@ -33,7 +33,7 @@ const std::vector secondaryInputTypes = { ngraph::helpers::InputLayerType::PARAMETER }; -INSTANTIATE_TEST_CASE_P(Basic_smoke, ReverseSequenceLayerTest, +INSTANTIATE_TEST_SUITE_P(Basic_smoke, ReverseSequenceLayerTest, ::testing::Combine( ::testing::ValuesIn(batchAxisIndices), ::testing::ValuesIn(seqAxisIndices), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/rnn_cell.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/rnn_cell.cpp index b353a97e318..9d0f3a58f3c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/rnn_cell.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/rnn_cell.cpp @@ -19,7 +19,7 @@ namespace { std::vector netPrecisions = {InferenceEngine::Precision::FP32, InferenceEngine::Precision::FP16}; - INSTANTIATE_TEST_CASE_P(RNNCellCommon, RNNCellTest, + INSTANTIATE_TEST_SUITE_P(RNNCellCommon, RNNCellTest, ::testing::Combine( ::testing::ValuesIn(should_decompose), ::testing::ValuesIn(batch), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/rnn_sequence.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/rnn_sequence.cpp index 718c1b6e771..ba5f3fa50ac 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/rnn_sequence.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/rnn_sequence.cpp @@ -31,7 +31,7 @@ std::vector direction = {ngraph::op::Rec }; std::vector netPrecisions = {InferenceEngine::Precision::FP32}; -INSTANTIATE_TEST_CASE_P(RNNSequenceCommonZeroClip, RNNSequenceTest, +INSTANTIATE_TEST_SUITE_P(RNNSequenceCommonZeroClip, RNNSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_zero_clip), @@ -45,7 +45,7 @@ INSTANTIATE_TEST_CASE_P(RNNSequenceCommonZeroClip, RNNSequenceTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), RNNSequenceTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(RNNSequenceCommonClip, RNNSequenceTest, +INSTANTIATE_TEST_SUITE_P(RNNSequenceCommonClip, RNNSequenceTest, ::testing::Combine( ::testing::ValuesIn(mode), ::testing::ValuesIn(seq_lengths_clip_non_zero), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/scatter_elements_update.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/scatter_elements_update.cpp index 325ace5c88a..ffa19fcc4fc 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/scatter_elements_update.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/scatter_elements_update.cpp @@ -43,6 +43,6 @@ const auto ScatterEltUpdateCases = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P(smoke_ScatterEltsUpdate, ScatterElementsUpdateLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ScatterEltsUpdate, ScatterElementsUpdateLayerTest, ScatterEltUpdateCases, ScatterElementsUpdateLayerTest::getTestCaseName); } // namespace \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/scatter_nd_update.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/scatter_nd_update.cpp index 39767aaa50c..70800dd664c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/scatter_nd_update.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/scatter_nd_update.cpp @@ -49,5 +49,5 @@ const auto ScatterNDUpdateCases = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P(smoke_ScatterNDUpdate, ScatterNDUpdateLayerTest, ScatterNDUpdateCases, ScatterNDUpdateLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_ScatterNDUpdate, ScatterNDUpdateLayerTest, ScatterNDUpdateCases, ScatterNDUpdateLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/scatter_update.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/scatter_update.cpp index 6f48dd1be42..ed4250538d9 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/scatter_update.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/scatter_update.cpp @@ -42,6 +42,6 @@ const auto ScatterUpdateCase = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P(smoke_ScatterUpdate, ScatterUpdateLayerTest, ScatterUpdateCase, ScatterUpdateLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_ScatterUpdate, ScatterUpdateLayerTest, ScatterUpdateCase, ScatterUpdateLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/select.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/select.cpp index f9a3e9b8c3a..dd0f75e78ba 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/select.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/select.cpp @@ -63,6 +63,6 @@ const auto numpyCases = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P(smoke_CLDNN_TestsSelect_none, SelectLayerTest, noneCases, SelectLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CLDNN_TestsSelect_none, SelectLayerTest, noneCases, SelectLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_CLDNN_TestsSelect_numpy, SelectLayerTest, numpyCases, SelectLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_CLDNN_TestsSelect_numpy, SelectLayerTest, numpyCases, SelectLayerTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp index 0eb593e16f4..74821cf0cc4 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/shuffle_channels.cpp @@ -34,10 +34,10 @@ const auto testCases = ::testing::Combine(::testing::ValuesIn(shuffleParameters) ::testing::Values(CommonTestUtils::DEVICE_GPU)); -INSTANTIATE_TEST_CASE_P(smoke_GPU_ShuffleChannels, ShuffleChannelsLayerTest, testCases, ShuffleChannelsLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_GPU_ShuffleChannels, ShuffleChannelsLayerTest, testCases, ShuffleChannelsLayerTest::getTestCaseName); // ND support tests -INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels3D, ShuffleChannelsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ShuffleChannels3D, ShuffleChannelsLayerTest, ::testing::Combine( ::testing::Values(std::tuple(1, 3)), ::testing::ValuesIn(netPrecisions), @@ -49,7 +49,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels3D, ShuffleChannelsLayerTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), ShuffleChannelsLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels2D, ShuffleChannelsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ShuffleChannels2D, ShuffleChannelsLayerTest, ::testing::Combine( ::testing::Values(std::tuple(1, 3)), ::testing::ValuesIn(netPrecisions), @@ -61,7 +61,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels2D, ShuffleChannelsLayerTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), ShuffleChannelsLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ShuffleChannels1D, ShuffleChannelsLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ShuffleChannels1D, ShuffleChannelsLayerTest, ::testing::Combine( ::testing::Values(std::tuple(0, 3)), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/softmax.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/softmax.cpp index 98727447a88..ad797508c6f 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/softmax.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/softmax.cpp @@ -41,7 +41,7 @@ const auto params2D = testing::Combine( testing::Values(std::map()) ); -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()) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_SoftMax4D, SoftMaxLayerTest, params4D, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp index 149908a1d7d..2da3b2bb729 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/space_to_batch.cpp @@ -119,6 +119,6 @@ spaceToBatchParamsTuple stb_only_test_cases[] = { CommonTestUtils::DEVICE_GPU), }; -INSTANTIATE_TEST_CASE_P(smoke_CLDNN, SpaceToBatchLayerTest, ::testing::ValuesIn(stb_only_test_cases), +INSTANTIATE_TEST_SUITE_P(smoke_CLDNN, SpaceToBatchLayerTest, ::testing::ValuesIn(stb_only_test_cases), SpaceToBatchLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/space_to_depth.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/space_to_depth.cpp index 4ad127c4d4c..e40127f312e 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/space_to_depth.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/space_to_depth.cpp @@ -34,7 +34,7 @@ const auto SpaceToDepthBS2 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P(SpaceToDepthBS2, SpaceToDepthLayerTest, SpaceToDepthBS2, SpaceToDepthLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(SpaceToDepthBS2, SpaceToDepthLayerTest, SpaceToDepthBS2, SpaceToDepthLayerTest::getTestCaseName); const std::vector> inputShapesBS3 = { {1, 1, 3, 3}, {1, 1, 6, 6}, {1, 1, 9, 9}, {2, 4, 9, 9}, {2, 3, 15, 12}, @@ -48,6 +48,6 @@ const auto SpaceToDepthBS3 = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P(SpaceToDepthBS3, SpaceToDepthLayerTest, SpaceToDepthBS3, SpaceToDepthLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(SpaceToDepthBS3, SpaceToDepthLayerTest, SpaceToDepthBS3, SpaceToDepthLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/split.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/split.cpp index c7fb37ec748..a456325ad7e 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/split.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/split.cpp @@ -17,7 +17,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::I64 }; -INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, SplitLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_NumSplitsCheck, SplitLayerTest, ::testing::Combine( ::testing::Values(1), ::testing::Values(0, 1, 2, 3), @@ -31,7 +31,7 @@ INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, SplitLayerTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), SplitLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_splitWithUnusedOutputsTest, SplitLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_splitWithUnusedOutputsTest, SplitLayerTest, ::testing::Combine( ::testing::Values(5), ::testing::Values(0), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp index ca5b6ece34a..895439d7d54 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/squeeze_unsqueeze.cpp @@ -38,7 +38,7 @@ const std::vector opTypes = { ngraph::helpers::SqueezeOpType::UNSQUEEZE }; -INSTANTIATE_TEST_CASE_P(smoke_Basic, SqueezeUnsqueezeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Basic, SqueezeUnsqueezeLayerTest, ::testing::Combine( ::testing::ValuesIn(CommonTestUtils::combineParams(axesVectors)), ::testing::ValuesIn(opTypes), @@ -50,7 +50,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Basic, SqueezeUnsqueezeLayerTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), SqueezeUnsqueezeLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Basic_emptyAxes, SqueezeUnsqueezeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Basic_emptyAxes, SqueezeUnsqueezeLayerTest, ::testing::Combine( ::testing::ValuesIn(CommonTestUtils::combineParams(emptyAxesVectors)), ::testing::Values(ngraph::helpers::SqueezeOpType::SQUEEZE), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/strided_slice.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/strided_slice.cpp index 7fb8dd1d8c6..1b4447a75da 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/strided_slice.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/strided_slice.cpp @@ -69,7 +69,7 @@ std::vector ss_only_test_cases_i64 = { {0, 0, 0, 0}, {0, 0, 0, 0}, {}, {}, {} }, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_CLDNN_FP32, StridedSliceLayerTest, ::testing::Combine( ::testing::ValuesIn(ss_only_test_cases_fp32), @@ -82,7 +82,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::Values(std::map())), StridedSliceLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_CLDNN_I64, StridedSliceLayerTest, ::testing::Combine( ::testing::ValuesIn(ss_only_test_cases_i64), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/tile.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/tile.cpp index 9ddeabf4789..8758fc208e8 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/tile.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/tile.cpp @@ -21,7 +21,7 @@ const std::vector> repeats = { {2, 2, 2}, }; -INSTANTIATE_TEST_CASE_P(smoke_Tile, TileLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Tile, TileLayerTest, ::testing::Combine( ::testing::ValuesIn(repeats), ::testing::ValuesIn(netPrecisions), @@ -33,7 +33,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Tile, TileLayerTest, ::testing::Values(CommonTestUtils::DEVICE_GPU)), TileLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Tile6d, TileLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Tile6d, TileLayerTest, ::testing::Combine( ::testing::Values(std::vector({1, 1, 1, 2, 1, 2})), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/topk.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/topk.cpp index 2ac2c1a2373..b34287c5bab 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/topk.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/topk.cpp @@ -38,7 +38,7 @@ const std::vector sortTypes = { }; -INSTANTIATE_TEST_CASE_P(smoke_TopK, TopKLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_TopK, TopKLayerTest, ::testing::Combine( ::testing::ValuesIn(k), ::testing::ValuesIn(axes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/transpose.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/transpose.cpp index 265b742e6f2..2fc92324ef5 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/transpose.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/transpose.cpp @@ -46,7 +46,7 @@ const auto params = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Transpose, TransposeLayerTest, params, @@ -82,7 +82,7 @@ const auto params5D = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Transpose_5D, TransposeLayerTest, params5D, @@ -118,7 +118,7 @@ const auto params6D = testing::Combine( testing::Values(CommonTestUtils::DEVICE_GPU) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Transpose_6D, TransposeLayerTest, params6D, diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/variadic_split.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/variadic_split.cpp index b5e91b031e7..d6fc5e6f830 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/variadic_split.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/single_layer_tests/variadic_split.cpp @@ -25,7 +25,7 @@ namespace { {4, 11, 6, 9} }; - INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, VariadicSplitLayerTest, + INSTANTIATE_TEST_SUITE_P(smoke_NumSplitsCheck, VariadicSplitLayerTest, ::testing::Combine( ::testing::ValuesIn(numSplits), ::testing::Values(0, 1, 2, 3), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/constant_result.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/constant_result.cpp index bf4ca2f1352..35c31e30577 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/constant_result.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/constant_result.cpp @@ -34,7 +34,7 @@ const std::vector precisions = { Precision::BOOL }; -INSTANTIATE_TEST_CASE_P(smoke_Check, ConstantResultSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_Check, ConstantResultSubgraphTest, ::testing::Combine( ::testing::ValuesIn(types), ::testing::ValuesIn(shapes), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/get_output_before_activation.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/get_output_before_activation.cpp index 7c4be794741..98027ac7bb6 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/get_output_before_activation.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/get_output_before_activation.cpp @@ -23,7 +23,7 @@ namespace { std::map additional_config = {}; } // namespace -INSTANTIATE_TEST_CASE_P(OutputBeforeActivation, OutputBeforeActivation, +INSTANTIATE_TEST_SUITE_P(OutputBeforeActivation, OutputBeforeActivation, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_GPU), ::testing::Values(InferenceEngine::Precision::FP32), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp index 9afd80f0af9..eb6d89436b7 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/matmul_squeeze_add.cpp @@ -36,7 +36,7 @@ std::vector output_sizes = { 8 }; -INSTANTIATE_TEST_CASE_P(MatmulSqueezeAdd, MatmulSqueezeAddTest, +INSTANTIATE_TEST_SUITE_P(MatmulSqueezeAdd, MatmulSqueezeAddTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/multiply_add.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/multiply_add.cpp index 642cb25d4cf..7dae838e78d 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/multiply_add.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/multiply_add.cpp @@ -23,7 +23,7 @@ const std::vector> inputShapes = { {1, 3, 2, 2, 4, 5}, }; -INSTANTIATE_TEST_CASE_P(smoke_MultipleAdd_Nd, MultiplyAddLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MultipleAdd_Nd, MultiplyAddLayerTest, ::testing::Combine( ::testing::ValuesIn(inputShapes), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/parameter_result.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/parameter_result.cpp index 2819577a771..9b3de7ad2b7 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/parameter_result.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/parameter_result.cpp @@ -10,7 +10,7 @@ using namespace SubgraphTestsDefinitions; namespace { - INSTANTIATE_TEST_CASE_P(smoke_Check, ParameterResultSubgraphTest, + INSTANTIATE_TEST_SUITE_P(smoke_Check, ParameterResultSubgraphTest, ::testing::Values(CommonTestUtils::DEVICE_GPU), ParameterResultSubgraphTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp index 88da94c4ddb..6f757c2bfda 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/perm_conv_perm_concat.cpp @@ -31,7 +31,7 @@ std::map additional_config = { } // namespace namespace SubgraphTestsDefinitions { - INSTANTIATE_TEST_CASE_P(smoke_basic, PermConvPermConcat, + INSTANTIATE_TEST_SUITE_P(smoke_basic, PermConvPermConcat, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp index 48f6635bdae..5f13a31053d 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/quantized_convolution_backprop_data.cpp @@ -41,7 +41,7 @@ const auto quantConvBackpropData2DParams = ::testing::Combine( ::testing::ValuesIn(granularity) ); -INSTANTIATE_TEST_CASE_P(smoke_QuantConvBackpropData2D, QuantConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_QuantConvBackpropData2D, QuantConvBackpropDataLayerTest, ::testing::Combine( quantConvBackpropData2DParams, ::testing::ValuesIn(netPrecisions), @@ -69,7 +69,7 @@ const auto quantConvBackpropData3DParams = ::testing::Combine( ::testing::ValuesIn(granularity) ); -INSTANTIATE_TEST_CASE_P(smoke_QuantConvBackpropData3D, QuantConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_QuantConvBackpropData3D, QuantConvBackpropDataLayerTest, ::testing::Combine( quantConvBackpropData3DParams, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp index b310104ff97..f965da23574 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/quantized_group_convolution_backprop_data.cpp @@ -43,7 +43,7 @@ const auto quantGroupConvBackpropData2DParams = ::testing::Combine( ::testing::ValuesIn(granularity) ); -INSTANTIATE_TEST_CASE_P(smoke_QuantGroupConvBackpropData2D, QuantGroupConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_QuantGroupConvBackpropData2D, QuantGroupConvBackpropDataLayerTest, ::testing::Combine( quantGroupConvBackpropData2DParams, ::testing::ValuesIn(netPrecisions), @@ -72,7 +72,7 @@ const auto quantGroupConvBackpropData3DParams = ::testing::Combine( ::testing::ValuesIn(granularity) ); -INSTANTIATE_TEST_CASE_P(smoke_QuantGroupConvBackpropData3D, QuantGroupConvBackpropDataLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_QuantGroupConvBackpropData3D, QuantGroupConvBackpropDataLayerTest, ::testing::Combine( quantGroupConvBackpropData3DParams, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reduce_eltwise.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reduce_eltwise.cpp index 04dbc6e8005..62a6097184e 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reduce_eltwise.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reduce_eltwise.cpp @@ -14,7 +14,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::FP32, }; -INSTANTIATE_TEST_CASE_P(smoke_ReduceEltwise6D, ReduceEltwiseTest, +INSTANTIATE_TEST_SUITE_P(smoke_ReduceEltwise6D, ReduceEltwiseTest, testing::Combine( testing::Values(std::vector{2, 3, 4, 5, 6, 7}), testing::Values(std::vector{2, 3, 4}), @@ -24,7 +24,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ReduceEltwise6D, ReduceEltwiseTest, testing::Values(CommonTestUtils::DEVICE_GPU)), ReduceEltwiseTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ReduceEltwise5D, ReduceEltwiseTest, +INSTANTIATE_TEST_SUITE_P(smoke_ReduceEltwise5D, ReduceEltwiseTest, testing::Combine( testing::Values(std::vector{2, 3, 4, 5, 6}), testing::Values(std::vector{2, 3}), @@ -34,7 +34,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ReduceEltwise5D, ReduceEltwiseTest, testing::Values(CommonTestUtils::DEVICE_GPU)), ReduceEltwiseTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ReduceEltwise4D, ReduceEltwiseTest, +INSTANTIATE_TEST_SUITE_P(smoke_ReduceEltwise4D, ReduceEltwiseTest, testing::Combine( testing::Values(std::vector{2, 3, 4, 5}), testing::Values(std::vector{2}), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp index 05fcaf36ecd..88ac469ef1c 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_permute_conv_permute_reshape_act.cpp @@ -32,7 +32,7 @@ std::vector netPrecisions = { std::map additional_config = {}; namespace SubgraphTestsDefinitions { - INSTANTIATE_TEST_CASE_P(smoke_basic, ConvReshapeAct, + INSTANTIATE_TEST_SUITE_P(smoke_basic, ConvReshapeAct, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_GPU), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp index 75d90a5fa29..dbf28170fdd 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp @@ -39,7 +39,7 @@ namespace { ngraph::helpers::SqueezeOpType::UNSQUEEZE }; - INSTANTIATE_TEST_CASE_P(smoke_reshape_squeeze_reshape_relu, ReshapeSqueezeReshapeRelu, + INSTANTIATE_TEST_SUITE_P(smoke_reshape_squeeze_reshape_relu, ReshapeSqueezeReshapeRelu, ::testing::Combine( ::testing::ValuesIn(inputs_squeeze), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/scale_shift.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/scale_shift.cpp index 928a9f19df6..5c1de701dee 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/scale_shift.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/scale_shift.cpp @@ -47,7 +47,7 @@ std::vector netPrecisions = {InferenceEngine::Precis } // namespace -INSTANTIATE_TEST_CASE_P(smoke_ScaleShift, ScaleShiftLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_ScaleShift, ScaleShiftLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp index 40364a93cd2..adafa4adbee 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/split_conv_concat.cpp @@ -15,7 +15,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::FP16 }; -INSTANTIATE_TEST_CASE_P(smoke_NoReshape, SplitConvConcat, +INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, SplitConvConcat, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(std::vector({1, 6, 40, 40})), diff --git a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/tensor_names.cpp b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/tensor_names.cpp index a1f5fc59981..40596655428 100644 --- a/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/tensor_names.cpp +++ b/inference-engine/tests/functional/plugin/gpu/shared_tests_instances/subgraph_tests/tensor_names.cpp @@ -10,7 +10,7 @@ using namespace SubgraphTestsDefinitions; namespace { - INSTANTIATE_TEST_CASE_P(smoke_Check, TensorNamesTest, + INSTANTIATE_TEST_SUITE_P(smoke_Check, TensorNamesTest, ::testing::Values(CommonTestUtils::DEVICE_GPU), TensorNamesTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/gpu/single_layer_tests/tensor_iterator.cpp b/inference-engine/tests/functional/plugin/gpu/single_layer_tests/tensor_iterator.cpp index bce1ef10691..f35942099c9 100644 --- a/inference-engine/tests/functional/plugin/gpu/single_layer_tests/tensor_iterator.cpp +++ b/inference-engine/tests/functional/plugin/gpu/single_layer_tests/tensor_iterator.cpp @@ -268,7 +268,7 @@ TEST_P(TensorIteratorWithConfigTest, CompareWithRefs) { using namespace LayerTestsDefinitions; namespace { - INSTANTIATE_TEST_CASE_P(smoke_TensorIteratorCommon, TensorIteratorWithConfigTest, + INSTANTIATE_TEST_SUITE_P(smoke_TensorIteratorCommon, TensorIteratorWithConfigTest, ::testing::Combine( ::testing::ValuesIn(std::vector {2, 4}), // seq lengths ::testing::ValuesIn(std::vector {1}), // only single batch supported diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/operations/dynamic_shape_resolver.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/operations/dynamic_shape_resolver.cpp index e3b5e4c137c..650d39238e0 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/operations/dynamic_shape_resolver.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/operations/dynamic_shape_resolver.cpp @@ -87,7 +87,7 @@ std::set allNGraphStaticTypes() { return staticTypes; } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicShapeResolverTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicShapeResolverTests, testing::Combine( testing::ValuesIn(allNGraphStaticTypes()), testing::Values(DataShape{1, 800}, DataShape{1, 1}))); @@ -119,7 +119,7 @@ TEST_P(DynamicShapeResolverNegativeTestsDataType, ThrowsOnInvalidDimsType) { ASSERT_THROW(auto dynamicShapeResolver = std::make_shared(data, dims), ngraph::ngraph_error); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicShapeResolverNegativeTestsDataType, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicShapeResolverNegativeTestsDataType, testing::Combine( testing::Values(ngraph::element::dynamic), testing::Values(ngraph::element::i64), testing::Values(DataPartialShape{1, 800}), @@ -139,7 +139,7 @@ std::set allNGraphNotIntegralTypes() { return notIntegralTypes; } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicShapeResolverNegativeTestsDimsType, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicShapeResolverNegativeTestsDimsType, testing::Combine( testing::ValuesIn(allNGraphStaticTypes()), testing::ValuesIn(allNGraphNotIntegralTypes()), testing::Values(DataPartialShape{1, 800}), @@ -150,7 +150,7 @@ TEST_P(DynamicShapeResolverNegativeTestsDataShape, ThrowsOnInvalidDimsType) { ASSERT_THROW(auto dynamicShapeResolver = std::make_shared(data, dims), ngraph::ngraph_error); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicShapeResolverNegativeTestsDataShape, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicShapeResolverNegativeTestsDataShape, testing::Combine( testing::ValuesIn(allNGraphStaticTypes()), testing::Values(ngraph::element::i64), testing::Values( @@ -165,7 +165,7 @@ TEST_P(DynamicShapeResolverNegativeTestsDimsShape, ThrowsOnInvalidDimsType) { ASSERT_THROW(auto dynamicShapeResolver = std::make_shared(data, dims), ngraph::ngraph_error); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicShapeResolverNegativeTestsDimsShape, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicShapeResolverNegativeTestsDimsShape, testing::Combine( testing::ValuesIn(allNGraphTypes()), testing::Values(ngraph::element::i64), testing::Values(DataShape{1, 800}), @@ -275,7 +275,7 @@ const auto basicCases = ::testing::Combine( ); -INSTANTIATE_TEST_CASE_P(smoke_DynamicShapeResolverPluginTests, DynamicShapeResolverPluginTests, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicShapeResolverPluginTests, DynamicShapeResolverPluginTests, ::testing::Combine( ::testing::ValuesIn(inputDatas), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/operations/out_shape_of_reshape.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/operations/out_shape_of_reshape.cpp index fd5687af017..9128463dd6d 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/operations/out_shape_of_reshape.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/operations/out_shape_of_reshape.cpp @@ -98,7 +98,7 @@ TEST_P(OutShapeOfReshapeTests, CanValidateAndInferTypes) { ngraph::ParameterVector{m_inDataShapeParam, m_outShapeDescriptorParam})); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, OutShapeOfReshapeTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, OutShapeOfReshapeTests, testing::Combine( testing::ValuesIn(tensorShapes), testing::ValuesIn(allNGraphIntegralNumberTypes()), testing::ValuesIn(tensorShapes), @@ -125,7 +125,7 @@ TEST_P(OutShapeOfReshapeTestsNegativeDataType, ThrowsOnInvalidDataType) { m_inDataShapeParam, m_outShapeDescriptorParam, true), ngraph::NodeValidationFailure); } -INSTANTIATE_TEST_CASE_P(smoke_InvalidInDataShapeTensorType, OutShapeOfReshapeTestsNegativeDataType, +INSTANTIATE_TEST_SUITE_P(smoke_InvalidInDataShapeTensorType, OutShapeOfReshapeTestsNegativeDataType, testing::Combine( testing::Values(TensorShape{4}), testing::ValuesIn(allNGraphNotIntegralTypes()), @@ -133,7 +133,7 @@ INSTANTIATE_TEST_CASE_P(smoke_InvalidInDataShapeTensorType, OutShapeOfReshapeTes testing::Values(ngraph::element::i64)) ); -INSTANTIATE_TEST_CASE_P(smoke_InvalidOutShapeDescriptorTensorType, OutShapeOfReshapeTestsNegativeDataType, +INSTANTIATE_TEST_SUITE_P(smoke_InvalidOutShapeDescriptorTensorType, OutShapeOfReshapeTestsNegativeDataType, testing::Combine( testing::Values(TensorShape{4}), testing::Values(ngraph::element::i64), @@ -155,7 +155,7 @@ TEST_P(OutShapeOfReshapeTestsNegativeDataShape, ThrowsOnInvalidDataShape) { ngraph::NodeValidationFailure); } -INSTANTIATE_TEST_CASE_P(smoke_InvalidInDataShapeTensorShape, OutShapeOfReshapeTestsNegativeDataShape, +INSTANTIATE_TEST_SUITE_P(smoke_InvalidInDataShapeTensorShape, OutShapeOfReshapeTestsNegativeDataShape, testing::Combine( testing::ValuesIn(invalidTensorShapes), testing::Values(ngraph::element::i64), @@ -163,7 +163,7 @@ INSTANTIATE_TEST_CASE_P(smoke_InvalidInDataShapeTensorShape, OutShapeOfReshapeTe testing::Values(ngraph::element::i64)) ); -INSTANTIATE_TEST_CASE_P(smoke_InvalidOutShapeDescriptorTensorShape, OutShapeOfReshapeTestsNegativeDataShape, +INSTANTIATE_TEST_SUITE_P(smoke_InvalidOutShapeDescriptorTensorShape, OutShapeOfReshapeTestsNegativeDataShape, testing::Combine( testing::ValuesIn(tensorShapes), testing::Values(ngraph::element::i64), diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/operations/static_shape_broadcast.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/operations/static_shape_broadcast.cpp index 79371a30a42..79bc42c66e6 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/operations/static_shape_broadcast.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/operations/static_shape_broadcast.cpp @@ -151,7 +151,7 @@ TEST_P(StaticShapeBroadcastNumpyTests, CanValidateAndInferTypes) { ASSERT_EQ(m_tensorWithTargetShape->get_shape(), op->output(0).get_shape()); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, StaticShapeBroadcastNumpyTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, StaticShapeBroadcastNumpyTests, testing::Combine( testing::ValuesIn(testNGraphNumericTypes), testing::ValuesIn(testNumpyStaticShapes)) ); @@ -167,7 +167,7 @@ TEST_P(StaticShapeBroadcastExplicitTests, CanValidateAndInferTypes) { ASSERT_EQ(m_tensorWithTargetShape->get_shape(), op->get_output_shape(0)); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, StaticShapeBroadcastExplicitTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, StaticShapeBroadcastExplicitTests, testing::Combine( testing::ValuesIn(testNGraphNumericTypes), testing::ValuesIn(testExplicitStaticShapes)) ); @@ -183,7 +183,7 @@ TEST_P(StaticShapeBroadcastBidirectionalTests, CanValidateAndInferTypes) { ASSERT_EQ(m_tensorWithOutput->get_shape(), op->output(0).get_shape()); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, StaticShapeBroadcastBidirectionalTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, StaticShapeBroadcastBidirectionalTests, testing::Combine( testing::ValuesIn(testNGraphNumericTypes), testing::ValuesIn(testBidirectionalStaticShapes)) ); @@ -204,7 +204,7 @@ TEST_P(StaticShapeBroadcastNumpyTestsNegativeNumInputs, ThrowsOnInvalidNumInputs ngraph::NodeValidationFailure); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, StaticShapeBroadcastNumpyTestsNegativeNumInputs, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, StaticShapeBroadcastNumpyTestsNegativeNumInputs, testing::Combine( testing::Values(ngraph::element::f16), testing::Values(testNumpyStaticShapes[0])) ); @@ -218,7 +218,7 @@ TEST_P(StaticShapeBroadcastExplicitTestsNegativeNumInputs, ThrowsOnInvalidNumInp ngraph::NodeValidationFailure); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, StaticShapeBroadcastExplicitTestsNegativeNumInputs, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, StaticShapeBroadcastExplicitTestsNegativeNumInputs, testing::Combine( testing::Values(ngraph::element::f16), testing::Values(testExplicitStaticShapes[0])) ); @@ -235,7 +235,7 @@ TEST_P(StaticShapeBroadcastBidirectionalTestsNegativeNumInputs, ThrowsOnInvalidN } using StaticShapeBroadcastTestsNegativeMode = StaticShapeBroadcastNumpyTests; -INSTANTIATE_TEST_CASE_P(smoke_NGraph, StaticShapeBroadcastTestsNegativeMode, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, StaticShapeBroadcastTestsNegativeMode, testing::Combine( testing::Values(ngraph::element::f16), testing::Values(testNumpyStaticShapes[0])) ); @@ -249,7 +249,7 @@ TEST_P(StaticShapeBroadcastTestsNegativeEvaluate, ThrowsOnInvalidMode) { m_tensor, targetShape), ngraph::NodeValidationFailure); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, StaticShapeBroadcastTestsNegativeEvaluate, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, StaticShapeBroadcastTestsNegativeEvaluate, testing::Combine( testing::Values(ngraph::element::f16), testing::Values(testNumpyStaticShapes[0])) ); diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/operations/static_shape_nonzero.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/operations/static_shape_nonzero.cpp index 245bee742a3..80a9d9b64f6 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/operations/static_shape_nonzero.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/operations/static_shape_nonzero.cpp @@ -88,7 +88,7 @@ TEST_P(StaticShapeNonZeroTests, CanValidateAndInferTypes) { ngraph::ParameterVector{m_param})); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, StaticShapeNonZeroTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, StaticShapeNonZeroTests, testing::Combine( testing::ValuesIn(testNGraphNumericTypes), testing::ValuesIn(testStaticShapes), testing::ValuesIn(outputTypes)) @@ -105,7 +105,7 @@ TEST_P(StaticShapeNonZeroTestsNegativeInputDataType, ThrowsOnInvalidInputType) { ngraph::NodeValidationFailure); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, StaticShapeNonZeroTestsNegativeInputDataType, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, StaticShapeNonZeroTestsNegativeInputDataType, testing::Combine( testing::Values(ngraph::element::dynamic), testing::ValuesIn(testStaticShapes), testing::ValuesIn(outputTypes)) @@ -118,7 +118,7 @@ TEST_P(StaticShapeNonZeroTestsNegativeDataShape, ThrowsOnInvalidDataShape) { ngraph::NodeValidationFailure); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, StaticShapeNonZeroTestsNegativeDataShape, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, StaticShapeNonZeroTestsNegativeDataShape, testing::Combine( testing::ValuesIn(testNGraphNumericTypes), testing::ValuesIn(testDynamicShapes), testing::ValuesIn(outputTypes)) @@ -131,7 +131,7 @@ TEST_P(StaticShapeNonZeroTestsNegativeOutputDataType, ThrowsOnInvalidOutputType) ngraph::NodeValidationFailure); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, StaticShapeNonZeroTestsNegativeOutputDataType, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, StaticShapeNonZeroTestsNegativeOutputDataType, testing::Combine( testing::ValuesIn(testNGraphNumericTypes), testing::ValuesIn(testStaticShapes), testing::Values(ngraph::element::boolean)) diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/convert_extract_image_patches_to_reorg_yolo_vpu.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/convert_extract_image_patches_to_reorg_yolo_vpu.cpp index e61a1765880..f3bb5bc2d63 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/convert_extract_image_patches_to_reorg_yolo_vpu.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/convert_extract_image_patches_to_reorg_yolo_vpu.cpp @@ -85,7 +85,7 @@ TEST_P(ConvertEIPToReorgYoloPositiveTest, CompareFunctions) { ASSERT_TRUE(res.first) << res.second; } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, ConvertEIPToReorgYoloPositiveTest, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, ConvertEIPToReorgYoloPositiveTest, testing::Combine( testing::Values(ngraph::Shape{1, 64, 500, 500}), testing::Values(ngraph::Shape{5, 5}), testing::Values(ngraph::Strides{5, 5}), @@ -106,7 +106,7 @@ TEST_P(DoNotConvertEIPToReorgYoloOnDiffSizeAndStride, CompareFunctions) { ASSERT_FALSE(res.first) << res.second; } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DoNotConvertEIPToReorgYoloOnDiffSizeAndStride, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DoNotConvertEIPToReorgYoloOnDiffSizeAndStride, testing::Combine( testing::Values(ngraph::PartialShape{1, 64, 500, 500}), testing::Values(ngraph::Shape{5, 5}), testing::Values(ngraph::Strides{4, 4}), @@ -126,7 +126,7 @@ TEST_P(DoNotConvertEIPToReorgYoloOnNot4DInput, CompareFunctions) { EXPECT_ANY_THROW(transform(dataShape, sizes, strides, rates, padMode)); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DoNotConvertEIPToReorgYoloOnNot4DInput, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DoNotConvertEIPToReorgYoloOnNot4DInput, testing::Combine( testing::Values(ngraph::PartialShape{1, 1, 64, 500, 500}, ngraph::PartialShape{64, 500, 500}, ngraph::PartialShape{500, 500}, @@ -154,7 +154,7 @@ TEST_P(DoNotConvertEIPToReorgYoloOnNotStaticInput, CompareFunctions) { ASSERT_TRUE(reorgIt == ops.end()); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DoNotConvertEIPToReorgYoloOnNotStaticInput, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DoNotConvertEIPToReorgYoloOnNotStaticInput, testing::Combine( testing::Values(ngraph::PartialShape{1, 64, ngraph::Dimension::dynamic(), 500}, ngraph::PartialShape{1, 64, 500, ngraph::Dimension::dynamic()}), testing::Values(ngraph::Shape{5, 5}), @@ -169,7 +169,7 @@ TEST_P(DoNotConvertEIPToReorgYoloOnNonSingleRates, CompareFunctions) { ASSERT_FALSE(res.first) << res.second; } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DoNotConvertEIPToReorgYoloOnNonSingleRates, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DoNotConvertEIPToReorgYoloOnNonSingleRates, testing::Combine( testing::Values(ngraph::Shape{1, 64, 500, 500}), testing::Values(ngraph::Shape{5, 5}), testing::Values(ngraph::Strides{5, 5}), diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_binary_elementwise.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_binary_elementwise.cpp index 24dcef17e60..d1d87c77d07 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_binary_elementwise.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_binary_elementwise.cpp @@ -266,7 +266,7 @@ private: TEST_P(DynamicToStaticShapeEltwise, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_EltwiseBroadcast, DynamicToStaticShapeEltwise, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_EltwiseBroadcast, DynamicToStaticShapeEltwise, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32, diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_broadcast.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_broadcast.cpp index dae6706a399..78de9260c2d 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_broadcast.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_broadcast.cpp @@ -151,7 +151,7 @@ protected: TEST_P(DynamicToStaticShapeBroadcastExplicitTests, compareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeBroadcastExplicitTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeBroadcastExplicitTests, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32, @@ -297,7 +297,7 @@ protected: TEST_P(DynamicToStaticShapeBroadcastBidirectionalTests, compareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeBroadcastBidirectionalTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeBroadcastBidirectionalTests, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32, diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_clamp.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_clamp.cpp index 15ecbfc951e..97d3d79238f 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_clamp.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_clamp.cpp @@ -72,7 +72,7 @@ protected: TEST_P(DynamicToStaticShapeClamp, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeClamp, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeClamp, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32, diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_concat.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_concat.cpp index d18710a0bd9..90b62ee451c 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_concat.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_concat.cpp @@ -134,7 +134,7 @@ std::vector concatParams = { {DataShapes{DataShape{3, 64, 128}, DataShape{3, 64, 256}, DataShape{3, 64, 512}}, -1}, }; -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeConcatTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeConcatTests, testing::Combine( testing::ValuesIn(dataTypes), testing::ValuesIn(concatParams))); diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_convert.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_convert.cpp index 851702d9575..e738d1d49c2 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_convert.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_convert.cpp @@ -72,7 +72,7 @@ protected: TEST_P(DynamicToStaticShapeConvert, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeConvert, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeConvert, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32, diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_gather.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_gather.cpp index 13b1c44893a..94463c74b71 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_gather.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_gather.cpp @@ -125,7 +125,7 @@ protected: TEST_P(DynamicToStaticShapeGatherDataDSR, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeGatherDataDSR, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeGatherDataDSR, combinations); class DynamicToStaticShapeGatherIdxDSR : public CommonTestUtils::TestsCommon, public testing::WithParamInterface> { @@ -206,7 +206,7 @@ protected: TEST_P(DynamicToStaticShapeGatherIdxDSR, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeGatherIdxDSR, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeGatherIdxDSR, combinations); class DynamicToStaticShapeGather : public CommonTestUtils::TestsCommon, public testing::WithParamInterface> { @@ -289,6 +289,6 @@ protected: TEST_P(DynamicToStaticShapeGather, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeGather, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeGather, combinations); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_gather_elements.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_gather_elements.cpp index c60be44e9e5..baf216e0101 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_gather_elements.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_gather_elements.cpp @@ -128,6 +128,6 @@ protected: TEST_P(DynamicToStaticShapeGatherElements, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeGatherElements, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeGatherElements, combinations); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_gather_nd.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_gather_nd.cpp index f4f91dd2bf6..16fbf15ea3c 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_gather_nd.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_gather_nd.cpp @@ -186,6 +186,6 @@ protected: TEST_P(DynamicToStaticShapeGatherND, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeGatherND, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeGatherND, combinations); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_matmul.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_matmul.cpp index fbab95ffbd4..998b640d62d 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_matmul.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_matmul.cpp @@ -204,6 +204,6 @@ protected: TEST_P(DynamicToStaticShapeMatMul, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_MatMul, DynamicToStaticShapeMatMul, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_MatMul, DynamicToStaticShapeMatMul, combinations); } // namespace \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_non_max_suppression.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_non_max_suppression.cpp index c69468741d1..b5e8cb06442 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_non_max_suppression.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_non_max_suppression.cpp @@ -111,7 +111,7 @@ protected: TEST_P(DynamicToStaticShapeNonMaxSuppression, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeNonMaxSuppression, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeNonMaxSuppression, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32), diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_nonzero.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_nonzero.cpp index b62ce98c88b..9da9b5072d3 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_nonzero.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_nonzero.cpp @@ -91,7 +91,7 @@ TEST_P(DynamicToStaticShapeNonZeroTests, CompareFunctions) { compareFunctions(); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeNonZeroTests, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeNonZeroTests, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32, diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_reduce.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_reduce.cpp index 13fbaee293a..09bd745769c 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_reduce.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_reduce.cpp @@ -158,7 +158,7 @@ protected: TEST_P(DynamicToStaticShapeReduce, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_Arithmetic, DynamicToStaticShapeReduce, arithmetic_combinations); -INSTANTIATE_TEST_CASE_P(smoke_Logical, DynamicToStaticShapeReduce, logical_combinations); +INSTANTIATE_TEST_SUITE_P(smoke_Arithmetic, DynamicToStaticShapeReduce, arithmetic_combinations); +INSTANTIATE_TEST_SUITE_P(smoke_Logical, DynamicToStaticShapeReduce, logical_combinations); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_reshape.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_reshape.cpp index a0abc4e5c9a..1200660372a 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_reshape.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_reshape.cpp @@ -114,7 +114,7 @@ std::shared_ptr generateDynamicReshapePattern(std::shared_ptr reference( TEST_P(DynamicToStaticShapeSplit, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeSplit, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeSplit, combinations); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_squeeze.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_squeeze.cpp index 65200017df2..757a8fd5113 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_squeeze.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_squeeze.cpp @@ -98,7 +98,7 @@ protected: TEST_P(DynamicToStaticShapeSqueeze, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeSqueeze, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeSqueeze, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32, diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_topk.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_topk.cpp index e761ed6d94b..b2674397fa8 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_topk.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_topk.cpp @@ -135,7 +135,7 @@ protected: TEST_P(DynamicToStaticShapeTopKConst, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeTopKConst, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeTopKConst, combinations); class DynamicToStaticShapeTopK : public CommonTestUtils::TestsCommon, @@ -239,6 +239,6 @@ protected: TEST_P(DynamicToStaticShapeTopK, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeTopK, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeTopK, combinations); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_transpose.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_transpose.cpp index 71e6d7cf7e5..81214680410 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_transpose.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_transpose.cpp @@ -104,7 +104,7 @@ protected: TEST_P(DynamicToStaticShapeTranspose, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeTranspose, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeTranspose, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32, diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_unary_elementwise.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_unary_elementwise.cpp index 55bef3bb2ce..317b8153344 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_unary_elementwise.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_unary_elementwise.cpp @@ -76,7 +76,7 @@ protected: TEST_P(DynamicToStaticShapeUnaryElementwise, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeUnaryElementwise, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeUnaryElementwise, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32, diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_unsqueeze.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_unsqueeze.cpp index 8684b1e6bba..9be7cfc2a68 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_unsqueeze.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_unsqueeze.cpp @@ -111,7 +111,7 @@ protected: TEST_P(DynamicToStaticShapeUnsqueeze, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeUnsqueeze, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeUnsqueeze, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32, diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_variadic_split.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_variadic_split.cpp index 8d871bdd6c5..75ed78c0880 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_variadic_split.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/dynamic_to_static_shape_variadic_split.cpp @@ -135,6 +135,6 @@ protected: TEST_P(DynamicToStaticShapeVeriadicSplit, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticShapeVeriadicSplit, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticShapeVeriadicSplit, combinations); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/eliminate_shapeof_after_dsr.cpp b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/eliminate_shapeof_after_dsr.cpp index 15b7f6f434e..15d863b446f 100644 --- a/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/eliminate_shapeof_after_dsr.cpp +++ b/inference-engine/tests/functional/plugin/myriad/ngraph/transformations/eliminate_shapeof_after_dsr.cpp @@ -69,7 +69,7 @@ protected: TEST_P(EliminateShapeOfAfterDSRTest, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, EliminateShapeOfAfterDSRTest, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, EliminateShapeOfAfterDSRTest, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32, @@ -134,7 +134,7 @@ protected: TEST_P(EliminateShapeOfAfterDSRWithoutOutputDSR, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, EliminateShapeOfAfterDSRWithoutOutputDSR, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, EliminateShapeOfAfterDSRWithoutOutputDSR, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32, @@ -203,7 +203,7 @@ protected: TEST_P(EliminateShapeOfAfterDSRKeepDSR, CompareFunctions) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, EliminateShapeOfAfterDSRKeepDSR, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, EliminateShapeOfAfterDSRKeepDSR, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32, diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/caching_tests.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/caching_tests.cpp index c7b1194c294..6c17496e7c2 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/caching_tests.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/caching_tests.cpp @@ -31,7 +31,7 @@ namespace { return funcs; } - INSTANTIATE_TEST_CASE_P(smoke_CachingSupportCase_Myriad, LoadNetworkCacheTestBase, + INSTANTIATE_TEST_SUITE_P(smoke_CachingSupportCase_Myriad, LoadNetworkCacheTestBase, ::testing::Combine( ::testing::ValuesIn(smoke_functions()), ::testing::ValuesIn(smoke_precisionsMyriad), @@ -39,7 +39,7 @@ namespace { ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), LoadNetworkCacheTestBase::getTestCaseName); - INSTANTIATE_TEST_CASE_P(nightly_CachingSupportCase_Myriad, LoadNetworkCacheTestBase, + INSTANTIATE_TEST_SUITE_P(nightly_CachingSupportCase_Myriad, LoadNetworkCacheTestBase, ::testing::Combine( ::testing::ValuesIn(LoadNetworkCacheTestBase::getStandardFunctions()), ::testing::ValuesIn(nightly_precisionsMyriad), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/config.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/config.cpp index 773419d78f1..a045692d932 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/config.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/config.cpp @@ -96,7 +96,7 @@ std::vector> getCorrectConfigs() { return correctConfigs; } -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CorrectConfigTests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CorrectConfigTests, ::testing::Combine( ::testing::ValuesIn(getPrecisions()), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), @@ -134,7 +134,7 @@ const std::vector>& getCorrectMultiConfigs() return correctMultiConfigs; } -INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, CorrectConfigTests, +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, CorrectConfigTests, ::testing::Combine( ::testing::ValuesIn(getPrecisions()), ::testing::Values(CommonTestUtils::DEVICE_MULTI), @@ -148,7 +148,7 @@ const std::vector>& getDefaul return defaultEntries; } -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CorrectSingleOptionDefaultValueConfigTests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CorrectSingleOptionDefaultValueConfigTests, ::testing::Combine( ::testing::ValuesIn(getPrecisions()), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), @@ -176,7 +176,7 @@ const std::vector& getPublicOptions() { return publicOptions; } -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CorrectConfigPublicOptionsTests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CorrectConfigPublicOptionsTests, ::testing::Combine( ::testing::ValuesIn(getPrecisions()), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), @@ -203,7 +203,7 @@ const std::vector& getPrivateOptions() { return privateOptions; } -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CorrectConfigPrivateOptionsTests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CorrectConfigPrivateOptionsTests, ::testing::Combine( ::testing::ValuesIn(getPrecisions()), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), @@ -270,7 +270,7 @@ const std::vector>& getIncorrectConfigs() { return incorrectConfigs; } -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, IncorrectConfigTests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, IncorrectConfigTests, ::testing::Combine( ::testing::ValuesIn(getPrecisions()), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), @@ -313,41 +313,41 @@ const std::vector>& getIncorrectMultiConfigs( return incorrectMultiConfigs; } -INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, IncorrectConfigTests, +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, IncorrectConfigTests, ::testing::Combine( ::testing::ValuesIn(getPrecisions()), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(getIncorrectMultiConfigs())), IncorrectConfigTests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, IncorrectConfigSingleOptionTests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, IncorrectConfigSingleOptionTests, ::testing::Combine( ::testing::ValuesIn(getPrecisions()), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::Values("INCORRECT_KEY"))); -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CorrectConfigAPITests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(getPrecisions()), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::Values(std::map{})), CorrectConfigAPITests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, CorrectConfigAPITests, +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, CorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(getPrecisions()), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(getCorrectMultiConfigs())), CorrectConfigAPITests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, IncorrectConfigAPITests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, IncorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(getPrecisions()), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::Values(std::map{{"INCORRECT_KEY", "INCORRECT_VALUE"}})), IncorrectConfigAPITests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, IncorrectConfigAPITests, +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, IncorrectConfigAPITests, ::testing::Combine( ::testing::ValuesIn(getPrecisions()), ::testing::Values(CommonTestUtils::DEVICE_MULTI), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/core_integration.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/core_integration.cpp index 2eaa15ec866..0897d13c2d1 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/core_integration.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/core_integration.cpp @@ -26,11 +26,11 @@ std::pair plugins[] = { // IE Class Common tests with // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassBasicTestP_smoke, IEClassBasicTestP, ::testing::ValuesIn(plugins)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassNetworkTestP_smoke, IEClassNetworkTestP, ::testing::ValuesIn(devices)); @@ -52,17 +52,17 @@ TEST_P(IEClassNetworkTestP_VPU_GetMetric, smoke_OptimizationCapabilitiesReturnsF ASSERT_EQ(optimizationCapabilities.front(), METRIC_VALUE(FP16)); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassGetMetricP, IEClassNetworkTestP_VPU_GetMetric, ::testing::ValuesIn(devices)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassImportExportTestP, IEClassImportExportTestP, ::testing::Values(std::string(CommonTestUtils::DEVICE_MYRIAD), "HETERO:" + std::string(CommonTestUtils::DEVICE_MYRIAD))); #if defined(ENABLE_MKL_DNN) && ENABLE_MKL_DNN -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_IEClassImportExportTestP_HETERO_CPU, IEClassImportExportTestP, ::testing::Values("HETERO:" + std::string(CommonTestUtils::DEVICE_MYRIAD) + ",CPU")); #endif @@ -71,27 +71,27 @@ INSTANTIATE_TEST_CASE_P( // Executable Network GetMetric // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassExecutableNetworkGetMetricTest_nightly, IEClassExecutableNetworkGetMetricTest_ThrowsUnsupported, ::testing::ValuesIn(devices)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassExecutableNetworkGetMetricTest_nightly, IEClassExecutableNetworkGetMetricTest_SUPPORTED_CONFIG_KEYS, ::testing::ValuesIn(devices)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassExecutableNetworkGetMetricTest_nightly, IEClassExecutableNetworkGetMetricTest_SUPPORTED_METRICS, ::testing::ValuesIn(devices)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassExecutableNetworkGetMetricTest_nightly, IEClassExecutableNetworkGetMetricTest_NETWORK_NAME, ::testing::ValuesIn(devices)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassExecutableNetworkGetMetricTest_nightly, IEClassExecutableNetworkGetMetricTest_OPTIMAL_NUMBER_OF_INFER_REQUESTS, ::testing::ValuesIn(devices)); @@ -100,7 +100,7 @@ INSTANTIATE_TEST_CASE_P( // Executable Network GetConfig // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassExecutableNetworkGetConfigTest_nightly, IEClassExecutableNetworkGetConfigTest, ::testing::ValuesIn(devices)); @@ -109,32 +109,32 @@ INSTANTIATE_TEST_CASE_P( // IE Class GetMetric // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassGetMetricTest_nightly, IEClassGetMetricTest_ThrowUnsupported, ::testing::ValuesIn(devices)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassGetMetricTest_nightly, IEClassGetMetricTest_AVAILABLE_DEVICES, ::testing::ValuesIn(devices)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassGetMetricTest_nightly, IEClassGetMetricTest_SUPPORTED_METRICS, ::testing::ValuesIn(devices)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassGetMetricTest_nightly, IEClassGetMetricTest_SUPPORTED_CONFIG_KEYS, ::testing::ValuesIn(devices)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassGetMetricTest_nightly, IEClassGetMetricTest_OPTIMIZATION_CAPABILITIES, ::testing::ValuesIn(devices)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassGetMetricTest_nightly, IEClassGetMetricTest_RANGE_FOR_ASYNC_INFER_REQUESTS, ::testing::ValuesIn(devices)); @@ -143,26 +143,26 @@ INSTANTIATE_TEST_CASE_P( // IE Class GetConfig // -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassGetConfigTest_nightly, IEClassGetConfigTest, ::testing::ValuesIn(devices)); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassGetConfigTest_nightly, IEClassGetConfigTest_ThrowUnsupported, ::testing::ValuesIn(devices)); // IE Class Query network -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_IEClassQueryNetworkTest_smoke, IEClassQueryNetworkTest, ::testing::ValuesIn(devices)); // IE Class Load network -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( IEClassLoadNetworkTest_smoke, IEClassLoadNetworkTest, ::testing::ValuesIn(devices)); diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/core_threading_tests.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/core_threading_tests.cpp index 9ca3ccb37dd..9a8a54b6991 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/core_threading_tests.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/core_threading_tests.cpp @@ -14,9 +14,9 @@ Params params[] = { } // namespace -INSTANTIATE_TEST_CASE_P(MYRIAD, CoreThreadingTests, testing::ValuesIn(params), CoreThreadingTests::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(MYRIAD, CoreThreadingTests, testing::ValuesIn(params), CoreThreadingTests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(DISABLED_MYRIAD, CoreThreadingTestsWithIterations, +INSTANTIATE_TEST_SUITE_P(DISABLED_MYRIAD, CoreThreadingTestsWithIterations, testing::Combine(testing::ValuesIn(params), testing::Values(2), testing::Values(2), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/cpp_holders.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/cpp_holders.cpp index 08de6a3269e..d64be9c7ac0 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/cpp_holders.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/cpp_holders.cpp @@ -18,19 +18,19 @@ namespace { {2, 1, 0} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, HoldersTest, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, HoldersTest, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::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_MYRIAD), ::testing::ValuesIn(orders)), HoldersTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, HoldersTestOnImportedNetwork, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, HoldersTestOnImportedNetwork, ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), HoldersTestOnImportedNetwork::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/detect_network_batch_test.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/detect_network_batch_test.cpp index d4d6ef76525..16bf3b8462d 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/detect_network_batch_test.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/detect_network_batch_test.cpp @@ -13,7 +13,7 @@ const std::vector batchSizes = { }; namespace { - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, DetectNetworkBatch, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, DetectNetworkBatch, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::ValuesIn(batchSizes)), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/exec_graph_info.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/exec_graph_info.cpp index e644dbc140b..1e62bb2da87 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/exec_graph_info.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/exec_graph_info.cpp @@ -15,7 +15,7 @@ namespace { {} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, ExecGraphTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, ExecGraphTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request.cpp index 931fefbf391..5e515c8b562 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request.cpp @@ -17,14 +17,14 @@ const std::vector> configs = { {{InferenceEngine::MultiDeviceConfigParams::KEY_MULTI_DEVICE_PRIORITIES, CommonTestUtils::DEVICE_MYRIAD}} }; -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestTests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::Values(std::map({}))), InferRequestTests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferRequestTests, +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_callback.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_callback.cpp index 71c5b891cce..4bb24fca393 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_callback.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_callback.cpp @@ -18,14 +18,14 @@ const std::vector> multiConfigs = { {{ MULTI_CONFIG_KEY(DEVICE_PRIORITIES) , CommonTestUtils::DEVICE_MYRIAD}} }; -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, CallbackTests, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, CallbackTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::ValuesIn(configs)), CallbackTests::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, CallbackTests, +INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, CallbackTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_config.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_config.cpp index d3ff02668a3..eba711f7b20 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_config.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_config.cpp @@ -76,28 +76,28 @@ namespace { {VPU_CONFIG_KEY(HW_STAGES_OPTIMIZATION), CONFIG_VALUE(YES)}}, }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::ValuesIn(configs)), InferConfigTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferConfigTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferConfigTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(multiConfigs)), InferConfigTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferConfigInTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferConfigInTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::ValuesIn(inferConfigs)), InferConfigInTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferConfigInTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferConfigInTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_input.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_input.cpp index 201f76cf0c4..8b97210ca01 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_input.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_input.cpp @@ -19,14 +19,14 @@ namespace { {{InferenceEngine::MultiDeviceConfigParams::KEY_MULTI_DEVICE_PRIORITIES, CommonTestUtils::DEVICE_MYRIAD}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestInputTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestInputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::ValuesIn(configs)), InferRequestInputTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferRequestInputTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestInputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_output.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_output.cpp index dfa9d4dfe3c..4ef86349b9a 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_output.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/infer_request_output.cpp @@ -19,14 +19,14 @@ namespace { {{InferenceEngine::MultiDeviceConfigParams::KEY_MULTI_DEVICE_PRIORITIES, CommonTestUtils::DEVICE_MYRIAD}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, InferRequestOutputTests, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, InferRequestOutputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::ValuesIn(configs)), InferRequestOutputTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, InferRequestOutputTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, InferRequestOutputTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/layout.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/layout.cpp index b0f9d38c93b..33f02720fef 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/layout.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/layout.cpp @@ -24,7 +24,7 @@ namespace { { 3 } }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, LayoutTest, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, LayoutTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP16), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/query_network.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/query_network.cpp index bacbb6e4de2..01d9aec2694 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/query_network.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/query_network.cpp @@ -16,7 +16,7 @@ auto TIwithLSTMcell = ngraph::builder::subgraph::makeTIwithLSTMcell(); auto SplitConvConcat = ngraph::builder::subgraph::makeNestedSplitConvConcat(); auto BranchSplitConvConcat = ngraph::builder::subgraph::makeSplitConvConcatNestedInBranch(); -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, QueryNetworkTest, +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, QueryNetworkTest, ::testing::Combine( ::testing::Values("MYRIAD", "HETERO:MYRIAD,CPU", "MULTI:MYRIAD,CPU"), ::testing::Values(ConvBias, TIwithLSTMcell, SplitConvConcat, BranchSplitConvConcat)), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/set_preprocess.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/set_preprocess.cpp index 1071fa66da8..7ef46d71e7e 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/set_preprocess.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/set_preprocess.cpp @@ -20,14 +20,14 @@ namespace { {{ InferenceEngine::MultiDeviceConfigParams::KEY_MULTI_DEVICE_PRIORITIES , CommonTestUtils::DEVICE_MYRIAD}} }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, PreprocessTest, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, PreprocessTest, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::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), @@ -48,7 +48,7 @@ namespace { 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), @@ -62,7 +62,7 @@ namespace { ::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(), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/stress_tests.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/stress_tests.cpp index 8655b88d39b..8b65e6d3f51 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/stress_tests.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/stress_tests.cpp @@ -9,7 +9,7 @@ using namespace LayerTestsDefinitions; const unsigned int g_BugAllocationLimit = 10000; namespace { - INSTANTIATE_TEST_CASE_P(nightly_BehaviorTests, MultipleAllocations, + INSTANTIATE_TEST_SUITE_P(nightly_BehaviorTests, MultipleAllocations, ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::Values(g_BugAllocationLimit)), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/test_plugin.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/test_plugin.cpp index 7e7353aebb5..c41206a5b43 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/test_plugin.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/test_plugin.cpp @@ -29,42 +29,42 @@ namespace { InferenceEngine::Precision::FP16 }; - INSTANTIATE_TEST_CASE_P(smoke_BehaviorTests, BehaviorTestOutput, + INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTests, BehaviorTestOutput, ::testing::Combine( ::testing::ValuesIn(netPrecision), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ::testing::ValuesIn(configs)), BehaviorTestOutput::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, BehaviorTestOutput, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, BehaviorTestOutput, ::testing::Combine( ::testing::ValuesIn(netPrecision), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(MultiConfigsInputOutput)), BehaviorTestOutput::getTestCaseName); - 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_MYRIAD), ::testing::ValuesIn(configs)), BehaviorTests::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, BehaviorTests, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, BehaviorTests, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(MultiConfigs)), 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_MYRIAD), ::testing::ValuesIn(configs)), BehaviorTestInput::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, BehaviorTestInput, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, BehaviorTestInput, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MULTI), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/version.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/version.cpp index 8c761386235..d5e9f9d9162 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/version.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/behavior/version.cpp @@ -18,21 +18,21 @@ namespace { {{ HETERO_CONFIG_KEY(DUMP_GRAPH_DOT) , CommonTestUtils::DEVICE_MYRIAD}} }; - 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_MYRIAD), ::testing::ValuesIn(configs)), VersionTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Multi_BehaviorTests, VersionTest, + INSTANTIATE_TEST_SUITE_P(smoke_Multi_BehaviorTests, VersionTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_MULTI), ::testing::ValuesIn(Multiconfigs)), VersionTest::getTestCaseName); - INSTANTIATE_TEST_CASE_P(smoke_Hetero_BehaviorTests, VersionTest, + INSTANTIATE_TEST_SUITE_P(smoke_Hetero_BehaviorTests, VersionTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32), ::testing::Values(CommonTestUtils::DEVICE_HETERO), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/import_export_tests/import_nonzero.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/import_export_tests/import_nonzero.cpp index ccdbb4182af..4555ac1ec9d 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/import_export_tests/import_nonzero.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/import_export_tests/import_nonzero.cpp @@ -26,7 +26,7 @@ const std::vector appHeaders = { "APPLICATION_HEADER" }; -INSTANTIATE_TEST_CASE_P(smoke_ImportNetworkCase, ImportNonZero, +INSTANTIATE_TEST_SUITE_P(smoke_ImportNetworkCase, ImportNonZero, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/myriad_remote_blobs_tests.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/myriad_remote_blobs_tests.cpp index 7a6948044cb..15324128621 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/myriad_remote_blobs_tests.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/myriad_remote_blobs_tests.cpp @@ -14,5 +14,5 @@ const std::vector device_names_and_support_for_remot #endif }; -INSTANTIATE_TEST_CASE_P(smoke_RemoteBlobMultiMyriad, MultiDevice_SupportTest, +INSTANTIATE_TEST_SUITE_P(smoke_RemoteBlobMultiMyriad, MultiDevice_SupportTest, ::testing::ValuesIn(device_names_and_support_for_remote_blobs), MultiDevice_SupportTest::getTestCaseName); \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/activation.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/activation.cpp index e87e73f6e6f..7fff88eb0bb 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/activation.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/activation.cpp @@ -48,6 +48,6 @@ const auto basicCases = ::testing::Combine( ); -INSTANTIATE_TEST_CASE_P(smoke_Activation_Basic, ActivationLayerTest, basicCases, ActivationLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_Activation_Basic, ActivationLayerTest, basicCases, ActivationLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/comparison.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/comparison.cpp index f4cfc820195..4485bbdea68 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/comparison.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/comparison.cpp @@ -50,7 +50,7 @@ std::vector comparisonOpTypesFpToInt = { ngraph::helpers::ComparisonTypes::LESS, }; -INSTANTIATE_TEST_CASE_P(smoke_ComparisonFp, +INSTANTIATE_TEST_SUITE_P(smoke_ComparisonFp, ComparisonLayerTest, ::testing::Combine( ::testing::ValuesIn(CommonTestUtils::combineParams(inputShapes)), @@ -63,7 +63,7 @@ INSTANTIATE_TEST_CASE_P(smoke_ComparisonFp, ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})), ComparisonLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_ComparisonInt, +INSTANTIATE_TEST_SUITE_P(smoke_ComparisonInt, ComparisonLayerTest, ::testing::Combine( ::testing::ValuesIn(CommonTestUtils::combineParams(inputShapes)), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/concat.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/concat.cpp index f9500dad7e6..228c892fa3a 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/concat.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/concat.cpp @@ -20,7 +20,7 @@ std::vector>> inShapes = { std::vector netPrecisions = {InferenceEngine::Precision::FP16}; -INSTANTIATE_TEST_CASE_P(smoke_Concat_Basic, ConcatLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Concat_Basic, ConcatLayerTest, ::testing::Combine( ::testing::ValuesIn(axes), ::testing::ValuesIn(inShapes), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/convolution.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/convolution.cpp index ac5285cad1b..43a582b89fe 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/convolution.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/convolution.cpp @@ -60,7 +60,7 @@ const auto conv2DParams_BigDimensionValid = ::testing::Combine( ::testing::Values(ngraph::op::PadType::VALID) ); -INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPadding, ConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_ExplicitPadding, ConvolutionLayerTest, ::testing::Combine( conv2DParams_ExplicitPadding, ::testing::ValuesIn(netPrecisions), @@ -72,7 +72,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_ExplicitPadding, ConvolutionLayerTes ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), ConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AutoPadValid, ConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_AutoPadValid, ConvolutionLayerTest, ::testing::Combine( conv2DParams_AutoPadValid, ::testing::ValuesIn(netPrecisions), @@ -83,7 +83,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_AutoPadValid, ConvolutionLayerTest, ::testing::Values(std::vector({1, 3, 30, 30})), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), ConvolutionLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Convolution2D_BigDimensionValid, ConvolutionLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Convolution2D_BigDimensionValid, ConvolutionLayerTest, ::testing::Combine( conv2DParams_BigDimensionValid, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/ctc_greedy_decoder_seq_len.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/ctc_greedy_decoder_seq_len.cpp index c3866b9621c..5025da6e91f 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/ctc_greedy_decoder_seq_len.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/ctc_greedy_decoder_seq_len.cpp @@ -29,7 +29,7 @@ const auto sequenceLengths = std::vector{1, 10, 50, 100}; const auto blankIndexes = std::vector{0, 10, 100}; -INSTANTIATE_TEST_CASE_P(smoke, CTCGreedyDecoderSeqLenLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke, CTCGreedyDecoderSeqLenLayerTest, ::testing::Combine( ::testing::ValuesIn(inputShape), ::testing::ValuesIn(sequenceLengths), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/eltwise.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/eltwise.cpp index dc258dec538..6821c49494a 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/eltwise.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/eltwise.cpp @@ -55,7 +55,7 @@ std::vector eltwiseMathTypesINT = { ngraph::helpers::EltwiseTypes::DIVIDE, }; -INSTANTIATE_TEST_CASE_P(smoke_EltwiseMathFP, +INSTANTIATE_TEST_SUITE_P(smoke_EltwiseMathFP, EltwiseLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes), @@ -70,7 +70,7 @@ INSTANTIATE_TEST_CASE_P(smoke_EltwiseMathFP, ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})), EltwiseLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_EltwiseMathInt, +INSTANTIATE_TEST_SUITE_P(smoke_EltwiseMathInt, EltwiseLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/gather_elements.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/gather_elements.cpp index e6dae478108..55843e804bf 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/gather_elements.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/gather_elements.cpp @@ -33,7 +33,7 @@ const std::vector iPrecisions = { InferenceEngine::Precision::I32 }; -INSTANTIATE_TEST_CASE_P(smoke_GatherElements1, GatherElementsLayerTestVPU, +INSTANTIATE_TEST_SUITE_P(smoke_GatherElements1, GatherElementsLayerTestVPU, ::testing::Combine( ::testing::Values(std::vector({2, 2})), // Data shape ::testing::Values(std::vector({2, 2})), // Indices shape @@ -43,7 +43,7 @@ INSTANTIATE_TEST_CASE_P(smoke_GatherElements1, GatherElementsLayerTestVPU, ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), GatherElementsLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_GatherElements2, GatherElementsLayerTestVPU, +INSTANTIATE_TEST_SUITE_P(smoke_GatherElements2, GatherElementsLayerTestVPU, ::testing::Combine( ::testing::Values(std::vector({2, 65, 300})), // Data shape ::testing::Values(std::vector({2, 65, 64})), // Indices shape diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/gather_nd.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/gather_nd.cpp index d6dbf6f5349..dc01dde5d87 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/gather_nd.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/gather_nd.cpp @@ -39,7 +39,7 @@ const std::vector layerParams = { GatherNDParamsSubset{{2, 2, 2, 2}, {2, 2, 1}, 2}, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_GatherND, GatherNDLayerTest, testing::Combine( diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/interpolate.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/interpolate.cpp index 3c7d701c09e..31d17ca51ba 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/interpolate.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/interpolate.cpp @@ -179,7 +179,7 @@ const auto interpolateCasesWithoutNearestMode = ::testing::Combine( ::testing::ValuesIn(defaultAxes), ::testing::ValuesIn(defaultScales)); -INSTANTIATE_TEST_CASE_P(smoke_Interpolate_nearest_mode_no_batch, InterpolateLayerTest, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_nearest_mode_no_batch, InterpolateLayerTest, ::testing::Combine( interpolateCasesNearestMode, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -192,7 +192,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Interpolate_nearest_mode_no_batch, InterpolateLaye ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})), InterpolateLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Interpolate_without_nearest_mode_no_batch, InterpolateLayerTest, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_without_nearest_mode_no_batch, InterpolateLayerTest, ::testing::Combine( interpolateCasesWithoutNearestMode, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -205,7 +205,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Interpolate_without_nearest_mode_no_batch, Interpo ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})), InterpolateLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Interpolate_nearest_mode, InterpolateLayerTest, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_nearest_mode, InterpolateLayerTest, ::testing::Combine( interpolateCasesNearestMode, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -218,7 +218,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Interpolate_nearest_mode, InterpolateLayerTest, :: ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})), InterpolateLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Interpolate_nearest_mode_more, InterpolateLayerTest, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_nearest_mode_more, InterpolateLayerTest, ::testing::Combine( interpolateCasesNearestModeMore, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -231,7 +231,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Interpolate_nearest_mode_more, InterpolateLayerTes ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})), InterpolateLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_Interpolate_without_nearest, InterpolateLayerTest, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_Interpolate_without_nearest, InterpolateLayerTest, ::testing::Combine( interpolateCasesWithoutNearestMode, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -244,7 +244,7 @@ INSTANTIATE_TEST_CASE_P(smoke_Interpolate_without_nearest, InterpolateLayerTest, ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})), InterpolateLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(nightly_Interpolate_without_nearest, InterpolateLayerTest, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(nightly_Interpolate_without_nearest, InterpolateLayerTest, ::testing::Combine( interpolateCasesWithoutNearestMode, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), @@ -257,7 +257,7 @@ INSTANTIATE_TEST_CASE_P(nightly_Interpolate_without_nearest, InterpolateLayerTes ::testing::Values(Config{{InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)}})), InterpolateLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(nightly_Interpolate_nearest_mode_2x, InterpolateLayerTest, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(nightly_Interpolate_nearest_mode_2x, InterpolateLayerTest, ::testing::Combine( interpolateCasesNearestMode2x, ::testing::ValuesIn(netPrecisions), ::testing::Values(InferenceEngine::Precision::UNSPECIFIED), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/logical.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/logical.cpp index 8c1202dba66..d4dd50db3e1 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/logical.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/logical.cpp @@ -66,7 +66,7 @@ std::map additional_config = { {InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)} }; -INSTANTIATE_TEST_CASE_P(smoke_EltwiseLogicalInt, +INSTANTIATE_TEST_SUITE_P(smoke_EltwiseLogicalInt, LogicalLayerTestVPU, ::testing::Combine( ::testing::ValuesIn(LogicalLayerTest::combineShapes(inputShapes)), @@ -81,7 +81,7 @@ INSTANTIATE_TEST_CASE_P(smoke_EltwiseLogicalInt, ::testing::Values(additional_config)), LogicalLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_EltwiseLogicalNotInt, +INSTANTIATE_TEST_SUITE_P(smoke_EltwiseLogicalNotInt, LogicalLayerTest, ::testing::Combine( ::testing::ValuesIn(LogicalLayerTest::combineShapes(inputShapesNot)), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/mat_mul.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/mat_mul.cpp index f947367633b..fcfa981c0e8 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/mat_mul.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/mat_mul.cpp @@ -31,7 +31,7 @@ Config additionalConfig = { {InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO)} }; -INSTANTIATE_TEST_CASE_P(smoke_MatMul, MatMulTest, +INSTANTIATE_TEST_SUITE_P(smoke_MatMul, MatMulTest, ::testing::Combine( ::testing::ValuesIn(shapeRelatedParams), ::testing::ValuesIn(inputPrecisions), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/minimum_maximum.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/minimum_maximum.cpp index 8db8e1297d3..d174e19756d 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/minimum_maximum.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/minimum_maximum.cpp @@ -33,7 +33,7 @@ const std::vector inputType = { ngraph::helpers::InputLayerType::PARAMETER, }; -INSTANTIATE_TEST_CASE_P(smoke_maximum, MaxMinLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_maximum, MaxMinLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes), ::testing::ValuesIn(opType), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/mvn.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/mvn.cpp index 1dc99bdd642..2c78d5c6698 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/mvn.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/mvn.cpp @@ -35,7 +35,7 @@ const std::vector eps = { 1.0e-10, 1.0e-8, 1.0e-7, 1.0e-5, 1.0e-3 }; -INSTANTIATE_TEST_CASE_P(smoke_MVN_4D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MVN_4D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(input_shape_4D), ::testing::Values(InferenceEngine::Precision::FP16), @@ -47,7 +47,7 @@ INSTANTIATE_TEST_CASE_P(smoke_MVN_4D, Mvn6LayerTest, ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), Mvn6LayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_MVN_3D, Mvn6LayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MVN_3D, Mvn6LayerTest, ::testing::Combine( ::testing::ValuesIn(input_shape_3D), ::testing::Values(InferenceEngine::Precision::FP16), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/nonzero.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/nonzero.cpp index 592236bb34b..b418a50da73 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/nonzero.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/nonzero.cpp @@ -38,7 +38,7 @@ const std::vector inputPrecisions = { InferenceEngine::Precision::U8, }; -INSTANTIATE_TEST_CASE_P(smoke_nonzero, NonZeroLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_nonzero, NonZeroLayerTest, ::testing::Combine( ::testing::ValuesIn(inShapes), ::testing::ValuesIn(inputPrecisions), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/pad.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/pad.cpp index ce681365a1c..a4b5d32c220 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/pad.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/pad.cpp @@ -37,7 +37,7 @@ const auto pad4DConstParams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_MYRIAD) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Pad4DConst, PadLayerTest, pad4DConstParams, @@ -57,7 +57,7 @@ const auto pad4DParams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_MYRIAD) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Pad4D, PadLayerTest, pad4DParams, @@ -77,7 +77,7 @@ const auto pad3DConstParams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_MYRIAD) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Pad3DConst, PadLayerTest, pad3DConstParams, @@ -97,7 +97,7 @@ const auto pad3DParams = testing::Combine( testing::Values(CommonTestUtils::DEVICE_MYRIAD) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Pad3D, PadLayerTest, pad3DParams, diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/pooling.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/pooling.cpp index 0909880261b..83f4c60039d 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/pooling.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/pooling.cpp @@ -40,7 +40,7 @@ const auto maxPool_ExplicitPad_FloorRounding_Params = ::testing::Combine( ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); -INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_FloorRpunding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MaxPool_ExplicitPad_FloorRpunding, PoolingLayerTest, ::testing::Combine( maxPool_ExplicitPad_FloorRounding_Params, ::testing::ValuesIn(netPrecisions), @@ -67,7 +67,7 @@ const auto maxPool_ExplicitPad_CeilRounding_Params = ::testing::Combine( ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); -INSTANTIATE_TEST_CASE_P(smoke_MaxPool_ExplicitPad_CeilRpunding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MaxPool_ExplicitPad_CeilRpunding, PoolingLayerTest, ::testing::Combine( maxPool_ExplicitPad_CeilRounding_Params, ::testing::ValuesIn(netPrecisions), @@ -96,7 +96,7 @@ const auto avgPoolExplicitPadCeilRoundingParams = ::testing::Combine( ::testing::Values(true, false) ); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_CeilRounding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_ExplicitPad_CeilRounding, PoolingLayerTest, ::testing::Combine( avgPoolExplicitPadCeilRoundingParams, ::testing::ValuesIn(netPrecisions), @@ -122,7 +122,7 @@ const auto avgPoolExplicitPadFloorRoundingParams = ::testing::Combine( ); -INSTANTIATE_TEST_CASE_P(smoke_AvgPool_ExplicitPad_FloorRounding, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_AvgPool_ExplicitPad_FloorRounding, PoolingLayerTest, ::testing::Combine( avgPoolExplicitPadFloorRoundingParams, ::testing::ValuesIn(netPrecisions), @@ -149,7 +149,7 @@ const auto allPools_ValidPad_Params = ::testing::Combine( ::testing::Values(false) // placeholder value - exclude pad not applicable for max pooling ); -INSTANTIATE_TEST_CASE_P(smoke_MAX_and_AVGPool_ValidPad, PoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_MAX_and_AVGPool_ValidPad, PoolingLayerTest, ::testing::Combine( allPools_ValidPad_Params, ::testing::ValuesIn(netPrecisions), @@ -175,7 +175,7 @@ const auto avgGlobalPoolParams = ::testing::Combine( ::testing::Values(false) ); -INSTANTIATE_TEST_CASE_P(smoke_GlobalAvgPool, GlobalPoolingLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_GlobalAvgPool, GlobalPoolingLayerTest, ::testing::Combine( avgGlobalPoolParams, ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/proposal.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/proposal.cpp index 103dff03d6f..438274a55f1 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/proposal.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/proposal.cpp @@ -40,7 +40,7 @@ const auto proposalParams = ::testing::Combine( ::testing::ValuesIn(framework_) ); -INSTANTIATE_TEST_CASE_P(smoke_Proposal_tests, ProposalLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_Proposal_tests, ProposalLayerTest, ::testing::Combine( proposalParams, ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/roi_pooling.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/roi_pooling.cpp index 66baf439e14..d28509dbe33 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/roi_pooling.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/roi_pooling.cpp @@ -52,7 +52,7 @@ const auto test_ROIPooling_bilinear = ::testing::Combine( ::testing::Values(CommonTestUtils::DEVICE_MYRIAD) ); -INSTANTIATE_TEST_CASE_P(smoke_TestsROIPooling_max, ROIPoolingLayerTest, test_ROIPooling_max, ROIPoolingLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TestsROIPooling_bilinear, ROIPoolingLayerTest, test_ROIPooling_bilinear, ROIPoolingLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsROIPooling_max, ROIPoolingLayerTest, test_ROIPooling_max, ROIPoolingLayerTest::getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_TestsROIPooling_bilinear, ROIPoolingLayerTest, test_ROIPooling_bilinear, ROIPoolingLayerTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/split.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/split.cpp index 11afafbc42a..5e69eebc503 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/split.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/split.cpp @@ -14,7 +14,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::FP16 }; -INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, SplitLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_NumSplitsCheck, SplitLayerTest, ::testing::Combine( ::testing::Values(5), // TODO: 0-axis excluded @@ -32,7 +32,7 @@ INSTANTIATE_TEST_CASE_P(smoke_NumSplitsCheck, SplitLayerTest, ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), SplitLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_splitWithUnusedOutputsTest, SplitLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_splitWithUnusedOutputsTest, SplitLayerTest, ::testing::Combine( ::testing::Values(5), // TODO: 0-axis excluded diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/strided_slice.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/strided_slice.cpp index 6c4003a3f3a..33893ae4241 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/strided_slice.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/strided_slice.cpp @@ -55,7 +55,7 @@ Config getConfig() { return Config{ { InferenceEngine::MYRIAD_DETECT_NETWORK_BATCH, CONFIG_VALUE(NO) } }; } -INSTANTIATE_TEST_CASE_P(smoke_StridedSlice_tests, StridedSliceLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_StridedSlice_tests, StridedSliceLayerTest, ::testing::Combine( ::testing::ValuesIn(testCases), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/topk.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/topk.cpp index 9b3e4c7239d..722f528d876 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/topk.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/single_layer_tests/topk.cpp @@ -40,7 +40,7 @@ const std::vector sortTypes = { ngraph::opset5::TopK::SortType::SORT_VALUES, }; -INSTANTIATE_TEST_CASE_P(smoke_TopK_IndicesValuesSort, TopKLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_TopK_IndicesValuesSort, TopKLayerTest, ::testing::Combine( ::testing::ValuesIn(k), ::testing::ValuesIn(axes), @@ -54,7 +54,7 @@ INSTANTIATE_TEST_CASE_P(smoke_TopK_IndicesValuesSort, TopKLayerTest, ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), TopKLayerTest::getTestCaseName); -INSTANTIATE_TEST_CASE_P(smoke_TopK_NoneSort, TopKLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_TopK_NoneSort, TopKLayerTest, ::testing::Combine( ::testing::Values(1), ::testing::ValuesIn(axes), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/constant_result.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/constant_result.cpp index 19fdc4ba9bf..919fcdef3d0 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/constant_result.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/constant_result.cpp @@ -34,7 +34,7 @@ const std::vector precisions = { Precision::BOOL }; -INSTANTIATE_TEST_CASE_P(smoke_Check, ConstantResultSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_Check, ConstantResultSubgraphTest, ::testing::Combine( ::testing::ValuesIn(types), ::testing::ValuesIn(shapes), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp index bdc85b7ae9f..6636ef971ff 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/reshape_squeeze_reshape_relu.cpp @@ -32,7 +32,7 @@ namespace { ngraph::helpers::SqueezeOpType::UNSQUEEZE }; - INSTANTIATE_TEST_CASE_P(DISABLED_reshape_squeeze_reshape_relu, ReshapeSqueezeReshapeRelu, + INSTANTIATE_TEST_SUITE_P(DISABLED_reshape_squeeze_reshape_relu, ReshapeSqueezeReshapeRelu, ::testing::Combine( ::testing::ValuesIn(inputs), ::testing::ValuesIn(netPrecisions), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/split_conv_concat.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/split_conv_concat.cpp index 2688eed42fc..82224e56375 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/split_conv_concat.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/split_conv_concat.cpp @@ -15,7 +15,7 @@ const std::vector netPrecisions = { InferenceEngine::Precision::FP16 }; -INSTANTIATE_TEST_CASE_P(smoke_NoReshape, SplitConvConcat, +INSTANTIATE_TEST_SUITE_P(smoke_NoReshape, SplitConvConcat, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values(std::vector({1, 6, 40, 40})), diff --git a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/tensor_names.cpp b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/tensor_names.cpp index b89622fb297..76fbf656b6f 100644 --- a/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/tensor_names.cpp +++ b/inference-engine/tests/functional/plugin/myriad/shared_tests_instances/subgraph_tests/tensor_names.cpp @@ -10,7 +10,7 @@ using namespace SubgraphTestsDefinitions; namespace { - INSTANTIATE_TEST_CASE_P(smoke_Check, TensorNamesTest, + INSTANTIATE_TEST_SUITE_P(smoke_Check, TensorNamesTest, ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), TensorNamesTest::getTestCaseName); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/gather.cpp b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/gather.cpp index d882c3ba7c2..96e245fad63 100644 --- a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/gather.cpp +++ b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/gather.cpp @@ -108,7 +108,7 @@ TEST_P(MyriadGatherLayerTest, accuracy) { Run(); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( smoke_Gather, MyriadGatherLayerTest, testing::Combine( diff --git a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/out_shape_of_reshape.cpp b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/out_shape_of_reshape.cpp index 61b27f909e7..681c14d3ce6 100644 --- a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/out_shape_of_reshape.cpp +++ b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/out_shape_of_reshape.cpp @@ -111,7 +111,7 @@ std::vector shapeParams = { std::make_tuple(InputShape{ 2, 5, 5, 0 }, ShapeDescriptor{ 0, 4 }, false), }; -INSTANTIATE_TEST_CASE_P(smoke_accuracy, OutShapeOfReshapeLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_accuracy, OutShapeOfReshapeLayerTest, ::testing::Combine( ::testing::ValuesIn(shapeParams), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)), diff --git a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_broadcast.cpp b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_broadcast.cpp index fb1f38f1ae4..a1f62c1ce1a 100644 --- a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_broadcast.cpp +++ b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_broadcast.cpp @@ -124,7 +124,7 @@ std::vector broadcastPrecisions = { InferenceEngine::Precision::I32, }; -INSTANTIATE_TEST_CASE_P(smoke_accuracy, StaticShapeBroadcastLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_accuracy, StaticShapeBroadcastLayerTest, ::testing::Combine( ::testing::ValuesIn(broadcastParam), ::testing::ValuesIn(broadcastPrecisions), diff --git a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nms.cpp b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nms.cpp index ea5a44ed988..83dd6dd2b04 100644 --- a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nms.cpp +++ b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nms.cpp @@ -115,7 +115,7 @@ std::vector NMSPrecisions = { }; // #-30919 -INSTANTIATE_TEST_CASE_P(DISABLED_accuracy, StaticShapeNMSLayerTest, +INSTANTIATE_TEST_SUITE_P(DISABLED_accuracy, StaticShapeNMSLayerTest, ::testing::Combine( ::testing::ValuesIn(NMSParams), ::testing::ValuesIn(NMSPrecisions), @@ -170,7 +170,7 @@ TEST_P(NMS1toStaticShapeNMS, PreviousNMSCanBeLoaded) { ASSERT_NO_THROW(LoadNetwork()); } -INSTANTIATE_TEST_CASE_P(smoke_NetworkLoad, NMS1toStaticShapeNMS, +INSTANTIATE_TEST_SUITE_P(smoke_NetworkLoad, NMS1toStaticShapeNMS, ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)); class NMS3toStaticShapeNMS : public PreviousNMStoStaticShapeNMS { @@ -190,7 +190,7 @@ TEST_P(NMS3toStaticShapeNMS, PreviousNMSCanBeLoaded) { ASSERT_NO_THROW(LoadNetwork()); } -INSTANTIATE_TEST_CASE_P(smoke_NetworkLoad, NMS3toStaticShapeNMS, +INSTANTIATE_TEST_SUITE_P(smoke_NetworkLoad, NMS3toStaticShapeNMS, ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)); class NMS4toStaticShapeNMS : public PreviousNMStoStaticShapeNMS { @@ -211,7 +211,7 @@ TEST_P(NMS4toStaticShapeNMS, PreviousNMSCanBeLoaded) { ASSERT_NO_THROW(LoadNetwork()); } -INSTANTIATE_TEST_CASE_P(smoke_NetworkLoad, NMS4toStaticShapeNMS, +INSTANTIATE_TEST_SUITE_P(smoke_NetworkLoad, NMS4toStaticShapeNMS, ::testing::Values(CommonTestUtils::DEVICE_MYRIAD)); } // namespace LayerTestsDefinitions diff --git a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nonzero.cpp b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nonzero.cpp index 6833f2b0f2d..c268a97753c 100644 --- a/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nonzero.cpp +++ b/inference-engine/tests/functional/plugin/myriad/single_layer_tests/static_shape_nonzero.cpp @@ -111,7 +111,7 @@ std::vector inputPrecisions = { InferenceEngine::Precision::I32, }; -INSTANTIATE_TEST_CASE_P(smoke_accuracy, StaticShapeNonZeroLayerTest, +INSTANTIATE_TEST_SUITE_P(smoke_accuracy, StaticShapeNonZeroLayerTest, ::testing::Combine( ::testing::ValuesIn(inputDims), ::testing::ValuesIn(inputPrecisions), diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/concat_split_transpose.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/concat_split_transpose.cpp index 7845ee434f5..1293b7e9609 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/concat_split_transpose.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/concat_split_transpose.cpp @@ -74,7 +74,7 @@ std::vector> length = { {500, 500} }; -INSTANTIATE_TEST_CASE_P(SpecialStages, Concat_Split_Transpose, +INSTANTIATE_TEST_SUITE_P(SpecialStages, Concat_Split_Transpose, ::testing::Combine( ::testing::Values(ngraph::element::i32), ::testing::ValuesIn(dims), diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_binary_elementwise.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_binary_elementwise.cpp index 279dc7a783d..003799dba84 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_binary_elementwise.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_binary_elementwise.cpp @@ -92,7 +92,7 @@ TEST_P(DSR_BinaryElementwiseBothDSR, CompareWithReference) { const auto& eltwiseType = std::get<2>(GetParam()); if (doNotSupportI32.count(eltwiseType) && inDataType == ngraph::element::i32) { - SKIP() << eltwiseType.name << " doesn't support int32_t inputs" << std::endl; + GTEST_SKIP() << eltwiseType.name << " doesn't support int32_t inputs" << std::endl; } Run(); @@ -105,7 +105,7 @@ std::vector dataShapesWithUpperBound = { }, }; -INSTANTIATE_TEST_CASE_P(smoke_DynamicBinaryElementwise, DSR_BinaryElementwiseBothDSR, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicBinaryElementwise, DSR_BinaryElementwiseBothDSR, ::testing::Combine( ::testing::Values(ngraph::element::f16, ngraph::element::f32, ngraph::element::i32), ::testing::ValuesIn(dataShapesWithUpperBound), @@ -117,7 +117,7 @@ TEST_P(DSR_BinaryElementwiseSingleDSR, CompareWithReference) { const auto& eltwiseType = std::get<2>(GetParam()); if (doNotSupportI32.count(eltwiseType) && inDataType == ngraph::element::i32) { - SKIP() << eltwiseType.name << " doesn't support int32_t inputs" << std::endl; + GTEST_SKIP() << eltwiseType.name << " doesn't support int32_t inputs" << std::endl; } Run(); @@ -130,7 +130,7 @@ std::vector dataShapesWithUpperBoundSingleDSR = { }, }; -INSTANTIATE_TEST_CASE_P(smoke_DynamicBinaryElementwiseSingleDSR, DSR_BinaryElementwiseSingleDSR, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicBinaryElementwiseSingleDSR, DSR_BinaryElementwiseSingleDSR, ::testing::Combine( ::testing::Values(ngraph::element::f16, ngraph::element::f32, ngraph::element::i32), ::testing::ValuesIn(dataShapesWithUpperBoundSingleDSR), @@ -169,7 +169,7 @@ TEST_P(DSR_BinaryElementwiseBothDSRCheckOutputShape, CheckOutputShape) { const auto& eltwiseType = std::get<2>(GetParam()); if (doNotSupportI32.count(eltwiseType) && inDataType == ngraph::element::i32) { - SKIP() << eltwiseType.name << " doesn't support int32_t inputs" << std::endl; + GTEST_SKIP() << eltwiseType.name << " doesn't support int32_t inputs" << std::endl; } Run(); @@ -334,7 +334,7 @@ std::vector dataShapesWithUpperBoundBothDSREmpty = { }, }; -INSTANTIATE_TEST_CASE_P(smoke_BinaryElementwiseBothDSRCheckOutputShape, DSR_BinaryElementwiseBothDSRCheckOutputShape, +INSTANTIATE_TEST_SUITE_P(smoke_BinaryElementwiseBothDSRCheckOutputShape, DSR_BinaryElementwiseBothDSRCheckOutputShape, ::testing::Combine( ::testing::Values(ngraph::element::f16, ngraph::element::f32, ngraph::element::i32), ::testing::ValuesIn(dataShapesWithUpperBoundBothDSREmpty), diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_clamp.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_clamp.cpp index 1cc7abf4ca9..6d80220fbcc 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_clamp.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_clamp.cpp @@ -38,7 +38,7 @@ TEST_P(DSR_Clamp, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicClamp, DSR_Clamp, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicClamp, DSR_Clamp, ::testing::Combine( ::testing::Values(ngraph::element::f16, ngraph::element::f32), ::testing::Values(DataShapeWithUpperBound{DataShape{1, 800}, DataShape{2, 1000}}), diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_concat.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_concat.cpp index 58d3c5d4357..81d1f3219f3 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_concat.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_concat.cpp @@ -98,7 +98,7 @@ std::vector concatParams = { }, }; -INSTANTIATE_TEST_CASE_P(smoke_DynamicConcat, DSR_Concat, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_DynamicConcat, DSR_Concat, ::testing::Combine( ::testing::ValuesIn(dataTypes), ::testing::ValuesIn(concatParams), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD))); diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_convert.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_convert.cpp index 7ba067a7e74..99af45c3323 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_convert.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_convert.cpp @@ -49,7 +49,7 @@ std::vector dataTypeConversionPairVector { {ngraph::element::f16, ngraph::element::i32}, }; -INSTANTIATE_TEST_CASE_P(smoke_DynamicConvert, DSR_Convert, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicConvert, DSR_Convert, ::testing::Combine( ::testing::ValuesIn(dataTypeConversionPairVector), ::testing::Values(DataShapeWithUpperBound{ngraph::Shape{1, 800}, ngraph::Shape{2, 1000}}, diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather.cpp index 628383b5bf6..3d4b5be8dfb 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather.cpp @@ -50,7 +50,7 @@ TEST_P(DSR_GatherDynamicDataStaticIdx, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicGatherData, DSR_GatherDynamicDataStaticIdx, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_DynamicGatherData, DSR_GatherDynamicDataStaticIdx, testing::Combine( testing::ValuesIn(dataTypeVector), testing::ValuesIn(idxTypeVector), testing::Values( @@ -88,7 +88,7 @@ TEST_P(DSR_GatherStaticDataDynamicIdx, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicGatherIdx, DSR_GatherStaticDataDynamicIdx, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_DynamicGatherIdx, DSR_GatherStaticDataDynamicIdx, testing::Combine( testing::ValuesIn(dataTypeVector), testing::ValuesIn(idxTypeVector), testing::Values( @@ -125,7 +125,7 @@ TEST_P(DSR_GatherDynamicDataDynamicIdx, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicGather, DSR_GatherDynamicDataDynamicIdx, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_DynamicGather, DSR_GatherDynamicDataDynamicIdx, testing::Combine( testing::ValuesIn(dataTypeVector), testing::ValuesIn(idxTypeVector), testing::Values( diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather_elements.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather_elements.cpp index fd27c196162..0529858d581 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather_elements.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather_elements.cpp @@ -49,7 +49,7 @@ TEST_P(DSR_GatherElements, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicGatherElements, DSR_GatherElements, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicGatherElements, DSR_GatherElements, testing::Combine( testing::ValuesIn(dataTypeVector), testing::ValuesIn(idxTypeVector), diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather_nd.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather_nd.cpp index 0b0b2a7db16..5003ea60685 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather_nd.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_gather_nd.cpp @@ -82,7 +82,7 @@ TEST_P(DSR_GatherNDDynamicDataStaticIdx, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicGatherData, DSR_GatherNDDynamicDataStaticIdx, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_DynamicGatherData, DSR_GatherNDDynamicDataStaticIdx, testing::Combine( testing::ValuesIn(dataTypeVector), testing::ValuesIn(idxTypeVector), testing::Values( @@ -112,7 +112,7 @@ TEST_P(DSR_GatherNDStaticDataDynamicIdx, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicGatherIdx, DSR_GatherNDStaticDataDynamicIdx, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_DynamicGatherIdx, DSR_GatherNDStaticDataDynamicIdx, testing::Combine( testing::ValuesIn(dataTypeVector), testing::ValuesIn(idxTypeVector), testing::Values( @@ -142,7 +142,7 @@ TEST_P(DSR_GatherNDDynamicDataDynamicIdx, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicGather, DSR_GatherNDDynamicDataDynamicIdx, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_DynamicGather, DSR_GatherNDDynamicDataDynamicIdx, testing::Combine( testing::ValuesIn(dataTypeVector), testing::ValuesIn(idxTypeVector), testing::Values( diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_matmul.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_matmul.cpp index 536da208e72..2bf60b55441 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_matmul.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_matmul.cpp @@ -99,5 +99,5 @@ TEST_P(DSR_MatMul, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicMatMul, DSR_MatMul, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_DynamicMatMul, DSR_MatMul, combinations); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_non_max_suppression.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_non_max_suppression.cpp index a764cb07c33..a3e86b211e1 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_non_max_suppression.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_non_max_suppression.cpp @@ -91,7 +91,7 @@ TEST_P(DSR_NonMaxSuppression, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicNonMaxSupression, DSR_NonMaxSuppression, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicNonMaxSupression, DSR_NonMaxSuppression, ::testing::Combine( ::testing::Values( ngraph::element::f16, diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_reduce.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_reduce.cpp index 20fb3c905a9..2a0a89351ce 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_reduce.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_reduce.cpp @@ -101,7 +101,7 @@ TEST_P(DSR_Reduce, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicArithmeticReduce, DSR_Reduce, arithmeticCombinations); -INSTANTIATE_TEST_CASE_P(smoke_DynamicLogicalReduce, DSR_Reduce, logicalCombinations); +INSTANTIATE_TEST_SUITE_P(smoke_DynamicArithmeticReduce, DSR_Reduce, arithmeticCombinations); +INSTANTIATE_TEST_SUITE_P(smoke_DynamicLogicalReduce, DSR_Reduce, logicalCombinations); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_reshape.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_reshape.cpp index 2aa408c7a5f..d416dd7b357 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_reshape.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_reshape.cpp @@ -88,13 +88,13 @@ const std::vector dataTypesVector = { ngraph::element::i32, }; -INSTANTIATE_TEST_CASE_P(smoke_DynamicReshape, DSR_ReshapeWithStaticDescriptor, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicReshape, DSR_ReshapeWithStaticDescriptor, ::testing::Combine( ::testing::ValuesIn(dataTypesVector), ::testing::ValuesIn(reshapeTestParams), ::testing::Values(CommonTestUtils::DEVICE_MYRIAD))); -INSTANTIATE_TEST_CASE_P(smoke_DynamicReshape, DSR_ReshapeWithDynamicDescriptor, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicReshape, DSR_ReshapeWithDynamicDescriptor, ::testing::Combine( ::testing::ValuesIn(dataTypesVector), ::testing::ValuesIn(reshapeTestParams), diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_roialign.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_roialign.cpp index c3e55b5ce93..19f07085ace 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_roialign.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_roialign.cpp @@ -54,7 +54,7 @@ TEST_P(DSR_ROIAlignDataDSR, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(DISABLED_DynamicROIAlignDataDSR, DSR_ROIAlignDataDSR, +INSTANTIATE_TEST_SUITE_P(DISABLED_DynamicROIAlignDataDSR, DSR_ROIAlignDataDSR, ::testing::Combine( ::testing::Values( ngraph::element::f16, @@ -99,7 +99,7 @@ TEST_P(DSR_ROIAlignROIDSR, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(DISABLED_smoke_DynamicROIAlign, DSR_ROIAlignROIDSR, +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_DynamicROIAlign, DSR_ROIAlignROIDSR, ::testing::Combine( ::testing::Values( ngraph::element::f16, @@ -148,7 +148,7 @@ TEST_P(DSR_ROIAlign, CompareWithReference) { } // #-30909 -INSTANTIATE_TEST_CASE_P(DISABLED_smoke_DynamicROIAlign, DSR_ROIAlign, +INSTANTIATE_TEST_SUITE_P(DISABLED_smoke_DynamicROIAlign, DSR_ROIAlign, ::testing::Combine( ::testing::Values( ngraph::element::f16, diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_scatter.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_scatter.cpp index 0aa93b16d50..2871505b726 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_scatter.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_scatter.cpp @@ -44,7 +44,7 @@ TEST_P(DSR_Scatter, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicScatter, DSR_Scatter, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicScatter, DSR_Scatter, ::testing::Combine( testing::Values( ngraph::element::f16), diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_split.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_split.cpp index 0f8164bc831..2378fdcc518 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_split.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_split.cpp @@ -56,6 +56,6 @@ TEST_P(DSR_Split, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicSplit, DSR_Split, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_DynamicSplit, DSR_Split, combinations); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_squeeze.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_squeeze.cpp index ef6f8cfad1e..8399251b60d 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_squeeze.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_squeeze.cpp @@ -49,7 +49,7 @@ TEST_P(DSR_Squeeze, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicSqueeze, DSR_Squeeze, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicSqueeze, DSR_Squeeze, ::testing::Combine( ::testing::Values(ngraph::element::f16, ngraph::element::i32), ::testing::Values( diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_strided_slice.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_strided_slice.cpp index da7c6bd5530..0cb0bcb4211 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_strided_slice.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_strided_slice.cpp @@ -67,7 +67,7 @@ std::vector precisions = { ngraph::element::i32 }; -INSTANTIATE_TEST_CASE_P(smoke_StridedSlice, DSR_StridedSlice, +INSTANTIATE_TEST_SUITE_P(smoke_StridedSlice, DSR_StridedSlice, ::testing::Combine( ::testing::ValuesIn(testCases), ::testing::ValuesIn(precisions), diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_topk.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_topk.cpp index bafc3d9212c..554ff1774bf 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_topk.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_topk.cpp @@ -53,7 +53,7 @@ TEST_P(DSR_TopK_Const, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicTopKConst, DSR_TopK_Const, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_DynamicTopKConst, DSR_TopK_Const, combinations); class DSR_TopK : public testing::WithParamInterface, public DSR_TestsCommon { protected: @@ -83,6 +83,6 @@ TEST_P(DSR_TopK, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicTopKConst, DSR_TopK, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_DynamicTopKConst, DSR_TopK, combinations); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_unary_elementwise.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_unary_elementwise.cpp index 589bbaae849..472cf02ddef 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_unary_elementwise.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_unary_elementwise.cpp @@ -40,7 +40,7 @@ TEST_P(DSR_UnaryElementwise, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicUnaryElementwise, DSR_UnaryElementwise, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicUnaryElementwise, DSR_UnaryElementwise, ::testing::Combine( ::testing::Values(ngraph::element::f16, ngraph::element::f32), ::testing::Values(DataShapeWithUpperBound{ngraph::Shape{8, 800}, ngraph::Shape{10, 1000}}), diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_unsqueeze.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_unsqueeze.cpp index 998e7f3878c..014c61fbb93 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_unsqueeze.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_unsqueeze.cpp @@ -44,7 +44,7 @@ TEST_P(DSR_Unsqueeze, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicUnsqueeze, DSR_Unsqueeze, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicUnsqueeze, DSR_Unsqueeze, ::testing::Combine( ::testing::Values(ngraph::element::f16, ngraph::element::i32), ::testing::Values( diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_variadic_split.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_variadic_split.cpp index aead1503198..77bb741be24 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_variadic_split.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/dsr_variadic_split.cpp @@ -57,6 +57,6 @@ TEST_P(DSR_VariadicSplit, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicGatherData, DSR_VariadicSplit, combinations); +INSTANTIATE_TEST_SUITE_P(smoke_DynamicGatherData, DSR_VariadicSplit, combinations); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/gather_gather_elements.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/gather_gather_elements.cpp index e8abae995bb..09630d00540 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/gather_gather_elements.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/gather_gather_elements.cpp @@ -131,6 +131,6 @@ TEST_P(Gather_GatherElements, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_Gather_GatherElements, Gather_GatherElements, testing::Values(CommonTestUtils::DEVICE_MYRIAD)); +INSTANTIATE_TEST_SUITE_P(smoke_Gather_GatherElements, Gather_GatherElements, testing::Values(CommonTestUtils::DEVICE_MYRIAD)); } // namespace \ No newline at end of file diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nms_nonzero.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nms_nonzero.cpp index c71eeaceaaa..344e3acb3ea 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nms_nonzero.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nms_nonzero.cpp @@ -61,7 +61,7 @@ TEST_P(NMS_NonZero, CompareWithReference) { } // #-30919 -INSTANTIATE_TEST_CASE_P(DISABLED_DynamicNonMaxSupression, NMS_NonZero, +INSTANTIATE_TEST_SUITE_P(DISABLED_DynamicNonMaxSupression, NMS_NonZero, ::testing::Combine( ::testing::Values( ngraph::element::f16, diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nonzero_broadcast.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nonzero_broadcast.cpp index d739c1279ce..70d4a2fcd57 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nonzero_broadcast.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nonzero_broadcast.cpp @@ -136,7 +136,7 @@ std::vector broadcastTestParams = { { DataShapeWithUpperBound{ {128, 256}, {} }, DataShapeWithUpperBound{ {1, 128, 256}, {3, 128, 256} }, {1, 2} }, }; -INSTANTIATE_TEST_CASE_P(smoke_DynamicBroadcast, NonZero_Broadcast, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicBroadcast, NonZero_Broadcast, ::testing::Combine( ::testing::ValuesIn(broadcastTestParams), ::testing::Values(ngraph::element::f16, ngraph::element::f32, ngraph::element::i32), diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nonzero_transpose.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nonzero_transpose.cpp index 9a446b4f727..290838ec3fa 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nonzero_transpose.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/nonzero_transpose.cpp @@ -43,7 +43,7 @@ TEST_P(NonZero_Transpose, CompareWithReference) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_DynamicTranspose, NonZero_Transpose, +INSTANTIATE_TEST_SUITE_P(smoke_DynamicTranspose, NonZero_Transpose, ::testing::Combine( ::testing::Values(ngraph::element::f16, ngraph::element::f32, ngraph::element::i32), ::testing::Values(ngraph::Shape{1, 800}), diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/parameter_result.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/parameter_result.cpp index 57866f28dde..3001e5b7e1b 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/parameter_result.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/parameter_result.cpp @@ -8,7 +8,7 @@ using namespace SubgraphTestsDefinitions; namespace { -INSTANTIATE_TEST_CASE_P(smoke_Check, ParameterResultSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_Check, ParameterResultSubgraphTest, ::testing::Values(CommonTestUtils::DEVICE_MYRIAD), ParameterResultSubgraphTest::getTestCaseName); diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/parameter_shapeof_result.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/parameter_shapeof_result.cpp index d47af641a3c..bb484899b3f 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/parameter_shapeof_result.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/parameter_shapeof_result.cpp @@ -8,7 +8,7 @@ using namespace SubgraphTestsDefinitions; namespace { -INSTANTIATE_TEST_CASE_P(smoke_Check, ParameterShapeOfResultSubgraphTest, +INSTANTIATE_TEST_SUITE_P(smoke_Check, ParameterShapeOfResultSubgraphTest, ::testing::Combine( ::testing::Values( ngraph::element::f32, diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/topk_k_propagation.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/topk_k_propagation.cpp index e5a6c520a4b..9c5199b0adb 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/topk_k_propagation.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/topk_k_propagation.cpp @@ -77,7 +77,7 @@ const std::vector kVec = {0, 10, 100, 200, 500}; TEST_P(DynamicToStaticTopKPropagationConcatBased, KPropagation) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticTopKPropagationConcatBased, ::testing::ValuesIn(kVec)); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticTopKPropagationConcatBased, ::testing::ValuesIn(kVec)); class DynamicToStaticTopKPropagationConcatReshape : public DynamicToStaticTopKPropagationConcatBased { protected: @@ -89,7 +89,7 @@ protected: TEST_P(DynamicToStaticTopKPropagationConcatReshape, KPropagation) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticTopKPropagationConcatReshape, ::testing::ValuesIn(kVec)); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticTopKPropagationConcatReshape, ::testing::ValuesIn(kVec)); class DynamicToStaticTopKPropagationConcatSqueezeUnsqueeze : public DynamicToStaticTopKPropagationConcatBased { protected: @@ -104,7 +104,7 @@ protected: TEST_P(DynamicToStaticTopKPropagationConcatSqueezeUnsqueeze, KPropagation) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticTopKPropagationConcatSqueezeUnsqueeze, ::testing::ValuesIn(kVec)); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticTopKPropagationConcatSqueezeUnsqueeze, ::testing::ValuesIn(kVec)); class DynamicToStaticTopKPropagationConcatConvert : public DynamicToStaticTopKPropagationConcatBased { protected: @@ -117,7 +117,7 @@ protected: TEST_P(DynamicToStaticTopKPropagationConcatConvert, KPropagation) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticTopKPropagationConcatConvert, ::testing::ValuesIn(kVec)); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticTopKPropagationConcatConvert, ::testing::ValuesIn(kVec)); class DynamicToStaticTopKPropagationShapeOfBased : public DynamicToStaticTopKPropagationBase { public: @@ -163,7 +163,7 @@ protected: TEST_P(DynamicToStaticTopKPropagationShapeOfGather, KPropagation) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, DynamicToStaticTopKPropagationShapeOfGather, ::testing::ValuesIn(kVec)); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, DynamicToStaticTopKPropagationShapeOfGather, ::testing::ValuesIn(kVec)); class KPropagationAfterShapeOfElimination : public DynamicToStaticTopKPropagationShapeOfBased { void SetUp() override { @@ -209,6 +209,6 @@ class KPropagationAfterShapeOfElimination : public DynamicToStaticTopKPropagatio TEST_P(KPropagationAfterShapeOfElimination, KPropagation) { } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, KPropagationAfterShapeOfElimination, ::testing::ValuesIn(kVec)); +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, KPropagationAfterShapeOfElimination, ::testing::ValuesIn(kVec)); } // namespace diff --git a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/unsqueeze_gather.cpp b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/unsqueeze_gather.cpp index c3d3e5ba9e7..65e1d0def46 100644 --- a/inference-engine/tests/functional/plugin/myriad/subgraph_tests/unsqueeze_gather.cpp +++ b/inference-engine/tests/functional/plugin/myriad/subgraph_tests/unsqueeze_gather.cpp @@ -48,7 +48,7 @@ TEST_P(UnsqueezeGather, CompareWithRefs) { Run(); } -INSTANTIATE_TEST_CASE_P(smoke_NGraph, UnsqueezeGather, testing::Combine( +INSTANTIATE_TEST_SUITE_P(smoke_NGraph, UnsqueezeGather, testing::Combine( testing::Values( ngraph::element::f16, ngraph::element::f32), diff --git a/inference-engine/tests/functional/plugin/shared/src/behavior/caching_tests.cpp b/inference-engine/tests/functional/plugin/shared/src/behavior/caching_tests.cpp index 0f8f97c6534..167afc80b6e 100644 --- a/inference-engine/tests/functional/plugin/shared/src/behavior/caching_tests.cpp +++ b/inference-engine/tests/functional/plugin/shared/src/behavior/caching_tests.cpp @@ -139,7 +139,7 @@ void LoadNetworkCacheTestBase::SetUp() { try { function = fGen(m_precision, m_batchSize); } catch (...) { - SKIP(); + GTEST_SKIP(); } std::stringstream ss; @@ -168,11 +168,11 @@ void LoadNetworkCacheTestBase::Run() { }; if (!function) { GTEST_COUT << "Can't create function " << m_functionName << " with precision " << m_precision.get_type_name() << std::endl; - SKIP(); + GTEST_SKIP(); } if (!importExportSupported(*core)) { GTEST_COUT << "Plugin doesn't support import and export - skipping test" << std::endl; - SKIP(); + GTEST_SKIP(); } cnnNetwork = CNNNetwork{function}; ConfigureNetwork(); @@ -183,10 +183,10 @@ void LoadNetworkCacheTestBase::Run() { } catch (const Exception &ex) { GTEST_COUT << "Can't loadNetwork without cache for " << m_functionName << " with precision " << m_precision.get_type_name() << std::endl; GTEST_COUT << "Exception [" << ex.what() << "]" << std::endl; - SKIP(); + GTEST_SKIP(); } catch (...) { GTEST_COUT << "Can't loadNetwork without cache for " << m_functionName << " with precision " << m_precision.get_type_name() << std::endl; - SKIP(); // skip caching test if such network is not supported by device at all + GTEST_SKIP(); // skip caching test if such network is not supported by device at all } auto originalOutputs = GetOutputs(); diff --git a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/non_max_suppression.hpp b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/non_max_suppression.hpp index d608a7e7526..67b0f595178 100644 --- a/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/non_max_suppression.hpp +++ b/inference-engine/tests/functional/shared_test_classes/include/shared_test_classes/single_layer/non_max_suppression.hpp @@ -10,6 +10,16 @@ #include "shared_test_classes/base/layer_test_utils.hpp" #include "ngraph_functions/builders.hpp" +namespace testing { +namespace internal { + +template <> inline void +PrintTo(const ::ngraph::op::v5::NonMaxSuppression::BoxEncodingType& value, + ::std::ostream* os) { } + +} +} + namespace LayerTestsDefinitions { using InputShapeParams = std::tuple +::std::ostream& ngraph::operator << (::std::ostream & os, const Function&) { + throw std::runtime_error("should not be called"); + return os; +} + namespace CommonTestUtils { IE_SUPPRESS_DEPRECATED_START diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp b/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp index dc6aaf2e051..39ea049ba1a 100644 --- a/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp +++ b/inference-engine/tests/ie_test_utils/common_test_utils/common_utils.hpp @@ -15,6 +15,11 @@ #include #include +#include + +namespace ngraph { +::std::ostream& operator << (::std::ostream &, const Function&); +} namespace InferenceEngine { class CNNLayer; diff --git a/inference-engine/tests/ie_test_utils/common_test_utils/gtest b/inference-engine/tests/ie_test_utils/common_test_utils/gtest deleted file mode 160000 index 9bd163b9934..00000000000 --- a/inference-engine/tests/ie_test_utils/common_test_utils/gtest +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9bd163b993459b2ca6ba2dc508577bbc8774c851 diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mock.cpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mock.cpp index 980044f8d02..9cc7309c1c9 100644 --- a/inference-engine/tests/ie_test_utils/unit_test_utils/mock.cpp +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mock.cpp @@ -14,6 +14,7 @@ #include "unit_test_utils/mocks/cpp_interfaces/impl/mock_executable_thread_safe_default.hpp" #include "unit_test_utils/mocks/cpp_interfaces/impl/mock_inference_plugin_internal.hpp" +#include "unit_test_utils/mocks/cpp_interfaces/interface/mock_icore.hpp" #include "unit_test_utils/mocks/cpp_interfaces/interface/mock_iexecutable_network_internal.hpp" #include "unit_test_utils/mocks/cpp_interfaces/interface/mock_iinfer_request_internal.hpp" #include "unit_test_utils/mocks/cpp_interfaces/interface/mock_ivariable_state_internal.hpp" diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_icore.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_icore.hpp index f84f4086e34..b061c4c3bdc 100644 --- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_icore.hpp +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_icore.hpp @@ -9,10 +9,10 @@ class MockICore : public InferenceEngine::ICore { public: - MOCK_QUALIFIED_METHOD0(GetTaskExecutor, const, std::shared_ptr()); + MOCK_CONST_METHOD0(GetTaskExecutor, std::shared_ptr()); - MOCK_QUALIFIED_METHOD2(ReadNetwork, const, InferenceEngine::CNNNetwork(const std::string&, const InferenceEngine::Blob::CPtr&)); - MOCK_QUALIFIED_METHOD2(ReadNetwork, const, InferenceEngine::CNNNetwork(const std::string&, const std::string&)); + MOCK_CONST_METHOD2(ReadNetwork, InferenceEngine::CNNNetwork(const std::string&, const InferenceEngine::Blob::CPtr&)); + MOCK_CONST_METHOD2(ReadNetwork, InferenceEngine::CNNNetwork(const std::string&, const std::string&)); MOCK_METHOD3(LoadNetwork, InferenceEngine::SoExecutableNetworkInternal( const InferenceEngine::CNNNetwork&, const std::string&, const std::map&)); @@ -26,12 +26,12 @@ public: MOCK_METHOD3(ImportNetwork, InferenceEngine::SoExecutableNetworkInternal( std::istream&, const InferenceEngine::RemoteContext::Ptr&, const std::map&)); - MOCK_QUALIFIED_METHOD3(QueryNetwork, const, InferenceEngine::QueryNetworkResult( + MOCK_CONST_METHOD3(QueryNetwork, InferenceEngine::QueryNetworkResult( const InferenceEngine::CNNNetwork&, const std::string&, const std::map&)); - MOCK_QUALIFIED_METHOD2(GetMetric, const, InferenceEngine::Parameter(const std::string&, const std::string&)); - MOCK_QUALIFIED_METHOD0(GetAvailableDevices, const, std::vector()); - MOCK_QUALIFIED_METHOD1(DeviceSupportsImportExport, const, bool(const std::string&)); // NOLINT not a cast to bool + MOCK_CONST_METHOD2(GetMetric, InferenceEngine::Parameter(const std::string&, const std::string&)); + MOCK_CONST_METHOD0(GetAvailableDevices, std::vector()); + MOCK_CONST_METHOD1(DeviceSupportsImportExport, bool(const std::string&)); // NOLINT not a cast to bool ~MockICore() = default; }; diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_iinference_plugin.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_iinference_plugin.hpp index 083a529e121..f6bc2a47953 100644 --- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_iinference_plugin.hpp +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/cpp_interfaces/interface/mock_iinference_plugin.hpp @@ -7,8 +7,8 @@ #include #include -#include "cpp_interfaces/interface/ie_iplugin_internal.hpp" #include +#include "cpp_interfaces/interface/ie_iplugin_internal.hpp" class MockIInferencePlugin : public InferenceEngine::IInferencePlugin { public: @@ -21,13 +21,13 @@ public: const std::string&, const std::map&)); MOCK_METHOD1(SetConfig, void(const std::map &)); - MOCK_QUALIFIED_METHOD1(SetName, noexcept, void(const std::string&)); - MOCK_QUALIFIED_METHOD0(GetName, const noexcept, std::string(void)); - MOCK_QUALIFIED_METHOD1(SetCore, noexcept, void(InferenceEngine::ICore*)); - MOCK_QUALIFIED_METHOD0(GetCore, const noexcept, InferenceEngine::ICore *(void)); - MOCK_QUALIFIED_METHOD2(GetConfig, const, InferenceEngine::Parameter( + MOCK_METHOD(void, SetName, (const std::string&), (noexcept)); + MOCK_METHOD(std::string, GetName, (), (const, noexcept)); + MOCK_METHOD(void, SetCore, (InferenceEngine::ICore*), (noexcept)); + MOCK_METHOD(InferenceEngine::ICore *, GetCore, (), (const, noexcept)); + MOCK_CONST_METHOD2(GetConfig, InferenceEngine::Parameter( const std::string&, const std::map&)); - MOCK_QUALIFIED_METHOD2(GetMetric, const, InferenceEngine::Parameter( + MOCK_CONST_METHOD2(GetMetric, InferenceEngine::Parameter( const std::string&, const std::map&)); MOCK_METHOD1(CreateContext, InferenceEngine::RemoteContext::Ptr(const InferenceEngine::ParamMap&)); @@ -40,7 +40,7 @@ public: MOCK_METHOD3(ImportNetwork, std::shared_ptr( std::istream&, const InferenceEngine::RemoteContext::Ptr&, const std::map&)); - MOCK_QUALIFIED_METHOD2(QueryNetwork, const, - InferenceEngine::QueryNetworkResult(const InferenceEngine::CNNNetwork&, - const std::map&)); + MOCK_CONST_METHOD2(QueryNetwork, + InferenceEngine::QueryNetworkResult(const InferenceEngine::CNNNetwork&, + const std::map&)); }; diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_allocator.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_allocator.hpp index 47b77d999e0..83af019e434 100644 --- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_allocator.hpp +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_allocator.hpp @@ -14,8 +14,8 @@ class MockAllocator : public InferenceEngine::IAllocator { public: - MOCK_QUALIFIED_METHOD2(lock, noexcept, void*(void*, InferenceEngine::LockOp)); - MOCK_QUALIFIED_METHOD1(unlock, noexcept, void(void *)); - MOCK_QUALIFIED_METHOD1(alloc, noexcept, void*(size_t)); - MOCK_QUALIFIED_METHOD1(free, noexcept, bool(void*)); // NOLINT(readability/casting) + MOCK_METHOD(void*, lock, (void*, InferenceEngine::LockOp), (noexcept)); + MOCK_METHOD(void, unlock, (void *), (noexcept)); + MOCK_METHOD(void*, alloc, (size_t), (noexcept)); + MOCK_METHOD(bool, free, (void*), (noexcept)); // NOLINT(readability/casting) }; diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_icnn_network.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_icnn_network.hpp index 618122505a4..a3f7d337dd0 100644 --- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_icnn_network.hpp +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_icnn_network.hpp @@ -27,23 +27,25 @@ class CNNLayer; */ class MockICNNNetwork final : public InferenceEngine::ICNNNetwork { public: - MOCK_QUALIFIED_METHOD0(getFunction, const noexcept, std::shared_ptr ()); - MOCK_QUALIFIED_METHOD0(getFunction, noexcept, std::shared_ptr()); - MOCK_QUALIFIED_METHOD1(getOutputsInfo, const noexcept, void(InferenceEngine::OutputsDataMap& out)); - MOCK_QUALIFIED_METHOD1(getInputsInfo, const noexcept, void(InferenceEngine::InputsDataMap &inputs)); - MOCK_QUALIFIED_METHOD1(getInput, const noexcept, InferenceEngine::InputInfo::Ptr(const std::string &inputName)); - MOCK_QUALIFIED_METHOD0(layerCount, const noexcept, size_t()); - MOCK_QUALIFIED_METHOD0(getName, const noexcept, const std::string&()); - MOCK_QUALIFIED_METHOD3(addOutput, noexcept, InferenceEngine::StatusCode(const std::string &, size_t, InferenceEngine::ResponseDesc*)); - MOCK_QUALIFIED_METHOD3(getLayerByName, const noexcept, InferenceEngine::StatusCode(const char* , - std::shared_ptr&, - InferenceEngine::ResponseDesc*)); - MOCK_QUALIFIED_METHOD2(setBatchSize, noexcept, InferenceEngine::StatusCode(const size_t size, InferenceEngine::ResponseDesc*)); - MOCK_QUALIFIED_METHOD0(getBatchSize, const noexcept, size_t()); - MOCK_QUALIFIED_METHOD1(getInputShapes, const noexcept, void(InferenceEngine::ICNNNetwork::InputShapes&)); - MOCK_QUALIFIED_METHOD2(reshape, noexcept, InferenceEngine::StatusCode(const InferenceEngine::ICNNNetwork::InputShapes &, InferenceEngine::ResponseDesc *)); - MOCK_QUALIFIED_METHOD3(serialize, const noexcept, InferenceEngine::StatusCode( - const std::string &, - const std::string &, - InferenceEngine::ResponseDesc*)); + MOCK_METHOD(std::shared_ptr, getFunction, (), (const, noexcept)); + MOCK_METHOD(std::shared_ptr, getFunction, (), (noexcept)); + MOCK_METHOD(void, getOutputsInfo, (InferenceEngine::OutputsDataMap& out), (const, noexcept)); + MOCK_METHOD(void, getInputsInfo, (InferenceEngine::InputsDataMap &inputs), (const, noexcept)); + MOCK_METHOD(InferenceEngine::InputInfo::Ptr, getInput, (const std::string &inputName), (const, noexcept)); + MOCK_METHOD(size_t, layerCount, (), (const, noexcept)); + MOCK_METHOD(const std::string&, getName, (), (const, noexcept)); + MOCK_METHOD(InferenceEngine::StatusCode, addOutput, + (const std::string &, size_t, InferenceEngine::ResponseDesc*), (noexcept)); + MOCK_METHOD(InferenceEngine::StatusCode, getLayerByName, + (const char* , std::shared_ptr&, InferenceEngine::ResponseDesc*), + (const, noexcept)); + MOCK_METHOD(InferenceEngine::StatusCode, setBatchSize, + (const size_t size, InferenceEngine::ResponseDesc*), (noexcept)); + MOCK_METHOD(size_t, getBatchSize, (), (const, noexcept)); + MOCK_METHOD(void, getInputShapes, (InferenceEngine::ICNNNetwork::InputShapes&), (const, noexcept)); + MOCK_METHOD(InferenceEngine::StatusCode, reshape, + (const InferenceEngine::ICNNNetwork::InputShapes &, InferenceEngine::ResponseDesc *), + (const, noexcept)); + MOCK_METHOD(InferenceEngine::StatusCode, serialize, + (const std::string &, const std::string &, InferenceEngine::ResponseDesc*), (const, noexcept)); }; diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_iexecutable_network.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_iexecutable_network.hpp index a5187953206..5a6779f12ab 100644 --- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_iexecutable_network.hpp +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_iexecutable_network.hpp @@ -22,16 +22,20 @@ IE_SUPPRESS_DEPRECATED_START class MockIExecutableNetwork : public IExecutableNetwork { public: - MOCK_QUALIFIED_METHOD2(GetOutputsInfo, const noexcept, StatusCode(ConstOutputsDataMap &, ResponseDesc *)); - MOCK_QUALIFIED_METHOD2(GetInputsInfo, const noexcept, StatusCode(ConstInputsDataMap &, ResponseDesc *)); - MOCK_QUALIFIED_METHOD2(CreateInferRequest, noexcept, StatusCode(IInferRequest::Ptr &, ResponseDesc*)); - MOCK_QUALIFIED_METHOD2(Export, noexcept, StatusCode(const std::string &, ResponseDesc*)); - MOCK_QUALIFIED_METHOD2(Export, noexcept, StatusCode(std::ostream &, ResponseDesc *)); - MOCK_QUALIFIED_METHOD2(GetExecGraphInfo, noexcept, StatusCode(ICNNNetwork::Ptr &, ResponseDesc*)); - MOCK_QUALIFIED_METHOD2(SetConfig, noexcept, StatusCode(const std::map &config, ResponseDesc *resp)); - MOCK_QUALIFIED_METHOD3(GetConfig, const noexcept, StatusCode(const std::string &name, Parameter &result, ResponseDesc *resp)); - MOCK_QUALIFIED_METHOD3(GetMetric, const noexcept, StatusCode(const std::string &name, Parameter &result, ResponseDesc *resp)); - MOCK_QUALIFIED_METHOD2(GetContext, const noexcept, StatusCode(RemoteContext::Ptr &pContext, ResponseDesc *resp)); + MOCK_METHOD(StatusCode, GetOutputsInfo, (ConstOutputsDataMap &, ResponseDesc *), (const, noexcept)); + MOCK_METHOD(StatusCode, GetInputsInfo, (ConstInputsDataMap &, ResponseDesc *), (const, noexcept)); + MOCK_METHOD(StatusCode, CreateInferRequest, (IInferRequest::Ptr &, ResponseDesc*), (noexcept)); + MOCK_METHOD(StatusCode, Export, (const std::string &, ResponseDesc*), (noexcept)); + MOCK_METHOD(StatusCode, Export, (std::ostream &, ResponseDesc *), (noexcept)); + MOCK_METHOD(StatusCode, GetExecGraphInfo, (ICNNNetwork::Ptr &, ResponseDesc*), (noexcept)); + MOCK_METHOD(StatusCode, SetConfig, + ((const std::map &config), ResponseDesc *resp), (noexcept)); + MOCK_METHOD(StatusCode, GetConfig, + (const std::string &name, Parameter &result, ResponseDesc *resp), (const, noexcept)); + MOCK_METHOD(StatusCode, GetMetric, + (const std::string &name, Parameter &result, ResponseDesc *resp), (const, noexcept)); + MOCK_METHOD(StatusCode, GetContext, + (RemoteContext::Ptr &pContext, ResponseDesc *resp), (const, noexcept)); }; IE_SUPPRESS_DEPRECATED_END diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_iinfer_request.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_iinfer_request.hpp index bac5fc7773e..32060d0138a 100644 --- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_iinfer_request.hpp +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_iinfer_request.hpp @@ -22,20 +22,22 @@ IE_SUPPRESS_DEPRECATED_START class MockIInferRequest : public IInferRequest { public: - MOCK_QUALIFIED_METHOD1(StartAsync, noexcept, StatusCode(ResponseDesc*)); - MOCK_QUALIFIED_METHOD2(Wait, noexcept, StatusCode(int64_t millis_timeout, ResponseDesc*)); - MOCK_QUALIFIED_METHOD2(GetUserData, noexcept, StatusCode(void**, ResponseDesc*)); - MOCK_QUALIFIED_METHOD2(SetUserData, noexcept, StatusCode(void*, ResponseDesc*)); - MOCK_QUALIFIED_METHOD1(SetCompletionCallback, noexcept, StatusCode(IInferRequest::CompletionCallback)); - MOCK_QUALIFIED_METHOD1(Infer, noexcept, StatusCode(ResponseDesc*)); - MOCK_QUALIFIED_METHOD2(GetPerformanceCounts, const noexcept, - StatusCode(std::map &perfMap, ResponseDesc*)); - MOCK_QUALIFIED_METHOD3(GetBlob, noexcept, StatusCode(const char*, Blob::Ptr&, ResponseDesc*)); - MOCK_QUALIFIED_METHOD3(GetPreProcess, const noexcept, StatusCode(const char*, const PreProcessInfo**, ResponseDesc*)); - MOCK_QUALIFIED_METHOD3(SetBlob, noexcept, StatusCode(const char*, const Blob::Ptr&, ResponseDesc*)); - MOCK_QUALIFIED_METHOD4(SetBlob, noexcept, StatusCode(const char*, const Blob::Ptr&, const PreProcessInfo&, ResponseDesc*)); - MOCK_QUALIFIED_METHOD2(SetBatch, noexcept, StatusCode(int batch, ResponseDesc*)); - MOCK_QUALIFIED_METHOD1(Cancel, noexcept, InferenceEngine::StatusCode(ResponseDesc*)); + MOCK_METHOD(StatusCode, StartAsync, (ResponseDesc*), (noexcept)); + MOCK_METHOD(StatusCode, Wait, (int64_t, ResponseDesc*), (noexcept)); + MOCK_METHOD(StatusCode, GetUserData, (void**, ResponseDesc*), (noexcept)); + MOCK_METHOD(StatusCode, SetUserData, (void*, ResponseDesc*), (noexcept)); + MOCK_METHOD(StatusCode, SetCompletionCallback, (IInferRequest::CompletionCallback), (noexcept)); + MOCK_METHOD(StatusCode, Infer, (ResponseDesc*), (noexcept)); + MOCK_METHOD(StatusCode, GetPerformanceCounts, + ((std::map &), ResponseDesc*), (const, noexcept)); + MOCK_METHOD(StatusCode, GetBlob, (const char*, Blob::Ptr&, ResponseDesc*), (noexcept)); + MOCK_METHOD(StatusCode, GetPreProcess, + (const char*, const PreProcessInfo**, ResponseDesc*), (const, noexcept)); + MOCK_METHOD(StatusCode, SetBlob, (const char*, const Blob::Ptr&, ResponseDesc*), (noexcept)); + MOCK_METHOD(StatusCode, SetBlob, + (const char*, const Blob::Ptr&, const PreProcessInfo&, ResponseDesc*), (noexcept)); + MOCK_METHOD(StatusCode, SetBatch, (int batch, ResponseDesc*), (noexcept)); + MOCK_METHOD(StatusCode, Cancel, (ResponseDesc*), (noexcept)); }; IE_SUPPRESS_DEPRECATED_END diff --git a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_not_empty_icnn_network.hpp b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_not_empty_icnn_network.hpp index 814336b887b..f9ffeab2f2d 100644 --- a/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_not_empty_icnn_network.hpp +++ b/inference-engine/tests/ie_test_utils/unit_test_utils/mocks/mock_not_empty_icnn_network.hpp @@ -34,14 +34,15 @@ public: std::shared_ptr getFunction() const noexcept override { return nullptr; } - MOCK_QUALIFIED_METHOD1(getInput, const noexcept, InputInfo::Ptr(const std::string &inputName)); - MOCK_QUALIFIED_METHOD0(layerCount, const noexcept, size_t()); - MOCK_QUALIFIED_METHOD3(addOutput, noexcept, StatusCode(const std::string &, size_t , ResponseDesc*)); - MOCK_QUALIFIED_METHOD2(setBatchSize, noexcept, StatusCode(const size_t size, ResponseDesc*)); - MOCK_QUALIFIED_METHOD0(getBatchSize, const noexcept, size_t()); - MOCK_QUALIFIED_METHOD1(getInputShapes, const noexcept, void(ICNNNetwork::InputShapes &)); - MOCK_QUALIFIED_METHOD2(reshape, noexcept, StatusCode(const ICNNNetwork::InputShapes &, ResponseDesc *)); - MOCK_QUALIFIED_METHOD3(serialize, const noexcept, StatusCode(const std::string &, const std::string &, InferenceEngine::ResponseDesc*)); + MOCK_METHOD(InputInfo::Ptr, getInput, (const std::string &inputName), (const, noexcept)); + MOCK_METHOD(size_t, layerCount, (), (const, noexcept)); + MOCK_METHOD(StatusCode, addOutput, (const std::string &, size_t , ResponseDesc*), (noexcept)); + MOCK_METHOD(StatusCode, setBatchSize, (const size_t size, ResponseDesc*), (noexcept)); + MOCK_METHOD(size_t, getBatchSize, (), (const, noexcept)); + MOCK_METHOD(void, getInputShapes, (ICNNNetwork::InputShapes &), (const, noexcept)); + MOCK_METHOD(StatusCode, reshape, (const ICNNNetwork::InputShapes &, ResponseDesc *), (noexcept)); + MOCK_METHOD(StatusCode, serialize, + (const std::string &, const std::string &, InferenceEngine::ResponseDesc*), (const, noexcept)); }; IE_SUPPRESS_DEPRECATED_END diff --git a/inference-engine/tests/unit/cpu/mkldnn_memory_desc_test.cpp b/inference-engine/tests/unit/cpu/mkldnn_memory_desc_test.cpp index ee7684cca24..fd828df6dd9 100644 --- a/inference-engine/tests/unit/cpu/mkldnn_memory_desc_test.cpp +++ b/inference-engine/tests/unit/cpu/mkldnn_memory_desc_test.cpp @@ -131,23 +131,23 @@ TEST(MemDescTest, isTailCCheck) { } TEST(MemDescTest, constructWithPlainFormat) { - SKIP(); + GTEST_SKIP(); } TEST(MemDescTest, CheckScalar) { - SKIP(); + GTEST_SKIP(); } TEST(MemDescTest, UpperBound) { - SKIP(); + GTEST_SKIP(); } TEST(MemDescTest, BlockedConversion) { - SKIP(); + GTEST_SKIP(); } TEST(MemDescTest, ComaptibleWithFormat) { - SKIP(); + GTEST_SKIP(); } TEST(isSameMethodTest, CheckTensorWithSameStrides) { diff --git a/inference-engine/tests/unit/cpu/mkldnn_memory_test.cpp b/inference-engine/tests/unit/cpu/mkldnn_memory_test.cpp index 41e2d42cf7b..7b46e154617 100644 --- a/inference-engine/tests/unit/cpu/mkldnn_memory_test.cpp +++ b/inference-engine/tests/unit/cpu/mkldnn_memory_test.cpp @@ -11,9 +11,9 @@ using namespace MKLDNNPlugin; using namespace InferenceEngine; TEST(MemoryTest, SedDataCheck) { - SKIP(); + GTEST_SKIP(); } TEST(MemoryTest, SedDataWithAutoPadCheck) { - SKIP(); + GTEST_SKIP(); } diff --git a/inference-engine/tests/unit/inference_engine/cpp_interfaces/ie_infer_async_request_base_test.cpp b/inference-engine/tests/unit/inference_engine/cpp_interfaces/ie_infer_async_request_base_test.cpp index d0cde74580c..6fbb50abe3e 100644 --- a/inference-engine/tests/unit/inference_engine/cpp_interfaces/ie_infer_async_request_base_test.cpp +++ b/inference-engine/tests/unit/inference_engine/cpp_interfaces/ie_infer_async_request_base_test.cpp @@ -3,8 +3,7 @@ // #include -#include -#include +#include #include #include diff --git a/inference-engine/tests/unit/inference_engine/cpp_interfaces/ie_memory_state_internal_test.cpp b/inference-engine/tests/unit/inference_engine/cpp_interfaces/ie_memory_state_internal_test.cpp index 83712bf6fd5..f35afd674e4 100644 --- a/inference-engine/tests/unit/inference_engine/cpp_interfaces/ie_memory_state_internal_test.cpp +++ b/inference-engine/tests/unit/inference_engine/cpp_interfaces/ie_memory_state_internal_test.cpp @@ -184,18 +184,16 @@ TEST_F(VariableStateTests, VariableStateCanPropagateSetState) { TEST_F(VariableStateTests, VariableStateCanPropagateGetLastState) { IE_SUPPRESS_DEPRECATED_START std::vector toReturn; + toReturn.push_back(mockVariableStateInternal); float data[] = {123, 124, 125}; auto stateBlob = make_shared_blob({ Precision::FP32, {3}, C }, data, sizeof(data) / sizeof(*data)); - - toReturn.push_back(mockVariableStateInternal); - EXPECT_CALL(*mockExeNetworkInternal.get(), QueryState()).WillRepeatedly(Return(toReturn)); EXPECT_CALL(*mockVariableStateInternal.get(), GetState()).WillOnce(Return(stateBlob)); - auto saver = net->QueryState().front()->GetState(); + ASSERT_NE(saver, nullptr); ASSERT_FLOAT_EQ(saver->cbuffer().as()[0], 123); ASSERT_FLOAT_EQ(saver->cbuffer().as()[1], 124); ASSERT_FLOAT_EQ(saver->cbuffer().as()[2], 125); @@ -222,6 +220,7 @@ TEST_F(VariableStateTests, VariableStateInternalCanSaveState) { pState->SetState(stateBlob); auto saver = pState->GetState(); + ASSERT_NE(saver, nullptr); ASSERT_FLOAT_EQ(saver->cbuffer().as()[0], 123); ASSERT_FLOAT_EQ(saver->cbuffer().as()[1], 124); ASSERT_FLOAT_EQ(saver->cbuffer().as()[2], 125); @@ -240,6 +239,7 @@ TEST_F(VariableStateTests, VariableStateInternalCanSaveStateByReference) { data[2] = 123; auto saver = pState->GetState(); + ASSERT_NE(saver, nullptr); ASSERT_FLOAT_EQ(saver->cbuffer().as()[0], 121); ASSERT_FLOAT_EQ(saver->cbuffer().as()[1], 122); ASSERT_FLOAT_EQ(saver->cbuffer().as()[2], 123); @@ -338,6 +338,7 @@ TEST_F(VariableStateTests, InfReqVariableStateCanPropagateGetLastState) { EXPECT_CALL(*mockVariableStateInternal.get(), GetState()).WillOnce(Return(stateBlob)); auto saver = req->QueryState().front()->GetState(); + ASSERT_NE(saver, nullptr); ASSERT_FLOAT_EQ(saver->cbuffer().as()[0], 123); ASSERT_FLOAT_EQ(saver->cbuffer().as()[1], 124); ASSERT_FLOAT_EQ(saver->cbuffer().as()[2], 125); diff --git a/inference-engine/tests/unit/vpu/blob_reader_tests.cpp b/inference-engine/tests/unit/vpu/blob_reader_tests.cpp index 0092c540885..5cb73484281 100644 --- a/inference-engine/tests/unit/vpu/blob_reader_tests.cpp +++ b/inference-engine/tests/unit/vpu/blob_reader_tests.cpp @@ -199,6 +199,6 @@ TEST_P(VPUBlobReaderOutputTests, canGetCorrectOutputNamesFromImportedNetwork) { const std::vector inputShape = {{1, 4, 10, 10}}; -INSTANTIATE_TEST_CASE_P(myriadBlobReader_nightly, VPUBlobReaderHeaderTests, ::testing::Values(inputShape)); -INSTANTIATE_TEST_CASE_P(myriadBlobReader_nightly, VPUBlobReaderInputTests, ::testing::Values(inputShape)); -INSTANTIATE_TEST_CASE_P(myriadBlobReader_nightly, VPUBlobReaderOutputTests, ::testing::Values(inputShape)); +INSTANTIATE_TEST_SUITE_P(myriadBlobReader_nightly, VPUBlobReaderHeaderTests, ::testing::Values(inputShape)); +INSTANTIATE_TEST_SUITE_P(myriadBlobReader_nightly, VPUBlobReaderInputTests, ::testing::Values(inputShape)); +INSTANTIATE_TEST_SUITE_P(myriadBlobReader_nightly, VPUBlobReaderOutputTests, ::testing::Values(inputShape)); diff --git a/inference-engine/tests/unit/vpu/middleend_tests/passes_tests/annotate_memory_types.cpp b/inference-engine/tests/unit/vpu/middleend_tests/passes_tests/annotate_memory_types.cpp index 14e73c28cc7..cb4bd63f44c 100644 --- a/inference-engine/tests/unit/vpu/middleend_tests/passes_tests/annotate_memory_types.cpp +++ b/inference-engine/tests/unit/vpu/middleend_tests/passes_tests/annotate_memory_types.cpp @@ -103,7 +103,7 @@ private: TEST_P(AnnotateMemoryTypes, SubgraphOf3Stages) { } -INSTANTIATE_TEST_CASE_P(unit, AnnotateMemoryTypes, testing::Combine( +INSTANTIATE_TEST_SUITE_P(unit, AnnotateMemoryTypes, testing::Combine( testing::Combine( testing::Values(MemoryType::DDR, MemoryType::CMX), testing::Values(MemoryType::DDR, MemoryType::CMX), diff --git a/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/aot_behavior_tests.cpp b/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/aot_behavior_tests.cpp index 99617e16f3b..b67029dbedc 100644 --- a/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/aot_behavior_tests.cpp +++ b/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/aot_behavior_tests.cpp @@ -202,6 +202,6 @@ const BehTestParams vpuValues[] = { BEH_MYRIAD, }; -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTest, AOTBehaviorTests, ValuesIn(vpuValues), getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest, AOTBehaviorTests, ValuesIn(vpuValues), getTestCaseName); #endif diff --git a/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_boot_tests.cpp b/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_boot_tests.cpp index e96bcbe408c..0998c48e25c 100644 --- a/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_boot_tests.cpp +++ b/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_boot_tests.cpp @@ -96,4 +96,4 @@ const BehTestParams vpuValues[] = { BEH_MYRIAD, }; -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTest, MYRIADBoot, ValuesIn(vpuValues), getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest, MYRIADBoot, ValuesIn(vpuValues), getTestCaseName); diff --git a/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_protocol_tests.cpp b/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_protocol_tests.cpp index 8f987c7c399..50b345866c9 100644 --- a/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_protocol_tests.cpp +++ b/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_protocol_tests.cpp @@ -48,7 +48,7 @@ TEST_P(MyriadProtocolTests, NoErrorsMessagesWhenLoadNetworkSuccessful) { } } -INSTANTIATE_TEST_CASE_P(smoke_VPUConfigProtocolTests, +INSTANTIATE_TEST_SUITE_P(smoke_VPUConfigProtocolTests, MyriadProtocolTests, ::testing::ValuesIn(myriadProtocols), MyriadProtocolTests::getTestCaseName); \ No newline at end of file diff --git a/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_watchdog_tests.cpp b/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_watchdog_tests.cpp index f55dd044735..a3dda5c8200 100644 --- a/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_watchdog_tests.cpp +++ b/inference-engine/tests_deprecated/behavior/vpu/myriad_tests/vpu_watchdog_tests.cpp @@ -261,4 +261,4 @@ const BehTestParams vpuValues[] = { BEH_MYRIAD, }; -INSTANTIATE_TEST_CASE_P(smoke_BehaviorTest, MYRIADWatchdog, ValuesIn(vpuValues), getTestCaseName); +INSTANTIATE_TEST_SUITE_P(smoke_BehaviorTest, MYRIADWatchdog, ValuesIn(vpuValues), getTestCaseName); diff --git a/inference-engine/tests_deprecated/fluid_preproc/cpu/fluid_tests_cpu.cpp b/inference-engine/tests_deprecated/fluid_preproc/cpu/fluid_tests_cpu.cpp index e20fa1f066d..f06ba5025df 100644 --- a/inference-engine/tests_deprecated/fluid_preproc/cpu/fluid_tests_cpu.cpp +++ b/inference-engine/tests_deprecated/fluid_preproc/cpu/fluid_tests_cpu.cpp @@ -98,57 +98,57 @@ using namespace testing; #if defined(__arm__) || defined(__aarch64__) -INSTANTIATE_TEST_CASE_P(ResizeTestFluid_U8, ResizeTestGAPI, +INSTANTIATE_TEST_SUITE_P(ResizeTestFluid_U8, ResizeTestGAPI, Combine(Values(CV_8UC1, CV_8UC3), Values(cv::INTER_LINEAR, cv::INTER_AREA), Values(TEST_RESIZE_PAIRS), Values(4))); // error not more than 4 unit -INSTANTIATE_TEST_CASE_P(ResizeRGB8UTestFluid_U8, ResizeRGB8UTestGAPI, +INSTANTIATE_TEST_SUITE_P(ResizeRGB8UTestFluid_U8, ResizeRGB8UTestGAPI, Combine(Values(CV_8UC3, CV_8UC4), Values(cv::INTER_LINEAR), Values(TEST_RESIZE_PAIRS), Values(4))); // error not more than 4 unit #else -INSTANTIATE_TEST_CASE_P(ResizeTestFluid_U8, ResizeTestGAPI, +INSTANTIATE_TEST_SUITE_P(ResizeTestFluid_U8, ResizeTestGAPI, Combine(Values(CV_8UC1, CV_8UC3), Values(cv::INTER_LINEAR, cv::INTER_AREA), Values(TEST_RESIZE_PAIRS), Values(1))); // error not more than 1 unit -INSTANTIATE_TEST_CASE_P(ResizeRGB8UTestFluid_U8, ResizeRGB8UTestGAPI, +INSTANTIATE_TEST_SUITE_P(ResizeRGB8UTestFluid_U8, ResizeRGB8UTestGAPI, Combine(Values(CV_8UC3, CV_8UC4), Values(cv::INTER_LINEAR), Values(TEST_RESIZE_PAIRS), Values(1))); // error not more than 1 unit #endif -INSTANTIATE_TEST_CASE_P(ResizeTestFluid_F32, ResizeTestGAPI, +INSTANTIATE_TEST_SUITE_P(ResizeTestFluid_F32, ResizeTestGAPI, Combine(Values(CV_32FC1, CV_32FC3), Values(cv::INTER_LINEAR, cv::INTER_AREA), Values(TEST_RESIZE_PAIRS), Values(0.015))); // accuracy like ~1.5% -INSTANTIATE_TEST_CASE_P(SplitTestFluid, SplitTestGAPI, +INSTANTIATE_TEST_SUITE_P(SplitTestFluid, SplitTestGAPI, Combine(Values(2, 3, 4), Values(CV_8U, CV_8S, CV_16U, CV_16S, CV_16F, CV_32F, CV_32S), Values(TEST_SIZES), Values(0))); -INSTANTIATE_TEST_CASE_P(ChanToPlaneTestFluid, ChanToPlaneTestGAPI, +INSTANTIATE_TEST_SUITE_P(ChanToPlaneTestFluid, ChanToPlaneTestGAPI, Combine(Values(1, 3), Values(CV_8U, CV_32F), Values(TEST_SIZES), Values(0))); -INSTANTIATE_TEST_CASE_P(MergeTestFluid, MergeTestGAPI, +INSTANTIATE_TEST_SUITE_P(MergeTestFluid, MergeTestGAPI, Combine(Values(2, 3, 4), Values(CV_8U, CV_8S, CV_16U, CV_16S, CV_16F, CV_32F, CV_32S), Values(TEST_SIZES), Values(0))); -INSTANTIATE_TEST_CASE_P(NV12toRGBTestFluid, NV12toRGBTestGAPI, +INSTANTIATE_TEST_SUITE_P(NV12toRGBTestFluid, NV12toRGBTestGAPI, Combine(Values(cv::Size(3840, 2160), cv::Size(1920, 1080), cv::Size(1280, 720), @@ -159,7 +159,7 @@ INSTANTIATE_TEST_CASE_P(NV12toRGBTestFluid, NV12toRGBTestGAPI, cv::Size( 320, 200)), Values(0))); -INSTANTIATE_TEST_CASE_P(I420toRGBTestFluid, I420toRGBTestGAPI, +INSTANTIATE_TEST_SUITE_P(I420toRGBTestFluid, I420toRGBTestGAPI, Combine(Values(cv::Size(3840, 2160), cv::Size(1920, 1080), cv::Size(1280, 720), @@ -170,7 +170,7 @@ INSTANTIATE_TEST_CASE_P(I420toRGBTestFluid, I420toRGBTestGAPI, cv::Size( 320, 200)), Values(0))); -INSTANTIATE_TEST_CASE_P(ConvertDepthFluid, ConvertDepthTestGAPI, +INSTANTIATE_TEST_SUITE_P(ConvertDepthFluid, ConvertDepthTestGAPI, Combine(Values(CV_16U, CV_32F, CV_8U), Values(CV_32F, CV_16U, CV_8U), Values(cv::Size(3840, 2160), @@ -183,21 +183,21 @@ INSTANTIATE_TEST_CASE_P(ConvertDepthFluid, ConvertDepthTestGAPI, cv::Size( 320, 200)), Values(1))); -INSTANTIATE_TEST_CASE_P(DivCFluid, DivCTestGAPI, +INSTANTIATE_TEST_SUITE_P(DivCFluid, DivCTestGAPI, Combine(Values(CV_32F), Values(1), //channels Values(TEST_SIZES), Values(cv::Scalar{0.229}), Values(0))); -INSTANTIATE_TEST_CASE_P(SubCFluid, SubCTestGAPI, +INSTANTIATE_TEST_SUITE_P(SubCFluid, SubCTestGAPI, Combine(Values(CV_32F), Values(1), //channels Values(TEST_SIZES), Values(cv::Scalar{0.229}), Values(0.00001))); -INSTANTIATE_TEST_CASE_P(ResizeRoiTestFluid, ResizeRoiTestGAPI, +INSTANTIATE_TEST_SUITE_P(ResizeRoiTestFluid, ResizeRoiTestGAPI, Combine(Values(CV_8UC1, CV_8UC3), Values(cv::INTER_LINEAR), Values(std::make_pair(cv::Size(24, 24), cv::Size(12, 12))), @@ -207,7 +207,7 @@ INSTANTIATE_TEST_CASE_P(ResizeRoiTestFluid, ResizeRoiTestGAPI, cv::Rect{0, 9, 12, 3}), Values(1))); // error not more than 1 unit -INSTANTIATE_TEST_CASE_P(ResizeRGB8URoiTestFluid, ResizeRGB8URoiTestGAPI, +INSTANTIATE_TEST_SUITE_P(ResizeRGB8URoiTestFluid, ResizeRGB8URoiTestGAPI, Combine(Values(CV_8UC3, CV_8UC4), Values(cv::INTER_LINEAR), Values(std::make_pair(cv::Size(24, 24), cv::Size(12, 12))), @@ -220,38 +220,38 @@ INSTANTIATE_TEST_CASE_P(ResizeRGB8URoiTestFluid, ResizeRGB8URoiTestGAPI, //---------------------------------------------------------------------- #if defined(__arm__) || defined(__aarch64__) -INSTANTIATE_TEST_CASE_P(ResizeTestFluid_U8, ResizeTestIE, +INSTANTIATE_TEST_SUITE_P(ResizeTestFluid_U8, ResizeTestIE, Combine(Values(CV_8UC1, CV_8UC3), Values(cv::INTER_LINEAR, cv::INTER_AREA), Values(TEST_RESIZE_PAIRS), Values(4))); // error not more than 4 unit #else -INSTANTIATE_TEST_CASE_P(ResizeTestFluid_U8, ResizeTestIE, +INSTANTIATE_TEST_SUITE_P(ResizeTestFluid_U8, ResizeTestIE, Combine(Values(CV_8UC1, CV_8UC3), Values(cv::INTER_LINEAR, cv::INTER_AREA), Values(TEST_RESIZE_PAIRS), Values(1))); // error not more than 1 unit #endif -INSTANTIATE_TEST_CASE_P(ResizeTestFluid_F32, ResizeTestIE, +INSTANTIATE_TEST_SUITE_P(ResizeTestFluid_F32, ResizeTestIE, Combine(Values(CV_32FC1, CV_32FC3), Values(cv::INTER_LINEAR, cv::INTER_AREA), Values(TEST_RESIZE_PAIRS), Values(0.05))); // error within 0.05 units -INSTANTIATE_TEST_CASE_P(SplitTestFluid, SplitTestIE, +INSTANTIATE_TEST_SUITE_P(SplitTestFluid, SplitTestIE, Combine(Values(CV_8UC2, CV_8UC3, CV_8UC4, CV_32FC2, CV_32FC3, CV_32FC4), Values(TEST_SIZES), Values(0))); -INSTANTIATE_TEST_CASE_P(MergeTestFluid, MergeTestIE, +INSTANTIATE_TEST_SUITE_P(MergeTestFluid, MergeTestIE, Combine(Values(CV_8UC2, CV_8UC3, CV_8UC4, CV_32FC2, CV_32FC3, CV_32FC4), Values(TEST_SIZES), Values(0))); -INSTANTIATE_TEST_CASE_P(ColorConvertFluid_3ch, ColorConvertTestIE, +INSTANTIATE_TEST_SUITE_P(ColorConvertFluid_3ch, ColorConvertTestIE, Combine(Values(CV_8U, CV_32F), Values(InferenceEngine::ColorFormat::RGB), Values(InferenceEngine::NHWC, InferenceEngine::NCHW), @@ -259,7 +259,7 @@ INSTANTIATE_TEST_CASE_P(ColorConvertFluid_3ch, ColorConvertTestIE, Values(TEST_SIZES), Values(0))); -INSTANTIATE_TEST_CASE_P(ColorConvertFluid_4ch, ColorConvertTestIE, +INSTANTIATE_TEST_SUITE_P(ColorConvertFluid_4ch, ColorConvertTestIE, Combine(Values(CV_8U, CV_32F), Values(InferenceEngine::ColorFormat::RGBX, InferenceEngine::ColorFormat::BGRX), @@ -268,7 +268,7 @@ INSTANTIATE_TEST_CASE_P(ColorConvertFluid_4ch, ColorConvertTestIE, Values(TEST_SIZES), Values(0))); -INSTANTIATE_TEST_CASE_P(ColorConvertYUV420Fluid, ColorConvertYUV420TestIE, +INSTANTIATE_TEST_SUITE_P(ColorConvertYUV420Fluid, ColorConvertYUV420TestIE, Combine(Values(InferenceEngine::NV12, InferenceEngine::I420), Values(InferenceEngine::NHWC, InferenceEngine::NCHW), Values(cv::Size(3840, 2160), @@ -282,7 +282,7 @@ INSTANTIATE_TEST_CASE_P(ColorConvertYUV420Fluid, ColorConvertYUV420TestIE, cv::Size( 150, 150)), Values(0))); -INSTANTIATE_TEST_CASE_P(Reorder_HWC2CHW, ColorConvertTestIE, +INSTANTIATE_TEST_SUITE_P(Reorder_HWC2CHW, ColorConvertTestIE, Combine(Values(CV_8U, CV_32F, CV_16S, CV_16F), Values(InferenceEngine::ColorFormat::BGR), Values(InferenceEngine::NHWC), @@ -290,7 +290,7 @@ INSTANTIATE_TEST_CASE_P(Reorder_HWC2CHW, ColorConvertTestIE, Values(TEST_SIZES), Values(0))); -INSTANTIATE_TEST_CASE_P(Reorder_CHW2HWC, ColorConvertTestIE, +INSTANTIATE_TEST_SUITE_P(Reorder_CHW2HWC, ColorConvertTestIE, Combine(Values(CV_8U, CV_32F, CV_16S, CV_16F), Values(InferenceEngine::ColorFormat::BGR), Values(InferenceEngine::NCHW), @@ -298,7 +298,7 @@ INSTANTIATE_TEST_CASE_P(Reorder_CHW2HWC, ColorConvertTestIE, Values(TEST_SIZES), Values(0))); -INSTANTIATE_TEST_CASE_P(MeanValueGAPI32F, MeanValueGAPI, +INSTANTIATE_TEST_SUITE_P(MeanValueGAPI32F, MeanValueGAPI, Combine(Values(TEST_SIZES), Values(0.00001))); @@ -345,7 +345,7 @@ static const auto U8toU8 = std::make_pair(IE::Precision::U8,IE::Precision::U8); static const auto PRECISIONS = Values(U8toU8, std::make_pair(IE::Precision::FP32,IE::Precision::FP32)); -INSTANTIATE_TEST_CASE_P(ReorderResize_Frame, PreprocTest, +INSTANTIATE_TEST_SUITE_P(ReorderResize_Frame, PreprocTest, Combine(PRECISIONS, Values(IE::ResizeAlgorithm::RESIZE_BILINEAR), // AREA is not there yet Values(IE::ColorFormat::RAW), @@ -354,7 +354,7 @@ INSTANTIATE_TEST_CASE_P(ReorderResize_Frame, PreprocTest, Values(std::make_pair(1, 1), std::make_pair(3, 3)), FRAME_SIZES)); -INSTANTIATE_TEST_CASE_P(Scale3ch_Frame, PreprocTest, +INSTANTIATE_TEST_SUITE_P(Scale3ch_Frame, PreprocTest, Combine(PRECISIONS, Values(IE::ResizeAlgorithm::RESIZE_BILINEAR), // AREA is not there yet Values(IE::ColorFormat::RAW), @@ -363,7 +363,7 @@ INSTANTIATE_TEST_CASE_P(Scale3ch_Frame, PreprocTest, Values(std::make_pair(3, 3)), FRAME_SIZES)); -INSTANTIATE_TEST_CASE_P(ReorderResize_Patch, PreprocTest, +INSTANTIATE_TEST_SUITE_P(ReorderResize_Patch, PreprocTest, Combine(PRECISIONS, Values(IE::ResizeAlgorithm::RESIZE_BILINEAR), // AREA is not there yet Values(IE::ColorFormat::RAW), @@ -372,7 +372,7 @@ INSTANTIATE_TEST_CASE_P(ReorderResize_Patch, PreprocTest, Values(std::make_pair(1, 1), std::make_pair(3, 3)), PATCH_SIZES)); -INSTANTIATE_TEST_CASE_P(Everything_Resize, PreprocTest, +INSTANTIATE_TEST_SUITE_P(Everything_Resize, PreprocTest, Combine(PRECISIONS, Values(IE::ResizeAlgorithm::RESIZE_BILINEAR, IE::ResizeAlgorithm::RESIZE_AREA), Values(IE::ColorFormat::RAW), @@ -384,7 +384,7 @@ INSTANTIATE_TEST_CASE_P(Everything_Resize, PreprocTest, std::make_pair(4, 4)), Values(TEST_SIZES_PREPROC))); -INSTANTIATE_TEST_CASE_P(ColorFormats_3ch, PreprocTest, +INSTANTIATE_TEST_SUITE_P(ColorFormats_3ch, PreprocTest, Combine(PRECISIONS, Values(IE::ResizeAlgorithm::RESIZE_BILINEAR, IE::ResizeAlgorithm::RESIZE_AREA), Values(IE::ColorFormat::RGB), @@ -393,7 +393,7 @@ INSTANTIATE_TEST_CASE_P(ColorFormats_3ch, PreprocTest, Values(std::make_pair(3, 3)), Values(TEST_SIZES_PREPROC))); -INSTANTIATE_TEST_CASE_P(ColorFormats_4ch, PreprocTest, +INSTANTIATE_TEST_SUITE_P(ColorFormats_4ch, PreprocTest, Combine(PRECISIONS, Values(IE::ResizeAlgorithm::RESIZE_BILINEAR, IE::ResizeAlgorithm::RESIZE_AREA), Values(IE::ColorFormat::BGRX, IE::ColorFormat::RGBX), @@ -402,7 +402,7 @@ INSTANTIATE_TEST_CASE_P(ColorFormats_4ch, PreprocTest, Values(std::make_pair(4, 3)), Values(TEST_SIZES_PREPROC))); -INSTANTIATE_TEST_CASE_P(ColorFormat_NV12, PreprocTest, +INSTANTIATE_TEST_SUITE_P(ColorFormat_NV12, PreprocTest, Combine(Values(U8toU8), Values(IE::ResizeAlgorithm::RESIZE_BILINEAR, IE::ResizeAlgorithm::RESIZE_AREA), Values(IE::ColorFormat::NV12), @@ -412,7 +412,7 @@ INSTANTIATE_TEST_CASE_P(ColorFormat_NV12, PreprocTest, Values(TEST_SIZES_PREPROC))); -INSTANTIATE_TEST_CASE_P(PlainPrecisionConversions, PreprocTest, +INSTANTIATE_TEST_SUITE_P(PlainPrecisionConversions, PreprocTest, Combine(Values(std::make_pair(IE::Precision::U16,IE::Precision::FP32), std::make_pair(IE::Precision::FP32,IE::Precision::U16) ), @@ -424,7 +424,7 @@ INSTANTIATE_TEST_CASE_P(PlainPrecisionConversions, PreprocTest, Values(std::make_pair(cv::Size(640,480), cv::Size(640,480))))); -INSTANTIATE_TEST_CASE_P(PrecisionConversionsPipelines, PreprocTest, +INSTANTIATE_TEST_SUITE_P(PrecisionConversionsPipelines, PreprocTest, Combine(Values(std::make_pair(IE::Precision::U16, IE::Precision::FP32), std::make_pair(IE::Precision::FP32,IE::Precision::U8), std::make_pair(IE::Precision::U8, IE::Precision::FP32) diff --git a/inference-engine/tests_deprecated/functional/gna/backward_compatibility/backward_compatibility.cpp b/inference-engine/tests_deprecated/functional/gna/backward_compatibility/backward_compatibility.cpp index 618c857c7b5..21ddf424726 100644 --- a/inference-engine/tests_deprecated/functional/gna/backward_compatibility/backward_compatibility.cpp +++ b/inference-engine/tests_deprecated/functional/gna/backward_compatibility/backward_compatibility.cpp @@ -121,7 +121,7 @@ const std::vector> importConfigs = { const std::vector nameExportModel = {"export2dot1.blob", "export2dot2.blob", "export2dot3.blob", "export2dot4.blob"}; -INSTANTIATE_TEST_CASE_P(smoke_OldVersion, BackwardCompatibilityTests, +INSTANTIATE_TEST_SUITE_P(smoke_OldVersion, BackwardCompatibilityTests, ::testing::Combine( ::testing::ValuesIn(netPrecisions), ::testing::Values("GNA"), diff --git a/inference-engine/tests_deprecated/functional/gna/shared_tests_instance/input_tests/parser_tests.cpp b/inference-engine/tests_deprecated/functional/gna/shared_tests_instance/input_tests/parser_tests.cpp index d54817b53ed..d53446b6a2e 100644 --- a/inference-engine/tests_deprecated/functional/gna/shared_tests_instance/input_tests/parser_tests.cpp +++ b/inference-engine/tests_deprecated/functional/gna/shared_tests_instance/input_tests/parser_tests.cpp @@ -30,6 +30,6 @@ ir_test_params ir_test_cases[] = { ir_test_params("GNA", "FP32", negative_norm_k_case) }; -INSTANTIATE_TEST_CASE_P(FunctionalTest_smoke, IncorrectIRTests, +INSTANTIATE_TEST_SUITE_P(FunctionalTest_smoke, IncorrectIRTests, ::testing::ValuesIn(ir_test_cases), getTestName); \ No newline at end of file diff --git a/inference-engine/tests_deprecated/functional/shared_tests/io_blob_tests/cropResize_tests.hpp b/inference-engine/tests_deprecated/functional/shared_tests/io_blob_tests/cropResize_tests.hpp index 7000bedee25..957f47b3156 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/io_blob_tests/cropResize_tests.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/io_blob_tests/cropResize_tests.hpp @@ -1186,9 +1186,9 @@ TEST_P(NV12ColorConvertTest, NV12Test) { ColorFormat::BGRX, ColorFormat::RGBX // #define PLUGING_CASE(_plugin, _test, _params) \ -// INSTANTIATE_TEST_CASE_P(_plugin##_run, _test, Combine(Values(#_plugin "Plugin"), _params) ) +// INSTANTIATE_TEST_SUITE_P(_plugin##_run, _test, Combine(Values(#_plugin "Plugin"), _params) ) #define PLUGING_CASE_WITH_SUFFIX(_device, _suffix, _test, _params) \ - INSTANTIATE_TEST_CASE_P(_device##_run##_suffix, _test, Combine(Values(#_device), _params) ) + INSTANTIATE_TEST_SUITE_P(_device##_run##_suffix, _test, Combine(Values(#_device), _params) ) #endif // USE_OPENCV diff --git a/inference-engine/tests_deprecated/functional/shared_tests/io_blob_tests/dims_tests.hpp b/inference-engine/tests_deprecated/functional/shared_tests/io_blob_tests/dims_tests.hpp index 866542377bd..b89ed7f1c7d 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/io_blob_tests/dims_tests.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/io_blob_tests/dims_tests.hpp @@ -192,7 +192,7 @@ static auto params = ::testing::Values(Precision::FP32); // network precision static auto params_myriad = ::testing::Values(Precision::FP16); // network precision #define PLUGING_CASE(_device, _test, _params) \ - INSTANTIATE_TEST_CASE_P(_device##_run, _test, ::testing::Combine(::testing::Values(#_device), _params) ) + INSTANTIATE_TEST_SUITE_P(_device##_run, _test, ::testing::Combine(::testing::Values(#_device), _params) ) #define PLUGING_CASE_WITH_SUFFIX(_device, _suffix, _test, _params) \ - INSTANTIATE_TEST_CASE_P(_device##_run##_suffix, _test, ::testing::Combine(::testing::Values(#_device), _params) ) + INSTANTIATE_TEST_SUITE_P(_device##_run##_suffix, _test, ::testing::Combine(::testing::Values(#_device), _params) ) diff --git a/inference-engine/tests_deprecated/functional/shared_tests/io_blob_tests/layout_tests.hpp b/inference-engine/tests_deprecated/functional/shared_tests/io_blob_tests/layout_tests.hpp index 502cefab902..06f0a48d71e 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/io_blob_tests/layout_tests.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/io_blob_tests/layout_tests.hpp @@ -217,10 +217,10 @@ conv_param conv_p = { 3,3, // kernel {2,16,13,13}}; // out shape #define PLUGING_CASE(_device, _test, _params) \ - INSTANTIATE_TEST_CASE_P(_device##_run, _test, ::testing::Combine(::testing::Values(#_device), _params) ) + INSTANTIATE_TEST_SUITE_P(_device##_run, _test, ::testing::Combine(::testing::Values(#_device), _params) ) #define PLUGING_CASE_WITH_SUFFIX(_device, _suffix, _test, _params) \ - INSTANTIATE_TEST_CASE_P(_device##_run##_suffix, _test, ::testing::Combine(::testing::Values(#_device), _params) ) + INSTANTIATE_TEST_SUITE_P(_device##_run##_suffix, _test, ::testing::Combine(::testing::Values(#_device), _params) ) #define PLUGING_CASE_WITH_PREFIX(_device, _prefix, _test, _params) \ - INSTANTIATE_TEST_CASE_P(_prefix##_device##_run, _test, ::testing::Combine(::testing::Values(#_device), _params) ) + INSTANTIATE_TEST_SUITE_P(_prefix##_device##_run, _test, ::testing::Combine(::testing::Values(#_device), _params) ) diff --git a/inference-engine/tests_deprecated/functional/shared_tests/lstm/plg_test.hpp b/inference-engine/tests_deprecated/functional/shared_tests/lstm/plg_test.hpp index c7e5039b327..9e5b63d76a3 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/lstm/plg_test.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/lstm/plg_test.hpp @@ -64,10 +64,10 @@ private: * @brief Macros to specify Per Plugin Run Test Case with parameters. */ #define RUN_CASE_P_WITH_SUFFIX(_plugin, _suffix, _test, _params) \ - INSTANTIATE_TEST_CASE_P(_plugin##_run##_suffix, _test, ::testing::Combine(::testing::Values(#_plugin), ::testing::ValuesIn(_params) )) + INSTANTIATE_TEST_SUITE_P(_plugin##_run##_suffix, _test, ::testing::Combine(::testing::Values(#_plugin), ::testing::ValuesIn(_params) )) /** * @brief Macros to specify Per Plugin Run Test Case with Cartesian Product of parameters. */ #define RUN_CASE_CP_WITH_SUFFIX(_plugin, _suffix, _test, _params, ...) \ - INSTANTIATE_TEST_CASE_P(_plugin##_run##_suffix, _test, ::testing::Combine(::testing::Values(#_plugin), _params), __VA_ARGS__ ) + INSTANTIATE_TEST_SUITE_P(_plugin##_run##_suffix, _test, ::testing::Combine(::testing::Values(#_plugin), _params), __VA_ARGS__ ) diff --git a/inference-engine/tests_deprecated/functional/shared_tests/lstm/rnn_seq_test.hpp b/inference-engine/tests_deprecated/functional/shared_tests/lstm/rnn_seq_test.hpp index 4e83949cf73..0c4db4ef993 100644 --- a/inference-engine/tests_deprecated/functional/shared_tests/lstm/rnn_seq_test.hpp +++ b/inference-engine/tests_deprecated/functional/shared_tests/lstm/rnn_seq_test.hpp @@ -75,7 +75,7 @@ TEST_P(RNNSeqTest, DISABLED_SingleRNN) { auto resh = std::get<7>(p); if (device_name == "GPU" && cell.type != LSTM) - SKIP(); + GTEST_SKIP(); cell.clip = clip; diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_CTCDecoder_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_CTCDecoder_test.cpp index d645f5627ea..c95b62f8b3e 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_CTCDecoder_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_CTCDecoder_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_CTCDecoder_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( DISABLED_accuracy, myriadCTCDecoderLayerTests_smoke, ::testing::Combine( ::testing::Values({{1, 88, 1, 71}}), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_batch_normalization_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_batch_normalization_test.cpp index 7e0378afebf..d64f8d4eeea 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_batch_normalization_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_batch_normalization_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_batch_normalization_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsBatchNormalization_smoke, ::testing::Values( bn_test_params{{1, 1, 16, 8}, 0.001f}, diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_bias_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_bias_test.cpp index a54a50efbe0..8757631cb8e 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_bias_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_bias_test.cpp @@ -4,6 +4,6 @@ #include "myriad_layers_bias_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsBias_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsBias_smoke, ::testing::ValuesIn(s_biasDims) ); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_blob_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_blob_test.cpp index 7a2c027be03..6128ac1ee1b 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_blob_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_blob_test.cpp @@ -62,7 +62,7 @@ TEST_P(myriadBlobTests_smoke, CanGetSameBlobsOnSameIR) { } } -INSTANTIATE_TEST_CASE_P(accuracy, myriadBlobTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadBlobTests_smoke, ::testing::Values(CONFIG_VALUE(YES), CONFIG_VALUE(NO)) ); @@ -356,7 +356,7 @@ using myriadExtraTests_smoke = myriadLayersTests_nightly; TEST_F(myriadExtraTests_smoke, ThereIsNoSegfaultOnZeroConvolutionWeights) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } tensor_test_params input_dims = { 1, 3, 25, 25 }; @@ -413,5 +413,5 @@ static const std::vector inputPrecisions = {Inferenc static const std::vector outputPrecisions = {InferenceEngine::Precision::FP16, InferenceEngine::Precision::FP32}; -INSTANTIATE_TEST_CASE_P(accuracy, myriadBlobExportAccuracyDifferentPrecisionOfInAndOutTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadBlobExportAccuracyDifferentPrecisionOfInAndOutTests_smoke, ::testing::Combine(::testing::ValuesIn(inputPrecisions), ::testing::ValuesIn(outputPrecisions))); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_clamp_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_clamp_test.cpp index 4d031eed5dc..5f5e64c3615 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_clamp_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_clamp_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_clamp_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsClampParams_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsClampParams_smoke, ::testing::Combine( ::testing::ValuesIn(s_clampTensors), ::testing::ValuesIn(s_clampParams)) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_concat_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_concat_test.cpp index 5872049504a..7b7ad34fdce 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_concat_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_concat_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_concat_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsConcat_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsConcat_smoke, ::testing::Combine( ::testing::ValuesIn(s_concatCores), ::testing::ValuesIn(s_axis), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_conv_nd_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_conv_nd_test.cpp index 472403fa6f2..f5c59174bd1 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_conv_nd_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_conv_nd_test.cpp @@ -12,7 +12,7 @@ using namespace testing; // //---------------------------------------------------------------------- -INSTANTIATE_TEST_CASE_P(tricky_ncdhw_userpad, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(tricky_ncdhw_userpad, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 3, 19, 65, 47}), Values(KernelShape {1, 3, 5}), @@ -26,7 +26,7 @@ INSTANTIATE_TEST_CASE_P(tricky_ncdhw_userpad, myriadLayersConvNDTest_smoke, ) ); -INSTANTIATE_TEST_CASE_P(tricky_ncdhw_autopad, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(tricky_ncdhw_autopad, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 3, 19, 65, 47}), Values(KernelShape {1, 3, 5}), @@ -48,7 +48,7 @@ INSTANTIATE_TEST_CASE_P(tricky_ncdhw_autopad, myriadLayersConvNDTest_smoke, // //---------------------------------------------------------------------- -INSTANTIATE_TEST_CASE_P(simple_ncdhw_userpad, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(simple_ncdhw_userpad, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 3, 20, 64, 48}), Values(KernelShape {3, 3, 3}), @@ -62,7 +62,7 @@ INSTANTIATE_TEST_CASE_P(simple_ncdhw_userpad, myriadLayersConvNDTest_smoke, ) ); -INSTANTIATE_TEST_CASE_P(simple_ncdhw_autopad, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(simple_ncdhw_autopad, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 3, 20, 64, 48}), Values(KernelShape {3, 3, 3}), @@ -84,7 +84,7 @@ INSTANTIATE_TEST_CASE_P(simple_ncdhw_autopad, myriadLayersConvNDTest_smoke, // //---------------------------------------------------------------------- -INSTANTIATE_TEST_CASE_P(tricky_nchw_userpad, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(tricky_nchw_userpad, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 3, 65, 47}), Values(KernelShape {1, 3}), @@ -98,7 +98,7 @@ INSTANTIATE_TEST_CASE_P(tricky_nchw_userpad, myriadLayersConvNDTest_smoke, ) ); -INSTANTIATE_TEST_CASE_P(tricky_nchw_autopad, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(tricky_nchw_autopad, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 3, 65, 47}), Values(KernelShape {1, 3}), @@ -120,7 +120,7 @@ INSTANTIATE_TEST_CASE_P(tricky_nchw_autopad, myriadLayersConvNDTest_smoke, // //---------------------------------------------------------------------- -INSTANTIATE_TEST_CASE_P(simple_nchw_userpad, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(simple_nchw_userpad, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 3, 64, 48}), Values(KernelShape {3, 3}), @@ -134,7 +134,7 @@ INSTANTIATE_TEST_CASE_P(simple_nchw_userpad, myriadLayersConvNDTest_smoke, ) ); -INSTANTIATE_TEST_CASE_P(simple_nchw_autopad, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(simple_nchw_autopad, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 3, 64, 48}), Values(KernelShape {3, 3}), @@ -158,7 +158,7 @@ INSTANTIATE_TEST_CASE_P(simple_nchw_autopad, myriadLayersConvNDTest_smoke, // NB: requires 1GB of RAM on device (e.g. ma2085 board) // Stress test: large image with large depth, large kernel -INSTANTIATE_TEST_CASE_P(i3d_id6, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(i3d_id6, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 3, 79, 224, 224}), Values(KernelShape {7, 7, 7}), @@ -171,7 +171,7 @@ INSTANTIATE_TEST_CASE_P(i3d_id6, myriadLayersConvNDTest_smoke, Values(Groups(1)))); // Like `i3d_id6` test but with smaller image (so must fit in Myriad X) -INSTANTIATE_TEST_CASE_P(i3d_id6_shrink, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(i3d_id6_shrink, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 3, 39, 112, 112}), Values(KernelShape {7, 7, 7}), @@ -184,7 +184,7 @@ INSTANTIATE_TEST_CASE_P(i3d_id6_shrink, myriadLayersConvNDTest_smoke, Values(Groups(1)))); // Average-size image, trivial kernel 1x1x1 -INSTANTIATE_TEST_CASE_P(i3d_id12, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(i3d_id12, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 64, 40, 56, 56}), Values(KernelShape {1, 1, 1}), @@ -197,7 +197,7 @@ INSTANTIATE_TEST_CASE_P(i3d_id12, myriadLayersConvNDTest_smoke, Values(Groups(1)))); // Average-size image, non-trivial kernel 3x3x3 -INSTANTIATE_TEST_CASE_P(i3d_id17, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(i3d_id17, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 64, 40, 56, 56}), Values(KernelShape {3, 3, 3}), @@ -210,7 +210,7 @@ INSTANTIATE_TEST_CASE_P(i3d_id17, myriadLayersConvNDTest_smoke, Values(Groups(1)))); // Small image (7x7), trivial kernel -INSTANTIATE_TEST_CASE_P(i3d_id249, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(i3d_id249, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 832, 10, 7, 7}), Values(KernelShape {1, 1, 1}), @@ -223,7 +223,7 @@ INSTANTIATE_TEST_CASE_P(i3d_id249, myriadLayersConvNDTest_smoke, Values(Groups(1)))); // Small image (7x7), non-trivial kernel -INSTANTIATE_TEST_CASE_P(i3d_id301, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(i3d_id301, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 48, 10, 7, 7}), Values(KernelShape {3, 3, 3}), @@ -236,7 +236,7 @@ INSTANTIATE_TEST_CASE_P(i3d_id301, myriadLayersConvNDTest_smoke, Values(Groups(1)))); // Trivial image (1x1), trivial kernel -INSTANTIATE_TEST_CASE_P(i3d_id314, myriadLayersConvNDTest_smoke, +INSTANTIATE_TEST_SUITE_P(i3d_id314, myriadLayersConvNDTest_smoke, Combine( Values(InputShape {1, 1024, 9, 1, 1}), Values(KernelShape {1, 1, 1}), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convert_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convert_test.cpp index 582311afe22..0b2fe34caea 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convert_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convert_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_convert_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsIOConvert_smoke, ::testing::Combine( ::testing::ValuesIn(inputsDims), @@ -13,7 +13,7 @@ INSTANTIATE_TEST_CASE_P( ) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy_customu8f16, myriadLayersTestsIOConvert_smoke, ::testing::Combine( ::testing::ValuesIn(inputsDims4D), @@ -22,7 +22,7 @@ INSTANTIATE_TEST_CASE_P( ) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsConvertWithFP16_smoke, ::testing::Combine( ::testing::ValuesIn(inputsDims), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convolution1x1.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convolution1x1.cpp index b25f1d80d38..eaf3e8f3052 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convolution1x1.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convolution1x1.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_convolution1x1.hpp" -INSTANTIATE_TEST_CASE_P(myriad, myriadConvolution1x1LayerTests_smoke, +INSTANTIATE_TEST_SUITE_P(myriad, myriadConvolution1x1LayerTests_smoke, ::testing::Combine( ::testing::Values(CONFIG_VALUE(NO)), ::testing::ValuesIn(s_isHWC), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convolution3x3.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convolution3x3.cpp index 537bef657fd..97257fd76c5 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convolution3x3.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convolution3x3.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_convolution3x3.hpp" -INSTANTIATE_TEST_CASE_P(myriad, myriadConvolution3x3LayerTests_smoke, +INSTANTIATE_TEST_SUITE_P(myriad, myriadConvolution3x3LayerTests_smoke, ::testing::Combine( ::testing::Values(CONFIG_VALUE(NO)), ::testing::ValuesIn(s_DimsConfig))); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convolution_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convolution_test.cpp index 9093504eaf6..8bea8f5d995 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convolution_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_convolution_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_convolution_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy_chw_dilation, myriadLayerConvolution_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_chw_dilation, myriadLayerConvolution_smoke, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 37, 43, 43) , MAKE_STRUCT(tensor_test_params, 1, 37, 19, 19)) @@ -21,7 +21,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_chw_dilation, myriadLayerConvolution_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayers_IR3_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayers_IR3_ConvTests_smoke, ::testing::Combine( ::testing::Values({1, 3, 32, 24}) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -33,7 +33,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayers_IR3_ConvTests_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_Batch_0, myriadLayers_BatchTest_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_Batch_0, myriadLayers_BatchTest_ConvTests_smoke, ::testing::Combine( ::testing::Values({10, 5, 1, 1}) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -45,7 +45,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_Batch_0, myriadLayers_BatchTest_ConvTests_smoke ) ); -INSTANTIATE_TEST_CASE_P(accuracy_Batch_1, myriadLayers_BatchTest_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_Batch_1, myriadLayers_BatchTest_ConvTests_smoke, ::testing::Combine( ::testing::Values({10, 576, 7, 7}) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -57,7 +57,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_Batch_1, myriadLayers_BatchTest_ConvTests_smoke ) ); -INSTANTIATE_TEST_CASE_P(accuracy_Batch_2, myriadLayers_BatchTest_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_Batch_2, myriadLayers_BatchTest_ConvTests_smoke, ::testing::Combine( ::testing::Values({10, 128, 7, 7}) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -69,7 +69,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_Batch_2, myriadLayers_BatchTest_ConvTests_smoke ) ); -INSTANTIATE_TEST_CASE_P(accuracy_Batch_3, myriadLayers_BatchTest_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_Batch_3, myriadLayers_BatchTest_ConvTests_smoke, ::testing::Combine( ::testing::Values({10, 4, 7, 7}) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -81,7 +81,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_Batch_3, myriadLayers_BatchTest_ConvTests_smoke ) ); -INSTANTIATE_TEST_CASE_P(accuracy_Batch_4, myriadLayers_BatchTest_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_Batch_4, myriadLayers_BatchTest_ConvTests_smoke, ::testing::Combine( ::testing::Values({10, 256, 7, 7}) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -93,7 +93,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_Batch_4, myriadLayers_BatchTest_ConvTests_smoke ) ); -INSTANTIATE_TEST_CASE_P(accuracy_Batch_5, myriadLayers_BatchTest_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_Batch_5, myriadLayers_BatchTest_ConvTests_smoke, ::testing::Combine( ::testing::Values({10, 1024, 4, 4}) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -105,7 +105,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_Batch_5, myriadLayers_BatchTest_ConvTests_smoke ) ); -INSTANTIATE_TEST_CASE_P(accuracy_Batch_6, myriadLayers_BatchTest_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_Batch_6, myriadLayers_BatchTest_ConvTests_smoke, ::testing::Combine( ::testing::Values({10, 192, 4, 4}) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -117,7 +117,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_Batch_6, myriadLayers_BatchTest_ConvTests_smoke ) ); -INSTANTIATE_TEST_CASE_P(accuracy_Batch_7, myriadLayers_BatchTest_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_Batch_7, myriadLayers_BatchTest_ConvTests_smoke, ::testing::Combine( ::testing::Values({10, 160, 4, 4}) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -129,7 +129,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_Batch_7, myriadLayers_BatchTest_ConvTests_smoke ) ); -INSTANTIATE_TEST_CASE_P(accuracy_Batch_8, myriadLayers_BatchTest_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_Batch_8, myriadLayers_BatchTest_ConvTests_smoke, ::testing::Combine( ::testing::Values({10, 224, 4, 4}) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -141,7 +141,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_Batch_8, myriadLayers_BatchTest_ConvTests_smoke ) ); -INSTANTIATE_TEST_CASE_P(accuracy_Batch_9, myriadLayers_BatchTest_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_Batch_9, myriadLayers_BatchTest_ConvTests_smoke, ::testing::Combine( ::testing::Values({10, 1024, 4, 4}) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -153,7 +153,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_Batch_9, myriadLayers_BatchTest_ConvTests_smoke ) ); -INSTANTIATE_TEST_CASE_P(accuracy_Batch_10, myriadLayers_BatchTest_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_Batch_10, myriadLayers_BatchTest_ConvTests_smoke, ::testing::Combine( ::testing::Values({1, 64, 56, 56}) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -165,7 +165,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_Batch_10, myriadLayers_BatchTest_ConvTests_smok ) ); -INSTANTIATE_TEST_CASE_P(accuracy_Batch_11, myriadLayers_BatchTest_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_Batch_11, myriadLayers_BatchTest_ConvTests_smoke, ::testing::Combine( ::testing::Values({10, 192, 7, 7}) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -177,7 +177,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_Batch_11, myriadLayers_BatchTest_ConvTests_smok ) ); -INSTANTIATE_TEST_CASE_P(accuracy_Batch_12, myriadLayers_BatchTest_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_Batch_12, myriadLayers_BatchTest_ConvTests_smoke, ::testing::Combine( ::testing::Values({10, 576, 7, 7}) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -189,7 +189,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_Batch_12, myriadLayers_BatchTest_ConvTests_smok ) ); -INSTANTIATE_TEST_CASE_P(accuracy_Batch_1, myriadLayers_BatchTest2_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_Batch_1, myriadLayers_BatchTest2_ConvTests_smoke, ::testing::Combine( ::testing::Values({10, 576, 7, 7}) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -201,7 +201,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_Batch_1, myriadLayers_BatchTest2_ConvTests_smok ) ); -INSTANTIATE_TEST_CASE_P(accuracy_3X3, myriadLayers_IR3_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_3X3, myriadLayers_IR3_ConvTests_smoke, ::testing::Combine( ::testing::Values({1, 3, 32, 24}) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -213,7 +213,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_3X3, myriadLayers_IR3_ConvTests_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_3X1, myriadLayers_IR3_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_3X1, myriadLayers_IR3_ConvTests_smoke, ::testing::Combine( ::testing::Values({1, 3, 32, 24}) , ::testing::Values(MAKE_STRUCT(param_size, 3, 1)) @@ -225,7 +225,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_3X1, myriadLayers_IR3_ConvTests_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_1X3, myriadLayers_IR3_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_1X3, myriadLayers_IR3_ConvTests_smoke, ::testing::Combine( ::testing::Values({1, 4, 16, 16}) , ::testing::Values(MAKE_STRUCT(param_size, 1, 3)) @@ -237,7 +237,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_1X3, myriadLayers_IR3_ConvTests_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayers_3X3X3_ConstInput_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayers_3X3X3_ConstInput_smoke, ::testing::Combine( ::testing::Values({1, 3, 10, 10}) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -249,7 +249,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayers_3X3X3_ConstInput_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_crossroad_spatialConv, myriadLayerConvolutionTensorFlow, +INSTANTIATE_TEST_SUITE_P(accuracy_crossroad_spatialConv, myriadLayerConvolutionTensorFlow, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 3, 1024, 1024)) , ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 3, 512, 512)) @@ -262,7 +262,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_crossroad_spatialConv, myriadLayerConvolutionTe ) ); -INSTANTIATE_TEST_CASE_P(accuracy_inception_v2, myriadLayerConvolutionTensorFlow, +INSTANTIATE_TEST_SUITE_P(accuracy_inception_v2, myriadLayerConvolutionTensorFlow, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 16, 28, 28)) , ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 64, 14, 14)) @@ -275,7 +275,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_inception_v2, myriadLayerConvolutionTensorFlow, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_inception_v1, myriadLayerConvolutionTensorFlow, +INSTANTIATE_TEST_SUITE_P(accuracy_inception_v1, myriadLayerConvolutionTensorFlow, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 3, 224, 224), MAKE_STRUCT(tensor_test_params, 1, 32, 224, 224) @@ -290,7 +290,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_inception_v1, myriadLayerConvolutionTensorFlow, ) ); -INSTANTIATE_TEST_CASE_P(test_3x3_SSD_dilation, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(test_3x3_SSD_dilation, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 512, 19, 19)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -303,7 +303,7 @@ INSTANTIATE_TEST_CASE_P(test_3x3_SSD_dilation, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(test_TF_Resnet_50, myriadLayers_IR3_ConvTests_smoke, +INSTANTIATE_TEST_SUITE_P(test_TF_Resnet_50, myriadLayers_IR3_ConvTests_smoke, ::testing::Combine( ::testing::Values({1, 512, 38, 38}) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -315,7 +315,7 @@ INSTANTIATE_TEST_CASE_P(test_TF_Resnet_50, myriadLayers_IR3_ConvTests_smoke, ) ); -INSTANTIATE_TEST_CASE_P(test_3x3_icvnet_dilation, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(test_3x3_icvnet_dilation, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 24, 20, 20)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -330,7 +330,7 @@ INSTANTIATE_TEST_CASE_P(test_3x3_icvnet_dilation, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(test_5x5_with_dilation, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(test_5x5_with_dilation, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 64, 77)) , ::testing::Values(MAKE_STRUCT(param_size, 5, 5)) @@ -346,7 +346,7 @@ INSTANTIATE_TEST_CASE_P(test_5x5_with_dilation, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(test_7x7_with_dilation, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(test_7x7_with_dilation, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 64, 77)) , ::testing::Values(MAKE_STRUCT(param_size, 7, 7)) @@ -363,7 +363,7 @@ INSTANTIATE_TEST_CASE_P(test_7x7_with_dilation, myriadLayerConvolution, ); -INSTANTIATE_TEST_CASE_P(test_conv1x1, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(test_conv1x1, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 10, 13, 13)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -377,7 +377,7 @@ INSTANTIATE_TEST_CASE_P(test_conv1x1, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(test_yolo_tiny_2_512x13x13_use_3x3_convolution, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(test_yolo_tiny_2_512x13x13_use_3x3_convolution, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 512, 13, 13)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -390,7 +390,7 @@ INSTANTIATE_TEST_CASE_P(test_yolo_tiny_2_512x13x13_use_3x3_convolution, myriadLa ) ); -INSTANTIATE_TEST_CASE_P(test_yolo_tiny_2_512x13x13_use_1x1_convolution, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(test_yolo_tiny_2_512x13x13_use_1x1_convolution, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 4608, 13, 13)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -403,7 +403,7 @@ INSTANTIATE_TEST_CASE_P(test_yolo_tiny_2_512x13x13_use_1x1_convolution, myriadLa ) ); -INSTANTIATE_TEST_CASE_P(accuracy_group, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_group, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 64, 77) , MAKE_STRUCT(tensor_test_params, 1, 32, 112, 96)) @@ -422,7 +422,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_group, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_group_large_input, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_group_large_input, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 192, 336)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -437,7 +437,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_group_large_input, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_any_group, myriadLayerConvolution_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_any_group, myriadLayerConvolution_smoke, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 64, 77)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -453,7 +453,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_any_group, myriadLayerConvolution_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_any_group, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_any_group, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 64, 77)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -469,7 +469,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_any_group, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(set_optimization_for_3x3_with_group, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(set_optimization_for_3x3_with_group, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 24, 80, 80) , MAKE_STRUCT(tensor_test_params, 1, 36, 80, 80)) @@ -484,7 +484,7 @@ INSTANTIATE_TEST_CASE_P(set_optimization_for_3x3_with_group, myriadLayerConvolut ) ); -INSTANTIATE_TEST_CASE_P(set_optimization_for_3x3s1, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(set_optimization_for_3x3s1, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 24, 80, 80)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -497,7 +497,7 @@ INSTANTIATE_TEST_CASE_P(set_optimization_for_3x3s1, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_1x1, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_1x1, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 16, 64, 64) , MAKE_STRUCT(tensor_test_params, 1, 32, 1, 1)) @@ -514,7 +514,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_1x1, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_3x3, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_3x3, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 8, 16, 16) , MAKE_STRUCT(tensor_test_params, 1, 8, 59, 73)) @@ -530,7 +530,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_3x3, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_1x3, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_1x3, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 8, 59, 73)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 3), MAKE_STRUCT(param_size, 3, 1)) @@ -544,7 +544,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_1x3, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_5x5, myriadLayerConvolution_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_5x5, myriadLayerConvolution_smoke, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 16, 32, 32) /*, MAKE_STRUCT(tensor_test_params, 1, 8, 511, 399) failed*/) @@ -561,7 +561,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_5x5, myriadLayerConvolution_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_5x5, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_5x5, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 16, 32, 32) /*, MAKE_STRUCT(tensor_test_params, 1, 8, 511, 399) failed*/) @@ -578,7 +578,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_5x5, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_7x7, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_7x7, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 8, 32, 32) /*, MAKE_STRUCT(tensor_test_params, 1, 8, 511, 399) failed*/) @@ -595,7 +595,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_7x7, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_3x3_large_input_1, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_3x3_large_input_1, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 3, 720, 1280)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -608,7 +608,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_3x3_large_input_1, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_3x3_large_input_2, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_3x3_large_input_2, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 24, 357, 637)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -622,7 +622,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_3x3_large_input_2, myriadLayerConvolution, ); -INSTANTIATE_TEST_CASE_P(accuracy_3x3_large_input_3, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_3x3_large_input_3, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 16, 359, 639)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -635,7 +635,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_3x3_large_input_3, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_1x1_large_input, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_1x1_large_input, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 24, 355, 635)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -648,7 +648,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_1x1_large_input, myriadLayerConvolution, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_small_input_0, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_small_input_0, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 128, 38, 38)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -660,7 +660,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_small_input_0, myriadLayerConvolution, , ::testing::Values(vpu::LayoutPreference::ChannelMinor) ) ); -INSTANTIATE_TEST_CASE_P(accuracy_small_input_1, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_small_input_1, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 256, 2, 3)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -672,7 +672,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_small_input_1, myriadLayerConvolution, , ::testing::Values(vpu::LayoutPreference::ChannelMinor) ) ); -INSTANTIATE_TEST_CASE_P(accuracy_small_input_2, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_small_input_2, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 256, 2, 2)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -684,7 +684,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_small_input_2, myriadLayerConvolution, , ::testing::Values(vpu::LayoutPreference::ChannelMinor) ) ); -INSTANTIATE_TEST_CASE_P(accuracy_small_input_3, myriadLayerConvolution, +INSTANTIATE_TEST_SUITE_P(accuracy_small_input_3, myriadLayerConvolution, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 256, 1, 1)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_copy_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_copy_test.cpp index 2dafed62127..2f42d4d9dff 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_copy_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_copy_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_copy_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerCopy_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerCopy_smoke, ::testing::Combine( ::testing::Values(MAKE_STRUCT(nd_tensor_test_params, {36, 19, 20, 21}) , MAKE_STRUCT(nd_tensor_test_params, {7, 8, 5, 12}) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_crop_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_crop_test.cpp index 8df5595df17..c7bcc255f3c 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_crop_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_crop_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_crop_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy_Crop, myriadLayerCropOneInputAndDim_smoke, ::testing::Combine( ::testing::ValuesIn(s_tileTensors1), @@ -14,7 +14,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(s_tileDim)) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy_Crop1, myriadLayerCropOneInput_smoke, ::testing::Combine( ::testing::ValuesIn(s_tileTensors1), @@ -24,7 +24,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(s_tileCropEnd)) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy_Crop2, myriadLayerCropTwoInputs_smoke, ::testing::Combine( ::testing::ValuesIn(s_tileTensors1), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_custom_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_custom_test.cpp index 106f2ea5253..ceebce481f8 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_custom_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_custom_test.cpp @@ -4,27 +4,27 @@ #include "myriad_layers_custom_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsShuffleChannel_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsShuffleChannel_smoke, ::testing::Combine( ::testing::ValuesIn(s_ShuffleChannelTensors), ::testing::ValuesIn(s_ShuffleChannelGroup), ::testing::ValuesIn(s_CustomConfig))); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsFakeQuantize_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsFakeQuantize_smoke, ::testing::Combine( ::testing::ValuesIn(s_QuantizeTensors), ::testing::ValuesIn(s_QuantizeLevels), ::testing::Values(IRVersion::v7, IRVersion::v10), ::testing::ValuesIn(s_CustomConfig))); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsQuantizeBinarize_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsQuantizeBinarize_smoke, ::testing::Combine( ::testing::ValuesIn(s_QuantizeTensors), ::testing::Values(2), ::testing::ValuesIn(s_QuantizeSwitchOut), ::testing::ValuesIn(s_CustomConfig))); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsBinaryConvolution_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsBinaryConvolution_smoke, ::testing::Combine( ::testing::ValuesIn(s_BinaryConvolutionTensors), ::testing::ValuesIn(s_BinaryConvolutionDilations), @@ -33,17 +33,17 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsBinaryConvolution_smoke, ::testing::ValuesIn(s_BinaryConvolutionStrides), ::testing::ValuesIn(s_CustomConfig))); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsExperimentalDetectronPriorGridGenerator_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsExperimentalDetectronPriorGridGenerator_smoke, ::testing::Combine( ::testing::ValuesIn(s_ExperimentalDetectronPriorGridGeneratorImageDims), ::testing::ValuesIn(s_CustomConfig))); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsCorrelate_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsCorrelate_smoke, ::testing::Combine( ::testing::ValuesIn(s_CorrelateParams), ::testing::ValuesIn(s_CustomConfig))); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsSpatialTransform_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsSpatialTransform_smoke, ::testing::Combine( ::testing::ValuesIn(s_SpatialTransformInputs), ::testing::ValuesIn(s_SpatialTransformTheta), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_deconvolution_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_deconvolution_test.cpp index 6dd93d3b146..c7412b5760c 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_deconvolution_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_deconvolution_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_deconvolution_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy_deconv_to_conv, myriadLayerDeconvolution_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_deconv_to_conv, myriadLayerDeconvolution_smoke, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 6, 5, 6)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 1), MAKE_STRUCT(param_size, 3, 3)) @@ -17,7 +17,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_deconv_to_conv, myriadLayerDeconvolution_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_deconv_to_conv_2, myriadLayerDeconvolution_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_deconv_to_conv_2, myriadLayerDeconvolution_smoke, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 2, 256, 14, 14)) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2), MAKE_STRUCT(param_size, 3, 3)) @@ -30,7 +30,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_deconv_to_conv_2, myriadLayerDeconvolution_smok ) ); -INSTANTIATE_TEST_CASE_P(accuracy_group, myriadLayerDeconvolution_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_group, myriadLayerDeconvolution_smoke, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 384, 4, 2)) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2) @@ -47,7 +47,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_group, myriadLayerDeconvolution_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_depthDeconv, myriadLayerDeconvolution_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_depthDeconv, myriadLayerDeconvolution_smoke, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 384, 4, 2)) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2) @@ -65,7 +65,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_depthDeconv, myriadLayerDeconvolution_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerDeconvolution_asymm_pad, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerDeconvolution_asymm_pad, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 128, 60, 80), MAKE_STRUCT(tensor_test_params, 1, 2, 37, 59)) @@ -84,7 +84,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerDeconvolution_asymm_pad, ) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerDeconvolution_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerDeconvolution_smoke, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 2, 37, 59) , MAKE_STRUCT(tensor_test_params, 1, 21, 16, 16) @@ -109,7 +109,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerDeconvolution_smoke, ) ); -INSTANTIATE_TEST_CASE_P(extra3x3s1, myriadLayerDeconvolution_smoke, +INSTANTIATE_TEST_SUITE_P(extra3x3s1, myriadLayerDeconvolution_smoke, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 256, 1, 1)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_eltwise_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_eltwise_test.cpp index 9b307b8d91e..8945b73fdd4 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_eltwise_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_eltwise_test.cpp @@ -4,168 +4,168 @@ #include "myriad_layers_eltwise_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseMax_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseMax_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseSum_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseSum_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseSub_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseSub_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyTwoInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseMul_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseMul_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseSumWithCoeff_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseSumWithCoeff_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseSumWithBroadcast_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseSumWithBroadcast_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseInputs), ::testing::Values(4)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseSubWithCoeff_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseSubWithCoeff_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyTwoInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseSubWithBroadcast_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseSubWithBroadcast_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyTwoInputs), ::testing::Values(4)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseDiv_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseDiv_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyTwoInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseMin_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseMin_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseSqDiff_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseSqDiff_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyTwoInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwisePow_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwisePow_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyTwoInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseFloorMod_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseFloorMod_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyTwoInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseEqual_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseEqual_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyTwoInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseNotEqual_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseNotEqual_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyTwoInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseGreater_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseGreater_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyTwoInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseGreaterEqual_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseGreaterEqual_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyTwoInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseLess_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseLess_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyTwoInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseLessEqual_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseLessEqual_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyTwoInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseLogicalNot_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseLogicalNot_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyOneInput), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseLogicalAnd_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseLogicalAnd_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseLogicalOr_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseLogicalOr_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseLogicalXor_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseLogicalXor_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseInputs), ::testing::ValuesIn(s_eltwiseDims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsEltwiseMean_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsEltwiseMean_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseOnlyTwoInputs), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_elu_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_elu_test.cpp index 16d211a1467..5e99e6795b4 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_elu_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_elu_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_elu_test.hpp" -INSTANTIATE_TEST_CASE_P( accuracy, myriadLayersTestsELUParams_smoke, +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsELUParams_smoke, ::testing::Combine( ::testing::ValuesIn(s_powerTensors), ::testing::ValuesIn(s_powerParams)) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_erf_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_erf_test.cpp index 609d76fa4c2..4730fa0a2e9 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_erf_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_erf_test.cpp @@ -4,6 +4,6 @@ #include "myriad_layers_erf_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsErf_smoke, ::testing::ValuesIn(s_ErfDims)); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_detectionoutput_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_detectionoutput_test.cpp index 23f6b46deac..2ac5cb77e04 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_detectionoutput_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_detectionoutput_test.cpp @@ -18,7 +18,7 @@ static const std::vector s_layerParams_list = {{ 10.0, 10.0, 5.0, 5.0 }, 4.135166645050049, 0.5, 0.05, _MaxDetections, _NumClasses, 2000, 0 }, }; -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsExpDetectionOutput_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsExpDetectionOutput_smoke, ::testing::Combine( ::testing::ValuesIn(s_sizeParams_list), ::testing::ValuesIn(s_layerParams_list)) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_generateproposals.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_generateproposals.cpp index 63175d7ce9d..027198d3f01 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_generateproposals.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_generateproposals.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_exp_generateproposals_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsExpGenerateProposals_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsExpGenerateProposals_smoke, ::testing::Combine( ::testing::ValuesIn(s_ExpGenerateProposalsLayerScores), ::testing::ValuesIn(s_ExpGenerateProposalsLayerImInfo), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_priorgridgenerator_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_priorgridgenerator_test.cpp index 1036a4bdf7d..3c63109a214 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_priorgridgenerator_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_priorgridgenerator_test.cpp @@ -4,19 +4,19 @@ #include "myriad_layers_exp_priorgridgenerator_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsExpPriorGridGeneratorAllInputs_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsExpPriorGridGeneratorAllInputs_smoke, ::testing::Combine( ::testing::ValuesIn(s_ExpPriorGridGeneratorLayerInputs), ::testing::ValuesIn(s_ExpPriorGridGeneratorLayerParam)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsExpPriorGridGeneratorNoFeatureMap_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsExpPriorGridGeneratorNoFeatureMap_smoke, ::testing::Combine( ::testing::ValuesIn(s_ExpPriorGridGenLayerNoFMInputs), ::testing::ValuesIn(s_ExpPriorGridGenLayerNoFMParam)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsExpPriorGridGeneratorNoInputImage_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsExpPriorGridGeneratorNoInputImage_smoke, ::testing::Combine( ::testing::ValuesIn(s_ExpPriorGridGenLayerNoInputImage), ::testing::ValuesIn(s_ExpPriorGridGenLayerNoInputImageParam)) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_test.cpp index b78906e928d..def1e217498 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_test.cpp @@ -4,6 +4,6 @@ #include "myriad_layers_exp_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsExp_smoke, ::testing::ValuesIn(s_expParams)); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_topkrois_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_topkrois_test.cpp index ff0094c4f20..8ed4022ba13 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_topkrois_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_exp_topkrois_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_exp_topkrois_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsExpTopKROIs_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsExpTopKROIs_smoke, ::testing::Combine( ::testing::ValuesIn(s_ExpTopKROIsInputRoisNum), ::testing::ValuesIn(s_ExpTopKROIsMaxRoisNum)) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_flatten_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_flatten_test.cpp index 98978ecfd11..260f01d1b8f 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_flatten_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_flatten_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_flatten_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsFlatten_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsFlatten_smoke, ::testing::Combine( ::testing::ValuesIn(s_flattenTensors), ::testing::ValuesIn(s_flattenAxis) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_floor_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_floor_test.cpp index cdd5dc7422a..046608b0d5e 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_floor_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_floor_test.cpp @@ -4,6 +4,6 @@ #include "myriad_layers_floor_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsFloor_smoke, ::testing::ValuesIn(s_FloorParams)); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_fully_connected_tests.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_fully_connected_tests.cpp index 8ec8ad6378c..7e65bc26ec0 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_fully_connected_tests.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_fully_connected_tests.cpp @@ -3,19 +3,19 @@ // #include "myriad_layers_fully_connected_tests.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsFullyConnected_smoke, ::testing::ValuesIn(s_fcTestParams) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsFullyConnectedBatch_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsFullyConnectedBatch_smoke, ::testing::Combine( ::testing::ValuesIn(s_fcTestBatchParams) , ::testing::ValuesIn(s_fcTestBatchOutSizes) ) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsFullyConnectedPVA_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsFullyConnectedPVA_smoke, ::testing::Combine( ::testing::ValuesIn(s_fcTestPVAParams) , ::testing::ValuesIn(s_fcTestPVAOutSizes) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_gemm_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_gemm_test.cpp index 7cb12c87748..bd4c7483665 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_gemm_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_gemm_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_gemm_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerGEMM_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerGEMM_smoke, ::testing::Combine( ::testing::Values( MAKE_STRUCT(gemm_parameters, 4.7f, 2.3f, 5, 7, 11, 1, 2, 3, 4, 5, 6, 7, 8), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_grn_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_grn_test.cpp index 5cccc5f5be3..d8e94ac8dc8 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_grn_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_grn_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_grn_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsGRN_smoke, ::testing::Combine( ::testing::ValuesIn(s_GRNInputs), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_interp_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_interp_test.cpp index bfedb460067..3fff0275d7b 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_interp_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_interp_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_interp_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsInterp_smoke, ::testing::Combine( diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_log_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_log_test.cpp index 490a762997e..0e709247015 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_log_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_log_test.cpp @@ -4,6 +4,6 @@ #include "myriad_layers_log_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsLog_smoke, ::testing::ValuesIn(s_logParams)); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_lrn_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_lrn_test.cpp index a7b3172ff43..e3a0a66af66 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_lrn_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_lrn_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_lrn_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsLRN_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsLRN_smoke, ::testing::Combine( ::testing::ValuesIn(s_LRNTensors), ::testing::ValuesIn(s_LRNlocal_size), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_lstm_cell.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_lstm_cell.cpp index 819de8087db..1b7ad35d892 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_lstm_cell.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_lstm_cell.cpp @@ -162,6 +162,6 @@ TEST_F(myriadLayersTests_nightly, LSTMCellSequenceNet) { CompareCommonAbsolute(output, refOut0, ERROR_BOUND); } -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsLSTMCell_smoke, - ::testing::Values(MAKE_STRUCT(lstmcell_test_params, 512, 128)), +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsLSTMCell_smoke, + ::testing::Values(MAKE_STRUCT(lstmcell_test_params, 512, 128)) ); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_mvn_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_mvn_test.cpp index 702c3688e56..16bf3cdc665 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_mvn_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_mvn_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_mvn_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsMVN_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsMVN_smoke, ::testing::Combine( ::testing::ValuesIn(s_MVNTensors), ::testing::ValuesIn(s_MVN_acrossChannels), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_nonzero_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_nonzero_test.cpp index 0075457ce6a..7a330009890 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_nonzero_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_nonzero_test.cpp @@ -4,5 +4,5 @@ #include "myriad_layers_nonzero_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerTestNonZero_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerTestNonZero_smoke, ::testing::ValuesIn(inputDims)); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_normalize_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_normalize_test.cpp index 34b9e4600cd..37f5948e5c0 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_normalize_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_normalize_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_normalize_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsNormalize_smoke, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsNormalize_smoke, ::testing::Combine( ::testing::Values( // small size, num_channels is not divisible by 8 MAKE_STRUCT(tensor_test_params, 1, 33, 1, 1), @@ -21,7 +21,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsNormalize_smoke, ::testing::C )); -INSTANTIATE_TEST_CASE_P(accuracy_more, myriadLayersTestsNormalize_smoke, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(accuracy_more, myriadLayersTestsNormalize_smoke, ::testing::Combine( ::testing::Values( //more tests MAKE_STRUCT(tensor_test_params, 1, 1, 38, 38), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_oneHot_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_oneHot_test.cpp index 72335191447..b3041a99167 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_oneHot_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_oneHot_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_oneHot_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerTestOneHot_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerTestOneHot_smoke, ::testing::Values( MAKE_STRUCT(OneHotParams, {64}, 2, {0}, {}, {}), MAKE_STRUCT(OneHotParams, {64}, 2, {-1}, {}, {}), @@ -22,7 +22,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerTestOneHot_smoke, MAKE_STRUCT(OneHotParams, {4, 8, 16, 32, 64}, 2, {-1}, {}, {}) )); -INSTANTIATE_TEST_CASE_P(accuracy_add, myriadLayerTestOneHot_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_add, myriadLayerTestOneHot_smoke, ::testing::Values( MAKE_STRUCT(OneHotParams, {16, 32, 64}, 2, {2}, {}, {}), MAKE_STRUCT(OneHotParams, {8, 16, 32,64}, 2, {2}, {}, {}), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_pad_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_pad_test.cpp index e45d93d121f..c68044dad2a 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_pad_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_pad_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_pad_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerPad_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerPad_smoke, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 64, 16, 16)), ::testing::Values(MAKE_STRUCT(pad_parameters, 0, 32, 1, 2, 0, 32, 3, 4)), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_permute_nd_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_permute_nd_test.cpp index 463163e8c56..96c50476c84 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_permute_nd_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_permute_nd_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_permute_nd_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy_2D, myriadLayersPermuteNDTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_2D, myriadLayersPermuteNDTests_smoke, ::testing::Combine( ::testing::ValuesIn(s_inTensors_2D) , ::testing::ValuesIn(s_permuteTensors_2D) @@ -12,7 +12,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_2D, myriadLayersPermuteNDTests_smoke, , ::testing::ValuesIn(s_permutePrecisions) )); -INSTANTIATE_TEST_CASE_P(accuracy_3D, myriadLayersPermuteNDTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_3D, myriadLayersPermuteNDTests_smoke, ::testing::Combine( ::testing::ValuesIn(s_inTensors_3D) , ::testing::ValuesIn(s_permuteTensors_3D) @@ -20,7 +20,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_3D, myriadLayersPermuteNDTests_smoke, , ::testing::ValuesIn(s_permutePrecisions) )); -INSTANTIATE_TEST_CASE_P(accuracy_4D, myriadLayersPermuteNDTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_4D, myriadLayersPermuteNDTests_smoke, ::testing::Combine( ::testing::ValuesIn(s_inTensors_4D) , ::testing::ValuesIn(s_permuteTensors_4D) @@ -28,7 +28,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_4D, myriadLayersPermuteNDTests_smoke, , ::testing::ValuesIn(s_permutePrecisions) )); -INSTANTIATE_TEST_CASE_P(accuracy_5D, myriadLayersPermuteNDTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_5D, myriadLayersPermuteNDTests_smoke, ::testing::Combine( ::testing::ValuesIn(s_inTensors_5D) , ::testing::ValuesIn(s_permuteTensors_5D) @@ -36,7 +36,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_5D, myriadLayersPermuteNDTests_smoke, , ::testing::ValuesIn(s_permutePrecisions) )); -INSTANTIATE_TEST_CASE_P(fc_to_conv_case, myriadLayersPermuteNDTests_smoke, +INSTANTIATE_TEST_SUITE_P(fc_to_conv_case, myriadLayersPermuteNDTests_smoke, ::testing::Values( std::make_tuple( SizeVector{8, 50, 256, 7, 7}, @@ -53,7 +53,7 @@ INSTANTIATE_TEST_CASE_P(fc_to_conv_case, myriadLayersPermuteNDTests_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_FasterRCNN, myriadLayersPermuteNDTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_FasterRCNN, myriadLayersPermuteNDTests_smoke, ::testing::Combine( ::testing::Values({1, 24, 14, 14}) ,::testing::Values({0, 2, 3, 1}) @@ -61,7 +61,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_FasterRCNN, myriadLayersPermuteNDTests_smoke, ,::testing::ValuesIn(s_permutePrecisions) )); -INSTANTIATE_TEST_CASE_P(accuracy_MaskRCNN, myriadLayersPermuteNDTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_MaskRCNN, myriadLayersPermuteNDTests_smoke, ::testing::Combine( ::testing::Values({4, 3, 1, 88, 120}) ,::testing::Values({0, 3, 4, 1, 2}) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_permute_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_permute_test.cpp index a8738e300b5..0ccef5858f0 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_permute_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_permute_test.cpp @@ -4,13 +4,13 @@ #include "myriad_layers_permute_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersPermuteTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersPermuteTests_smoke, ::testing::Combine( ::testing::ValuesIn(s_inTensors) , ::testing::ValuesIn(s_permuteTensors) )); -INSTANTIATE_TEST_CASE_P(accuracyFasterRCNN, myriadLayersPermuteTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracyFasterRCNN, myriadLayersPermuteTests_smoke, ::testing::Combine( ::testing::Values({1, 24, 14, 14}) ,::testing::Values({0, 2, 3, 1}) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_pool_nd_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_pool_nd_test.cpp index b6b791c108a..094ef5c4994 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_pool_nd_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_pool_nd_test.cpp @@ -12,7 +12,7 @@ using namespace testing; // //====================================================================== -INSTANTIATE_TEST_CASE_P(tricky_ncdhw_avg_userpad, +INSTANTIATE_TEST_SUITE_P(tricky_ncdhw_avg_userpad, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 19, 65, 47}), @@ -28,7 +28,7 @@ INSTANTIATE_TEST_CASE_P(tricky_ncdhw_avg_userpad, ) ); -INSTANTIATE_TEST_CASE_P(tricky_ncdhw_max_userpad, +INSTANTIATE_TEST_SUITE_P(tricky_ncdhw_max_userpad, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 19, 65, 47}), @@ -43,7 +43,7 @@ INSTANTIATE_TEST_CASE_P(tricky_ncdhw_max_userpad, ) ); -INSTANTIATE_TEST_CASE_P(tricky_ncdhw_avg_autopad, +INSTANTIATE_TEST_SUITE_P(tricky_ncdhw_avg_autopad, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 19, 65, 47}), @@ -61,7 +61,7 @@ INSTANTIATE_TEST_CASE_P(tricky_ncdhw_avg_autopad, ) ); -INSTANTIATE_TEST_CASE_P(tricky_ncdhw_max_autopad, +INSTANTIATE_TEST_SUITE_P(tricky_ncdhw_max_autopad, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 19, 65, 47}), @@ -84,7 +84,7 @@ INSTANTIATE_TEST_CASE_P(tricky_ncdhw_max_autopad, // //====================================================================== -INSTANTIATE_TEST_CASE_P(simple_ncdhw_avg_userpad, +INSTANTIATE_TEST_SUITE_P(simple_ncdhw_avg_userpad, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 20, 64, 48}), @@ -100,7 +100,7 @@ INSTANTIATE_TEST_CASE_P(simple_ncdhw_avg_userpad, ) ); -INSTANTIATE_TEST_CASE_P(simple_ncdhw_max_userpad, +INSTANTIATE_TEST_SUITE_P(simple_ncdhw_max_userpad, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 20, 64, 48}), @@ -124,7 +124,7 @@ INSTANTIATE_TEST_CASE_P(simple_ncdhw_max_userpad, // Issue-15146 HW AvgPool doesn't support excludePad parameter //---------------------------------------------------------------------- -INSTANTIATE_TEST_CASE_P(simple_ncdhw_avg_autopad_1, +INSTANTIATE_TEST_SUITE_P(simple_ncdhw_avg_autopad_1, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 20, 64, 48}), @@ -141,7 +141,7 @@ INSTANTIATE_TEST_CASE_P(simple_ncdhw_avg_autopad_1, ) ); -INSTANTIATE_TEST_CASE_P(simple_ncdhw_avg_autopad_2, +INSTANTIATE_TEST_SUITE_P(simple_ncdhw_avg_autopad_2, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 20, 64, 48}), @@ -158,7 +158,7 @@ INSTANTIATE_TEST_CASE_P(simple_ncdhw_avg_autopad_2, //---------------------------------------------------------------------- -INSTANTIATE_TEST_CASE_P(simple_ncdhw_max_autopad, +INSTANTIATE_TEST_SUITE_P(simple_ncdhw_max_autopad, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 20, 64, 48}), @@ -181,7 +181,7 @@ INSTANTIATE_TEST_CASE_P(simple_ncdhw_max_autopad, // //====================================================================== -INSTANTIATE_TEST_CASE_P(tricky_nchw_avg_userpad, +INSTANTIATE_TEST_SUITE_P(tricky_nchw_avg_userpad, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 65, 47}), @@ -197,7 +197,7 @@ INSTANTIATE_TEST_CASE_P(tricky_nchw_avg_userpad, ) ); -INSTANTIATE_TEST_CASE_P(tricky_nchw_max_userpad, +INSTANTIATE_TEST_SUITE_P(tricky_nchw_max_userpad, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 65, 47}), @@ -212,7 +212,7 @@ INSTANTIATE_TEST_CASE_P(tricky_nchw_max_userpad, ) ); -INSTANTIATE_TEST_CASE_P(tricky_nchw_avg_autopad, +INSTANTIATE_TEST_SUITE_P(tricky_nchw_avg_autopad, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 65, 47}), @@ -230,7 +230,7 @@ INSTANTIATE_TEST_CASE_P(tricky_nchw_avg_autopad, ) ); -INSTANTIATE_TEST_CASE_P(tricky_nchw_max_autopad, +INSTANTIATE_TEST_SUITE_P(tricky_nchw_max_autopad, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 65, 47}), @@ -253,7 +253,7 @@ INSTANTIATE_TEST_CASE_P(tricky_nchw_max_autopad, // //====================================================================== -INSTANTIATE_TEST_CASE_P(simple_nchw_avg_userpad, +INSTANTIATE_TEST_SUITE_P(simple_nchw_avg_userpad, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 64, 48}), @@ -269,7 +269,7 @@ INSTANTIATE_TEST_CASE_P(simple_nchw_avg_userpad, ) ); -INSTANTIATE_TEST_CASE_P(simple_nchw_max_userpad, +INSTANTIATE_TEST_SUITE_P(simple_nchw_max_userpad, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 64, 48}), @@ -293,7 +293,7 @@ INSTANTIATE_TEST_CASE_P(simple_nchw_max_userpad, // Issue-15146 HW AvgPool doesn't support excludePad parameter //---------------------------------------------------------------------- -INSTANTIATE_TEST_CASE_P(simple_nchw_avg_autopad_1, +INSTANTIATE_TEST_SUITE_P(simple_nchw_avg_autopad_1, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 64, 48}), @@ -310,7 +310,7 @@ INSTANTIATE_TEST_CASE_P(simple_nchw_avg_autopad_1, ) ); -INSTANTIATE_TEST_CASE_P(simple_nchw_avg_autopad_2, +INSTANTIATE_TEST_SUITE_P(simple_nchw_avg_autopad_2, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 64, 48}), @@ -327,7 +327,7 @@ INSTANTIATE_TEST_CASE_P(simple_nchw_avg_autopad_2, //---------------------------------------------------------------------- -INSTANTIATE_TEST_CASE_P(simple_nchw_max_autopad, +INSTANTIATE_TEST_SUITE_P(simple_nchw_max_autopad, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 3, 64, 48}), @@ -350,7 +350,7 @@ INSTANTIATE_TEST_CASE_P(simple_nchw_max_autopad, // //====================================================================== -INSTANTIATE_TEST_CASE_P(i3d_id10, +INSTANTIATE_TEST_SUITE_P(i3d_id10, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 64, 40, 112, 112}), @@ -363,7 +363,7 @@ INSTANTIATE_TEST_CASE_P(i3d_id10, Values(RoundingType("")), Values(ExcludePad(true)))); -INSTANTIATE_TEST_CASE_P(i3d_id47, +INSTANTIATE_TEST_SUITE_P(i3d_id47, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 192, 40, 28, 28}), @@ -376,7 +376,7 @@ INSTANTIATE_TEST_CASE_P(i3d_id47, Values(RoundingType("")), Values(ExcludePad(true)))); -INSTANTIATE_TEST_CASE_P(i3d_id247, +INSTANTIATE_TEST_SUITE_P(i3d_id247, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 832, 20, 14, 14}), @@ -389,7 +389,7 @@ INSTANTIATE_TEST_CASE_P(i3d_id247, Values(RoundingType("")), Values(ExcludePad(true)))); -INSTANTIATE_TEST_CASE_P(i3d_id312, +INSTANTIATE_TEST_SUITE_P(i3d_id312, myriadLayersPoolNDTest_smoke, Combine( Values(InputShape {1, 1024, 10, 7, 7}), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_pooling_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_pooling_test.cpp index 1fda0995a0b..5bd7ddd3df4 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_pooling_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_pooling_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_pooling_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayers_IR3_BatchPoolingTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayers_IR3_BatchPoolingTests_smoke, ::testing::Combine( ::testing::Values({10, 192, 56, 56}) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) /* kernel */ @@ -17,7 +17,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayers_IR3_BatchPoolingTests_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_1, myriadLayers_IR3_BatchPoolingTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_1, myriadLayers_IR3_BatchPoolingTests_smoke, ::testing::Combine( ::testing::Values({10, 576, 14, 14}) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2)) /* kernel */ @@ -31,7 +31,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_1, myriadLayers_IR3_BatchPoolingTests_smoke, ); -INSTANTIATE_TEST_CASE_P(accuracy_4X4, myriadLayers_IR3_PoolingTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_4X4, myriadLayers_IR3_PoolingTests_smoke, ::testing::Combine( ::testing::Values({10, 1024, 4, 4}) , ::testing::Values(MAKE_STRUCT(param_size, 4, 4)) /* kernel */ @@ -44,7 +44,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_4X4, myriadLayers_IR3_PoolingTests_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_1X1, myriadLayers_IR3_BatchPoolingTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_1X1, myriadLayers_IR3_BatchPoolingTests_smoke, ::testing::Combine( ::testing::Values({1, 3, 5, 7}) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) /* kernel */ @@ -57,7 +57,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_1X1, myriadLayers_IR3_BatchPoolingTests_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_2X2p0000, myriadLayers_IR3_BatchPoolingTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_2X2p0000, myriadLayers_IR3_BatchPoolingTests_smoke, ::testing::Combine( ::testing::Values({1, 512, 26, 26}) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2)) /* kernel */ @@ -70,7 +70,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_2X2p0000, myriadLayers_IR3_BatchPoolingTests_sm ) ); -INSTANTIATE_TEST_CASE_P(accuracy_2X2p0001, myriadLayers_IR3_BatchPoolingTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_2X2p0001, myriadLayers_IR3_BatchPoolingTests_smoke, ::testing::Combine( ::testing::Values({1, 512, 26, 26}) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2)) /* kernel */ @@ -82,7 +82,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_2X2p0001, myriadLayers_IR3_BatchPoolingTests_sm , ::testing::ValuesIn(s_poolingMethod) ) ); -INSTANTIATE_TEST_CASE_P(accuracy_2X2p0011, myriadLayers_IR3_BatchPoolingTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_2X2p0011, myriadLayers_IR3_BatchPoolingTests_smoke, ::testing::Combine( ::testing::Values({1, 512, 26, 26}) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2)) /* kernel */ @@ -94,7 +94,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_2X2p0011, myriadLayers_IR3_BatchPoolingTests_sm , ::testing::ValuesIn(s_poolingMethod) ) ); -INSTANTIATE_TEST_CASE_P(accuracy_2X2p0111, myriadLayers_IR3_BatchPoolingTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_2X2p0111, myriadLayers_IR3_BatchPoolingTests_smoke, ::testing::Combine( ::testing::Values({1, 512, 26, 26}) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2)) /* kernel */ @@ -106,7 +106,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_2X2p0111, myriadLayers_IR3_BatchPoolingTests_sm , ::testing::ValuesIn(s_poolingMethod) ) ); -INSTANTIATE_TEST_CASE_P(accuracy_2X2p1111, myriadLayers_IR3_BatchPoolingTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_2X2p1111, myriadLayers_IR3_BatchPoolingTests_smoke, ::testing::Combine( ::testing::Values({1, 512, 26, 26}) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2)) /* kernel */ @@ -118,7 +118,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_2X2p1111, myriadLayers_IR3_BatchPoolingTests_sm , ::testing::ValuesIn(s_poolingMethod) ) ); -INSTANTIATE_TEST_CASE_P(accuracy_2X2p1110, myriadLayers_IR3_BatchPoolingTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_2X2p1110, myriadLayers_IR3_BatchPoolingTests_smoke, ::testing::Combine( ::testing::Values({1, 512, 26, 26}) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2)) /* kernel */ @@ -130,7 +130,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_2X2p1110, myriadLayers_IR3_BatchPoolingTests_sm , ::testing::ValuesIn(s_poolingMethod) ) ); -INSTANTIATE_TEST_CASE_P(accuracy_2X2p1100, myriadLayers_IR3_BatchPoolingTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_2X2p1100, myriadLayers_IR3_BatchPoolingTests_smoke, ::testing::Combine( ::testing::Values({1, 512, 26, 26}) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2)) /* kernel */ @@ -142,7 +142,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_2X2p1100, myriadLayers_IR3_BatchPoolingTests_sm , ::testing::ValuesIn(s_poolingMethod) ) ); -INSTANTIATE_TEST_CASE_P(accuracy_2X2p1000, myriadLayers_IR3_BatchPoolingTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_2X2p1000, myriadLayers_IR3_BatchPoolingTests_smoke, ::testing::Combine( ::testing::Values({1, 512, 26, 26}) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2)) /* kernel */ @@ -154,7 +154,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_2X2p1000, myriadLayers_IR3_BatchPoolingTests_sm , ::testing::ValuesIn(s_poolingMethod) ) ); -INSTANTIATE_TEST_CASE_P(accuracy_2X2p1101, myriadLayers_IR3_BatchPoolingTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_2X2p1101, myriadLayers_IR3_BatchPoolingTests_smoke, ::testing::Combine( ::testing::Values({1, 512, 26, 26}) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2)) /* kernel */ @@ -166,7 +166,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_2X2p1101, myriadLayers_IR3_BatchPoolingTests_sm , ::testing::ValuesIn(s_poolingMethod) ) ); -INSTANTIATE_TEST_CASE_P(accuracy_2X2p1011, myriadLayers_IR3_BatchPoolingTests_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_2X2p1011, myriadLayers_IR3_BatchPoolingTests_smoke, ::testing::Combine( ::testing::Values({1, 512, 26, 26}) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2)) /* kernel */ @@ -179,14 +179,14 @@ INSTANTIATE_TEST_CASE_P(accuracy_2X2p1011, myriadLayers_IR3_BatchPoolingTests_sm ) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsMax_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsMax_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput), ::testing::ValuesIn(g_poolingLayerParamsFull), ::testing::ValuesIn(g_poolingLayout)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsMaxOverlappedByKernel_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsMaxOverlappedByKernel_smoke, ::testing::Combine( ::testing::Values({1, 1024, 6, 6}), ::testing::Values(MAKE_STRUCT(param_size, 7, 7)), @@ -195,7 +195,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsMaxOverlappedByKernel_smoke, ::testing::ValuesIn(g_poolingLayout)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsMaxPad4_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsMaxPad4_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInputPad4), ::testing::ValuesIn(g_poolingKernelPad4), @@ -204,7 +204,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsMaxPad4_smoke, ::testing::ValuesIn(g_poolingLayout)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsAvgPad4_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsAvgPad4_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInputPad4), ::testing::ValuesIn(g_poolingKernelPad4), @@ -213,24 +213,24 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsAvgPad4_smoke, ::testing::ValuesIn(g_poolingLayout)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsGlobalMax_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsGlobalMax_smoke, ::testing::ValuesIn(g_GlobalPoolingInput )); -INSTANTIATE_TEST_CASE_P(accuracy_3x3, myriadLayersTestsMax_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_3x3, myriadLayersTestsMax_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput), ::testing::ValuesIn(s_poolingLayerParams_k3x3), ::testing::ValuesIn(g_poolingLayout)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsAvg_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsAvg_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput), ::testing::ValuesIn(g_poolingLayerParamsFull), ::testing::ValuesIn(g_poolingLayout)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsAvgOverlappedByKernel_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsAvgOverlappedByKernel_smoke, ::testing::Combine( ::testing::Values({1, 1024, 6, 6}), ::testing::Values(MAKE_STRUCT(param_size, 7, 7)), @@ -239,12 +239,12 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsAvgOverlappedByKernel_smoke, ::testing::ValuesIn(g_poolingLayout)) ); -INSTANTIATE_TEST_CASE_P(accuracy_3x3, myriadLayersTestsAvg_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_3x3, myriadLayersTestsAvg_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput), ::testing::ValuesIn(s_poolingLayerParams_k3x3), ::testing::ValuesIn(g_poolingLayout)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsGlobalAvg_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsGlobalAvg_smoke, ::testing::ValuesIn(g_GlobalPoolingInput)); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_power_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_power_test.cpp index a8557aa10ed..8585729e529 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_power_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_power_test.cpp @@ -3,7 +3,7 @@ // #include "myriad_layers_power_test.hpp" -INSTANTIATE_TEST_CASE_P( accuracy, myriadLayersTestsPowerParams_smoke, +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsPowerParams_smoke, ::testing::Combine( ::testing::ValuesIn(s_powerTensors), ::testing::ValuesIn(s_powerParams)) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_prelu_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_prelu_test.cpp index 7a6f469a06a..35f41cbe28c 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_prelu_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_prelu_test.cpp @@ -4,14 +4,14 @@ #include "myriad_layers_prelu_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy_PReLU, myriadLayerPReLU_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_PReLU, myriadLayerPReLU_smoke, ::testing::Combine( ::testing::ValuesIn(s_PReLUTensors) , ::testing::Values(0, 1) ) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayerFullyConnectedWithPReLU_smoke, ::testing::Combine( ::testing::ValuesIn(g_fcTestParamsSubset), @@ -21,7 +21,7 @@ INSTANTIATE_TEST_CASE_P( ) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsMaxPoolingWithPReLU_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsMaxPoolingWithPReLU_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput), ::testing::ValuesIn(g_poolingLayerParamsLite), @@ -29,7 +29,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsMaxPoolingWithPReLU_smoke, ::testing::ValuesIn(s_PReluLayerParams)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsAvgPoolingWithPReLU_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsAvgPoolingWithPReLU_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput), ::testing::ValuesIn(g_poolingLayerParamsLite), @@ -37,7 +37,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsAvgPoolingWithPReLU_smoke, ::testing::ValuesIn(s_PReluLayerParams)) ); -INSTANTIATE_TEST_CASE_P(accuracy_postop, myriadLayersTestsMaxPoolingWithPReLU_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_postop, myriadLayersTestsMaxPoolingWithPReLU_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput_postOp), ::testing::Values(MAKE_STRUCT(pooling_layer_params, {3, 3}, {1, 1}, {1, 1})), @@ -45,7 +45,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_postop, myriadLayersTestsMaxPoolingWithPReLU_sm ::testing::Values(MAKE_STRUCT(PReLULayerDef, {{{PRELU_PARAM, "0"}}}))) ); -INSTANTIATE_TEST_CASE_P(accuracy_postop, myriadLayersTestsAvgPoolingWithPReLU_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_postop, myriadLayersTestsAvgPoolingWithPReLU_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput_postOp), ::testing::Values(MAKE_STRUCT(pooling_layer_params, {3, 3}, {1, 1}, {1, 1})), @@ -53,7 +53,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_postop, myriadLayersTestsAvgPoolingWithPReLU_sm ::testing::Values(MAKE_STRUCT(PReLULayerDef, {{{PRELU_PARAM, "0"}}}))) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerConvolutionWithPReLU_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerConvolutionWithPReLU_smoke, ::testing::Combine( ::testing::ValuesIn(g_convolutionTensors) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -65,7 +65,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerConvolutionWithPReLU_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_postop, myriadLayerConvolutionWithPReLU_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_postop, myriadLayerConvolutionWithPReLU_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput_postOp) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_psroipooling_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_psroipooling_test.cpp index 1955910aa7f..4a5196bef7e 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_psroipooling_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_psroipooling_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_psroipooling_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsPSROIPooling_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsPSROIPooling_smoke, ::testing::Combine( ::testing::ValuesIn(s_PSROIPoolingLayerInput), ::testing::ValuesIn(s_PSROIPoolingLayerParam), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_psroipooling_test.hpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_psroipooling_test.hpp index 9f25bb1df37..0aadb311e02 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_psroipooling_test.hpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_psroipooling_test.hpp @@ -192,7 +192,7 @@ static std::vector s_PSROIPoolingNumROIs = { TEST_P(myriadLayersTestsPSROIPooling_smoke, PSROIPooling) { #ifdef _WIN32 - SKIP() << "Disabled for Windows. Issue-13239"; + GTEST_SKIP() << "Disabled for Windows. Issue-13239"; #endif tensor_test_params dims_layer_in = std::get<0>(GetParam()); PSROIPoolingParams test_params = std::get<1>(GetParam()); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reduce_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reduce_test.cpp index eeb62e51ca0..68923313877 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reduce_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reduce_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_reduce_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsReduceAnd_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsReduceAnd_smoke, ::testing::Combine( ::testing::ValuesIn(s_input_pair), ::testing::ValuesIn(s_axes_list), @@ -12,7 +12,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsReduceAnd_smoke, ::testing::ValuesIn(s_keep_dims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsReduceMin_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsReduceMin_smoke, ::testing::Combine( ::testing::ValuesIn(s_input_pair), ::testing::ValuesIn(s_axes_list), @@ -20,7 +20,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsReduceMin_smoke, ::testing::ValuesIn(s_keep_dims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsReduceMax_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsReduceMax_smoke, ::testing::Combine( ::testing::ValuesIn(s_input_pair), ::testing::ValuesIn(s_axes_list), @@ -28,7 +28,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsReduceMax_smoke, ::testing::ValuesIn(s_keep_dims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsReduceSum_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsReduceSum_smoke, ::testing::Combine( ::testing::ValuesIn(s_input_pair), ::testing::ValuesIn(s_axes_list), @@ -36,7 +36,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsReduceSum_smoke, ::testing::ValuesIn(s_keep_dims)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsReduceMean_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsReduceMean_smoke, ::testing::Combine( ::testing::ValuesIn(s_input_pair), ::testing::ValuesIn(s_axes_list), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_region_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_region_test.cpp index a5470c4ac95..80c2a4c1e11 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_region_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_region_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_region_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsRegionYolo_smoke, ::testing::Combine( ::testing::Values(4), @@ -19,7 +19,7 @@ INSTANTIATE_TEST_CASE_P( #ifdef VPU_HAS_CUSTOM_KERNELS -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy_custom, myriadLayersTestsRegionYolo_smoke, ::testing::Combine( ::testing::Values(4), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_relu_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_relu_test.cpp index 84c9a828040..da43b0b7922 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_relu_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_relu_test.cpp @@ -4,14 +4,14 @@ #include "myriad_layers_relu_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerReLU_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerReLU_smoke, ::testing::Combine( ::testing::ValuesIn(s_copyTensors), ::testing::ValuesIn(s_reluLayerParams) ) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayerFullyConnectedWithReLU_smoke, ::testing::Combine( ::testing::ValuesIn(g_fcTestParamsSubset), @@ -21,7 +21,7 @@ INSTANTIATE_TEST_CASE_P( ) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsMaxPoolingWithReLU_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsMaxPoolingWithReLU_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput), ::testing::ValuesIn(g_poolingLayerParamsLite), @@ -29,7 +29,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsMaxPoolingWithReLU_smoke, ::testing::ValuesIn(s_reluLayerParams)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsAvgPoolingWithReLU_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsAvgPoolingWithReLU_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput), ::testing::ValuesIn(g_poolingLayerParamsLite), @@ -37,7 +37,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsAvgPoolingWithReLU_smoke, ::testing::ValuesIn(s_reluLayerParams)) ); -INSTANTIATE_TEST_CASE_P(accuracy_postop, myriadLayersTestsMaxPoolingWithReLU_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_postop, myriadLayersTestsMaxPoolingWithReLU_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput_postOp), ::testing::Values(MAKE_STRUCT(pooling_layer_params, {3, 3}, {1, 1}, {1, 1})), @@ -45,7 +45,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_postop, myriadLayersTestsMaxPoolingWithReLU_smo ::testing::Values(MAKE_STRUCT(ReLULayerDef, {{{"negative_slope", "0.0"}}}))) ); -INSTANTIATE_TEST_CASE_P(accuracy_postop, myriadLayersTestsAvgPoolingWithReLU_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_postop, myriadLayersTestsAvgPoolingWithReLU_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput_postOp), ::testing::Values(MAKE_STRUCT(pooling_layer_params, {3, 3}, {1, 1}, {1, 1})), @@ -53,7 +53,7 @@ INSTANTIATE_TEST_CASE_P(accuracy_postop, myriadLayersTestsAvgPoolingWithReLU_smo ::testing::Values(MAKE_STRUCT(ReLULayerDef, {{{"negative_slope", "0.0"}}}))) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerConvolutionWithReLU_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerConvolutionWithReLU_smoke, ::testing::Combine( ::testing::ValuesIn(g_convolutionTensors) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -65,7 +65,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerConvolutionWithReLU_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy_postop, myriadLayerConvolutionWithReLU_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_postop, myriadLayerConvolutionWithReLU_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput_postOp) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reorg_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reorg_test.cpp index 6b5e88de88d..964170e4f21 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reorg_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reorg_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_reorg_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsReorg_smoke, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsReorg_smoke, ::testing::Combine( ::testing::ValuesIn(s_ReorgInputs), ::testing::Values(2), ::testing::Values(vpu::LayoutPreference::ChannelMinor, vpu::LayoutPreference::ChannelMajor), @@ -14,7 +14,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsReorg_smoke, ::testing::Combi #ifdef VPU_HAS_CUSTOM_KERNELS -INSTANTIATE_TEST_CASE_P(accuracy_custom, myriadLayersTestsReorg_smoke, ::testing::Combine( +INSTANTIATE_TEST_SUITE_P(accuracy_custom, myriadLayersTestsReorg_smoke, ::testing::Combine( ::testing::ValuesIn(s_ReorgInputs_CustomLayer), ::testing::Values(2), ::testing::Values(vpu::LayoutPreference::ChannelMinor, vpu::LayoutPreference::ChannelMajor), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_resample_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_resample_test.cpp index c111327edd8..f9f57089c10 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_resample_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_resample_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_resample_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadResampleLayerTests_smoke, ::testing::Combine( ::testing::ValuesIn(s_ResampleInput), @@ -16,7 +16,7 @@ INSTANTIATE_TEST_CASE_P( #ifdef VPU_HAS_CUSTOM_KERNELS -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy_custom, myriadResampleLayerTests_smoke, ::testing::Combine( ::testing::ValuesIn(s_ResampleInput), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reshape_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reshape_test.cpp index 721a9c68201..3dde909a85e 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reshape_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reshape_test.cpp @@ -264,13 +264,13 @@ TEST_F(myriadLayerReshapeFasterRCNN_smoke, Reshape) { ASSERT_TRUE(generateNetAndInfer(NetworkInitParams().useHWOpt( CheckMyriadX()))); } -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerReshape_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerReshape_smoke, ::testing::Combine( ::testing::ValuesIn(s_reshapeInParams), ::testing::ValuesIn(s_reshapeOutParams)) ); -INSTANTIATE_TEST_CASE_P(fc_to_conv_case, myriadLayerReshape_smoke, +INSTANTIATE_TEST_SUITE_P(fc_to_conv_case, myriadLayerReshape_smoke, ::testing::Values( std::make_tuple( SizeVector{400, 12544}, @@ -291,11 +291,11 @@ INSTANTIATE_TEST_CASE_P(fc_to_conv_case, myriadLayerReshape_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsReshapeBeforeFC_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsReshapeBeforeFC_smoke, ::testing::Values(CONFIG_VALUE(YES), CONFIG_VALUE(NO)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsReshapeFasterRCNN_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsReshapeFasterRCNN_smoke, ::testing::Combine( ::testing::ValuesIn(s_convTensor) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reverse_sequence_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reverse_sequence_test.cpp index 21938c5e595..2685d602f84 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reverse_sequence_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_reverse_sequence_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_reverse_sequence_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerReverseSequence_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerReverseSequence_smoke, ::testing::Combine( ::testing::Values( MAKE_STRUCT(reverse_sequence_test_params, {5, 6, 18}, 0, 0) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_roi_align_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_roi_align_test.cpp index 87c467e3dfc..a19af42ecf3 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_roi_align_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_roi_align_test.cpp @@ -4,18 +4,18 @@ #include "myriad_layers_roi_align_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsROIAlign_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsROIAlign_smoke, ::testing::Combine( ::testing::ValuesIn(s_ROIAlignLayerInput), ::testing::ValuesIn(s_ROIAlignLayerParam), ::testing::ValuesIn(s_ROIAlignNumROIs), - ::testing::ValuesIn(s_ROIAlignMode)), + ::testing::ValuesIn(s_ROIAlignMode)) ); -INSTANTIATE_TEST_CASE_P(accuracy_faster, myriadLayersTestsROIAlign_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy_faster, myriadLayersTestsROIAlign_smoke, ::testing::Combine( ::testing::ValuesIn(s_ROIAlignLayerInput_Faster), ::testing::ValuesIn(s_ROIAlignLayerParam_Faster), ::testing::ValuesIn(s_ROIAlignNumROIs_Faster), - ::testing::ValuesIn(s_ROIAlignMode_Faster)), + ::testing::ValuesIn(s_ROIAlignMode_Faster)) ); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_roi_feature_extractor_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_roi_feature_extractor_test.cpp index e047f00ce0c..2c30e1b1bc4 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_roi_feature_extractor_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_roi_feature_extractor_test.cpp @@ -4,9 +4,9 @@ #include "myriad_layers_roi_feature_extractor_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsROIFeatureExtractor_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsROIFeatureExtractor_smoke, ::testing::Combine( ::testing::ValuesIn(s_ROIFeatureExtractorLayerInput), ::testing::ValuesIn(s_ROIFeatureExtractorLayerParam), - ::testing::ValuesIn(s_ROIFeatureExtractorNumROIs)), + ::testing::ValuesIn(s_ROIFeatureExtractorNumROIs)) ); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_roi_pooling_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_roi_pooling_test.cpp index dc88686743c..6e8bf111eae 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_roi_pooling_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_roi_pooling_test.cpp @@ -4,11 +4,11 @@ #include "myriad_layers_roi_pooling_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsROIPooling_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsROIPooling_smoke, ::testing::Combine( ::testing::ValuesIn(s_ROIPoolingLayerInput), ::testing::ValuesIn(s_ROIPoolingLayerParam), ::testing::ValuesIn(s_ROIPoolingNumRois), ::testing::ValuesIn(s_ROIPoolingMethod), - ::testing::Values(IRVersion::v7, IRVersion::v10)), + ::testing::Values(IRVersion::v7, IRVersion::v10)) ); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_scale_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_scale_test.cpp index 0bee6c57c43..66a2df07136 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_scale_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_scale_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_scale_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsScale_smoke, ::testing::Combine( ::testing::ValuesIn(s_inputScaleTensors), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_scatter_elements_update_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_scatter_elements_update_test.cpp index e344d9fac8a..e156cc2559a 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_scatter_elements_update_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_scatter_elements_update_test.cpp @@ -53,12 +53,12 @@ static const std::vector dataShapeList_useCases = { { 16, 512, 56, 56 }, }; -INSTANTIATE_TEST_CASE_P(nd_tensors, myriadLayersScatterElementsUpdateTest_smoke, +INSTANTIATE_TEST_SUITE_P(nd_tensors, myriadLayersScatterElementsUpdateTest_smoke, Combine( ValuesIn(dataShapeList_ndTensors), ValuesIn(dataTypeList))); -INSTANTIATE_TEST_CASE_P(use_cases, myriadLayersScatterElementsUpdateTest_smoke, +INSTANTIATE_TEST_SUITE_P(use_cases, myriadLayersScatterElementsUpdateTest_smoke, Combine( ValuesIn(dataShapeList_useCases), ValuesIn(dataTypeList))); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_scatter_update_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_scatter_update_test.cpp index 4412c1d1cf6..640598f5fb5 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_scatter_update_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_scatter_update_test.cpp @@ -12,7 +12,7 @@ using namespace testing; // //---------------------------------------------------------------------- -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( nd_tensors, myriadLayersScatterUpdateTest_smoke, Values( @@ -49,7 +49,7 @@ INSTANTIATE_TEST_CASE_P( // //---------------------------------------------------------------------- -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( use_cases, myriadLayersScatterUpdateTest_smoke, Values( diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_select_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_select_test.cpp index 76939b7c23e..ef886903419 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_select_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_select_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_select_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsSelect_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsSelect_smoke, ::testing::Combine( ::testing::ValuesIn(s_eltwiseTensors), ::testing::ValuesIn(s_eltwiseDims)) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_sigmoid_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_sigmoid_test.cpp index 4eca99fa2ff..091740c25c6 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_sigmoid_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_sigmoid_test.cpp @@ -4,25 +4,25 @@ #include "myriad_layers_sigmoid_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsSigmoid_smoke, ::testing::ValuesIn(s_sigmoidParams)); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsMaxPoolingWithSigmoid_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsMaxPoolingWithSigmoid_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput), ::testing::ValuesIn(g_poolingLayerParamsLite), ::testing::ValuesIn(g_poolingLayout)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsAvgPoolingWithSigmoid_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsAvgPoolingWithSigmoid_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput), ::testing::ValuesIn(g_poolingLayerParamsLite), ::testing::ValuesIn(g_poolingLayout)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerConvolutionWithSigmoid_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerConvolutionWithSigmoid_smoke, ::testing::Combine( ::testing::ValuesIn(g_convolutionTensors) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -34,7 +34,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerConvolutionWithSigmoid_smoke, ) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayerFullyConnectedWithSigmoid_smoke, ::testing::Combine( ::testing::ValuesIn(g_fcTestParamsSubset), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_slice_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_slice_test.cpp index f710365f2e0..c99bef79a16 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_slice_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_slice_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_slice_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsSlice_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsSlice_smoke, ::testing::Values( MAKE_STRUCT(SliceParams, {4, 8, 16, 32, 64}, {{4, 8, 16, 10, 64}, {4, 8, 16, 22, 64}}, 3), MAKE_STRUCT(SliceParams, {4, 8, 16, 32}, {{4, 8, 2, 32}, {4, 8, 14, 32}}, 2)) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_softmax_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_softmax_test.cpp index 75cea33ed2b..3d64c5c37a1 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_softmax_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_softmax_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_softmax_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsSoftMax_smoke, ::testing::Combine( ::testing::ValuesIn(s_softMaxTensors) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_split_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_split_test.cpp index cc28aa41976..c75d3b37592 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_split_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_split_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_split_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsSplit_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsSplit_smoke, ::testing::Values( MAKE_STRUCT(SplitParams, {4, 8, 16, 32, 64}, 2, 6), MAKE_STRUCT(SplitParams, {4, 8, 16, 32}, 2, 6), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_squeeze_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_squeeze_test.cpp index be4f1553639..170aab55518 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_squeeze_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_squeeze_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_squeeze_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsSqueezeTC1_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsSqueezeTC1_smoke, ::testing::Combine( ::testing::ValuesIn(s_squeezeTensorsTC1), ::testing::ValuesIn(s_squeezeIndicesTC1), @@ -13,7 +13,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsSqueezeTC1_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsSqueezeTC2_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsSqueezeTC2_smoke, ::testing::Combine( ::testing::ValuesIn(s_squeezeTensorsTC2), ::testing::ValuesIn(s_squeezeIndicesTC2), @@ -23,7 +23,7 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsSqueezeTC2_smoke, ); // TODO: rewrite to ngraph to have reshape functionality -INSTANTIATE_TEST_CASE_P(DISABLED_accuracy, myriadLayersTestsSqueezeTC3_smoke, +INSTANTIATE_TEST_SUITE_P(DISABLED_accuracy, myriadLayersTestsSqueezeTC3_smoke, ::testing::Combine( ::testing::ValuesIn(s_squeezeTensorsTC3), ::testing::ValuesIn(s_squeezeIndicesTC3), @@ -33,7 +33,7 @@ INSTANTIATE_TEST_CASE_P(DISABLED_accuracy, myriadLayersTestsSqueezeTC3_smoke, ); // TODO: rewrite to ngraph to have reshape functionality -INSTANTIATE_TEST_CASE_P(DISABLED_accuracy, myriadLayersTestsSqueezeTC4_smoke, +INSTANTIATE_TEST_SUITE_P(DISABLED_accuracy, myriadLayersTestsSqueezeTC4_smoke, ::testing::Combine( ::testing::ValuesIn(s_squeezeTensorsTC4), ::testing::ValuesIn(s_squeezeIndicesTC4), @@ -42,7 +42,7 @@ INSTANTIATE_TEST_CASE_P(DISABLED_accuracy, myriadLayersTestsSqueezeTC4_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsSqueezeTC5_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsSqueezeTC5_smoke, ::testing::Combine( ::testing::ValuesIn(s_squeezeTensorsTC5), ::testing::ValuesIn(s_squeezeIndicesTC5), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_strided_slice_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_strided_slice_test.cpp index b3936b10db0..8df50c44271 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_strided_slice_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_strided_slice_test.cpp @@ -4,6 +4,6 @@ #include "myriad_layers_strided_slice_test.h" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsStridedSlice_smoke, ::testing::ValuesIn(s_stridedSliceParams)); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_tanh_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_tanh_test.cpp index 60f816b0842..5a7b5be8a46 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_tanh_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_tanh_test.cpp @@ -4,11 +4,11 @@ #include "myriad_layers_tanh_test.hpp" -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayersTestsTanh_smoke, ::testing::ValuesIn(s_tanhParams)); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerConvolutionWithTanH_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerConvolutionWithTanH_smoke, ::testing::Combine( ::testing::ValuesIn(g_convolutionTensors) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -20,21 +20,21 @@ INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerConvolutionWithTanH_smoke, ) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsMaxPoolingWithTanh_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsMaxPoolingWithTanh_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput), ::testing::ValuesIn(g_poolingLayerParamsLite), ::testing::ValuesIn(g_poolingLayout)) ); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsAvgPoolingWithTanh_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsAvgPoolingWithTanh_smoke, ::testing::Combine( ::testing::ValuesIn(g_poolingInput), ::testing::ValuesIn(g_poolingLayerParamsLite), ::testing::ValuesIn(g_poolingLayout)) ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( accuracy, myriadLayerFullyConnectedWithTanH_smoke, ::testing::Combine( ::testing::ValuesIn(g_fcTestParamsSubset), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_tile_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_tile_test.cpp index ad6d40376a5..7d68de1b77b 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_tile_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_tile_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_tile_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracyAdd, myriadLayerTestTile_smoke, +INSTANTIATE_TEST_SUITE_P(accuracyAdd, myriadLayerTestTile_smoke, ::testing::Combine( ::testing::Values( MAKE_STRUCT(tile_test::nd_tensor_test_params, {4, 5, 6}, 0) @@ -21,7 +21,7 @@ INSTANTIATE_TEST_CASE_P(accuracyAdd, myriadLayerTestTile_smoke, , ::testing::Values(2, 3, 5) )); -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayerTestTile_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayerTestTile_smoke, ::testing::Combine( ::testing::Values( MAKE_STRUCT(tile_test::nd_tensor_test_params, {4, 5, 6}, 1) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_topk_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_topk_test.cpp index 23a36df4f58..1cf3edc8642 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_topk_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_topk_test.cpp @@ -32,7 +32,7 @@ static const std::vector s_sorts_list = // "none", // currently is not supported by firmware }; -INSTANTIATE_TEST_CASE_P(accuracy, myriadTestsTopK_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadTestsTopK_smoke, ::testing::Combine( ::testing::ValuesIn(s_geometries_list), ::testing::ValuesIn(s_modes_list), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_unsqueeze_test.cpp b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_unsqueeze_test.cpp index 070a99e6405..d5384668bf9 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_unsqueeze_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/layers/myriad_layers_unsqueeze_test.cpp @@ -4,7 +4,7 @@ #include "myriad_layers_unsqueeze_test.hpp" -INSTANTIATE_TEST_CASE_P(accuracy, myriadLayersTestsUnsqueeze_smoke, +INSTANTIATE_TEST_SUITE_P(accuracy, myriadLayersTestsUnsqueeze_smoke, ::testing::Combine( ::testing::ValuesIn(s_squeezeTensors), ::testing::ValuesIn(s_squeezeIndices) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/myriad_get_output_tests.cpp b/inference-engine/tests_deprecated/functional/vpu/common/myriad_get_output_tests.cpp index 4d45cc5a9a2..41540403574 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/myriad_get_output_tests.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/myriad_get_output_tests.cpp @@ -4,7 +4,7 @@ #include "myriad_get_output_tests.hpp" -INSTANTIATE_TEST_CASE_P(Test_params_pool, myriadGetOutput_nightly, +INSTANTIATE_TEST_SUITE_P(Test_params_pool, myriadGetOutput_nightly, testing::Values( std::make_tuple(std::make_tuple(&full_model, &poolModel), "pool1_3x3_s2"), std::make_tuple(std::make_tuple(&full_model, &convModel), "conv1_7x7_s2"), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_conv_tests.hpp b/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_conv_tests.hpp index f911e8e3fe7..a8fed6cea07 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_conv_tests.hpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_conv_tests.hpp @@ -105,7 +105,7 @@ public: TEST_P(MyriadX_HW_Convolution_Tests_nightly, Single) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddInitialCopyLayer(); @@ -117,7 +117,7 @@ TEST_P(MyriadX_HW_Convolution_Tests_nightly, Single) { TEST_P(MyriadX_HW_Convolution_Tests_nightly, WithReLU) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddInitialCopyLayer(); @@ -130,7 +130,7 @@ TEST_P(MyriadX_HW_Convolution_Tests_nightly, WithReLU) { TEST_P(MyriadX_HW_Convolution_Tests_nightly, WithLeakyReLU) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddConvolutionLayer(); @@ -142,7 +142,7 @@ TEST_P(MyriadX_HW_Convolution_Tests_nightly, WithLeakyReLU) { TEST_P(MyriadX_HW_Convolution_Tests_nightly, WithClamp) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddConvolutionLayer(); @@ -154,7 +154,7 @@ TEST_P(MyriadX_HW_Convolution_Tests_nightly, WithClamp) { TEST_P(MyriadX_HW_Convolution_Tests_nightly, MultipleInfer) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddConvolutionLayer(); @@ -162,7 +162,7 @@ TEST_P(MyriadX_HW_Convolution_Tests_nightly, MultipleInfer) { CompareWithItself(100); } -INSTANTIATE_TEST_CASE_P(MaskRcnn101_DILATION, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(MaskRcnn101_DILATION, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 256, 50, 50), MAKE_STRUCT(tensor_test_params, 1, 256, 100, 171)) @@ -175,7 +175,7 @@ INSTANTIATE_TEST_CASE_P(MaskRcnn101_DILATION, MyriadX_HW_Convolution_Tests_night ) ); -INSTANTIATE_TEST_CASE_P(kernel_7x7_DILATION, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(kernel_7x7_DILATION, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 90, 90)) , ::testing::Values(MAKE_STRUCT(param_size, 7, 7)) @@ -187,7 +187,7 @@ INSTANTIATE_TEST_CASE_P(kernel_7x7_DILATION, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(Unequal_hw_pad_dilationfactor_DILATION, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(Unequal_hw_pad_dilationfactor_DILATION, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 128, 128)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3), @@ -201,7 +201,7 @@ INSTANTIATE_TEST_CASE_P(Unequal_hw_pad_dilationfactor_DILATION, MyriadX_HW_Convo ) ); -INSTANTIATE_TEST_CASE_P(Strides_DILATION, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(Strides_DILATION, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 64, 64)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -215,7 +215,7 @@ INSTANTIATE_TEST_CASE_P(Strides_DILATION, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_1x1s1p0_extra1, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_1x1s1p0_extra1, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 64, 180, 320)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -227,7 +227,7 @@ INSTANTIATE_TEST_CASE_P(conv_1x1s1p0_extra1, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_1x1s1p0_extra2, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_1x1s1p0_extra2, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 512, 45, 80)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -239,7 +239,7 @@ INSTANTIATE_TEST_CASE_P(conv_1x1s1p0_extra2, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_1x1s1p0_extra3, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_1x1s1p0_extra3, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 256, 45, 80)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -251,7 +251,7 @@ INSTANTIATE_TEST_CASE_P(conv_1x1s1p0_extra3, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_1x1s1p0_extra4, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_1x1s1p0_extra4, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 512, 45, 80)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -263,7 +263,7 @@ INSTANTIATE_TEST_CASE_P(conv_1x1s1p0_extra4, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_1x1s2p0_extra1, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_1x1s2p0_extra1, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 64, 180, 320)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -275,7 +275,7 @@ INSTANTIATE_TEST_CASE_P(conv_1x1s2p0_extra1, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_1x1s2p0_extra2, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_1x1s2p0_extra2, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 128, 90, 160)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -287,7 +287,7 @@ INSTANTIATE_TEST_CASE_P(conv_1x1s2p0_extra2, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_1x1s2p0_extra3, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_1x1s2p0_extra3, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 128, 90, 160)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -299,7 +299,7 @@ INSTANTIATE_TEST_CASE_P(conv_1x1s2p0_extra3, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s2p1_extra1, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s2p1_extra1, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 64, 180, 320)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -311,7 +311,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s2p1_extra1, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s2p1_extra2, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s2p1_extra2, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 128, 90, 160)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -323,7 +323,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s2p1_extra2, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s2p1_extra3, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s2p1_extra3, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 256, 45, 80)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -335,7 +335,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s2p1_extra3, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s2p1_extra4, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s2p1_extra4, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 180, 320)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -347,7 +347,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s2p1_extra4, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_1x1s1p0, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_1x1s1p0, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 64, 56, 56)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -359,7 +359,7 @@ INSTANTIATE_TEST_CASE_P(conv_1x1s1p0, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_1x1s1p0_resnet50, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_1x1s1p0_resnet50, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 2048, 7, 7)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -372,7 +372,7 @@ INSTANTIATE_TEST_CASE_P(conv_1x1s1p0_resnet50, MyriadX_HW_Convolution_Tests_nigh ); // This case adds extra CopyMakeBorder stage -INSTANTIATE_TEST_CASE_P(conv_1x1s1p1, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_1x1s1p1, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 512, 13, 13)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -384,7 +384,7 @@ INSTANTIATE_TEST_CASE_P(conv_1x1s1p1, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_1x1s2p0, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_1x1s2p0, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 256, 56, 56), MAKE_STRUCT(tensor_test_params, 1, 512, 28, 28), @@ -398,7 +398,7 @@ INSTANTIATE_TEST_CASE_P(conv_1x1s2p0, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s1p1, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s1p1, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 64, 56, 56)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -410,7 +410,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s1p1, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s1p1_yolo_tiny_v1_conv1, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s1p1_yolo_tiny_v1_conv1, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 3, 448, 448)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -422,7 +422,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s1p1_yolo_tiny_v1_conv1, MyriadX_HW_Convolution_ ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s1p1_yolo_tiny_v1_conv7, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s1p1_yolo_tiny_v1_conv7, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 512, 7, 7)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -434,7 +434,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s1p1_yolo_tiny_v1_conv7, MyriadX_HW_Convolution_ ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s1p1_yolo_tiny_v1_conv8, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s1p1_yolo_tiny_v1_conv8, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 1024, 7, 7)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -446,7 +446,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s1p1_yolo_tiny_v1_conv8, MyriadX_HW_Convolution_ ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s1p1_vgg, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s1p1_vgg, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 64, 224, 224)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -458,7 +458,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s1p1_vgg, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_7x7s2p3, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_7x7s2p3, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 3, 224, 224)) , ::testing::Values(MAKE_STRUCT(param_size, 7, 7)) @@ -472,7 +472,7 @@ INSTANTIATE_TEST_CASE_P(conv_7x7s2p3, MyriadX_HW_Convolution_Tests_nightly, // This case for unsymmetric convolution -INSTANTIATE_TEST_CASE_P(conv_3x1s1_LPR, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x1s1_LPR, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 22, 92)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 1)) @@ -484,7 +484,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x1s1_LPR, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_1x3s1_LPR, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_1x3s1_LPR, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 22, 92)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 3)) @@ -496,7 +496,7 @@ INSTANTIATE_TEST_CASE_P(conv_1x3s1_LPR, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_1x5s1_LPR, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_1x5s1_LPR, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 256, 5, 88)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 5)) @@ -508,7 +508,7 @@ INSTANTIATE_TEST_CASE_P(conv_1x5s1_LPR, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_13x1s1_LPR, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_13x1s1_LPR, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 128, 1, 88)) , ::testing::Values(MAKE_STRUCT(param_size, 13, 1)) @@ -520,7 +520,7 @@ INSTANTIATE_TEST_CASE_P(conv_13x1s1_LPR, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_5x1s1_LPR, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_5x1s1_LPR, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 128, 1, 28)) , ::testing::Values(MAKE_STRUCT(param_size, 5, 1)) @@ -532,7 +532,7 @@ INSTANTIATE_TEST_CASE_P(conv_5x1s1_LPR, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_4x4s2p1, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_4x4s2p1, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 3, 256, 416)) , ::testing::Values(MAKE_STRUCT(param_size, 4, 4)) @@ -544,7 +544,7 @@ INSTANTIATE_TEST_CASE_P(conv_4x4s2p1, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_5x5s2p1, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_5x5s2p1, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 3, 256, 416)) , ::testing::Values(MAKE_STRUCT(param_size, 5, 5)) @@ -556,7 +556,7 @@ INSTANTIATE_TEST_CASE_P(conv_5x5s2p1, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_5x5s2p2, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_5x5s2p2, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 3, 256, 416)) , ::testing::Values(MAKE_STRUCT(param_size, 5, 5)) @@ -568,7 +568,7 @@ INSTANTIATE_TEST_CASE_P(conv_5x5s2p2, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s1p1_group1, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s1p1_group1, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 150, 150)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -580,7 +580,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s1p1_group1, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s2p1_group1, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s2p1_group1, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 64, 150, 150)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -592,7 +592,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s2p1_group1, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s2p1_group2, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s2p1_group2, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 128, 75, 75)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -604,7 +604,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s2p1_group2, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s2p1_group3, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s2p1_group3, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 256, 38, 38)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -616,7 +616,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s2p1_group3, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s1p1_pva_pvd, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s1p1_pva_pvd, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 6, 208, 368)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -628,7 +628,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s1p1_pva_pvd, MyriadX_HW_Convolution_Tests_night ) ); -INSTANTIATE_TEST_CASE_P(conv_1x1s2p0_pva_pvd, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_1x1s2p0_pva_pvd, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 128, 208)) , ::testing::Values(MAKE_STRUCT(param_size, 1, 1)) @@ -640,7 +640,7 @@ INSTANTIATE_TEST_CASE_P(conv_1x1s2p0_pva_pvd, MyriadX_HW_Convolution_Tests_night ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s1p1_ssd, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s1p1_ssd, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 128, 75, 75)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -652,7 +652,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s1p1_ssd, MyriadX_HW_Convolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(conv_unequal_hw_pad, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_unequal_hw_pad, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 128, 128)) , ::testing::Values(MAKE_STRUCT(param_size, 5, 5), @@ -665,7 +665,7 @@ INSTANTIATE_TEST_CASE_P(conv_unequal_hw_pad, MyriadX_HW_Convolution_Tests_nightl ) ); -INSTANTIATE_TEST_CASE_P(conv_3x3s3p1_resnet34, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(conv_3x3s3p1_resnet34, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 512, 75, 75)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -677,7 +677,7 @@ INSTANTIATE_TEST_CASE_P(conv_3x3s3p1_resnet34, MyriadX_HW_Convolution_Tests_nigh ) ); -INSTANTIATE_TEST_CASE_P(fc_to_conv_case, MyriadX_HW_Convolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(fc_to_conv_case, MyriadX_HW_Convolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 256, 56, 350)) , ::testing::Values(MAKE_STRUCT(param_size, 7, 7)) @@ -794,7 +794,7 @@ public: TEST_P(MyriadX_HW_ConvPoolMerged_Tests_nightly, WithReLU) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddConvLayer(); @@ -807,7 +807,7 @@ TEST_P(MyriadX_HW_ConvPoolMerged_Tests_nightly, WithReLU) { TEST_P(MyriadX_HW_ConvPoolMerged_Tests_nightly, WithLeakyReLU) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddConvLayer(); @@ -818,7 +818,7 @@ TEST_P(MyriadX_HW_ConvPoolMerged_Tests_nightly, WithLeakyReLU) { CompareWithSW(maxerr); } -INSTANTIATE_TEST_CASE_P(yolo_conv1, MyriadX_HW_ConvPoolMerged_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(yolo_conv1, MyriadX_HW_ConvPoolMerged_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 3, 448, 448)), ::testing::Values(MAKE_STRUCT(param_size, 3, 3)), @@ -831,7 +831,7 @@ INSTANTIATE_TEST_CASE_P(yolo_conv1, MyriadX_HW_ConvPoolMerged_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(yolov2_tf_conv, MyriadX_HW_ConvPoolMerged_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(yolov2_tf_conv, MyriadX_HW_ConvPoolMerged_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 304, 304), MAKE_STRUCT(tensor_test_params, 1, 64, 152, 152)), @@ -845,7 +845,7 @@ INSTANTIATE_TEST_CASE_P(yolov2_tf_conv, MyriadX_HW_ConvPoolMerged_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(yolo_conv2, MyriadX_HW_ConvPoolMerged_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(yolo_conv2, MyriadX_HW_ConvPoolMerged_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 16, 224, 224)), ::testing::Values(MAKE_STRUCT(param_size, 3, 3)), @@ -858,7 +858,7 @@ INSTANTIATE_TEST_CASE_P(yolo_conv2, MyriadX_HW_ConvPoolMerged_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(yolo_conv4, MyriadX_HW_ConvPoolMerged_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(yolo_conv4, MyriadX_HW_ConvPoolMerged_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 64, 56, 56)), ::testing::Values(MAKE_STRUCT(param_size, 3, 3)), @@ -871,7 +871,7 @@ INSTANTIATE_TEST_CASE_P(yolo_conv4, MyriadX_HW_ConvPoolMerged_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(ssd_case1, MyriadX_HW_ConvPoolMerged_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(ssd_case1, MyriadX_HW_ConvPoolMerged_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 64, 98, 150)), ::testing::Values(MAKE_STRUCT(param_size, 3, 3)), @@ -884,7 +884,7 @@ INSTANTIATE_TEST_CASE_P(ssd_case1, MyriadX_HW_ConvPoolMerged_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(vgg16_case1, MyriadX_HW_ConvPoolMerged_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(vgg16_case1, MyriadX_HW_ConvPoolMerged_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 512, 28, 28)), ::testing::Values(MAKE_STRUCT(param_size, 3, 3)), @@ -951,7 +951,7 @@ public: TEST_P(MyriadX_HW_ConvTF_Tests_nightly, Single) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddConvolutionLayer(); @@ -960,7 +960,7 @@ TEST_P(MyriadX_HW_ConvTF_Tests_nightly, Single) { CompareWithSW(maxerr); } -INSTANTIATE_TEST_CASE_P(tf, MyriadX_HW_ConvTF_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(tf, MyriadX_HW_ConvTF_Tests_nightly, ::testing::Values( std::make_tuple( MAKE_STRUCT(tensor_test_params, 1, 3, 224, 224), // input @@ -1124,7 +1124,7 @@ public: TEST_P(MyriadX_HW_Deconvolution_Tests_nightly, Single) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddInitialCopyLayer(); @@ -1136,7 +1136,7 @@ TEST_P(MyriadX_HW_Deconvolution_Tests_nightly, Single) { TEST_P(MyriadX_HW_Deconvolution_Tests_nightly, ScaleTests) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddInitialCopyLayer(); @@ -1146,7 +1146,7 @@ TEST_P(MyriadX_HW_Deconvolution_Tests_nightly, ScaleTests) { CompareWithSW(maxerr); } -INSTANTIATE_TEST_CASE_P(deconv_tf_ssd, MyriadX_HW_Deconvolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(deconv_tf_ssd, MyriadX_HW_Deconvolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 2, 3, 3)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -1157,7 +1157,7 @@ INSTANTIATE_TEST_CASE_P(deconv_tf_ssd, MyriadX_HW_Deconvolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(deconv_3x3_str1, MyriadX_HW_Deconvolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(deconv_3x3_str1, MyriadX_HW_Deconvolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 256, 3, 3), MAKE_STRUCT(tensor_test_params, 1, 128, 5, 5), @@ -1170,7 +1170,7 @@ INSTANTIATE_TEST_CASE_P(deconv_3x3_str1, MyriadX_HW_Deconvolution_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(hw_accuracy_deconv_3x3, MyriadX_HW_Deconvolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(hw_accuracy_deconv_3x3, MyriadX_HW_Deconvolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 256, 5, 5), MAKE_STRUCT(tensor_test_params, 1, 128, 11, 11), @@ -1185,7 +1185,7 @@ INSTANTIATE_TEST_CASE_P(hw_accuracy_deconv_3x3, MyriadX_HW_Deconvolution_Tests_n ) ); -INSTANTIATE_TEST_CASE_P(hw_accuracy_deconv, MyriadX_HW_Deconvolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(hw_accuracy_deconv, MyriadX_HW_Deconvolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 120, 36, 36), MAKE_STRUCT(tensor_test_params, 1, 73, 40, 54), @@ -1200,7 +1200,7 @@ INSTANTIATE_TEST_CASE_P(hw_accuracy_deconv, MyriadX_HW_Deconvolution_Tests_night ) ); -INSTANTIATE_TEST_CASE_P(hw_accuracy_scale_deconv, MyriadX_HW_Deconvolution_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(hw_accuracy_scale_deconv, MyriadX_HW_Deconvolution_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 120, 36, 36)) , ::testing::Values(MAKE_STRUCT(param_size, 5, 5)) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_extra_tests.hpp b/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_extra_tests.hpp index f7c5b2bca06..41a4370feb3 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_extra_tests.hpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_extra_tests.hpp @@ -8,7 +8,7 @@ TEST_F(MyriadX_HW_Tests_nightly, SeveralLayers) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } tensor_test_params dims1{1, 3, 224, 224}; @@ -78,7 +78,7 @@ TEST_F(MyriadX_HW_Tests_nightly, SeveralLayers) { TEST_F(MyriadX_HW_Tests_nightly, LargePoolWithConv) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } tensor_test_params dims1{1, 16, 448, 448}; @@ -139,7 +139,7 @@ TEST_F(MyriadX_HW_Tests_nightly, LargePoolWithConv) { TEST_F(MyriadX_HW_Tests_nightly, ConvWithPool) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } tensor_test_params dims1{1, 16, 4, 4}; @@ -202,7 +202,7 @@ TEST_F(MyriadX_HW_Tests_nightly, ConvWithPool) { TEST_F(MyriadX_HW_Tests_nightly, WithConcat) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } const std::string model = R"V0G0N( @@ -391,7 +391,7 @@ TEST_F(MyriadX_HW_Tests_nightly, WithConcat) { TEST_F(MyriadX_HW_Tests_nightly, WithConcatMisaligned) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } const std::string model = R"V0G0N( @@ -548,7 +548,7 @@ TEST_F(MyriadX_HW_Tests_nightly, WithConcatMisaligned) { TEST_F(MyriadX_HW_Tests_nightly, With_3_FC_Layers) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } const std::string model = R"V0G0N( @@ -693,7 +693,7 @@ TEST_F(MyriadX_HW_Tests_nightly, With_3_FC_Layers) { TEST_F(MyriadX_HW_Tests_nightly, WithEltwise) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } const std::string model = R"V0G0N( @@ -913,7 +913,7 @@ TEST_F(MyriadX_HW_Tests_nightly, WithEltwise) { TEST_F(MyriadX_HW_Tests_nightly, WithEltwiseReLU) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } const std::string model = R"V0G0N( @@ -1152,7 +1152,7 @@ TEST_F(MyriadX_HW_Tests_nightly, WithEltwiseReLU) { TEST_F(MyriadX_HW_Tests_nightly, PermuteFlattenConcat) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } const std::string model = R"V0G0N( @@ -1378,7 +1378,7 @@ TEST_F(MyriadX_HW_Tests_nightly, PermuteFlattenConcat) { TEST_F(MyriadX_HW_Tests_nightly, VGG_FirstTwoConvs) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } IN_OUT_desc in_tensor, out_tensor; diff --git a/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_fc_tests.hpp b/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_fc_tests.hpp index 55425389477..dd8cdaafb54 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_fc_tests.hpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_fc_tests.hpp @@ -57,7 +57,7 @@ public: TEST_P(MyriadX_HW_FullyConnected_Tests_nightly, Single) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddFCLayer(); @@ -67,11 +67,11 @@ TEST_P(MyriadX_HW_FullyConnected_Tests_nightly, Single) { TEST_P(MyriadX_HW_FullyConnected_Tests_nightly, Single_NC) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } if (p.in.h != 1 || p.in.w != 1) { - SKIP() << "Non NC case"; + GTEST_SKIP() << "Non NC case"; } in_tensor.clear(); @@ -84,7 +84,7 @@ TEST_P(MyriadX_HW_FullyConnected_Tests_nightly, Single_NC) { TEST_P(MyriadX_HW_FullyConnected_Tests_nightly, WithReLU) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddFCLayer(); @@ -95,7 +95,7 @@ TEST_P(MyriadX_HW_FullyConnected_Tests_nightly, WithReLU) { TEST_P(MyriadX_HW_FullyConnected_Tests_nightly, MultipleInfer) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddFCLayer(); @@ -103,38 +103,38 @@ TEST_P(MyriadX_HW_FullyConnected_Tests_nightly, MultipleInfer) { CompareWithItself(100); } -INSTANTIATE_TEST_CASE_P(fc_1024to1000, MyriadX_HW_FullyConnected_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(fc_1024to1000, MyriadX_HW_FullyConnected_Tests_nightly, ::testing::Values(MAKE_STRUCT(fcon_test_params, {1, 1024, 1, 1}, 1000, 0.25f)) ); -INSTANTIATE_TEST_CASE_P(fc_4096to1000, MyriadX_HW_FullyConnected_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(fc_4096to1000, MyriadX_HW_FullyConnected_Tests_nightly, ::testing::Values(MAKE_STRUCT(fcon_test_params, {1, 4096, 1, 1}, 1000, 0.82f)) ); -INSTANTIATE_TEST_CASE_P(fc_4096to4096, MyriadX_HW_FullyConnected_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(fc_4096to4096, MyriadX_HW_FullyConnected_Tests_nightly, ::testing::Values(MAKE_STRUCT(fcon_test_params, {1, 4096, 1, 1}, 4096, 0.9f)) ); -INSTANTIATE_TEST_CASE_P(fc_16x16x16to16, MyriadX_HW_FullyConnected_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(fc_16x16x16to16, MyriadX_HW_FullyConnected_Tests_nightly, ::testing::Values(MAKE_STRUCT(fcon_test_params, {1, 16, 16, 16}, 16, 0.71f)) ); -INSTANTIATE_TEST_CASE_P(fc_512x7x7to4096, MyriadX_HW_FullyConnected_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(fc_512x7x7to4096, MyriadX_HW_FullyConnected_Tests_nightly, ::testing::Values(MAKE_STRUCT(fcon_test_params, {1, 512, 7, 7}, 4096, 4.38f)) ); -INSTANTIATE_TEST_CASE_P(fc_256x7x7to1470, MyriadX_HW_FullyConnected_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(fc_256x7x7to1470, MyriadX_HW_FullyConnected_Tests_nightly, ::testing::Values(MAKE_STRUCT(fcon_test_params, {1, 256, 7, 7}, 1470, 2.375f)) ); -INSTANTIATE_TEST_CASE_P(fc_576to128, MyriadX_HW_FullyConnected_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(fc_576to128, MyriadX_HW_FullyConnected_Tests_nightly, ::testing::Values(MAKE_STRUCT(fcon_test_params, {1, 576, 1, 1}, 128, 0.76f)) ); -INSTANTIATE_TEST_CASE_P(fc_1152to128, MyriadX_HW_FullyConnected_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(fc_1152to128, MyriadX_HW_FullyConnected_Tests_nightly, ::testing::Values(MAKE_STRUCT(fcon_test_params, {1, 1152, 1, 1}, 128, 0.76f)) ); -INSTANTIATE_TEST_CASE_P(fc_batch, MyriadX_HW_FullyConnected_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(fc_batch, MyriadX_HW_FullyConnected_Tests_nightly, ::testing::Values(MAKE_STRUCT(fcon_test_params, {100, 256, 1, 1}, 1024, 0.1f)) ); diff --git a/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_network_tests.hpp b/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_network_tests.hpp index 7d91bd5ee22..1df7a1307c8 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_network_tests.hpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_network_tests.hpp @@ -58,7 +58,7 @@ public: void RunAsyncTest(int numIters = 20) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } auto fnPtr = ngraph::builder::subgraph::makeSplitMultiConvConcat(); @@ -145,7 +145,7 @@ inline std::string getTestCaseName(const testing::TestParamInfo std::string((std::get<1>(param.param)).name()); } -INSTANTIATE_TEST_CASE_P(Input_Output_ExecMode, MyriadX_HW_Networks_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(Input_Output_ExecMode, MyriadX_HW_Networks_Tests_nightly, testing::Values( std::make_tuple(Precision::FP16, Precision::FP16) ), diff --git a/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_pool_tests.hpp b/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_pool_tests.hpp index 10f982b6945..e4fcf81a66a 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_pool_tests.hpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/myriad_hw_pool_tests.hpp @@ -70,7 +70,7 @@ public: void RunSingleTest(const std::string& poolMethod, float tolerance) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddPoolingLayer(poolMethod); @@ -80,7 +80,7 @@ public: void RunWithReLUTest(const std::string& poolMethod, float tolerance) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddPoolingLayer(poolMethod); @@ -91,7 +91,7 @@ public: void RunMultipleInferTest(const std::string& poolMethod) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddPoolingLayer(poolMethod); @@ -108,11 +108,11 @@ TEST_P(MyriadX_HW_Pooling_Tests_nightly, Avg_Single) { // this case is not supported by HW if (kernel.x == 3 && kernel.y == 3 && stride.x == 2 && stride.y == 2) { - SKIP() << "Unsupported case"; + GTEST_SKIP() << "Unsupported case"; } if ((kernel.x % 2 == 0 || kernel.y % 2 == 0) && (in_dims.w % 2 == 1 || in_dims.h % 2 == 1)) { - SKIP() << "Unsupported case"; + GTEST_SKIP() << "Unsupported case"; } RunSingleTest("avg", 0.0015f); @@ -126,11 +126,11 @@ TEST_P(MyriadX_HW_Pooling_Tests_nightly, Avg_WithReLU) { // this case is not supported by HW if (kernel.x == 3 && kernel.y == 3 && stride.x == 2 && stride.y == 2) { - SKIP() << "Unsupported case"; + GTEST_SKIP() << "Unsupported case"; } if ((kernel.x % 2 == 0 || kernel.y % 2 == 0) && (in_dims.w % 2 == 1 || in_dims.h % 2 == 1)) { - SKIP() << "Unsupported case"; + GTEST_SKIP() << "Unsupported case"; } RunWithReLUTest("avg", 0.0015f); @@ -144,17 +144,17 @@ TEST_P(MyriadX_HW_Pooling_Tests_nightly, Avg_MultipleInfer) { // this case is not supported by HW if (kernel.x == 3 && kernel.y == 3 && stride.x == 2 && stride.y == 2) { - SKIP() << "Unsupported case"; + GTEST_SKIP() << "Unsupported case"; } if ((kernel.x % 2 == 0 || kernel.y % 2 == 0) && (in_dims.w % 2 == 1 || in_dims.h % 2 == 1)) { - SKIP() << "Unsupported case"; + GTEST_SKIP() << "Unsupported case"; } RunMultipleInferTest("avg"); } -INSTANTIATE_TEST_CASE_P(pool_2x2s1p0, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_2x2s1p0, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 64, 112, 112)) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2)) @@ -163,7 +163,7 @@ INSTANTIATE_TEST_CASE_P(pool_2x2s1p0, MyriadX_HW_Pooling_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool_2x2s2p0, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_2x2s2p0, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 64, 224, 224), MAKE_STRUCT(tensor_test_params, 1, 128, 112, 112), @@ -176,7 +176,7 @@ INSTANTIATE_TEST_CASE_P(pool_2x2s2p0, MyriadX_HW_Pooling_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool_2x2s2p0_yolo_tiny_v1, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_2x2s2p0_yolo_tiny_v1, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 16, 448, 448)) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2)) @@ -185,7 +185,7 @@ INSTANTIATE_TEST_CASE_P(pool_2x2s2p0_yolo_tiny_v1, MyriadX_HW_Pooling_Tests_nigh ) ); -INSTANTIATE_TEST_CASE_P(pool_3x3s1p0, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_3x3s1p0, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 192, 28, 28), MAKE_STRUCT(tensor_test_params, 1, 100, 28, 28)) @@ -195,7 +195,7 @@ INSTANTIATE_TEST_CASE_P(pool_3x3s1p0, MyriadX_HW_Pooling_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool_3x3s1p1, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_3x3s1p1, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 192, 28, 28)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -205,7 +205,7 @@ INSTANTIATE_TEST_CASE_P(pool_3x3s1p1, MyriadX_HW_Pooling_Tests_nightly, ); // TODO : 3x3s2p0 HW seems to work only for Max Pooling -INSTANTIATE_TEST_CASE_P(pool_3x3s2p0, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_3x3s2p0, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 64, 112, 112)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -214,7 +214,7 @@ INSTANTIATE_TEST_CASE_P(pool_3x3s2p0, MyriadX_HW_Pooling_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool_3x3s2p1, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_3x3s2p1, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 576, 7, 7), MAKE_STRUCT(tensor_test_params, 1, 16, 35, 35), @@ -226,7 +226,7 @@ INSTANTIATE_TEST_CASE_P(pool_3x3s2p1, MyriadX_HW_Pooling_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool_7x7s1p0, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_7x7s1p0, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 1024, 7, 7)) , ::testing::Values(MAKE_STRUCT(param_size, 7, 7)) @@ -235,7 +235,7 @@ INSTANTIATE_TEST_CASE_P(pool_7x7s1p0, MyriadX_HW_Pooling_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool_14x14s1p0, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_14x14s1p0, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 1024, 14, 14), MAKE_STRUCT(tensor_test_params, 1, 1000, 14, 14)) @@ -245,7 +245,7 @@ INSTANTIATE_TEST_CASE_P(pool_14x14s1p0, MyriadX_HW_Pooling_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool_15x15s1p0, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_15x15s1p0, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 1024, 15, 15), MAKE_STRUCT(tensor_test_params, 1, 1000, 15, 15)) @@ -255,7 +255,7 @@ INSTANTIATE_TEST_CASE_P(pool_15x15s1p0, MyriadX_HW_Pooling_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool_2x2s1p1_odd, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_2x2s1p1_odd, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 512, 13, 13)) , ::testing::Values(MAKE_STRUCT(param_size, 2, 2)) @@ -264,7 +264,7 @@ INSTANTIATE_TEST_CASE_P(pool_2x2s1p1_odd, MyriadX_HW_Pooling_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool_2x2s2p0_odd, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_2x2s2p0_odd, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 256, 75, 75), MAKE_STRUCT(tensor_test_params, 2, 64, 75, 75), @@ -276,7 +276,7 @@ INSTANTIATE_TEST_CASE_P(pool_2x2s2p0_odd, MyriadX_HW_Pooling_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool_3x3s1p0_odd, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_3x3s1p0_odd, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 192, 37, 37), MAKE_STRUCT(tensor_test_params, 1, 832, 9, 9), @@ -287,7 +287,7 @@ INSTANTIATE_TEST_CASE_P(pool_3x3s1p0_odd, MyriadX_HW_Pooling_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool_3x3s2p0_odd, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_3x3s2p0_odd, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 96, 93, 93), MAKE_STRUCT(tensor_test_params, 1, 512, 23, 23), @@ -299,7 +299,7 @@ INSTANTIATE_TEST_CASE_P(pool_3x3s2p0_odd, MyriadX_HW_Pooling_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool_3x3s2p0_extra, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_3x3s2p0_extra, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 96, 32, 52)) , ::testing::Values(MAKE_STRUCT(param_size, 3, 3)) @@ -308,7 +308,7 @@ INSTANTIATE_TEST_CASE_P(pool_3x3s2p0_extra, MyriadX_HW_Pooling_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool_7x7s7p0_rfcn_batch, MyriadX_HW_Pooling_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_7x7s7p0_rfcn_batch, MyriadX_HW_Pooling_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 300, 5, 7, 7)) , ::testing::Values(MAKE_STRUCT(param_size, 7, 7)) @@ -368,7 +368,7 @@ public: TEST_P(MyriadX_HW_PoolTF_Tests_nightly, Single) { if (!CheckMyriadX()) { - SKIP() << "Non-MyriadX device"; + GTEST_SKIP() << "Non-MyriadX device"; } AddPoolingLayer(); @@ -376,7 +376,7 @@ TEST_P(MyriadX_HW_PoolTF_Tests_nightly, Single) { CompareWithSW(0.0f); } -INSTANTIATE_TEST_CASE_P(pool_2x2_3x3, MyriadX_HW_PoolTF_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_2x2_3x3, MyriadX_HW_PoolTF_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 128, 128)), ::testing::Values(MAKE_STRUCT(param_size, 2, 2), @@ -391,7 +391,7 @@ INSTANTIATE_TEST_CASE_P(pool_2x2_3x3, MyriadX_HW_PoolTF_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool4x4, MyriadX_HW_PoolTF_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool4x4, MyriadX_HW_PoolTF_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 32, 128, 128)), ::testing::Values(MAKE_STRUCT(param_size, 4, 4)), @@ -409,7 +409,7 @@ INSTANTIATE_TEST_CASE_P(pool4x4, MyriadX_HW_PoolTF_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(pool_with_large_width, MyriadX_HW_PoolTF_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(pool_with_large_width, MyriadX_HW_PoolTF_Tests_nightly, ::testing::Combine( ::testing::Values(MAKE_STRUCT(tensor_test_params, 1, 8, 640, 960), MAKE_STRUCT(tensor_test_params, 1, 64, 6, 1000)), @@ -422,7 +422,7 @@ INSTANTIATE_TEST_CASE_P(pool_with_large_width, MyriadX_HW_PoolTF_Tests_nightly, ) ); -INSTANTIATE_TEST_CASE_P(tf, MyriadX_HW_PoolTF_Tests_nightly, +INSTANTIATE_TEST_SUITE_P(tf, MyriadX_HW_PoolTF_Tests_nightly, ::testing::Values( std::make_tuple( MAKE_STRUCT(tensor_test_params, 1, 64, 112, 112), // input diff --git a/inference-engine/tests_deprecated/functional/vpu/common/myriad_merge_permute_tests.cpp b/inference-engine/tests_deprecated/functional/vpu/common/myriad_merge_permute_tests.cpp index 0c11efcf6ea..becb06c5385 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/myriad_merge_permute_tests.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/myriad_merge_permute_tests.cpp @@ -4,19 +4,19 @@ #include "myriad_merge_permute_tests.hpp" -INSTANTIATE_TEST_CASE_P(accuracy_3D, myriadLayersMergePermuteNDTests_nightly, +INSTANTIATE_TEST_SUITE_P(accuracy_3D, myriadLayersMergePermuteNDTests_nightly, ::testing::Combine( ::testing::ValuesIn(s_inTensors_3D) , ::testing::ValuesIn(s_permuteParams_3D) )); -INSTANTIATE_TEST_CASE_P(accuracy_4D, myriadLayersMergePermuteNDTests_nightly, +INSTANTIATE_TEST_SUITE_P(accuracy_4D, myriadLayersMergePermuteNDTests_nightly, ::testing::Combine( ::testing::ValuesIn(s_inTensors_4D) , ::testing::ValuesIn(s_permuteParams_4D) )); -INSTANTIATE_TEST_CASE_P(accuracy_5D, myriadLayersMergePermuteNDTests_nightly, +INSTANTIATE_TEST_SUITE_P(accuracy_5D, myriadLayersMergePermuteNDTests_nightly, ::testing::Combine( ::testing::ValuesIn(s_inTensors_5D) , ::testing::ValuesIn(s_permuteParams_5D) diff --git a/inference-engine/tests_deprecated/functional/vpu/common/regression/helpers/vpu_case_common.hpp b/inference-engine/tests_deprecated/functional/vpu/common/regression/helpers/vpu_case_common.hpp index 82217999d18..b3f3b15b3c7 100644 --- a/inference-engine/tests_deprecated/functional/vpu/common/regression/helpers/vpu_case_common.hpp +++ b/inference-engine/tests_deprecated/functional/vpu/common/regression/helpers/vpu_case_common.hpp @@ -21,7 +21,7 @@ using namespace InferenceEngine; #define DISABLE_IF(expr) \ do { \ if (expr) { \ - SKIP() << "Disabled since " << #expr << std::endl; \ + GTEST_SKIP() << "Disabled since " << #expr << std::endl; \ } \ }while(false) @@ -33,7 +33,7 @@ using namespace InferenceEngine; #endif #if defined(__arm__) || defined(_M_ARM) || defined(__aarch64__) || defined(_M_ARM64) -# define DISABLE_ON_ARM SKIP() << "Disabled on ARM" << std::endl; +# define DISABLE_ON_ARM GTEST_SKIP() << "Disabled on ARM" << std::endl; # define VPU_REG_TEST_ARM_PLATFORM #else # define DISABLE_ON_ARM @@ -42,9 +42,9 @@ using namespace InferenceEngine; #define ENABLE_IF_MA2085 \ do { \ if (!CheckMA2085()) { \ - SKIP() << "Disabled since not on MA2085" << std::endl; \ + GTEST_SKIP() << "Disabled since not on MA2085" << std::endl; \ }\ - }while(false) + } while(false) extern bool CheckMyriadX(); extern bool CheckMA2085(); diff --git a/inference-engine/tests_deprecated/functional/vpu/graph_transformer/merge_permute_and_reorder_test.cpp b/inference-engine/tests_deprecated/functional/vpu/graph_transformer/merge_permute_and_reorder_test.cpp index ec6332dcc98..f6105b9979c 100644 --- a/inference-engine/tests_deprecated/functional/vpu/graph_transformer/merge_permute_and_reorder_test.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/graph_transformer/merge_permute_and_reorder_test.cpp @@ -147,13 +147,13 @@ TEST_P(myriadGTMergePermuteNDTests_nightly, Permute) { std::cout << "Myriad time = non-optimized: " << executionMicroseconds << " us., optimized: " << executionMicrosecondsOptimized << " us.\n"; } -INSTANTIATE_TEST_CASE_P(accuracy_3D, myriadGTMergePermuteNDTests_nightly, +INSTANTIATE_TEST_SUITE_P(accuracy_3D, myriadGTMergePermuteNDTests_nightly, ::testing::Combine( ::testing::ValuesIn(s_inTensors_3D) , ::testing::ValuesIn(s_permuteParams_3D) )); -INSTANTIATE_TEST_CASE_P(accuracy_5D, myriadGTMergePermuteNDTests_nightly, +INSTANTIATE_TEST_SUITE_P(accuracy_5D, myriadGTMergePermuteNDTests_nightly, ::testing::Combine( ::testing::ValuesIn(s_inTensors_5D) , ::testing::ValuesIn(s_permuteParams_5D) diff --git a/inference-engine/tests_deprecated/functional/vpu/myriad_tests/myriad_configs_tests.cpp b/inference-engine/tests_deprecated/functional/vpu/myriad_tests/myriad_configs_tests.cpp index 074ed1a78ef..8fc795322c8 100644 --- a/inference-engine/tests_deprecated/functional/vpu/myriad_tests/myriad_configs_tests.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/myriad_tests/myriad_configs_tests.cpp @@ -100,14 +100,14 @@ static const std::vector myriadIncorrectPackageTypeConfigValues = { {{VPU_MYRIAD_CONFIG_KEY(MOVIDIUS_DDR_TYPE), "-MICRON_1GB"}}, }; -INSTANTIATE_TEST_CASE_P(MyriadConfigs, myriadCorrectModelsConfigsTests_nightly, +INSTANTIATE_TEST_SUITE_P(MyriadConfigs, myriadCorrectModelsConfigsTests_nightly, ::testing::ValuesIn(myriadCorrectPlatformConfigValues)); -INSTANTIATE_TEST_CASE_P(MyriadConfigs, myriadIncorrectModelsConfigsTests_nightly, +INSTANTIATE_TEST_SUITE_P(MyriadConfigs, myriadIncorrectModelsConfigsTests_nightly, ::testing::ValuesIn(myriadIncorrectPlatformConfigValues)); -INSTANTIATE_TEST_CASE_P(MyriadPackageConfigs, myriadCorrectModelsConfigsTests_nightly, +INSTANTIATE_TEST_SUITE_P(MyriadPackageConfigs, myriadCorrectModelsConfigsTests_nightly, ::testing::ValuesIn(myriadCorrectPackageTypeConfigValues)); -INSTANTIATE_TEST_CASE_P(MyriadPackageConfigs, myriadIncorrectModelsConfigsTests_nightly, +INSTANTIATE_TEST_SUITE_P(MyriadPackageConfigs, myriadIncorrectModelsConfigsTests_nightly, ::testing::ValuesIn(myriadIncorrectPackageTypeConfigValues)); diff --git a/inference-engine/tests_deprecated/functional/vpu/myriad_tests/myriad_multiple_graph_tests.cpp b/inference-engine/tests_deprecated/functional/vpu/myriad_tests/myriad_multiple_graph_tests.cpp index 19a626a90bb..59dee4b7280 100644 --- a/inference-engine/tests_deprecated/functional/vpu/myriad_tests/myriad_multiple_graph_tests.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/myriad_tests/myriad_multiple_graph_tests.cpp @@ -23,6 +23,6 @@ TEST_P(myriadMultipleGraphsTests_nightly, LoadGraphsOnDevice) { } } -INSTANTIATE_TEST_CASE_P(numerOfGraphs, myriadMultipleGraphsTests_nightly, +INSTANTIATE_TEST_SUITE_P(numerOfGraphs, myriadMultipleGraphsTests_nightly, ::testing::Values(2, 4, 10) ); diff --git a/inference-engine/tests_deprecated/functional/vpu/myriad_tests/myriad_streams_configuration_tests.cpp b/inference-engine/tests_deprecated/functional/vpu/myriad_tests/myriad_streams_configuration_tests.cpp index a6d99e2367a..93f4b4cc8d0 100644 --- a/inference-engine/tests_deprecated/functional/vpu/myriad_tests/myriad_streams_configuration_tests.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/myriad_tests/myriad_streams_configuration_tests.cpp @@ -24,6 +24,6 @@ TEST_P(myriadCorrectStreamsConfiguration_nightly, InfersWithConfiguredStreams) { ASSERT_TRUE(Infer()); } -INSTANTIATE_TEST_CASE_P(StreamsConfiguration, myriadCorrectStreamsConfiguration_nightly, testing::Values(1, 2, 3)); +INSTANTIATE_TEST_SUITE_P(StreamsConfiguration, myriadCorrectStreamsConfiguration_nightly, testing::Values(1, 2, 3)); } diff --git a/inference-engine/tests_deprecated/functional/vpu/shared_tests_instance/common_single_layer_tests/single_layer_tests.cpp b/inference-engine/tests_deprecated/functional/vpu/shared_tests_instance/common_single_layer_tests/single_layer_tests.cpp index 0b59f755bb1..6587fb3eaf9 100644 --- a/inference-engine/tests_deprecated/functional/vpu/shared_tests_instance/common_single_layer_tests/single_layer_tests.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/shared_tests_instance/common_single_layer_tests/single_layer_tests.cpp @@ -44,7 +44,7 @@ getTestCaseName(testing::TestParamInfogetType(); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( // TODO: rewrite to ngraph to have reshape functionality DISABLED_Conv_nightly, CommonSingleLayerTest, ::testing::Combine( @@ -61,7 +61,7 @@ INSTANTIATE_TEST_CASE_P( ), getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( // TODO: rewrite to ngraph to have reshape functionality DISABLED_Deconv_nightly, CommonSingleLayerTest, ::testing::Combine( @@ -78,7 +78,7 @@ INSTANTIATE_TEST_CASE_P( ), getTestCaseName ); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( // TODO: rewrite to ngraph to have reshape functionality DISABLED_Pool_nightly, CommonSingleLayerTest, ::testing::Combine( diff --git a/inference-engine/tests_deprecated/functional/vpu/shared_tests_instance/input_tests/parser_tests.cpp b/inference-engine/tests_deprecated/functional/vpu/shared_tests_instance/input_tests/parser_tests.cpp index 616e2214011..14e48bcd2e4 100644 --- a/inference-engine/tests_deprecated/functional/vpu/shared_tests_instance/input_tests/parser_tests.cpp +++ b/inference-engine/tests_deprecated/functional/vpu/shared_tests_instance/input_tests/parser_tests.cpp @@ -30,6 +30,6 @@ ir_test_params ir_test_cases[] = { ir_test_params("MYRIAD", "FP16", negative_norm_k_case) }; -INSTANTIATE_TEST_CASE_P(FunctionalTest_nightly, IncorrectIRTests, +INSTANTIATE_TEST_SUITE_P(FunctionalTest_nightly, IncorrectIRTests, ::testing::ValuesIn(ir_test_cases), getTestName); diff --git a/inference-engine/tests_deprecated/functional/vpu/vpu_base/vpu_tests_config.hpp b/inference-engine/tests_deprecated/functional/vpu/vpu_base/vpu_tests_config.hpp index ab402644b3f..bddbf9dd20e 100644 --- a/inference-engine/tests_deprecated/functional/vpu/vpu_base/vpu_tests_config.hpp +++ b/inference-engine/tests_deprecated/functional/vpu/vpu_base/vpu_tests_config.hpp @@ -25,7 +25,7 @@ bool deviceForceReset(); // IE macro forcing gave us no ability to pass device name as variable. // So we create this two replacements to PLUGING_CASE_WITH_SUFFIX. #define VPU_PLUGING_CASE_WITH_SUFFIX(_suffix, _test, _params) \ - INSTANTIATE_TEST_CASE_P(VPU_run##_suffix, _test, ::testing::Combine(::testing::Values(::vpu::tests::deviceName()), _params) ) + INSTANTIATE_TEST_SUITE_P(VPU_run##_suffix, _test, ::testing::Combine(::testing::Values(::vpu::tests::deviceName()), _params) ) #define DISABLED_VPU_PLUGING_CASE_WITH_SUFFIX(_suffix, _test, _params) \ - INSTANTIATE_TEST_CASE_P(DISABLED_VPU_run##_suffix, _test, ::testing::Combine(::testing::Values(::vpu::tests::deviceName()), _params) ) + INSTANTIATE_TEST_SUITE_P(DISABLED_VPU_run##_suffix, _test, ::testing::Combine(::testing::Values(::vpu::tests::deviceName()), _params) ) diff --git a/inference-engine/tests_deprecated/helpers/tests_vpu_common.hpp b/inference-engine/tests_deprecated/helpers/tests_vpu_common.hpp index 5cfc76f825b..18d17be9337 100644 --- a/inference-engine/tests_deprecated/helpers/tests_vpu_common.hpp +++ b/inference-engine/tests_deprecated/helpers/tests_vpu_common.hpp @@ -24,7 +24,7 @@ static constexpr char ENV_HDDL_R[] = "IE_VPU_ENABLE_PER_LAYER_TESTS_HDDL"; #define DISABLE_IF(expression) \ { \ if (expression) { \ - SKIP() << "Disabled since " << #expression << std::endl; \ + GTEST_SKIP() << "Disabled since " << #expression << std::endl; \ } \ } diff --git a/inference-engine/tests_deprecated/unit/engines/gna/fp32_non_quantized_tests.cpp b/inference-engine/tests_deprecated/unit/engines/gna/fp32_non_quantized_tests.cpp index e321c50a77c..35705118515 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/fp32_non_quantized_tests.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/fp32_non_quantized_tests.cpp @@ -66,7 +66,7 @@ FP32TestParams gna_fp32_test_params[] = { {32, FP32TestParams::eSumm} }; -INSTANTIATE_TEST_CASE_P(GNAFP32Tests, GNAFP32ParametricTest, +INSTANTIATE_TEST_SUITE_P(GNAFP32Tests, GNAFP32ParametricTest, ::testing::ValuesIn(gna_fp32_test_params), getTestName); TEST_F(FP32NonQuantizedTest, SplitFollowedByFCAndEltwiseOnCPU) { diff --git a/inference-engine/tests_deprecated/unit/engines/gna/gna_input_precision_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/gna_input_precision_test.cpp index 34baad4349b..0efbeb83a72 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/gna_input_precision_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/gna_input_precision_test.cpp @@ -3,7 +3,7 @@ // #include -#include +#include #include "gna_matcher.hpp" #include "matchers/input_data_matcher.hpp" #include "test_irs.hpp" diff --git a/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp b/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp index 70f8c2d7ef0..f6d611faffe 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/gna_matcher.cpp @@ -17,7 +17,7 @@ #include "matchers/pool_matcher.hpp" #include "matchers/fill_with_data.hpp" #include "matchers/weights_matcher.hpp" -#include +#include #include #include diff --git a/inference-engine/tests_deprecated/unit/engines/gna/gna_proc_type_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/gna_proc_type_test.cpp index 8eed7282212..0f810246822 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/gna_proc_type_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/gna_proc_type_test.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include #include #include "gna_plugin.hpp" #include "gna_mock_api.hpp" diff --git a/inference-engine/tests_deprecated/unit/engines/gna/layers/activation_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/layers/activation_test.cpp index 34b3c20761e..0d768f823a1 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/layers/activation_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/layers/activation_test.cpp @@ -89,7 +89,7 @@ static const ActivationCaseParam gna_activation_test_params[] = { {"softsign", 200, {-10, 10}}, }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( GNALayerTests, GNAActivationTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32, InferenceEngine::Precision::I16, InferenceEngine::Precision::I8), diff --git a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_align_filter2_tests.cpp b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_align_filter2_tests.cpp index 71db4e90376..75fdc98b934 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_align_filter2_tests.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_align_filter2_tests.cpp @@ -170,7 +170,7 @@ TEST_P(GNAAlignFilterTest, concatWith_2_Inputs_accurate) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( GNALayerTests, GNAAlignFilterTest, testing::Combine( diff --git a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_conv1d_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_conv1d_test.cpp index 310cf46d0f1..9761edd803b 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_conv1d_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_conv1d_test.cpp @@ -100,7 +100,7 @@ TEST_P(GNAConv1DTest, SplitToConcatWith2Inputs) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( GNALayerTests, GNAConv1DTest, testing::Combine( diff --git a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_eltwise_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_eltwise_test.cpp index 28c26e21af1..c1e2ea788c3 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_eltwise_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_eltwise_test.cpp @@ -106,7 +106,7 @@ TEST_P(GNAEltwiseTest, FourBytesInputsViaReshape) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( GNALayerTests, GNAEltwiseTest, ::testing::Combine( diff --git a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_multi_input_to_concat_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_multi_input_to_concat_test.cpp index 068b0f681e9..dac88c92cc7 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_multi_input_to_concat_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_multi_input_to_concat_test.cpp @@ -106,7 +106,7 @@ TEST_P(GNAMultiInputToConcatTest, InputsToConcat) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( GNALayerTests, GNAMultiInputToConcatTest, ::testing::Combine( diff --git a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_permute_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_permute_test.cpp index 3c0c7ffe33e..8392de59122 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_permute_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_permute_test.cpp @@ -71,5 +71,5 @@ const Permute3dimTestParam gna_permute3d_test_params[] = { {{{2, 1, 0}, {2, 1, 4}}, false} }; -INSTANTIATE_TEST_CASE_P(GNALayerTests, GNAPermute3dTest, +INSTANTIATE_TEST_SUITE_P(GNALayerTests, GNAPermute3dTest, ::testing::ValuesIn(gna_permute3d_test_params), getPermute3dTestName); diff --git a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_split_to_concat_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_split_to_concat_test.cpp index 9ac1011ca6c..7e429f9edca 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_split_to_concat_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_split_to_concat_test.cpp @@ -84,7 +84,7 @@ TEST_P(GNASplitToConcatTest, SplitToConcatWith2Inputs) { } } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( GNALayerTests, GNASplitToConcatTest, testing::Combine( diff --git a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_squeeze_test.cpp b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_squeeze_test.cpp index 603efb6578e..ce015857859 100644 --- a/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_squeeze_test.cpp +++ b/inference-engine/tests_deprecated/unit/engines/gna/layers/gna_squeeze_test.cpp @@ -147,7 +147,7 @@ static const SqueezeCaseParam gna_squeeze_test_params[] = { {{1, 1, 1, 1, 1, 3}, {1, 3}} }; -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( GNALayerTests, GNASqueezeTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32, InferenceEngine::Precision::I16), @@ -155,7 +155,7 @@ INSTANTIATE_TEST_CASE_P( ::testing::ValuesIn(gna_squeeze_test_params)), GNAUnsqueezeTest::getTestName); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( GNALayerTests, GNAUnsqueezeTest, ::testing::Combine( ::testing::Values(InferenceEngine::Precision::FP32, InferenceEngine::Precision::I16), diff --git a/inference-engine/tests_deprecated/unit/engines/vpu/merge_parallel_fc.cpp b/inference-engine/tests_deprecated/unit/engines/vpu/merge_parallel_fc.cpp index 3ab1ab9dec0..45da2af742c 100644 --- a/inference-engine/tests_deprecated/unit/engines/vpu/merge_parallel_fc.cpp +++ b/inference-engine/tests_deprecated/unit/engines/vpu/merge_parallel_fc.cpp @@ -346,12 +346,12 @@ TEST_P(VPU_NoMergeParallelFCTest, NoMergeParallelFCMergeCases) { AssertNotMergedCorrectly(testInputDimensions, testFCDescriptors); } -INSTANTIATE_TEST_CASE_P(MergeParallelFCTest, VPU_MergeParallelFCTest, testing::Combine( +INSTANTIATE_TEST_SUITE_P(MergeParallelFCTest, VPU_MergeParallelFCTest, testing::Combine( testing::ValuesIn(inputDimensions), testing::ValuesIn(FCDescriptorsMerge) )); -INSTANTIATE_TEST_CASE_P(NoMergeParallelFCTest, VPU_NoMergeParallelFCTest, testing::Combine( +INSTANTIATE_TEST_SUITE_P(NoMergeParallelFCTest, VPU_NoMergeParallelFCTest, testing::Combine( testing::ValuesIn(inputDimensions), testing::ValuesIn(FCDescriptorsNoMerge) )); diff --git a/inference-engine/tests_deprecated/unit/engines/vpu/mvnc/pthread_semaphore_tests.cpp b/inference-engine/tests_deprecated/unit/engines/vpu/mvnc/pthread_semaphore_tests.cpp index 8a2f6282aa4..6f6f851ae4e 100644 --- a/inference-engine/tests_deprecated/unit/engines/vpu/mvnc/pthread_semaphore_tests.cpp +++ b/inference-engine/tests_deprecated/unit/engines/vpu/mvnc/pthread_semaphore_tests.cpp @@ -366,7 +366,7 @@ TEST_P(PThreadBinSemaphoreTest, PostWakeUpOnlyOneWaiterOfMany) { th3.join(); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( PThreadParametrizedTests, PThreadBinSemaphoreTest, ::testing::Values( diff --git a/inference-engine/tests_deprecated/unit/engines/vpu/mvnc/watchdog_tests.cpp b/inference-engine/tests_deprecated/unit/engines/vpu/mvnc/watchdog_tests.cpp index a4c2f50aa8b..8ae4110fc1a 100644 --- a/inference-engine/tests_deprecated/unit/engines/vpu/mvnc/watchdog_tests.cpp +++ b/inference-engine/tests_deprecated/unit/engines/vpu/mvnc/watchdog_tests.cpp @@ -17,10 +17,10 @@ using ms = std::chrono::milliseconds; class MockWatchdogDevice : public Watchdog::IDevice { public: using time_point = Watchdog::IDevice::time_point; - MOCK_QUALIFIED_METHOD1(keepAlive, noexcept, void(const time_point &)); - MOCK_QUALIFIED_METHOD1(dueIn, const noexcept, std::chrono::milliseconds (const time_point ¤t_time)); - MOCK_QUALIFIED_METHOD0(isTimeout, const noexcept, bool ()); - MOCK_QUALIFIED_METHOD0(getHandle, const noexcept, void* ()); + MOCK_METHOD(void, keepAlive, (const time_point &), (noexcept)); + MOCK_METHOD(std::chrono::milliseconds, dueIn, (const time_point ¤t_time), (const, noexcept)); + MOCK_METHOD(bool, isTimeout, (), (const, noexcept)); + MOCK_METHOD(void *, getHandle, (), (const, noexcept)); }; class MVNCWatchdogTests: public TestsCommon { diff --git a/inference-engine/tests_deprecated/unit/engines/vpu/mvnc/xlink_device_tests.cpp b/inference-engine/tests_deprecated/unit/engines/vpu/mvnc/xlink_device_tests.cpp index 555caa04a95..400c84e1cd0 100644 --- a/inference-engine/tests_deprecated/unit/engines/vpu/mvnc/xlink_device_tests.cpp +++ b/inference-engine/tests_deprecated/unit/engines/vpu/mvnc/xlink_device_tests.cpp @@ -34,6 +34,6 @@ TEST_P(XLinkDeviceTestsWithParam, shouldNotCreateXlinkDeviceWithInvalidInterval) xlink_device_destroy(deviceHndl); } -INSTANTIATE_TEST_CASE_P(WatchdogDevice, +INSTANTIATE_TEST_SUITE_P(WatchdogDevice, XLinkDeviceTestsWithParam, testing::Values(0, -1, -WATCHDOG_MAX_PING_INTERVAL_MS)); diff --git a/inference-engine/tests_deprecated/unit/engines/vpu/myriad_tests/helpers/myriad_mvnc_stub.h b/inference-engine/tests_deprecated/unit/engines/vpu/myriad_tests/helpers/myriad_mvnc_stub.h index 2a52228fe93..b9541c78959 100644 --- a/inference-engine/tests_deprecated/unit/engines/vpu/myriad_tests/helpers/myriad_mvnc_stub.h +++ b/inference-engine/tests_deprecated/unit/engines/vpu/myriad_tests/helpers/myriad_mvnc_stub.h @@ -17,8 +17,8 @@ using namespace vpu::MyriadPlugin; class MvncStub : public IMvnc { public: //Operations - MOCK_QUALIFIED_METHOD0(AvailableDevicesNames, const, std::vector()); - MOCK_QUALIFIED_METHOD0(AvailableDevicesDesc, const, std::vector()); + MOCK_CONST_METHOD0(AvailableDevicesNames, std::vector()); + MOCK_CONST_METHOD0(AvailableDevicesDesc, std::vector()); MOCK_METHOD0(watchdogHndl, WatchdogHndl_t*()); diff --git a/inference-engine/tests_deprecated/unit/engines/vpu/myriad_tests/myriad_engine_tests.cpp b/inference-engine/tests_deprecated/unit/engines/vpu/myriad_tests/myriad_engine_tests.cpp index ab437ab8774..5fc90e2e678 100644 --- a/inference-engine/tests_deprecated/unit/engines/vpu/myriad_tests/myriad_engine_tests.cpp +++ b/inference-engine/tests_deprecated/unit/engines/vpu/myriad_tests/myriad_engine_tests.cpp @@ -104,32 +104,32 @@ static const std::vector myriadIncorrectPackageTypeConfigValues = { IE_SUPPRESS_DEPRECATED_END /// Platform -INSTANTIATE_TEST_CASE_P(MyriadPlatformConfigs, MyriadEngineSetCorrectConfigTest, +INSTANTIATE_TEST_SUITE_P(MyriadPlatformConfigs, MyriadEngineSetCorrectConfigTest, ::testing::ValuesIn(myriadCorrectPlatformConfigValues)); -INSTANTIATE_TEST_CASE_P(MyriadPlatformConfigs, MyriadEngineSetIncorrectConfigTest, +INSTANTIATE_TEST_SUITE_P(MyriadPlatformConfigs, MyriadEngineSetIncorrectConfigTest, ::testing::ValuesIn(myriadIncorrectPlatformConfigValues)); /// Protocol -INSTANTIATE_TEST_CASE_P(MyriadProtocolConfigs, MyriadEngineSetCorrectConfigTest, +INSTANTIATE_TEST_SUITE_P(MyriadProtocolConfigs, MyriadEngineSetCorrectConfigTest, ::testing::ValuesIn(myriadCorrectProtocolConfigValues)); -INSTANTIATE_TEST_CASE_P(MyriadProtocolConfigs, MyriadEngineSetIncorrectConfigTest, +INSTANTIATE_TEST_SUITE_P(MyriadProtocolConfigs, MyriadEngineSetIncorrectConfigTest, ::testing::ValuesIn(myriadIncorrectProtocolConfigValues)); /// Config combinations -INSTANTIATE_TEST_CASE_P(MyriadConfigOptionsCombination, MyriadEngineSetCorrectConfigTest, +INSTANTIATE_TEST_SUITE_P(MyriadConfigOptionsCombination, MyriadEngineSetCorrectConfigTest, ::testing::ValuesIn(myriadCorrectConfigCombinationValues)); /// Power Config -INSTANTIATE_TEST_CASE_P(MyriadPowerConfigs, MyriadEngineSetCorrectConfigTest, +INSTANTIATE_TEST_SUITE_P(MyriadPowerConfigs, MyriadEngineSetCorrectConfigTest, ::testing::ValuesIn(myriadCorrectPowerConfigValues)); -INSTANTIATE_TEST_CASE_P(MyriadPowerConfigs, MyriadEngineSetIncorrectConfigTest, +INSTANTIATE_TEST_SUITE_P(MyriadPowerConfigs, MyriadEngineSetIncorrectConfigTest, ::testing::ValuesIn(myriadIncorrectPowerConfigValues)); /// Package Config -INSTANTIATE_TEST_CASE_P(MyriadPackageConfigs, MyriadEngineSetCorrectConfigTest, +INSTANTIATE_TEST_SUITE_P(MyriadPackageConfigs, MyriadEngineSetCorrectConfigTest, ::testing::ValuesIn(myriadCorrectPackageTypeConfigValues)); -INSTANTIATE_TEST_CASE_P(MyriadPackageConfigs, MyriadEngineSetIncorrectConfigTest, +INSTANTIATE_TEST_SUITE_P(MyriadPackageConfigs, MyriadEngineSetIncorrectConfigTest, ::testing::ValuesIn(myriadIncorrectPackageTypeConfigValues)); diff --git a/inference-engine/tests_deprecated/unit/engines/vpu/myriad_tests/myriad_metrics_tests.cpp b/inference-engine/tests_deprecated/unit/engines/vpu/myriad_tests/myriad_metrics_tests.cpp index 55879599166..2c27aea933f 100644 --- a/inference-engine/tests_deprecated/unit/engines/vpu/myriad_tests/myriad_metrics_tests.cpp +++ b/inference-engine/tests_deprecated/unit/engines/vpu/myriad_tests/myriad_metrics_tests.cpp @@ -193,14 +193,14 @@ TEST_P(MyriadRangeInferMetricsTestWithParam, CheckValues) { ASSERT_TRUE(act_res == exp_range_); } -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( MetricsTest, MyriadGetMetricsTestCaseWithParam, ::testing::Values(std::vector {}, std::vector {"2.1-ma2480"}, std::vector {"2.1-ma2480", "3.1-ma2085"})); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( MetricsTest, MyriadDeviceMetricsTestWithParam, Combine(::testing::Values(std::vector {}, @@ -210,7 +210,7 @@ INSTANTIATE_TEST_CASE_P( std::vector {"1.4-ma2455"}, std::vector {"1.1-ma2080", "3.3-ma2085"}))); -INSTANTIATE_TEST_CASE_P( +INSTANTIATE_TEST_SUITE_P( MetricsTest, MyriadRangeInferMetricsTestWithParam, ::testing::Values(std::tuple(range_type(3,6,1), "-1"), diff --git a/inference-engine/tests_deprecated/unit/graph_tools/graph_copy_tests.cpp b/inference-engine/tests_deprecated/unit/graph_tools/graph_copy_tests.cpp index c9a1e8bb218..3dfe1293624 100644 --- a/inference-engine/tests_deprecated/unit/graph_tools/graph_copy_tests.cpp +++ b/inference-engine/tests_deprecated/unit/graph_tools/graph_copy_tests.cpp @@ -7,9 +7,7 @@ #include #include #include -#include -#include -#include +#include #include "ie_common.h" #include #include "graph_test_base.hpp" diff --git a/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp b/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp index 71b1f6ec46d..f96bf8e8abd 100644 --- a/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp +++ b/inference-engine/tests_deprecated/unit/graph_tools/graph_tools_test.cpp @@ -7,9 +7,7 @@ #include #include "graph_test_base.hpp" #include -#include -#include -#include +#include #include "ie_common.h" #include #include diff --git a/inference-engine/tests_deprecated/unit/inference_engine_tests/get_num_iterations_test.cpp b/inference-engine/tests_deprecated/unit/inference_engine_tests/get_num_iterations_test.cpp index 01fb9f61163..830cab7cc4c 100644 --- a/inference-engine/tests_deprecated/unit/inference_engine_tests/get_num_iterations_test.cpp +++ b/inference-engine/tests_deprecated/unit/inference_engine_tests/get_num_iterations_test.cpp @@ -147,7 +147,7 @@ using GetNumIterationsInvalidAxisTests = GetNumIterationsNegativeTests; TEST_P(GetNumIterationsInvalidAxisTests, InvalidAxisThrowsAnException) { ASSERT_ANY_THROW(Run()); } -INSTANTIATE_TEST_CASE_P(NumIterationsTest, GetNumIterationsInvalidAxisTests, testing::Values( +INSTANTIATE_TEST_SUITE_P(NumIterationsTest, GetNumIterationsInvalidAxisTests, testing::Values( NegativeTestParams{{{1}}, {{From{0}, Axis{-2}, Start{0}, Stride{1}, End{1}}}, {}, {}}, NegativeTestParams{{{1}}, {{From{0}, Axis{10}, Start{0}, Stride{1}, End{1}}}, {}, {}}, NegativeTestParams{{{1}, {1, 2}}, {{From{0}, Axis{-2}, Start{0}, Stride{1}, End{1}}}, {}, {}}, @@ -177,7 +177,7 @@ using GetNumIterationsInvalidStartTests = GetNumIterationsNegativeTests; TEST_P(GetNumIterationsInvalidStartTests, InvalidStartThrowsAnException) { ASSERT_ANY_THROW(Run()); } -INSTANTIATE_TEST_CASE_P(NumIterationsTest, GetNumIterationsInvalidStartTests, testing::Values( +INSTANTIATE_TEST_SUITE_P(NumIterationsTest, GetNumIterationsInvalidStartTests, testing::Values( NegativeTestParams{{{1}}, {{From{0}, Axis{0}, Start{2}, Stride{1}, End{1}}}, {}, {}}, NegativeTestParams{{{1}, {1, 2}}, {{From{0}, Axis{0}, Start{2}, Stride{1}, End{1}}}, {}, {}}, NegativeTestParams{{{1}, {1, 2}}, {{From{1}, Axis{0}, Start{2}, Stride{1}, End{1}}}, {}, {}}, @@ -193,7 +193,7 @@ using GetNumIterationsInvalidEndTests = GetNumIterationsNegativeTests; TEST_P(GetNumIterationsInvalidEndTests, InvalidEndThrowsAnException) { ASSERT_ANY_THROW(Run()); } -INSTANTIATE_TEST_CASE_P(NumIterationsTest, GetNumIterationsInvalidEndTests, testing::Values( +INSTANTIATE_TEST_SUITE_P(NumIterationsTest, GetNumIterationsInvalidEndTests, testing::Values( NegativeTestParams{{}, {}, {{1}}, {{From{0}, Axis{0}, Start{0}, Stride{1}, End{2}}}}, NegativeTestParams{{}, {}, {{1}, {1, 2}}, {{From{0}, Axis{0}, Start{0}, Stride{1}, End{2}}}}, NegativeTestParams{{}, {}, {{1}, {1, 2}}, {{From{1}, Axis{0}, Start{0}, Stride{1}, End{2}}}} @@ -203,7 +203,7 @@ using GetNumIterationsInvalidStrideTests = GetNumIterationsNegativeTests; TEST_P(GetNumIterationsInvalidStrideTests, InvalidStrideThrowsAnException) { ASSERT_ANY_THROW(Run()); } -INSTANTIATE_TEST_CASE_P(NumIterationsTest, GetNumIterationsInvalidStrideTests, testing::Values( +INSTANTIATE_TEST_SUITE_P(NumIterationsTest, GetNumIterationsInvalidStrideTests, testing::Values( NegativeTestParams{{{1}}, {{From{0}, Axis{0}, Start{0}, Stride{0}, End{1}}}, {}, {}}, NegativeTestParams{{}, {}, {{1}}, {{From{0}, Axis{0}, Start{0}, Stride{0}, End{1}}}} )); @@ -212,7 +212,7 @@ using GetNumIterationsInvalidFromTests = GetNumIterationsNegativeTests; TEST_P(GetNumIterationsInvalidFromTests, InvalidFromThrowsAnException) { ASSERT_ANY_THROW(Run()); } -INSTANTIATE_TEST_CASE_P(NumIterationsTest, GetNumIterationsInvalidFromTests, testing::Values( +INSTANTIATE_TEST_SUITE_P(NumIterationsTest, GetNumIterationsInvalidFromTests, testing::Values( NegativeTestParams{{{1}}, {{From{-1}, Axis{0}, Start{0}, Stride{1}, End{1}}}, {}, {}}, NegativeTestParams{{{1}}, {{From{1}, Axis{0}, Start{0}, Stride{1}, End{1}}}, {}, {}}, @@ -224,7 +224,7 @@ using GetNumIterationsInvalidDirectionTests = GetNumIterationsNegativeTests; TEST_P(GetNumIterationsInvalidDirectionTests, InvalidDirectionThrowsAnException) { ASSERT_ANY_THROW(Run()); } -INSTANTIATE_TEST_CASE_P(NumIterationsTest, GetNumIterationsInvalidDirectionTests, testing::Values( +INSTANTIATE_TEST_SUITE_P(NumIterationsTest, GetNumIterationsInvalidDirectionTests, testing::Values( NegativeTestParams{{{10}}, {{From{0}, Axis{0}, Start{8}, Stride{1}, End{2}}}, {}, {}}, NegativeTestParams{{{10}}, {{From{0}, Axis{0}, Start{2}, Stride{-1}, End{8}}}, {}, {}}, @@ -236,7 +236,7 @@ using GetNumIterationsInvalidStepTests = GetNumIterationsNegativeTests; TEST_P(GetNumIterationsInvalidStepTests, InvalidStepThrowsAnException) { ASSERT_ANY_THROW(Run()); } -INSTANTIATE_TEST_CASE_P(NumIterationsTest, GetNumIterationsInvalidStepTests, testing::Values( +INSTANTIATE_TEST_SUITE_P(NumIterationsTest, GetNumIterationsInvalidStepTests, testing::Values( NegativeTestParams{{{10}}, {{From{0}, Axis{0}, Start{2}, Stride{3}, End{6}}}, {}, {}}, NegativeTestParams{{{10}}, {{From{0}, Axis{0}, Start{2}, Stride{8}, End{6}}}, {}, {}}, NegativeTestParams{{{10}}, {{From{0}, Axis{0}, Start{6}, Stride{-3}, End{2}}}, {}, {}}, @@ -252,7 +252,7 @@ using GetNumIterationsInvalidIterationNumbersTests = GetNumIterationsNegativeTes TEST_P(GetNumIterationsInvalidIterationNumbersTests, InvalidInterationNumbersThrowAnException) { ASSERT_ANY_THROW(Run()); } -INSTANTIATE_TEST_CASE_P(NumIterationsTest, GetNumIterationsInvalidIterationNumbersTests, testing::Values( +INSTANTIATE_TEST_SUITE_P(NumIterationsTest, GetNumIterationsInvalidIterationNumbersTests, testing::Values( NegativeTestParams{ { {1, 3, 24, 24}, @@ -473,6 +473,6 @@ std::vector g_positiveTestParameters = { {{{13}}, {{From{0}, Axis{0}, Start{ 10}, Stride{-1}, End{-11}}}, {}, {}, 7}, {{{13}}, {{From{0}, Axis{0}, Start{ 9}, Stride{-2}, End{-11}}}, {}, {}, 3} }; -INSTANTIATE_TEST_CASE_P(NumIterationsTest, GetNumIterationsPositiveTests, testing::ValuesIn(g_positiveTestParameters)); +INSTANTIATE_TEST_SUITE_P(NumIterationsTest, GetNumIterationsPositiveTests, testing::ValuesIn(g_positiveTestParameters)); } diff --git a/inference-engine/thirdparty/clDNN/CMakeLists.txt b/inference-engine/thirdparty/clDNN/CMakeLists.txt index 41833b58dc5..4106e0522cb 100644 --- a/inference-engine/thirdparty/clDNN/CMakeLists.txt +++ b/inference-engine/thirdparty/clDNN/CMakeLists.txt @@ -92,9 +92,6 @@ set(CLDNN__OCL_ICD_DIR "${CLDNN__COMMON_DIR}/khronos_ocl_icd") # Path which points to directory with C++ bindings for OpenCL (header files + wrapper that disables specific warnings). set(CLDNN__KHR_CLHPP_DIR "${CLDNN__COMMON_DIR}/include") -# Path which points to directory with fused version of googletest framework (with fused googlemock as well). -set(CLDNN__GTEST_DIR "${CLDNN__COMMON_DIR}/googletest-fused") - # Build targets settings. # Path which points to default root directory for compilation output. diff --git a/inference-engine/thirdparty/clDNN/common/googletest-fused/License.txt b/inference-engine/thirdparty/clDNN/common/googletest-fused/License.txt deleted file mode 100644 index 65c76c50ce2..00000000000 --- a/inference-engine/thirdparty/clDNN/common/googletest-fused/License.txt +++ /dev/null @@ -1,28 +0,0 @@ -Copyright 2008, Google Inc. -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are -met: - - * Redistributions of source code must retain the above copyright -notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above -copyright notice, this list of conditions and the following disclaimer -in the documentation and/or other materials provided with the -distribution. - * Neither the name of Google Inc. nor the names of its -contributors may be used to endorse or promote products derived from -this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. \ No newline at end of file diff --git a/inference-engine/thirdparty/clDNN/common/googletest-fused/gmock-gtest-all.cc b/inference-engine/thirdparty/clDNN/common/googletest-fused/gmock-gtest-all.cc deleted file mode 100644 index 272563d970d..00000000000 --- a/inference-engine/thirdparty/clDNN/common/googletest-fused/gmock-gtest-all.cc +++ /dev/null @@ -1,13278 +0,0 @@ -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: mheule@google.com (Markus Heule) -// -// Google C++ Testing and Mocking Framework (Google Test) -// -// Sometimes it's desirable to build Google Test by compiling a single file. -// This file serves this purpose. - -// This line ensures that gtest.h can be compiled on its own, even -// when it's fused. -#include "gtest/gtest.h" - -// The following lines pull in the real gtest *.cc files. -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// The Google C++ Testing and Mocking Framework (Google Test) - -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// Utilities for testing Google Test itself and code that uses Google Test -// (e.g. frameworks built on top of Google Test). - -#ifndef GTEST_INCLUDE_GTEST_GTEST_SPI_H_ -#define GTEST_INCLUDE_GTEST_GTEST_SPI_H_ - - -namespace testing { - -// This helper class can be used to mock out Google Test failure reporting -// so that we can test Google Test or code that builds on Google Test. -// -// An object of this class appends a TestPartResult object to the -// TestPartResultArray object given in the constructor whenever a Google Test -// failure is reported. It can either intercept only failures that are -// generated in the same thread that created this object or it can intercept -// all generated failures. The scope of this mock object can be controlled with -// the second argument to the two arguments constructor. -class GTEST_API_ ScopedFakeTestPartResultReporter - : public TestPartResultReporterInterface { - public: - // The two possible mocking modes of this object. - enum InterceptMode { - INTERCEPT_ONLY_CURRENT_THREAD, // Intercepts only thread local failures. - INTERCEPT_ALL_THREADS // Intercepts all failures. - }; - - // The c'tor sets this object as the test part result reporter used - // by Google Test. The 'result' parameter specifies where to report the - // results. This reporter will only catch failures generated in the current - // thread. DEPRECATED - explicit ScopedFakeTestPartResultReporter(TestPartResultArray* result); - - // Same as above, but you can choose the interception scope of this object. - ScopedFakeTestPartResultReporter(InterceptMode intercept_mode, - TestPartResultArray* result); - - // The d'tor restores the previous test part result reporter. - virtual ~ScopedFakeTestPartResultReporter(); - - // Appends the TestPartResult object to the TestPartResultArray - // received in the constructor. - // - // This method is from the TestPartResultReporterInterface - // interface. - virtual void ReportTestPartResult(const TestPartResult& result); - private: - void Init(); - - const InterceptMode intercept_mode_; - TestPartResultReporterInterface* old_reporter_; - TestPartResultArray* const result_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedFakeTestPartResultReporter); -}; - -namespace internal { - -// A helper class for implementing EXPECT_FATAL_FAILURE() and -// EXPECT_NONFATAL_FAILURE(). Its destructor verifies that the given -// TestPartResultArray contains exactly one failure that has the given -// type and contains the given substring. If that's not the case, a -// non-fatal failure will be generated. -class GTEST_API_ SingleFailureChecker { - public: - // The constructor remembers the arguments. - SingleFailureChecker(const TestPartResultArray* results, - TestPartResult::Type type, const std::string& substr); - ~SingleFailureChecker(); - private: - const TestPartResultArray* const results_; - const TestPartResult::Type type_; - const std::string substr_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(SingleFailureChecker); -}; - -} // namespace internal - -} // namespace testing - -// A set of macros for testing Google Test assertions or code that's expected -// to generate Google Test fatal failures. It verifies that the given -// statement will cause exactly one fatal Google Test failure with 'substr' -// being part of the failure message. -// -// There are two different versions of this macro. EXPECT_FATAL_FAILURE only -// affects and considers failures generated in the current thread and -// EXPECT_FATAL_FAILURE_ON_ALL_THREADS does the same but for all threads. -// -// The verification of the assertion is done correctly even when the statement -// throws an exception or aborts the current function. -// -// Known restrictions: -// - 'statement' cannot reference local non-static variables or -// non-static members of the current object. -// - 'statement' cannot return a value. -// - You cannot stream a failure message to this macro. -// -// Note that even though the implementations of the following two -// macros are much alike, we cannot refactor them to use a common -// helper macro, due to some peculiarity in how the preprocessor -// works. The AcceptsMacroThatExpandsToUnprotectedComma test in -// gtest_unittest.cc will fail to compile if we do that. -#define EXPECT_FATAL_FAILURE(statement, substr) \ - do { \ - class GTestExpectFatalFailureHelper {\ - public:\ - static void Execute() { statement; }\ - };\ - ::testing::TestPartResultArray gtest_failures;\ - ::testing::internal::SingleFailureChecker gtest_checker(\ - >est_failures, ::testing::TestPartResult::kFatalFailure, (substr));\ - {\ - ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ - ::testing::ScopedFakeTestPartResultReporter:: \ - INTERCEPT_ONLY_CURRENT_THREAD, >est_failures);\ - GTestExpectFatalFailureHelper::Execute();\ - }\ - } while (::testing::internal::AlwaysFalse()) - -#define EXPECT_FATAL_FAILURE_ON_ALL_THREADS(statement, substr) \ - do { \ - class GTestExpectFatalFailureHelper {\ - public:\ - static void Execute() { statement; }\ - };\ - ::testing::TestPartResultArray gtest_failures;\ - ::testing::internal::SingleFailureChecker gtest_checker(\ - >est_failures, ::testing::TestPartResult::kFatalFailure, (substr));\ - {\ - ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ - ::testing::ScopedFakeTestPartResultReporter:: \ - INTERCEPT_ALL_THREADS, >est_failures);\ - GTestExpectFatalFailureHelper::Execute();\ - }\ - } while (::testing::internal::AlwaysFalse()) - -// A macro for testing Google Test assertions or code that's expected to -// generate Google Test non-fatal failures. It asserts that the given -// statement will cause exactly one non-fatal Google Test failure with 'substr' -// being part of the failure message. -// -// There are two different versions of this macro. EXPECT_NONFATAL_FAILURE only -// affects and considers failures generated in the current thread and -// EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS does the same but for all threads. -// -// 'statement' is allowed to reference local variables and members of -// the current object. -// -// The verification of the assertion is done correctly even when the statement -// throws an exception or aborts the current function. -// -// Known restrictions: -// - You cannot stream a failure message to this macro. -// -// Note that even though the implementations of the following two -// macros are much alike, we cannot refactor them to use a common -// helper macro, due to some peculiarity in how the preprocessor -// works. If we do that, the code won't compile when the user gives -// EXPECT_NONFATAL_FAILURE() a statement that contains a macro that -// expands to code containing an unprotected comma. The -// AcceptsMacroThatExpandsToUnprotectedComma test in gtest_unittest.cc -// catches that. -// -// For the same reason, we have to write -// if (::testing::internal::AlwaysTrue()) { statement; } -// instead of -// GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_(statement) -// to avoid an MSVC warning on unreachable code. -#define EXPECT_NONFATAL_FAILURE(statement, substr) \ - do {\ - ::testing::TestPartResultArray gtest_failures;\ - ::testing::internal::SingleFailureChecker gtest_checker(\ - >est_failures, ::testing::TestPartResult::kNonFatalFailure, \ - (substr));\ - {\ - ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ - ::testing::ScopedFakeTestPartResultReporter:: \ - INTERCEPT_ONLY_CURRENT_THREAD, >est_failures);\ - if (::testing::internal::AlwaysTrue()) { statement; }\ - }\ - } while (::testing::internal::AlwaysFalse()) - -#define EXPECT_NONFATAL_FAILURE_ON_ALL_THREADS(statement, substr) \ - do {\ - ::testing::TestPartResultArray gtest_failures;\ - ::testing::internal::SingleFailureChecker gtest_checker(\ - >est_failures, ::testing::TestPartResult::kNonFatalFailure, \ - (substr));\ - {\ - ::testing::ScopedFakeTestPartResultReporter gtest_reporter(\ - ::testing::ScopedFakeTestPartResultReporter::INTERCEPT_ALL_THREADS, \ - >est_failures);\ - if (::testing::internal::AlwaysTrue()) { statement; }\ - }\ - } while (::testing::internal::AlwaysFalse()) - -#endif // GTEST_INCLUDE_GTEST_GTEST_SPI_H_ - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include // NOLINT -#include -#include - -#if GTEST_OS_LINUX - -// TODO(kenton@google.com): Use autoconf to detect availability of -// gettimeofday(). -# define GTEST_HAS_GETTIMEOFDAY_ 1 - -# include // NOLINT -# include // NOLINT -# include // NOLINT -// Declares vsnprintf(). This header is not available on Windows. -# include // NOLINT -# include // NOLINT -# include // NOLINT -# include // NOLINT -# include - -#elif GTEST_OS_SYMBIAN -# define GTEST_HAS_GETTIMEOFDAY_ 1 -# include // NOLINT - -#elif GTEST_OS_ZOS -# define GTEST_HAS_GETTIMEOFDAY_ 1 -# include // NOLINT - -// On z/OS we additionally need strings.h for strcasecmp. -# include // NOLINT - -#elif GTEST_OS_WINDOWS_MOBILE // We are on Windows CE. - -# include // NOLINT -# undef min - -#elif GTEST_OS_WINDOWS // We are on Windows proper. - -# include // NOLINT -# include // NOLINT -# include // NOLINT -# include // NOLINT - -# if GTEST_OS_WINDOWS_MINGW -// MinGW has gettimeofday() but not _ftime64(). -// TODO(kenton@google.com): Use autoconf to detect availability of -// gettimeofday(). -// TODO(kenton@google.com): There are other ways to get the time on -// Windows, like GetTickCount() or GetSystemTimeAsFileTime(). MinGW -// supports these. consider using them instead. -# define GTEST_HAS_GETTIMEOFDAY_ 1 -# include // NOLINT -# endif // GTEST_OS_WINDOWS_MINGW - -// cpplint thinks that the header is already included, so we want to -// silence it. -# include // NOLINT -# undef min - -#else - -// Assume other platforms have gettimeofday(). -// TODO(kenton@google.com): Use autoconf to detect availability of -// gettimeofday(). -# define GTEST_HAS_GETTIMEOFDAY_ 1 - -// cpplint thinks that the header is already included, so we want to -// silence it. -# include // NOLINT -# include // NOLINT - -#endif // GTEST_OS_LINUX - -#if GTEST_HAS_EXCEPTIONS -# include -#endif - -#if GTEST_CAN_STREAM_RESULTS_ -# include // NOLINT -# include // NOLINT -# include // NOLINT -# include // NOLINT -#endif - -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -// Utility functions and classes used by the Google C++ testing framework. -// -// Author: wan@google.com (Zhanyong Wan) -// -// This file contains purely Google Test's internal implementation. Please -// DO NOT #INCLUDE IT IN A USER PROGRAM. - -#ifndef GTEST_SRC_GTEST_INTERNAL_INL_H_ -#define GTEST_SRC_GTEST_INTERNAL_INL_H_ - -#ifndef _WIN32_WCE -# include -#endif // !_WIN32_WCE -#include -#include // For strtoll/_strtoul64/malloc/free. -#include // For memmove. - -#include -#include -#include - - -#if GTEST_CAN_STREAM_RESULTS_ -# include // NOLINT -# include // NOLINT -#endif - -#if GTEST_OS_WINDOWS -# include // NOLINT -#endif // GTEST_OS_WINDOWS - - -namespace testing { - -// Declares the flags. -// -// We don't want the users to modify this flag in the code, but want -// Google Test's own unit tests to be able to access it. Therefore we -// declare it here as opposed to in gtest.h. -GTEST_DECLARE_bool_(death_test_use_fork); - -namespace internal { - -// The value of GetTestTypeId() as seen from within the Google Test -// library. This is solely for testing GetTestTypeId(). -GTEST_API_ extern const TypeId kTestTypeIdInGoogleTest; - -// Names of the flags (needed for parsing Google Test flags). -const char kAlsoRunDisabledTestsFlag[] = "also_run_disabled_tests"; -const char kBreakOnFailureFlag[] = "break_on_failure"; -const char kCatchExceptionsFlag[] = "catch_exceptions"; -const char kColorFlag[] = "color"; -const char kFilterFlag[] = "filter"; -const char kListTestsFlag[] = "list_tests"; -const char kOutputFlag[] = "output"; -const char kPrintTimeFlag[] = "print_time"; -const char kPrintUTF8Flag[] = "print_utf8"; -const char kRandomSeedFlag[] = "random_seed"; -const char kRepeatFlag[] = "repeat"; -const char kShuffleFlag[] = "shuffle"; -const char kStackTraceDepthFlag[] = "stack_trace_depth"; -const char kStreamResultToFlag[] = "stream_result_to"; -const char kThrowOnFailureFlag[] = "throw_on_failure"; -const char kFlagfileFlag[] = "flagfile"; - -// A valid random seed must be in [1, kMaxRandomSeed]. -const int kMaxRandomSeed = 99999; - -// g_help_flag is true iff the --help flag or an equivalent form is -// specified on the command line. -GTEST_API_ extern bool g_help_flag; - -// Returns the current time in milliseconds. -GTEST_API_ TimeInMillis GetTimeInMillis(); - -// Returns true iff Google Test should use colors in the output. -GTEST_API_ bool ShouldUseColor(bool stdout_is_tty); - -// Formats the given time in milliseconds as seconds. -GTEST_API_ std::string FormatTimeInMillisAsSeconds(TimeInMillis ms); - -// Converts the given time in milliseconds to a date string in the ISO 8601 -// format, without the timezone information. N.B.: due to the use the -// non-reentrant localtime() function, this function is not thread safe. Do -// not use it in any code that can be called from multiple threads. -GTEST_API_ std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms); - -// Parses a string for an Int32 flag, in the form of "--flag=value". -// -// On success, stores the value of the flag in *value, and returns -// true. On failure, returns false without changing *value. -GTEST_API_ bool ParseInt32Flag( - const char* str, const char* flag, Int32* value); - -// Returns a random seed in range [1, kMaxRandomSeed] based on the -// given --gtest_random_seed flag value. -inline int GetRandomSeedFromFlag(Int32 random_seed_flag) { - const unsigned int raw_seed = (random_seed_flag == 0) ? - static_cast(GetTimeInMillis()) : - static_cast(random_seed_flag); - - // Normalizes the actual seed to range [1, kMaxRandomSeed] such that - // it's easy to type. - const int normalized_seed = - static_cast((raw_seed - 1U) % - static_cast(kMaxRandomSeed)) + 1; - return normalized_seed; -} - -// Returns the first valid random seed after 'seed'. The behavior is -// undefined if 'seed' is invalid. The seed after kMaxRandomSeed is -// considered to be 1. -inline int GetNextRandomSeed(int seed) { - GTEST_CHECK_(1 <= seed && seed <= kMaxRandomSeed) - << "Invalid random seed " << seed << " - must be in [1, " - << kMaxRandomSeed << "]."; - const int next_seed = seed + 1; - return (next_seed > kMaxRandomSeed) ? 1 : next_seed; -} - -// This class saves the values of all Google Test flags in its c'tor, and -// restores them in its d'tor. -class GTestFlagSaver { - public: - // The c'tor. - GTestFlagSaver() { - also_run_disabled_tests_ = GTEST_FLAG(also_run_disabled_tests); - break_on_failure_ = GTEST_FLAG(break_on_failure); - catch_exceptions_ = GTEST_FLAG(catch_exceptions); - color_ = GTEST_FLAG(color); - death_test_style_ = GTEST_FLAG(death_test_style); - death_test_use_fork_ = GTEST_FLAG(death_test_use_fork); - filter_ = GTEST_FLAG(filter); - internal_run_death_test_ = GTEST_FLAG(internal_run_death_test); - list_tests_ = GTEST_FLAG(list_tests); - output_ = GTEST_FLAG(output); - print_time_ = GTEST_FLAG(print_time); - print_utf8_ = GTEST_FLAG(print_utf8); - random_seed_ = GTEST_FLAG(random_seed); - repeat_ = GTEST_FLAG(repeat); - shuffle_ = GTEST_FLAG(shuffle); - stack_trace_depth_ = GTEST_FLAG(stack_trace_depth); - stream_result_to_ = GTEST_FLAG(stream_result_to); - throw_on_failure_ = GTEST_FLAG(throw_on_failure); - } - - // The d'tor is not virtual. DO NOT INHERIT FROM THIS CLASS. - ~GTestFlagSaver() { - GTEST_FLAG(also_run_disabled_tests) = also_run_disabled_tests_; - GTEST_FLAG(break_on_failure) = break_on_failure_; - GTEST_FLAG(catch_exceptions) = catch_exceptions_; - GTEST_FLAG(color) = color_; - GTEST_FLAG(death_test_style) = death_test_style_; - GTEST_FLAG(death_test_use_fork) = death_test_use_fork_; - GTEST_FLAG(filter) = filter_; - GTEST_FLAG(internal_run_death_test) = internal_run_death_test_; - GTEST_FLAG(list_tests) = list_tests_; - GTEST_FLAG(output) = output_; - GTEST_FLAG(print_time) = print_time_; - GTEST_FLAG(print_utf8) = print_utf8_; - GTEST_FLAG(random_seed) = random_seed_; - GTEST_FLAG(repeat) = repeat_; - GTEST_FLAG(shuffle) = shuffle_; - GTEST_FLAG(stack_trace_depth) = stack_trace_depth_; - GTEST_FLAG(stream_result_to) = stream_result_to_; - GTEST_FLAG(throw_on_failure) = throw_on_failure_; - } - - private: - // Fields for saving the original values of flags. - bool also_run_disabled_tests_; - bool break_on_failure_; - bool catch_exceptions_; - std::string color_; - std::string death_test_style_; - bool death_test_use_fork_; - std::string filter_; - std::string internal_run_death_test_; - bool list_tests_; - std::string output_; - bool print_time_; - bool print_utf8_; - internal::Int32 random_seed_; - internal::Int32 repeat_; - bool shuffle_; - internal::Int32 stack_trace_depth_; - std::string stream_result_to_; - bool throw_on_failure_; -} GTEST_ATTRIBUTE_UNUSED_; - -// Converts a Unicode code point to a narrow string in UTF-8 encoding. -// code_point parameter is of type UInt32 because wchar_t may not be -// wide enough to contain a code point. -// If the code_point is not a valid Unicode code point -// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted -// to "(Invalid Unicode 0xXXXXXXXX)". -GTEST_API_ std::string CodePointToUtf8(UInt32 code_point); - -// Converts a wide string to a narrow string in UTF-8 encoding. -// The wide string is assumed to have the following encoding: -// UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin, Symbian OS) -// UTF-32 if sizeof(wchar_t) == 4 (on Linux) -// Parameter str points to a null-terminated wide string. -// Parameter num_chars may additionally limit the number -// of wchar_t characters processed. -1 is used when the entire string -// should be processed. -// If the string contains code points that are not valid Unicode code points -// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output -// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding -// and contains invalid UTF-16 surrogate pairs, values in those pairs -// will be encoded as individual Unicode characters from Basic Normal Plane. -GTEST_API_ std::string WideStringToUtf8(const wchar_t* str, int num_chars); - -// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file -// if the variable is present. If a file already exists at this location, this -// function will write over it. If the variable is present, but the file cannot -// be created, prints an error and exits. -void WriteToShardStatusFileIfNeeded(); - -// Checks whether sharding is enabled by examining the relevant -// environment variable values. If the variables are present, -// but inconsistent (e.g., shard_index >= total_shards), prints -// an error and exits. If in_subprocess_for_death_test, sharding is -// disabled because it must only be applied to the original test -// process. Otherwise, we could filter out death tests we intended to execute. -GTEST_API_ bool ShouldShard(const char* total_shards_str, - const char* shard_index_str, - bool in_subprocess_for_death_test); - -// Parses the environment variable var as an Int32. If it is unset, -// returns default_val. If it is not an Int32, prints an error and -// and aborts. -GTEST_API_ Int32 Int32FromEnvOrDie(const char* env_var, Int32 default_val); - -// Given the total number of shards, the shard index, and the test id, -// returns true iff the test should be run on this shard. The test id is -// some arbitrary but unique non-negative integer assigned to each test -// method. Assumes that 0 <= shard_index < total_shards. -GTEST_API_ bool ShouldRunTestOnShard( - int total_shards, int shard_index, int test_id); - -// STL container utilities. - -// Returns the number of elements in the given container that satisfy -// the given predicate. -template -inline int CountIf(const Container& c, Predicate predicate) { - // Implemented as an explicit loop since std::count_if() in libCstd on - // Solaris has a non-standard signature. - int count = 0; - for (typename Container::const_iterator it = c.begin(); it != c.end(); ++it) { - if (predicate(*it)) - ++count; - } - return count; -} - -// Applies a function/functor to each element in the container. -template -void ForEach(const Container& c, Functor functor) { - std::for_each(c.begin(), c.end(), functor); -} - -// Returns the i-th element of the vector, or default_value if i is not -// in range [0, v.size()). -template -inline E GetElementOr(const std::vector& v, int i, E default_value) { - return (i < 0 || i >= static_cast(v.size())) ? default_value : v[i]; -} - -// Performs an in-place shuffle of a range of the vector's elements. -// 'begin' and 'end' are element indices as an STL-style range; -// i.e. [begin, end) are shuffled, where 'end' == size() means to -// shuffle to the end of the vector. -template -void ShuffleRange(internal::Random* random, int begin, int end, - std::vector* v) { - const int size = static_cast(v->size()); - GTEST_CHECK_(0 <= begin && begin <= size) - << "Invalid shuffle range start " << begin << ": must be in range [0, " - << size << "]."; - GTEST_CHECK_(begin <= end && end <= size) - << "Invalid shuffle range finish " << end << ": must be in range [" - << begin << ", " << size << "]."; - - // Fisher-Yates shuffle, from - // http://en.wikipedia.org/wiki/Fisher-Yates_shuffle - for (int range_width = end - begin; range_width >= 2; range_width--) { - const int last_in_range = begin + range_width - 1; - const int selected = begin + random->Generate(range_width); - std::swap((*v)[selected], (*v)[last_in_range]); - } -} - -// Performs an in-place shuffle of the vector's elements. -template -inline void Shuffle(internal::Random* random, std::vector* v) { - ShuffleRange(random, 0, static_cast(v->size()), v); -} - -// A function for deleting an object. Handy for being used as a -// functor. -template -static void Delete(T* x) { - delete x; -} - -// A predicate that checks the key of a TestProperty against a known key. -// -// TestPropertyKeyIs is copyable. -class TestPropertyKeyIs { - public: - // Constructor. - // - // TestPropertyKeyIs has NO default constructor. - explicit TestPropertyKeyIs(const std::string& key) : key_(key) {} - - // Returns true iff the test name of test property matches on key_. - bool operator()(const TestProperty& test_property) const { - return test_property.key() == key_; - } - - private: - std::string key_; -}; - -// Class UnitTestOptions. -// -// This class contains functions for processing options the user -// specifies when running the tests. It has only static members. -// -// In most cases, the user can specify an option using either an -// environment variable or a command line flag. E.g. you can set the -// test filter using either GTEST_FILTER or --gtest_filter. If both -// the variable and the flag are present, the latter overrides the -// former. -class GTEST_API_ UnitTestOptions { - public: - // Functions for processing the gtest_output flag. - - // Returns the output format, or "" for normal printed output. - static std::string GetOutputFormat(); - - // Returns the absolute path of the requested output file, or the - // default (test_detail.xml in the original working directory) if - // none was explicitly specified. - static std::string GetAbsolutePathToOutputFile(); - - // Functions for processing the gtest_filter flag. - - // Returns true iff the wildcard pattern matches the string. The - // first ':' or '\0' character in pattern marks the end of it. - // - // This recursive algorithm isn't very efficient, but is clear and - // works well enough for matching test names, which are short. - static bool PatternMatchesString(const char *pattern, const char *str); - - // Returns true iff the user-specified filter matches the test case - // name and the test name. - static bool FilterMatchesTest(const std::string &test_case_name, - const std::string &test_name); - -#if GTEST_OS_WINDOWS - // Function for supporting the gtest_catch_exception flag. - - // Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the - // given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise. - // This function is useful as an __except condition. - static int GTestShouldProcessSEH(DWORD exception_code); -#endif // GTEST_OS_WINDOWS - - // Returns true if "name" matches the ':' separated list of glob-style - // filters in "filter". - static bool MatchesFilter(const std::string& name, const char* filter); -}; - -// Returns the current application's name, removing directory path if that -// is present. Used by UnitTestOptions::GetOutputFile. -GTEST_API_ FilePath GetCurrentExecutableName(); - -// The role interface for getting the OS stack trace as a string. -class OsStackTraceGetterInterface { - public: - OsStackTraceGetterInterface() {} - virtual ~OsStackTraceGetterInterface() {} - - // Returns the current OS stack trace as an std::string. Parameters: - // - // max_depth - the maximum number of stack frames to be included - // in the trace. - // skip_count - the number of top frames to be skipped; doesn't count - // against max_depth. - virtual std::string CurrentStackTrace(int max_depth, int skip_count) = 0; - - // UponLeavingGTest() should be called immediately before Google Test calls - // user code. It saves some information about the current stack that - // CurrentStackTrace() will use to find and hide Google Test stack frames. - virtual void UponLeavingGTest() = 0; - - // This string is inserted in place of stack frames that are part of - // Google Test's implementation. - static const char* const kElidedFramesMarker; - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetterInterface); -}; - -// A working implementation of the OsStackTraceGetterInterface interface. -class OsStackTraceGetter : public OsStackTraceGetterInterface { - public: - OsStackTraceGetter() {} - - virtual std::string CurrentStackTrace(int max_depth, int skip_count); - virtual void UponLeavingGTest(); - - private: -#if GTEST_HAS_ABSL - Mutex mutex_; // Protects all internal state. - - // We save the stack frame below the frame that calls user code. - // We do this because the address of the frame immediately below - // the user code changes between the call to UponLeavingGTest() - // and any calls to the stack trace code from within the user code. - void* caller_frame_ = nullptr; -#endif // GTEST_HAS_ABSL - - GTEST_DISALLOW_COPY_AND_ASSIGN_(OsStackTraceGetter); -}; - -// Information about a Google Test trace point. -struct TraceInfo { - const char* file; - int line; - std::string message; -}; - -// This is the default global test part result reporter used in UnitTestImpl. -// This class should only be used by UnitTestImpl. -class DefaultGlobalTestPartResultReporter - : public TestPartResultReporterInterface { - public: - explicit DefaultGlobalTestPartResultReporter(UnitTestImpl* unit_test); - // Implements the TestPartResultReporterInterface. Reports the test part - // result in the current test. - virtual void ReportTestPartResult(const TestPartResult& result); - - private: - UnitTestImpl* const unit_test_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultGlobalTestPartResultReporter); -}; - -// This is the default per thread test part result reporter used in -// UnitTestImpl. This class should only be used by UnitTestImpl. -class DefaultPerThreadTestPartResultReporter - : public TestPartResultReporterInterface { - public: - explicit DefaultPerThreadTestPartResultReporter(UnitTestImpl* unit_test); - // Implements the TestPartResultReporterInterface. The implementation just - // delegates to the current global test part result reporter of *unit_test_. - virtual void ReportTestPartResult(const TestPartResult& result); - - private: - UnitTestImpl* const unit_test_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(DefaultPerThreadTestPartResultReporter); -}; - -// The private implementation of the UnitTest class. We don't protect -// the methods under a mutex, as this class is not accessible by a -// user and the UnitTest class that delegates work to this class does -// proper locking. -class GTEST_API_ UnitTestImpl { - public: - explicit UnitTestImpl(UnitTest* parent); - virtual ~UnitTestImpl(); - - // There are two different ways to register your own TestPartResultReporter. - // You can register your own repoter to listen either only for test results - // from the current thread or for results from all threads. - // By default, each per-thread test result repoter just passes a new - // TestPartResult to the global test result reporter, which registers the - // test part result for the currently running test. - - // Returns the global test part result reporter. - TestPartResultReporterInterface* GetGlobalTestPartResultReporter(); - - // Sets the global test part result reporter. - void SetGlobalTestPartResultReporter( - TestPartResultReporterInterface* reporter); - - // Returns the test part result reporter for the current thread. - TestPartResultReporterInterface* GetTestPartResultReporterForCurrentThread(); - - // Sets the test part result reporter for the current thread. - void SetTestPartResultReporterForCurrentThread( - TestPartResultReporterInterface* reporter); - - // Gets the number of successful test cases. - int successful_test_case_count() const; - - // Gets the number of failed test cases. - int failed_test_case_count() const; - - // Gets the number of all test cases. - int total_test_case_count() const; - - // Gets the number of all test cases that contain at least one test - // that should run. - int test_case_to_run_count() const; - - // Gets the number of successful tests. - int successful_test_count() const; - - // Gets the number of failed tests. - int failed_test_count() const; - - // Gets the number of disabled tests that will be reported in the XML report. - int reportable_disabled_test_count() const; - - // Gets the number of disabled tests. - int disabled_test_count() const; - - // Gets the number of tests to be printed in the XML report. - int reportable_test_count() const; - - // Gets the number of all tests. - int total_test_count() const; - - // Gets the number of tests that should run. - int test_to_run_count() const; - - // Gets the time of the test program start, in ms from the start of the - // UNIX epoch. - TimeInMillis start_timestamp() const { return start_timestamp_; } - - // Gets the elapsed time, in milliseconds. - TimeInMillis elapsed_time() const { return elapsed_time_; } - - // Returns true iff the unit test passed (i.e. all test cases passed). - bool Passed() const { return !Failed(); } - - // Returns true iff the unit test failed (i.e. some test case failed - // or something outside of all tests failed). - bool Failed() const { - return failed_test_case_count() > 0 || ad_hoc_test_result()->Failed(); - } - - // Gets the i-th test case among all the test cases. i can range from 0 to - // total_test_case_count() - 1. If i is not in that range, returns NULL. - const TestCase* GetTestCase(int i) const { - const int index = GetElementOr(test_case_indices_, i, -1); - return index < 0 ? NULL : test_cases_[i]; - } - - // Gets the i-th test case among all the test cases. i can range from 0 to - // total_test_case_count() - 1. If i is not in that range, returns NULL. - TestCase* GetMutableTestCase(int i) { - const int index = GetElementOr(test_case_indices_, i, -1); - return index < 0 ? NULL : test_cases_[index]; - } - - // Provides access to the event listener list. - TestEventListeners* listeners() { return &listeners_; } - - // Returns the TestResult for the test that's currently running, or - // the TestResult for the ad hoc test if no test is running. - TestResult* current_test_result(); - - // Returns the TestResult for the ad hoc test. - const TestResult* ad_hoc_test_result() const { return &ad_hoc_test_result_; } - - // Sets the OS stack trace getter. - // - // Does nothing if the input and the current OS stack trace getter - // are the same; otherwise, deletes the old getter and makes the - // input the current getter. - void set_os_stack_trace_getter(OsStackTraceGetterInterface* getter); - - // Returns the current OS stack trace getter if it is not NULL; - // otherwise, creates an OsStackTraceGetter, makes it the current - // getter, and returns it. - OsStackTraceGetterInterface* os_stack_trace_getter(); - - // Returns the current OS stack trace as an std::string. - // - // The maximum number of stack frames to be included is specified by - // the gtest_stack_trace_depth flag. The skip_count parameter - // specifies the number of top frames to be skipped, which doesn't - // count against the number of frames to be included. - // - // For example, if Foo() calls Bar(), which in turn calls - // CurrentOsStackTraceExceptTop(1), Foo() will be included in the - // trace but Bar() and CurrentOsStackTraceExceptTop() won't. - std::string CurrentOsStackTraceExceptTop(int skip_count) GTEST_NO_INLINE_; - - // Finds and returns a TestCase with the given name. If one doesn't - // exist, creates one and returns it. - // - // Arguments: - // - // test_case_name: name of the test case - // type_param: the name of the test's type parameter, or NULL if - // this is not a typed or a type-parameterized test. - // set_up_tc: pointer to the function that sets up the test case - // tear_down_tc: pointer to the function that tears down the test case - TestCase* GetTestCase(const char* test_case_name, - const char* type_param, - Test::SetUpTestCaseFunc set_up_tc, - Test::TearDownTestCaseFunc tear_down_tc); - - // Adds a TestInfo to the unit test. - // - // Arguments: - // - // set_up_tc: pointer to the function that sets up the test case - // tear_down_tc: pointer to the function that tears down the test case - // test_info: the TestInfo object - void AddTestInfo(Test::SetUpTestCaseFunc set_up_tc, - Test::TearDownTestCaseFunc tear_down_tc, - TestInfo* test_info) { - // In order to support thread-safe death tests, we need to - // remember the original working directory when the test program - // was first invoked. We cannot do this in RUN_ALL_TESTS(), as - // the user may have changed the current directory before calling - // RUN_ALL_TESTS(). Therefore we capture the current directory in - // AddTestInfo(), which is called to register a TEST or TEST_F - // before main() is reached. - if (original_working_dir_.IsEmpty()) { - original_working_dir_.Set(FilePath::GetCurrentDir()); - GTEST_CHECK_(!original_working_dir_.IsEmpty()) - << "Failed to get the current working directory."; - } - - GetTestCase(test_info->test_case_name(), - test_info->type_param(), - set_up_tc, - tear_down_tc)->AddTestInfo(test_info); - } - - // Returns ParameterizedTestCaseRegistry object used to keep track of - // value-parameterized tests and instantiate and register them. - internal::ParameterizedTestCaseRegistry& parameterized_test_registry() { - return parameterized_test_registry_; - } - - // Sets the TestCase object for the test that's currently running. - void set_current_test_case(TestCase* a_current_test_case) { - current_test_case_ = a_current_test_case; - } - - // Sets the TestInfo object for the test that's currently running. If - // current_test_info is NULL, the assertion results will be stored in - // ad_hoc_test_result_. - void set_current_test_info(TestInfo* a_current_test_info) { - current_test_info_ = a_current_test_info; - } - - // Registers all parameterized tests defined using TEST_P and - // INSTANTIATE_TEST_CASE_P, creating regular tests for each test/parameter - // combination. This method can be called more then once; it has guards - // protecting from registering the tests more then once. If - // value-parameterized tests are disabled, RegisterParameterizedTests is - // present but does nothing. - void RegisterParameterizedTests(); - - // Runs all tests in this UnitTest object, prints the result, and - // returns true if all tests are successful. If any exception is - // thrown during a test, this test is considered to be failed, but - // the rest of the tests will still be run. - bool RunAllTests(); - - // Clears the results of all tests, except the ad hoc tests. - void ClearNonAdHocTestResult() { - ForEach(test_cases_, TestCase::ClearTestCaseResult); - } - - // Clears the results of ad-hoc test assertions. - void ClearAdHocTestResult() { - ad_hoc_test_result_.Clear(); - } - - // Adds a TestProperty to the current TestResult object when invoked in a - // context of a test or a test case, or to the global property set. If the - // result already contains a property with the same key, the value will be - // updated. - void RecordProperty(const TestProperty& test_property); - - enum ReactionToSharding { - HONOR_SHARDING_PROTOCOL, - IGNORE_SHARDING_PROTOCOL - }; - - // Matches the full name of each test against the user-specified - // filter to decide whether the test should run, then records the - // result in each TestCase and TestInfo object. - // If shard_tests == HONOR_SHARDING_PROTOCOL, further filters tests - // based on sharding variables in the environment. - // Returns the number of tests that should run. - int FilterTests(ReactionToSharding shard_tests); - - // Prints the names of the tests matching the user-specified filter flag. - void ListTestsMatchingFilter(); - - const TestCase* current_test_case() const { return current_test_case_; } - TestInfo* current_test_info() { return current_test_info_; } - const TestInfo* current_test_info() const { return current_test_info_; } - - // Returns the vector of environments that need to be set-up/torn-down - // before/after the tests are run. - std::vector& environments() { return environments_; } - - // Getters for the per-thread Google Test trace stack. - std::vector& gtest_trace_stack() { - return *(gtest_trace_stack_.pointer()); - } - const std::vector& gtest_trace_stack() const { - return gtest_trace_stack_.get(); - } - -#if GTEST_HAS_DEATH_TEST - void InitDeathTestSubprocessControlInfo() { - internal_run_death_test_flag_.reset(ParseInternalRunDeathTestFlag()); - } - // Returns a pointer to the parsed --gtest_internal_run_death_test - // flag, or NULL if that flag was not specified. - // This information is useful only in a death test child process. - // Must not be called before a call to InitGoogleTest. - const InternalRunDeathTestFlag* internal_run_death_test_flag() const { - return internal_run_death_test_flag_.get(); - } - - // Returns a pointer to the current death test factory. - internal::DeathTestFactory* death_test_factory() { - return death_test_factory_.get(); - } - - void SuppressTestEventsIfInSubprocess(); - - friend class ReplaceDeathTestFactory; -#endif // GTEST_HAS_DEATH_TEST - - // Initializes the event listener performing XML output as specified by - // UnitTestOptions. Must not be called before InitGoogleTest. - void ConfigureXmlOutput(); - -#if GTEST_CAN_STREAM_RESULTS_ - // Initializes the event listener for streaming test results to a socket. - // Must not be called before InitGoogleTest. - void ConfigureStreamingOutput(); -#endif - - // Performs initialization dependent upon flag values obtained in - // ParseGoogleTestFlagsOnly. Is called from InitGoogleTest after the call to - // ParseGoogleTestFlagsOnly. In case a user neglects to call InitGoogleTest - // this function is also called from RunAllTests. Since this function can be - // called more than once, it has to be idempotent. - void PostFlagParsingInit(); - - // Gets the random seed used at the start of the current test iteration. - int random_seed() const { return random_seed_; } - - // Gets the random number generator. - internal::Random* random() { return &random_; } - - // Shuffles all test cases, and the tests within each test case, - // making sure that death tests are still run first. - void ShuffleTests(); - - // Restores the test cases and tests to their order before the first shuffle. - void UnshuffleTests(); - - // Returns the value of GTEST_FLAG(catch_exceptions) at the moment - // UnitTest::Run() starts. - bool catch_exceptions() const { return catch_exceptions_; } - - private: - friend class ::testing::UnitTest; - - // Used by UnitTest::Run() to capture the state of - // GTEST_FLAG(catch_exceptions) at the moment it starts. - void set_catch_exceptions(bool value) { catch_exceptions_ = value; } - - // The UnitTest object that owns this implementation object. - UnitTest* const parent_; - - // The working directory when the first TEST() or TEST_F() was - // executed. - internal::FilePath original_working_dir_; - - // The default test part result reporters. - DefaultGlobalTestPartResultReporter default_global_test_part_result_reporter_; - DefaultPerThreadTestPartResultReporter - default_per_thread_test_part_result_reporter_; - - // Points to (but doesn't own) the global test part result reporter. - TestPartResultReporterInterface* global_test_part_result_repoter_; - - // Protects read and write access to global_test_part_result_reporter_. - internal::Mutex global_test_part_result_reporter_mutex_; - - // Points to (but doesn't own) the per-thread test part result reporter. - internal::ThreadLocal - per_thread_test_part_result_reporter_; - - // The vector of environments that need to be set-up/torn-down - // before/after the tests are run. - std::vector environments_; - - // The vector of TestCases in their original order. It owns the - // elements in the vector. - std::vector test_cases_; - - // Provides a level of indirection for the test case list to allow - // easy shuffling and restoring the test case order. The i-th - // element of this vector is the index of the i-th test case in the - // shuffled order. - std::vector test_case_indices_; - - // ParameterizedTestRegistry object used to register value-parameterized - // tests. - internal::ParameterizedTestCaseRegistry parameterized_test_registry_; - - // Indicates whether RegisterParameterizedTests() has been called already. - bool parameterized_tests_registered_; - - // Index of the last death test case registered. Initially -1. - int last_death_test_case_; - - // This points to the TestCase for the currently running test. It - // changes as Google Test goes through one test case after another. - // When no test is running, this is set to NULL and Google Test - // stores assertion results in ad_hoc_test_result_. Initially NULL. - TestCase* current_test_case_; - - // This points to the TestInfo for the currently running test. It - // changes as Google Test goes through one test after another. When - // no test is running, this is set to NULL and Google Test stores - // assertion results in ad_hoc_test_result_. Initially NULL. - TestInfo* current_test_info_; - - // Normally, a user only writes assertions inside a TEST or TEST_F, - // or inside a function called by a TEST or TEST_F. Since Google - // Test keeps track of which test is current running, it can - // associate such an assertion with the test it belongs to. - // - // If an assertion is encountered when no TEST or TEST_F is running, - // Google Test attributes the assertion result to an imaginary "ad hoc" - // test, and records the result in ad_hoc_test_result_. - TestResult ad_hoc_test_result_; - - // The list of event listeners that can be used to track events inside - // Google Test. - TestEventListeners listeners_; - - // The OS stack trace getter. Will be deleted when the UnitTest - // object is destructed. By default, an OsStackTraceGetter is used, - // but the user can set this field to use a custom getter if that is - // desired. - OsStackTraceGetterInterface* os_stack_trace_getter_; - - // True iff PostFlagParsingInit() has been called. - bool post_flag_parse_init_performed_; - - // The random number seed used at the beginning of the test run. - int random_seed_; - - // Our random number generator. - internal::Random random_; - - // The time of the test program start, in ms from the start of the - // UNIX epoch. - TimeInMillis start_timestamp_; - - // How long the test took to run, in milliseconds. - TimeInMillis elapsed_time_; - -#if GTEST_HAS_DEATH_TEST - // The decomposed components of the gtest_internal_run_death_test flag, - // parsed when RUN_ALL_TESTS is called. - internal::scoped_ptr internal_run_death_test_flag_; - internal::scoped_ptr death_test_factory_; -#endif // GTEST_HAS_DEATH_TEST - - // A per-thread stack of traces created by the SCOPED_TRACE() macro. - internal::ThreadLocal > gtest_trace_stack_; - - // The value of GTEST_FLAG(catch_exceptions) at the moment RunAllTests() - // starts. - bool catch_exceptions_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(UnitTestImpl); -}; // class UnitTestImpl - -// Convenience function for accessing the global UnitTest -// implementation object. -inline UnitTestImpl* GetUnitTestImpl() { - return UnitTest::GetInstance()->impl(); -} - -#if GTEST_USES_SIMPLE_RE - -// Internal helper functions for implementing the simple regular -// expression matcher. -GTEST_API_ bool IsInSet(char ch, const char* str); -GTEST_API_ bool IsAsciiDigit(char ch); -GTEST_API_ bool IsAsciiPunct(char ch); -GTEST_API_ bool IsRepeat(char ch); -GTEST_API_ bool IsAsciiWhiteSpace(char ch); -GTEST_API_ bool IsAsciiWordChar(char ch); -GTEST_API_ bool IsValidEscape(char ch); -GTEST_API_ bool AtomMatchesChar(bool escaped, char pattern, char ch); -GTEST_API_ bool ValidateRegex(const char* regex); -GTEST_API_ bool MatchRegexAtHead(const char* regex, const char* str); -GTEST_API_ bool MatchRepetitionAndRegexAtHead( - bool escaped, char ch, char repeat, const char* regex, const char* str); -GTEST_API_ bool MatchRegexAnywhere(const char* regex, const char* str); - -#endif // GTEST_USES_SIMPLE_RE - -// Parses the command line for Google Test flags, without initializing -// other parts of Google Test. -GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, char** argv); -GTEST_API_ void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv); - -#if GTEST_HAS_DEATH_TEST - -// Returns the message describing the last system error, regardless of the -// platform. -GTEST_API_ std::string GetLastErrnoDescription(); - -// Attempts to parse a string into a positive integer pointed to by the -// number parameter. Returns true if that is possible. -// GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we can use -// it here. -template -bool ParseNaturalNumber(const ::std::string& str, Integer* number) { - // Fail fast if the given string does not begin with a digit; - // this bypasses strtoXXX's "optional leading whitespace and plus - // or minus sign" semantics, which are undesirable here. - if (str.empty() || !IsDigit(str[0])) { - return false; - } - errno = 0; - - char* end; - // BiggestConvertible is the largest integer type that system-provided - // string-to-number conversion routines can return. - -# if GTEST_OS_WINDOWS && !defined(__GNUC__) - - // MSVC and C++ Builder define __int64 instead of the standard long long. - typedef unsigned __int64 BiggestConvertible; - const BiggestConvertible parsed = _strtoui64(str.c_str(), &end, 10); - -# else - - typedef unsigned long long BiggestConvertible; // NOLINT - const BiggestConvertible parsed = strtoull(str.c_str(), &end, 10); - -# endif // GTEST_OS_WINDOWS && !defined(__GNUC__) - - const bool parse_success = *end == '\0' && errno == 0; - - // TODO(vladl@google.com): Convert this to compile time assertion when it is - // available. - GTEST_CHECK_(sizeof(Integer) <= sizeof(parsed)); - - const Integer result = static_cast(parsed); - if (parse_success && static_cast(result) == parsed) { - *number = result; - return true; - } - return false; -} -#endif // GTEST_HAS_DEATH_TEST - -// TestResult contains some private methods that should be hidden from -// Google Test user but are required for testing. This class allow our tests -// to access them. -// -// This class is supplied only for the purpose of testing Google Test's own -// constructs. Do not use it in user tests, either directly or indirectly. -class TestResultAccessor { - public: - static void RecordProperty(TestResult* test_result, - const std::string& xml_element, - const TestProperty& property) { - test_result->RecordProperty(xml_element, property); - } - - static void ClearTestPartResults(TestResult* test_result) { - test_result->ClearTestPartResults(); - } - - static const std::vector& test_part_results( - const TestResult& test_result) { - return test_result.test_part_results(); - } -}; - -#if GTEST_CAN_STREAM_RESULTS_ - -// Streams test results to the given port on the given host machine. -class StreamingListener : public EmptyTestEventListener { - public: - // Abstract base class for writing strings to a socket. - class AbstractSocketWriter { - public: - virtual ~AbstractSocketWriter() {} - - // Sends a string to the socket. - virtual void Send(const std::string& message) = 0; - - // Closes the socket. - virtual void CloseConnection() {} - - // Sends a string and a newline to the socket. - void SendLn(const std::string& message) { Send(message + "\n"); } - }; - - // Concrete class for actually writing strings to a socket. - class SocketWriter : public AbstractSocketWriter { - public: - SocketWriter(const std::string& host, const std::string& port) - : sockfd_(-1), host_name_(host), port_num_(port) { - MakeConnection(); - } - - virtual ~SocketWriter() { - if (sockfd_ != -1) - CloseConnection(); - } - - // Sends a string to the socket. - virtual void Send(const std::string& message) { - GTEST_CHECK_(sockfd_ != -1) - << "Send() can be called only when there is a connection."; - - const int len = static_cast(message.length()); - if (write(sockfd_, message.c_str(), len) != len) { - GTEST_LOG_(WARNING) - << "stream_result_to: failed to stream to " - << host_name_ << ":" << port_num_; - } - } - - private: - // Creates a client socket and connects to the server. - void MakeConnection(); - - // Closes the socket. - void CloseConnection() { - GTEST_CHECK_(sockfd_ != -1) - << "CloseConnection() can be called only when there is a connection."; - - close(sockfd_); - sockfd_ = -1; - } - - int sockfd_; // socket file descriptor - const std::string host_name_; - const std::string port_num_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(SocketWriter); - }; // class SocketWriter - - // Escapes '=', '&', '%', and '\n' characters in str as "%xx". - static std::string UrlEncode(const char* str); - - StreamingListener(const std::string& host, const std::string& port) - : socket_writer_(new SocketWriter(host, port)) { - Start(); - } - - explicit StreamingListener(AbstractSocketWriter* socket_writer) - : socket_writer_(socket_writer) { Start(); } - - void OnTestProgramStart(const UnitTest& /* unit_test */) { - SendLn("event=TestProgramStart"); - } - - void OnTestProgramEnd(const UnitTest& unit_test) { - // Note that Google Test current only report elapsed time for each - // test iteration, not for the entire test program. - SendLn("event=TestProgramEnd&passed=" + FormatBool(unit_test.Passed())); - - // Notify the streaming server to stop. - socket_writer_->CloseConnection(); - } - - void OnTestIterationStart(const UnitTest& /* unit_test */, int iteration) { - SendLn("event=TestIterationStart&iteration=" + - StreamableToString(iteration)); - } - - void OnTestIterationEnd(const UnitTest& unit_test, int /* iteration */) { - SendLn("event=TestIterationEnd&passed=" + - FormatBool(unit_test.Passed()) + "&elapsed_time=" + - StreamableToString(unit_test.elapsed_time()) + "ms"); - } - - void OnTestCaseStart(const TestCase& test_case) { - SendLn(std::string("event=TestCaseStart&name=") + test_case.name()); - } - - void OnTestCaseEnd(const TestCase& test_case) { - SendLn("event=TestCaseEnd&passed=" + FormatBool(test_case.Passed()) - + "&elapsed_time=" + StreamableToString(test_case.elapsed_time()) - + "ms"); - } - - void OnTestStart(const TestInfo& test_info) { - SendLn(std::string("event=TestStart&name=") + test_info.name()); - } - - void OnTestEnd(const TestInfo& test_info) { - SendLn("event=TestEnd&passed=" + - FormatBool((test_info.result())->Passed()) + - "&elapsed_time=" + - StreamableToString((test_info.result())->elapsed_time()) + "ms"); - } - - void OnTestPartResult(const TestPartResult& test_part_result) { - const char* file_name = test_part_result.file_name(); - if (file_name == NULL) - file_name = ""; - SendLn("event=TestPartResult&file=" + UrlEncode(file_name) + - "&line=" + StreamableToString(test_part_result.line_number()) + - "&message=" + UrlEncode(test_part_result.message())); - } - - private: - // Sends the given message and a newline to the socket. - void SendLn(const std::string& message) { socket_writer_->SendLn(message); } - - // Called at the start of streaming to notify the receiver what - // protocol we are using. - void Start() { SendLn("gtest_streaming_protocol_version=1.0"); } - - std::string FormatBool(bool value) { return value ? "1" : "0"; } - - const scoped_ptr socket_writer_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamingListener); -}; // class StreamingListener - -#endif // GTEST_CAN_STREAM_RESULTS_ - -} // namespace internal -} // namespace testing - -#endif // GTEST_SRC_GTEST_INTERNAL_INL_H_ - -#if GTEST_OS_WINDOWS -# define vsnprintf _vsnprintf -#endif // GTEST_OS_WINDOWS - -#if GTEST_HAS_ABSL -#include "absl/debugging/failure_signal_handler.h" -#include "absl/debugging/stacktrace.h" -#include "absl/debugging/symbolize.h" -#include "absl/strings/str_cat.h" -#endif // GTEST_HAS_ABSL - -namespace testing { - -using internal::CountIf; -using internal::ForEach; -using internal::GetElementOr; -using internal::Shuffle; - -// Constants. - -// A test whose test case name or test name matches this filter is -// disabled and not run. -static const char kDisableTestFilter[] = "DISABLED_*:*/DISABLED_*"; - -// A test case whose name matches this filter is considered a death -// test case and will be run before test cases whose name doesn't -// match this filter. -static const char kDeathTestCaseFilter[] = "*DeathTest:*DeathTest/*"; - -// A test filter that matches everything. -static const char kUniversalFilter[] = "*"; - -// The default output format. -static const char kDefaultOutputFormat[] = "xml"; -// The default output file. -static const char kDefaultOutputFile[] = "test_detail"; - -// The environment variable name for the test shard index. -static const char kTestShardIndex[] = "GTEST_SHARD_INDEX"; -// The environment variable name for the total number of test shards. -static const char kTestTotalShards[] = "GTEST_TOTAL_SHARDS"; -// The environment variable name for the test shard status file. -static const char kTestShardStatusFile[] = "GTEST_SHARD_STATUS_FILE"; - -namespace internal { - -// The text used in failure messages to indicate the start of the -// stack trace. -const char kStackTraceMarker[] = "\nStack trace:\n"; - -// g_help_flag is true iff the --help flag or an equivalent form is -// specified on the command line. -bool g_help_flag = false; - -} // namespace internal - -// Bazel passes in the argument to '--test_filter' via the TESTBRIDGE_TEST_ONLY -// environment variable. -static const char* GetDefaultFilter() { - const char* const testbridge_test_only = - internal::posix::GetEnv("TESTBRIDGE_TEST_ONLY"); - if (testbridge_test_only != NULL) { - return testbridge_test_only; - } - return kUniversalFilter; -} - -GTEST_DEFINE_bool_( - also_run_disabled_tests, - internal::BoolFromGTestEnv("also_run_disabled_tests", false), - "Run disabled tests too, in addition to the tests normally being run."); - -GTEST_DEFINE_bool_( - break_on_failure, - internal::BoolFromGTestEnv("break_on_failure", false), - "True iff a failed assertion should be a debugger break-point."); - -GTEST_DEFINE_bool_( - catch_exceptions, - internal::BoolFromGTestEnv("catch_exceptions", true), - "True iff " GTEST_NAME_ - " should catch exceptions and treat them as test failures."); - -GTEST_DEFINE_string_( - color, - internal::StringFromGTestEnv("color", "auto"), - "Whether to use colors in the output. Valid values: yes, no, " - "and auto. 'auto' means to use colors if the output is " - "being sent to a terminal and the TERM environment variable " - "is set to a terminal type that supports colors."); - -GTEST_DEFINE_string_( - filter, - internal::StringFromGTestEnv("filter", GetDefaultFilter()), - "A colon-separated list of glob (not regex) patterns " - "for filtering the tests to run, optionally followed by a " - "'-' and a : separated list of negative patterns (tests to " - "exclude). A test is run if it matches one of the positive " - "patterns and does not match any of the negative patterns."); - -GTEST_DEFINE_bool_( - install_failure_signal_handler, - internal::BoolFromGTestEnv("install_failure_signal_handler", false), - "If true and supported on the current platform, " GTEST_NAME_ " should " - "install a signal handler that dumps debugging information when fatal " - "signals are raised."); - -GTEST_DEFINE_bool_(list_tests, false, - "List all tests without running them."); - -// The net priority order after flag processing is thus: -// --gtest_output command line flag -// GTEST_OUTPUT environment variable -// XML_OUTPUT_FILE environment variable -// '' -GTEST_DEFINE_string_( - output, - internal::StringFromGTestEnv("output", - internal::OutputFlagAlsoCheckEnvVar().c_str()), - "A format (defaults to \"xml\" but can be specified to be \"json\"), " - "optionally followed by a colon and an output file name or directory. " - "A directory is indicated by a trailing pathname separator. " - "Examples: \"xml:filename.xml\", \"xml::directoryname/\". " - "If a directory is specified, output files will be created " - "within that directory, with file-names based on the test " - "executable's name and, if necessary, made unique by adding " - "digits."); - -GTEST_DEFINE_bool_( - print_time, - internal::BoolFromGTestEnv("print_time", true), - "True iff " GTEST_NAME_ - " should display elapsed time in text output."); - -GTEST_DEFINE_bool_( - print_utf8, - internal::BoolFromGTestEnv("print_utf8", true), - "True iff " GTEST_NAME_ - " prints UTF8 characters as text."); - -GTEST_DEFINE_int32_( - random_seed, - internal::Int32FromGTestEnv("random_seed", 0), - "Random number seed to use when shuffling test orders. Must be in range " - "[1, 99999], or 0 to use a seed based on the current time."); - -GTEST_DEFINE_int32_( - repeat, - internal::Int32FromGTestEnv("repeat", 1), - "How many times to repeat each test. Specify a negative number " - "for repeating forever. Useful for shaking out flaky tests."); - -GTEST_DEFINE_bool_( - show_internal_stack_frames, false, - "True iff " GTEST_NAME_ " should include internal stack frames when " - "printing test failure stack traces."); - -GTEST_DEFINE_bool_( - shuffle, - internal::BoolFromGTestEnv("shuffle", false), - "True iff " GTEST_NAME_ - " should randomize tests' order on every run."); - -GTEST_DEFINE_int32_( - stack_trace_depth, - internal::Int32FromGTestEnv("stack_trace_depth", kMaxStackTraceDepth), - "The maximum number of stack frames to print when an " - "assertion fails. The valid range is 0 through 100, inclusive."); - -GTEST_DEFINE_string_( - stream_result_to, - internal::StringFromGTestEnv("stream_result_to", ""), - "This flag specifies the host name and the port number on which to stream " - "test results. Example: \"localhost:555\". The flag is effective only on " - "Linux."); - -GTEST_DEFINE_bool_( - throw_on_failure, - internal::BoolFromGTestEnv("throw_on_failure", false), - "When this flag is specified, a failed assertion will throw an exception " - "if exceptions are enabled or exit the program with a non-zero code " - "otherwise. For use with an external test framework."); - -#if GTEST_USE_OWN_FLAGFILE_FLAG_ -GTEST_DEFINE_string_( - flagfile, - internal::StringFromGTestEnv("flagfile", ""), - "This flag specifies the flagfile to read command-line flags from."); -#endif // GTEST_USE_OWN_FLAGFILE_FLAG_ - -namespace internal { - -// Generates a random number from [0, range), using a Linear -// Congruential Generator (LCG). Crashes if 'range' is 0 or greater -// than kMaxRange. -UInt32 Random::Generate(UInt32 range) { - // These constants are the same as are used in glibc's rand(3). - // Use wider types than necessary to prevent unsigned overflow diagnostics. - state_ = static_cast(1103515245ULL*state_ + 12345U) % kMaxRange; - - GTEST_CHECK_(range > 0) - << "Cannot generate a number in the range [0, 0)."; - GTEST_CHECK_(range <= kMaxRange) - << "Generation of a number in [0, " << range << ") was requested, " - << "but this can only generate numbers in [0, " << kMaxRange << ")."; - - // Converting via modulus introduces a bit of downward bias, but - // it's simple, and a linear congruential generator isn't too good - // to begin with. - return state_ % range; -} - -// GTestIsInitialized() returns true iff the user has initialized -// Google Test. Useful for catching the user mistake of not initializing -// Google Test before calling RUN_ALL_TESTS(). -static bool GTestIsInitialized() { return GetArgvs().size() > 0; } - -// Iterates over a vector of TestCases, keeping a running sum of the -// results of calling a given int-returning method on each. -// Returns the sum. -static int SumOverTestCaseList(const std::vector& case_list, - int (TestCase::*method)() const) { - int sum = 0; - for (size_t i = 0; i < case_list.size(); i++) { - sum += (case_list[i]->*method)(); - } - return sum; -} - -// Returns true iff the test case passed. -static bool TestCasePassed(const TestCase* test_case) { - return test_case->should_run() && test_case->Passed(); -} - -// Returns true iff the test case failed. -static bool TestCaseFailed(const TestCase* test_case) { - return test_case->should_run() && test_case->Failed(); -} - -// Returns true iff test_case contains at least one test that should -// run. -static bool ShouldRunTestCase(const TestCase* test_case) { - return test_case->should_run(); -} - -// AssertHelper constructor. -AssertHelper::AssertHelper(TestPartResult::Type type, - const char* file, - int line, - const char* message) - : data_(new AssertHelperData(type, file, line, message)) { -} - -AssertHelper::~AssertHelper() { - delete data_; -} - -// Message assignment, for assertion streaming support. -void AssertHelper::operator=(const Message& message) const { - UnitTest::GetInstance()-> - AddTestPartResult(data_->type, data_->file, data_->line, - AppendUserMessage(data_->message, message), - UnitTest::GetInstance()->impl() - ->CurrentOsStackTraceExceptTop(1) - // Skips the stack frame for this function itself. - ); // NOLINT -} - -// Mutex for linked pointers. -GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_linked_ptr_mutex); - -// A copy of all command line arguments. Set by InitGoogleTest(). -::std::vector g_argvs; - -::std::vector GetArgvs() { -#if defined(GTEST_CUSTOM_GET_ARGVS_) - // GTEST_CUSTOM_GET_ARGVS_() may return a container of std::string or - // ::string. This code converts it to the appropriate type. - const auto& custom = GTEST_CUSTOM_GET_ARGVS_(); - return ::std::vector(custom.begin(), custom.end()); -#else // defined(GTEST_CUSTOM_GET_ARGVS_) - return g_argvs; -#endif // defined(GTEST_CUSTOM_GET_ARGVS_) -} - -// Returns the current application's name, removing directory path if that -// is present. -FilePath GetCurrentExecutableName() { - FilePath result; - -#if GTEST_OS_WINDOWS - result.Set(FilePath(GetArgvs()[0]).RemoveExtension("exe")); -#else - result.Set(FilePath(GetArgvs()[0])); -#endif // GTEST_OS_WINDOWS - - return result.RemoveDirectoryName(); -} - -// Functions for processing the gtest_output flag. - -// Returns the output format, or "" for normal printed output. -std::string UnitTestOptions::GetOutputFormat() { - const char* const gtest_output_flag = GTEST_FLAG(output).c_str(); - if (gtest_output_flag == NULL) return std::string(""); - - const char* const colon = strchr(gtest_output_flag, ':'); - return (colon == NULL) ? - std::string(gtest_output_flag) : - std::string(gtest_output_flag, colon - gtest_output_flag); -} - -// Returns the name of the requested output file, or the default if none -// was explicitly specified. -std::string UnitTestOptions::GetAbsolutePathToOutputFile() { - const char* const gtest_output_flag = GTEST_FLAG(output).c_str(); - if (gtest_output_flag == NULL) - return ""; - - std::string format = GetOutputFormat(); - if (format.empty()) - format = std::string(kDefaultOutputFormat); - - const char* const colon = strchr(gtest_output_flag, ':'); - if (colon == NULL) - return internal::FilePath::MakeFileName( - internal::FilePath( - UnitTest::GetInstance()->original_working_dir()), - internal::FilePath(kDefaultOutputFile), 0, - format.c_str()).string(); - - internal::FilePath output_name(colon + 1); - if (!output_name.IsAbsolutePath()) - // TODO(wan@google.com): on Windows \some\path is not an absolute - // path (as its meaning depends on the current drive), yet the - // following logic for turning it into an absolute path is wrong. - // Fix it. - output_name = internal::FilePath::ConcatPaths( - internal::FilePath(UnitTest::GetInstance()->original_working_dir()), - internal::FilePath(colon + 1)); - - if (!output_name.IsDirectory()) - return output_name.string(); - - internal::FilePath result(internal::FilePath::GenerateUniqueFileName( - output_name, internal::GetCurrentExecutableName(), - GetOutputFormat().c_str())); - return result.string(); -} - -// Returns true iff the wildcard pattern matches the string. The -// first ':' or '\0' character in pattern marks the end of it. -// -// This recursive algorithm isn't very efficient, but is clear and -// works well enough for matching test names, which are short. -bool UnitTestOptions::PatternMatchesString(const char *pattern, - const char *str) { - switch (*pattern) { - case '\0': - case ':': // Either ':' or '\0' marks the end of the pattern. - return *str == '\0'; - case '?': // Matches any single character. - return *str != '\0' && PatternMatchesString(pattern + 1, str + 1); - case '*': // Matches any string (possibly empty) of characters. - return (*str != '\0' && PatternMatchesString(pattern, str + 1)) || - PatternMatchesString(pattern + 1, str); - default: // Non-special character. Matches itself. - return *pattern == *str && - PatternMatchesString(pattern + 1, str + 1); - } -} - -bool UnitTestOptions::MatchesFilter( - const std::string& name, const char* filter) { - const char *cur_pattern = filter; - for (;;) { - if (PatternMatchesString(cur_pattern, name.c_str())) { - return true; - } - - // Finds the next pattern in the filter. - cur_pattern = strchr(cur_pattern, ':'); - - // Returns if no more pattern can be found. - if (cur_pattern == NULL) { - return false; - } - - // Skips the pattern separater (the ':' character). - cur_pattern++; - } -} - -// Returns true iff the user-specified filter matches the test case -// name and the test name. -bool UnitTestOptions::FilterMatchesTest(const std::string &test_case_name, - const std::string &test_name) { - const std::string& full_name = test_case_name + "." + test_name.c_str(); - - // Split --gtest_filter at '-', if there is one, to separate into - // positive filter and negative filter portions - const char* const p = GTEST_FLAG(filter).c_str(); - const char* const dash = strchr(p, '-'); - std::string positive; - std::string negative; - if (dash == NULL) { - positive = GTEST_FLAG(filter).c_str(); // Whole string is a positive filter - negative = ""; - } else { - positive = std::string(p, dash); // Everything up to the dash - negative = std::string(dash + 1); // Everything after the dash - if (positive.empty()) { - // Treat '-test1' as the same as '*-test1' - positive = kUniversalFilter; - } - } - - // A filter is a colon-separated list of patterns. It matches a - // test if any pattern in it matches the test. - return (MatchesFilter(full_name, positive.c_str()) && - !MatchesFilter(full_name, negative.c_str())); -} - -#if GTEST_HAS_SEH -// Returns EXCEPTION_EXECUTE_HANDLER if Google Test should handle the -// given SEH exception, or EXCEPTION_CONTINUE_SEARCH otherwise. -// This function is useful as an __except condition. -int UnitTestOptions::GTestShouldProcessSEH(DWORD exception_code) { - // Google Test should handle a SEH exception if: - // 1. the user wants it to, AND - // 2. this is not a breakpoint exception, AND - // 3. this is not a C++ exception (VC++ implements them via SEH, - // apparently). - // - // SEH exception code for C++ exceptions. - // (see http://support.microsoft.com/kb/185294 for more information). - const DWORD kCxxExceptionCode = 0xe06d7363; - - bool should_handle = true; - - if (!GTEST_FLAG(catch_exceptions)) - should_handle = false; - else if (exception_code == EXCEPTION_BREAKPOINT) - should_handle = false; - else if (exception_code == kCxxExceptionCode) - should_handle = false; - - return should_handle ? EXCEPTION_EXECUTE_HANDLER : EXCEPTION_CONTINUE_SEARCH; -} -#endif // GTEST_HAS_SEH - -} // namespace internal - -// The c'tor sets this object as the test part result reporter used by -// Google Test. The 'result' parameter specifies where to report the -// results. Intercepts only failures from the current thread. -ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter( - TestPartResultArray* result) - : intercept_mode_(INTERCEPT_ONLY_CURRENT_THREAD), - result_(result) { - Init(); -} - -// The c'tor sets this object as the test part result reporter used by -// Google Test. The 'result' parameter specifies where to report the -// results. -ScopedFakeTestPartResultReporter::ScopedFakeTestPartResultReporter( - InterceptMode intercept_mode, TestPartResultArray* result) - : intercept_mode_(intercept_mode), - result_(result) { - Init(); -} - -void ScopedFakeTestPartResultReporter::Init() { - internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); - if (intercept_mode_ == INTERCEPT_ALL_THREADS) { - old_reporter_ = impl->GetGlobalTestPartResultReporter(); - impl->SetGlobalTestPartResultReporter(this); - } else { - old_reporter_ = impl->GetTestPartResultReporterForCurrentThread(); - impl->SetTestPartResultReporterForCurrentThread(this); - } -} - -// The d'tor restores the test part result reporter used by Google Test -// before. -ScopedFakeTestPartResultReporter::~ScopedFakeTestPartResultReporter() { - internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); - if (intercept_mode_ == INTERCEPT_ALL_THREADS) { - impl->SetGlobalTestPartResultReporter(old_reporter_); - } else { - impl->SetTestPartResultReporterForCurrentThread(old_reporter_); - } -} - -// Increments the test part result count and remembers the result. -// This method is from the TestPartResultReporterInterface interface. -void ScopedFakeTestPartResultReporter::ReportTestPartResult( - const TestPartResult& result) { - result_->Append(result); -} - -namespace internal { - -// Returns the type ID of ::testing::Test. We should always call this -// instead of GetTypeId< ::testing::Test>() to get the type ID of -// testing::Test. This is to work around a suspected linker bug when -// using Google Test as a framework on Mac OS X. The bug causes -// GetTypeId< ::testing::Test>() to return different values depending -// on whether the call is from the Google Test framework itself or -// from user test code. GetTestTypeId() is guaranteed to always -// return the same value, as it always calls GetTypeId<>() from the -// gtest.cc, which is within the Google Test framework. -TypeId GetTestTypeId() { - return GetTypeId(); -} - -// The value of GetTestTypeId() as seen from within the Google Test -// library. This is solely for testing GetTestTypeId(). -extern const TypeId kTestTypeIdInGoogleTest = GetTestTypeId(); - -// This predicate-formatter checks that 'results' contains a test part -// failure of the given type and that the failure message contains the -// given substring. -static AssertionResult HasOneFailure(const char* /* results_expr */, - const char* /* type_expr */, - const char* /* substr_expr */, - const TestPartResultArray& results, - TestPartResult::Type type, - const std::string& substr) { - const std::string expected(type == TestPartResult::kFatalFailure ? - "1 fatal failure" : - "1 non-fatal failure"); - Message msg; - if (results.size() != 1) { - msg << "Expected: " << expected << "\n" - << " Actual: " << results.size() << " failures"; - for (int i = 0; i < results.size(); i++) { - msg << "\n" << results.GetTestPartResult(i); - } - return AssertionFailure() << msg; - } - - const TestPartResult& r = results.GetTestPartResult(0); - if (r.type() != type) { - return AssertionFailure() << "Expected: " << expected << "\n" - << " Actual:\n" - << r; - } - - if (strstr(r.message(), substr.c_str()) == NULL) { - return AssertionFailure() << "Expected: " << expected << " containing \"" - << substr << "\"\n" - << " Actual:\n" - << r; - } - - return AssertionSuccess(); -} - -// The constructor of SingleFailureChecker remembers where to look up -// test part results, what type of failure we expect, and what -// substring the failure message should contain. -SingleFailureChecker::SingleFailureChecker(const TestPartResultArray* results, - TestPartResult::Type type, - const std::string& substr) - : results_(results), type_(type), substr_(substr) {} - -// The destructor of SingleFailureChecker verifies that the given -// TestPartResultArray contains exactly one failure that has the given -// type and contains the given substring. If that's not the case, a -// non-fatal failure will be generated. -SingleFailureChecker::~SingleFailureChecker() { - EXPECT_PRED_FORMAT3(HasOneFailure, *results_, type_, substr_); -} - -DefaultGlobalTestPartResultReporter::DefaultGlobalTestPartResultReporter( - UnitTestImpl* unit_test) : unit_test_(unit_test) {} - -void DefaultGlobalTestPartResultReporter::ReportTestPartResult( - const TestPartResult& result) { - unit_test_->current_test_result()->AddTestPartResult(result); - unit_test_->listeners()->repeater()->OnTestPartResult(result); -} - -DefaultPerThreadTestPartResultReporter::DefaultPerThreadTestPartResultReporter( - UnitTestImpl* unit_test) : unit_test_(unit_test) {} - -void DefaultPerThreadTestPartResultReporter::ReportTestPartResult( - const TestPartResult& result) { - unit_test_->GetGlobalTestPartResultReporter()->ReportTestPartResult(result); -} - -// Returns the global test part result reporter. -TestPartResultReporterInterface* -UnitTestImpl::GetGlobalTestPartResultReporter() { - internal::MutexLock lock(&global_test_part_result_reporter_mutex_); - return global_test_part_result_repoter_; -} - -// Sets the global test part result reporter. -void UnitTestImpl::SetGlobalTestPartResultReporter( - TestPartResultReporterInterface* reporter) { - internal::MutexLock lock(&global_test_part_result_reporter_mutex_); - global_test_part_result_repoter_ = reporter; -} - -// Returns the test part result reporter for the current thread. -TestPartResultReporterInterface* -UnitTestImpl::GetTestPartResultReporterForCurrentThread() { - return per_thread_test_part_result_reporter_.get(); -} - -// Sets the test part result reporter for the current thread. -void UnitTestImpl::SetTestPartResultReporterForCurrentThread( - TestPartResultReporterInterface* reporter) { - per_thread_test_part_result_reporter_.set(reporter); -} - -// Gets the number of successful test cases. -int UnitTestImpl::successful_test_case_count() const { - return CountIf(test_cases_, TestCasePassed); -} - -// Gets the number of failed test cases. -int UnitTestImpl::failed_test_case_count() const { - return CountIf(test_cases_, TestCaseFailed); -} - -// Gets the number of all test cases. -int UnitTestImpl::total_test_case_count() const { - return static_cast(test_cases_.size()); -} - -// Gets the number of all test cases that contain at least one test -// that should run. -int UnitTestImpl::test_case_to_run_count() const { - return CountIf(test_cases_, ShouldRunTestCase); -} - -// Gets the number of successful tests. -int UnitTestImpl::successful_test_count() const { - return SumOverTestCaseList(test_cases_, &TestCase::successful_test_count); -} - -// Gets the number of failed tests. -int UnitTestImpl::failed_test_count() const { - return SumOverTestCaseList(test_cases_, &TestCase::failed_test_count); -} - -// Gets the number of disabled tests that will be reported in the XML report. -int UnitTestImpl::reportable_disabled_test_count() const { - return SumOverTestCaseList(test_cases_, - &TestCase::reportable_disabled_test_count); -} - -// Gets the number of disabled tests. -int UnitTestImpl::disabled_test_count() const { - return SumOverTestCaseList(test_cases_, &TestCase::disabled_test_count); -} - -// Gets the number of tests to be printed in the XML report. -int UnitTestImpl::reportable_test_count() const { - return SumOverTestCaseList(test_cases_, &TestCase::reportable_test_count); -} - -// Gets the number of all tests. -int UnitTestImpl::total_test_count() const { - return SumOverTestCaseList(test_cases_, &TestCase::total_test_count); -} - -// Gets the number of tests that should run. -int UnitTestImpl::test_to_run_count() const { - return SumOverTestCaseList(test_cases_, &TestCase::test_to_run_count); -} - -// Returns the current OS stack trace as an std::string. -// -// The maximum number of stack frames to be included is specified by -// the gtest_stack_trace_depth flag. The skip_count parameter -// specifies the number of top frames to be skipped, which doesn't -// count against the number of frames to be included. -// -// For example, if Foo() calls Bar(), which in turn calls -// CurrentOsStackTraceExceptTop(1), Foo() will be included in the -// trace but Bar() and CurrentOsStackTraceExceptTop() won't. -std::string UnitTestImpl::CurrentOsStackTraceExceptTop(int skip_count) { - return os_stack_trace_getter()->CurrentStackTrace( - static_cast(GTEST_FLAG(stack_trace_depth)), - skip_count + 1 - // Skips the user-specified number of frames plus this function - // itself. - ); // NOLINT -} - -// Returns the current time in milliseconds. -TimeInMillis GetTimeInMillis() { -#if GTEST_OS_WINDOWS_MOBILE || defined(__BORLANDC__) - // Difference between 1970-01-01 and 1601-01-01 in milliseconds. - // http://analogous.blogspot.com/2005/04/epoch.html - const TimeInMillis kJavaEpochToWinFileTimeDelta = - static_cast(116444736UL) * 100000UL; - const DWORD kTenthMicrosInMilliSecond = 10000; - - SYSTEMTIME now_systime; - FILETIME now_filetime; - ULARGE_INTEGER now_int64; - // TODO(kenton@google.com): Shouldn't this just use - // GetSystemTimeAsFileTime()? - GetSystemTime(&now_systime); - if (SystemTimeToFileTime(&now_systime, &now_filetime)) { - now_int64.LowPart = now_filetime.dwLowDateTime; - now_int64.HighPart = now_filetime.dwHighDateTime; - now_int64.QuadPart = (now_int64.QuadPart / kTenthMicrosInMilliSecond) - - kJavaEpochToWinFileTimeDelta; - return now_int64.QuadPart; - } - return 0; -#elif GTEST_OS_WINDOWS && !GTEST_HAS_GETTIMEOFDAY_ - __timeb64 now; - - // MSVC 8 deprecates _ftime64(), so we want to suppress warning 4996 - // (deprecated function) there. - // TODO(kenton@google.com): Use GetTickCount()? Or use - // SystemTimeToFileTime() - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996) - _ftime64(&now); - GTEST_DISABLE_MSC_WARNINGS_POP_() - - return static_cast(now.time) * 1000 + now.millitm; -#elif GTEST_HAS_GETTIMEOFDAY_ - struct timeval now; - gettimeofday(&now, NULL); - return static_cast(now.tv_sec) * 1000 + now.tv_usec / 1000; -#else -# error "Don't know how to get the current time on your system." -#endif -} - -// Utilities - -// class String. - -#if GTEST_OS_WINDOWS_MOBILE -// Creates a UTF-16 wide string from the given ANSI string, allocating -// memory using new. The caller is responsible for deleting the return -// value using delete[]. Returns the wide string, or NULL if the -// input is NULL. -LPCWSTR String::AnsiToUtf16(const char* ansi) { - if (!ansi) return NULL; - const int length = strlen(ansi); - const int unicode_length = - MultiByteToWideChar(CP_ACP, 0, ansi, length, - NULL, 0); - WCHAR* unicode = new WCHAR[unicode_length + 1]; - MultiByteToWideChar(CP_ACP, 0, ansi, length, - unicode, unicode_length); - unicode[unicode_length] = 0; - return unicode; -} - -// Creates an ANSI string from the given wide string, allocating -// memory using new. The caller is responsible for deleting the return -// value using delete[]. Returns the ANSI string, or NULL if the -// input is NULL. -const char* String::Utf16ToAnsi(LPCWSTR utf16_str) { - if (!utf16_str) return NULL; - const int ansi_length = - WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, - NULL, 0, NULL, NULL); - char* ansi = new char[ansi_length + 1]; - WideCharToMultiByte(CP_ACP, 0, utf16_str, -1, - ansi, ansi_length, NULL, NULL); - ansi[ansi_length] = 0; - return ansi; -} - -#endif // GTEST_OS_WINDOWS_MOBILE - -// Compares two C strings. Returns true iff they have the same content. -// -// Unlike strcmp(), this function can handle NULL argument(s). A NULL -// C string is considered different to any non-NULL C string, -// including the empty string. -bool String::CStringEquals(const char * lhs, const char * rhs) { - if ( lhs == NULL ) return rhs == NULL; - - if ( rhs == NULL ) return false; - - return strcmp(lhs, rhs) == 0; -} - -#if GTEST_HAS_STD_WSTRING || GTEST_HAS_GLOBAL_WSTRING - -// Converts an array of wide chars to a narrow string using the UTF-8 -// encoding, and streams the result to the given Message object. -static void StreamWideCharsToMessage(const wchar_t* wstr, size_t length, - Message* msg) { - for (size_t i = 0; i != length; ) { // NOLINT - if (wstr[i] != L'\0') { - *msg << WideStringToUtf8(wstr + i, static_cast(length - i)); - while (i != length && wstr[i] != L'\0') - i++; - } else { - *msg << '\0'; - i++; - } - } -} - -#endif // GTEST_HAS_STD_WSTRING || GTEST_HAS_GLOBAL_WSTRING - -void SplitString(const ::std::string& str, char delimiter, - ::std::vector< ::std::string>* dest) { - ::std::vector< ::std::string> parsed; - ::std::string::size_type pos = 0; - while (::testing::internal::AlwaysTrue()) { - const ::std::string::size_type colon = str.find(delimiter, pos); - if (colon == ::std::string::npos) { - parsed.push_back(str.substr(pos)); - break; - } else { - parsed.push_back(str.substr(pos, colon - pos)); - pos = colon + 1; - } - } - dest->swap(parsed); -} - -} // namespace internal - -// Constructs an empty Message. -// We allocate the stringstream separately because otherwise each use of -// ASSERT/EXPECT in a procedure adds over 200 bytes to the procedure's -// stack frame leading to huge stack frames in some cases; gcc does not reuse -// the stack space. -Message::Message() : ss_(new ::std::stringstream) { - // By default, we want there to be enough precision when printing - // a double to a Message. - *ss_ << std::setprecision(std::numeric_limits::digits10 + 2); -} - -// These two overloads allow streaming a wide C string to a Message -// using the UTF-8 encoding. -Message& Message::operator <<(const wchar_t* wide_c_str) { - return *this << internal::String::ShowWideCString(wide_c_str); -} -Message& Message::operator <<(wchar_t* wide_c_str) { - return *this << internal::String::ShowWideCString(wide_c_str); -} - -#if GTEST_HAS_STD_WSTRING -// Converts the given wide string to a narrow string using the UTF-8 -// encoding, and streams the result to this Message object. -Message& Message::operator <<(const ::std::wstring& wstr) { - internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this); - return *this; -} -#endif // GTEST_HAS_STD_WSTRING - -#if GTEST_HAS_GLOBAL_WSTRING -// Converts the given wide string to a narrow string using the UTF-8 -// encoding, and streams the result to this Message object. -Message& Message::operator <<(const ::wstring& wstr) { - internal::StreamWideCharsToMessage(wstr.c_str(), wstr.length(), this); - return *this; -} -#endif // GTEST_HAS_GLOBAL_WSTRING - -// Gets the text streamed to this object so far as an std::string. -// Each '\0' character in the buffer is replaced with "\\0". -std::string Message::GetString() const { - return internal::StringStreamToString(ss_.get()); -} - -// AssertionResult constructors. -// Used in EXPECT_TRUE/FALSE(assertion_result). -AssertionResult::AssertionResult(const AssertionResult& other) - : success_(other.success_), - message_(other.message_.get() != NULL ? - new ::std::string(*other.message_) : - static_cast< ::std::string*>(NULL)) { -} - -// Swaps two AssertionResults. -void AssertionResult::swap(AssertionResult& other) { - using std::swap; - swap(success_, other.success_); - swap(message_, other.message_); -} - -// Returns the assertion's negation. Used with EXPECT/ASSERT_FALSE. -AssertionResult AssertionResult::operator!() const { - AssertionResult negation(!success_); - if (message_.get() != NULL) - negation << *message_; - return negation; -} - -// Makes a successful assertion result. -AssertionResult AssertionSuccess() { - return AssertionResult(true); -} - -// Makes a failed assertion result. -AssertionResult AssertionFailure() { - return AssertionResult(false); -} - -// Makes a failed assertion result with the given failure message. -// Deprecated; use AssertionFailure() << message. -AssertionResult AssertionFailure(const Message& message) { - return AssertionFailure() << message; -} - -namespace internal { - -namespace edit_distance { -std::vector CalculateOptimalEdits(const std::vector& left, - const std::vector& right) { - std::vector > costs( - left.size() + 1, std::vector(right.size() + 1)); - std::vector > best_move( - left.size() + 1, std::vector(right.size() + 1)); - - // Populate for empty right. - for (size_t l_i = 0; l_i < costs.size(); ++l_i) { - costs[l_i][0] = static_cast(l_i); - best_move[l_i][0] = kRemove; - } - // Populate for empty left. - for (size_t r_i = 1; r_i < costs[0].size(); ++r_i) { - costs[0][r_i] = static_cast(r_i); - best_move[0][r_i] = kAdd; - } - - for (size_t l_i = 0; l_i < left.size(); ++l_i) { - for (size_t r_i = 0; r_i < right.size(); ++r_i) { - if (left[l_i] == right[r_i]) { - // Found a match. Consume it. - costs[l_i + 1][r_i + 1] = costs[l_i][r_i]; - best_move[l_i + 1][r_i + 1] = kMatch; - continue; - } - - const double add = costs[l_i + 1][r_i]; - const double remove = costs[l_i][r_i + 1]; - const double replace = costs[l_i][r_i]; - if (add < remove && add < replace) { - costs[l_i + 1][r_i + 1] = add + 1; - best_move[l_i + 1][r_i + 1] = kAdd; - } else if (remove < add && remove < replace) { - costs[l_i + 1][r_i + 1] = remove + 1; - best_move[l_i + 1][r_i + 1] = kRemove; - } else { - // We make replace a little more expensive than add/remove to lower - // their priority. - costs[l_i + 1][r_i + 1] = replace + 1.00001; - best_move[l_i + 1][r_i + 1] = kReplace; - } - } - } - - // Reconstruct the best path. We do it in reverse order. - std::vector best_path; - for (size_t l_i = left.size(), r_i = right.size(); l_i > 0 || r_i > 0;) { - EditType move = best_move[l_i][r_i]; - best_path.push_back(move); - l_i -= move != kAdd; - r_i -= move != kRemove; - } - std::reverse(best_path.begin(), best_path.end()); - return best_path; -} - -namespace { - -// Helper class to convert string into ids with deduplication. -class InternalStrings { - public: - size_t GetId(const std::string& str) { - IdMap::iterator it = ids_.find(str); - if (it != ids_.end()) return it->second; - size_t id = ids_.size(); - return ids_[str] = id; - } - - private: - typedef std::map IdMap; - IdMap ids_; -}; - -} // namespace - -std::vector CalculateOptimalEdits( - const std::vector& left, - const std::vector& right) { - std::vector left_ids, right_ids; - { - InternalStrings intern_table; - for (size_t i = 0; i < left.size(); ++i) { - left_ids.push_back(intern_table.GetId(left[i])); - } - for (size_t i = 0; i < right.size(); ++i) { - right_ids.push_back(intern_table.GetId(right[i])); - } - } - return CalculateOptimalEdits(left_ids, right_ids); -} - -namespace { - -// Helper class that holds the state for one hunk and prints it out to the -// stream. -// It reorders adds/removes when possible to group all removes before all -// adds. It also adds the hunk header before printint into the stream. -class Hunk { - public: - Hunk(size_t left_start, size_t right_start) - : left_start_(left_start), - right_start_(right_start), - adds_(), - removes_(), - common_() {} - - void PushLine(char edit, const char* line) { - switch (edit) { - case ' ': - ++common_; - FlushEdits(); - hunk_.push_back(std::make_pair(' ', line)); - break; - case '-': - ++removes_; - hunk_removes_.push_back(std::make_pair('-', line)); - break; - case '+': - ++adds_; - hunk_adds_.push_back(std::make_pair('+', line)); - break; - } - } - - void PrintTo(std::ostream* os) { - PrintHeader(os); - FlushEdits(); - for (std::list >::const_iterator it = - hunk_.begin(); - it != hunk_.end(); ++it) { - *os << it->first << it->second << "\n"; - } - } - - bool has_edits() const { return adds_ || removes_; } - - private: - void FlushEdits() { - hunk_.splice(hunk_.end(), hunk_removes_); - hunk_.splice(hunk_.end(), hunk_adds_); - } - - // Print a unified diff header for one hunk. - // The format is - // "@@ -, +, @@" - // where the left/right parts are omitted if unnecessary. - void PrintHeader(std::ostream* ss) const { - *ss << "@@ "; - if (removes_) { - *ss << "-" << left_start_ << "," << (removes_ + common_); - } - if (removes_ && adds_) { - *ss << " "; - } - if (adds_) { - *ss << "+" << right_start_ << "," << (adds_ + common_); - } - *ss << " @@\n"; - } - - size_t left_start_, right_start_; - size_t adds_, removes_, common_; - std::list > hunk_, hunk_adds_, hunk_removes_; -}; - -} // namespace - -// Create a list of diff hunks in Unified diff format. -// Each hunk has a header generated by PrintHeader above plus a body with -// lines prefixed with ' ' for no change, '-' for deletion and '+' for -// addition. -// 'context' represents the desired unchanged prefix/suffix around the diff. -// If two hunks are close enough that their contexts overlap, then they are -// joined into one hunk. -std::string CreateUnifiedDiff(const std::vector& left, - const std::vector& right, - size_t context) { - const std::vector edits = CalculateOptimalEdits(left, right); - - size_t l_i = 0, r_i = 0, edit_i = 0; - std::stringstream ss; - while (edit_i < edits.size()) { - // Find first edit. - while (edit_i < edits.size() && edits[edit_i] == kMatch) { - ++l_i; - ++r_i; - ++edit_i; - } - - // Find the first line to include in the hunk. - const size_t prefix_context = std::min(l_i, context); - Hunk hunk(l_i - prefix_context + 1, r_i - prefix_context + 1); - for (size_t i = prefix_context; i > 0; --i) { - hunk.PushLine(' ', left[l_i - i].c_str()); - } - - // Iterate the edits until we found enough suffix for the hunk or the input - // is over. - size_t n_suffix = 0; - for (; edit_i < edits.size(); ++edit_i) { - if (n_suffix >= context) { - // Continue only if the next hunk is very close. - std::vector::const_iterator it = edits.begin() + edit_i; - while (it != edits.end() && *it == kMatch) ++it; - if (it == edits.end() || (it - edits.begin()) - edit_i >= context) { - // There is no next edit or it is too far away. - break; - } - } - - EditType edit = edits[edit_i]; - // Reset count when a non match is found. - n_suffix = edit == kMatch ? n_suffix + 1 : 0; - - if (edit == kMatch || edit == kRemove || edit == kReplace) { - hunk.PushLine(edit == kMatch ? ' ' : '-', left[l_i].c_str()); - } - if (edit == kAdd || edit == kReplace) { - hunk.PushLine('+', right[r_i].c_str()); - } - - // Advance indices, depending on edit type. - l_i += edit != kAdd; - r_i += edit != kRemove; - } - - if (!hunk.has_edits()) { - // We are done. We don't want this hunk. - break; - } - - hunk.PrintTo(&ss); - } - return ss.str(); -} - -} // namespace edit_distance - -namespace { - -// The string representation of the values received in EqFailure() are already -// escaped. Split them on escaped '\n' boundaries. Leave all other escaped -// characters the same. -std::vector SplitEscapedString(const std::string& str) { - std::vector lines; - size_t start = 0, end = str.size(); - if (end > 2 && str[0] == '"' && str[end - 1] == '"') { - ++start; - --end; - } - bool escaped = false; - for (size_t i = start; i + 1 < end; ++i) { - if (escaped) { - escaped = false; - if (str[i] == 'n') { - lines.push_back(str.substr(start, i - start - 1)); - start = i + 1; - } - } else { - escaped = str[i] == '\\'; - } - } - lines.push_back(str.substr(start, end - start)); - return lines; -} - -} // namespace - -// Constructs and returns the message for an equality assertion -// (e.g. ASSERT_EQ, EXPECT_STREQ, etc) failure. -// -// The first four parameters are the expressions used in the assertion -// and their values, as strings. For example, for ASSERT_EQ(foo, bar) -// where foo is 5 and bar is 6, we have: -// -// lhs_expression: "foo" -// rhs_expression: "bar" -// lhs_value: "5" -// rhs_value: "6" -// -// The ignoring_case parameter is true iff the assertion is a -// *_STRCASEEQ*. When it's true, the string "Ignoring case" will -// be inserted into the message. -AssertionResult EqFailure(const char* lhs_expression, - const char* rhs_expression, - const std::string& lhs_value, - const std::string& rhs_value, - bool ignoring_case) { - Message msg; - msg << "Expected equality of these values:"; - msg << "\n " << lhs_expression; - if (lhs_value != lhs_expression) { - msg << "\n Which is: " << lhs_value; - } - msg << "\n " << rhs_expression; - if (rhs_value != rhs_expression) { - msg << "\n Which is: " << rhs_value; - } - - if (ignoring_case) { - msg << "\nIgnoring case"; - } - - if (!lhs_value.empty() && !rhs_value.empty()) { - const std::vector lhs_lines = - SplitEscapedString(lhs_value); - const std::vector rhs_lines = - SplitEscapedString(rhs_value); - if (lhs_lines.size() > 1 || rhs_lines.size() > 1) { - msg << "\nWith diff:\n" - << edit_distance::CreateUnifiedDiff(lhs_lines, rhs_lines); - } - } - - return AssertionFailure() << msg; -} - -// Constructs a failure message for Boolean assertions such as EXPECT_TRUE. -std::string GetBoolAssertionFailureMessage( - const AssertionResult& assertion_result, - const char* expression_text, - const char* actual_predicate_value, - const char* expected_predicate_value) { - const char* actual_message = assertion_result.message(); - Message msg; - msg << "Value of: " << expression_text - << "\n Actual: " << actual_predicate_value; - if (actual_message[0] != '\0') - msg << " (" << actual_message << ")"; - msg << "\nExpected: " << expected_predicate_value; - return msg.GetString(); -} - -// Helper function for implementing ASSERT_NEAR. -AssertionResult DoubleNearPredFormat(const char* expr1, - const char* expr2, - const char* abs_error_expr, - double val1, - double val2, - double abs_error) { - const double diff = fabs(val1 - val2); - if (diff <= abs_error) return AssertionSuccess(); - - // TODO(wan): do not print the value of an expression if it's - // already a literal. - return AssertionFailure() - << "The difference between " << expr1 << " and " << expr2 - << " is " << diff << ", which exceeds " << abs_error_expr << ", where\n" - << expr1 << " evaluates to " << val1 << ",\n" - << expr2 << " evaluates to " << val2 << ", and\n" - << abs_error_expr << " evaluates to " << abs_error << "."; -} - - -// Helper template for implementing FloatLE() and DoubleLE(). -template -AssertionResult FloatingPointLE(const char* expr1, - const char* expr2, - RawType val1, - RawType val2) { - // Returns success if val1 is less than val2, - if (val1 < val2) { - return AssertionSuccess(); - } - - // or if val1 is almost equal to val2. - const FloatingPoint lhs(val1), rhs(val2); - if (lhs.AlmostEquals(rhs)) { - return AssertionSuccess(); - } - - // Note that the above two checks will both fail if either val1 or - // val2 is NaN, as the IEEE floating-point standard requires that - // any predicate involving a NaN must return false. - - ::std::stringstream val1_ss; - val1_ss << std::setprecision(std::numeric_limits::digits10 + 2) - << val1; - - ::std::stringstream val2_ss; - val2_ss << std::setprecision(std::numeric_limits::digits10 + 2) - << val2; - - return AssertionFailure() - << "Expected: (" << expr1 << ") <= (" << expr2 << ")\n" - << " Actual: " << StringStreamToString(&val1_ss) << " vs " - << StringStreamToString(&val2_ss); -} - -} // namespace internal - -// Asserts that val1 is less than, or almost equal to, val2. Fails -// otherwise. In particular, it fails if either val1 or val2 is NaN. -AssertionResult FloatLE(const char* expr1, const char* expr2, - float val1, float val2) { - return internal::FloatingPointLE(expr1, expr2, val1, val2); -} - -// Asserts that val1 is less than, or almost equal to, val2. Fails -// otherwise. In particular, it fails if either val1 or val2 is NaN. -AssertionResult DoubleLE(const char* expr1, const char* expr2, - double val1, double val2) { - return internal::FloatingPointLE(expr1, expr2, val1, val2); -} - -namespace internal { - -// The helper function for {ASSERT|EXPECT}_EQ with int or enum -// arguments. -AssertionResult CmpHelperEQ(const char* lhs_expression, - const char* rhs_expression, - BiggestInt lhs, - BiggestInt rhs) { - if (lhs == rhs) { - return AssertionSuccess(); - } - - return EqFailure(lhs_expression, - rhs_expression, - FormatForComparisonFailureMessage(lhs, rhs), - FormatForComparisonFailureMessage(rhs, lhs), - false); -} - -// A macro for implementing the helper functions needed to implement -// ASSERT_?? and EXPECT_?? with integer or enum arguments. It is here -// just to avoid copy-and-paste of similar code. -#define GTEST_IMPL_CMP_HELPER_(op_name, op)\ -AssertionResult CmpHelper##op_name(const char* expr1, const char* expr2, \ - BiggestInt val1, BiggestInt val2) {\ - if (val1 op val2) {\ - return AssertionSuccess();\ - } else {\ - return AssertionFailure() \ - << "Expected: (" << expr1 << ") " #op " (" << expr2\ - << "), actual: " << FormatForComparisonFailureMessage(val1, val2)\ - << " vs " << FormatForComparisonFailureMessage(val2, val1);\ - }\ -} - -// Implements the helper function for {ASSERT|EXPECT}_NE with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(NE, !=) -// Implements the helper function for {ASSERT|EXPECT}_LE with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(LE, <=) -// Implements the helper function for {ASSERT|EXPECT}_LT with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(LT, < ) -// Implements the helper function for {ASSERT|EXPECT}_GE with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(GE, >=) -// Implements the helper function for {ASSERT|EXPECT}_GT with int or -// enum arguments. -GTEST_IMPL_CMP_HELPER_(GT, > ) - -#undef GTEST_IMPL_CMP_HELPER_ - -// The helper function for {ASSERT|EXPECT}_STREQ. -AssertionResult CmpHelperSTREQ(const char* lhs_expression, - const char* rhs_expression, - const char* lhs, - const char* rhs) { - if (String::CStringEquals(lhs, rhs)) { - return AssertionSuccess(); - } - - return EqFailure(lhs_expression, - rhs_expression, - PrintToString(lhs), - PrintToString(rhs), - false); -} - -// The helper function for {ASSERT|EXPECT}_STRCASEEQ. -AssertionResult CmpHelperSTRCASEEQ(const char* lhs_expression, - const char* rhs_expression, - const char* lhs, - const char* rhs) { - if (String::CaseInsensitiveCStringEquals(lhs, rhs)) { - return AssertionSuccess(); - } - - return EqFailure(lhs_expression, - rhs_expression, - PrintToString(lhs), - PrintToString(rhs), - true); -} - -// The helper function for {ASSERT|EXPECT}_STRNE. -AssertionResult CmpHelperSTRNE(const char* s1_expression, - const char* s2_expression, - const char* s1, - const char* s2) { - if (!String::CStringEquals(s1, s2)) { - return AssertionSuccess(); - } else { - return AssertionFailure() << "Expected: (" << s1_expression << ") != (" - << s2_expression << "), actual: \"" - << s1 << "\" vs \"" << s2 << "\""; - } -} - -// The helper function for {ASSERT|EXPECT}_STRCASENE. -AssertionResult CmpHelperSTRCASENE(const char* s1_expression, - const char* s2_expression, - const char* s1, - const char* s2) { - if (!String::CaseInsensitiveCStringEquals(s1, s2)) { - return AssertionSuccess(); - } else { - return AssertionFailure() - << "Expected: (" << s1_expression << ") != (" - << s2_expression << ") (ignoring case), actual: \"" - << s1 << "\" vs \"" << s2 << "\""; - } -} - -} // namespace internal - -namespace { - -// Helper functions for implementing IsSubString() and IsNotSubstring(). - -// This group of overloaded functions return true iff needle is a -// substring of haystack. NULL is considered a substring of itself -// only. - -bool IsSubstringPred(const char* needle, const char* haystack) { - if (needle == NULL || haystack == NULL) - return needle == haystack; - - return strstr(haystack, needle) != NULL; -} - -bool IsSubstringPred(const wchar_t* needle, const wchar_t* haystack) { - if (needle == NULL || haystack == NULL) - return needle == haystack; - - return wcsstr(haystack, needle) != NULL; -} - -// StringType here can be either ::std::string or ::std::wstring. -template -bool IsSubstringPred(const StringType& needle, - const StringType& haystack) { - return haystack.find(needle) != StringType::npos; -} - -// This function implements either IsSubstring() or IsNotSubstring(), -// depending on the value of the expected_to_be_substring parameter. -// StringType here can be const char*, const wchar_t*, ::std::string, -// or ::std::wstring. -template -AssertionResult IsSubstringImpl( - bool expected_to_be_substring, - const char* needle_expr, const char* haystack_expr, - const StringType& needle, const StringType& haystack) { - if (IsSubstringPred(needle, haystack) == expected_to_be_substring) - return AssertionSuccess(); - - const bool is_wide_string = sizeof(needle[0]) > 1; - const char* const begin_string_quote = is_wide_string ? "L\"" : "\""; - return AssertionFailure() - << "Value of: " << needle_expr << "\n" - << " Actual: " << begin_string_quote << needle << "\"\n" - << "Expected: " << (expected_to_be_substring ? "" : "not ") - << "a substring of " << haystack_expr << "\n" - << "Which is: " << begin_string_quote << haystack << "\""; -} - -} // namespace - -// IsSubstring() and IsNotSubstring() check whether needle is a -// substring of haystack (NULL is considered a substring of itself -// only), and return an appropriate error message when they fail. - -AssertionResult IsSubstring( - const char* needle_expr, const char* haystack_expr, - const char* needle, const char* haystack) { - return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack); -} - -AssertionResult IsSubstring( - const char* needle_expr, const char* haystack_expr, - const wchar_t* needle, const wchar_t* haystack) { - return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack); -} - -AssertionResult IsNotSubstring( - const char* needle_expr, const char* haystack_expr, - const char* needle, const char* haystack) { - return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack); -} - -AssertionResult IsNotSubstring( - const char* needle_expr, const char* haystack_expr, - const wchar_t* needle, const wchar_t* haystack) { - return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack); -} - -AssertionResult IsSubstring( - const char* needle_expr, const char* haystack_expr, - const ::std::string& needle, const ::std::string& haystack) { - return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack); -} - -AssertionResult IsNotSubstring( - const char* needle_expr, const char* haystack_expr, - const ::std::string& needle, const ::std::string& haystack) { - return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack); -} - -#if GTEST_HAS_STD_WSTRING -AssertionResult IsSubstring( - const char* needle_expr, const char* haystack_expr, - const ::std::wstring& needle, const ::std::wstring& haystack) { - return IsSubstringImpl(true, needle_expr, haystack_expr, needle, haystack); -} - -AssertionResult IsNotSubstring( - const char* needle_expr, const char* haystack_expr, - const ::std::wstring& needle, const ::std::wstring& haystack) { - return IsSubstringImpl(false, needle_expr, haystack_expr, needle, haystack); -} -#endif // GTEST_HAS_STD_WSTRING - -namespace internal { - -#if GTEST_OS_WINDOWS - -namespace { - -// Helper function for IsHRESULT{SuccessFailure} predicates -AssertionResult HRESULTFailureHelper(const char* expr, - const char* expected, - long hr) { // NOLINT -# if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_TV_TITLE - - // Windows CE doesn't support FormatMessage. - const char error_text[] = ""; - -# else - - // Looks up the human-readable system message for the HRESULT code - // and since we're not passing any params to FormatMessage, we don't - // want inserts expanded. - const DWORD kFlags = FORMAT_MESSAGE_FROM_SYSTEM | - FORMAT_MESSAGE_IGNORE_INSERTS; - const DWORD kBufSize = 4096; - // Gets the system's human readable message string for this HRESULT. - char error_text[kBufSize] = { '\0' }; - DWORD message_length = ::FormatMessageA(kFlags, - 0, // no source, we're asking system - hr, // the error - 0, // no line width restrictions - error_text, // output buffer - kBufSize, // buf size - NULL); // no arguments for inserts - // Trims tailing white space (FormatMessage leaves a trailing CR-LF) - for (; message_length && IsSpace(error_text[message_length - 1]); - --message_length) { - error_text[message_length - 1] = '\0'; - } - -# endif // GTEST_OS_WINDOWS_MOBILE - - const std::string error_hex("0x" + String::FormatHexInt(hr)); - return ::testing::AssertionFailure() - << "Expected: " << expr << " " << expected << ".\n" - << " Actual: " << error_hex << " " << error_text << "\n"; -} - -} // namespace - -AssertionResult IsHRESULTSuccess(const char* expr, long hr) { // NOLINT - if (SUCCEEDED(hr)) { - return AssertionSuccess(); - } - return HRESULTFailureHelper(expr, "succeeds", hr); -} - -AssertionResult IsHRESULTFailure(const char* expr, long hr) { // NOLINT - if (FAILED(hr)) { - return AssertionSuccess(); - } - return HRESULTFailureHelper(expr, "fails", hr); -} - -#endif // GTEST_OS_WINDOWS - -// Utility functions for encoding Unicode text (wide strings) in -// UTF-8. - -// A Unicode code-point can have up to 21 bits, and is encoded in UTF-8 -// like this: -// -// Code-point length Encoding -// 0 - 7 bits 0xxxxxxx -// 8 - 11 bits 110xxxxx 10xxxxxx -// 12 - 16 bits 1110xxxx 10xxxxxx 10xxxxxx -// 17 - 21 bits 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx - -// The maximum code-point a one-byte UTF-8 sequence can represent. -const UInt32 kMaxCodePoint1 = (static_cast(1) << 7) - 1; - -// The maximum code-point a two-byte UTF-8 sequence can represent. -const UInt32 kMaxCodePoint2 = (static_cast(1) << (5 + 6)) - 1; - -// The maximum code-point a three-byte UTF-8 sequence can represent. -const UInt32 kMaxCodePoint3 = (static_cast(1) << (4 + 2*6)) - 1; - -// The maximum code-point a four-byte UTF-8 sequence can represent. -const UInt32 kMaxCodePoint4 = (static_cast(1) << (3 + 3*6)) - 1; - -// Chops off the n lowest bits from a bit pattern. Returns the n -// lowest bits. As a side effect, the original bit pattern will be -// shifted to the right by n bits. -inline UInt32 ChopLowBits(UInt32* bits, int n) { - const UInt32 low_bits = *bits & ((static_cast(1) << n) - 1); - *bits >>= n; - return low_bits; -} - -// Converts a Unicode code point to a narrow string in UTF-8 encoding. -// code_point parameter is of type UInt32 because wchar_t may not be -// wide enough to contain a code point. -// If the code_point is not a valid Unicode code point -// (i.e. outside of Unicode range U+0 to U+10FFFF) it will be converted -// to "(Invalid Unicode 0xXXXXXXXX)". -std::string CodePointToUtf8(UInt32 code_point) { - if (code_point > kMaxCodePoint4) { - return "(Invalid Unicode 0x" + String::FormatHexInt(code_point) + ")"; - } - - char str[5]; // Big enough for the largest valid code point. - if (code_point <= kMaxCodePoint1) { - str[1] = '\0'; - str[0] = static_cast(code_point); // 0xxxxxxx - } else if (code_point <= kMaxCodePoint2) { - str[2] = '\0'; - str[1] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx - str[0] = static_cast(0xC0 | code_point); // 110xxxxx - } else if (code_point <= kMaxCodePoint3) { - str[3] = '\0'; - str[2] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx - str[1] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx - str[0] = static_cast(0xE0 | code_point); // 1110xxxx - } else { // code_point <= kMaxCodePoint4 - str[4] = '\0'; - str[3] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx - str[2] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx - str[1] = static_cast(0x80 | ChopLowBits(&code_point, 6)); // 10xxxxxx - str[0] = static_cast(0xF0 | code_point); // 11110xxx - } - return str; -} - -// The following two functions only make sense if the system -// uses UTF-16 for wide string encoding. All supported systems -// with 16 bit wchar_t (Windows, Cygwin, Symbian OS) do use UTF-16. - -// Determines if the arguments constitute UTF-16 surrogate pair -// and thus should be combined into a single Unicode code point -// using CreateCodePointFromUtf16SurrogatePair. -inline bool IsUtf16SurrogatePair(wchar_t first, wchar_t second) { - return sizeof(wchar_t) == 2 && - (first & 0xFC00) == 0xD800 && (second & 0xFC00) == 0xDC00; -} - -// Creates a Unicode code point from UTF16 surrogate pair. -inline UInt32 CreateCodePointFromUtf16SurrogatePair(wchar_t first, - wchar_t second) { - const UInt32 mask = (1 << 10) - 1; - return (sizeof(wchar_t) == 2) ? - (((first & mask) << 10) | (second & mask)) + 0x10000 : - // This function should not be called when the condition is - // false, but we provide a sensible default in case it is. - static_cast(first); -} - -// Converts a wide string to a narrow string in UTF-8 encoding. -// The wide string is assumed to have the following encoding: -// UTF-16 if sizeof(wchar_t) == 2 (on Windows, Cygwin, Symbian OS) -// UTF-32 if sizeof(wchar_t) == 4 (on Linux) -// Parameter str points to a null-terminated wide string. -// Parameter num_chars may additionally limit the number -// of wchar_t characters processed. -1 is used when the entire string -// should be processed. -// If the string contains code points that are not valid Unicode code points -// (i.e. outside of Unicode range U+0 to U+10FFFF) they will be output -// as '(Invalid Unicode 0xXXXXXXXX)'. If the string is in UTF16 encoding -// and contains invalid UTF-16 surrogate pairs, values in those pairs -// will be encoded as individual Unicode characters from Basic Normal Plane. -std::string WideStringToUtf8(const wchar_t* str, int num_chars) { - if (num_chars == -1) - num_chars = static_cast(wcslen(str)); - - ::std::stringstream stream; - for (int i = 0; i < num_chars; ++i) { - UInt32 unicode_code_point; - - if (str[i] == L'\0') { - break; - } else if (i + 1 < num_chars && IsUtf16SurrogatePair(str[i], str[i + 1])) { - unicode_code_point = CreateCodePointFromUtf16SurrogatePair(str[i], - str[i + 1]); - i++; - } else { - unicode_code_point = static_cast(str[i]); - } - - stream << CodePointToUtf8(unicode_code_point); - } - return StringStreamToString(&stream); -} - -// Converts a wide C string to an std::string using the UTF-8 encoding. -// NULL will be converted to "(null)". -std::string String::ShowWideCString(const wchar_t * wide_c_str) { - if (wide_c_str == NULL) return "(null)"; - - return internal::WideStringToUtf8(wide_c_str, -1); -} - -// Compares two wide C strings. Returns true iff they have the same -// content. -// -// Unlike wcscmp(), this function can handle NULL argument(s). A NULL -// C string is considered different to any non-NULL C string, -// including the empty string. -bool String::WideCStringEquals(const wchar_t * lhs, const wchar_t * rhs) { - if (lhs == NULL) return rhs == NULL; - - if (rhs == NULL) return false; - - return wcscmp(lhs, rhs) == 0; -} - -// Helper function for *_STREQ on wide strings. -AssertionResult CmpHelperSTREQ(const char* lhs_expression, - const char* rhs_expression, - const wchar_t* lhs, - const wchar_t* rhs) { - if (String::WideCStringEquals(lhs, rhs)) { - return AssertionSuccess(); - } - - return EqFailure(lhs_expression, - rhs_expression, - PrintToString(lhs), - PrintToString(rhs), - false); -} - -// Helper function for *_STRNE on wide strings. -AssertionResult CmpHelperSTRNE(const char* s1_expression, - const char* s2_expression, - const wchar_t* s1, - const wchar_t* s2) { - if (!String::WideCStringEquals(s1, s2)) { - return AssertionSuccess(); - } - - return AssertionFailure() << "Expected: (" << s1_expression << ") != (" - << s2_expression << "), actual: " - << PrintToString(s1) - << " vs " << PrintToString(s2); -} - -// Compares two C strings, ignoring case. Returns true iff they have -// the same content. -// -// Unlike strcasecmp(), this function can handle NULL argument(s). A -// NULL C string is considered different to any non-NULL C string, -// including the empty string. -bool String::CaseInsensitiveCStringEquals(const char * lhs, const char * rhs) { - if (lhs == NULL) - return rhs == NULL; - if (rhs == NULL) - return false; - return posix::StrCaseCmp(lhs, rhs) == 0; -} - - // Compares two wide C strings, ignoring case. Returns true iff they - // have the same content. - // - // Unlike wcscasecmp(), this function can handle NULL argument(s). - // A NULL C string is considered different to any non-NULL wide C string, - // including the empty string. - // NB: The implementations on different platforms slightly differ. - // On windows, this method uses _wcsicmp which compares according to LC_CTYPE - // environment variable. On GNU platform this method uses wcscasecmp - // which compares according to LC_CTYPE category of the current locale. - // On MacOS X, it uses towlower, which also uses LC_CTYPE category of the - // current locale. -bool String::CaseInsensitiveWideCStringEquals(const wchar_t* lhs, - const wchar_t* rhs) { - if (lhs == NULL) return rhs == NULL; - - if (rhs == NULL) return false; - -#if GTEST_OS_WINDOWS - return _wcsicmp(lhs, rhs) == 0; -#elif GTEST_OS_LINUX && !GTEST_OS_LINUX_ANDROID - return wcscasecmp(lhs, rhs) == 0; -#else - // Android, Mac OS X and Cygwin don't define wcscasecmp. - // Other unknown OSes may not define it either. - wint_t left, right; - do { - left = towlower(*lhs++); - right = towlower(*rhs++); - } while (left && left == right); - return left == right; -#endif // OS selector -} - -// Returns true iff str ends with the given suffix, ignoring case. -// Any string is considered to end with an empty suffix. -bool String::EndsWithCaseInsensitive( - const std::string& str, const std::string& suffix) { - const size_t str_len = str.length(); - const size_t suffix_len = suffix.length(); - return (str_len >= suffix_len) && - CaseInsensitiveCStringEquals(str.c_str() + str_len - suffix_len, - suffix.c_str()); -} - -// Formats an int value as "%02d". -std::string String::FormatIntWidth2(int value) { - std::stringstream ss; - ss << std::setfill('0') << std::setw(2) << value; - return ss.str(); -} - -// Formats an int value as "%X". -std::string String::FormatHexInt(int value) { - std::stringstream ss; - ss << std::hex << std::uppercase << value; - return ss.str(); -} - -// Formats a byte as "%02X". -std::string String::FormatByte(unsigned char value) { - std::stringstream ss; - ss << std::setfill('0') << std::setw(2) << std::hex << std::uppercase - << static_cast(value); - return ss.str(); -} - -// Converts the buffer in a stringstream to an std::string, converting NUL -// bytes to "\\0" along the way. -std::string StringStreamToString(::std::stringstream* ss) { - const ::std::string& str = ss->str(); - const char* const start = str.c_str(); - const char* const end = start + str.length(); - - std::string result; - result.reserve(2 * (end - start)); - for (const char* ch = start; ch != end; ++ch) { - if (*ch == '\0') { - result += "\\0"; // Replaces NUL with "\\0"; - } else { - result += *ch; - } - } - - return result; -} - -// Appends the user-supplied message to the Google-Test-generated message. -std::string AppendUserMessage(const std::string& gtest_msg, - const Message& user_msg) { - // Appends the user message if it's non-empty. - const std::string user_msg_string = user_msg.GetString(); - if (user_msg_string.empty()) { - return gtest_msg; - } - - return gtest_msg + "\n" + user_msg_string; -} - -} // namespace internal - -// class TestResult - -// Creates an empty TestResult. -TestResult::TestResult() - : death_test_count_(0), - elapsed_time_(0) { -} - -// D'tor. -TestResult::~TestResult() { -} - -// Returns the i-th test part result among all the results. i can -// range from 0 to total_part_count() - 1. If i is not in that range, -// aborts the program. -const TestPartResult& TestResult::GetTestPartResult(int i) const { - if (i < 0 || i >= total_part_count()) - internal::posix::Abort(); - return test_part_results_.at(i); -} - -// Returns the i-th test property. i can range from 0 to -// test_property_count() - 1. If i is not in that range, aborts the -// program. -const TestProperty& TestResult::GetTestProperty(int i) const { - if (i < 0 || i >= test_property_count()) - internal::posix::Abort(); - return test_properties_.at(i); -} - -// Clears the test part results. -void TestResult::ClearTestPartResults() { - test_part_results_.clear(); -} - -// Adds a test part result to the list. -void TestResult::AddTestPartResult(const TestPartResult& test_part_result) { - test_part_results_.push_back(test_part_result); -} - -// Adds a test property to the list. If a property with the same key as the -// supplied property is already represented, the value of this test_property -// replaces the old value for that key. -void TestResult::RecordProperty(const std::string& xml_element, - const TestProperty& test_property) { - if (!ValidateTestProperty(xml_element, test_property)) { - return; - } - internal::MutexLock lock(&test_properites_mutex_); - const std::vector::iterator property_with_matching_key = - std::find_if(test_properties_.begin(), test_properties_.end(), - internal::TestPropertyKeyIs(test_property.key())); - if (property_with_matching_key == test_properties_.end()) { - test_properties_.push_back(test_property); - return; - } - property_with_matching_key->SetValue(test_property.value()); -} - -// The list of reserved attributes used in the element of XML -// output. -static const char* const kReservedTestSuitesAttributes[] = { - "disabled", - "errors", - "failures", - "name", - "random_seed", - "tests", - "time", - "timestamp" -}; - -// The list of reserved attributes used in the element of XML -// output. -static const char* const kReservedTestSuiteAttributes[] = { - "disabled", - "errors", - "failures", - "name", - "tests", - "time" -}; - -// The list of reserved attributes used in the element of XML output. -static const char* const kReservedTestCaseAttributes[] = { - "classname", - "name", - "status", - "time", - "type_param", - "value_param" -}; - -template -std::vector ArrayAsVector(const char* const (&array)[kSize]) { - return std::vector(array, array + kSize); -} - -static std::vector GetReservedAttributesForElement( - const std::string& xml_element) { - if (xml_element == "testsuites") { - return ArrayAsVector(kReservedTestSuitesAttributes); - } else if (xml_element == "testsuite") { - return ArrayAsVector(kReservedTestSuiteAttributes); - } else if (xml_element == "testcase") { - return ArrayAsVector(kReservedTestCaseAttributes); - } else { - GTEST_CHECK_(false) << "Unrecognized xml_element provided: " << xml_element; - } - // This code is unreachable but some compilers may not realizes that. - return std::vector(); -} - -static std::string FormatWordList(const std::vector& words) { - Message word_list; - for (size_t i = 0; i < words.size(); ++i) { - if (i > 0 && words.size() > 2) { - word_list << ", "; - } - if (i == words.size() - 1) { - word_list << "and "; - } - word_list << "'" << words[i] << "'"; - } - return word_list.GetString(); -} - -static bool ValidateTestPropertyName( - const std::string& property_name, - const std::vector& reserved_names) { - if (std::find(reserved_names.begin(), reserved_names.end(), property_name) != - reserved_names.end()) { - ADD_FAILURE() << "Reserved key used in RecordProperty(): " << property_name - << " (" << FormatWordList(reserved_names) - << " are reserved by " << GTEST_NAME_ << ")"; - return false; - } - return true; -} - -// Adds a failure if the key is a reserved attribute of the element named -// xml_element. Returns true if the property is valid. -bool TestResult::ValidateTestProperty(const std::string& xml_element, - const TestProperty& test_property) { - return ValidateTestPropertyName(test_property.key(), - GetReservedAttributesForElement(xml_element)); -} - -// Clears the object. -void TestResult::Clear() { - test_part_results_.clear(); - test_properties_.clear(); - death_test_count_ = 0; - elapsed_time_ = 0; -} - -// Returns true iff the test failed. -bool TestResult::Failed() const { - for (int i = 0; i < total_part_count(); ++i) { - if (GetTestPartResult(i).failed()) - return true; - } - return false; -} - -// Returns true iff the test part fatally failed. -static bool TestPartFatallyFailed(const TestPartResult& result) { - return result.fatally_failed(); -} - -// Returns true iff the test fatally failed. -bool TestResult::HasFatalFailure() const { - return CountIf(test_part_results_, TestPartFatallyFailed) > 0; -} - -// Returns true iff the test part non-fatally failed. -static bool TestPartNonfatallyFailed(const TestPartResult& result) { - return result.nonfatally_failed(); -} - -// Returns true iff the test has a non-fatal failure. -bool TestResult::HasNonfatalFailure() const { - return CountIf(test_part_results_, TestPartNonfatallyFailed) > 0; -} - -// Gets the number of all test parts. This is the sum of the number -// of successful test parts and the number of failed test parts. -int TestResult::total_part_count() const { - return static_cast(test_part_results_.size()); -} - -// Returns the number of the test properties. -int TestResult::test_property_count() const { - return static_cast(test_properties_.size()); -} - -// class Test - -// Creates a Test object. - -// The c'tor saves the states of all flags. -Test::Test() - : gtest_flag_saver_(new GTEST_FLAG_SAVER_) { -} - -// The d'tor restores the states of all flags. The actual work is -// done by the d'tor of the gtest_flag_saver_ field, and thus not -// visible here. -Test::~Test() { -} - -// Sets up the test fixture. -// -// A sub-class may override this. -void Test::SetUp() { -} - -// Tears down the test fixture. -// -// A sub-class may override this. -void Test::TearDown() { -} - -// Allows user supplied key value pairs to be recorded for later output. -void Test::RecordProperty(const std::string& key, const std::string& value) { - UnitTest::GetInstance()->RecordProperty(key, value); -} - -// Allows user supplied key value pairs to be recorded for later output. -void Test::RecordProperty(const std::string& key, int value) { - Message value_message; - value_message << value; - RecordProperty(key, value_message.GetString().c_str()); -} - -namespace internal { - -void ReportFailureInUnknownLocation(TestPartResult::Type result_type, - const std::string& message) { - // This function is a friend of UnitTest and as such has access to - // AddTestPartResult. - UnitTest::GetInstance()->AddTestPartResult( - result_type, - NULL, // No info about the source file where the exception occurred. - -1, // We have no info on which line caused the exception. - message, - ""); // No stack trace, either. -} - -} // namespace internal - -// Google Test requires all tests in the same test case to use the same test -// fixture class. This function checks if the current test has the -// same fixture class as the first test in the current test case. If -// yes, it returns true; otherwise it generates a Google Test failure and -// returns false. -bool Test::HasSameFixtureClass() { - internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); - const TestCase* const test_case = impl->current_test_case(); - - // Info about the first test in the current test case. - const TestInfo* const first_test_info = test_case->test_info_list()[0]; - const internal::TypeId first_fixture_id = first_test_info->fixture_class_id_; - const char* const first_test_name = first_test_info->name(); - - // Info about the current test. - const TestInfo* const this_test_info = impl->current_test_info(); - const internal::TypeId this_fixture_id = this_test_info->fixture_class_id_; - const char* const this_test_name = this_test_info->name(); - - if (this_fixture_id != first_fixture_id) { - // Is the first test defined using TEST? - const bool first_is_TEST = first_fixture_id == internal::GetTestTypeId(); - // Is this test defined using TEST? - const bool this_is_TEST = this_fixture_id == internal::GetTestTypeId(); - - if (first_is_TEST || this_is_TEST) { - // Both TEST and TEST_F appear in same test case, which is incorrect. - // Tell the user how to fix this. - - // Gets the name of the TEST and the name of the TEST_F. Note - // that first_is_TEST and this_is_TEST cannot both be true, as - // the fixture IDs are different for the two tests. - const char* const TEST_name = - first_is_TEST ? first_test_name : this_test_name; - const char* const TEST_F_name = - first_is_TEST ? this_test_name : first_test_name; - - ADD_FAILURE() - << "All tests in the same test case must use the same test fixture\n" - << "class, so mixing TEST_F and TEST in the same test case is\n" - << "illegal. In test case " << this_test_info->test_case_name() - << ",\n" - << "test " << TEST_F_name << " is defined using TEST_F but\n" - << "test " << TEST_name << " is defined using TEST. You probably\n" - << "want to change the TEST to TEST_F or move it to another test\n" - << "case."; - } else { - // Two fixture classes with the same name appear in two different - // namespaces, which is not allowed. Tell the user how to fix this. - ADD_FAILURE() - << "All tests in the same test case must use the same test fixture\n" - << "class. However, in test case " - << this_test_info->test_case_name() << ",\n" - << "you defined test " << first_test_name - << " and test " << this_test_name << "\n" - << "using two different test fixture classes. This can happen if\n" - << "the two classes are from different namespaces or translation\n" - << "units and have the same name. You should probably rename one\n" - << "of the classes to put the tests into different test cases."; - } - return false; - } - - return true; -} - -#if GTEST_HAS_SEH - -// Adds an "exception thrown" fatal failure to the current test. This -// function returns its result via an output parameter pointer because VC++ -// prohibits creation of objects with destructors on stack in functions -// using __try (see error C2712). -static std::string* FormatSehExceptionMessage(DWORD exception_code, - const char* location) { - Message message; - message << "SEH exception with code 0x" << std::setbase(16) << - exception_code << std::setbase(10) << " thrown in " << location << "."; - - return new std::string(message.GetString()); -} - -#endif // GTEST_HAS_SEH - -namespace internal { - -#if GTEST_HAS_EXCEPTIONS - -// Adds an "exception thrown" fatal failure to the current test. -static std::string FormatCxxExceptionMessage(const char* description, - const char* location) { - Message message; - if (description != NULL) { - message << "C++ exception with description \"" << description << "\""; - } else { - message << "Unknown C++ exception"; - } - message << " thrown in " << location << "."; - - return message.GetString(); -} - -static std::string PrintTestPartResultToString( - const TestPartResult& test_part_result); - -GoogleTestFailureException::GoogleTestFailureException( - const TestPartResult& failure) - : ::std::runtime_error(PrintTestPartResultToString(failure).c_str()) {} - -#endif // GTEST_HAS_EXCEPTIONS - -// We put these helper functions in the internal namespace as IBM's xlC -// compiler rejects the code if they were declared static. - -// Runs the given method and handles SEH exceptions it throws, when -// SEH is supported; returns the 0-value for type Result in case of an -// SEH exception. (Microsoft compilers cannot handle SEH and C++ -// exceptions in the same function. Therefore, we provide a separate -// wrapper function for handling SEH exceptions.) -template -Result HandleSehExceptionsInMethodIfSupported( - T* object, Result (T::*method)(), const char* location) { -#if GTEST_HAS_SEH - __try { - return (object->*method)(); - } __except (internal::UnitTestOptions::GTestShouldProcessSEH( // NOLINT - GetExceptionCode())) { - // We create the exception message on the heap because VC++ prohibits - // creation of objects with destructors on stack in functions using __try - // (see error C2712). - std::string* exception_message = FormatSehExceptionMessage( - GetExceptionCode(), location); - internal::ReportFailureInUnknownLocation(TestPartResult::kFatalFailure, - *exception_message); - delete exception_message; - return static_cast(0); - } -#else - (void)location; - return (object->*method)(); -#endif // GTEST_HAS_SEH -} - -// Runs the given method and catches and reports C++ and/or SEH-style -// exceptions, if they are supported; returns the 0-value for type -// Result in case of an SEH exception. -template -Result HandleExceptionsInMethodIfSupported( - T* object, Result (T::*method)(), const char* location) { - // NOTE: The user code can affect the way in which Google Test handles - // exceptions by setting GTEST_FLAG(catch_exceptions), but only before - // RUN_ALL_TESTS() starts. It is technically possible to check the flag - // after the exception is caught and either report or re-throw the - // exception based on the flag's value: - // - // try { - // // Perform the test method. - // } catch (...) { - // if (GTEST_FLAG(catch_exceptions)) - // // Report the exception as failure. - // else - // throw; // Re-throws the original exception. - // } - // - // However, the purpose of this flag is to allow the program to drop into - // the debugger when the exception is thrown. On most platforms, once the - // control enters the catch block, the exception origin information is - // lost and the debugger will stop the program at the point of the - // re-throw in this function -- instead of at the point of the original - // throw statement in the code under test. For this reason, we perform - // the check early, sacrificing the ability to affect Google Test's - // exception handling in the method where the exception is thrown. - if (internal::GetUnitTestImpl()->catch_exceptions()) { -#if GTEST_HAS_EXCEPTIONS - try { - return HandleSehExceptionsInMethodIfSupported(object, method, location); - } catch (const AssertionException&) { // NOLINT - // This failure was reported already. - } catch (const internal::GoogleTestFailureException&) { // NOLINT - // This exception type can only be thrown by a failed Google - // Test assertion with the intention of letting another testing - // framework catch it. Therefore we just re-throw it. - throw; - } catch (const std::exception& e) { // NOLINT - internal::ReportFailureInUnknownLocation( - TestPartResult::kFatalFailure, - FormatCxxExceptionMessage(e.what(), location)); - } catch (...) { // NOLINT - internal::ReportFailureInUnknownLocation( - TestPartResult::kFatalFailure, - FormatCxxExceptionMessage(NULL, location)); - } - return static_cast(0); -#else - return HandleSehExceptionsInMethodIfSupported(object, method, location); -#endif // GTEST_HAS_EXCEPTIONS - } else { - return (object->*method)(); - } -} - -} // namespace internal - -// Runs the test and updates the test result. -void Test::Run() { - if (!HasSameFixtureClass()) return; - - internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); - impl->os_stack_trace_getter()->UponLeavingGTest(); - internal::HandleExceptionsInMethodIfSupported(this, &Test::SetUp, "SetUp()"); - // We will run the test only if SetUp() was successful. - if (!HasFatalFailure()) { - impl->os_stack_trace_getter()->UponLeavingGTest(); - internal::HandleExceptionsInMethodIfSupported( - this, &Test::TestBody, "the test body"); - } - - // However, we want to clean up as much as possible. Hence we will - // always call TearDown(), even if SetUp() or the test body has - // failed. - impl->os_stack_trace_getter()->UponLeavingGTest(); - internal::HandleExceptionsInMethodIfSupported( - this, &Test::TearDown, "TearDown()"); -} - -// Returns true iff the current test has a fatal failure. -bool Test::HasFatalFailure() { - return internal::GetUnitTestImpl()->current_test_result()->HasFatalFailure(); -} - -// Returns true iff the current test has a non-fatal failure. -bool Test::HasNonfatalFailure() { - return internal::GetUnitTestImpl()->current_test_result()-> - HasNonfatalFailure(); -} - -// class TestInfo - -// Constructs a TestInfo object. It assumes ownership of the test factory -// object. -TestInfo::TestInfo(const std::string& a_test_case_name, - const std::string& a_name, - const char* a_type_param, - const char* a_value_param, - internal::CodeLocation a_code_location, - internal::TypeId fixture_class_id, - internal::TestFactoryBase* factory) - : test_case_name_(a_test_case_name), - name_(a_name), - type_param_(a_type_param ? new std::string(a_type_param) : NULL), - value_param_(a_value_param ? new std::string(a_value_param) : NULL), - location_(a_code_location), - fixture_class_id_(fixture_class_id), - should_run_(false), - is_disabled_(false), - matches_filter_(false), - factory_(factory), - result_() {} - -// Destructs a TestInfo object. -TestInfo::~TestInfo() { delete factory_; } - -namespace internal { - -// Creates a new TestInfo object and registers it with Google Test; -// returns the created object. -// -// Arguments: -// -// test_case_name: name of the test case -// name: name of the test -// type_param: the name of the test's type parameter, or NULL if -// this is not a typed or a type-parameterized test. -// value_param: text representation of the test's value parameter, -// or NULL if this is not a value-parameterized test. -// code_location: code location where the test is defined -// fixture_class_id: ID of the test fixture class -// set_up_tc: pointer to the function that sets up the test case -// tear_down_tc: pointer to the function that tears down the test case -// factory: pointer to the factory that creates a test object. -// The newly created TestInfo instance will assume -// ownership of the factory object. -TestInfo* MakeAndRegisterTestInfo( - const char* test_case_name, - const char* name, - const char* type_param, - const char* value_param, - CodeLocation code_location, - TypeId fixture_class_id, - SetUpTestCaseFunc set_up_tc, - TearDownTestCaseFunc tear_down_tc, - TestFactoryBase* factory) { - TestInfo* const test_info = - new TestInfo(test_case_name, name, type_param, value_param, - code_location, fixture_class_id, factory); - GetUnitTestImpl()->AddTestInfo(set_up_tc, tear_down_tc, test_info); - return test_info; -} - -void ReportInvalidTestCaseType(const char* test_case_name, - CodeLocation code_location) { - Message errors; - errors - << "Attempted redefinition of test case " << test_case_name << ".\n" - << "All tests in the same test case must use the same test fixture\n" - << "class. However, in test case " << test_case_name << ", you tried\n" - << "to define a test using a fixture class different from the one\n" - << "used earlier. This can happen if the two fixture classes are\n" - << "from different namespaces and have the same name. You should\n" - << "probably rename one of the classes to put the tests into different\n" - << "test cases."; - - GTEST_LOG_(ERROR) << FormatFileLocation(code_location.file.c_str(), - code_location.line) - << " " << errors.GetString(); -} -} // namespace internal - -namespace { - -// A predicate that checks the test name of a TestInfo against a known -// value. -// -// This is used for implementation of the TestCase class only. We put -// it in the anonymous namespace to prevent polluting the outer -// namespace. -// -// TestNameIs is copyable. -class TestNameIs { - public: - // Constructor. - // - // TestNameIs has NO default constructor. - explicit TestNameIs(const char* name) - : name_(name) {} - - // Returns true iff the test name of test_info matches name_. - bool operator()(const TestInfo * test_info) const { - return test_info && test_info->name() == name_; - } - - private: - std::string name_; -}; - -} // namespace - -namespace internal { - -// This method expands all parameterized tests registered with macros TEST_P -// and INSTANTIATE_TEST_CASE_P into regular tests and registers those. -// This will be done just once during the program runtime. -void UnitTestImpl::RegisterParameterizedTests() { - if (!parameterized_tests_registered_) { - parameterized_test_registry_.RegisterTests(); - parameterized_tests_registered_ = true; - } -} - -} // namespace internal - -// Creates the test object, runs it, records its result, and then -// deletes it. -void TestInfo::Run() { - if (!should_run_) return; - - // Tells UnitTest where to store test result. - internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); - impl->set_current_test_info(this); - - TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater(); - - // Notifies the unit test event listeners that a test is about to start. - repeater->OnTestStart(*this); - - const TimeInMillis start = internal::GetTimeInMillis(); - - impl->os_stack_trace_getter()->UponLeavingGTest(); - - // Creates the test object. - Test* const test = internal::HandleExceptionsInMethodIfSupported( - factory_, &internal::TestFactoryBase::CreateTest, - "the test fixture's constructor"); - - // Runs the test only if the test object was created and its - // constructor didn't generate a fatal failure. - if ((test != NULL) && !Test::HasFatalFailure()) { - // This doesn't throw as all user code that can throw are wrapped into - // exception handling code. - test->Run(); - } - - // Deletes the test object. - impl->os_stack_trace_getter()->UponLeavingGTest(); - internal::HandleExceptionsInMethodIfSupported( - test, &Test::DeleteSelf_, "the test fixture's destructor"); - - result_.set_elapsed_time(internal::GetTimeInMillis() - start); - - // Notifies the unit test event listener that a test has just finished. - repeater->OnTestEnd(*this); - - // Tells UnitTest to stop associating assertion results to this - // test. - impl->set_current_test_info(NULL); -} - -// class TestCase - -// Gets the number of successful tests in this test case. -int TestCase::successful_test_count() const { - return CountIf(test_info_list_, TestPassed); -} - -// Gets the number of failed tests in this test case. -int TestCase::failed_test_count() const { - return CountIf(test_info_list_, TestFailed); -} - -// Gets the number of disabled tests that will be reported in the XML report. -int TestCase::reportable_disabled_test_count() const { - return CountIf(test_info_list_, TestReportableDisabled); -} - -// Gets the number of disabled tests in this test case. -int TestCase::disabled_test_count() const { - return CountIf(test_info_list_, TestDisabled); -} - -// Gets the number of tests to be printed in the XML report. -int TestCase::reportable_test_count() const { - return CountIf(test_info_list_, TestReportable); -} - -// Get the number of tests in this test case that should run. -int TestCase::test_to_run_count() const { - return CountIf(test_info_list_, ShouldRunTest); -} - -// Gets the number of all tests. -int TestCase::total_test_count() const { - return static_cast(test_info_list_.size()); -} - -// Creates a TestCase with the given name. -// -// Arguments: -// -// name: name of the test case -// a_type_param: the name of the test case's type parameter, or NULL if -// this is not a typed or a type-parameterized test case. -// set_up_tc: pointer to the function that sets up the test case -// tear_down_tc: pointer to the function that tears down the test case -TestCase::TestCase(const char* a_name, const char* a_type_param, - Test::SetUpTestCaseFunc set_up_tc, - Test::TearDownTestCaseFunc tear_down_tc) - : name_(a_name), - type_param_(a_type_param ? new std::string(a_type_param) : NULL), - set_up_tc_(set_up_tc), - tear_down_tc_(tear_down_tc), - should_run_(false), - elapsed_time_(0) { -} - -// Destructor of TestCase. -TestCase::~TestCase() { - // Deletes every Test in the collection. - ForEach(test_info_list_, internal::Delete); -} - -// Returns the i-th test among all the tests. i can range from 0 to -// total_test_count() - 1. If i is not in that range, returns NULL. -const TestInfo* TestCase::GetTestInfo(int i) const { - const int index = GetElementOr(test_indices_, i, -1); - return index < 0 ? NULL : test_info_list_[index]; -} - -// Returns the i-th test among all the tests. i can range from 0 to -// total_test_count() - 1. If i is not in that range, returns NULL. -TestInfo* TestCase::GetMutableTestInfo(int i) { - const int index = GetElementOr(test_indices_, i, -1); - return index < 0 ? NULL : test_info_list_[index]; -} - -// Adds a test to this test case. Will delete the test upon -// destruction of the TestCase object. -void TestCase::AddTestInfo(TestInfo * test_info) { - test_info_list_.push_back(test_info); - test_indices_.push_back(static_cast(test_indices_.size())); -} - -// Runs every test in this TestCase. -void TestCase::Run() { - if (!should_run_) return; - - internal::UnitTestImpl* const impl = internal::GetUnitTestImpl(); - impl->set_current_test_case(this); - - TestEventListener* repeater = UnitTest::GetInstance()->listeners().repeater(); - - repeater->OnTestCaseStart(*this); - impl->os_stack_trace_getter()->UponLeavingGTest(); - internal::HandleExceptionsInMethodIfSupported( - this, &TestCase::RunSetUpTestCase, "SetUpTestCase()"); - - const internal::TimeInMillis start = internal::GetTimeInMillis(); - for (int i = 0; i < total_test_count(); i++) { - GetMutableTestInfo(i)->Run(); - } - elapsed_time_ = internal::GetTimeInMillis() - start; - - impl->os_stack_trace_getter()->UponLeavingGTest(); - internal::HandleExceptionsInMethodIfSupported( - this, &TestCase::RunTearDownTestCase, "TearDownTestCase()"); - - repeater->OnTestCaseEnd(*this); - impl->set_current_test_case(NULL); -} - -// Clears the results of all tests in this test case. -void TestCase::ClearResult() { - ad_hoc_test_result_.Clear(); - ForEach(test_info_list_, TestInfo::ClearTestResult); -} - -// Shuffles the tests in this test case. -void TestCase::ShuffleTests(internal::Random* random) { - Shuffle(random, &test_indices_); -} - -// Restores the test order to before the first shuffle. -void TestCase::UnshuffleTests() { - for (size_t i = 0; i < test_indices_.size(); i++) { - test_indices_[i] = static_cast(i); - } -} - -// Formats a countable noun. Depending on its quantity, either the -// singular form or the plural form is used. e.g. -// -// FormatCountableNoun(1, "formula", "formuli") returns "1 formula". -// FormatCountableNoun(5, "book", "books") returns "5 books". -static std::string FormatCountableNoun(int count, - const char * singular_form, - const char * plural_form) { - return internal::StreamableToString(count) + " " + - (count == 1 ? singular_form : plural_form); -} - -// Formats the count of tests. -static std::string FormatTestCount(int test_count) { - return FormatCountableNoun(test_count, "test", "tests"); -} - -// Formats the count of test cases. -static std::string FormatTestCaseCount(int test_case_count) { - return FormatCountableNoun(test_case_count, "test case", "test cases"); -} - -// Converts a TestPartResult::Type enum to human-friendly string -// representation. Both kNonFatalFailure and kFatalFailure are translated -// to "Failure", as the user usually doesn't care about the difference -// between the two when viewing the test result. -static const char * TestPartResultTypeToString(TestPartResult::Type type) { - switch (type) { - case TestPartResult::kSuccess: - return "Success"; - - case TestPartResult::kNonFatalFailure: - case TestPartResult::kFatalFailure: -#ifdef _MSC_VER - return "error: "; -#else - return "Failure\n"; -#endif - default: - return "Unknown result type"; - } -} - -namespace internal { - -// Prints a TestPartResult to an std::string. -static std::string PrintTestPartResultToString( - const TestPartResult& test_part_result) { - return (Message() - << internal::FormatFileLocation(test_part_result.file_name(), - test_part_result.line_number()) - << " " << TestPartResultTypeToString(test_part_result.type()) - << test_part_result.message()).GetString(); -} - -// Prints a TestPartResult. -static void PrintTestPartResult(const TestPartResult& test_part_result) { - const std::string& result = - PrintTestPartResultToString(test_part_result); - printf("%s\n", result.c_str()); - fflush(stdout); - // If the test program runs in Visual Studio or a debugger, the - // following statements add the test part result message to the Output - // window such that the user can double-click on it to jump to the - // corresponding source code location; otherwise they do nothing. -#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE - // We don't call OutputDebugString*() on Windows Mobile, as printing - // to stdout is done by OutputDebugString() there already - we don't - // want the same message printed twice. - ::OutputDebugStringA(result.c_str()); - ::OutputDebugStringA("\n"); -#endif -} - -// class PrettyUnitTestResultPrinter - -enum GTestColor { - COLOR_DEFAULT, - COLOR_RED, - COLOR_GREEN, - COLOR_YELLOW -}; - -#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \ - !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW - -// Returns the character attribute for the given color. -static WORD GetColorAttribute(GTestColor color) { - switch (color) { - case COLOR_RED: return FOREGROUND_RED; - case COLOR_GREEN: return FOREGROUND_GREEN; - case COLOR_YELLOW: return FOREGROUND_RED | FOREGROUND_GREEN; - default: return 0; - } -} - -static int GetBitOffset(WORD color_mask) { - if (color_mask == 0) return 0; - - int bitOffset = 0; - while ((color_mask & 1) == 0) { - color_mask >>= 1; - ++bitOffset; - } - return bitOffset; -} - -static WORD GetNewColor(GTestColor color, WORD old_color_attrs) { - // Let's reuse the BG - static const WORD background_mask = BACKGROUND_BLUE | BACKGROUND_GREEN | - BACKGROUND_RED | BACKGROUND_INTENSITY; - static const WORD foreground_mask = FOREGROUND_BLUE | FOREGROUND_GREEN | - FOREGROUND_RED | FOREGROUND_INTENSITY; - const WORD existing_bg = old_color_attrs & background_mask; - - WORD new_color = - GetColorAttribute(color) | existing_bg | FOREGROUND_INTENSITY; - static const int bg_bitOffset = GetBitOffset(background_mask); - static const int fg_bitOffset = GetBitOffset(foreground_mask); - - if (((new_color & background_mask) >> bg_bitOffset) == - ((new_color & foreground_mask) >> fg_bitOffset)) { - new_color ^= FOREGROUND_INTENSITY; // invert intensity - } - return new_color; -} - -#else - -// Returns the ANSI color code for the given color. COLOR_DEFAULT is -// an invalid input. -static const char* GetAnsiColorCode(GTestColor color) { - switch (color) { - case COLOR_RED: return "1"; - case COLOR_GREEN: return "2"; - case COLOR_YELLOW: return "3"; - default: return NULL; - }; -} - -#endif // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE - -// Returns true iff Google Test should use colors in the output. -bool ShouldUseColor(bool stdout_is_tty) { - const char* const gtest_color = GTEST_FLAG(color).c_str(); - - if (String::CaseInsensitiveCStringEquals(gtest_color, "auto")) { -#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MINGW - // On Windows the TERM variable is usually not set, but the - // console there does support colors. - return stdout_is_tty; -#else - // On non-Windows platforms, we rely on the TERM variable. - const char* const term = posix::GetEnv("TERM"); - const bool term_supports_color = - String::CStringEquals(term, "xterm") || - String::CStringEquals(term, "xterm-color") || - String::CStringEquals(term, "xterm-256color") || - String::CStringEquals(term, "screen") || - String::CStringEquals(term, "screen-256color") || - String::CStringEquals(term, "tmux") || - String::CStringEquals(term, "tmux-256color") || - String::CStringEquals(term, "rxvt-unicode") || - String::CStringEquals(term, "rxvt-unicode-256color") || - String::CStringEquals(term, "linux") || - String::CStringEquals(term, "cygwin"); - return stdout_is_tty && term_supports_color; -#endif // GTEST_OS_WINDOWS - } - - return String::CaseInsensitiveCStringEquals(gtest_color, "yes") || - String::CaseInsensitiveCStringEquals(gtest_color, "true") || - String::CaseInsensitiveCStringEquals(gtest_color, "t") || - String::CStringEquals(gtest_color, "1"); - // We take "yes", "true", "t", and "1" as meaning "yes". If the - // value is neither one of these nor "auto", we treat it as "no" to - // be conservative. -} - -// Helpers for printing colored strings to stdout. Note that on Windows, we -// cannot simply emit special characters and have the terminal change colors. -// This routine must actually emit the characters rather than return a string -// that would be colored when printed, as can be done on Linux. -static void ColoredPrintf(GTestColor color, const char* fmt, ...) { - va_list args; - va_start(args, fmt); - -#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS || \ - GTEST_OS_IOS || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT - const bool use_color = AlwaysFalse(); -#else - static const bool in_color_mode = - ShouldUseColor(posix::IsATTY(posix::FileNo(stdout)) != 0); - const bool use_color = in_color_mode && (color != COLOR_DEFAULT); -#endif // GTEST_OS_WINDOWS_MOBILE || GTEST_OS_SYMBIAN || GTEST_OS_ZOS - // The '!= 0' comparison is necessary to satisfy MSVC 7.1. - - if (!use_color) { - vprintf(fmt, args); - va_end(args); - return; - } - -#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE && \ - !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT && !GTEST_OS_WINDOWS_MINGW - const HANDLE stdout_handle = GetStdHandle(STD_OUTPUT_HANDLE); - - // Gets the current text color. - CONSOLE_SCREEN_BUFFER_INFO buffer_info; - GetConsoleScreenBufferInfo(stdout_handle, &buffer_info); - const WORD old_color_attrs = buffer_info.wAttributes; - const WORD new_color = GetNewColor(color, old_color_attrs); - - // We need to flush the stream buffers into the console before each - // SetConsoleTextAttribute call lest it affect the text that is already - // printed but has not yet reached the console. - fflush(stdout); - SetConsoleTextAttribute(stdout_handle, new_color); - - vprintf(fmt, args); - - fflush(stdout); - // Restores the text color. - SetConsoleTextAttribute(stdout_handle, old_color_attrs); -#else - printf("\033[0;3%sm", GetAnsiColorCode(color)); - vprintf(fmt, args); - printf("\033[m"); // Resets the terminal to default. -#endif // GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_MOBILE - va_end(args); -} - -// Text printed in Google Test's text output and --gtest_list_tests -// output to label the type parameter and value parameter for a test. -static const char kTypeParamLabel[] = "TypeParam"; -static const char kValueParamLabel[] = "GetParam()"; - -static void PrintFullTestCommentIfPresent(const TestInfo& test_info) { - const char* const type_param = test_info.type_param(); - const char* const value_param = test_info.value_param(); - - if (type_param != NULL || value_param != NULL) { - printf(", where "); - if (type_param != NULL) { - printf("%s = %s", kTypeParamLabel, type_param); - if (value_param != NULL) - printf(" and "); - } - if (value_param != NULL) { - printf("%s = %s", kValueParamLabel, value_param); - } - } -} - -// This class implements the TestEventListener interface. -// -// Class PrettyUnitTestResultPrinter is copyable. -class PrettyUnitTestResultPrinter : public TestEventListener { - public: - PrettyUnitTestResultPrinter() {} - static void PrintTestName(const char * test_case, const char * test) { - printf("%s.%s", test_case, test); - } - - // The following methods override what's in the TestEventListener class. - virtual void OnTestProgramStart(const UnitTest& /*unit_test*/) {} - virtual void OnTestIterationStart(const UnitTest& unit_test, int iteration); - virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test); - virtual void OnEnvironmentsSetUpEnd(const UnitTest& /*unit_test*/) {} - virtual void OnTestCaseStart(const TestCase& test_case); - virtual void OnTestStart(const TestInfo& test_info); - virtual void OnTestPartResult(const TestPartResult& result); - virtual void OnTestEnd(const TestInfo& test_info); - virtual void OnTestCaseEnd(const TestCase& test_case); - virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test); - virtual void OnEnvironmentsTearDownEnd(const UnitTest& /*unit_test*/) {} - virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration); - virtual void OnTestProgramEnd(const UnitTest& /*unit_test*/) {} - - private: - static void PrintFailedTests(const UnitTest& unit_test); -}; - - // Fired before each iteration of tests starts. -void PrettyUnitTestResultPrinter::OnTestIterationStart( - const UnitTest& unit_test, int iteration) { - if (GTEST_FLAG(repeat) != 1) - printf("\nRepeating all tests (iteration %d) . . .\n\n", iteration + 1); - - const char* const filter = GTEST_FLAG(filter).c_str(); - - // Prints the filter if it's not *. This reminds the user that some - // tests may be skipped. - if (!String::CStringEquals(filter, kUniversalFilter)) { - ColoredPrintf(COLOR_YELLOW, - "Note: %s filter = %s\n", GTEST_NAME_, filter); - } - - if (internal::ShouldShard(kTestTotalShards, kTestShardIndex, false)) { - const Int32 shard_index = Int32FromEnvOrDie(kTestShardIndex, -1); - ColoredPrintf(COLOR_YELLOW, - "Note: This is test shard %d of %s.\n", - static_cast(shard_index) + 1, - internal::posix::GetEnv(kTestTotalShards)); - } - - if (GTEST_FLAG(shuffle)) { - ColoredPrintf(COLOR_YELLOW, - "Note: Randomizing tests' orders with a seed of %d .\n", - unit_test.random_seed()); - } - ColoredPrintf(COLOR_GREEN, "[==========] "); - printf("Running %s from %s.\n", - FormatTestCount(unit_test.test_to_run_count()).c_str(), - FormatTestCaseCount(unit_test.test_case_to_run_count()).c_str()); - fflush(stdout); -} - -void PrettyUnitTestResultPrinter::OnEnvironmentsSetUpStart( - const UnitTest& /*unit_test*/) { - ColoredPrintf(COLOR_GREEN, "[----------] "); - printf("Global test environment set-up.\n"); - fflush(stdout); -} - -void PrettyUnitTestResultPrinter::OnTestCaseStart(const TestCase& test_case) { - const std::string counts = - FormatCountableNoun(test_case.test_to_run_count(), "test", "tests"); - ColoredPrintf(COLOR_GREEN, "[----------] "); - printf("%s from %s", counts.c_str(), test_case.name()); - if (test_case.type_param() == NULL) { - printf("\n"); - } else { - printf(", where %s = %s\n", kTypeParamLabel, test_case.type_param()); - } - fflush(stdout); -} - -void PrettyUnitTestResultPrinter::OnTestStart(const TestInfo& test_info) { - ColoredPrintf(COLOR_GREEN, "[ RUN ] "); - PrintTestName(test_info.test_case_name(), test_info.name()); - printf("\n"); - fflush(stdout); -} - -// Called after an assertion failure. -void PrettyUnitTestResultPrinter::OnTestPartResult( - const TestPartResult& result) { - // If the test part succeeded, we don't need to do anything. - if (result.type() == TestPartResult::kSuccess) - return; - - // Print failure message from the assertion (e.g. expected this and got that). - PrintTestPartResult(result); - fflush(stdout); -} - -void PrettyUnitTestResultPrinter::OnTestEnd(const TestInfo& test_info) { - if (test_info.result()->Passed()) { - ColoredPrintf(COLOR_GREEN, "[ OK ] "); - } else { - ColoredPrintf(COLOR_RED, "[ FAILED ] "); - } - PrintTestName(test_info.test_case_name(), test_info.name()); - if (test_info.result()->Failed()) - PrintFullTestCommentIfPresent(test_info); - - if (GTEST_FLAG(print_time)) { - printf(" (%s ms)\n", internal::StreamableToString( - test_info.result()->elapsed_time()).c_str()); - } else { - printf("\n"); - } - fflush(stdout); -} - -void PrettyUnitTestResultPrinter::OnTestCaseEnd(const TestCase& test_case) { - if (!GTEST_FLAG(print_time)) return; - - const std::string counts = - FormatCountableNoun(test_case.test_to_run_count(), "test", "tests"); - ColoredPrintf(COLOR_GREEN, "[----------] "); - printf("%s from %s (%s ms total)\n\n", - counts.c_str(), test_case.name(), - internal::StreamableToString(test_case.elapsed_time()).c_str()); - fflush(stdout); -} - -void PrettyUnitTestResultPrinter::OnEnvironmentsTearDownStart( - const UnitTest& /*unit_test*/) { - ColoredPrintf(COLOR_GREEN, "[----------] "); - printf("Global test environment tear-down\n"); - fflush(stdout); -} - -// Internal helper for printing the list of failed tests. -void PrettyUnitTestResultPrinter::PrintFailedTests(const UnitTest& unit_test) { - const int failed_test_count = unit_test.failed_test_count(); - if (failed_test_count == 0) { - return; - } - - for (int i = 0; i < unit_test.total_test_case_count(); ++i) { - const TestCase& test_case = *unit_test.GetTestCase(i); - if (!test_case.should_run() || (test_case.failed_test_count() == 0)) { - continue; - } - for (int j = 0; j < test_case.total_test_count(); ++j) { - const TestInfo& test_info = *test_case.GetTestInfo(j); - if (!test_info.should_run() || test_info.result()->Passed()) { - continue; - } - ColoredPrintf(COLOR_RED, "[ FAILED ] "); - printf("%s.%s", test_case.name(), test_info.name()); - PrintFullTestCommentIfPresent(test_info); - printf("\n"); - } - } -} - -void PrettyUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test, - int /*iteration*/) { - ColoredPrintf(COLOR_GREEN, "[==========] "); - printf("%s from %s ran.", - FormatTestCount(unit_test.test_to_run_count()).c_str(), - FormatTestCaseCount(unit_test.test_case_to_run_count()).c_str()); - if (GTEST_FLAG(print_time)) { - printf(" (%s ms total)", - internal::StreamableToString(unit_test.elapsed_time()).c_str()); - } - printf("\n"); - ColoredPrintf(COLOR_GREEN, "[ PASSED ] "); - printf("%s.\n", FormatTestCount(unit_test.successful_test_count()).c_str()); - - int num_failures = unit_test.failed_test_count(); - if (!unit_test.Passed()) { - const int failed_test_count = unit_test.failed_test_count(); - ColoredPrintf(COLOR_RED, "[ FAILED ] "); - printf("%s, listed below:\n", FormatTestCount(failed_test_count).c_str()); - PrintFailedTests(unit_test); - printf("\n%2d FAILED %s\n", num_failures, - num_failures == 1 ? "TEST" : "TESTS"); - } - - int num_disabled = unit_test.reportable_disabled_test_count(); - if (num_disabled && !GTEST_FLAG(also_run_disabled_tests)) { - if (!num_failures) { - printf("\n"); // Add a spacer if no FAILURE banner is displayed. - } - ColoredPrintf(COLOR_YELLOW, - " YOU HAVE %d DISABLED %s\n\n", - num_disabled, - num_disabled == 1 ? "TEST" : "TESTS"); - } - // Ensure that Google Test output is printed before, e.g., heapchecker output. - fflush(stdout); -} - -// End PrettyUnitTestResultPrinter - -// class TestEventRepeater -// -// This class forwards events to other event listeners. -class TestEventRepeater : public TestEventListener { - public: - TestEventRepeater() : forwarding_enabled_(true) {} - virtual ~TestEventRepeater(); - void Append(TestEventListener *listener); - TestEventListener* Release(TestEventListener* listener); - - // Controls whether events will be forwarded to listeners_. Set to false - // in death test child processes. - bool forwarding_enabled() const { return forwarding_enabled_; } - void set_forwarding_enabled(bool enable) { forwarding_enabled_ = enable; } - - virtual void OnTestProgramStart(const UnitTest& unit_test); - virtual void OnTestIterationStart(const UnitTest& unit_test, int iteration); - virtual void OnEnvironmentsSetUpStart(const UnitTest& unit_test); - virtual void OnEnvironmentsSetUpEnd(const UnitTest& unit_test); - virtual void OnTestCaseStart(const TestCase& test_case); - virtual void OnTestStart(const TestInfo& test_info); - virtual void OnTestPartResult(const TestPartResult& result); - virtual void OnTestEnd(const TestInfo& test_info); - virtual void OnTestCaseEnd(const TestCase& test_case); - virtual void OnEnvironmentsTearDownStart(const UnitTest& unit_test); - virtual void OnEnvironmentsTearDownEnd(const UnitTest& unit_test); - virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration); - virtual void OnTestProgramEnd(const UnitTest& unit_test); - - private: - // Controls whether events will be forwarded to listeners_. Set to false - // in death test child processes. - bool forwarding_enabled_; - // The list of listeners that receive events. - std::vector listeners_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(TestEventRepeater); -}; - -TestEventRepeater::~TestEventRepeater() { - ForEach(listeners_, Delete); -} - -void TestEventRepeater::Append(TestEventListener *listener) { - listeners_.push_back(listener); -} - -// TODO(vladl@google.com): Factor the search functionality into Vector::Find. -TestEventListener* TestEventRepeater::Release(TestEventListener *listener) { - for (size_t i = 0; i < listeners_.size(); ++i) { - if (listeners_[i] == listener) { - listeners_.erase(listeners_.begin() + i); - return listener; - } - } - - return NULL; -} - -// Since most methods are very similar, use macros to reduce boilerplate. -// This defines a member that forwards the call to all listeners. -#define GTEST_REPEATER_METHOD_(Name, Type) \ -void TestEventRepeater::Name(const Type& parameter) { \ - if (forwarding_enabled_) { \ - for (size_t i = 0; i < listeners_.size(); i++) { \ - listeners_[i]->Name(parameter); \ - } \ - } \ -} -// This defines a member that forwards the call to all listeners in reverse -// order. -#define GTEST_REVERSE_REPEATER_METHOD_(Name, Type) \ -void TestEventRepeater::Name(const Type& parameter) { \ - if (forwarding_enabled_) { \ - for (int i = static_cast(listeners_.size()) - 1; i >= 0; i--) { \ - listeners_[i]->Name(parameter); \ - } \ - } \ -} - -GTEST_REPEATER_METHOD_(OnTestProgramStart, UnitTest) -GTEST_REPEATER_METHOD_(OnEnvironmentsSetUpStart, UnitTest) -GTEST_REPEATER_METHOD_(OnTestCaseStart, TestCase) -GTEST_REPEATER_METHOD_(OnTestStart, TestInfo) -GTEST_REPEATER_METHOD_(OnTestPartResult, TestPartResult) -GTEST_REPEATER_METHOD_(OnEnvironmentsTearDownStart, UnitTest) -GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsSetUpEnd, UnitTest) -GTEST_REVERSE_REPEATER_METHOD_(OnEnvironmentsTearDownEnd, UnitTest) -GTEST_REVERSE_REPEATER_METHOD_(OnTestEnd, TestInfo) -GTEST_REVERSE_REPEATER_METHOD_(OnTestCaseEnd, TestCase) -GTEST_REVERSE_REPEATER_METHOD_(OnTestProgramEnd, UnitTest) - -#undef GTEST_REPEATER_METHOD_ -#undef GTEST_REVERSE_REPEATER_METHOD_ - -void TestEventRepeater::OnTestIterationStart(const UnitTest& unit_test, - int iteration) { - if (forwarding_enabled_) { - for (size_t i = 0; i < listeners_.size(); i++) { - listeners_[i]->OnTestIterationStart(unit_test, iteration); - } - } -} - -void TestEventRepeater::OnTestIterationEnd(const UnitTest& unit_test, - int iteration) { - if (forwarding_enabled_) { - for (int i = static_cast(listeners_.size()) - 1; i >= 0; i--) { - listeners_[i]->OnTestIterationEnd(unit_test, iteration); - } - } -} - -// End TestEventRepeater - -// This class generates an XML output file. -class XmlUnitTestResultPrinter : public EmptyTestEventListener { - public: - explicit XmlUnitTestResultPrinter(const char* output_file); - - virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration); - - private: - // Is c a whitespace character that is normalized to a space character - // when it appears in an XML attribute value? - static bool IsNormalizableWhitespace(char c) { - return c == 0x9 || c == 0xA || c == 0xD; - } - - // May c appear in a well-formed XML document? - static bool IsValidXmlCharacter(char c) { - return IsNormalizableWhitespace(c) || c >= 0x20; - } - - // Returns an XML-escaped copy of the input string str. If - // is_attribute is true, the text is meant to appear as an attribute - // value, and normalizable whitespace is preserved by replacing it - // with character references. - static std::string EscapeXml(const std::string& str, bool is_attribute); - - // Returns the given string with all characters invalid in XML removed. - static std::string RemoveInvalidXmlCharacters(const std::string& str); - - // Convenience wrapper around EscapeXml when str is an attribute value. - static std::string EscapeXmlAttribute(const std::string& str) { - return EscapeXml(str, true); - } - - // Convenience wrapper around EscapeXml when str is not an attribute value. - static std::string EscapeXmlText(const char* str) { - return EscapeXml(str, false); - } - - // Verifies that the given attribute belongs to the given element and - // streams the attribute as XML. - static void OutputXmlAttribute(std::ostream* stream, - const std::string& element_name, - const std::string& name, - const std::string& value); - - // Streams an XML CDATA section, escaping invalid CDATA sequences as needed. - static void OutputXmlCDataSection(::std::ostream* stream, const char* data); - - // Streams an XML representation of a TestInfo object. - static void OutputXmlTestInfo(::std::ostream* stream, - const char* test_case_name, - const TestInfo& test_info); - - // Prints an XML representation of a TestCase object - static void PrintXmlTestCase(::std::ostream* stream, - const TestCase& test_case); - - // Prints an XML summary of unit_test to output stream out. - static void PrintXmlUnitTest(::std::ostream* stream, - const UnitTest& unit_test); - - // Produces a string representing the test properties in a result as space - // delimited XML attributes based on the property key="value" pairs. - // When the std::string is not empty, it includes a space at the beginning, - // to delimit this attribute from prior attributes. - static std::string TestPropertiesAsXmlAttributes(const TestResult& result); - - // Streams an XML representation of the test properties of a TestResult - // object. - static void OutputXmlTestProperties(std::ostream* stream, - const TestResult& result); - - // The output file. - const std::string output_file_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(XmlUnitTestResultPrinter); -}; - -// Creates a new XmlUnitTestResultPrinter. -XmlUnitTestResultPrinter::XmlUnitTestResultPrinter(const char* output_file) - : output_file_(output_file) { - if (output_file_.c_str() == NULL || output_file_.empty()) { - GTEST_LOG_(FATAL) << "XML output file may not be null"; - } -} - -// Called after the unit test ends. -void XmlUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test, - int /*iteration*/) { - FILE* xmlout = NULL; - FilePath output_file(output_file_); - FilePath output_dir(output_file.RemoveFileName()); - - if (output_dir.CreateDirectoriesRecursively()) { - xmlout = posix::FOpen(output_file_.c_str(), "w"); - } - if (xmlout == NULL) { - // TODO(wan): report the reason of the failure. - // - // We don't do it for now as: - // - // 1. There is no urgent need for it. - // 2. It's a bit involved to make the errno variable thread-safe on - // all three operating systems (Linux, Windows, and Mac OS). - // 3. To interpret the meaning of errno in a thread-safe way, - // we need the strerror_r() function, which is not available on - // Windows. - - GTEST_LOG_(FATAL) << "Unable to open file \"" << output_file_ << "\""; - } - std::stringstream stream; - PrintXmlUnitTest(&stream, unit_test); - fprintf(xmlout, "%s", StringStreamToString(&stream).c_str()); - fclose(xmlout); -} - -// Returns an XML-escaped copy of the input string str. If is_attribute -// is true, the text is meant to appear as an attribute value, and -// normalizable whitespace is preserved by replacing it with character -// references. -// -// Invalid XML characters in str, if any, are stripped from the output. -// It is expected that most, if not all, of the text processed by this -// module will consist of ordinary English text. -// If this module is ever modified to produce version 1.1 XML output, -// most invalid characters can be retained using character references. -// TODO(wan): It might be nice to have a minimally invasive, human-readable -// escaping scheme for invalid characters, rather than dropping them. -std::string XmlUnitTestResultPrinter::EscapeXml( - const std::string& str, bool is_attribute) { - Message m; - - for (size_t i = 0; i < str.size(); ++i) { - const char ch = str[i]; - switch (ch) { - case '<': - m << "<"; - break; - case '>': - m << ">"; - break; - case '&': - m << "&"; - break; - case '\'': - if (is_attribute) - m << "'"; - else - m << '\''; - break; - case '"': - if (is_attribute) - m << """; - else - m << '"'; - break; - default: - if (IsValidXmlCharacter(ch)) { - if (is_attribute && IsNormalizableWhitespace(ch)) - m << "&#x" << String::FormatByte(static_cast(ch)) - << ";"; - else - m << ch; - } - break; - } - } - - return m.GetString(); -} - -// Returns the given string with all characters invalid in XML removed. -// Currently invalid characters are dropped from the string. An -// alternative is to replace them with certain characters such as . or ?. -std::string XmlUnitTestResultPrinter::RemoveInvalidXmlCharacters( - const std::string& str) { - std::string output; - output.reserve(str.size()); - for (std::string::const_iterator it = str.begin(); it != str.end(); ++it) - if (IsValidXmlCharacter(*it)) - output.push_back(*it); - - return output; -} - -// The following routines generate an XML representation of a UnitTest -// object. -// -// This is how Google Test concepts map to the DTD: -// -// <-- corresponds to a UnitTest object -// <-- corresponds to a TestCase object -// <-- corresponds to a TestInfo object -// ... -// ... -// ... -// <-- individual assertion failures -// -// -// - -// Formats the given time in milliseconds as seconds. -std::string FormatTimeInMillisAsSeconds(TimeInMillis ms) { - ::std::stringstream ss; - ss << (static_cast(ms) * 1e-3); - return ss.str(); -} - -static bool PortableLocaltime(time_t seconds, struct tm* out) { -#if defined(_MSC_VER) - return localtime_s(out, &seconds) == 0; -#elif defined(__MINGW32__) || defined(__MINGW64__) - // MINGW provides neither localtime_r nor localtime_s, but uses - // Windows' localtime(), which has a thread-local tm buffer. - struct tm* tm_ptr = localtime(&seconds); // NOLINT - if (tm_ptr == NULL) - return false; - *out = *tm_ptr; - return true; -#else - return localtime_r(&seconds, out) != NULL; -#endif -} - -// Converts the given epoch time in milliseconds to a date string in the ISO -// 8601 format, without the timezone information. -std::string FormatEpochTimeInMillisAsIso8601(TimeInMillis ms) { - struct tm time_struct; - if (!PortableLocaltime(static_cast(ms / 1000), &time_struct)) - return ""; - // YYYY-MM-DDThh:mm:ss - return StreamableToString(time_struct.tm_year + 1900) + "-" + - String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" + - String::FormatIntWidth2(time_struct.tm_mday) + "T" + - String::FormatIntWidth2(time_struct.tm_hour) + ":" + - String::FormatIntWidth2(time_struct.tm_min) + ":" + - String::FormatIntWidth2(time_struct.tm_sec); -} - -// Streams an XML CDATA section, escaping invalid CDATA sequences as needed. -void XmlUnitTestResultPrinter::OutputXmlCDataSection(::std::ostream* stream, - const char* data) { - const char* segment = data; - *stream << ""); - if (next_segment != NULL) { - stream->write( - segment, static_cast(next_segment - segment)); - *stream << "]]>]]>"); - } else { - *stream << segment; - break; - } - } - *stream << "]]>"; -} - -void XmlUnitTestResultPrinter::OutputXmlAttribute( - std::ostream* stream, - const std::string& element_name, - const std::string& name, - const std::string& value) { - const std::vector& allowed_names = - GetReservedAttributesForElement(element_name); - - GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) != - allowed_names.end()) - << "Attribute " << name << " is not allowed for element <" << element_name - << ">."; - - *stream << " " << name << "=\"" << EscapeXmlAttribute(value) << "\""; -} - -// Prints an XML representation of a TestInfo object. -// TODO(wan): There is also value in printing properties with the plain printer. -void XmlUnitTestResultPrinter::OutputXmlTestInfo(::std::ostream* stream, - const char* test_case_name, - const TestInfo& test_info) { - const TestResult& result = *test_info.result(); - const std::string kTestcase = "testcase"; - - if (test_info.is_in_another_shard()) { - return; - } - - *stream << " \n"; - } - const std::string location = - internal::FormatCompilerIndependentFileLocation(part.file_name(), - part.line_number()); - const std::string summary = location + "\n" + part.summary(); - *stream << " "; - const std::string detail = location + "\n" + part.message(); - OutputXmlCDataSection(stream, RemoveInvalidXmlCharacters(detail).c_str()); - *stream << "\n"; - } - } - - if (failures == 0 && result.test_property_count() == 0) { - *stream << " />\n"; - } else { - if (failures == 0) { - *stream << ">\n"; - } - OutputXmlTestProperties(stream, result); - *stream << " \n"; - } -} - -// Prints an XML representation of a TestCase object -void XmlUnitTestResultPrinter::PrintXmlTestCase(std::ostream* stream, - const TestCase& test_case) { - const std::string kTestsuite = "testsuite"; - *stream << " <" << kTestsuite; - OutputXmlAttribute(stream, kTestsuite, "name", test_case.name()); - OutputXmlAttribute(stream, kTestsuite, "tests", - StreamableToString(test_case.reportable_test_count())); - OutputXmlAttribute(stream, kTestsuite, "failures", - StreamableToString(test_case.failed_test_count())); - OutputXmlAttribute( - stream, kTestsuite, "disabled", - StreamableToString(test_case.reportable_disabled_test_count())); - OutputXmlAttribute(stream, kTestsuite, "errors", "0"); - OutputXmlAttribute(stream, kTestsuite, "time", - FormatTimeInMillisAsSeconds(test_case.elapsed_time())); - *stream << TestPropertiesAsXmlAttributes(test_case.ad_hoc_test_result()) - << ">\n"; - - for (int i = 0; i < test_case.total_test_count(); ++i) { - if (test_case.GetTestInfo(i)->is_reportable()) - OutputXmlTestInfo(stream, test_case.name(), *test_case.GetTestInfo(i)); - } - *stream << " \n"; -} - -// Prints an XML summary of unit_test to output stream out. -void XmlUnitTestResultPrinter::PrintXmlUnitTest(std::ostream* stream, - const UnitTest& unit_test) { - const std::string kTestsuites = "testsuites"; - - *stream << "\n"; - *stream << "<" << kTestsuites; - - OutputXmlAttribute(stream, kTestsuites, "tests", - StreamableToString(unit_test.reportable_test_count())); - OutputXmlAttribute(stream, kTestsuites, "failures", - StreamableToString(unit_test.failed_test_count())); - OutputXmlAttribute( - stream, kTestsuites, "disabled", - StreamableToString(unit_test.reportable_disabled_test_count())); - OutputXmlAttribute(stream, kTestsuites, "errors", "0"); - OutputXmlAttribute( - stream, kTestsuites, "timestamp", - FormatEpochTimeInMillisAsIso8601(unit_test.start_timestamp())); - OutputXmlAttribute(stream, kTestsuites, "time", - FormatTimeInMillisAsSeconds(unit_test.elapsed_time())); - - if (GTEST_FLAG(shuffle)) { - OutputXmlAttribute(stream, kTestsuites, "random_seed", - StreamableToString(unit_test.random_seed())); - } - *stream << TestPropertiesAsXmlAttributes(unit_test.ad_hoc_test_result()); - - OutputXmlAttribute(stream, kTestsuites, "name", "AllTests"); - *stream << ">\n"; - - for (int i = 0; i < unit_test.total_test_case_count(); ++i) { - if (unit_test.GetTestCase(i)->reportable_test_count() > 0) - PrintXmlTestCase(stream, *unit_test.GetTestCase(i)); - } - *stream << "\n"; -} - -// Produces a string representing the test properties in a result as space -// delimited XML attributes based on the property key="value" pairs. -std::string XmlUnitTestResultPrinter::TestPropertiesAsXmlAttributes( - const TestResult& result) { - Message attributes; - for (int i = 0; i < result.test_property_count(); ++i) { - const TestProperty& property = result.GetTestProperty(i); - attributes << " " << property.key() << "=" - << "\"" << EscapeXmlAttribute(property.value()) << "\""; - } - return attributes.GetString(); -} - -void XmlUnitTestResultPrinter::OutputXmlTestProperties( - std::ostream* stream, const TestResult& result) { - const std::string kProperties = "properties"; - const std::string kProperty = "property"; - - if (result.test_property_count() <= 0) { - return; - } - - *stream << "<" << kProperties << ">\n"; - for (int i = 0; i < result.test_property_count(); ++i) { - const TestProperty& property = result.GetTestProperty(i); - *stream << "<" << kProperty; - *stream << " name=\"" << EscapeXmlAttribute(property.key()) << "\""; - *stream << " value=\"" << EscapeXmlAttribute(property.value()) << "\""; - *stream << "/>\n"; - } - *stream << "\n"; -} - -// End XmlUnitTestResultPrinter - - -// This class generates an JSON output file. -class JsonUnitTestResultPrinter : public EmptyTestEventListener { - public: - explicit JsonUnitTestResultPrinter(const char* output_file); - - virtual void OnTestIterationEnd(const UnitTest& unit_test, int iteration); - - private: - // Returns an JSON-escaped copy of the input string str. - static std::string EscapeJson(const std::string& str); - - //// Verifies that the given attribute belongs to the given element and - //// streams the attribute as JSON. - static void OutputJsonKey(std::ostream* stream, - const std::string& element_name, - const std::string& name, - const std::string& value, - const std::string& indent, - bool comma = true); - static void OutputJsonKey(std::ostream* stream, - const std::string& element_name, - const std::string& name, - int value, - const std::string& indent, - bool comma = true); - - // Streams a JSON representation of a TestInfo object. - static void OutputJsonTestInfo(::std::ostream* stream, - const char* test_case_name, - const TestInfo& test_info); - - // Prints a JSON representation of a TestCase object - static void PrintJsonTestCase(::std::ostream* stream, - const TestCase& test_case); - - // Prints a JSON summary of unit_test to output stream out. - static void PrintJsonUnitTest(::std::ostream* stream, - const UnitTest& unit_test); - - // Produces a string representing the test properties in a result as - // a JSON dictionary. - static std::string TestPropertiesAsJson(const TestResult& result, - const std::string& indent); - - // The output file. - const std::string output_file_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(JsonUnitTestResultPrinter); -}; - -// Creates a new JsonUnitTestResultPrinter. -JsonUnitTestResultPrinter::JsonUnitTestResultPrinter(const char* output_file) - : output_file_(output_file) { - if (output_file_.empty()) { - GTEST_LOG_(FATAL) << "JSON output file may not be null"; - } -} - -void JsonUnitTestResultPrinter::OnTestIterationEnd(const UnitTest& unit_test, - int /*iteration*/) { - FILE* jsonout = NULL; - FilePath output_file(output_file_); - FilePath output_dir(output_file.RemoveFileName()); - - if (output_dir.CreateDirectoriesRecursively()) { - jsonout = posix::FOpen(output_file_.c_str(), "w"); - } - if (jsonout == NULL) { - // TODO(phosek): report the reason of the failure. - // - // We don't do it for now as: - // - // 1. There is no urgent need for it. - // 2. It's a bit involved to make the errno variable thread-safe on - // all three operating systems (Linux, Windows, and Mac OS). - // 3. To interpret the meaning of errno in a thread-safe way, - // we need the strerror_r() function, which is not available on - // Windows. - GTEST_LOG_(FATAL) << "Unable to open file \"" - << output_file_ << "\""; - } - std::stringstream stream; - PrintJsonUnitTest(&stream, unit_test); - fprintf(jsonout, "%s", StringStreamToString(&stream).c_str()); - fclose(jsonout); -} - -// Returns an JSON-escaped copy of the input string str. -std::string JsonUnitTestResultPrinter::EscapeJson(const std::string& str) { - Message m; - - for (size_t i = 0; i < str.size(); ++i) { - const char ch = str[i]; - switch (ch) { - case '\\': - case '"': - case '/': - m << '\\' << ch; - break; - case '\b': - m << "\\b"; - break; - case '\t': - m << "\\t"; - break; - case '\n': - m << "\\n"; - break; - case '\f': - m << "\\f"; - break; - case '\r': - m << "\\r"; - break; - default: - if (ch < ' ') { - m << "\\u00" << String::FormatByte(static_cast(ch)); - } else { - m << ch; - } - break; - } - } - - return m.GetString(); -} - -// The following routines generate an JSON representation of a UnitTest -// object. - -// Formats the given time in milliseconds as seconds. -static std::string FormatTimeInMillisAsDuration(TimeInMillis ms) { - ::std::stringstream ss; - ss << (static_cast(ms) * 1e-3) << "s"; - return ss.str(); -} - -// Converts the given epoch time in milliseconds to a date string in the -// RFC3339 format, without the timezone information. -static std::string FormatEpochTimeInMillisAsRFC3339(TimeInMillis ms) { - struct tm time_struct; - if (!PortableLocaltime(static_cast(ms / 1000), &time_struct)) - return ""; - // YYYY-MM-DDThh:mm:ss - return StreamableToString(time_struct.tm_year + 1900) + "-" + - String::FormatIntWidth2(time_struct.tm_mon + 1) + "-" + - String::FormatIntWidth2(time_struct.tm_mday) + "T" + - String::FormatIntWidth2(time_struct.tm_hour) + ":" + - String::FormatIntWidth2(time_struct.tm_min) + ":" + - String::FormatIntWidth2(time_struct.tm_sec) + "Z"; -} - -static inline std::string Indent(int width) { - return std::string(width, ' '); -} - -void JsonUnitTestResultPrinter::OutputJsonKey( - std::ostream* stream, - const std::string& element_name, - const std::string& name, - const std::string& value, - const std::string& indent, - bool comma) { - const std::vector& allowed_names = - GetReservedAttributesForElement(element_name); - - GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) != - allowed_names.end()) - << "Key \"" << name << "\" is not allowed for value \"" << element_name - << "\"."; - - *stream << indent << "\"" << name << "\": \"" << EscapeJson(value) << "\""; - if (comma) - *stream << ",\n"; -} - -void JsonUnitTestResultPrinter::OutputJsonKey( - std::ostream* stream, - const std::string& element_name, - const std::string& name, - int value, - const std::string& indent, - bool comma) { - const std::vector& allowed_names = - GetReservedAttributesForElement(element_name); - - GTEST_CHECK_(std::find(allowed_names.begin(), allowed_names.end(), name) != - allowed_names.end()) - << "Key \"" << name << "\" is not allowed for value \"" << element_name - << "\"."; - - *stream << indent << "\"" << name << "\": " << StreamableToString(value); - if (comma) - *stream << ",\n"; -} - -// Prints a JSON representation of a TestInfo object. -void JsonUnitTestResultPrinter::OutputJsonTestInfo(::std::ostream* stream, - const char* test_case_name, - const TestInfo& test_info) { - const TestResult& result = *test_info.result(); - const std::string kTestcase = "testcase"; - const std::string kIndent = Indent(10); - - *stream << Indent(8) << "{\n"; - OutputJsonKey(stream, kTestcase, "name", test_info.name(), kIndent); - - if (test_info.value_param() != NULL) { - OutputJsonKey(stream, kTestcase, "value_param", - test_info.value_param(), kIndent); - } - if (test_info.type_param() != NULL) { - OutputJsonKey(stream, kTestcase, "type_param", test_info.type_param(), - kIndent); - } - - OutputJsonKey(stream, kTestcase, "status", - test_info.should_run() ? "RUN" : "NOTRUN", kIndent); - OutputJsonKey(stream, kTestcase, "time", - FormatTimeInMillisAsDuration(result.elapsed_time()), kIndent); - OutputJsonKey(stream, kTestcase, "classname", test_case_name, kIndent, false); - *stream << TestPropertiesAsJson(result, kIndent); - - int failures = 0; - for (int i = 0; i < result.total_part_count(); ++i) { - const TestPartResult& part = result.GetTestPartResult(i); - if (part.failed()) { - *stream << ",\n"; - if (++failures == 1) { - *stream << kIndent << "\"" << "failures" << "\": [\n"; - } - const std::string location = - internal::FormatCompilerIndependentFileLocation(part.file_name(), - part.line_number()); - const std::string message = EscapeJson(location + "\n" + part.message()); - *stream << kIndent << " {\n" - << kIndent << " \"failure\": \"" << message << "\",\n" - << kIndent << " \"type\": \"\"\n" - << kIndent << " }"; - } - } - - if (failures > 0) - *stream << "\n" << kIndent << "]"; - *stream << "\n" << Indent(8) << "}"; -} - -// Prints an JSON representation of a TestCase object -void JsonUnitTestResultPrinter::PrintJsonTestCase(std::ostream* stream, - const TestCase& test_case) { - const std::string kTestsuite = "testsuite"; - const std::string kIndent = Indent(6); - - *stream << Indent(4) << "{\n"; - OutputJsonKey(stream, kTestsuite, "name", test_case.name(), kIndent); - OutputJsonKey(stream, kTestsuite, "tests", test_case.reportable_test_count(), - kIndent); - OutputJsonKey(stream, kTestsuite, "failures", test_case.failed_test_count(), - kIndent); - OutputJsonKey(stream, kTestsuite, "disabled", - test_case.reportable_disabled_test_count(), kIndent); - OutputJsonKey(stream, kTestsuite, "errors", 0, kIndent); - OutputJsonKey(stream, kTestsuite, "time", - FormatTimeInMillisAsDuration(test_case.elapsed_time()), kIndent, - false); - *stream << TestPropertiesAsJson(test_case.ad_hoc_test_result(), kIndent) - << ",\n"; - - *stream << kIndent << "\"" << kTestsuite << "\": [\n"; - - bool comma = false; - for (int i = 0; i < test_case.total_test_count(); ++i) { - if (test_case.GetTestInfo(i)->is_reportable()) { - if (comma) { - *stream << ",\n"; - } else { - comma = true; - } - OutputJsonTestInfo(stream, test_case.name(), *test_case.GetTestInfo(i)); - } - } - *stream << "\n" << kIndent << "]\n" << Indent(4) << "}"; -} - -// Prints a JSON summary of unit_test to output stream out. -void JsonUnitTestResultPrinter::PrintJsonUnitTest(std::ostream* stream, - const UnitTest& unit_test) { - const std::string kTestsuites = "testsuites"; - const std::string kIndent = Indent(2); - *stream << "{\n"; - - OutputJsonKey(stream, kTestsuites, "tests", unit_test.reportable_test_count(), - kIndent); - OutputJsonKey(stream, kTestsuites, "failures", unit_test.failed_test_count(), - kIndent); - OutputJsonKey(stream, kTestsuites, "disabled", - unit_test.reportable_disabled_test_count(), kIndent); - OutputJsonKey(stream, kTestsuites, "errors", 0, kIndent); - if (GTEST_FLAG(shuffle)) { - OutputJsonKey(stream, kTestsuites, "random_seed", unit_test.random_seed(), - kIndent); - } - OutputJsonKey(stream, kTestsuites, "timestamp", - FormatEpochTimeInMillisAsRFC3339(unit_test.start_timestamp()), - kIndent); - OutputJsonKey(stream, kTestsuites, "time", - FormatTimeInMillisAsDuration(unit_test.elapsed_time()), kIndent, - false); - - *stream << TestPropertiesAsJson(unit_test.ad_hoc_test_result(), kIndent) - << ",\n"; - - OutputJsonKey(stream, kTestsuites, "name", "AllTests", kIndent); - *stream << kIndent << "\"" << kTestsuites << "\": [\n"; - - bool comma = false; - for (int i = 0; i < unit_test.total_test_case_count(); ++i) { - if (unit_test.GetTestCase(i)->reportable_test_count() > 0) { - if (comma) { - *stream << ",\n"; - } else { - comma = true; - } - PrintJsonTestCase(stream, *unit_test.GetTestCase(i)); - } - } - - *stream << "\n" << kIndent << "]\n" << "}\n"; -} - -// Produces a string representing the test properties in a result as -// a JSON dictionary. -std::string JsonUnitTestResultPrinter::TestPropertiesAsJson( - const TestResult& result, const std::string& indent) { - Message attributes; - for (int i = 0; i < result.test_property_count(); ++i) { - const TestProperty& property = result.GetTestProperty(i); - attributes << ",\n" << indent << "\"" << property.key() << "\": " - << "\"" << EscapeJson(property.value()) << "\""; - } - return attributes.GetString(); -} - -// End JsonUnitTestResultPrinter - -#if GTEST_CAN_STREAM_RESULTS_ - -// Checks if str contains '=', '&', '%' or '\n' characters. If yes, -// replaces them by "%xx" where xx is their hexadecimal value. For -// example, replaces "=" with "%3D". This algorithm is O(strlen(str)) -// in both time and space -- important as the input str may contain an -// arbitrarily long test failure message and stack trace. -std::string StreamingListener::UrlEncode(const char* str) { - std::string result; - result.reserve(strlen(str) + 1); - for (char ch = *str; ch != '\0'; ch = *++str) { - switch (ch) { - case '%': - case '=': - case '&': - case '\n': - result.append("%" + String::FormatByte(static_cast(ch))); - break; - default: - result.push_back(ch); - break; - } - } - return result; -} - -void StreamingListener::SocketWriter::MakeConnection() { - GTEST_CHECK_(sockfd_ == -1) - << "MakeConnection() can't be called when there is already a connection."; - - addrinfo hints; - memset(&hints, 0, sizeof(hints)); - hints.ai_family = AF_UNSPEC; // To allow both IPv4 and IPv6 addresses. - hints.ai_socktype = SOCK_STREAM; - addrinfo* servinfo = NULL; - - // Use the getaddrinfo() to get a linked list of IP addresses for - // the given host name. - const int error_num = getaddrinfo( - host_name_.c_str(), port_num_.c_str(), &hints, &servinfo); - if (error_num != 0) { - GTEST_LOG_(WARNING) << "stream_result_to: getaddrinfo() failed: " - << gai_strerror(error_num); - } - - // Loop through all the results and connect to the first we can. - for (addrinfo* cur_addr = servinfo; sockfd_ == -1 && cur_addr != NULL; - cur_addr = cur_addr->ai_next) { - sockfd_ = socket( - cur_addr->ai_family, cur_addr->ai_socktype, cur_addr->ai_protocol); - if (sockfd_ != -1) { - // Connect the client socket to the server socket. - if (connect(sockfd_, cur_addr->ai_addr, cur_addr->ai_addrlen) == -1) { - close(sockfd_); - sockfd_ = -1; - } - } - } - - freeaddrinfo(servinfo); // all done with this structure - - if (sockfd_ == -1) { - GTEST_LOG_(WARNING) << "stream_result_to: failed to connect to " - << host_name_ << ":" << port_num_; - } -} - -// End of class Streaming Listener -#endif // GTEST_CAN_STREAM_RESULTS__ - -// class OsStackTraceGetter - -const char* const OsStackTraceGetterInterface::kElidedFramesMarker = - "... " GTEST_NAME_ " internal frames ..."; - -std::string OsStackTraceGetter::CurrentStackTrace(int max_depth, int skip_count) - GTEST_LOCK_EXCLUDED_(mutex_) { -#if GTEST_HAS_ABSL - std::string result; - - if (max_depth <= 0) { - return result; - } - - max_depth = std::min(max_depth, kMaxStackTraceDepth); - - std::vector raw_stack(max_depth); - // Skips the frames requested by the caller, plus this function. - const int raw_stack_size = - absl::GetStackTrace(&raw_stack[0], max_depth, skip_count + 1); - - void* caller_frame = nullptr; - { - MutexLock lock(&mutex_); - caller_frame = caller_frame_; - } - - for (int i = 0; i < raw_stack_size; ++i) { - if (raw_stack[i] == caller_frame && - !GTEST_FLAG(show_internal_stack_frames)) { - // Add a marker to the trace and stop adding frames. - absl::StrAppend(&result, kElidedFramesMarker, "\n"); - break; - } - - char tmp[1024]; - const char* symbol = "(unknown)"; - if (absl::Symbolize(raw_stack[i], tmp, sizeof(tmp))) { - symbol = tmp; - } - - char line[1024]; - snprintf(line, sizeof(line), " %p: %s\n", raw_stack[i], symbol); - result += line; - } - - return result; - -#else // !GTEST_HAS_ABSL - static_cast(max_depth); - static_cast(skip_count); - return ""; -#endif // GTEST_HAS_ABSL -} - -void OsStackTraceGetter::UponLeavingGTest() GTEST_LOCK_EXCLUDED_(mutex_) { -#if GTEST_HAS_ABSL - void* caller_frame = nullptr; - if (absl::GetStackTrace(&caller_frame, 1, 3) <= 0) { - caller_frame = nullptr; - } - - MutexLock lock(&mutex_); - caller_frame_ = caller_frame; -#endif // GTEST_HAS_ABSL -} - -// A helper class that creates the premature-exit file in its -// constructor and deletes the file in its destructor. -class ScopedPrematureExitFile { - public: - explicit ScopedPrematureExitFile(const char* premature_exit_filepath) - : premature_exit_filepath_(premature_exit_filepath ? - premature_exit_filepath : "") { - // If a path to the premature-exit file is specified... - if (!premature_exit_filepath_.empty()) { - // create the file with a single "0" character in it. I/O - // errors are ignored as there's nothing better we can do and we - // don't want to fail the test because of this. - FILE* pfile = posix::FOpen(premature_exit_filepath, "w"); - fwrite("0", 1, 1, pfile); - fclose(pfile); - } - } - - ~ScopedPrematureExitFile() { - if (!premature_exit_filepath_.empty()) { - int retval = remove(premature_exit_filepath_.c_str()); - if (retval) { - GTEST_LOG_(ERROR) << "Failed to remove premature exit filepath \"" - << premature_exit_filepath_ << "\" with error " - << retval; - } - } - } - - private: - const std::string premature_exit_filepath_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(ScopedPrematureExitFile); -}; - -} // namespace internal - -// class TestEventListeners - -TestEventListeners::TestEventListeners() - : repeater_(new internal::TestEventRepeater()), - default_result_printer_(NULL), - default_xml_generator_(NULL) { -} - -TestEventListeners::~TestEventListeners() { delete repeater_; } - -// Returns the standard listener responsible for the default console -// output. Can be removed from the listeners list to shut down default -// console output. Note that removing this object from the listener list -// with Release transfers its ownership to the user. -void TestEventListeners::Append(TestEventListener* listener) { - repeater_->Append(listener); -} - -// Removes the given event listener from the list and returns it. It then -// becomes the caller's responsibility to delete the listener. Returns -// NULL if the listener is not found in the list. -TestEventListener* TestEventListeners::Release(TestEventListener* listener) { - if (listener == default_result_printer_) - default_result_printer_ = NULL; - else if (listener == default_xml_generator_) - default_xml_generator_ = NULL; - return repeater_->Release(listener); -} - -// Returns repeater that broadcasts the TestEventListener events to all -// subscribers. -TestEventListener* TestEventListeners::repeater() { return repeater_; } - -// Sets the default_result_printer attribute to the provided listener. -// The listener is also added to the listener list and previous -// default_result_printer is removed from it and deleted. The listener can -// also be NULL in which case it will not be added to the list. Does -// nothing if the previous and the current listener objects are the same. -void TestEventListeners::SetDefaultResultPrinter(TestEventListener* listener) { - if (default_result_printer_ != listener) { - // It is an error to pass this method a listener that is already in the - // list. - delete Release(default_result_printer_); - default_result_printer_ = listener; - if (listener != NULL) - Append(listener); - } -} - -// Sets the default_xml_generator attribute to the provided listener. The -// listener is also added to the listener list and previous -// default_xml_generator is removed from it and deleted. The listener can -// also be NULL in which case it will not be added to the list. Does -// nothing if the previous and the current listener objects are the same. -void TestEventListeners::SetDefaultXmlGenerator(TestEventListener* listener) { - if (default_xml_generator_ != listener) { - // It is an error to pass this method a listener that is already in the - // list. - delete Release(default_xml_generator_); - default_xml_generator_ = listener; - if (listener != NULL) - Append(listener); - } -} - -// Controls whether events will be forwarded by the repeater to the -// listeners in the list. -bool TestEventListeners::EventForwardingEnabled() const { - return repeater_->forwarding_enabled(); -} - -void TestEventListeners::SuppressEventForwarding() { - repeater_->set_forwarding_enabled(false); -} - -// class UnitTest - -// Gets the singleton UnitTest object. The first time this method is -// called, a UnitTest object is constructed and returned. Consecutive -// calls will return the same object. -// -// We don't protect this under mutex_ as a user is not supposed to -// call this before main() starts, from which point on the return -// value will never change. -UnitTest* UnitTest::GetInstance() { - // When compiled with MSVC 7.1 in optimized mode, destroying the - // UnitTest object upon exiting the program messes up the exit code, - // causing successful tests to appear failed. We have to use a - // different implementation in this case to bypass the compiler bug. - // This implementation makes the compiler happy, at the cost of - // leaking the UnitTest object. - - // CodeGear C++Builder insists on a public destructor for the - // default implementation. Use this implementation to keep good OO - // design with private destructor. - -#if (_MSC_VER == 1310 && !defined(_DEBUG)) || defined(__BORLANDC__) - static UnitTest* const instance = new UnitTest; - return instance; -#else - static UnitTest instance; - return &instance; -#endif // (_MSC_VER == 1310 && !defined(_DEBUG)) || defined(__BORLANDC__) -} - -// Gets the number of successful test cases. -int UnitTest::successful_test_case_count() const { - return impl()->successful_test_case_count(); -} - -// Gets the number of failed test cases. -int UnitTest::failed_test_case_count() const { - return impl()->failed_test_case_count(); -} - -// Gets the number of all test cases. -int UnitTest::total_test_case_count() const { - return impl()->total_test_case_count(); -} - -// Gets the number of all test cases that contain at least one test -// that should run. -int UnitTest::test_case_to_run_count() const { - return impl()->test_case_to_run_count(); -} - -// Gets the number of successful tests. -int UnitTest::successful_test_count() const { - return impl()->successful_test_count(); -} - -// Gets the number of failed tests. -int UnitTest::failed_test_count() const { return impl()->failed_test_count(); } - -// Gets the number of disabled tests that will be reported in the XML report. -int UnitTest::reportable_disabled_test_count() const { - return impl()->reportable_disabled_test_count(); -} - -// Gets the number of disabled tests. -int UnitTest::disabled_test_count() const { - return impl()->disabled_test_count(); -} - -// Gets the number of tests to be printed in the XML report. -int UnitTest::reportable_test_count() const { - return impl()->reportable_test_count(); -} - -// Gets the number of all tests. -int UnitTest::total_test_count() const { return impl()->total_test_count(); } - -// Gets the number of tests that should run. -int UnitTest::test_to_run_count() const { return impl()->test_to_run_count(); } - -// Gets the time of the test program start, in ms from the start of the -// UNIX epoch. -internal::TimeInMillis UnitTest::start_timestamp() const { - return impl()->start_timestamp(); -} - -// Gets the elapsed time, in milliseconds. -internal::TimeInMillis UnitTest::elapsed_time() const { - return impl()->elapsed_time(); -} - -// Returns true iff the unit test passed (i.e. all test cases passed). -bool UnitTest::Passed() const { return impl()->Passed(); } - -// Returns true iff the unit test failed (i.e. some test case failed -// or something outside of all tests failed). -bool UnitTest::Failed() const { return impl()->Failed(); } - -// Gets the i-th test case among all the test cases. i can range from 0 to -// total_test_case_count() - 1. If i is not in that range, returns NULL. -const TestCase* UnitTest::GetTestCase(int i) const { - return impl()->GetTestCase(i); -} - -// Returns the TestResult containing information on test failures and -// properties logged outside of individual test cases. -const TestResult& UnitTest::ad_hoc_test_result() const { - return *impl()->ad_hoc_test_result(); -} - -// Gets the i-th test case among all the test cases. i can range from 0 to -// total_test_case_count() - 1. If i is not in that range, returns NULL. -TestCase* UnitTest::GetMutableTestCase(int i) { - return impl()->GetMutableTestCase(i); -} - -// Returns the list of event listeners that can be used to track events -// inside Google Test. -TestEventListeners& UnitTest::listeners() { - return *impl()->listeners(); -} - -// Registers and returns a global test environment. When a test -// program is run, all global test environments will be set-up in the -// order they were registered. After all tests in the program have -// finished, all global test environments will be torn-down in the -// *reverse* order they were registered. -// -// The UnitTest object takes ownership of the given environment. -// -// We don't protect this under mutex_, as we only support calling it -// from the main thread. -Environment* UnitTest::AddEnvironment(Environment* env) { - if (env == NULL) { - return NULL; - } - - impl_->environments().push_back(env); - return env; -} - -// Adds a TestPartResult to the current TestResult object. All Google Test -// assertion macros (e.g. ASSERT_TRUE, EXPECT_EQ, etc) eventually call -// this to report their results. The user code should use the -// assertion macros instead of calling this directly. -void UnitTest::AddTestPartResult( - TestPartResult::Type result_type, - const char* file_name, - int line_number, - const std::string& message, - const std::string& os_stack_trace) GTEST_LOCK_EXCLUDED_(mutex_) { - Message msg; - msg << message; - - internal::MutexLock lock(&mutex_); - if (impl_->gtest_trace_stack().size() > 0) { - msg << "\n" << GTEST_NAME_ << " trace:"; - - for (int i = static_cast(impl_->gtest_trace_stack().size()); - i > 0; --i) { - const internal::TraceInfo& trace = impl_->gtest_trace_stack()[i - 1]; - msg << "\n" << internal::FormatFileLocation(trace.file, trace.line) - << " " << trace.message; - } - } - - if (os_stack_trace.c_str() != NULL && !os_stack_trace.empty()) { - msg << internal::kStackTraceMarker << os_stack_trace; - } - - const TestPartResult result = - TestPartResult(result_type, file_name, line_number, - msg.GetString().c_str()); - impl_->GetTestPartResultReporterForCurrentThread()-> - ReportTestPartResult(result); - - if (result_type != TestPartResult::kSuccess) { - // gtest_break_on_failure takes precedence over - // gtest_throw_on_failure. This allows a user to set the latter - // in the code (perhaps in order to use Google Test assertions - // with another testing framework) and specify the former on the - // command line for debugging. - if (GTEST_FLAG(break_on_failure)) { -#if GTEST_OS_WINDOWS && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT - // Using DebugBreak on Windows allows gtest to still break into a debugger - // when a failure happens and both the --gtest_break_on_failure and - // the --gtest_catch_exceptions flags are specified. - DebugBreak(); -#elif (!defined(__native_client__)) && \ - ((defined(__clang__) || defined(__GNUC__)) && \ - (defined(__x86_64__) || defined(__i386__))) - // with clang/gcc we can achieve the same effect on x86 by invoking int3 - asm("int3"); -#else - // Dereference NULL through a volatile pointer to prevent the compiler - // from removing. We use this rather than abort() or __builtin_trap() for - // portability: Symbian doesn't implement abort() well, and some debuggers - // don't correctly trap abort(). - *static_cast(NULL) = 1; -#endif // GTEST_OS_WINDOWS - } else if (GTEST_FLAG(throw_on_failure)) { -#if GTEST_HAS_EXCEPTIONS - throw internal::GoogleTestFailureException(result); -#else - // We cannot call abort() as it generates a pop-up in debug mode - // that cannot be suppressed in VC 7.1 or below. - exit(1); -#endif - } - } -} - -// Adds a TestProperty to the current TestResult object when invoked from -// inside a test, to current TestCase's ad_hoc_test_result_ when invoked -// from SetUpTestCase or TearDownTestCase, or to the global property set -// when invoked elsewhere. If the result already contains a property with -// the same key, the value will be updated. -void UnitTest::RecordProperty(const std::string& key, - const std::string& value) { - impl_->RecordProperty(TestProperty(key, value)); -} - -// Runs all tests in this UnitTest object and prints the result. -// Returns 0 if successful, or 1 otherwise. -// -// We don't protect this under mutex_, as we only support calling it -// from the main thread. -int UnitTest::Run() { - const bool in_death_test_child_process = - internal::GTEST_FLAG(internal_run_death_test).length() > 0; - - // Google Test implements this protocol for catching that a test - // program exits before returning control to Google Test: - // - // 1. Upon start, Google Test creates a file whose absolute path - // is specified by the environment variable - // TEST_PREMATURE_EXIT_FILE. - // 2. When Google Test has finished its work, it deletes the file. - // - // This allows a test runner to set TEST_PREMATURE_EXIT_FILE before - // running a Google-Test-based test program and check the existence - // of the file at the end of the test execution to see if it has - // exited prematurely. - - // If we are in the child process of a death test, don't - // create/delete the premature exit file, as doing so is unnecessary - // and will confuse the parent process. Otherwise, create/delete - // the file upon entering/leaving this function. If the program - // somehow exits before this function has a chance to return, the - // premature-exit file will be left undeleted, causing a test runner - // that understands the premature-exit-file protocol to report the - // test as having failed. - const internal::ScopedPrematureExitFile premature_exit_file( - in_death_test_child_process ? - NULL : internal::posix::GetEnv("TEST_PREMATURE_EXIT_FILE")); - - // Captures the value of GTEST_FLAG(catch_exceptions). This value will be - // used for the duration of the program. - impl()->set_catch_exceptions(GTEST_FLAG(catch_exceptions)); - -#if GTEST_HAS_SEH - // Either the user wants Google Test to catch exceptions thrown by the - // tests or this is executing in the context of death test child - // process. In either case the user does not want to see pop-up dialogs - // about crashes - they are expected. - if (impl()->catch_exceptions() || in_death_test_child_process) { -# if !GTEST_OS_WINDOWS_MOBILE && !GTEST_OS_WINDOWS_PHONE && !GTEST_OS_WINDOWS_RT - // SetErrorMode doesn't exist on CE. - SetErrorMode(SEM_FAILCRITICALERRORS | SEM_NOALIGNMENTFAULTEXCEPT | - SEM_NOGPFAULTERRORBOX | SEM_NOOPENFILEERRORBOX); -# endif // !GTEST_OS_WINDOWS_MOBILE - -# if (defined(_MSC_VER) || GTEST_OS_WINDOWS_MINGW) && !GTEST_OS_WINDOWS_MOBILE - // Death test children can be terminated with _abort(). On Windows, - // _abort() can show a dialog with a warning message. This forces the - // abort message to go to stderr instead. - _set_error_mode(_OUT_TO_STDERR); -# endif - -# if _MSC_VER >= 1400 && !GTEST_OS_WINDOWS_MOBILE - // In the debug version, Visual Studio pops up a separate dialog - // offering a choice to debug the aborted program. We need to suppress - // this dialog or it will pop up for every EXPECT/ASSERT_DEATH statement - // executed. Google Test will notify the user of any unexpected - // failure via stderr. - // - // VC++ doesn't define _set_abort_behavior() prior to the version 8.0. - // Users of prior VC versions shall suffer the agony and pain of - // clicking through the countless debug dialogs. - // TODO(vladl@google.com): find a way to suppress the abort dialog() in the - // debug mode when compiled with VC 7.1 or lower. - if (!GTEST_FLAG(break_on_failure)) - _set_abort_behavior( - 0x0, // Clear the following flags: - _WRITE_ABORT_MSG | _CALL_REPORTFAULT); // pop-up window, core dump. -# endif - } -#endif // GTEST_HAS_SEH - - return internal::HandleExceptionsInMethodIfSupported( - impl(), - &internal::UnitTestImpl::RunAllTests, - "auxiliary test code (environments or event listeners)") ? 0 : 1; -} - -// Returns the working directory when the first TEST() or TEST_F() was -// executed. -const char* UnitTest::original_working_dir() const { - return impl_->original_working_dir_.c_str(); -} - -// Returns the TestCase object for the test that's currently running, -// or NULL if no test is running. -const TestCase* UnitTest::current_test_case() const - GTEST_LOCK_EXCLUDED_(mutex_) { - internal::MutexLock lock(&mutex_); - return impl_->current_test_case(); -} - -// Returns the TestInfo object for the test that's currently running, -// or NULL if no test is running. -const TestInfo* UnitTest::current_test_info() const - GTEST_LOCK_EXCLUDED_(mutex_) { - internal::MutexLock lock(&mutex_); - return impl_->current_test_info(); -} - -// Returns the random seed used at the start of the current test run. -int UnitTest::random_seed() const { return impl_->random_seed(); } - -// Returns ParameterizedTestCaseRegistry object used to keep track of -// value-parameterized tests and instantiate and register them. -internal::ParameterizedTestCaseRegistry& - UnitTest::parameterized_test_registry() - GTEST_LOCK_EXCLUDED_(mutex_) { - return impl_->parameterized_test_registry(); -} - -// Creates an empty UnitTest. -UnitTest::UnitTest() { - impl_ = new internal::UnitTestImpl(this); -} - -// Destructor of UnitTest. -UnitTest::~UnitTest() { - delete impl_; -} - -// Pushes a trace defined by SCOPED_TRACE() on to the per-thread -// Google Test trace stack. -void UnitTest::PushGTestTrace(const internal::TraceInfo& trace) - GTEST_LOCK_EXCLUDED_(mutex_) { - internal::MutexLock lock(&mutex_); - impl_->gtest_trace_stack().push_back(trace); -} - -// Pops a trace from the per-thread Google Test trace stack. -void UnitTest::PopGTestTrace() - GTEST_LOCK_EXCLUDED_(mutex_) { - internal::MutexLock lock(&mutex_); - impl_->gtest_trace_stack().pop_back(); -} - -namespace internal { - -UnitTestImpl::UnitTestImpl(UnitTest* parent) - : parent_(parent), - GTEST_DISABLE_MSC_WARNINGS_PUSH_(4355 /* using this in initializer */) - default_global_test_part_result_reporter_(this), - default_per_thread_test_part_result_reporter_(this), - GTEST_DISABLE_MSC_WARNINGS_POP_() - global_test_part_result_repoter_( - &default_global_test_part_result_reporter_), - per_thread_test_part_result_reporter_( - &default_per_thread_test_part_result_reporter_), - parameterized_test_registry_(), - parameterized_tests_registered_(false), - last_death_test_case_(-1), - current_test_case_(NULL), - current_test_info_(NULL), - ad_hoc_test_result_(), - os_stack_trace_getter_(NULL), - post_flag_parse_init_performed_(false), - random_seed_(0), // Will be overridden by the flag before first use. - random_(0), // Will be reseeded before first use. - start_timestamp_(0), - elapsed_time_(0), -#if GTEST_HAS_DEATH_TEST - death_test_factory_(new DefaultDeathTestFactory), -#endif - // Will be overridden by the flag before first use. - catch_exceptions_(false) { - listeners()->SetDefaultResultPrinter(new PrettyUnitTestResultPrinter); -} - -UnitTestImpl::~UnitTestImpl() { - // Deletes every TestCase. - ForEach(test_cases_, internal::Delete); - - // Deletes every Environment. - ForEach(environments_, internal::Delete); - - delete os_stack_trace_getter_; -} - -// Adds a TestProperty to the current TestResult object when invoked in a -// context of a test, to current test case's ad_hoc_test_result when invoke -// from SetUpTestCase/TearDownTestCase, or to the global property set -// otherwise. If the result already contains a property with the same key, -// the value will be updated. -void UnitTestImpl::RecordProperty(const TestProperty& test_property) { - std::string xml_element; - TestResult* test_result; // TestResult appropriate for property recording. - - if (current_test_info_ != NULL) { - xml_element = "testcase"; - test_result = &(current_test_info_->result_); - } else if (current_test_case_ != NULL) { - xml_element = "testsuite"; - test_result = &(current_test_case_->ad_hoc_test_result_); - } else { - xml_element = "testsuites"; - test_result = &ad_hoc_test_result_; - } - test_result->RecordProperty(xml_element, test_property); -} - -#if GTEST_HAS_DEATH_TEST -// Disables event forwarding if the control is currently in a death test -// subprocess. Must not be called before InitGoogleTest. -void UnitTestImpl::SuppressTestEventsIfInSubprocess() { - if (internal_run_death_test_flag_.get() != NULL) - listeners()->SuppressEventForwarding(); -} -#endif // GTEST_HAS_DEATH_TEST - -// Initializes event listeners performing XML output as specified by -// UnitTestOptions. Must not be called before InitGoogleTest. -void UnitTestImpl::ConfigureXmlOutput() { - const std::string& output_format = UnitTestOptions::GetOutputFormat(); - if (output_format == "xml") { - listeners()->SetDefaultXmlGenerator(new XmlUnitTestResultPrinter( - UnitTestOptions::GetAbsolutePathToOutputFile().c_str())); - } else if (output_format == "json") { - listeners()->SetDefaultXmlGenerator(new JsonUnitTestResultPrinter( - UnitTestOptions::GetAbsolutePathToOutputFile().c_str())); - } else if (output_format != "") { - GTEST_LOG_(WARNING) << "WARNING: unrecognized output format \"" - << output_format << "\" ignored."; - } -} - -#if GTEST_CAN_STREAM_RESULTS_ -// Initializes event listeners for streaming test results in string form. -// Must not be called before InitGoogleTest. -void UnitTestImpl::ConfigureStreamingOutput() { - const std::string& target = GTEST_FLAG(stream_result_to); - if (!target.empty()) { - const size_t pos = target.find(':'); - if (pos != std::string::npos) { - listeners()->Append(new StreamingListener(target.substr(0, pos), - target.substr(pos+1))); - } else { - GTEST_LOG_(WARNING) << "unrecognized streaming target \"" << target - << "\" ignored."; - } - } -} -#endif // GTEST_CAN_STREAM_RESULTS_ - -// Performs initialization dependent upon flag values obtained in -// ParseGoogleTestFlagsOnly. Is called from InitGoogleTest after the call to -// ParseGoogleTestFlagsOnly. In case a user neglects to call InitGoogleTest -// this function is also called from RunAllTests. Since this function can be -// called more than once, it has to be idempotent. -void UnitTestImpl::PostFlagParsingInit() { - // Ensures that this function does not execute more than once. - if (!post_flag_parse_init_performed_) { - post_flag_parse_init_performed_ = true; - -#if defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_) - // Register to send notifications about key process state changes. - listeners()->Append(new GTEST_CUSTOM_TEST_EVENT_LISTENER_()); -#endif // defined(GTEST_CUSTOM_TEST_EVENT_LISTENER_) - -#if GTEST_HAS_DEATH_TEST - InitDeathTestSubprocessControlInfo(); - SuppressTestEventsIfInSubprocess(); -#endif // GTEST_HAS_DEATH_TEST - - // Registers parameterized tests. This makes parameterized tests - // available to the UnitTest reflection API without running - // RUN_ALL_TESTS. - RegisterParameterizedTests(); - - // Configures listeners for XML output. This makes it possible for users - // to shut down the default XML output before invoking RUN_ALL_TESTS. - ConfigureXmlOutput(); - -#if GTEST_CAN_STREAM_RESULTS_ - // Configures listeners for streaming test results to the specified server. - ConfigureStreamingOutput(); -#endif // GTEST_CAN_STREAM_RESULTS_ - -#if GTEST_HAS_ABSL - if (GTEST_FLAG(install_failure_signal_handler)) { - absl::FailureSignalHandlerOptions options; - absl::InstallFailureSignalHandler(options); - } -#endif // GTEST_HAS_ABSL - } -} - -// A predicate that checks the name of a TestCase against a known -// value. -// -// This is used for implementation of the UnitTest class only. We put -// it in the anonymous namespace to prevent polluting the outer -// namespace. -// -// TestCaseNameIs is copyable. -class TestCaseNameIs { - public: - // Constructor. - explicit TestCaseNameIs(const std::string& name) - : name_(name) {} - - // Returns true iff the name of test_case matches name_. - bool operator()(const TestCase* test_case) const { - return test_case != NULL && strcmp(test_case->name(), name_.c_str()) == 0; - } - - private: - std::string name_; -}; - -// Finds and returns a TestCase with the given name. If one doesn't -// exist, creates one and returns it. It's the CALLER'S -// RESPONSIBILITY to ensure that this function is only called WHEN THE -// TESTS ARE NOT SHUFFLED. -// -// Arguments: -// -// test_case_name: name of the test case -// type_param: the name of the test case's type parameter, or NULL if -// this is not a typed or a type-parameterized test case. -// set_up_tc: pointer to the function that sets up the test case -// tear_down_tc: pointer to the function that tears down the test case -TestCase* UnitTestImpl::GetTestCase(const char* test_case_name, - const char* type_param, - Test::SetUpTestCaseFunc set_up_tc, - Test::TearDownTestCaseFunc tear_down_tc) { - // Can we find a TestCase with the given name? - const std::vector::const_reverse_iterator test_case = - std::find_if(test_cases_.rbegin(), test_cases_.rend(), - TestCaseNameIs(test_case_name)); - - if (test_case != test_cases_.rend()) - return *test_case; - - // No. Let's create one. - TestCase* const new_test_case = - new TestCase(test_case_name, type_param, set_up_tc, tear_down_tc); - - // Is this a death test case? - if (internal::UnitTestOptions::MatchesFilter(test_case_name, - kDeathTestCaseFilter)) { - // Yes. Inserts the test case after the last death test case - // defined so far. This only works when the test cases haven't - // been shuffled. Otherwise we may end up running a death test - // after a non-death test. - ++last_death_test_case_; - test_cases_.insert(test_cases_.begin() + last_death_test_case_, - new_test_case); - } else { - // No. Appends to the end of the list. - test_cases_.push_back(new_test_case); - } - - test_case_indices_.push_back(static_cast(test_case_indices_.size())); - return new_test_case; -} - -// Helpers for setting up / tearing down the given environment. They -// are for use in the ForEach() function. -static void SetUpEnvironment(Environment* env) { env->SetUp(); } -static void TearDownEnvironment(Environment* env) { env->TearDown(); } - -// Runs all tests in this UnitTest object, prints the result, and -// returns true if all tests are successful. If any exception is -// thrown during a test, the test is considered to be failed, but the -// rest of the tests will still be run. -// -// When parameterized tests are enabled, it expands and registers -// parameterized tests first in RegisterParameterizedTests(). -// All other functions called from RunAllTests() may safely assume that -// parameterized tests are ready to be counted and run. -bool UnitTestImpl::RunAllTests() { - // True iff Google Test is initialized before RUN_ALL_TESTS() is called. - const bool gtest_is_initialized_before_run_all_tests = GTestIsInitialized(); - - // Do not run any test if the --help flag was specified. - if (g_help_flag) - return true; - - // Repeats the call to the post-flag parsing initialization in case the - // user didn't call InitGoogleTest. - PostFlagParsingInit(); - - // Even if sharding is not on, test runners may want to use the - // GTEST_SHARD_STATUS_FILE to query whether the test supports the sharding - // protocol. - internal::WriteToShardStatusFileIfNeeded(); - - // True iff we are in a subprocess for running a thread-safe-style - // death test. - bool in_subprocess_for_death_test = false; - -#if GTEST_HAS_DEATH_TEST - in_subprocess_for_death_test = (internal_run_death_test_flag_.get() != NULL); -# if defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_) - if (in_subprocess_for_death_test) { - GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_(); - } -# endif // defined(GTEST_EXTRA_DEATH_TEST_CHILD_SETUP_) -#endif // GTEST_HAS_DEATH_TEST - - const bool should_shard = ShouldShard(kTestTotalShards, kTestShardIndex, - in_subprocess_for_death_test); - - // Compares the full test names with the filter to decide which - // tests to run. - const bool has_tests_to_run = FilterTests(should_shard - ? HONOR_SHARDING_PROTOCOL - : IGNORE_SHARDING_PROTOCOL) > 0; - - // Lists the tests and exits if the --gtest_list_tests flag was specified. - if (GTEST_FLAG(list_tests)) { - // This must be called *after* FilterTests() has been called. - ListTestsMatchingFilter(); - return true; - } - - random_seed_ = GTEST_FLAG(shuffle) ? - GetRandomSeedFromFlag(GTEST_FLAG(random_seed)) : 0; - - // True iff at least one test has failed. - bool failed = false; - - TestEventListener* repeater = listeners()->repeater(); - - start_timestamp_ = GetTimeInMillis(); - repeater->OnTestProgramStart(*parent_); - - // How many times to repeat the tests? We don't want to repeat them - // when we are inside the subprocess of a death test. - const int repeat = in_subprocess_for_death_test ? 1 : GTEST_FLAG(repeat); - // Repeats forever if the repeat count is negative. - const bool forever = repeat < 0; - for (int i = 0; forever || i != repeat; i++) { - // We want to preserve failures generated by ad-hoc test - // assertions executed before RUN_ALL_TESTS(). - ClearNonAdHocTestResult(); - - const TimeInMillis start = GetTimeInMillis(); - - // Shuffles test cases and tests if requested. - if (has_tests_to_run && GTEST_FLAG(shuffle)) { - random()->Reseed(random_seed_); - // This should be done before calling OnTestIterationStart(), - // such that a test event listener can see the actual test order - // in the event. - ShuffleTests(); - } - - // Tells the unit test event listeners that the tests are about to start. - repeater->OnTestIterationStart(*parent_, i); - - // Runs each test case if there is at least one test to run. - if (has_tests_to_run) { - // Sets up all environments beforehand. - repeater->OnEnvironmentsSetUpStart(*parent_); - ForEach(environments_, SetUpEnvironment); - repeater->OnEnvironmentsSetUpEnd(*parent_); - - // Runs the tests only if there was no fatal failure during global - // set-up. - if (!Test::HasFatalFailure()) { - for (int test_index = 0; test_index < total_test_case_count(); - test_index++) { - GetMutableTestCase(test_index)->Run(); - } - } - - // Tears down all environments in reverse order afterwards. - repeater->OnEnvironmentsTearDownStart(*parent_); - std::for_each(environments_.rbegin(), environments_.rend(), - TearDownEnvironment); - repeater->OnEnvironmentsTearDownEnd(*parent_); - } - - elapsed_time_ = GetTimeInMillis() - start; - - // Tells the unit test event listener that the tests have just finished. - repeater->OnTestIterationEnd(*parent_, i); - - // Gets the result and clears it. - if (!Passed()) { - failed = true; - } - - // Restores the original test order after the iteration. This - // allows the user to quickly repro a failure that happens in the - // N-th iteration without repeating the first (N - 1) iterations. - // This is not enclosed in "if (GTEST_FLAG(shuffle)) { ... }", in - // case the user somehow changes the value of the flag somewhere - // (it's always safe to unshuffle the tests). - UnshuffleTests(); - - if (GTEST_FLAG(shuffle)) { - // Picks a new random seed for each iteration. - random_seed_ = GetNextRandomSeed(random_seed_); - } - } - - repeater->OnTestProgramEnd(*parent_); - - if (!gtest_is_initialized_before_run_all_tests) { - ColoredPrintf( - COLOR_RED, - "\nIMPORTANT NOTICE - DO NOT IGNORE:\n" - "This test program did NOT call " GTEST_INIT_GOOGLE_TEST_NAME_ - "() before calling RUN_ALL_TESTS(). This is INVALID. Soon " GTEST_NAME_ - " will start to enforce the valid usage. " - "Please fix it ASAP, or IT WILL START TO FAIL.\n"); // NOLINT -#if GTEST_FOR_GOOGLE_ - ColoredPrintf(COLOR_RED, - "For more details, see http://wiki/Main/ValidGUnitMain.\n"); -#endif // GTEST_FOR_GOOGLE_ - } - - return !failed; -} - -// Reads the GTEST_SHARD_STATUS_FILE environment variable, and creates the file -// if the variable is present. If a file already exists at this location, this -// function will write over it. If the variable is present, but the file cannot -// be created, prints an error and exits. -void WriteToShardStatusFileIfNeeded() { - const char* const test_shard_file = posix::GetEnv(kTestShardStatusFile); - if (test_shard_file != NULL) { - FILE* const file = posix::FOpen(test_shard_file, "w"); - if (file == NULL) { - ColoredPrintf(COLOR_RED, - "Could not write to the test shard status file \"%s\" " - "specified by the %s environment variable.\n", - test_shard_file, kTestShardStatusFile); - fflush(stdout); - exit(EXIT_FAILURE); - } - fclose(file); - } -} - -// Checks whether sharding is enabled by examining the relevant -// environment variable values. If the variables are present, -// but inconsistent (i.e., shard_index >= total_shards), prints -// an error and exits. If in_subprocess_for_death_test, sharding is -// disabled because it must only be applied to the original test -// process. Otherwise, we could filter out death tests we intended to execute. -bool ShouldShard(const char* total_shards_env, - const char* shard_index_env, - bool in_subprocess_for_death_test) { - if (in_subprocess_for_death_test) { - return false; - } - - const Int32 total_shards = Int32FromEnvOrDie(total_shards_env, -1); - const Int32 shard_index = Int32FromEnvOrDie(shard_index_env, -1); - - if (total_shards == -1 && shard_index == -1) { - return false; - } else if (total_shards == -1 && shard_index != -1) { - const Message msg = Message() - << "Invalid environment variables: you have " - << kTestShardIndex << " = " << shard_index - << ", but have left " << kTestTotalShards << " unset.\n"; - ColoredPrintf(COLOR_RED, msg.GetString().c_str()); - fflush(stdout); - exit(EXIT_FAILURE); - } else if (total_shards != -1 && shard_index == -1) { - const Message msg = Message() - << "Invalid environment variables: you have " - << kTestTotalShards << " = " << total_shards - << ", but have left " << kTestShardIndex << " unset.\n"; - ColoredPrintf(COLOR_RED, msg.GetString().c_str()); - fflush(stdout); - exit(EXIT_FAILURE); - } else if (shard_index < 0 || shard_index >= total_shards) { - const Message msg = Message() - << "Invalid environment variables: we require 0 <= " - << kTestShardIndex << " < " << kTestTotalShards - << ", but you have " << kTestShardIndex << "=" << shard_index - << ", " << kTestTotalShards << "=" << total_shards << ".\n"; - ColoredPrintf(COLOR_RED, msg.GetString().c_str()); - fflush(stdout); - exit(EXIT_FAILURE); - } - - return total_shards > 1; -} - -// Parses the environment variable var as an Int32. If it is unset, -// returns default_val. If it is not an Int32, prints an error -// and aborts. -Int32 Int32FromEnvOrDie(const char* var, Int32 default_val) { - const char* str_val = posix::GetEnv(var); - if (str_val == NULL) { - return default_val; - } - - Int32 result; - if (!ParseInt32(Message() << "The value of environment variable " << var, - str_val, &result)) { - exit(EXIT_FAILURE); - } - return result; -} - -// Given the total number of shards, the shard index, and the test id, -// returns true iff the test should be run on this shard. The test id is -// some arbitrary but unique non-negative integer assigned to each test -// method. Assumes that 0 <= shard_index < total_shards. -bool ShouldRunTestOnShard(int total_shards, int shard_index, int test_id) { - return (test_id % total_shards) == shard_index; -} - -// Compares the name of each test with the user-specified filter to -// decide whether the test should be run, then records the result in -// each TestCase and TestInfo object. -// If shard_tests == true, further filters tests based on sharding -// variables in the environment - see -// https://github.com/google/googletest/blob/master/googletest/docs/advanced.md -// . Returns the number of tests that should run. -int UnitTestImpl::FilterTests(ReactionToSharding shard_tests) { - const Int32 total_shards = shard_tests == HONOR_SHARDING_PROTOCOL ? - Int32FromEnvOrDie(kTestTotalShards, -1) : -1; - const Int32 shard_index = shard_tests == HONOR_SHARDING_PROTOCOL ? - Int32FromEnvOrDie(kTestShardIndex, -1) : -1; - - // num_runnable_tests are the number of tests that will - // run across all shards (i.e., match filter and are not disabled). - // num_selected_tests are the number of tests to be run on - // this shard. - int num_runnable_tests = 0; - int num_selected_tests = 0; - for (size_t i = 0; i < test_cases_.size(); i++) { - TestCase* const test_case = test_cases_[i]; - const std::string &test_case_name = test_case->name(); - test_case->set_should_run(false); - - for (size_t j = 0; j < test_case->test_info_list().size(); j++) { - TestInfo* const test_info = test_case->test_info_list()[j]; - const std::string test_name(test_info->name()); - // A test is disabled if test case name or test name matches - // kDisableTestFilter. - const bool is_disabled = - internal::UnitTestOptions::MatchesFilter(test_case_name, - kDisableTestFilter) || - internal::UnitTestOptions::MatchesFilter(test_name, - kDisableTestFilter); - test_info->is_disabled_ = is_disabled; - - const bool matches_filter = - internal::UnitTestOptions::FilterMatchesTest(test_case_name, - test_name); - test_info->matches_filter_ = matches_filter; - - const bool is_runnable = - (GTEST_FLAG(also_run_disabled_tests) || !is_disabled) && - matches_filter; - - const bool is_in_another_shard = - shard_tests != IGNORE_SHARDING_PROTOCOL && - !ShouldRunTestOnShard(total_shards, shard_index, num_runnable_tests); - test_info->is_in_another_shard_ = is_in_another_shard; - const bool is_selected = is_runnable && !is_in_another_shard; - - num_runnable_tests += is_runnable; - num_selected_tests += is_selected; - - test_info->should_run_ = is_selected; - test_case->set_should_run(test_case->should_run() || is_selected); - } - } - return num_selected_tests; -} - -// Prints the given C-string on a single line by replacing all '\n' -// characters with string "\\n". If the output takes more than -// max_length characters, only prints the first max_length characters -// and "...". -static void PrintOnOneLine(const char* str, int max_length) { - if (str != NULL) { - for (int i = 0; *str != '\0'; ++str) { - if (i >= max_length) { - printf("..."); - break; - } - if (*str == '\n') { - printf("\\n"); - i += 2; - } else { - printf("%c", *str); - ++i; - } - } - } -} - -// Prints the names of the tests matching the user-specified filter flag. -void UnitTestImpl::ListTestsMatchingFilter() { - // Print at most this many characters for each type/value parameter. - const int kMaxParamLength = 250; - - for (size_t i = 0; i < test_cases_.size(); i++) { - const TestCase* const test_case = test_cases_[i]; - bool printed_test_case_name = false; - - for (size_t j = 0; j < test_case->test_info_list().size(); j++) { - const TestInfo* const test_info = - test_case->test_info_list()[j]; - if (test_info->matches_filter_) { - if (!printed_test_case_name) { - printed_test_case_name = true; - printf("%s.", test_case->name()); - if (test_case->type_param() != NULL) { - printf(" # %s = ", kTypeParamLabel); - // We print the type parameter on a single line to make - // the output easy to parse by a program. - PrintOnOneLine(test_case->type_param(), kMaxParamLength); - } - printf("\n"); - } - printf(" %s", test_info->name()); - if (test_info->value_param() != NULL) { - printf(" # %s = ", kValueParamLabel); - // We print the value parameter on a single line to make the - // output easy to parse by a program. - PrintOnOneLine(test_info->value_param(), kMaxParamLength); - } - printf("\n"); - } - } - } - fflush(stdout); -} - -// Sets the OS stack trace getter. -// -// Does nothing if the input and the current OS stack trace getter are -// the same; otherwise, deletes the old getter and makes the input the -// current getter. -void UnitTestImpl::set_os_stack_trace_getter( - OsStackTraceGetterInterface* getter) { - if (os_stack_trace_getter_ != getter) { - delete os_stack_trace_getter_; - os_stack_trace_getter_ = getter; - } -} - -// Returns the current OS stack trace getter if it is not NULL; -// otherwise, creates an OsStackTraceGetter, makes it the current -// getter, and returns it. -OsStackTraceGetterInterface* UnitTestImpl::os_stack_trace_getter() { - if (os_stack_trace_getter_ == NULL) { -#ifdef GTEST_OS_STACK_TRACE_GETTER_ - os_stack_trace_getter_ = new GTEST_OS_STACK_TRACE_GETTER_; -#else - os_stack_trace_getter_ = new OsStackTraceGetter; -#endif // GTEST_OS_STACK_TRACE_GETTER_ - } - - return os_stack_trace_getter_; -} - -// Returns the most specific TestResult currently running. -TestResult* UnitTestImpl::current_test_result() { - if (current_test_info_ != NULL) { - return ¤t_test_info_->result_; - } - if (current_test_case_ != NULL) { - return ¤t_test_case_->ad_hoc_test_result_; - } - return &ad_hoc_test_result_; -} - -// Shuffles all test cases, and the tests within each test case, -// making sure that death tests are still run first. -void UnitTestImpl::ShuffleTests() { - // Shuffles the death test cases. - ShuffleRange(random(), 0, last_death_test_case_ + 1, &test_case_indices_); - - // Shuffles the non-death test cases. - ShuffleRange(random(), last_death_test_case_ + 1, - static_cast(test_cases_.size()), &test_case_indices_); - - // Shuffles the tests inside each test case. - for (size_t i = 0; i < test_cases_.size(); i++) { - test_cases_[i]->ShuffleTests(random()); - } -} - -// Restores the test cases and tests to their order before the first shuffle. -void UnitTestImpl::UnshuffleTests() { - for (size_t i = 0; i < test_cases_.size(); i++) { - // Unshuffles the tests in each test case. - test_cases_[i]->UnshuffleTests(); - // Resets the index of each test case. - test_case_indices_[i] = static_cast(i); - } -} - -// Returns the current OS stack trace as an std::string. -// -// The maximum number of stack frames to be included is specified by -// the gtest_stack_trace_depth flag. The skip_count parameter -// specifies the number of top frames to be skipped, which doesn't -// count against the number of frames to be included. -// -// For example, if Foo() calls Bar(), which in turn calls -// GetCurrentOsStackTraceExceptTop(..., 1), Foo() will be included in -// the trace but Bar() and GetCurrentOsStackTraceExceptTop() won't. -std::string GetCurrentOsStackTraceExceptTop(UnitTest* /*unit_test*/, - int skip_count) { - // We pass skip_count + 1 to skip this wrapper function in addition - // to what the user really wants to skip. - return GetUnitTestImpl()->CurrentOsStackTraceExceptTop(skip_count + 1); -} - -// Used by the GTEST_SUPPRESS_UNREACHABLE_CODE_WARNING_BELOW_ macro to -// suppress unreachable code warnings. -namespace { -class ClassUniqueToAlwaysTrue {}; -} - -bool IsTrue(bool condition) { return condition; } - -bool AlwaysTrue() { -#if GTEST_HAS_EXCEPTIONS - // This condition is always false so AlwaysTrue() never actually throws, - // but it makes the compiler think that it may throw. - if (IsTrue(false)) - throw ClassUniqueToAlwaysTrue(); -#endif // GTEST_HAS_EXCEPTIONS - return true; -} - -// If *pstr starts with the given prefix, modifies *pstr to be right -// past the prefix and returns true; otherwise leaves *pstr unchanged -// and returns false. None of pstr, *pstr, and prefix can be NULL. -bool SkipPrefix(const char* prefix, const char** pstr) { - const size_t prefix_len = strlen(prefix); - if (strncmp(*pstr, prefix, prefix_len) == 0) { - *pstr += prefix_len; - return true; - } - return false; -} - -// Parses a string as a command line flag. The string should have -// the format "--flag=value". When def_optional is true, the "=value" -// part can be omitted. -// -// Returns the value of the flag, or NULL if the parsing failed. -static const char* ParseFlagValue(const char* str, const char* flag, - bool def_optional) { - // str and flag must not be NULL. - if (str == NULL || flag == NULL) return NULL; - - // The flag must start with "--" followed by GTEST_FLAG_PREFIX_. - const std::string flag_str = std::string("--") + GTEST_FLAG_PREFIX_ + flag; - const size_t flag_len = flag_str.length(); - if (strncmp(str, flag_str.c_str(), flag_len) != 0) return NULL; - - // Skips the flag name. - const char* flag_end = str + flag_len; - - // When def_optional is true, it's OK to not have a "=value" part. - if (def_optional && (flag_end[0] == '\0')) { - return flag_end; - } - - // If def_optional is true and there are more characters after the - // flag name, or if def_optional is false, there must be a '=' after - // the flag name. - if (flag_end[0] != '=') return NULL; - - // Returns the string after "=". - return flag_end + 1; -} - -// Parses a string for a bool flag, in the form of either -// "--flag=value" or "--flag". -// -// In the former case, the value is taken as true as long as it does -// not start with '0', 'f', or 'F'. -// -// In the latter case, the value is taken as true. -// -// On success, stores the value of the flag in *value, and returns -// true. On failure, returns false without changing *value. -static bool ParseBoolFlag(const char* str, const char* flag, bool* value) { - // Gets the value of the flag as a string. - const char* const value_str = ParseFlagValue(str, flag, true); - - // Aborts if the parsing failed. - if (value_str == NULL) return false; - - // Converts the string value to a bool. - *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F'); - return true; -} - -// Parses a string for an Int32 flag, in the form of -// "--flag=value". -// -// On success, stores the value of the flag in *value, and returns -// true. On failure, returns false without changing *value. -bool ParseInt32Flag(const char* str, const char* flag, Int32* value) { - // Gets the value of the flag as a string. - const char* const value_str = ParseFlagValue(str, flag, false); - - // Aborts if the parsing failed. - if (value_str == NULL) return false; - - // Sets *value to the value of the flag. - return ParseInt32(Message() << "The value of flag --" << flag, - value_str, value); -} - -// Parses a string for a string flag, in the form of -// "--flag=value". -// -// On success, stores the value of the flag in *value, and returns -// true. On failure, returns false without changing *value. -template -static bool ParseStringFlag(const char* str, const char* flag, String* value) { - // Gets the value of the flag as a string. - const char* const value_str = ParseFlagValue(str, flag, false); - - // Aborts if the parsing failed. - if (value_str == NULL) return false; - - // Sets *value to the value of the flag. - *value = value_str; - return true; -} - -// Determines whether a string has a prefix that Google Test uses for its -// flags, i.e., starts with GTEST_FLAG_PREFIX_ or GTEST_FLAG_PREFIX_DASH_. -// If Google Test detects that a command line flag has its prefix but is not -// recognized, it will print its help message. Flags starting with -// GTEST_INTERNAL_PREFIX_ followed by "internal_" are considered Google Test -// internal flags and do not trigger the help message. -static bool HasGoogleTestFlagPrefix(const char* str) { - return (SkipPrefix("--", &str) || - SkipPrefix("-", &str) || - SkipPrefix("/", &str)) && - !SkipPrefix(GTEST_FLAG_PREFIX_ "internal_", &str) && - (SkipPrefix(GTEST_FLAG_PREFIX_, &str) || - SkipPrefix(GTEST_FLAG_PREFIX_DASH_, &str)); -} - -// Prints a string containing code-encoded text. The following escape -// sequences can be used in the string to control the text color: -// -// @@ prints a single '@' character. -// @R changes the color to red. -// @G changes the color to green. -// @Y changes the color to yellow. -// @D changes to the default terminal text color. -// -// TODO(wan@google.com): Write tests for this once we add stdout -// capturing to Google Test. -static void PrintColorEncoded(const char* str) { - GTestColor color = COLOR_DEFAULT; // The current color. - - // Conceptually, we split the string into segments divided by escape - // sequences. Then we print one segment at a time. At the end of - // each iteration, the str pointer advances to the beginning of the - // next segment. - for (;;) { - const char* p = strchr(str, '@'); - if (p == NULL) { - ColoredPrintf(color, "%s", str); - return; - } - - ColoredPrintf(color, "%s", std::string(str, p).c_str()); - - const char ch = p[1]; - str = p + 2; - if (ch == '@') { - ColoredPrintf(color, "@"); - } else if (ch == 'D') { - color = COLOR_DEFAULT; - } else if (ch == 'R') { - color = COLOR_RED; - } else if (ch == 'G') { - color = COLOR_GREEN; - } else if (ch == 'Y') { - color = COLOR_YELLOW; - } else { - --str; - } - } -} - -static const char kColorEncodedHelpMessage[] = -"This program contains tests written using " GTEST_NAME_ ". You can use the\n" -"following command line flags to control its behavior:\n" -"\n" -"Test Selection:\n" -" @G--" GTEST_FLAG_PREFIX_ "list_tests@D\n" -" List the names of all tests instead of running them. The name of\n" -" TEST(Foo, Bar) is \"Foo.Bar\".\n" -" @G--" GTEST_FLAG_PREFIX_ "filter=@YPOSTIVE_PATTERNS" - "[@G-@YNEGATIVE_PATTERNS]@D\n" -" Run only the tests whose name matches one of the positive patterns but\n" -" none of the negative patterns. '?' matches any single character; '*'\n" -" matches any substring; ':' separates two patterns.\n" -" @G--" GTEST_FLAG_PREFIX_ "also_run_disabled_tests@D\n" -" Run all disabled tests too.\n" -"\n" -"Test Execution:\n" -" @G--" GTEST_FLAG_PREFIX_ "repeat=@Y[COUNT]@D\n" -" Run the tests repeatedly; use a negative count to repeat forever.\n" -" @G--" GTEST_FLAG_PREFIX_ "shuffle@D\n" -" Randomize tests' orders on every iteration.\n" -" @G--" GTEST_FLAG_PREFIX_ "random_seed=@Y[NUMBER]@D\n" -" Random number seed to use for shuffling test orders (between 1 and\n" -" 99999, or 0 to use a seed based on the current time).\n" -"\n" -"Test Output:\n" -" @G--" GTEST_FLAG_PREFIX_ "color=@Y(@Gyes@Y|@Gno@Y|@Gauto@Y)@D\n" -" Enable/disable colored output. The default is @Gauto@D.\n" -" -@G-" GTEST_FLAG_PREFIX_ "print_time=0@D\n" -" Don't print the elapsed time of each test.\n" -" @G--" GTEST_FLAG_PREFIX_ "output=@Y(@Gjson@Y|@Gxml@Y)[@G:@YDIRECTORY_PATH@G" - GTEST_PATH_SEP_ "@Y|@G:@YFILE_PATH]@D\n" -" Generate a JSON or XML report in the given directory or with the given\n" -" file name. @YFILE_PATH@D defaults to @Gtest_details.xml@D.\n" -# if GTEST_CAN_STREAM_RESULTS_ -" @G--" GTEST_FLAG_PREFIX_ "stream_result_to=@YHOST@G:@YPORT@D\n" -" Stream test results to the given server.\n" -# endif // GTEST_CAN_STREAM_RESULTS_ -"\n" -"Assertion Behavior:\n" -# if GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS -" @G--" GTEST_FLAG_PREFIX_ "death_test_style=@Y(@Gfast@Y|@Gthreadsafe@Y)@D\n" -" Set the default death test style.\n" -# endif // GTEST_HAS_DEATH_TEST && !GTEST_OS_WINDOWS -" @G--" GTEST_FLAG_PREFIX_ "break_on_failure@D\n" -" Turn assertion failures into debugger break-points.\n" -" @G--" GTEST_FLAG_PREFIX_ "throw_on_failure@D\n" -" Turn assertion failures into C++ exceptions for use by an external\n" -" test framework.\n" -" @G--" GTEST_FLAG_PREFIX_ "catch_exceptions=0@D\n" -" Do not report exceptions as test failures. Instead, allow them\n" -" to crash the program or throw a pop-up (on Windows).\n" -"\n" -"Except for @G--" GTEST_FLAG_PREFIX_ "list_tests@D, you can alternatively set " - "the corresponding\n" -"environment variable of a flag (all letters in upper-case). For example, to\n" -"disable colored text output, you can either specify @G--" GTEST_FLAG_PREFIX_ - "color=no@D or set\n" -"the @G" GTEST_FLAG_PREFIX_UPPER_ "COLOR@D environment variable to @Gno@D.\n" -"\n" -"For more information, please read the " GTEST_NAME_ " documentation at\n" -"@G" GTEST_PROJECT_URL_ "@D. If you find a bug in " GTEST_NAME_ "\n" -"(not one in your own code or tests), please report it to\n" -"@G<" GTEST_DEV_EMAIL_ ">@D.\n"; - -static bool ParseGoogleTestFlag(const char* const arg) { - return ParseBoolFlag(arg, kAlsoRunDisabledTestsFlag, - >EST_FLAG(also_run_disabled_tests)) || - ParseBoolFlag(arg, kBreakOnFailureFlag, - >EST_FLAG(break_on_failure)) || - ParseBoolFlag(arg, kCatchExceptionsFlag, - >EST_FLAG(catch_exceptions)) || - ParseStringFlag(arg, kColorFlag, >EST_FLAG(color)) || - ParseStringFlag(arg, kDeathTestStyleFlag, - >EST_FLAG(death_test_style)) || - ParseBoolFlag(arg, kDeathTestUseFork, - >EST_FLAG(death_test_use_fork)) || - ParseStringFlag(arg, kFilterFlag, >EST_FLAG(filter)) || - ParseStringFlag(arg, kInternalRunDeathTestFlag, - >EST_FLAG(internal_run_death_test)) || - ParseBoolFlag(arg, kListTestsFlag, >EST_FLAG(list_tests)) || - ParseStringFlag(arg, kOutputFlag, >EST_FLAG(output)) || - ParseBoolFlag(arg, kPrintTimeFlag, >EST_FLAG(print_time)) || - ParseBoolFlag(arg, kPrintUTF8Flag, >EST_FLAG(print_utf8)) || - ParseInt32Flag(arg, kRandomSeedFlag, >EST_FLAG(random_seed)) || - ParseInt32Flag(arg, kRepeatFlag, >EST_FLAG(repeat)) || - ParseBoolFlag(arg, kShuffleFlag, >EST_FLAG(shuffle)) || - ParseInt32Flag(arg, kStackTraceDepthFlag, - >EST_FLAG(stack_trace_depth)) || - ParseStringFlag(arg, kStreamResultToFlag, - >EST_FLAG(stream_result_to)) || - ParseBoolFlag(arg, kThrowOnFailureFlag, - >EST_FLAG(throw_on_failure)); -} - -#if GTEST_USE_OWN_FLAGFILE_FLAG_ -static void LoadFlagsFromFile(const std::string& path) { - FILE* flagfile = posix::FOpen(path.c_str(), "r"); - if (!flagfile) { - GTEST_LOG_(FATAL) << "Unable to open file \"" << GTEST_FLAG(flagfile) - << "\""; - } - std::string contents(ReadEntireFile(flagfile)); - posix::FClose(flagfile); - std::vector lines; - SplitString(contents, '\n', &lines); - for (size_t i = 0; i < lines.size(); ++i) { - if (lines[i].empty()) - continue; - if (!ParseGoogleTestFlag(lines[i].c_str())) - g_help_flag = true; - } -} -#endif // GTEST_USE_OWN_FLAGFILE_FLAG_ - -// Parses the command line for Google Test flags, without initializing -// other parts of Google Test. The type parameter CharType can be -// instantiated to either char or wchar_t. -template -void ParseGoogleTestFlagsOnlyImpl(int* argc, CharType** argv) { - for (int i = 1; i < *argc; i++) { - const std::string arg_string = StreamableToString(argv[i]); - const char* const arg = arg_string.c_str(); - - using internal::ParseBoolFlag; - using internal::ParseInt32Flag; - using internal::ParseStringFlag; - - bool remove_flag = false; - if (ParseGoogleTestFlag(arg)) { - remove_flag = true; -#if GTEST_USE_OWN_FLAGFILE_FLAG_ - } else if (ParseStringFlag(arg, kFlagfileFlag, >EST_FLAG(flagfile))) { - LoadFlagsFromFile(GTEST_FLAG(flagfile)); - remove_flag = true; -#endif // GTEST_USE_OWN_FLAGFILE_FLAG_ - } else if (arg_string == "--help" || arg_string == "-h" || - arg_string == "-?" || arg_string == "/?" || - HasGoogleTestFlagPrefix(arg)) { - // Both help flag and unrecognized Google Test flags (excluding - // internal ones) trigger help display. - g_help_flag = true; - } - - if (remove_flag) { - // Shift the remainder of the argv list left by one. Note - // that argv has (*argc + 1) elements, the last one always being - // NULL. The following loop moves the trailing NULL element as - // well. - for (int j = i; j != *argc; j++) { - argv[j] = argv[j + 1]; - } - - // Decrements the argument count. - (*argc)--; - - // We also need to decrement the iterator as we just removed - // an element. - i--; - } - } - - if (g_help_flag) { - // We print the help here instead of in RUN_ALL_TESTS(), as the - // latter may not be called at all if the user is using Google - // Test with another testing framework. - PrintColorEncoded(kColorEncodedHelpMessage); - } -} - -// Parses the command line for Google Test flags, without initializing -// other parts of Google Test. -void ParseGoogleTestFlagsOnly(int* argc, char** argv) { - ParseGoogleTestFlagsOnlyImpl(argc, argv); -} -void ParseGoogleTestFlagsOnly(int* argc, wchar_t** argv) { - ParseGoogleTestFlagsOnlyImpl(argc, argv); -} - -// The internal implementation of InitGoogleTest(). -// -// The type parameter CharType can be instantiated to either char or -// wchar_t. -template -void InitGoogleTestImpl(int* argc, CharType** argv) { - // We don't want to run the initialization code twice. - if (GTestIsInitialized()) return; - - if (*argc <= 0) return; - - g_argvs.clear(); - for (int i = 0; i != *argc; i++) { - g_argvs.push_back(StreamableToString(argv[i])); - } - -#if GTEST_HAS_ABSL - absl::InitializeSymbolizer(g_argvs[0].c_str()); -#endif // GTEST_HAS_ABSL - - ParseGoogleTestFlagsOnly(argc, argv); - GetUnitTestImpl()->PostFlagParsingInit(); -} - -} // namespace internal - -// Initializes Google Test. This must be called before calling -// RUN_ALL_TESTS(). In particular, it parses a command line for the -// flags that Google Test recognizes. Whenever a Google Test flag is -// seen, it is removed from argv, and *argc is decremented. -// -// No value is returned. Instead, the Google Test flag variables are -// updated. -// -// Calling the function for the second time has no user-visible effect. -void InitGoogleTest(int* argc, char** argv) { -#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) - GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv); -#else // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) - internal::InitGoogleTestImpl(argc, argv); -#endif // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) -} - -// This overloaded version can be used in Windows programs compiled in -// UNICODE mode. -void InitGoogleTest(int* argc, wchar_t** argv) { -#if defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) - GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_(argc, argv); -#else // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) - internal::InitGoogleTestImpl(argc, argv); -#endif // defined(GTEST_CUSTOM_INIT_GOOGLE_TEST_FUNCTION_) -} - -std::string TempDir() { -#if defined(GTEST_CUSTOM_TEMPDIR_FUNCTION_) - return GTEST_CUSTOM_TEMPDIR_FUNCTION_(); -#endif - -#if GTEST_OS_WINDOWS_MOBILE - return "\\temp\\"; -#elif GTEST_OS_WINDOWS - const char* temp_dir = internal::posix::GetEnv("TEMP"); - if (temp_dir == NULL || temp_dir[0] == '\0') - return "\\temp\\"; - else if (temp_dir[strlen(temp_dir) - 1] == '\\') - return temp_dir; - else - return std::string(temp_dir) + "\\"; -#elif GTEST_OS_LINUX_ANDROID - return "/sdcard/"; -#else - return "/tmp/"; -#endif // GTEST_OS_WINDOWS_MOBILE -} - -// Class ScopedTrace - -// Pushes the given source file location and message onto a per-thread -// trace stack maintained by Google Test. -void ScopedTrace::PushTrace(const char* file, int line, std::string message) { - internal::TraceInfo trace; - trace.file = file; - trace.line = line; - trace.message.swap(message); - - UnitTest::GetInstance()->PushGTestTrace(trace); -} - -// Pops the info pushed by the c'tor. -ScopedTrace::~ScopedTrace() - GTEST_LOCK_EXCLUDED_(&UnitTest::mutex_) { - UnitTest::GetInstance()->PopGTestTrace(); -} - -} // namespace testing -// Copyright 2005, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan), vladl@google.com (Vlad Losev) -// -// This file implements death tests. - - -#if GTEST_HAS_DEATH_TEST - -# if GTEST_OS_MAC -# include -# endif // GTEST_OS_MAC - -# include -# include -# include - -# if GTEST_OS_LINUX -# include -# endif // GTEST_OS_LINUX - -# include - -# if GTEST_OS_WINDOWS -# include -# else -# include -# include -# endif // GTEST_OS_WINDOWS - -# if GTEST_OS_QNX -# include -# endif // GTEST_OS_QNX - -# if GTEST_OS_FUCHSIA -# include -# include -# include -# include -# endif // GTEST_OS_FUCHSIA - -#endif // GTEST_HAS_DEATH_TEST - - -namespace testing { - -// Constants. - -// The default death test style. -// -// This is defined in internal/gtest-port.h as "fast", but can be overridden by -// a definition in internal/custom/gtest-port.h. The recommended value, which is -// used internally at Google, is "threadsafe". -static const char kDefaultDeathTestStyle[] = GTEST_DEFAULT_DEATH_TEST_STYLE; - -GTEST_DEFINE_string_( - death_test_style, - internal::StringFromGTestEnv("death_test_style", kDefaultDeathTestStyle), - "Indicates how to run a death test in a forked child process: " - "\"threadsafe\" (child process re-executes the test binary " - "from the beginning, running only the specific death test) or " - "\"fast\" (child process runs the death test immediately " - "after forking)."); - -GTEST_DEFINE_bool_( - death_test_use_fork, - internal::BoolFromGTestEnv("death_test_use_fork", false), - "Instructs to use fork()/_exit() instead of clone() in death tests. " - "Ignored and always uses fork() on POSIX systems where clone() is not " - "implemented. Useful when running under valgrind or similar tools if " - "those do not support clone(). Valgrind 3.3.1 will just fail if " - "it sees an unsupported combination of clone() flags. " - "It is not recommended to use this flag w/o valgrind though it will " - "work in 99% of the cases. Once valgrind is fixed, this flag will " - "most likely be removed."); - -namespace internal { -GTEST_DEFINE_string_( - internal_run_death_test, "", - "Indicates the file, line number, temporal index of " - "the single death test to run, and a file descriptor to " - "which a success code may be sent, all separated by " - "the '|' characters. This flag is specified if and only if the current " - "process is a sub-process launched for running a thread-safe " - "death test. FOR INTERNAL USE ONLY."); -} // namespace internal - -#if GTEST_HAS_DEATH_TEST - -namespace internal { - -// Valid only for fast death tests. Indicates the code is running in the -// child process of a fast style death test. -# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA -static bool g_in_fast_death_test_child = false; -# endif - -// Returns a Boolean value indicating whether the caller is currently -// executing in the context of the death test child process. Tools such as -// Valgrind heap checkers may need this to modify their behavior in death -// tests. IMPORTANT: This is an internal utility. Using it may break the -// implementation of death tests. User code MUST NOT use it. -bool InDeathTestChild() { -# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA - - // On Windows and Fuchsia, death tests are thread-safe regardless of the value - // of the death_test_style flag. - return !GTEST_FLAG(internal_run_death_test).empty(); - -# else - - if (GTEST_FLAG(death_test_style) == "threadsafe") - return !GTEST_FLAG(internal_run_death_test).empty(); - else - return g_in_fast_death_test_child; -#endif -} - -} // namespace internal - -// ExitedWithCode constructor. -ExitedWithCode::ExitedWithCode(int exit_code) : exit_code_(exit_code) { -} - -// ExitedWithCode function-call operator. -bool ExitedWithCode::operator()(int exit_status) const { -# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA - - return exit_status == exit_code_; - -# else - - return WIFEXITED(exit_status) && WEXITSTATUS(exit_status) == exit_code_; - -# endif // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA -} - -# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA -// KilledBySignal constructor. -KilledBySignal::KilledBySignal(int signum) : signum_(signum) { -} - -// KilledBySignal function-call operator. -bool KilledBySignal::operator()(int exit_status) const { -# if defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_) - { - bool result; - if (GTEST_KILLED_BY_SIGNAL_OVERRIDE_(signum_, exit_status, &result)) { - return result; - } - } -# endif // defined(GTEST_KILLED_BY_SIGNAL_OVERRIDE_) - return WIFSIGNALED(exit_status) && WTERMSIG(exit_status) == signum_; -} -# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA - -namespace internal { - -// Utilities needed for death tests. - -// Generates a textual description of a given exit code, in the format -// specified by wait(2). -static std::string ExitSummary(int exit_code) { - Message m; - -# if GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA - - m << "Exited with exit status " << exit_code; - -# else - - if (WIFEXITED(exit_code)) { - m << "Exited with exit status " << WEXITSTATUS(exit_code); - } else if (WIFSIGNALED(exit_code)) { - m << "Terminated by signal " << WTERMSIG(exit_code); - } -# ifdef WCOREDUMP - if (WCOREDUMP(exit_code)) { - m << " (core dumped)"; - } -# endif -# endif // GTEST_OS_WINDOWS || GTEST_OS_FUCHSIA - - return m.GetString(); -} - -// Returns true if exit_status describes a process that was terminated -// by a signal, or exited normally with a nonzero exit code. -bool ExitedUnsuccessfully(int exit_status) { - return !ExitedWithCode(0)(exit_status); -} - -# if !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA -// Generates a textual failure message when a death test finds more than -// one thread running, or cannot determine the number of threads, prior -// to executing the given statement. It is the responsibility of the -// caller not to pass a thread_count of 1. -static std::string DeathTestThreadWarning(size_t thread_count) { - Message msg; - msg << "Death tests use fork(), which is unsafe particularly" - << " in a threaded context. For this test, " << GTEST_NAME_ << " "; - if (thread_count == 0) - msg << "couldn't detect the number of threads."; - else - msg << "detected " << thread_count << " threads."; - return msg.GetString(); -} -# endif // !GTEST_OS_WINDOWS && !GTEST_OS_FUCHSIA - -// Flag characters for reporting a death test that did not die. -static const char kDeathTestLived = 'L'; -static const char kDeathTestReturned = 'R'; -static const char kDeathTestThrew = 'T'; -static const char kDeathTestInternalError = 'I'; - -#if GTEST_OS_FUCHSIA - -// File descriptor used for the pipe in the child process. -static const int kFuchsiaReadPipeFd = 3; - -#endif - -// An enumeration describing all of the possible ways that a death test can -// conclude. DIED means that the process died while executing the test -// code; LIVED means that process lived beyond the end of the test code; -// RETURNED means that the test statement attempted to execute a return -// statement, which is not allowed; THREW means that the test statement -// returned control by throwing an exception. IN_PROGRESS means the test -// has not yet concluded. -// TODO(vladl@google.com): Unify names and possibly values for -// AbortReason, DeathTestOutcome, and flag characters above. -enum DeathTestOutcome { IN_PROGRESS, DIED, LIVED, RETURNED, THREW }; - -// Routine for aborting the program which is safe to call from an -// exec-style death test child process, in which case the error -// message is propagated back to the parent process. Otherwise, the -// message is simply printed to stderr. In either case, the program -// then exits with status 1. -static void DeathTestAbort(const std::string& message) { - // On a POSIX system, this function may be called from a threadsafe-style - // death test child process, which operates on a very small stack. Use - // the heap for any additional non-minuscule memory requirements. - const InternalRunDeathTestFlag* const flag = - GetUnitTestImpl()->internal_run_death_test_flag(); - if (flag != NULL) { - FILE* parent = posix::FDOpen(flag->write_fd(), "w"); - fputc(kDeathTestInternalError, parent); - fprintf(parent, "%s", message.c_str()); - fflush(parent); - _exit(1); - } else { - fprintf(stderr, "%s", message.c_str()); - fflush(stderr); - posix::Abort(); - } -} - -// A replacement for CHECK that calls DeathTestAbort if the assertion -// fails. -# define GTEST_DEATH_TEST_CHECK_(expression) \ - do { \ - if (!::testing::internal::IsTrue(expression)) { \ - DeathTestAbort( \ - ::std::string("CHECK failed: File ") + __FILE__ + ", line " \ - + ::testing::internal::StreamableToString(__LINE__) + ": " \ - + #expression); \ - } \ - } while (::testing::internal::AlwaysFalse()) - -// This macro is similar to GTEST_DEATH_TEST_CHECK_, but it is meant for -// evaluating any system call that fulfills two conditions: it must return -// -1 on failure, and set errno to EINTR when it is interrupted and -// should be tried again. The macro expands to a loop that repeatedly -// evaluates the expression as long as it evaluates to -1 and sets -// errno to EINTR. If the expression evaluates to -1 but errno is -// something other than EINTR, DeathTestAbort is called. -# define GTEST_DEATH_TEST_CHECK_SYSCALL_(expression) \ - do { \ - int gtest_retval; \ - do { \ - gtest_retval = (expression); \ - } while (gtest_retval == -1 && errno == EINTR); \ - if (gtest_retval == -1) { \ - DeathTestAbort( \ - ::std::string("CHECK failed: File ") + __FILE__ + ", line " \ - + ::testing::internal::StreamableToString(__LINE__) + ": " \ - + #expression + " != -1"); \ - } \ - } while (::testing::internal::AlwaysFalse()) - -// Returns the message describing the last system error in errno. -std::string GetLastErrnoDescription() { - return errno == 0 ? "" : posix::StrError(errno); -} - -// This is called from a death test parent process to read a failure -// message from the death test child process and log it with the FATAL -// severity. On Windows, the message is read from a pipe handle. On other -// platforms, it is read from a file descriptor. -static void FailFromInternalError(int fd) { - Message error; - char buffer[256]; - int num_read; - - do { - while ((num_read = posix::Read(fd, buffer, 255)) > 0) { - buffer[num_read] = '\0'; - error << buffer; - } - } while (num_read == -1 && errno == EINTR); - - if (num_read == 0) { - GTEST_LOG_(FATAL) << error.GetString(); - } else { - const int last_error = errno; - GTEST_LOG_(FATAL) << "Error while reading death test internal: " - << GetLastErrnoDescription() << " [" << last_error << "]"; - } -} - -// Death test constructor. Increments the running death test count -// for the current test. -DeathTest::DeathTest() { - TestInfo* const info = GetUnitTestImpl()->current_test_info(); - if (info == NULL) { - DeathTestAbort("Cannot run a death test outside of a TEST or " - "TEST_F construct"); - } -} - -// Creates and returns a death test by dispatching to the current -// death test factory. -bool DeathTest::Create(const char* statement, const RE* regex, - const char* file, int line, DeathTest** test) { - return GetUnitTestImpl()->death_test_factory()->Create( - statement, regex, file, line, test); -} - -const char* DeathTest::LastMessage() { - return last_death_test_message_.c_str(); -} - -void DeathTest::set_last_death_test_message(const std::string& message) { - last_death_test_message_ = message; -} - -std::string DeathTest::last_death_test_message_; - -// Provides cross platform implementation for some death functionality. -class DeathTestImpl : public DeathTest { - protected: - DeathTestImpl(const char* a_statement, const RE* a_regex) - : statement_(a_statement), - regex_(a_regex), - spawned_(false), - status_(-1), - outcome_(IN_PROGRESS), - read_fd_(-1), - write_fd_(-1) {} - - // read_fd_ is expected to be closed and cleared by a derived class. - ~DeathTestImpl() { GTEST_DEATH_TEST_CHECK_(read_fd_ == -1); } - - void Abort(AbortReason reason); - virtual bool Passed(bool status_ok); - - const char* statement() const { return statement_; } - const RE* regex() const { return regex_; } - bool spawned() const { return spawned_; } - void set_spawned(bool is_spawned) { spawned_ = is_spawned; } - int status() const { return status_; } - void set_status(int a_status) { status_ = a_status; } - DeathTestOutcome outcome() const { return outcome_; } - void set_outcome(DeathTestOutcome an_outcome) { outcome_ = an_outcome; } - int read_fd() const { return read_fd_; } - void set_read_fd(int fd) { read_fd_ = fd; } - int write_fd() const { return write_fd_; } - void set_write_fd(int fd) { write_fd_ = fd; } - - // Called in the parent process only. Reads the result code of the death - // test child process via a pipe, interprets it to set the outcome_ - // member, and closes read_fd_. Outputs diagnostics and terminates in - // case of unexpected codes. - void ReadAndInterpretStatusByte(); - - private: - // The textual content of the code this object is testing. This class - // doesn't own this string and should not attempt to delete it. - const char* const statement_; - // The regular expression which test output must match. DeathTestImpl - // doesn't own this object and should not attempt to delete it. - const RE* const regex_; - // True if the death test child process has been successfully spawned. - bool spawned_; - // The exit status of the child process. - int status_; - // How the death test concluded. - DeathTestOutcome outcome_; - // Descriptor to the read end of the pipe to the child process. It is - // always -1 in the child process. The child keeps its write end of the - // pipe in write_fd_. - int read_fd_; - // Descriptor to the child's write end of the pipe to the parent process. - // It is always -1 in the parent process. The parent keeps its end of the - // pipe in read_fd_. - int write_fd_; -}; - -// Called in the parent process only. Reads the result code of the death -// test child process via a pipe, interprets it to set the outcome_ -// member, and closes read_fd_. Outputs diagnostics and terminates in -// case of unexpected codes. -void DeathTestImpl::ReadAndInterpretStatusByte() { - char flag; - int bytes_read; - - // The read() here blocks until data is available (signifying the - // failure of the death test) or until the pipe is closed (signifying - // its success), so it's okay to call this in the parent before - // the child process has exited. - do { - bytes_read = posix::Read(read_fd(), &flag, 1); - } while (bytes_read == -1 && errno == EINTR); - - if (bytes_read == 0) { - set_outcome(DIED); - } else if (bytes_read == 1) { - switch (flag) { - case kDeathTestReturned: - set_outcome(RETURNED); - break; - case kDeathTestThrew: - set_outcome(THREW); - break; - case kDeathTestLived: - set_outcome(LIVED); - break; - case kDeathTestInternalError: - FailFromInternalError(read_fd()); // Does not return. - break; - default: - GTEST_LOG_(FATAL) << "Death test child process reported " - << "unexpected status byte (" - << static_cast(flag) << ")"; - } - } else { - GTEST_LOG_(FATAL) << "Read from death test child process failed: " - << GetLastErrnoDescription(); - } - GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Close(read_fd())); - set_read_fd(-1); -} - -// Signals that the death test code which should have exited, didn't. -// Should be called only in a death test child process. -// Writes a status byte to the child's status file descriptor, then -// calls _exit(1). -void DeathTestImpl::Abort(AbortReason reason) { - // The parent process considers the death test to be a failure if - // it finds any data in our pipe. So, here we write a single flag byte - // to the pipe, then exit. - const char status_ch = - reason == TEST_DID_NOT_DIE ? kDeathTestLived : - reason == TEST_THREW_EXCEPTION ? kDeathTestThrew : kDeathTestReturned; - - GTEST_DEATH_TEST_CHECK_SYSCALL_(posix::Write(write_fd(), &status_ch, 1)); - // We are leaking the descriptor here because on some platforms (i.e., - // when built as Windows DLL), destructors of global objects will still - // run after calling _exit(). On such systems, write_fd_ will be - // indirectly closed from the destructor of UnitTestImpl, causing double - // close if it is also closed here. On debug configurations, double close - // may assert. As there are no in-process buffers to flush here, we are - // relying on the OS to close the descriptor after the process terminates - // when the destructors are not run. - _exit(1); // Exits w/o any normal exit hooks (we were supposed to crash) -} - -// Returns an indented copy of stderr output for a death test. -// This makes distinguishing death test output lines from regular log lines -// much easier. -static ::std::string FormatDeathTestOutput(const ::std::string& output) { - ::std::string ret; - for (size_t at = 0; ; ) { - const size_t line_end = output.find('\n', at); - ret += "[ DEATH ] "; - if (line_end == ::std::string::npos) { - ret += output.substr(at); - break; - } - ret += output.substr(at, line_end + 1 - at); - at = line_end + 1; - } - return ret; -} - -// Assesses the success or failure of a death test, using both private -// members which have previously been set, and one argument: -// -// Private data members: -// outcome: An enumeration describing how the death test -// concluded: DIED, LIVED, THREW, or RETURNED. The death test -// fails in the latter three cases. -// status: The exit status of the child process. On *nix, it is in the -// in the format specified by wait(2). On Windows, this is the -// value supplied to the ExitProcess() API or a numeric code -// of the exception that terminated the program. -// regex: A regular expression object to be applied to -// the test's captured standard error output; the death test -// fails if it does not match. -// -// Argument: -// status_ok: true if exit_status is acceptable in the context of -// this particular death test, which fails if it is false -// -// Returns true iff all of the above conditions are met. Otherwise, the -// first failing condition, in the order given above, is the one that is -// reported. Also sets the last death test message string. -bool DeathTestImpl::Passed(bool status_ok) { - if (!spawned()) - return false; - - const std::string error_message = GetCapturedStderr(); - - bool success = false; - Message buffer; - - buffer << "Death test: " << statement() << "\n"; - switch (outcome()) { - case LIVED: - buffer << " Result: failed to die.\n" - << " Error msg:\n" << FormatDeathTestOutput(error_message); - break; - case THREW: - buffer << " Result: threw an exception.\n" - << " Error msg:\n" << FormatDeathTestOutput(error_message); - break; - case RETURNED: - buffer << " Result: illegal return in test statement.\n" - << " Error msg:\n" << FormatDeathTestOutput(error_message); - break; - case DIED: - if (status_ok) { -# if GTEST_USES_PCRE - // PCRE regexes support embedded NULs. - // GTEST_USES_PCRE is defined only in google3 mode - const bool matched = RE::PartialMatch(error_message, *regex()); -# else - const bool matched = RE::PartialMatch(error_message.c_str(), *regex()); -# endif // GTEST_USES_PCRE - if (matched) { - success = true; - } else { - buffer << " Result: died but not with expected error.\n" - << " Expected: " << regex()->pattern() << "\n" - << "Actual msg:\n" << FormatDeathTestOutput(error_message); - } - } else { - buffer << " Result: died but not with expected exit code:\n" - << " " << ExitSummary(status()) << "\n" - << "Actual msg:\n" << FormatDeathTestOutput(error_message); - } - break; - case IN_PROGRESS: - default: - GTEST_LOG_(FATAL) - << "DeathTest::Passed somehow called before conclusion of test"; - } - - DeathTest::set_last_death_test_message(buffer.GetString()); - return success; -} - -# if GTEST_OS_WINDOWS -// WindowsDeathTest implements death tests on Windows. Due to the -// specifics of starting new processes on Windows, death tests there are -// always threadsafe, and Google Test considers the -// --gtest_death_test_style=fast setting to be equivalent to -// --gtest_death_test_style=threadsafe there. -// -// A few implementation notes: Like the Linux version, the Windows -// implementation uses pipes for child-to-parent communication. But due to -// the specifics of pipes on Windows, some extra steps are required: -// -// 1. The parent creates a communication pipe and stores handles to both -// ends of it. -// 2. The parent starts the child and provides it with the information -// necessary to acquire the handle to the write end of the pipe. -// 3. The child acquires the write end of the pipe and signals the parent -// using a Windows event. -// 4. Now the parent can release the write end of the pipe on its side. If -// this is done before step 3, the object's reference count goes down to -// 0 and it is destroyed, preventing the child from acquiring it. The -// parent now has to release it, or read operations on the read end of -// the pipe will not return when the child terminates. -// 5. The parent reads child's output through the pipe (outcome code and -// any possible error messages) from the pipe, and its stderr and then -// determines whether to fail the test. -// -// Note: to distinguish Win32 API calls from the local method and function -// calls, the former are explicitly resolved in the global namespace. -// -class WindowsDeathTest : public DeathTestImpl { - public: - WindowsDeathTest(const char* a_statement, - const RE* a_regex, - const char* file, - int line) - : DeathTestImpl(a_statement, a_regex), file_(file), line_(line) {} - - // All of these virtual functions are inherited from DeathTest. - virtual int Wait(); - virtual TestRole AssumeRole(); - - private: - // The name of the file in which the death test is located. - const char* const file_; - // The line number on which the death test is located. - const int line_; - // Handle to the write end of the pipe to the child process. - AutoHandle write_handle_; - // Child process handle. - AutoHandle child_handle_; - // Event the child process uses to signal the parent that it has - // acquired the handle to the write end of the pipe. After seeing this - // event the parent can release its own handles to make sure its - // ReadFile() calls return when the child terminates. - AutoHandle event_handle_; -}; - -// Waits for the child in a death test to exit, returning its exit -// status, or 0 if no child process exists. As a side effect, sets the -// outcome data member. -int WindowsDeathTest::Wait() { - if (!spawned()) - return 0; - - // Wait until the child either signals that it has acquired the write end - // of the pipe or it dies. - const HANDLE wait_handles[2] = { child_handle_.Get(), event_handle_.Get() }; - switch (::WaitForMultipleObjects(2, - wait_handles, - FALSE, // Waits for any of the handles. - INFINITE)) { - case WAIT_OBJECT_0: - case WAIT_OBJECT_0 + 1: - break; - default: - GTEST_DEATH_TEST_CHECK_(false); // Should not get here. - } - - // The child has acquired the write end of the pipe or exited. - // We release the handle on our side and continue. - write_handle_.Reset(); - event_handle_.Reset(); - - ReadAndInterpretStatusByte(); - - // Waits for the child process to exit if it haven't already. This - // returns immediately if the child has already exited, regardless of - // whether previous calls to WaitForMultipleObjects synchronized on this - // handle or not. - GTEST_DEATH_TEST_CHECK_( - WAIT_OBJECT_0 == ::WaitForSingleObject(child_handle_.Get(), - INFINITE)); - DWORD status_code; - GTEST_DEATH_TEST_CHECK_( - ::GetExitCodeProcess(child_handle_.Get(), &status_code) != FALSE); - child_handle_.Reset(); - set_status(static_cast(status_code)); - return status(); -} - -// The AssumeRole process for a Windows death test. It creates a child -// process with the same executable as the current process to run the -// death test. The child process is given the --gtest_filter and -// --gtest_internal_run_death_test flags such that it knows to run the -// current death test only. -DeathTest::TestRole WindowsDeathTest::AssumeRole() { - const UnitTestImpl* const impl = GetUnitTestImpl(); - const InternalRunDeathTestFlag* const flag = - impl->internal_run_death_test_flag(); - const TestInfo* const info = impl->current_test_info(); - const int death_test_index = info->result()->death_test_count(); - - if (flag != NULL) { - // ParseInternalRunDeathTestFlag() has performed all the necessary - // processing. - set_write_fd(flag->write_fd()); - return EXECUTE_TEST; - } - - // WindowsDeathTest uses an anonymous pipe to communicate results of - // a death test. - SECURITY_ATTRIBUTES handles_are_inheritable = { - sizeof(SECURITY_ATTRIBUTES), NULL, TRUE }; - HANDLE read_handle, write_handle; - GTEST_DEATH_TEST_CHECK_( - ::CreatePipe(&read_handle, &write_handle, &handles_are_inheritable, - 0) // Default buffer size. - != FALSE); - set_read_fd(::_open_osfhandle(reinterpret_cast(read_handle), - O_RDONLY)); - write_handle_.Reset(write_handle); - event_handle_.Reset(::CreateEvent( - &handles_are_inheritable, - TRUE, // The event will automatically reset to non-signaled state. - FALSE, // The initial state is non-signalled. - NULL)); // The even is unnamed. - GTEST_DEATH_TEST_CHECK_(event_handle_.Get() != NULL); - const std::string filter_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" + - info->test_case_name() + "." + info->name(); - const std::string internal_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + - "=" + file_ + "|" + StreamableToString(line_) + "|" + - StreamableToString(death_test_index) + "|" + - StreamableToString(static_cast(::GetCurrentProcessId())) + - // size_t has the same width as pointers on both 32-bit and 64-bit - // Windows platforms. - // See http://msdn.microsoft.com/en-us/library/tcxf1dw6.aspx. - "|" + StreamableToString(reinterpret_cast(write_handle)) + - "|" + StreamableToString(reinterpret_cast(event_handle_.Get())); - - char executable_path[_MAX_PATH + 1]; // NOLINT - GTEST_DEATH_TEST_CHECK_( - _MAX_PATH + 1 != ::GetModuleFileNameA(NULL, - executable_path, - _MAX_PATH)); - - std::string command_line = - std::string(::GetCommandLineA()) + " " + filter_flag + " \"" + - internal_flag + "\""; - - DeathTest::set_last_death_test_message(""); - - CaptureStderr(); - // Flush the log buffers since the log streams are shared with the child. - FlushInfoLog(); - - // The child process will share the standard handles with the parent. - STARTUPINFOA startup_info; - memset(&startup_info, 0, sizeof(STARTUPINFO)); - startup_info.dwFlags = STARTF_USESTDHANDLES; - startup_info.hStdInput = ::GetStdHandle(STD_INPUT_HANDLE); - startup_info.hStdOutput = ::GetStdHandle(STD_OUTPUT_HANDLE); - startup_info.hStdError = ::GetStdHandle(STD_ERROR_HANDLE); - - PROCESS_INFORMATION process_info; - GTEST_DEATH_TEST_CHECK_(::CreateProcessA( - executable_path, - const_cast(command_line.c_str()), - NULL, // Retuned process handle is not inheritable. - NULL, // Retuned thread handle is not inheritable. - TRUE, // Child inherits all inheritable handles (for write_handle_). - 0x0, // Default creation flags. - NULL, // Inherit the parent's environment. - UnitTest::GetInstance()->original_working_dir(), - &startup_info, - &process_info) != FALSE); - child_handle_.Reset(process_info.hProcess); - ::CloseHandle(process_info.hThread); - set_spawned(true); - return OVERSEE_TEST; -} - -# elif GTEST_OS_FUCHSIA - -class FuchsiaDeathTest : public DeathTestImpl { - public: - FuchsiaDeathTest(const char* a_statement, - const RE* a_regex, - const char* file, - int line) - : DeathTestImpl(a_statement, a_regex), file_(file), line_(line) {} - - // All of these virtual functions are inherited from DeathTest. - virtual int Wait(); - virtual TestRole AssumeRole(); - - private: - // The name of the file in which the death test is located. - const char* const file_; - // The line number on which the death test is located. - const int line_; - - zx_handle_t child_process_; -}; - -// Utility class for accumulating command-line arguments. -class Arguments { - public: - Arguments() { - args_.push_back(NULL); - } - - ~Arguments() { - for (std::vector::iterator i = args_.begin(); i != args_.end(); - ++i) { - free(*i); - } - } - void AddArgument(const char* argument) { - args_.insert(args_.end() - 1, posix::StrDup(argument)); - } - - template - void AddArguments(const ::std::vector& arguments) { - for (typename ::std::vector::const_iterator i = arguments.begin(); - i != arguments.end(); - ++i) { - args_.insert(args_.end() - 1, posix::StrDup(i->c_str())); - } - } - char* const* Argv() { - return &args_[0]; - } - - int size() { - return args_.size() - 1; - } - - private: - std::vector args_; -}; - -// Waits for the child in a death test to exit, returning its exit -// status, or 0 if no child process exists. As a side effect, sets the -// outcome data member. -int FuchsiaDeathTest::Wait() { - if (!spawned()) - return 0; - - // Wait for child process to terminate. - zx_status_t status_zx; - zx_signals_t signals; - status_zx = zx_object_wait_one( - child_process_, - ZX_PROCESS_TERMINATED, - ZX_TIME_INFINITE, - &signals); - GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK); - - ReadAndInterpretStatusByte(); - - zx_info_process_t buffer; - status_zx = zx_object_get_info( - child_process_, - ZX_INFO_PROCESS, - &buffer, - sizeof(buffer), - nullptr, - nullptr); - GTEST_DEATH_TEST_CHECK_(status_zx == ZX_OK); - - GTEST_DEATH_TEST_CHECK_(buffer.exited); - set_status(buffer.return_code); - return status(); -} - -// The AssumeRole process for a Fuchsia death test. It creates a child -// process with the same executable as the current process to run the -// death test. The child process is given the --gtest_filter and -// --gtest_internal_run_death_test flags such that it knows to run the -// current death test only. -DeathTest::TestRole FuchsiaDeathTest::AssumeRole() { - const UnitTestImpl* const impl = GetUnitTestImpl(); - const InternalRunDeathTestFlag* const flag = - impl->internal_run_death_test_flag(); - const TestInfo* const info = impl->current_test_info(); - const int death_test_index = info->result()->death_test_count(); - - if (flag != NULL) { - // ParseInternalRunDeathTestFlag() has performed all the necessary - // processing. - set_write_fd(kFuchsiaReadPipeFd); - return EXECUTE_TEST; - } - - CaptureStderr(); - // Flush the log buffers since the log streams are shared with the child. - FlushInfoLog(); - - // Build the child process command line. - const std::string filter_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" - + info->test_case_name() + "." + info->name(); - const std::string internal_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "=" - + file_ + "|" - + StreamableToString(line_) + "|" - + StreamableToString(death_test_index); - Arguments args; - args.AddArguments(GetInjectableArgvs()); - args.AddArgument(filter_flag.c_str()); - args.AddArgument(internal_flag.c_str()); - - // Build the pipe for communication with the child. - zx_status_t status; - zx_handle_t child_pipe_handle; - uint32_t type; - status = fdio_pipe_half(&child_pipe_handle, &type); - GTEST_DEATH_TEST_CHECK_(status >= 0); - set_read_fd(status); - - // Set the pipe handle for the child. - fdio_spawn_action_t add_handle_action = { - .action = FDIO_SPAWN_ACTION_ADD_HANDLE, - .h = { - .id = PA_HND(type, kFuchsiaReadPipeFd), - .handle = child_pipe_handle - } - }; - - // Spawn the child process. - status = fdio_spawn_etc(ZX_HANDLE_INVALID, FDIO_SPAWN_CLONE_ALL, - args.Argv()[0], args.Argv(), nullptr, 1, - &add_handle_action, &child_process_, nullptr); - GTEST_DEATH_TEST_CHECK_(status == ZX_OK); - - set_spawned(true); - return OVERSEE_TEST; -} - -#else // We are neither on Windows, nor on Fuchsia. - -// ForkingDeathTest provides implementations for most of the abstract -// methods of the DeathTest interface. Only the AssumeRole method is -// left undefined. -class ForkingDeathTest : public DeathTestImpl { - public: - ForkingDeathTest(const char* statement, const RE* regex); - - // All of these virtual functions are inherited from DeathTest. - virtual int Wait(); - - protected: - void set_child_pid(pid_t child_pid) { child_pid_ = child_pid; } - - private: - // PID of child process during death test; 0 in the child process itself. - pid_t child_pid_; -}; - -// Constructs a ForkingDeathTest. -ForkingDeathTest::ForkingDeathTest(const char* a_statement, const RE* a_regex) - : DeathTestImpl(a_statement, a_regex), - child_pid_(-1) {} - -// Waits for the child in a death test to exit, returning its exit -// status, or 0 if no child process exists. As a side effect, sets the -// outcome data member. -int ForkingDeathTest::Wait() { - if (!spawned()) - return 0; - - ReadAndInterpretStatusByte(); - - int status_value; - GTEST_DEATH_TEST_CHECK_SYSCALL_(waitpid(child_pid_, &status_value, 0)); - set_status(status_value); - return status_value; -} - -// A concrete death test class that forks, then immediately runs the test -// in the child process. -class NoExecDeathTest : public ForkingDeathTest { - public: - NoExecDeathTest(const char* a_statement, const RE* a_regex) : - ForkingDeathTest(a_statement, a_regex) { } - virtual TestRole AssumeRole(); -}; - -// The AssumeRole process for a fork-and-run death test. It implements a -// straightforward fork, with a simple pipe to transmit the status byte. -DeathTest::TestRole NoExecDeathTest::AssumeRole() { - const size_t thread_count = GetThreadCount(); - if (thread_count != 1) { - GTEST_LOG_(WARNING) << DeathTestThreadWarning(thread_count); - } - - int pipe_fd[2]; - GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1); - - DeathTest::set_last_death_test_message(""); - CaptureStderr(); - // When we fork the process below, the log file buffers are copied, but the - // file descriptors are shared. We flush all log files here so that closing - // the file descriptors in the child process doesn't throw off the - // synchronization between descriptors and buffers in the parent process. - // This is as close to the fork as possible to avoid a race condition in case - // there are multiple threads running before the death test, and another - // thread writes to the log file. - FlushInfoLog(); - - const pid_t child_pid = fork(); - GTEST_DEATH_TEST_CHECK_(child_pid != -1); - set_child_pid(child_pid); - if (child_pid == 0) { - GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[0])); - set_write_fd(pipe_fd[1]); - // Redirects all logging to stderr in the child process to prevent - // concurrent writes to the log files. We capture stderr in the parent - // process and append the child process' output to a log. - LogToStderr(); - // Event forwarding to the listeners of event listener API mush be shut - // down in death test subprocesses. - GetUnitTestImpl()->listeners()->SuppressEventForwarding(); - g_in_fast_death_test_child = true; - return EXECUTE_TEST; - } else { - GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1])); - set_read_fd(pipe_fd[0]); - set_spawned(true); - return OVERSEE_TEST; - } -} - -// A concrete death test class that forks and re-executes the main -// program from the beginning, with command-line flags set that cause -// only this specific death test to be run. -class ExecDeathTest : public ForkingDeathTest { - public: - ExecDeathTest(const char* a_statement, const RE* a_regex, - const char* file, int line) : - ForkingDeathTest(a_statement, a_regex), file_(file), line_(line) { } - virtual TestRole AssumeRole(); - private: - static ::std::vector GetArgvsForDeathTestChildProcess() { - ::std::vector args = GetInjectableArgvs(); -# if defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_) - ::std::vector extra_args = - GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_(); - args.insert(args.end(), extra_args.begin(), extra_args.end()); -# endif // defined(GTEST_EXTRA_DEATH_TEST_COMMAND_LINE_ARGS_) - return args; - } - // The name of the file in which the death test is located. - const char* const file_; - // The line number on which the death test is located. - const int line_; -}; - -// Utility class for accumulating command-line arguments. -class Arguments { - public: - Arguments() { - args_.push_back(NULL); - } - - ~Arguments() { - for (std::vector::iterator i = args_.begin(); i != args_.end(); - ++i) { - free(*i); - } - } - void AddArgument(const char* argument) { - args_.insert(args_.end() - 1, posix::StrDup(argument)); - } - - template - void AddArguments(const ::std::vector& arguments) { - for (typename ::std::vector::const_iterator i = arguments.begin(); - i != arguments.end(); - ++i) { - args_.insert(args_.end() - 1, posix::StrDup(i->c_str())); - } - } - char* const* Argv() { - return &args_[0]; - } - - private: - std::vector args_; -}; - -// A struct that encompasses the arguments to the child process of a -// threadsafe-style death test process. -struct ExecDeathTestArgs { - char* const* argv; // Command-line arguments for the child's call to exec - int close_fd; // File descriptor to close; the read end of a pipe -}; - -# if GTEST_OS_MAC -inline char** GetEnviron() { - // When Google Test is built as a framework on MacOS X, the environ variable - // is unavailable. Apple's documentation (man environ) recommends using - // _NSGetEnviron() instead. - return *_NSGetEnviron(); -} -# else -// Some POSIX platforms expect you to declare environ. extern "C" makes -// it reside in the global namespace. -extern "C" char** environ; -inline char** GetEnviron() { return environ; } -# endif // GTEST_OS_MAC - -# if !GTEST_OS_QNX -// The main function for a threadsafe-style death test child process. -// This function is called in a clone()-ed process and thus must avoid -// any potentially unsafe operations like malloc or libc functions. -static int ExecDeathTestChildMain(void* child_arg) { - ExecDeathTestArgs* const args = static_cast(child_arg); - GTEST_DEATH_TEST_CHECK_SYSCALL_(close(args->close_fd)); - - // We need to execute the test program in the same environment where - // it was originally invoked. Therefore we change to the original - // working directory first. - const char* const original_dir = - UnitTest::GetInstance()->original_working_dir(); - // We can safely call chdir() as it's a direct system call. - if (chdir(original_dir) != 0) { - DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " + - GetLastErrnoDescription()); - return EXIT_FAILURE; - } - - // We can safely call execve() as it's a direct system call. We - // cannot use execvp() as it's a libc function and thus potentially - // unsafe. Since execve() doesn't search the PATH, the user must - // invoke the test program via a valid path that contains at least - // one path separator. - execve(args->argv[0], args->argv, GetEnviron()); - DeathTestAbort(std::string("execve(") + args->argv[0] + ", ...) in " + - original_dir + " failed: " + - GetLastErrnoDescription()); - return EXIT_FAILURE; -} -# endif // !GTEST_OS_QNX - -# if GTEST_HAS_CLONE -// Two utility routines that together determine the direction the stack -// grows. -// This could be accomplished more elegantly by a single recursive -// function, but we want to guard against the unlikely possibility of -// a smart compiler optimizing the recursion away. -// -// GTEST_NO_INLINE_ is required to prevent GCC 4.6 from inlining -// StackLowerThanAddress into StackGrowsDown, which then doesn't give -// correct answer. -static void StackLowerThanAddress(const void* ptr, - bool* result) GTEST_NO_INLINE_; -static void StackLowerThanAddress(const void* ptr, bool* result) { - int dummy; - *result = (&dummy < ptr); -} - -// Make sure AddressSanitizer does not tamper with the stack here. -GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ -static bool StackGrowsDown() { - int dummy; - bool result; - StackLowerThanAddress(&dummy, &result); - return result; -} -# endif // GTEST_HAS_CLONE - -// Spawns a child process with the same executable as the current process in -// a thread-safe manner and instructs it to run the death test. The -// implementation uses fork(2) + exec. On systems where clone(2) is -// available, it is used instead, being slightly more thread-safe. On QNX, -// fork supports only single-threaded environments, so this function uses -// spawn(2) there instead. The function dies with an error message if -// anything goes wrong. -static pid_t ExecDeathTestSpawnChild(char* const* argv, int close_fd) { - ExecDeathTestArgs args = { argv, close_fd }; - pid_t child_pid = -1; - -# if GTEST_OS_QNX - // Obtains the current directory and sets it to be closed in the child - // process. - const int cwd_fd = open(".", O_RDONLY); - GTEST_DEATH_TEST_CHECK_(cwd_fd != -1); - GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(cwd_fd, F_SETFD, FD_CLOEXEC)); - // We need to execute the test program in the same environment where - // it was originally invoked. Therefore we change to the original - // working directory first. - const char* const original_dir = - UnitTest::GetInstance()->original_working_dir(); - // We can safely call chdir() as it's a direct system call. - if (chdir(original_dir) != 0) { - DeathTestAbort(std::string("chdir(\"") + original_dir + "\") failed: " + - GetLastErrnoDescription()); - return EXIT_FAILURE; - } - - int fd_flags; - // Set close_fd to be closed after spawn. - GTEST_DEATH_TEST_CHECK_SYSCALL_(fd_flags = fcntl(close_fd, F_GETFD)); - GTEST_DEATH_TEST_CHECK_SYSCALL_(fcntl(close_fd, F_SETFD, - fd_flags | FD_CLOEXEC)); - struct inheritance inherit = {0}; - // spawn is a system call. - child_pid = spawn(args.argv[0], 0, NULL, &inherit, args.argv, GetEnviron()); - // Restores the current working directory. - GTEST_DEATH_TEST_CHECK_(fchdir(cwd_fd) != -1); - GTEST_DEATH_TEST_CHECK_SYSCALL_(close(cwd_fd)); - -# else // GTEST_OS_QNX -# if GTEST_OS_LINUX - // When a SIGPROF signal is received while fork() or clone() are executing, - // the process may hang. To avoid this, we ignore SIGPROF here and re-enable - // it after the call to fork()/clone() is complete. - struct sigaction saved_sigprof_action; - struct sigaction ignore_sigprof_action; - memset(&ignore_sigprof_action, 0, sizeof(ignore_sigprof_action)); - sigemptyset(&ignore_sigprof_action.sa_mask); - ignore_sigprof_action.sa_handler = SIG_IGN; - GTEST_DEATH_TEST_CHECK_SYSCALL_(sigaction( - SIGPROF, &ignore_sigprof_action, &saved_sigprof_action)); -# endif // GTEST_OS_LINUX - -# if GTEST_HAS_CLONE - const bool use_fork = GTEST_FLAG(death_test_use_fork); - - if (!use_fork) { - static const bool stack_grows_down = StackGrowsDown(); - const size_t stack_size = getpagesize(); - // MMAP_ANONYMOUS is not defined on Mac, so we use MAP_ANON instead. - void* const stack = mmap(NULL, stack_size, PROT_READ | PROT_WRITE, - MAP_ANON | MAP_PRIVATE, -1, 0); - GTEST_DEATH_TEST_CHECK_(stack != MAP_FAILED); - - // Maximum stack alignment in bytes: For a downward-growing stack, this - // amount is subtracted from size of the stack space to get an address - // that is within the stack space and is aligned on all systems we care - // about. As far as I know there is no ABI with stack alignment greater - // than 64. We assume stack and stack_size already have alignment of - // kMaxStackAlignment. - const size_t kMaxStackAlignment = 64; - void* const stack_top = - static_cast(stack) + - (stack_grows_down ? stack_size - kMaxStackAlignment : 0); - GTEST_DEATH_TEST_CHECK_(stack_size > kMaxStackAlignment && - reinterpret_cast(stack_top) % kMaxStackAlignment == 0); - - child_pid = clone(&ExecDeathTestChildMain, stack_top, SIGCHLD, &args); - - GTEST_DEATH_TEST_CHECK_(munmap(stack, stack_size) != -1); - } -# else - const bool use_fork = true; -# endif // GTEST_HAS_CLONE - - if (use_fork && (child_pid = fork()) == 0) { - ExecDeathTestChildMain(&args); - _exit(0); - } -# endif // GTEST_OS_QNX -# if GTEST_OS_LINUX - GTEST_DEATH_TEST_CHECK_SYSCALL_( - sigaction(SIGPROF, &saved_sigprof_action, NULL)); -# endif // GTEST_OS_LINUX - - GTEST_DEATH_TEST_CHECK_(child_pid != -1); - return child_pid; -} - -// The AssumeRole process for a fork-and-exec death test. It re-executes the -// main program from the beginning, setting the --gtest_filter -// and --gtest_internal_run_death_test flags to cause only the current -// death test to be re-run. -DeathTest::TestRole ExecDeathTest::AssumeRole() { - const UnitTestImpl* const impl = GetUnitTestImpl(); - const InternalRunDeathTestFlag* const flag = - impl->internal_run_death_test_flag(); - const TestInfo* const info = impl->current_test_info(); - const int death_test_index = info->result()->death_test_count(); - - if (flag != NULL) { - set_write_fd(flag->write_fd()); - return EXECUTE_TEST; - } - - int pipe_fd[2]; - GTEST_DEATH_TEST_CHECK_(pipe(pipe_fd) != -1); - // Clear the close-on-exec flag on the write end of the pipe, lest - // it be closed when the child process does an exec: - GTEST_DEATH_TEST_CHECK_(fcntl(pipe_fd[1], F_SETFD, 0) != -1); - - const std::string filter_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kFilterFlag + "=" - + info->test_case_name() + "." + info->name(); - const std::string internal_flag = - std::string("--") + GTEST_FLAG_PREFIX_ + kInternalRunDeathTestFlag + "=" - + file_ + "|" + StreamableToString(line_) + "|" - + StreamableToString(death_test_index) + "|" - + StreamableToString(pipe_fd[1]); - Arguments args; - args.AddArguments(GetArgvsForDeathTestChildProcess()); - args.AddArgument(filter_flag.c_str()); - args.AddArgument(internal_flag.c_str()); - - DeathTest::set_last_death_test_message(""); - - CaptureStderr(); - // See the comment in NoExecDeathTest::AssumeRole for why the next line - // is necessary. - FlushInfoLog(); - - const pid_t child_pid = ExecDeathTestSpawnChild(args.Argv(), pipe_fd[0]); - GTEST_DEATH_TEST_CHECK_SYSCALL_(close(pipe_fd[1])); - set_child_pid(child_pid); - set_read_fd(pipe_fd[0]); - set_spawned(true); - return OVERSEE_TEST; -} - -# endif // !GTEST_OS_WINDOWS - -// Creates a concrete DeathTest-derived class that depends on the -// --gtest_death_test_style flag, and sets the pointer pointed to -// by the "test" argument to its address. If the test should be -// skipped, sets that pointer to NULL. Returns true, unless the -// flag is set to an invalid value. -bool DefaultDeathTestFactory::Create(const char* statement, const RE* regex, - const char* file, int line, - DeathTest** test) { - UnitTestImpl* const impl = GetUnitTestImpl(); - const InternalRunDeathTestFlag* const flag = - impl->internal_run_death_test_flag(); - const int death_test_index = impl->current_test_info() - ->increment_death_test_count(); - - if (flag != NULL) { - if (death_test_index > flag->index()) { - DeathTest::set_last_death_test_message( - "Death test count (" + StreamableToString(death_test_index) - + ") somehow exceeded expected maximum (" - + StreamableToString(flag->index()) + ")"); - return false; - } - - if (!(flag->file() == file && flag->line() == line && - flag->index() == death_test_index)) { - *test = NULL; - return true; - } - } - -# if GTEST_OS_WINDOWS - - if (GTEST_FLAG(death_test_style) == "threadsafe" || - GTEST_FLAG(death_test_style) == "fast") { - *test = new WindowsDeathTest(statement, regex, file, line); - } - -# elif GTEST_OS_FUCHSIA - - if (GTEST_FLAG(death_test_style) == "threadsafe" || - GTEST_FLAG(death_test_style) == "fast") { - *test = new FuchsiaDeathTest(statement, regex, file, line); - } - -# else - - if (GTEST_FLAG(death_test_style) == "threadsafe") { - *test = new ExecDeathTest(statement, regex, file, line); - } else if (GTEST_FLAG(death_test_style) == "fast") { - *test = new NoExecDeathTest(statement, regex); - } - -# endif // GTEST_OS_WINDOWS - - else { // NOLINT - this is more readable than unbalanced brackets inside #if. - DeathTest::set_last_death_test_message( - "Unknown death test style \"" + GTEST_FLAG(death_test_style) - + "\" encountered"); - return false; - } - - return true; -} - -# if GTEST_OS_WINDOWS -// Recreates the pipe and event handles from the provided parameters, -// signals the event, and returns a file descriptor wrapped around the pipe -// handle. This function is called in the child process only. -static int GetStatusFileDescriptor(unsigned int parent_process_id, - size_t write_handle_as_size_t, - size_t event_handle_as_size_t) { - AutoHandle parent_process_handle(::OpenProcess(PROCESS_DUP_HANDLE, - FALSE, // Non-inheritable. - parent_process_id)); - if (parent_process_handle.Get() == INVALID_HANDLE_VALUE) { - DeathTestAbort("Unable to open parent process " + - StreamableToString(parent_process_id)); - } - - // TODO(vladl@google.com): Replace the following check with a - // compile-time assertion when available. - GTEST_CHECK_(sizeof(HANDLE) <= sizeof(size_t)); - - const HANDLE write_handle = - reinterpret_cast(write_handle_as_size_t); - HANDLE dup_write_handle; - - // The newly initialized handle is accessible only in the parent - // process. To obtain one accessible within the child, we need to use - // DuplicateHandle. - if (!::DuplicateHandle(parent_process_handle.Get(), write_handle, - ::GetCurrentProcess(), &dup_write_handle, - 0x0, // Requested privileges ignored since - // DUPLICATE_SAME_ACCESS is used. - FALSE, // Request non-inheritable handler. - DUPLICATE_SAME_ACCESS)) { - DeathTestAbort("Unable to duplicate the pipe handle " + - StreamableToString(write_handle_as_size_t) + - " from the parent process " + - StreamableToString(parent_process_id)); - } - - const HANDLE event_handle = reinterpret_cast(event_handle_as_size_t); - HANDLE dup_event_handle; - - if (!::DuplicateHandle(parent_process_handle.Get(), event_handle, - ::GetCurrentProcess(), &dup_event_handle, - 0x0, - FALSE, - DUPLICATE_SAME_ACCESS)) { - DeathTestAbort("Unable to duplicate the event handle " + - StreamableToString(event_handle_as_size_t) + - " from the parent process " + - StreamableToString(parent_process_id)); - } - - const int write_fd = - ::_open_osfhandle(reinterpret_cast(dup_write_handle), O_APPEND); - if (write_fd == -1) { - DeathTestAbort("Unable to convert pipe handle " + - StreamableToString(write_handle_as_size_t) + - " to a file descriptor"); - } - - // Signals the parent that the write end of the pipe has been acquired - // so the parent can release its own write end. - ::SetEvent(dup_event_handle); - - return write_fd; -} -# endif // GTEST_OS_WINDOWS - -// Returns a newly created InternalRunDeathTestFlag object with fields -// initialized from the GTEST_FLAG(internal_run_death_test) flag if -// the flag is specified; otherwise returns NULL. -InternalRunDeathTestFlag* ParseInternalRunDeathTestFlag() { - if (GTEST_FLAG(internal_run_death_test) == "") return NULL; - - // GTEST_HAS_DEATH_TEST implies that we have ::std::string, so we - // can use it here. - int line = -1; - int index = -1; - ::std::vector< ::std::string> fields; - SplitString(GTEST_FLAG(internal_run_death_test).c_str(), '|', &fields); - int write_fd = -1; - -# if GTEST_OS_WINDOWS - - unsigned int parent_process_id = 0; - size_t write_handle_as_size_t = 0; - size_t event_handle_as_size_t = 0; - - if (fields.size() != 6 - || !ParseNaturalNumber(fields[1], &line) - || !ParseNaturalNumber(fields[2], &index) - || !ParseNaturalNumber(fields[3], &parent_process_id) - || !ParseNaturalNumber(fields[4], &write_handle_as_size_t) - || !ParseNaturalNumber(fields[5], &event_handle_as_size_t)) { - DeathTestAbort("Bad --gtest_internal_run_death_test flag: " + - GTEST_FLAG(internal_run_death_test)); - } - write_fd = GetStatusFileDescriptor(parent_process_id, - write_handle_as_size_t, - event_handle_as_size_t); - -# elif GTEST_OS_FUCHSIA - - if (fields.size() != 3 - || !ParseNaturalNumber(fields[1], &line) - || !ParseNaturalNumber(fields[2], &index)) { - DeathTestAbort("Bad --gtest_internal_run_death_test flag: " - + GTEST_FLAG(internal_run_death_test)); - } - -# else - - if (fields.size() != 4 - || !ParseNaturalNumber(fields[1], &line) - || !ParseNaturalNumber(fields[2], &index) - || !ParseNaturalNumber(fields[3], &write_fd)) { - DeathTestAbort("Bad --gtest_internal_run_death_test flag: " - + GTEST_FLAG(internal_run_death_test)); - } - -# endif // GTEST_OS_WINDOWS - - return new InternalRunDeathTestFlag(fields[0], line, index, write_fd); -} - -} // namespace internal - -#endif // GTEST_HAS_DEATH_TEST - -} // namespace testing -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - - -#include - -#if GTEST_OS_WINDOWS_MOBILE -# include -#elif GTEST_OS_WINDOWS -# include -# include -#elif GTEST_OS_SYMBIAN -// Symbian OpenC has PATH_MAX in sys/syslimits.h -# include -#else -# include -# include // Some Linux distributions define PATH_MAX here. -#endif // GTEST_OS_WINDOWS_MOBILE - - -#if GTEST_OS_WINDOWS -# define GTEST_PATH_MAX_ _MAX_PATH -#elif defined(PATH_MAX) -# define GTEST_PATH_MAX_ PATH_MAX -#elif defined(_XOPEN_PATH_MAX) -# define GTEST_PATH_MAX_ _XOPEN_PATH_MAX -#else -# define GTEST_PATH_MAX_ _POSIX_PATH_MAX -#endif // GTEST_OS_WINDOWS - -namespace testing { -namespace internal { - -#if GTEST_OS_WINDOWS -// On Windows, '\\' is the standard path separator, but many tools and the -// Windows API also accept '/' as an alternate path separator. Unless otherwise -// noted, a file path can contain either kind of path separators, or a mixture -// of them. -const char kPathSeparator = '\\'; -const char kAlternatePathSeparator = '/'; -const char kAlternatePathSeparatorString[] = "/"; -# if GTEST_OS_WINDOWS_MOBILE -// Windows CE doesn't have a current directory. You should not use -// the current directory in tests on Windows CE, but this at least -// provides a reasonable fallback. -const char kCurrentDirectoryString[] = "\\"; -// Windows CE doesn't define INVALID_FILE_ATTRIBUTES -const DWORD kInvalidFileAttributes = 0xffffffff; -# else -const char kCurrentDirectoryString[] = ".\\"; -# endif // GTEST_OS_WINDOWS_MOBILE -#else -const char kPathSeparator = '/'; -const char kCurrentDirectoryString[] = "./"; -#endif // GTEST_OS_WINDOWS - -// Returns whether the given character is a valid path separator. -static bool IsPathSeparator(char c) { -#if GTEST_HAS_ALT_PATH_SEP_ - return (c == kPathSeparator) || (c == kAlternatePathSeparator); -#else - return c == kPathSeparator; -#endif -} - -// Returns the current working directory, or "" if unsuccessful. -FilePath FilePath::GetCurrentDir() { -#if GTEST_OS_WINDOWS_MOBILE || GTEST_OS_WINDOWS_PHONE || GTEST_OS_WINDOWS_RT - // Windows CE doesn't have a current directory, so we just return - // something reasonable. - return FilePath(kCurrentDirectoryString); -#elif GTEST_OS_WINDOWS - char cwd[GTEST_PATH_MAX_ + 1] = { '\0' }; - return FilePath(_getcwd(cwd, sizeof(cwd)) == NULL ? "" : cwd); -#else - char cwd[GTEST_PATH_MAX_ + 1] = { '\0' }; - char* result = getcwd(cwd, sizeof(cwd)); -# if GTEST_OS_NACL - // getcwd will likely fail in NaCl due to the sandbox, so return something - // reasonable. The user may have provided a shim implementation for getcwd, - // however, so fallback only when failure is detected. - return FilePath(result == NULL ? kCurrentDirectoryString : cwd); -# endif // GTEST_OS_NACL - return FilePath(result == NULL ? "" : cwd); -#endif // GTEST_OS_WINDOWS_MOBILE -} - -// Returns a copy of the FilePath with the case-insensitive extension removed. -// Example: FilePath("dir/file.exe").RemoveExtension("EXE") returns -// FilePath("dir/file"). If a case-insensitive extension is not -// found, returns a copy of the original FilePath. -FilePath FilePath::RemoveExtension(const char* extension) const { - const std::string dot_extension = std::string(".") + extension; - if (String::EndsWithCaseInsensitive(pathname_, dot_extension)) { - return FilePath(pathname_.substr( - 0, pathname_.length() - dot_extension.length())); - } - return *this; -} - -// Returns a pointer to the last occurrence of a valid path separator in -// the FilePath. On Windows, for example, both '/' and '\' are valid path -// separators. Returns NULL if no path separator was found. -const char* FilePath::FindLastPathSeparator() const { - const char* const last_sep = strrchr(c_str(), kPathSeparator); -#if GTEST_HAS_ALT_PATH_SEP_ - const char* const last_alt_sep = strrchr(c_str(), kAlternatePathSeparator); - // Comparing two pointers of which only one is NULL is undefined. - if (last_alt_sep != NULL && - (last_sep == NULL || last_alt_sep > last_sep)) { - return last_alt_sep; - } -#endif - return last_sep; -} - -// Returns a copy of the FilePath with the directory part removed. -// Example: FilePath("path/to/file").RemoveDirectoryName() returns -// FilePath("file"). If there is no directory part ("just_a_file"), it returns -// the FilePath unmodified. If there is no file part ("just_a_dir/") it -// returns an empty FilePath (""). -// On Windows platform, '\' is the path separator, otherwise it is '/'. -FilePath FilePath::RemoveDirectoryName() const { - const char* const last_sep = FindLastPathSeparator(); - return last_sep ? FilePath(last_sep + 1) : *this; -} - -// RemoveFileName returns the directory path with the filename removed. -// Example: FilePath("path/to/file").RemoveFileName() returns "path/to/". -// If the FilePath is "a_file" or "/a_file", RemoveFileName returns -// FilePath("./") or, on Windows, FilePath(".\\"). If the filepath does -// not have a file, like "just/a/dir/", it returns the FilePath unmodified. -// On Windows platform, '\' is the path separator, otherwise it is '/'. -FilePath FilePath::RemoveFileName() const { - const char* const last_sep = FindLastPathSeparator(); - std::string dir; - if (last_sep) { - dir = std::string(c_str(), last_sep + 1 - c_str()); - } else { - dir = kCurrentDirectoryString; - } - return FilePath(dir); -} - -// Helper functions for naming files in a directory for xml output. - -// Given directory = "dir", base_name = "test", number = 0, -// extension = "xml", returns "dir/test.xml". If number is greater -// than zero (e.g., 12), returns "dir/test_12.xml". -// On Windows platform, uses \ as the separator rather than /. -FilePath FilePath::MakeFileName(const FilePath& directory, - const FilePath& base_name, - int number, - const char* extension) { - std::string file; - if (number == 0) { - file = base_name.string() + "." + extension; - } else { - file = base_name.string() + "_" + StreamableToString(number) - + "." + extension; - } - return ConcatPaths(directory, FilePath(file)); -} - -// Given directory = "dir", relative_path = "test.xml", returns "dir/test.xml". -// On Windows, uses \ as the separator rather than /. -FilePath FilePath::ConcatPaths(const FilePath& directory, - const FilePath& relative_path) { - if (directory.IsEmpty()) - return relative_path; - const FilePath dir(directory.RemoveTrailingPathSeparator()); - return FilePath(dir.string() + kPathSeparator + relative_path.string()); -} - -// Returns true if pathname describes something findable in the file-system, -// either a file, directory, or whatever. -bool FilePath::FileOrDirectoryExists() const { -#if GTEST_OS_WINDOWS_MOBILE - LPCWSTR unicode = String::AnsiToUtf16(pathname_.c_str()); - const DWORD attributes = GetFileAttributes(unicode); - delete [] unicode; - return attributes != kInvalidFileAttributes; -#else - posix::StatStruct file_stat; - return posix::Stat(pathname_.c_str(), &file_stat) == 0; -#endif // GTEST_OS_WINDOWS_MOBILE -} - -// Returns true if pathname describes a directory in the file-system -// that exists. -bool FilePath::DirectoryExists() const { - bool result = false; -#if GTEST_OS_WINDOWS - // Don't strip off trailing separator if path is a root directory on - // Windows (like "C:\\"). - const FilePath& path(IsRootDirectory() ? *this : - RemoveTrailingPathSeparator()); -#else - const FilePath& path(*this); -#endif - -#if GTEST_OS_WINDOWS_MOBILE - LPCWSTR unicode = String::AnsiToUtf16(path.c_str()); - const DWORD attributes = GetFileAttributes(unicode); - delete [] unicode; - if ((attributes != kInvalidFileAttributes) && - (attributes & FILE_ATTRIBUTE_DIRECTORY)) { - result = true; - } -#else - posix::StatStruct file_stat; - result = posix::Stat(path.c_str(), &file_stat) == 0 && - posix::IsDir(file_stat); -#endif // GTEST_OS_WINDOWS_MOBILE - - return result; -} - -// Returns true if pathname describes a root directory. (Windows has one -// root directory per disk drive.) -bool FilePath::IsRootDirectory() const { -#if GTEST_OS_WINDOWS - // TODO(wan@google.com): on Windows a network share like - // \\server\share can be a root directory, although it cannot be the - // current directory. Handle this properly. - return pathname_.length() == 3 && IsAbsolutePath(); -#else - return pathname_.length() == 1 && IsPathSeparator(pathname_.c_str()[0]); -#endif -} - -// Returns true if pathname describes an absolute path. -bool FilePath::IsAbsolutePath() const { - const char* const name = pathname_.c_str(); -#if GTEST_OS_WINDOWS - return pathname_.length() >= 3 && - ((name[0] >= 'a' && name[0] <= 'z') || - (name[0] >= 'A' && name[0] <= 'Z')) && - name[1] == ':' && - IsPathSeparator(name[2]); -#else - return IsPathSeparator(name[0]); -#endif -} - -// Returns a pathname for a file that does not currently exist. The pathname -// will be directory/base_name.extension or -// directory/base_name_.extension if directory/base_name.extension -// already exists. The number will be incremented until a pathname is found -// that does not already exist. -// Examples: 'dir/foo_test.xml' or 'dir/foo_test_1.xml'. -// There could be a race condition if two or more processes are calling this -// function at the same time -- they could both pick the same filename. -FilePath FilePath::GenerateUniqueFileName(const FilePath& directory, - const FilePath& base_name, - const char* extension) { - FilePath full_pathname; - int number = 0; - do { - full_pathname.Set(MakeFileName(directory, base_name, number++, extension)); - } while (full_pathname.FileOrDirectoryExists()); - return full_pathname; -} - -// Returns true if FilePath ends with a path separator, which indicates that -// it is intended to represent a directory. Returns false otherwise. -// This does NOT check that a directory (or file) actually exists. -bool FilePath::IsDirectory() const { - return !pathname_.empty() && - IsPathSeparator(pathname_.c_str()[pathname_.length() - 1]); -} - -// Create directories so that path exists. Returns true if successful or if -// the directories already exist; returns false if unable to create directories -// for any reason. -bool FilePath::CreateDirectoriesRecursively() const { - if (!this->IsDirectory()) { - return false; - } - - if (pathname_.length() == 0 || this->DirectoryExists()) { - return true; - } - - const FilePath parent(this->RemoveTrailingPathSeparator().RemoveFileName()); - return parent.CreateDirectoriesRecursively() && this->CreateFolder(); -} - -// Create the directory so that path exists. Returns true if successful or -// if the directory already exists; returns false if unable to create the -// directory for any reason, including if the parent directory does not -// exist. Not named "CreateDirectory" because that's a macro on Windows. -bool FilePath::CreateFolder() const { -#if GTEST_OS_WINDOWS_MOBILE - FilePath removed_sep(this->RemoveTrailingPathSeparator()); - LPCWSTR unicode = String::AnsiToUtf16(removed_sep.c_str()); - int result = CreateDirectory(unicode, NULL) ? 0 : -1; - delete [] unicode; -#elif GTEST_OS_WINDOWS - int result = _mkdir(pathname_.c_str()); -#else - int result = mkdir(pathname_.c_str(), 0777); -#endif // GTEST_OS_WINDOWS_MOBILE - - if (result == -1) { - return this->DirectoryExists(); // An error is OK if the directory exists. - } - return true; // No error. -} - -// If input name has a trailing separator character, remove it and return the -// name, otherwise return the name string unmodified. -// On Windows platform, uses \ as the separator, other platforms use /. -FilePath FilePath::RemoveTrailingPathSeparator() const { - return IsDirectory() - ? FilePath(pathname_.substr(0, pathname_.length() - 1)) - : *this; -} - -// Removes any redundant separators that might be in the pathname. -// For example, "bar///foo" becomes "bar/foo". Does not eliminate other -// redundancies that might be in a pathname involving "." or "..". -// TODO(wan@google.com): handle Windows network shares (e.g. \\server\share). -void FilePath::Normalize() { - if (pathname_.c_str() == NULL) { - pathname_ = ""; - return; - } - const char* src = pathname_.c_str(); - char* const dest = new char[pathname_.length() + 1]; - char* dest_ptr = dest; - memset(dest_ptr, 0, pathname_.length() + 1); - - while (*src != '\0') { - *dest_ptr = *src; - if (!IsPathSeparator(*src)) { - src++; - } else { -#if GTEST_HAS_ALT_PATH_SEP_ - if (*dest_ptr == kAlternatePathSeparator) { - *dest_ptr = kPathSeparator; - } -#endif - while (IsPathSeparator(*src)) - src++; - } - dest_ptr++; - } - *dest_ptr = '\0'; - pathname_ = dest; - delete[] dest; -} - -} // namespace internal -} // namespace testing -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - - -#include -#include -#include -#include -#include - -#if GTEST_OS_WINDOWS -# include -# include -# include -# include // Used in ThreadLocal. -#else -# include -#endif // GTEST_OS_WINDOWS - -#if GTEST_OS_MAC -# include -# include -# include -#endif // GTEST_OS_MAC - -#if GTEST_OS_QNX -# include -# include -# include -#endif // GTEST_OS_QNX - -#if GTEST_OS_AIX -# include -# include -#endif // GTEST_OS_AIX - -#if GTEST_OS_FUCHSIA -# include -# include -#endif // GTEST_OS_FUCHSIA - - -namespace testing { -namespace internal { - -#if defined(_MSC_VER) || defined(__BORLANDC__) -// MSVC and C++Builder do not provide a definition of STDERR_FILENO. -const int kStdOutFileno = 1; -const int kStdErrFileno = 2; -#else -const int kStdOutFileno = STDOUT_FILENO; -const int kStdErrFileno = STDERR_FILENO; -#endif // _MSC_VER - -#if GTEST_OS_LINUX - -namespace { -template -T ReadProcFileField(const std::string& filename, int field) { - std::string dummy; - std::ifstream file(filename.c_str()); - while (field-- > 0) { - file >> dummy; - } - T output = 0; - file >> output; - return output; -} -} // namespace - -// Returns the number of active threads, or 0 when there is an error. -size_t GetThreadCount() { - const std::string filename = - (Message() << "/proc/" << getpid() << "/stat").GetString(); - return ReadProcFileField(filename, 19); -} - -#elif GTEST_OS_MAC - -size_t GetThreadCount() { - const task_t task = mach_task_self(); - mach_msg_type_number_t thread_count; - thread_act_array_t thread_list; - const kern_return_t status = task_threads(task, &thread_list, &thread_count); - if (status == KERN_SUCCESS) { - // task_threads allocates resources in thread_list and we need to free them - // to avoid leaks. - vm_deallocate(task, - reinterpret_cast(thread_list), - sizeof(thread_t) * thread_count); - return static_cast(thread_count); - } else { - return 0; - } -} - -#elif GTEST_OS_QNX - -// Returns the number of threads running in the process, or 0 to indicate that -// we cannot detect it. -size_t GetThreadCount() { - const int fd = open("/proc/self/as", O_RDONLY); - if (fd < 0) { - return 0; - } - procfs_info process_info; - const int status = - devctl(fd, DCMD_PROC_INFO, &process_info, sizeof(process_info), NULL); - close(fd); - if (status == EOK) { - return static_cast(process_info.num_threads); - } else { - return 0; - } -} - -#elif GTEST_OS_AIX - -size_t GetThreadCount() { - struct procentry64 entry; - pid_t pid = getpid(); - int status = getprocs64(&entry, sizeof(entry), NULL, 0, &pid, 1); - if (status == 1) { - return entry.pi_thcount; - } else { - return 0; - } -} - -#elif GTEST_OS_FUCHSIA - -size_t GetThreadCount() { - int dummy_buffer; - size_t avail; - zx_status_t status = zx_object_get_info( - zx_process_self(), - ZX_INFO_PROCESS_THREADS, - &dummy_buffer, - 0, - nullptr, - &avail); - if (status == ZX_OK) { - return avail; - } else { - return 0; - } -} - -#else - -size_t GetThreadCount() { - // There's no portable way to detect the number of threads, so we just - // return 0 to indicate that we cannot detect it. - return 0; -} - -#endif // GTEST_OS_LINUX - -#if GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS - -void SleepMilliseconds(int n) { - ::Sleep(n); -} - -AutoHandle::AutoHandle() - : handle_(INVALID_HANDLE_VALUE) {} - -AutoHandle::AutoHandle(Handle handle) - : handle_(handle) {} - -AutoHandle::~AutoHandle() { - Reset(); -} - -AutoHandle::Handle AutoHandle::Get() const { - return handle_; -} - -void AutoHandle::Reset() { - Reset(INVALID_HANDLE_VALUE); -} - -void AutoHandle::Reset(HANDLE handle) { - // Resetting with the same handle we already own is invalid. - if (handle_ != handle) { - if (IsCloseable()) { - ::CloseHandle(handle_); - } - handle_ = handle; - } else { - GTEST_CHECK_(!IsCloseable()) - << "Resetting a valid handle to itself is likely a programmer error " - "and thus not allowed."; - } -} - -bool AutoHandle::IsCloseable() const { - // Different Windows APIs may use either of these values to represent an - // invalid handle. - return handle_ != NULL && handle_ != INVALID_HANDLE_VALUE; -} - -Notification::Notification() - : event_(::CreateEvent(NULL, // Default security attributes. - TRUE, // Do not reset automatically. - FALSE, // Initially unset. - NULL)) { // Anonymous event. - GTEST_CHECK_(event_.Get() != NULL); -} - -void Notification::Notify() { - GTEST_CHECK_(::SetEvent(event_.Get()) != FALSE); -} - -void Notification::WaitForNotification() { - GTEST_CHECK_( - ::WaitForSingleObject(event_.Get(), INFINITE) == WAIT_OBJECT_0); -} - -Mutex::Mutex() - : owner_thread_id_(0), - type_(kDynamic), - critical_section_init_phase_(0), - critical_section_(new CRITICAL_SECTION) { - ::InitializeCriticalSection(critical_section_); -} - -Mutex::~Mutex() { - // Static mutexes are leaked intentionally. It is not thread-safe to try - // to clean them up. - // TODO(yukawa): Switch to Slim Reader/Writer (SRW) Locks, which requires - // nothing to clean it up but is available only on Vista and later. - // http://msdn.microsoft.com/en-us/library/windows/desktop/aa904937.aspx - if (type_ == kDynamic) { - ::DeleteCriticalSection(critical_section_); - delete critical_section_; - critical_section_ = NULL; - } -} - -void Mutex::Lock() { - ThreadSafeLazyInit(); - ::EnterCriticalSection(critical_section_); - owner_thread_id_ = ::GetCurrentThreadId(); -} - -void Mutex::Unlock() { - ThreadSafeLazyInit(); - // We don't protect writing to owner_thread_id_ here, as it's the - // caller's responsibility to ensure that the current thread holds the - // mutex when this is called. - owner_thread_id_ = 0; - ::LeaveCriticalSection(critical_section_); -} - -// Does nothing if the current thread holds the mutex. Otherwise, crashes -// with high probability. -void Mutex::AssertHeld() { - ThreadSafeLazyInit(); - GTEST_CHECK_(owner_thread_id_ == ::GetCurrentThreadId()) - << "The current thread is not holding the mutex @" << this; -} - -// Initializes owner_thread_id_ and critical_section_ in static mutexes. -void Mutex::ThreadSafeLazyInit() { - // Dynamic mutexes are initialized in the constructor. - if (type_ == kStatic) { - switch ( - ::InterlockedCompareExchange(&critical_section_init_phase_, 1L, 0L)) { - case 0: - // If critical_section_init_phase_ was 0 before the exchange, we - // are the first to test it and need to perform the initialization. - owner_thread_id_ = 0; - critical_section_ = new CRITICAL_SECTION; - ::InitializeCriticalSection(critical_section_); - // Updates the critical_section_init_phase_ to 2 to signal - // initialization complete. - GTEST_CHECK_(::InterlockedCompareExchange( - &critical_section_init_phase_, 2L, 1L) == - 1L); - break; - case 1: - // Somebody else is already initializing the mutex; spin until they - // are done. - while (::InterlockedCompareExchange(&critical_section_init_phase_, - 2L, - 2L) != 2L) { - // Possibly yields the rest of the thread's time slice to other - // threads. - ::Sleep(0); - } - break; - - case 2: - break; // The mutex is already initialized and ready for use. - - default: - GTEST_CHECK_(false) - << "Unexpected value of critical_section_init_phase_ " - << "while initializing a static mutex."; - } - } -} - -namespace { - -class ThreadWithParamSupport : public ThreadWithParamBase { - public: - static HANDLE CreateThread(Runnable* runnable, - Notification* thread_can_start) { - ThreadMainParam* param = new ThreadMainParam(runnable, thread_can_start); - DWORD thread_id; - // TODO(yukawa): Consider to use _beginthreadex instead. - HANDLE thread_handle = ::CreateThread( - NULL, // Default security. - 0, // Default stack size. - &ThreadWithParamSupport::ThreadMain, - param, // Parameter to ThreadMainStatic - 0x0, // Default creation flags. - &thread_id); // Need a valid pointer for the call to work under Win98. - GTEST_CHECK_(thread_handle != NULL) << "CreateThread failed with error " - << ::GetLastError() << "."; - if (thread_handle == NULL) { - delete param; - } - return thread_handle; - } - - private: - struct ThreadMainParam { - ThreadMainParam(Runnable* runnable, Notification* thread_can_start) - : runnable_(runnable), - thread_can_start_(thread_can_start) { - } - scoped_ptr runnable_; - // Does not own. - Notification* thread_can_start_; - }; - - static DWORD WINAPI ThreadMain(void* ptr) { - // Transfers ownership. - scoped_ptr param(static_cast(ptr)); - if (param->thread_can_start_ != NULL) - param->thread_can_start_->WaitForNotification(); - param->runnable_->Run(); - return 0; - } - - // Prohibit instantiation. - ThreadWithParamSupport(); - - GTEST_DISALLOW_COPY_AND_ASSIGN_(ThreadWithParamSupport); -}; - -} // namespace - -ThreadWithParamBase::ThreadWithParamBase(Runnable *runnable, - Notification* thread_can_start) - : thread_(ThreadWithParamSupport::CreateThread(runnable, - thread_can_start)) { -} - -ThreadWithParamBase::~ThreadWithParamBase() { - Join(); -} - -void ThreadWithParamBase::Join() { - GTEST_CHECK_(::WaitForSingleObject(thread_.Get(), INFINITE) == WAIT_OBJECT_0) - << "Failed to join the thread with error " << ::GetLastError() << "."; -} - -// Maps a thread to a set of ThreadIdToThreadLocals that have values -// instantiated on that thread and notifies them when the thread exits. A -// ThreadLocal instance is expected to persist until all threads it has -// values on have terminated. -class ThreadLocalRegistryImpl { - public: - // Registers thread_local_instance as having value on the current thread. - // Returns a value that can be used to identify the thread from other threads. - static ThreadLocalValueHolderBase* GetValueOnCurrentThread( - const ThreadLocalBase* thread_local_instance) { - DWORD current_thread = ::GetCurrentThreadId(); - MutexLock lock(&mutex_); - ThreadIdToThreadLocals* const thread_to_thread_locals = - GetThreadLocalsMapLocked(); - ThreadIdToThreadLocals::iterator thread_local_pos = - thread_to_thread_locals->find(current_thread); - if (thread_local_pos == thread_to_thread_locals->end()) { - thread_local_pos = thread_to_thread_locals->insert( - std::make_pair(current_thread, ThreadLocalValues())).first; - StartWatcherThreadFor(current_thread); - } - ThreadLocalValues& thread_local_values = thread_local_pos->second; - ThreadLocalValues::iterator value_pos = - thread_local_values.find(thread_local_instance); - if (value_pos == thread_local_values.end()) { - value_pos = - thread_local_values - .insert(std::make_pair( - thread_local_instance, - linked_ptr( - thread_local_instance->NewValueForCurrentThread()))) - .first; - } - return value_pos->second.get(); - } - - static void OnThreadLocalDestroyed( - const ThreadLocalBase* thread_local_instance) { - std::vector > value_holders; - // Clean up the ThreadLocalValues data structure while holding the lock, but - // defer the destruction of the ThreadLocalValueHolderBases. - { - MutexLock lock(&mutex_); - ThreadIdToThreadLocals* const thread_to_thread_locals = - GetThreadLocalsMapLocked(); - for (ThreadIdToThreadLocals::iterator it = - thread_to_thread_locals->begin(); - it != thread_to_thread_locals->end(); - ++it) { - ThreadLocalValues& thread_local_values = it->second; - ThreadLocalValues::iterator value_pos = - thread_local_values.find(thread_local_instance); - if (value_pos != thread_local_values.end()) { - value_holders.push_back(value_pos->second); - thread_local_values.erase(value_pos); - // This 'if' can only be successful at most once, so theoretically we - // could break out of the loop here, but we don't bother doing so. - } - } - } - // Outside the lock, let the destructor for 'value_holders' deallocate the - // ThreadLocalValueHolderBases. - } - - static void OnThreadExit(DWORD thread_id) { - GTEST_CHECK_(thread_id != 0) << ::GetLastError(); - std::vector > value_holders; - // Clean up the ThreadIdToThreadLocals data structure while holding the - // lock, but defer the destruction of the ThreadLocalValueHolderBases. - { - MutexLock lock(&mutex_); - ThreadIdToThreadLocals* const thread_to_thread_locals = - GetThreadLocalsMapLocked(); - ThreadIdToThreadLocals::iterator thread_local_pos = - thread_to_thread_locals->find(thread_id); - if (thread_local_pos != thread_to_thread_locals->end()) { - ThreadLocalValues& thread_local_values = thread_local_pos->second; - for (ThreadLocalValues::iterator value_pos = - thread_local_values.begin(); - value_pos != thread_local_values.end(); - ++value_pos) { - value_holders.push_back(value_pos->second); - } - thread_to_thread_locals->erase(thread_local_pos); - } - } - // Outside the lock, let the destructor for 'value_holders' deallocate the - // ThreadLocalValueHolderBases. - } - - private: - // In a particular thread, maps a ThreadLocal object to its value. - typedef std::map > ThreadLocalValues; - // Stores all ThreadIdToThreadLocals having values in a thread, indexed by - // thread's ID. - typedef std::map ThreadIdToThreadLocals; - - // Holds the thread id and thread handle that we pass from - // StartWatcherThreadFor to WatcherThreadFunc. - typedef std::pair ThreadIdAndHandle; - - static void StartWatcherThreadFor(DWORD thread_id) { - // The returned handle will be kept in thread_map and closed by - // watcher_thread in WatcherThreadFunc. - HANDLE thread = ::OpenThread(SYNCHRONIZE | THREAD_QUERY_INFORMATION, - FALSE, - thread_id); - GTEST_CHECK_(thread != NULL); - // We need to pass a valid thread ID pointer into CreateThread for it - // to work correctly under Win98. - DWORD watcher_thread_id; - HANDLE watcher_thread = ::CreateThread( - NULL, // Default security. - 0, // Default stack size - &ThreadLocalRegistryImpl::WatcherThreadFunc, - reinterpret_cast(new ThreadIdAndHandle(thread_id, thread)), - CREATE_SUSPENDED, - &watcher_thread_id); - GTEST_CHECK_(watcher_thread != NULL); - // Give the watcher thread the same priority as ours to avoid being - // blocked by it. - ::SetThreadPriority(watcher_thread, - ::GetThreadPriority(::GetCurrentThread())); - ::ResumeThread(watcher_thread); - ::CloseHandle(watcher_thread); - } - - // Monitors exit from a given thread and notifies those - // ThreadIdToThreadLocals about thread termination. - static DWORD WINAPI WatcherThreadFunc(LPVOID param) { - const ThreadIdAndHandle* tah = - reinterpret_cast(param); - GTEST_CHECK_( - ::WaitForSingleObject(tah->second, INFINITE) == WAIT_OBJECT_0); - OnThreadExit(tah->first); - ::CloseHandle(tah->second); - delete tah; - return 0; - } - - // Returns map of thread local instances. - static ThreadIdToThreadLocals* GetThreadLocalsMapLocked() { - mutex_.AssertHeld(); - static ThreadIdToThreadLocals* map = new ThreadIdToThreadLocals; - return map; - } - - // Protects access to GetThreadLocalsMapLocked() and its return value. - static Mutex mutex_; - // Protects access to GetThreadMapLocked() and its return value. - static Mutex thread_map_mutex_; -}; - -Mutex ThreadLocalRegistryImpl::mutex_(Mutex::kStaticMutex); -Mutex ThreadLocalRegistryImpl::thread_map_mutex_(Mutex::kStaticMutex); - -ThreadLocalValueHolderBase* ThreadLocalRegistry::GetValueOnCurrentThread( - const ThreadLocalBase* thread_local_instance) { - return ThreadLocalRegistryImpl::GetValueOnCurrentThread( - thread_local_instance); -} - -void ThreadLocalRegistry::OnThreadLocalDestroyed( - const ThreadLocalBase* thread_local_instance) { - ThreadLocalRegistryImpl::OnThreadLocalDestroyed(thread_local_instance); -} - -#endif // GTEST_IS_THREADSAFE && GTEST_OS_WINDOWS - -#if GTEST_USES_POSIX_RE - -// Implements RE. Currently only needed for death tests. - -RE::~RE() { - if (is_valid_) { - // regfree'ing an invalid regex might crash because the content - // of the regex is undefined. Since the regex's are essentially - // the same, one cannot be valid (or invalid) without the other - // being so too. - regfree(&partial_regex_); - regfree(&full_regex_); - } - free(const_cast(pattern_)); -} - -// Returns true iff regular expression re matches the entire str. -bool RE::FullMatch(const char* str, const RE& re) { - if (!re.is_valid_) return false; - - regmatch_t match; - return regexec(&re.full_regex_, str, 1, &match, 0) == 0; -} - -// Returns true iff regular expression re matches a substring of str -// (including str itself). -bool RE::PartialMatch(const char* str, const RE& re) { - if (!re.is_valid_) return false; - - regmatch_t match; - return regexec(&re.partial_regex_, str, 1, &match, 0) == 0; -} - -// Initializes an RE from its string representation. -void RE::Init(const char* regex) { - pattern_ = posix::StrDup(regex); - - // Reserves enough bytes to hold the regular expression used for a - // full match. - const size_t full_regex_len = strlen(regex) + 10; - char* const full_pattern = new char[full_regex_len]; - - snprintf(full_pattern, full_regex_len, "^(%s)$", regex); - is_valid_ = regcomp(&full_regex_, full_pattern, REG_EXTENDED) == 0; - // We want to call regcomp(&partial_regex_, ...) even if the - // previous expression returns false. Otherwise partial_regex_ may - // not be properly initialized can may cause trouble when it's - // freed. - // - // Some implementation of POSIX regex (e.g. on at least some - // versions of Cygwin) doesn't accept the empty string as a valid - // regex. We change it to an equivalent form "()" to be safe. - if (is_valid_) { - const char* const partial_regex = (*regex == '\0') ? "()" : regex; - is_valid_ = regcomp(&partial_regex_, partial_regex, REG_EXTENDED) == 0; - } - EXPECT_TRUE(is_valid_) - << "Regular expression \"" << regex - << "\" is not a valid POSIX Extended regular expression."; - - delete[] full_pattern; -} - -#elif GTEST_USES_SIMPLE_RE - -// Returns true iff ch appears anywhere in str (excluding the -// terminating '\0' character). -bool IsInSet(char ch, const char* str) { - return ch != '\0' && strchr(str, ch) != NULL; -} - -// Returns true iff ch belongs to the given classification. Unlike -// similar functions in , these aren't affected by the -// current locale. -bool IsAsciiDigit(char ch) { return '0' <= ch && ch <= '9'; } -bool IsAsciiPunct(char ch) { - return IsInSet(ch, "^-!\"#$%&'()*+,./:;<=>?@[\\]_`{|}~"); -} -bool IsRepeat(char ch) { return IsInSet(ch, "?*+"); } -bool IsAsciiWhiteSpace(char ch) { return IsInSet(ch, " \f\n\r\t\v"); } -bool IsAsciiWordChar(char ch) { - return ('a' <= ch && ch <= 'z') || ('A' <= ch && ch <= 'Z') || - ('0' <= ch && ch <= '9') || ch == '_'; -} - -// Returns true iff "\\c" is a supported escape sequence. -bool IsValidEscape(char c) { - return (IsAsciiPunct(c) || IsInSet(c, "dDfnrsStvwW")); -} - -// Returns true iff the given atom (specified by escaped and pattern) -// matches ch. The result is undefined if the atom is invalid. -bool AtomMatchesChar(bool escaped, char pattern_char, char ch) { - if (escaped) { // "\\p" where p is pattern_char. - switch (pattern_char) { - case 'd': return IsAsciiDigit(ch); - case 'D': return !IsAsciiDigit(ch); - case 'f': return ch == '\f'; - case 'n': return ch == '\n'; - case 'r': return ch == '\r'; - case 's': return IsAsciiWhiteSpace(ch); - case 'S': return !IsAsciiWhiteSpace(ch); - case 't': return ch == '\t'; - case 'v': return ch == '\v'; - case 'w': return IsAsciiWordChar(ch); - case 'W': return !IsAsciiWordChar(ch); - } - return IsAsciiPunct(pattern_char) && pattern_char == ch; - } - - return (pattern_char == '.' && ch != '\n') || pattern_char == ch; -} - -// Helper function used by ValidateRegex() to format error messages. -static std::string FormatRegexSyntaxError(const char* regex, int index) { - return (Message() << "Syntax error at index " << index - << " in simple regular expression \"" << regex << "\": ").GetString(); -} - -// Generates non-fatal failures and returns false if regex is invalid; -// otherwise returns true. -bool ValidateRegex(const char* regex) { - if (regex == NULL) { - // TODO(wan@google.com): fix the source file location in the - // assertion failures to match where the regex is used in user - // code. - ADD_FAILURE() << "NULL is not a valid simple regular expression."; - return false; - } - - bool is_valid = true; - - // True iff ?, *, or + can follow the previous atom. - bool prev_repeatable = false; - for (int i = 0; regex[i]; i++) { - if (regex[i] == '\\') { // An escape sequence - i++; - if (regex[i] == '\0') { - ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1) - << "'\\' cannot appear at the end."; - return false; - } - - if (!IsValidEscape(regex[i])) { - ADD_FAILURE() << FormatRegexSyntaxError(regex, i - 1) - << "invalid escape sequence \"\\" << regex[i] << "\"."; - is_valid = false; - } - prev_repeatable = true; - } else { // Not an escape sequence. - const char ch = regex[i]; - - if (ch == '^' && i > 0) { - ADD_FAILURE() << FormatRegexSyntaxError(regex, i) - << "'^' can only appear at the beginning."; - is_valid = false; - } else if (ch == '$' && regex[i + 1] != '\0') { - ADD_FAILURE() << FormatRegexSyntaxError(regex, i) - << "'$' can only appear at the end."; - is_valid = false; - } else if (IsInSet(ch, "()[]{}|")) { - ADD_FAILURE() << FormatRegexSyntaxError(regex, i) - << "'" << ch << "' is unsupported."; - is_valid = false; - } else if (IsRepeat(ch) && !prev_repeatable) { - ADD_FAILURE() << FormatRegexSyntaxError(regex, i) - << "'" << ch << "' can only follow a repeatable token."; - is_valid = false; - } - - prev_repeatable = !IsInSet(ch, "^$?*+"); - } - } - - return is_valid; -} - -// Matches a repeated regex atom followed by a valid simple regular -// expression. The regex atom is defined as c if escaped is false, -// or \c otherwise. repeat is the repetition meta character (?, *, -// or +). The behavior is undefined if str contains too many -// characters to be indexable by size_t, in which case the test will -// probably time out anyway. We are fine with this limitation as -// std::string has it too. -bool MatchRepetitionAndRegexAtHead( - bool escaped, char c, char repeat, const char* regex, - const char* str) { - const size_t min_count = (repeat == '+') ? 1 : 0; - const size_t max_count = (repeat == '?') ? 1 : - static_cast(-1) - 1; - // We cannot call numeric_limits::max() as it conflicts with the - // max() macro on Windows. - - for (size_t i = 0; i <= max_count; ++i) { - // We know that the atom matches each of the first i characters in str. - if (i >= min_count && MatchRegexAtHead(regex, str + i)) { - // We have enough matches at the head, and the tail matches too. - // Since we only care about *whether* the pattern matches str - // (as opposed to *how* it matches), there is no need to find a - // greedy match. - return true; - } - if (str[i] == '\0' || !AtomMatchesChar(escaped, c, str[i])) - return false; - } - return false; -} - -// Returns true iff regex matches a prefix of str. regex must be a -// valid simple regular expression and not start with "^", or the -// result is undefined. -bool MatchRegexAtHead(const char* regex, const char* str) { - if (*regex == '\0') // An empty regex matches a prefix of anything. - return true; - - // "$" only matches the end of a string. Note that regex being - // valid guarantees that there's nothing after "$" in it. - if (*regex == '$') - return *str == '\0'; - - // Is the first thing in regex an escape sequence? - const bool escaped = *regex == '\\'; - if (escaped) - ++regex; - if (IsRepeat(regex[1])) { - // MatchRepetitionAndRegexAtHead() calls MatchRegexAtHead(), so - // here's an indirect recursion. It terminates as the regex gets - // shorter in each recursion. - return MatchRepetitionAndRegexAtHead( - escaped, regex[0], regex[1], regex + 2, str); - } else { - // regex isn't empty, isn't "$", and doesn't start with a - // repetition. We match the first atom of regex with the first - // character of str and recurse. - return (*str != '\0') && AtomMatchesChar(escaped, *regex, *str) && - MatchRegexAtHead(regex + 1, str + 1); - } -} - -// Returns true iff regex matches any substring of str. regex must be -// a valid simple regular expression, or the result is undefined. -// -// The algorithm is recursive, but the recursion depth doesn't exceed -// the regex length, so we won't need to worry about running out of -// stack space normally. In rare cases the time complexity can be -// exponential with respect to the regex length + the string length, -// but usually it's must faster (often close to linear). -bool MatchRegexAnywhere(const char* regex, const char* str) { - if (regex == NULL || str == NULL) - return false; - - if (*regex == '^') - return MatchRegexAtHead(regex + 1, str); - - // A successful match can be anywhere in str. - do { - if (MatchRegexAtHead(regex, str)) - return true; - } while (*str++ != '\0'); - return false; -} - -// Implements the RE class. - -RE::~RE() { - free(const_cast(pattern_)); - free(const_cast(full_pattern_)); -} - -// Returns true iff regular expression re matches the entire str. -bool RE::FullMatch(const char* str, const RE& re) { - return re.is_valid_ && MatchRegexAnywhere(re.full_pattern_, str); -} - -// Returns true iff regular expression re matches a substring of str -// (including str itself). -bool RE::PartialMatch(const char* str, const RE& re) { - return re.is_valid_ && MatchRegexAnywhere(re.pattern_, str); -} - -// Initializes an RE from its string representation. -void RE::Init(const char* regex) { - pattern_ = full_pattern_ = NULL; - if (regex != NULL) { - pattern_ = posix::StrDup(regex); - } - - is_valid_ = ValidateRegex(regex); - if (!is_valid_) { - // No need to calculate the full pattern when the regex is invalid. - return; - } - - const size_t len = strlen(regex); - // Reserves enough bytes to hold the regular expression used for a - // full match: we need space to prepend a '^', append a '$', and - // terminate the string with '\0'. - char* buffer = static_cast(malloc(len + 3)); - full_pattern_ = buffer; - - if (*regex != '^') - *buffer++ = '^'; // Makes sure full_pattern_ starts with '^'. - - // We don't use snprintf or strncpy, as they trigger a warning when - // compiled with VC++ 8.0. - memcpy(buffer, regex, len); - buffer += len; - - if (len == 0 || regex[len - 1] != '$') - *buffer++ = '$'; // Makes sure full_pattern_ ends with '$'. - - *buffer = '\0'; -} - -#endif // GTEST_USES_POSIX_RE - -const char kUnknownFile[] = "unknown file"; - -// Formats a source file path and a line number as they would appear -// in an error message from the compiler used to compile this code. -GTEST_API_ ::std::string FormatFileLocation(const char* file, int line) { - const std::string file_name(file == NULL ? kUnknownFile : file); - - if (line < 0) { - return file_name + ":"; - } -#ifdef _MSC_VER - return file_name + "(" + StreamableToString(line) + "):"; -#else - return file_name + ":" + StreamableToString(line) + ":"; -#endif // _MSC_VER -} - -// Formats a file location for compiler-independent XML output. -// Although this function is not platform dependent, we put it next to -// FormatFileLocation in order to contrast the two functions. -// Note that FormatCompilerIndependentFileLocation() does NOT append colon -// to the file location it produces, unlike FormatFileLocation(). -GTEST_API_ ::std::string FormatCompilerIndependentFileLocation( - const char* file, int line) { - const std::string file_name(file == NULL ? kUnknownFile : file); - - if (line < 0) - return file_name; - else - return file_name + ":" + StreamableToString(line); -} - -GTestLog::GTestLog(GTestLogSeverity severity, const char* file, int line) - : severity_(severity) { - const char* const marker = - severity == GTEST_INFO ? "[ INFO ]" : - severity == GTEST_WARNING ? "[WARNING]" : - severity == GTEST_ERROR ? "[ ERROR ]" : "[ FATAL ]"; - GetStream() << ::std::endl << marker << " " - << FormatFileLocation(file, line).c_str() << ": "; -} - -// Flushes the buffers and, if severity is GTEST_FATAL, aborts the program. -GTestLog::~GTestLog() { - GetStream() << ::std::endl; - if (severity_ == GTEST_FATAL) { - fflush(stderr); - posix::Abort(); - } -} - -// Disable Microsoft deprecation warnings for POSIX functions called from -// this class (creat, dup, dup2, and close) -GTEST_DISABLE_MSC_WARNINGS_PUSH_(4996) - -#if GTEST_HAS_STREAM_REDIRECTION - -// Object that captures an output stream (stdout/stderr). -class CapturedStream { - public: - // The ctor redirects the stream to a temporary file. - explicit CapturedStream(int fd) : fd_(fd), uncaptured_fd_(dup(fd)) { -# if GTEST_OS_WINDOWS - char temp_dir_path[MAX_PATH + 1] = { '\0' }; // NOLINT - char temp_file_path[MAX_PATH + 1] = { '\0' }; // NOLINT - - ::GetTempPathA(sizeof(temp_dir_path), temp_dir_path); - const UINT success = ::GetTempFileNameA(temp_dir_path, - "gtest_redir", - 0, // Generate unique file name. - temp_file_path); - GTEST_CHECK_(success != 0) - << "Unable to create a temporary file in " << temp_dir_path; - const int captured_fd = creat(temp_file_path, _S_IREAD | _S_IWRITE); - GTEST_CHECK_(captured_fd != -1) << "Unable to open temporary file " - << temp_file_path; - filename_ = temp_file_path; -# else - // There's no guarantee that a test has write access to the current - // directory, so we create the temporary file in the /tmp directory - // instead. We use /tmp on most systems, and /sdcard on Android. - // That's because Android doesn't have /tmp. -# if GTEST_OS_LINUX_ANDROID - // Note: Android applications are expected to call the framework's - // Context.getExternalStorageDirectory() method through JNI to get - // the location of the world-writable SD Card directory. However, - // this requires a Context handle, which cannot be retrieved - // globally from native code. Doing so also precludes running the - // code as part of a regular standalone executable, which doesn't - // run in a Dalvik process (e.g. when running it through 'adb shell'). - // - // The location /sdcard is directly accessible from native code - // and is the only location (unofficially) supported by the Android - // team. It's generally a symlink to the real SD Card mount point - // which can be /mnt/sdcard, /mnt/sdcard0, /system/media/sdcard, or - // other OEM-customized locations. Never rely on these, and always - // use /sdcard. - char name_template[] = "/sdcard/gtest_captured_stream.XXXXXX"; -# else - char name_template[] = "/tmp/captured_stream.XXXXXX"; -# endif // GTEST_OS_LINUX_ANDROID - const int captured_fd = mkstemp(name_template); - filename_ = name_template; -# endif // GTEST_OS_WINDOWS - fflush(NULL); - dup2(captured_fd, fd_); - close(captured_fd); - } - - ~CapturedStream() { - remove(filename_.c_str()); - } - - std::string GetCapturedString() { - if (uncaptured_fd_ != -1) { - // Restores the original stream. - fflush(NULL); - dup2(uncaptured_fd_, fd_); - close(uncaptured_fd_); - uncaptured_fd_ = -1; - } - - FILE* const file = posix::FOpen(filename_.c_str(), "r"); - const std::string content = ReadEntireFile(file); - posix::FClose(file); - return content; - } - - private: - const int fd_; // A stream to capture. - int uncaptured_fd_; - // Name of the temporary file holding the stderr output. - ::std::string filename_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(CapturedStream); -}; - -GTEST_DISABLE_MSC_WARNINGS_POP_() - -static CapturedStream* g_captured_stderr = NULL; -static CapturedStream* g_captured_stdout = NULL; - -// Starts capturing an output stream (stdout/stderr). -static void CaptureStream(int fd, const char* stream_name, - CapturedStream** stream) { - if (*stream != NULL) { - GTEST_LOG_(FATAL) << "Only one " << stream_name - << " capturer can exist at a time."; - } - *stream = new CapturedStream(fd); -} - -// Stops capturing the output stream and returns the captured string. -static std::string GetCapturedStream(CapturedStream** captured_stream) { - const std::string content = (*captured_stream)->GetCapturedString(); - - delete *captured_stream; - *captured_stream = NULL; - - return content; -} - -// Starts capturing stdout. -void CaptureStdout() { - CaptureStream(kStdOutFileno, "stdout", &g_captured_stdout); -} - -// Starts capturing stderr. -void CaptureStderr() { - CaptureStream(kStdErrFileno, "stderr", &g_captured_stderr); -} - -// Stops capturing stdout and returns the captured string. -std::string GetCapturedStdout() { - return GetCapturedStream(&g_captured_stdout); -} - -// Stops capturing stderr and returns the captured string. -std::string GetCapturedStderr() { - return GetCapturedStream(&g_captured_stderr); -} - -#endif // GTEST_HAS_STREAM_REDIRECTION - - - - - -size_t GetFileSize(FILE* file) { - fseek(file, 0, SEEK_END); - return static_cast(ftell(file)); -} - -std::string ReadEntireFile(FILE* file) { - const size_t file_size = GetFileSize(file); - char* const buffer = new char[file_size]; - - size_t bytes_last_read = 0; // # of bytes read in the last fread() - size_t bytes_read = 0; // # of bytes read so far - - fseek(file, 0, SEEK_SET); - - // Keeps reading the file until we cannot read further or the - // pre-determined file size is reached. - do { - bytes_last_read = fread(buffer+bytes_read, 1, file_size-bytes_read, file); - bytes_read += bytes_last_read; - } while (bytes_last_read > 0 && bytes_read < file_size); - - const std::string content(buffer, bytes_read); - delete[] buffer; - - return content; -} - -#if GTEST_HAS_DEATH_TEST -static const std::vector* g_injected_test_argvs = NULL; // Owned. - -std::vector GetInjectableArgvs() { - if (g_injected_test_argvs != NULL) { - return *g_injected_test_argvs; - } - return GetArgvs(); -} - -void SetInjectableArgvs(const std::vector* new_argvs) { - if (g_injected_test_argvs != new_argvs) delete g_injected_test_argvs; - g_injected_test_argvs = new_argvs; -} - -void SetInjectableArgvs(const std::vector& new_argvs) { - SetInjectableArgvs( - new std::vector(new_argvs.begin(), new_argvs.end())); -} - -#if GTEST_HAS_GLOBAL_STRING -void SetInjectableArgvs(const std::vector< ::string>& new_argvs) { - SetInjectableArgvs( - new std::vector(new_argvs.begin(), new_argvs.end())); -} -#endif // GTEST_HAS_GLOBAL_STRING - -void ClearInjectableArgvs() { - delete g_injected_test_argvs; - g_injected_test_argvs = NULL; -} -#endif // GTEST_HAS_DEATH_TEST - -#if GTEST_OS_WINDOWS_MOBILE -namespace posix { -void Abort() { - DebugBreak(); - TerminateProcess(GetCurrentProcess(), 1); -} -} // namespace posix -#endif // GTEST_OS_WINDOWS_MOBILE - -// Returns the name of the environment variable corresponding to the -// given flag. For example, FlagToEnvVar("foo") will return -// "GTEST_FOO" in the open-source version. -static std::string FlagToEnvVar(const char* flag) { - const std::string full_flag = - (Message() << GTEST_FLAG_PREFIX_ << flag).GetString(); - - Message env_var; - for (size_t i = 0; i != full_flag.length(); i++) { - env_var << ToUpper(full_flag.c_str()[i]); - } - - return env_var.GetString(); -} - -// Parses 'str' for a 32-bit signed integer. If successful, writes -// the result to *value and returns true; otherwise leaves *value -// unchanged and returns false. -bool ParseInt32(const Message& src_text, const char* str, Int32* value) { - // Parses the environment variable as a decimal integer. - char* end = NULL; - const long long_value = strtol(str, &end, 10); // NOLINT - - // Has strtol() consumed all characters in the string? - if (*end != '\0') { - // No - an invalid character was encountered. - Message msg; - msg << "WARNING: " << src_text - << " is expected to be a 32-bit integer, but actually" - << " has value \"" << str << "\".\n"; - printf("%s", msg.GetString().c_str()); - fflush(stdout); - return false; - } - - // Is the parsed value in the range of an Int32? - const Int32 result = static_cast(long_value); - if (long_value == LONG_MAX || long_value == LONG_MIN || - // The parsed value overflows as a long. (strtol() returns - // LONG_MAX or LONG_MIN when the input overflows.) - result != long_value - // The parsed value overflows as an Int32. - ) { - Message msg; - msg << "WARNING: " << src_text - << " is expected to be a 32-bit integer, but actually" - << " has value " << str << ", which overflows.\n"; - printf("%s", msg.GetString().c_str()); - fflush(stdout); - return false; - } - - *value = result; - return true; -} - -// Reads and returns the Boolean environment variable corresponding to -// the given flag; if it's not set, returns default_value. -// -// The value is considered true iff it's not "0". -bool BoolFromGTestEnv(const char* flag, bool default_value) { -#if defined(GTEST_GET_BOOL_FROM_ENV_) - return GTEST_GET_BOOL_FROM_ENV_(flag, default_value); -#else - const std::string env_var = FlagToEnvVar(flag); - const char* const string_value = posix::GetEnv(env_var.c_str()); - return string_value == NULL ? - default_value : strcmp(string_value, "0") != 0; -#endif // defined(GTEST_GET_BOOL_FROM_ENV_) -} - -// Reads and returns a 32-bit integer stored in the environment -// variable corresponding to the given flag; if it isn't set or -// doesn't represent a valid 32-bit integer, returns default_value. -Int32 Int32FromGTestEnv(const char* flag, Int32 default_value) { -#if defined(GTEST_GET_INT32_FROM_ENV_) - return GTEST_GET_INT32_FROM_ENV_(flag, default_value); -#else - const std::string env_var = FlagToEnvVar(flag); - const char* const string_value = posix::GetEnv(env_var.c_str()); - if (string_value == NULL) { - // The environment variable is not set. - return default_value; - } - - Int32 result = default_value; - if (!ParseInt32(Message() << "Environment variable " << env_var, - string_value, &result)) { - printf("The default value %s is used.\n", - (Message() << default_value).GetString().c_str()); - fflush(stdout); - return default_value; - } - - return result; -#endif // defined(GTEST_GET_INT32_FROM_ENV_) -} - -// As a special case for the 'output' flag, if GTEST_OUTPUT is not -// set, we look for XML_OUTPUT_FILE, which is set by the Bazel build -// system. The value of XML_OUTPUT_FILE is a filename without the -// "xml:" prefix of GTEST_OUTPUT. -// Note that this is meant to be called at the call site so it does -// not check that the flag is 'output' -// In essence this checks an env variable called XML_OUTPUT_FILE -// and if it is set we prepend "xml:" to its value, if it not set we return "" -std::string OutputFlagAlsoCheckEnvVar(){ - std::string default_value_for_output_flag = ""; - const char* xml_output_file_env = posix::GetEnv("XML_OUTPUT_FILE"); - if (NULL != xml_output_file_env) { - default_value_for_output_flag = std::string("xml:") + xml_output_file_env; - } - return default_value_for_output_flag; -} - -// Reads and returns the string environment variable corresponding to -// the given flag; if it's not set, returns default_value. -const char* StringFromGTestEnv(const char* flag, const char* default_value) { -#if defined(GTEST_GET_STRING_FROM_ENV_) - return GTEST_GET_STRING_FROM_ENV_(flag, default_value); -#else - const std::string env_var = FlagToEnvVar(flag); - const char* const value = posix::GetEnv(env_var.c_str()); - return value == NULL ? default_value : value; -#endif // defined(GTEST_GET_STRING_FROM_ENV_) -} - -} // namespace internal -} // namespace testing -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Test - The Google C++ Testing and Mocking Framework -// -// This file implements a universal value printer that can print a -// value of any type T: -// -// void ::testing::internal::UniversalPrinter::Print(value, ostream_ptr); -// -// It uses the << operator when possible, and prints the bytes in the -// object otherwise. A user can override its behavior for a class -// type Foo by defining either operator<<(::std::ostream&, const Foo&) -// or void PrintTo(const Foo&, ::std::ostream*) in the namespace that -// defines Foo. - -#include -#include -#include -#include // NOLINT -#include - -namespace testing { - -namespace { - -using ::std::ostream; - -// Prints a segment of bytes in the given object. -GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ -GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ -GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ -void PrintByteSegmentInObjectTo(const unsigned char* obj_bytes, size_t start, - size_t count, ostream* os) { - char text[5] = ""; - for (size_t i = 0; i != count; i++) { - const size_t j = start + i; - if (i != 0) { - // Organizes the bytes into groups of 2 for easy parsing by - // human. - if ((j % 2) == 0) - *os << ' '; - else - *os << '-'; - } - GTEST_SNPRINTF_(text, sizeof(text), "%02X", obj_bytes[j]); - *os << text; - } -} - -// Prints the bytes in the given value to the given ostream. -void PrintBytesInObjectToImpl(const unsigned char* obj_bytes, size_t count, - ostream* os) { - // Tells the user how big the object is. - *os << count << "-byte object <"; - - const size_t kThreshold = 132; - const size_t kChunkSize = 64; - // If the object size is bigger than kThreshold, we'll have to omit - // some details by printing only the first and the last kChunkSize - // bytes. - // TODO(wan): let the user control the threshold using a flag. - if (count < kThreshold) { - PrintByteSegmentInObjectTo(obj_bytes, 0, count, os); - } else { - PrintByteSegmentInObjectTo(obj_bytes, 0, kChunkSize, os); - *os << " ... "; - // Rounds up to 2-byte boundary. - const size_t resume_pos = (count - kChunkSize + 1)/2*2; - PrintByteSegmentInObjectTo(obj_bytes, resume_pos, count - resume_pos, os); - } - *os << ">"; -} - -} // namespace - -namespace internal2 { - -// Delegates to PrintBytesInObjectToImpl() to print the bytes in the -// given object. The delegation simplifies the implementation, which -// uses the << operator and thus is easier done outside of the -// ::testing::internal namespace, which contains a << operator that -// sometimes conflicts with the one in STL. -void PrintBytesInObjectTo(const unsigned char* obj_bytes, size_t count, - ostream* os) { - PrintBytesInObjectToImpl(obj_bytes, count, os); -} - -} // namespace internal2 - -namespace internal { - -// Depending on the value of a char (or wchar_t), we print it in one -// of three formats: -// - as is if it's a printable ASCII (e.g. 'a', '2', ' '), -// - as a hexadecimal escape sequence (e.g. '\x7F'), or -// - as a special escape sequence (e.g. '\r', '\n'). -enum CharFormat { - kAsIs, - kHexEscape, - kSpecialEscape -}; - -// Returns true if c is a printable ASCII character. We test the -// value of c directly instead of calling isprint(), which is buggy on -// Windows Mobile. -inline bool IsPrintableAscii(wchar_t c) { - return 0x20 <= c && c <= 0x7E; -} - -// Prints a wide or narrow char c as a character literal without the -// quotes, escaping it when necessary; returns how c was formatted. -// The template argument UnsignedChar is the unsigned version of Char, -// which is the type of c. -template -static CharFormat PrintAsCharLiteralTo(Char c, ostream* os) { - switch (static_cast(c)) { - case L'\0': - *os << "\\0"; - break; - case L'\'': - *os << "\\'"; - break; - case L'\\': - *os << "\\\\"; - break; - case L'\a': - *os << "\\a"; - break; - case L'\b': - *os << "\\b"; - break; - case L'\f': - *os << "\\f"; - break; - case L'\n': - *os << "\\n"; - break; - case L'\r': - *os << "\\r"; - break; - case L'\t': - *os << "\\t"; - break; - case L'\v': - *os << "\\v"; - break; - default: - if (IsPrintableAscii(c)) { - *os << static_cast(c); - return kAsIs; - } else { - ostream::fmtflags flags = os->flags(); - *os << "\\x" << std::hex << std::uppercase - << static_cast(static_cast(c)); - os->flags(flags); - return kHexEscape; - } - } - return kSpecialEscape; -} - -// Prints a wchar_t c as if it's part of a string literal, escaping it when -// necessary; returns how c was formatted. -static CharFormat PrintAsStringLiteralTo(wchar_t c, ostream* os) { - switch (c) { - case L'\'': - *os << "'"; - return kAsIs; - case L'"': - *os << "\\\""; - return kSpecialEscape; - default: - return PrintAsCharLiteralTo(c, os); - } -} - -// Prints a char c as if it's part of a string literal, escaping it when -// necessary; returns how c was formatted. -static CharFormat PrintAsStringLiteralTo(char c, ostream* os) { - return PrintAsStringLiteralTo( - static_cast(static_cast(c)), os); -} - -// Prints a wide or narrow character c and its code. '\0' is printed -// as "'\\0'", other unprintable characters are also properly escaped -// using the standard C++ escape sequence. The template argument -// UnsignedChar is the unsigned version of Char, which is the type of c. -template -void PrintCharAndCodeTo(Char c, ostream* os) { - // First, print c as a literal in the most readable form we can find. - *os << ((sizeof(c) > 1) ? "L'" : "'"); - const CharFormat format = PrintAsCharLiteralTo(c, os); - *os << "'"; - - // To aid user debugging, we also print c's code in decimal, unless - // it's 0 (in which case c was printed as '\\0', making the code - // obvious). - if (c == 0) - return; - *os << " (" << static_cast(c); - - // For more convenience, we print c's code again in hexadecimal, - // unless c was already printed in the form '\x##' or the code is in - // [1, 9]. - if (format == kHexEscape || (1 <= c && c <= 9)) { - // Do nothing. - } else { - *os << ", 0x" << String::FormatHexInt(static_cast(c)); - } - *os << ")"; -} - -void PrintTo(unsigned char c, ::std::ostream* os) { - PrintCharAndCodeTo(c, os); -} -void PrintTo(signed char c, ::std::ostream* os) { - PrintCharAndCodeTo(c, os); -} - -// Prints a wchar_t as a symbol if it is printable or as its internal -// code otherwise and also as its code. L'\0' is printed as "L'\\0'". -void PrintTo(wchar_t wc, ostream* os) { - PrintCharAndCodeTo(wc, os); -} - -// Prints the given array of characters to the ostream. CharType must be either -// char or wchar_t. -// The array starts at begin, the length is len, it may include '\0' characters -// and may not be NUL-terminated. -template -GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ -GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ -GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ -static CharFormat PrintCharsAsStringTo( - const CharType* begin, size_t len, ostream* os) { - const char* const kQuoteBegin = sizeof(CharType) == 1 ? "\"" : "L\""; - *os << kQuoteBegin; - bool is_previous_hex = false; - CharFormat print_format = kAsIs; - for (size_t index = 0; index < len; ++index) { - const CharType cur = begin[index]; - if (is_previous_hex && IsXDigit(cur)) { - // Previous character is of '\x..' form and this character can be - // interpreted as another hexadecimal digit in its number. Break string to - // disambiguate. - *os << "\" " << kQuoteBegin; - } - is_previous_hex = PrintAsStringLiteralTo(cur, os) == kHexEscape; - // Remember if any characters required hex escaping. - if (is_previous_hex) { - print_format = kHexEscape; - } - } - *os << "\""; - return print_format; -} - -// Prints a (const) char/wchar_t array of 'len' elements, starting at address -// 'begin'. CharType must be either char or wchar_t. -template -GTEST_ATTRIBUTE_NO_SANITIZE_MEMORY_ -GTEST_ATTRIBUTE_NO_SANITIZE_ADDRESS_ -GTEST_ATTRIBUTE_NO_SANITIZE_THREAD_ -static void UniversalPrintCharArray( - const CharType* begin, size_t len, ostream* os) { - // The code - // const char kFoo[] = "foo"; - // generates an array of 4, not 3, elements, with the last one being '\0'. - // - // Therefore when printing a char array, we don't print the last element if - // it's '\0', such that the output matches the string literal as it's - // written in the source code. - if (len > 0 && begin[len - 1] == '\0') { - PrintCharsAsStringTo(begin, len - 1, os); - return; - } - - // If, however, the last element in the array is not '\0', e.g. - // const char kFoo[] = { 'f', 'o', 'o' }; - // we must print the entire array. We also print a message to indicate - // that the array is not NUL-terminated. - PrintCharsAsStringTo(begin, len, os); - *os << " (no terminating NUL)"; -} - -// Prints a (const) char array of 'len' elements, starting at address 'begin'. -void UniversalPrintArray(const char* begin, size_t len, ostream* os) { - UniversalPrintCharArray(begin, len, os); -} - -// Prints a (const) wchar_t array of 'len' elements, starting at address -// 'begin'. -void UniversalPrintArray(const wchar_t* begin, size_t len, ostream* os) { - UniversalPrintCharArray(begin, len, os); -} - -// Prints the given C string to the ostream. -void PrintTo(const char* s, ostream* os) { - if (s == NULL) { - *os << "NULL"; - } else { - *os << ImplicitCast_(s) << " pointing to "; - PrintCharsAsStringTo(s, strlen(s), os); - } -} - -// MSVC compiler can be configured to define whar_t as a typedef -// of unsigned short. Defining an overload for const wchar_t* in that case -// would cause pointers to unsigned shorts be printed as wide strings, -// possibly accessing more memory than intended and causing invalid -// memory accesses. MSVC defines _NATIVE_WCHAR_T_DEFINED symbol when -// wchar_t is implemented as a native type. -#if !defined(_MSC_VER) || defined(_NATIVE_WCHAR_T_DEFINED) -// Prints the given wide C string to the ostream. -void PrintTo(const wchar_t* s, ostream* os) { - if (s == NULL) { - *os << "NULL"; - } else { - *os << ImplicitCast_(s) << " pointing to "; - PrintCharsAsStringTo(s, std::wcslen(s), os); - } -} -#endif // wchar_t is native - -namespace { - -bool ContainsUnprintableControlCodes(const char* str, size_t length) { - const unsigned char *s = reinterpret_cast(str); - - for (size_t i = 0; i < length; i++) { - unsigned char ch = *s++; - if (std::iscntrl(ch)) { - switch (ch) { - case '\t': - case '\n': - case '\r': - break; - default: - return true; - } - } - } - return false; -} - -bool IsUTF8TrailByte(unsigned char t) { return 0x80 <= t && t<= 0xbf; } - -bool IsValidUTF8(const char* str, size_t length) { - const unsigned char *s = reinterpret_cast(str); - - for (size_t i = 0; i < length;) { - unsigned char lead = s[i++]; - - if (lead <= 0x7f) { - continue; // single-byte character (ASCII) 0..7F - } - if (lead < 0xc2) { - return false; // trail byte or non-shortest form - } else if (lead <= 0xdf && (i + 1) <= length && IsUTF8TrailByte(s[i])) { - ++i; // 2-byte character - } else if (0xe0 <= lead && lead <= 0xef && (i + 2) <= length && - IsUTF8TrailByte(s[i]) && - IsUTF8TrailByte(s[i + 1]) && - // check for non-shortest form and surrogate - (lead != 0xe0 || s[i] >= 0xa0) && - (lead != 0xed || s[i] < 0xa0)) { - i += 2; // 3-byte character - } else if (0xf0 <= lead && lead <= 0xf4 && (i + 3) <= length && - IsUTF8TrailByte(s[i]) && - IsUTF8TrailByte(s[i + 1]) && - IsUTF8TrailByte(s[i + 2]) && - // check for non-shortest form - (lead != 0xf0 || s[i] >= 0x90) && - (lead != 0xf4 || s[i] < 0x90)) { - i += 3; // 4-byte character - } else { - return false; - } - } - return true; -} - -void ConditionalPrintAsText(const char* str, size_t length, ostream* os) { - if (!ContainsUnprintableControlCodes(str, length) && - IsValidUTF8(str, length)) { - *os << "\n As Text: \"" << str << "\""; - } -} - -} // anonymous namespace - -// Prints a ::string object. -#if GTEST_HAS_GLOBAL_STRING -void PrintStringTo(const ::string& s, ostream* os) { - if (PrintCharsAsStringTo(s.data(), s.size(), os) == kHexEscape) { - if (GTEST_FLAG(print_utf8)) { - ConditionalPrintAsText(s.data(), s.size(), os); - } - } -} -#endif // GTEST_HAS_GLOBAL_STRING - -void PrintStringTo(const ::std::string& s, ostream* os) { - if (PrintCharsAsStringTo(s.data(), s.size(), os) == kHexEscape) { - if (GTEST_FLAG(print_utf8)) { - ConditionalPrintAsText(s.data(), s.size(), os); - } - } -} - -// Prints a ::wstring object. -#if GTEST_HAS_GLOBAL_WSTRING -void PrintWideStringTo(const ::wstring& s, ostream* os) { - PrintCharsAsStringTo(s.data(), s.size(), os); -} -#endif // GTEST_HAS_GLOBAL_WSTRING - -#if GTEST_HAS_STD_WSTRING -void PrintWideStringTo(const ::std::wstring& s, ostream* os) { - PrintCharsAsStringTo(s.data(), s.size(), os); -} -#endif // GTEST_HAS_STD_WSTRING - -} // namespace internal - -} // namespace testing -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: mheule@google.com (Markus Heule) -// -// The Google C++ Testing and Mocking Framework (Google Test) - - -namespace testing { - -using internal::GetUnitTestImpl; - -// Gets the summary of the failure message by omitting the stack trace -// in it. -std::string TestPartResult::ExtractSummary(const char* message) { - const char* const stack_trace = strstr(message, internal::kStackTraceMarker); - return stack_trace == NULL ? message : - std::string(message, stack_trace); -} - -// Prints a TestPartResult object. -std::ostream& operator<<(std::ostream& os, const TestPartResult& result) { - return os - << result.file_name() << ":" << result.line_number() << ": " - << (result.type() == TestPartResult::kSuccess ? "Success" : - result.type() == TestPartResult::kFatalFailure ? "Fatal failure" : - "Non-fatal failure") << ":\n" - << result.message() << std::endl; -} - -// Appends a TestPartResult to the array. -void TestPartResultArray::Append(const TestPartResult& result) { - array_.push_back(result); -} - -// Returns the TestPartResult at the given index (0-based). -const TestPartResult& TestPartResultArray::GetTestPartResult(int index) const { - if (index < 0 || index >= size()) { - printf("\nInvalid index (%d) into TestPartResultArray.\n", index); - internal::posix::Abort(); - } - - return array_[index]; -} - -// Returns the number of TestPartResult objects in the array. -int TestPartResultArray::size() const { - return static_cast(array_.size()); -} - -namespace internal { - -HasNewFatalFailureHelper::HasNewFatalFailureHelper() - : has_new_fatal_failure_(false), - original_reporter_(GetUnitTestImpl()-> - GetTestPartResultReporterForCurrentThread()) { - GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread(this); -} - -HasNewFatalFailureHelper::~HasNewFatalFailureHelper() { - GetUnitTestImpl()->SetTestPartResultReporterForCurrentThread( - original_reporter_); -} - -void HasNewFatalFailureHelper::ReportTestPartResult( - const TestPartResult& result) { - if (result.fatally_failed()) - has_new_fatal_failure_ = true; - original_reporter_->ReportTestPartResult(result); -} - -} // namespace internal - -} // namespace testing -// Copyright 2008 Google Inc. -// All Rights Reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - - - -namespace testing { -namespace internal { - -#if GTEST_HAS_TYPED_TEST_P - -// Skips to the first non-space char in str. Returns an empty string if str -// contains only whitespace characters. -static const char* SkipSpaces(const char* str) { - while (IsSpace(*str)) - str++; - return str; -} - -static std::vector SplitIntoTestNames(const char* src) { - std::vector name_vec; - src = SkipSpaces(src); - for (; src != NULL; src = SkipComma(src)) { - name_vec.push_back(StripTrailingSpaces(GetPrefixUntilComma(src))); - } - return name_vec; -} - -// Verifies that registered_tests match the test names in -// registered_tests_; returns registered_tests if successful, or -// aborts the program otherwise. -const char* TypedTestCasePState::VerifyRegisteredTestNames( - const char* file, int line, const char* registered_tests) { - typedef RegisteredTestsMap::const_iterator RegisteredTestIter; - registered_ = true; - - std::vector name_vec = SplitIntoTestNames(registered_tests); - - Message errors; - - std::set tests; - for (std::vector::const_iterator name_it = name_vec.begin(); - name_it != name_vec.end(); ++name_it) { - const std::string& name = *name_it; - if (tests.count(name) != 0) { - errors << "Test " << name << " is listed more than once.\n"; - continue; - } - - bool found = false; - for (RegisteredTestIter it = registered_tests_.begin(); - it != registered_tests_.end(); - ++it) { - if (name == it->first) { - found = true; - break; - } - } - - if (found) { - tests.insert(name); - } else { - errors << "No test named " << name - << " can be found in this test case.\n"; - } - } - - for (RegisteredTestIter it = registered_tests_.begin(); - it != registered_tests_.end(); - ++it) { - if (tests.count(it->first) == 0) { - errors << "You forgot to list test " << it->first << ".\n"; - } - } - - const std::string& errors_str = errors.GetString(); - if (errors_str != "") { - fprintf(stderr, "%s %s", FormatFileLocation(file, line).c_str(), - errors_str.c_str()); - fflush(stderr); - posix::Abort(); - } - - return registered_tests; -} - -#endif // GTEST_HAS_TYPED_TEST_P - -} // namespace internal -} // namespace testing -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) -// -// Google C++ Mocking Framework (Google Mock) -// -// This file #includes all Google Mock implementation .cc files. The -// purpose is to allow a user to build Google Mock by compiling this -// file alone. - -// This line ensures that gmock.h can be compiled on its own, even -// when it's fused. -#include "gmock/gmock.h" - -// The following lines pull in the real gmock *.cc files. -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Mock - a framework for writing C++ mock classes. -// -// This file implements cardinalities. - - -#include -#include // NOLINT -#include -#include - -namespace testing { - -namespace { - -// Implements the Between(m, n) cardinality. -class BetweenCardinalityImpl : public CardinalityInterface { - public: - BetweenCardinalityImpl(int min, int max) - : min_(min >= 0 ? min : 0), - max_(max >= min_ ? max : min_) { - std::stringstream ss; - if (min < 0) { - ss << "The invocation lower bound must be >= 0, " - << "but is actually " << min << "."; - internal::Expect(false, __FILE__, __LINE__, ss.str()); - } else if (max < 0) { - ss << "The invocation upper bound must be >= 0, " - << "but is actually " << max << "."; - internal::Expect(false, __FILE__, __LINE__, ss.str()); - } else if (min > max) { - ss << "The invocation upper bound (" << max - << ") must be >= the invocation lower bound (" << min - << ")."; - internal::Expect(false, __FILE__, __LINE__, ss.str()); - } - } - - // Conservative estimate on the lower/upper bound of the number of - // calls allowed. - virtual int ConservativeLowerBound() const { return min_; } - virtual int ConservativeUpperBound() const { return max_; } - - virtual bool IsSatisfiedByCallCount(int call_count) const { - return min_ <= call_count && call_count <= max_; - } - - virtual bool IsSaturatedByCallCount(int call_count) const { - return call_count >= max_; - } - - virtual void DescribeTo(::std::ostream* os) const; - - private: - const int min_; - const int max_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(BetweenCardinalityImpl); -}; - -// Formats "n times" in a human-friendly way. -inline std::string FormatTimes(int n) { - if (n == 1) { - return "once"; - } else if (n == 2) { - return "twice"; - } else { - std::stringstream ss; - ss << n << " times"; - return ss.str(); - } -} - -// Describes the Between(m, n) cardinality in human-friendly text. -void BetweenCardinalityImpl::DescribeTo(::std::ostream* os) const { - if (min_ == 0) { - if (max_ == 0) { - *os << "never called"; - } else if (max_ == INT_MAX) { - *os << "called any number of times"; - } else { - *os << "called at most " << FormatTimes(max_); - } - } else if (min_ == max_) { - *os << "called " << FormatTimes(min_); - } else if (max_ == INT_MAX) { - *os << "called at least " << FormatTimes(min_); - } else { - // 0 < min_ < max_ < INT_MAX - *os << "called between " << min_ << " and " << max_ << " times"; - } -} - -} // Unnamed namespace - -// Describes the given call count to an ostream. -void Cardinality::DescribeActualCallCountTo(int actual_call_count, - ::std::ostream* os) { - if (actual_call_count > 0) { - *os << "called " << FormatTimes(actual_call_count); - } else { - *os << "never called"; - } -} - -// Creates a cardinality that allows at least n calls. -GTEST_API_ Cardinality AtLeast(int n) { return Between(n, INT_MAX); } - -// Creates a cardinality that allows at most n calls. -GTEST_API_ Cardinality AtMost(int n) { return Between(0, n); } - -// Creates a cardinality that allows any number of calls. -GTEST_API_ Cardinality AnyNumber() { return AtLeast(0); } - -// Creates a cardinality that allows between min and max calls. -GTEST_API_ Cardinality Between(int min, int max) { - return Cardinality(new BetweenCardinalityImpl(min, max)); -} - -// Creates a cardinality that allows exactly n calls. -GTEST_API_ Cardinality Exactly(int n) { return Between(n, n); } - -} // namespace testing -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Mock - a framework for writing C++ mock classes. -// -// This file defines some utilities useful for implementing Google -// Mock. They are subject to change without notice, so please DO NOT -// USE THEM IN USER CODE. - - -#include -#include // NOLINT -#include - -namespace testing { -namespace internal { - -// Joins a vector of strings as if they are fields of a tuple; returns -// the joined string. -GTEST_API_ std::string JoinAsTuple(const Strings& fields) { - switch (fields.size()) { - case 0: - return ""; - case 1: - return fields[0]; - default: - std::string result = "(" + fields[0]; - for (size_t i = 1; i < fields.size(); i++) { - result += ", "; - result += fields[i]; - } - result += ")"; - return result; - } -} - -// Converts an identifier name to a space-separated list of lower-case -// words. Each maximum substring of the form [A-Za-z][a-z]*|\d+ is -// treated as one word. For example, both "FooBar123" and -// "foo_bar_123" are converted to "foo bar 123". -GTEST_API_ std::string ConvertIdentifierNameToWords(const char* id_name) { - std::string result; - char prev_char = '\0'; - for (const char* p = id_name; *p != '\0'; prev_char = *(p++)) { - // We don't care about the current locale as the input is - // guaranteed to be a valid C++ identifier name. - const bool starts_new_word = IsUpper(*p) || - (!IsAlpha(prev_char) && IsLower(*p)) || - (!IsDigit(prev_char) && IsDigit(*p)); - - if (IsAlNum(*p)) { - if (starts_new_word && result != "") - result += ' '; - result += ToLower(*p); - } - } - return result; -} - -// This class reports Google Mock failures as Google Test failures. A -// user can define another class in a similar fashion if they intend to -// use Google Mock with a testing framework other than Google Test. -class GoogleTestFailureReporter : public FailureReporterInterface { - public: - virtual void ReportFailure(FailureType type, const char* file, int line, - const std::string& message) { - AssertHelper(type == kFatal ? - TestPartResult::kFatalFailure : - TestPartResult::kNonFatalFailure, - file, - line, - message.c_str()) = Message(); - if (type == kFatal) { - posix::Abort(); - } - } -}; - -// Returns the global failure reporter. Will create a -// GoogleTestFailureReporter and return it the first time called. -GTEST_API_ FailureReporterInterface* GetFailureReporter() { - // Points to the global failure reporter used by Google Mock. gcc - // guarantees that the following use of failure_reporter is - // thread-safe. We may need to add additional synchronization to - // protect failure_reporter if we port Google Mock to other - // compilers. - static FailureReporterInterface* const failure_reporter = - new GoogleTestFailureReporter(); - return failure_reporter; -} - -// Protects global resources (stdout in particular) used by Log(). -static GTEST_DEFINE_STATIC_MUTEX_(g_log_mutex); - -// Returns true iff a log with the given severity is visible according -// to the --gmock_verbose flag. -GTEST_API_ bool LogIsVisible(LogSeverity severity) { - if (GMOCK_FLAG(verbose) == kInfoVerbosity) { - // Always show the log if --gmock_verbose=info. - return true; - } else if (GMOCK_FLAG(verbose) == kErrorVerbosity) { - // Always hide it if --gmock_verbose=error. - return false; - } else { - // If --gmock_verbose is neither "info" nor "error", we treat it - // as "warning" (its default value). - return severity == kWarning; - } -} - -// Prints the given message to stdout iff 'severity' >= the level -// specified by the --gmock_verbose flag. If stack_frames_to_skip >= -// 0, also prints the stack trace excluding the top -// stack_frames_to_skip frames. In opt mode, any positive -// stack_frames_to_skip is treated as 0, since we don't know which -// function calls will be inlined by the compiler and need to be -// conservative. -GTEST_API_ void Log(LogSeverity severity, const std::string& message, - int stack_frames_to_skip) { - if (!LogIsVisible(severity)) - return; - - // Ensures that logs from different threads don't interleave. - MutexLock l(&g_log_mutex); - - // "using ::std::cout;" doesn't work with Symbian's STLport, where cout is a - // macro. - - if (severity == kWarning) { - // Prints a GMOCK WARNING marker to make the warnings easily searchable. - std::cout << "\nGMOCK WARNING:"; - } - // Pre-pends a new-line to message if it doesn't start with one. - if (message.empty() || message[0] != '\n') { - std::cout << "\n"; - } - std::cout << message; - if (stack_frames_to_skip >= 0) { -#ifdef NDEBUG - // In opt mode, we have to be conservative and skip no stack frame. - const int actual_to_skip = 0; -#else - // In dbg mode, we can do what the caller tell us to do (plus one - // for skipping this function's stack frame). - const int actual_to_skip = stack_frames_to_skip + 1; -#endif // NDEBUG - - // Appends a new-line to message if it doesn't end with one. - if (!message.empty() && *message.rbegin() != '\n') { - std::cout << "\n"; - } - std::cout << "Stack trace:\n" - << ::testing::internal::GetCurrentOsStackTraceExceptTop( - ::testing::UnitTest::GetInstance(), actual_to_skip); - } - std::cout << ::std::flush; -} - -GTEST_API_ WithoutMatchers GetWithoutMatchers() { return WithoutMatchers(); } - -GTEST_API_ void IllegalDoDefault(const char* file, int line) { - internal::Assert( - false, file, line, - "You are using DoDefault() inside a composite action like " - "DoAll() or WithArgs(). This is not supported for technical " - "reasons. Please instead spell out the default action, or " - "assign the default action to an Action variable and use " - "the variable in various places."); -} - -} // namespace internal -} // namespace testing -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Mock - a framework for writing C++ mock classes. -// -// This file implements Matcher, Matcher, and -// utilities for defining matchers. - - -#include -#include -#include -#include - -namespace testing { - -// Constructs a matcher that matches a const std::string& whose value is -// equal to s. -Matcher::Matcher(const std::string& s) { *this = Eq(s); } - -#if GTEST_HAS_GLOBAL_STRING -// Constructs a matcher that matches a const std::string& whose value is -// equal to s. -Matcher::Matcher(const ::string& s) { - *this = Eq(static_cast(s)); -} -#endif // GTEST_HAS_GLOBAL_STRING - -// Constructs a matcher that matches a const std::string& whose value is -// equal to s. -Matcher::Matcher(const char* s) { - *this = Eq(std::string(s)); -} - -// Constructs a matcher that matches a std::string whose value is equal to -// s. -Matcher::Matcher(const std::string& s) { *this = Eq(s); } - -#if GTEST_HAS_GLOBAL_STRING -// Constructs a matcher that matches a std::string whose value is equal to -// s. -Matcher::Matcher(const ::string& s) { - *this = Eq(static_cast(s)); -} -#endif // GTEST_HAS_GLOBAL_STRING - -// Constructs a matcher that matches a std::string whose value is equal to -// s. -Matcher::Matcher(const char* s) { *this = Eq(std::string(s)); } - -#if GTEST_HAS_GLOBAL_STRING -// Constructs a matcher that matches a const ::string& whose value is -// equal to s. -Matcher::Matcher(const std::string& s) { - *this = Eq(static_cast<::string>(s)); -} - -// Constructs a matcher that matches a const ::string& whose value is -// equal to s. -Matcher::Matcher(const ::string& s) { *this = Eq(s); } - -// Constructs a matcher that matches a const ::string& whose value is -// equal to s. -Matcher::Matcher(const char* s) { *this = Eq(::string(s)); } - -// Constructs a matcher that matches a ::string whose value is equal to s. -Matcher<::string>::Matcher(const std::string& s) { - *this = Eq(static_cast<::string>(s)); -} - -// Constructs a matcher that matches a ::string whose value is equal to s. -Matcher<::string>::Matcher(const ::string& s) { *this = Eq(s); } - -// Constructs a matcher that matches a string whose value is equal to s. -Matcher<::string>::Matcher(const char* s) { *this = Eq(::string(s)); } -#endif // GTEST_HAS_GLOBAL_STRING - -#if GTEST_HAS_ABSL -// Constructs a matcher that matches a const absl::string_view& whose value is -// equal to s. -Matcher::Matcher(const std::string& s) { - *this = Eq(s); -} - -#if GTEST_HAS_GLOBAL_STRING -// Constructs a matcher that matches a const absl::string_view& whose value is -// equal to s. -Matcher::Matcher(const ::string& s) { *this = Eq(s); } -#endif // GTEST_HAS_GLOBAL_STRING - -// Constructs a matcher that matches a const absl::string_view& whose value is -// equal to s. -Matcher::Matcher(const char* s) { - *this = Eq(std::string(s)); -} - -// Constructs a matcher that matches a const absl::string_view& whose value is -// equal to s. -Matcher::Matcher(absl::string_view s) { - *this = Eq(std::string(s)); -} - -// Constructs a matcher that matches a absl::string_view whose value is equal to -// s. -Matcher::Matcher(const std::string& s) { *this = Eq(s); } - -#if GTEST_HAS_GLOBAL_STRING -// Constructs a matcher that matches a absl::string_view whose value is equal to -// s. -Matcher::Matcher(const ::string& s) { *this = Eq(s); } -#endif // GTEST_HAS_GLOBAL_STRING - -// Constructs a matcher that matches a absl::string_view whose value is equal to -// s. -Matcher::Matcher(const char* s) { - *this = Eq(std::string(s)); -} - -// Constructs a matcher that matches a absl::string_view whose value is equal to -// s. -Matcher::Matcher(absl::string_view s) { - *this = Eq(std::string(s)); -} -#endif // GTEST_HAS_ABSL - -namespace internal { - -// Returns the description for a matcher defined using the MATCHER*() -// macro where the user-supplied description string is "", if -// 'negation' is false; otherwise returns the description of the -// negation of the matcher. 'param_values' contains a list of strings -// that are the print-out of the matcher's parameters. -GTEST_API_ std::string FormatMatcherDescription(bool negation, - const char* matcher_name, - const Strings& param_values) { - std::string result = ConvertIdentifierNameToWords(matcher_name); - if (param_values.size() >= 1) result += " " + JoinAsTuple(param_values); - return negation ? "not (" + result + ")" : result; -} - -// FindMaxBipartiteMatching and its helper class. -// -// Uses the well-known Ford-Fulkerson max flow method to find a maximum -// bipartite matching. Flow is considered to be from left to right. -// There is an implicit source node that is connected to all of the left -// nodes, and an implicit sink node that is connected to all of the -// right nodes. All edges have unit capacity. -// -// Neither the flow graph nor the residual flow graph are represented -// explicitly. Instead, they are implied by the information in 'graph' and -// a vector called 'left_' whose elements are initialized to the -// value kUnused. This represents the initial state of the algorithm, -// where the flow graph is empty, and the residual flow graph has the -// following edges: -// - An edge from source to each left_ node -// - An edge from each right_ node to sink -// - An edge from each left_ node to each right_ node, if the -// corresponding edge exists in 'graph'. -// -// When the TryAugment() method adds a flow, it sets left_[l] = r for some -// nodes l and r. This induces the following changes: -// - The edges (source, l), (l, r), and (r, sink) are added to the -// flow graph. -// - The same three edges are removed from the residual flow graph. -// - The reverse edges (l, source), (r, l), and (sink, r) are added -// to the residual flow graph, which is a directional graph -// representing unused flow capacity. -// -// When the method augments a flow (moving left_[l] from some r1 to some -// other r2), this can be thought of as "undoing" the above steps with -// respect to r1 and "redoing" them with respect to r2. -// -// It bears repeating that the flow graph and residual flow graph are -// never represented explicitly, but can be derived by looking at the -// information in 'graph' and in left_. -// -// As an optimization, there is a second vector called right_ which -// does not provide any new information. Instead, it enables more -// efficient queries about edges entering or leaving the right-side nodes -// of the flow or residual flow graphs. The following invariants are -// maintained: -// -// left[l] == kUnused or right[left[l]] == l -// right[r] == kUnused or left[right[r]] == r -// -// . [ source ] . -// . ||| . -// . ||| . -// . ||\--> left[0]=1 ---\ right[0]=-1 ----\ . -// . || | | . -// . |\---> left[1]=-1 \--> right[1]=0 ---\| . -// . | || . -// . \----> left[2]=2 ------> right[2]=2 --\|| . -// . ||| . -// . elements matchers vvv . -// . [ sink ] . -// -// See Also: -// [1] Cormen, et al (2001). "Section 26.2: The Ford-Fulkerson method". -// "Introduction to Algorithms (Second ed.)", pp. 651-664. -// [2] "Ford-Fulkerson algorithm", Wikipedia, -// 'http://en.wikipedia.org/wiki/Ford%E2%80%93Fulkerson_algorithm' -class MaxBipartiteMatchState { - public: - explicit MaxBipartiteMatchState(const MatchMatrix& graph) - : graph_(&graph), - left_(graph_->LhsSize(), kUnused), - right_(graph_->RhsSize(), kUnused) {} - - // Returns the edges of a maximal match, each in the form {left, right}. - ElementMatcherPairs Compute() { - // 'seen' is used for path finding { 0: unseen, 1: seen }. - ::std::vector seen; - // Searches the residual flow graph for a path from each left node to - // the sink in the residual flow graph, and if one is found, add flow - // to the graph. It's okay to search through the left nodes once. The - // edge from the implicit source node to each previously-visited left - // node will have flow if that left node has any path to the sink - // whatsoever. Subsequent augmentations can only add flow to the - // network, and cannot take away that previous flow unit from the source. - // Since the source-to-left edge can only carry one flow unit (or, - // each element can be matched to only one matcher), there is no need - // to visit the left nodes more than once looking for augmented paths. - // The flow is known to be possible or impossible by looking at the - // node once. - for (size_t ilhs = 0; ilhs < graph_->LhsSize(); ++ilhs) { - // Reset the path-marking vector and try to find a path from - // source to sink starting at the left_[ilhs] node. - GTEST_CHECK_(left_[ilhs] == kUnused) - << "ilhs: " << ilhs << ", left_[ilhs]: " << left_[ilhs]; - // 'seen' initialized to 'graph_->RhsSize()' copies of 0. - seen.assign(graph_->RhsSize(), 0); - TryAugment(ilhs, &seen); - } - ElementMatcherPairs result; - for (size_t ilhs = 0; ilhs < left_.size(); ++ilhs) { - size_t irhs = left_[ilhs]; - if (irhs == kUnused) continue; - result.push_back(ElementMatcherPair(ilhs, irhs)); - } - return result; - } - - private: - static const size_t kUnused = static_cast(-1); - - // Perform a depth-first search from left node ilhs to the sink. If a - // path is found, flow is added to the network by linking the left and - // right vector elements corresponding each segment of the path. - // Returns true if a path to sink was found, which means that a unit of - // flow was added to the network. The 'seen' vector elements correspond - // to right nodes and are marked to eliminate cycles from the search. - // - // Left nodes will only be explored at most once because they - // are accessible from at most one right node in the residual flow - // graph. - // - // Note that left_[ilhs] is the only element of left_ that TryAugment will - // potentially transition from kUnused to another value. Any other - // left_ element holding kUnused before TryAugment will be holding it - // when TryAugment returns. - // - bool TryAugment(size_t ilhs, ::std::vector* seen) { - for (size_t irhs = 0; irhs < graph_->RhsSize(); ++irhs) { - if ((*seen)[irhs]) continue; - if (!graph_->HasEdge(ilhs, irhs)) continue; - // There's an available edge from ilhs to irhs. - (*seen)[irhs] = 1; - // Next a search is performed to determine whether - // this edge is a dead end or leads to the sink. - // - // right_[irhs] == kUnused means that there is residual flow from - // right node irhs to the sink, so we can use that to finish this - // flow path and return success. - // - // Otherwise there is residual flow to some ilhs. We push flow - // along that path and call ourselves recursively to see if this - // ultimately leads to sink. - if (right_[irhs] == kUnused || TryAugment(right_[irhs], seen)) { - // Add flow from left_[ilhs] to right_[irhs]. - left_[ilhs] = irhs; - right_[irhs] = ilhs; - return true; - } - } - return false; - } - - const MatchMatrix* graph_; // not owned - // Each element of the left_ vector represents a left hand side node - // (i.e. an element) and each element of right_ is a right hand side - // node (i.e. a matcher). The values in the left_ vector indicate - // outflow from that node to a node on the right_ side. The values - // in the right_ indicate inflow, and specify which left_ node is - // feeding that right_ node, if any. For example, left_[3] == 1 means - // there's a flow from element #3 to matcher #1. Such a flow would also - // be redundantly represented in the right_ vector as right_[1] == 3. - // Elements of left_ and right_ are either kUnused or mutually - // referent. Mutually referent means that left_[right_[i]] = i and - // right_[left_[i]] = i. - ::std::vector left_; - ::std::vector right_; - - GTEST_DISALLOW_ASSIGN_(MaxBipartiteMatchState); -}; - -const size_t MaxBipartiteMatchState::kUnused; - -GTEST_API_ ElementMatcherPairs FindMaxBipartiteMatching(const MatchMatrix& g) { - return MaxBipartiteMatchState(g).Compute(); -} - -static void LogElementMatcherPairVec(const ElementMatcherPairs& pairs, - ::std::ostream* stream) { - typedef ElementMatcherPairs::const_iterator Iter; - ::std::ostream& os = *stream; - os << "{"; - const char* sep = ""; - for (Iter it = pairs.begin(); it != pairs.end(); ++it) { - os << sep << "\n (" - << "element #" << it->first << ", " - << "matcher #" << it->second << ")"; - sep = ","; - } - os << "\n}"; -} - -bool MatchMatrix::NextGraph() { - for (size_t ilhs = 0; ilhs < LhsSize(); ++ilhs) { - for (size_t irhs = 0; irhs < RhsSize(); ++irhs) { - char& b = matched_[SpaceIndex(ilhs, irhs)]; - if (!b) { - b = 1; - return true; - } - b = 0; - } - } - return false; -} - -void MatchMatrix::Randomize() { - for (size_t ilhs = 0; ilhs < LhsSize(); ++ilhs) { - for (size_t irhs = 0; irhs < RhsSize(); ++irhs) { - char& b = matched_[SpaceIndex(ilhs, irhs)]; - b = static_cast(rand() & 1); // NOLINT - } - } -} - -std::string MatchMatrix::DebugString() const { - ::std::stringstream ss; - const char* sep = ""; - for (size_t i = 0; i < LhsSize(); ++i) { - ss << sep; - for (size_t j = 0; j < RhsSize(); ++j) { - ss << HasEdge(i, j); - } - sep = ";"; - } - return ss.str(); -} - -void UnorderedElementsAreMatcherImplBase::DescribeToImpl( - ::std::ostream* os) const { - switch (match_flags()) { - case UnorderedMatcherRequire::ExactMatch: - if (matcher_describers_.empty()) { - *os << "is empty"; - return; - } - if (matcher_describers_.size() == 1) { - *os << "has " << Elements(1) << " and that element "; - matcher_describers_[0]->DescribeTo(os); - return; - } - *os << "has " << Elements(matcher_describers_.size()) - << " and there exists some permutation of elements such that:\n"; - break; - case UnorderedMatcherRequire::Superset: - *os << "a surjection from elements to requirements exists such that:\n"; - break; - case UnorderedMatcherRequire::Subset: - *os << "an injection from elements to requirements exists such that:\n"; - break; - } - - const char* sep = ""; - for (size_t i = 0; i != matcher_describers_.size(); ++i) { - *os << sep; - if (match_flags() == UnorderedMatcherRequire::ExactMatch) { - *os << " - element #" << i << " "; - } else { - *os << " - an element "; - } - matcher_describers_[i]->DescribeTo(os); - if (match_flags() == UnorderedMatcherRequire::ExactMatch) { - sep = ", and\n"; - } else { - sep = "\n"; - } - } -} - -void UnorderedElementsAreMatcherImplBase::DescribeNegationToImpl( - ::std::ostream* os) const { - switch (match_flags()) { - case UnorderedMatcherRequire::ExactMatch: - if (matcher_describers_.empty()) { - *os << "isn't empty"; - return; - } - if (matcher_describers_.size() == 1) { - *os << "doesn't have " << Elements(1) << ", or has " << Elements(1) - << " that "; - matcher_describers_[0]->DescribeNegationTo(os); - return; - } - *os << "doesn't have " << Elements(matcher_describers_.size()) - << ", or there exists no permutation of elements such that:\n"; - break; - case UnorderedMatcherRequire::Superset: - *os << "no surjection from elements to requirements exists such that:\n"; - break; - case UnorderedMatcherRequire::Subset: - *os << "no injection from elements to requirements exists such that:\n"; - break; - } - const char* sep = ""; - for (size_t i = 0; i != matcher_describers_.size(); ++i) { - *os << sep; - if (match_flags() == UnorderedMatcherRequire::ExactMatch) { - *os << " - element #" << i << " "; - } else { - *os << " - an element "; - } - matcher_describers_[i]->DescribeTo(os); - if (match_flags() == UnorderedMatcherRequire::ExactMatch) { - sep = ", and\n"; - } else { - sep = "\n"; - } - } -} - -// Checks that all matchers match at least one element, and that all -// elements match at least one matcher. This enables faster matching -// and better error reporting. -// Returns false, writing an explanation to 'listener', if and only -// if the success criteria are not met. -bool UnorderedElementsAreMatcherImplBase::VerifyMatchMatrix( - const ::std::vector& element_printouts, - const MatchMatrix& matrix, MatchResultListener* listener) const { - bool result = true; - ::std::vector element_matched(matrix.LhsSize(), 0); - ::std::vector matcher_matched(matrix.RhsSize(), 0); - - for (size_t ilhs = 0; ilhs < matrix.LhsSize(); ilhs++) { - for (size_t irhs = 0; irhs < matrix.RhsSize(); irhs++) { - char matched = matrix.HasEdge(ilhs, irhs); - element_matched[ilhs] |= matched; - matcher_matched[irhs] |= matched; - } - } - - if (match_flags() & UnorderedMatcherRequire::Superset) { - const char* sep = - "where the following matchers don't match any elements:\n"; - for (size_t mi = 0; mi < matcher_matched.size(); ++mi) { - if (matcher_matched[mi]) continue; - result = false; - if (listener->IsInterested()) { - *listener << sep << "matcher #" << mi << ": "; - matcher_describers_[mi]->DescribeTo(listener->stream()); - sep = ",\n"; - } - } - } - - if (match_flags() & UnorderedMatcherRequire::Subset) { - const char* sep = - "where the following elements don't match any matchers:\n"; - const char* outer_sep = ""; - if (!result) { - outer_sep = "\nand "; - } - for (size_t ei = 0; ei < element_matched.size(); ++ei) { - if (element_matched[ei]) continue; - result = false; - if (listener->IsInterested()) { - *listener << outer_sep << sep << "element #" << ei << ": " - << element_printouts[ei]; - sep = ",\n"; - outer_sep = ""; - } - } - } - return result; -} - -bool UnorderedElementsAreMatcherImplBase::FindPairing( - const MatchMatrix& matrix, MatchResultListener* listener) const { - ElementMatcherPairs matches = FindMaxBipartiteMatching(matrix); - - size_t max_flow = matches.size(); - if ((match_flags() & UnorderedMatcherRequire::Superset) && - max_flow < matrix.RhsSize()) { - if (listener->IsInterested()) { - *listener << "where no permutation of the elements can satisfy all " - "matchers, and the closest match is " - << max_flow << " of " << matrix.RhsSize() - << " matchers with the pairings:\n"; - LogElementMatcherPairVec(matches, listener->stream()); - } - return false; - } - if ((match_flags() & UnorderedMatcherRequire::Subset) && - max_flow < matrix.LhsSize()) { - if (listener->IsInterested()) { - *listener - << "where not all elements can be matched, and the closest match is " - << max_flow << " of " << matrix.RhsSize() - << " matchers with the pairings:\n"; - LogElementMatcherPairVec(matches, listener->stream()); - } - return false; - } - - if (matches.size() > 1) { - if (listener->IsInterested()) { - const char* sep = "where:\n"; - for (size_t mi = 0; mi < matches.size(); ++mi) { - *listener << sep << " - element #" << matches[mi].first - << " is matched by matcher #" << matches[mi].second; - sep = ",\n"; - } - } - } - return true; -} - -} // namespace internal -} // namespace testing -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Mock - a framework for writing C++ mock classes. -// -// This file implements the spec builder syntax (ON_CALL and -// EXPECT_CALL). - - -#include -#include // NOLINT -#include -#include -#include -#include - -#if GTEST_OS_CYGWIN || GTEST_OS_LINUX || GTEST_OS_MAC -# include // NOLINT -#endif - -// Silence C4800 (C4800: 'int *const ': forcing value -// to bool 'true' or 'false') for MSVC 14,15 -#ifdef _MSC_VER -#if _MSC_VER <= 1900 -# pragma warning(push) -# pragma warning(disable:4800) -#endif -#endif - -namespace testing { -namespace internal { - -// Protects the mock object registry (in class Mock), all function -// mockers, and all expectations. -GTEST_API_ GTEST_DEFINE_STATIC_MUTEX_(g_gmock_mutex); - -// Logs a message including file and line number information. -GTEST_API_ void LogWithLocation(testing::internal::LogSeverity severity, - const char* file, int line, - const std::string& message) { - ::std::ostringstream s; - s << file << ":" << line << ": " << message << ::std::endl; - Log(severity, s.str(), 0); -} - -// Constructs an ExpectationBase object. -ExpectationBase::ExpectationBase(const char* a_file, int a_line, - const std::string& a_source_text) - : file_(a_file), - line_(a_line), - source_text_(a_source_text), - cardinality_specified_(false), - cardinality_(Exactly(1)), - call_count_(0), - retired_(false), - extra_matcher_specified_(false), - repeated_action_specified_(false), - retires_on_saturation_(false), - last_clause_(kNone), - action_count_checked_(false) {} - -// Destructs an ExpectationBase object. -ExpectationBase::~ExpectationBase() {} - -// Explicitly specifies the cardinality of this expectation. Used by -// the subclasses to implement the .Times() clause. -void ExpectationBase::SpecifyCardinality(const Cardinality& a_cardinality) { - cardinality_specified_ = true; - cardinality_ = a_cardinality; -} - -// Retires all pre-requisites of this expectation. -void ExpectationBase::RetireAllPreRequisites() - GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { - if (is_retired()) { - // We can take this short-cut as we never retire an expectation - // until we have retired all its pre-requisites. - return; - } - - ::std::vector expectations(1, this); - while (!expectations.empty()) { - ExpectationBase* exp = expectations.back(); - expectations.pop_back(); - - for (ExpectationSet::const_iterator it = - exp->immediate_prerequisites_.begin(); - it != exp->immediate_prerequisites_.end(); ++it) { - ExpectationBase* next = it->expectation_base().get(); - if (!next->is_retired()) { - next->Retire(); - expectations.push_back(next); - } - } - } -} - -// Returns true iff all pre-requisites of this expectation have been -// satisfied. -bool ExpectationBase::AllPrerequisitesAreSatisfied() const - GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { - g_gmock_mutex.AssertHeld(); - ::std::vector expectations(1, this); - while (!expectations.empty()) { - const ExpectationBase* exp = expectations.back(); - expectations.pop_back(); - - for (ExpectationSet::const_iterator it = - exp->immediate_prerequisites_.begin(); - it != exp->immediate_prerequisites_.end(); ++it) { - const ExpectationBase* next = it->expectation_base().get(); - if (!next->IsSatisfied()) return false; - expectations.push_back(next); - } - } - return true; -} - -// Adds unsatisfied pre-requisites of this expectation to 'result'. -void ExpectationBase::FindUnsatisfiedPrerequisites(ExpectationSet* result) const - GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { - g_gmock_mutex.AssertHeld(); - ::std::vector expectations(1, this); - while (!expectations.empty()) { - const ExpectationBase* exp = expectations.back(); - expectations.pop_back(); - - for (ExpectationSet::const_iterator it = - exp->immediate_prerequisites_.begin(); - it != exp->immediate_prerequisites_.end(); ++it) { - const ExpectationBase* next = it->expectation_base().get(); - - if (next->IsSatisfied()) { - // If *it is satisfied and has a call count of 0, some of its - // pre-requisites may not be satisfied yet. - if (next->call_count_ == 0) { - expectations.push_back(next); - } - } else { - // Now that we know next is unsatisfied, we are not so interested - // in whether its pre-requisites are satisfied. Therefore we - // don't iterate into it here. - *result += *it; - } - } - } -} - -// Describes how many times a function call matching this -// expectation has occurred. -void ExpectationBase::DescribeCallCountTo(::std::ostream* os) const - GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { - g_gmock_mutex.AssertHeld(); - - // Describes how many times the function is expected to be called. - *os << " Expected: to be "; - cardinality().DescribeTo(os); - *os << "\n Actual: "; - Cardinality::DescribeActualCallCountTo(call_count(), os); - - // Describes the state of the expectation (e.g. is it satisfied? - // is it active?). - *os << " - " << (IsOverSaturated() ? "over-saturated" : - IsSaturated() ? "saturated" : - IsSatisfied() ? "satisfied" : "unsatisfied") - << " and " - << (is_retired() ? "retired" : "active"); -} - -// Checks the action count (i.e. the number of WillOnce() and -// WillRepeatedly() clauses) against the cardinality if this hasn't -// been done before. Prints a warning if there are too many or too -// few actions. -void ExpectationBase::CheckActionCountIfNotDone() const - GTEST_LOCK_EXCLUDED_(mutex_) { - bool should_check = false; - { - MutexLock l(&mutex_); - if (!action_count_checked_) { - action_count_checked_ = true; - should_check = true; - } - } - - if (should_check) { - if (!cardinality_specified_) { - // The cardinality was inferred - no need to check the action - // count against it. - return; - } - - // The cardinality was explicitly specified. - const int action_count = static_cast(untyped_actions_.size()); - const int upper_bound = cardinality().ConservativeUpperBound(); - const int lower_bound = cardinality().ConservativeLowerBound(); - bool too_many; // True if there are too many actions, or false - // if there are too few. - if (action_count > upper_bound || - (action_count == upper_bound && repeated_action_specified_)) { - too_many = true; - } else if (0 < action_count && action_count < lower_bound && - !repeated_action_specified_) { - too_many = false; - } else { - return; - } - - ::std::stringstream ss; - DescribeLocationTo(&ss); - ss << "Too " << (too_many ? "many" : "few") - << " actions specified in " << source_text() << "...\n" - << "Expected to be "; - cardinality().DescribeTo(&ss); - ss << ", but has " << (too_many ? "" : "only ") - << action_count << " WillOnce()" - << (action_count == 1 ? "" : "s"); - if (repeated_action_specified_) { - ss << " and a WillRepeatedly()"; - } - ss << "."; - Log(kWarning, ss.str(), -1); // -1 means "don't print stack trace". - } -} - -// Implements the .Times() clause. -void ExpectationBase::UntypedTimes(const Cardinality& a_cardinality) { - if (last_clause_ == kTimes) { - ExpectSpecProperty(false, - ".Times() cannot appear " - "more than once in an EXPECT_CALL()."); - } else { - ExpectSpecProperty(last_clause_ < kTimes, - ".Times() cannot appear after " - ".InSequence(), .WillOnce(), .WillRepeatedly(), " - "or .RetiresOnSaturation()."); - } - last_clause_ = kTimes; - - SpecifyCardinality(a_cardinality); -} - -// Points to the implicit sequence introduced by a living InSequence -// object (if any) in the current thread or NULL. -GTEST_API_ ThreadLocal g_gmock_implicit_sequence; - -// Reports an uninteresting call (whose description is in msg) in the -// manner specified by 'reaction'. -void ReportUninterestingCall(CallReaction reaction, const std::string& msg) { - // Include a stack trace only if --gmock_verbose=info is specified. - const int stack_frames_to_skip = - GMOCK_FLAG(verbose) == kInfoVerbosity ? 3 : -1; - switch (reaction) { - case kAllow: - Log(kInfo, msg, stack_frames_to_skip); - break; - case kWarn: - Log(kWarning, - msg + - "\nNOTE: You can safely ignore the above warning unless this " - "call should not happen. Do not suppress it by blindly adding " - "an EXPECT_CALL() if you don't mean to enforce the call. " - "See " - "https://github.com/google/googletest/blob/master/googlemock/" - "docs/CookBook.md#" - "knowing-when-to-expect for details.\n", - stack_frames_to_skip); - break; - default: // FAIL - Expect(false, NULL, -1, msg); - } -} - -UntypedFunctionMockerBase::UntypedFunctionMockerBase() - : mock_obj_(NULL), name_("") {} - -UntypedFunctionMockerBase::~UntypedFunctionMockerBase() {} - -// Sets the mock object this mock method belongs to, and registers -// this information in the global mock registry. Will be called -// whenever an EXPECT_CALL() or ON_CALL() is executed on this mock -// method. -void UntypedFunctionMockerBase::RegisterOwner(const void* mock_obj) - GTEST_LOCK_EXCLUDED_(g_gmock_mutex) { - { - MutexLock l(&g_gmock_mutex); - mock_obj_ = mock_obj; - } - Mock::Register(mock_obj, this); -} - -// Sets the mock object this mock method belongs to, and sets the name -// of the mock function. Will be called upon each invocation of this -// mock function. -void UntypedFunctionMockerBase::SetOwnerAndName(const void* mock_obj, - const char* name) - GTEST_LOCK_EXCLUDED_(g_gmock_mutex) { - // We protect name_ under g_gmock_mutex in case this mock function - // is called from two threads concurrently. - MutexLock l(&g_gmock_mutex); - mock_obj_ = mock_obj; - name_ = name; -} - -// Returns the name of the function being mocked. Must be called -// after RegisterOwner() or SetOwnerAndName() has been called. -const void* UntypedFunctionMockerBase::MockObject() const - GTEST_LOCK_EXCLUDED_(g_gmock_mutex) { - const void* mock_obj; - { - // We protect mock_obj_ under g_gmock_mutex in case this mock - // function is called from two threads concurrently. - MutexLock l(&g_gmock_mutex); - Assert(mock_obj_ != NULL, __FILE__, __LINE__, - "MockObject() must not be called before RegisterOwner() or " - "SetOwnerAndName() has been called."); - mock_obj = mock_obj_; - } - return mock_obj; -} - -// Returns the name of this mock method. Must be called after -// SetOwnerAndName() has been called. -const char* UntypedFunctionMockerBase::Name() const - GTEST_LOCK_EXCLUDED_(g_gmock_mutex) { - const char* name; - { - // We protect name_ under g_gmock_mutex in case this mock - // function is called from two threads concurrently. - MutexLock l(&g_gmock_mutex); - Assert(name_ != NULL, __FILE__, __LINE__, - "Name() must not be called before SetOwnerAndName() has " - "been called."); - name = name_; - } - return name; -} - -// Calculates the result of invoking this mock function with the given -// arguments, prints it, and returns it. The caller is responsible -// for deleting the result. -UntypedActionResultHolderBase* UntypedFunctionMockerBase::UntypedInvokeWith( - void* const untyped_args) GTEST_LOCK_EXCLUDED_(g_gmock_mutex) { - // See the definition of untyped_expectations_ for why access to it - // is unprotected here. - if (untyped_expectations_.size() == 0) { - // No expectation is set on this mock method - we have an - // uninteresting call. - - // We must get Google Mock's reaction on uninteresting calls - // made on this mock object BEFORE performing the action, - // because the action may DELETE the mock object and make the - // following expression meaningless. - const CallReaction reaction = - Mock::GetReactionOnUninterestingCalls(MockObject()); - - // True iff we need to print this call's arguments and return - // value. This definition must be kept in sync with - // the behavior of ReportUninterestingCall(). - const bool need_to_report_uninteresting_call = - // If the user allows this uninteresting call, we print it - // only when they want informational messages. - reaction == kAllow ? LogIsVisible(kInfo) : - // If the user wants this to be a warning, we print - // it only when they want to see warnings. - reaction == kWarn - ? LogIsVisible(kWarning) - : - // Otherwise, the user wants this to be an error, and we - // should always print detailed information in the error. - true; - - if (!need_to_report_uninteresting_call) { - // Perform the action without printing the call information. - return this->UntypedPerformDefaultAction( - untyped_args, "Function call: " + std::string(Name())); - } - - // Warns about the uninteresting call. - ::std::stringstream ss; - this->UntypedDescribeUninterestingCall(untyped_args, &ss); - - // Calculates the function result. - UntypedActionResultHolderBase* const result = - this->UntypedPerformDefaultAction(untyped_args, ss.str()); - - // Prints the function result. - if (result != NULL) - result->PrintAsActionResult(&ss); - - ReportUninterestingCall(reaction, ss.str()); - return result; - } - - bool is_excessive = false; - ::std::stringstream ss; - ::std::stringstream why; - ::std::stringstream loc; - const void* untyped_action = NULL; - - // The UntypedFindMatchingExpectation() function acquires and - // releases g_gmock_mutex. - const ExpectationBase* const untyped_expectation = - this->UntypedFindMatchingExpectation( - untyped_args, &untyped_action, &is_excessive, - &ss, &why); - const bool found = untyped_expectation != NULL; - - // True iff we need to print the call's arguments and return value. - // This definition must be kept in sync with the uses of Expect() - // and Log() in this function. - const bool need_to_report_call = - !found || is_excessive || LogIsVisible(kInfo); - if (!need_to_report_call) { - // Perform the action without printing the call information. - return - untyped_action == NULL ? - this->UntypedPerformDefaultAction(untyped_args, "") : - this->UntypedPerformAction(untyped_action, untyped_args); - } - - ss << " Function call: " << Name(); - this->UntypedPrintArgs(untyped_args, &ss); - - // In case the action deletes a piece of the expectation, we - // generate the message beforehand. - if (found && !is_excessive) { - untyped_expectation->DescribeLocationTo(&loc); - } - - UntypedActionResultHolderBase* const result = - untyped_action == NULL ? - this->UntypedPerformDefaultAction(untyped_args, ss.str()) : - this->UntypedPerformAction(untyped_action, untyped_args); - if (result != NULL) - result->PrintAsActionResult(&ss); - ss << "\n" << why.str(); - - if (!found) { - // No expectation matches this call - reports a failure. - Expect(false, NULL, -1, ss.str()); - } else if (is_excessive) { - // We had an upper-bound violation and the failure message is in ss. - Expect(false, untyped_expectation->file(), - untyped_expectation->line(), ss.str()); - } else { - // We had an expected call and the matching expectation is - // described in ss. - Log(kInfo, loc.str() + ss.str(), 2); - } - - return result; -} - -// Returns an Expectation object that references and co-owns exp, -// which must be an expectation on this mock function. -Expectation UntypedFunctionMockerBase::GetHandleOf(ExpectationBase* exp) { - // See the definition of untyped_expectations_ for why access to it - // is unprotected here. - for (UntypedExpectations::const_iterator it = - untyped_expectations_.begin(); - it != untyped_expectations_.end(); ++it) { - if (it->get() == exp) { - return Expectation(*it); - } - } - - Assert(false, __FILE__, __LINE__, "Cannot find expectation."); - return Expectation(); - // The above statement is just to make the code compile, and will - // never be executed. -} - -// Verifies that all expectations on this mock function have been -// satisfied. Reports one or more Google Test non-fatal failures -// and returns false if not. -bool UntypedFunctionMockerBase::VerifyAndClearExpectationsLocked() - GTEST_EXCLUSIVE_LOCK_REQUIRED_(g_gmock_mutex) { - g_gmock_mutex.AssertHeld(); - bool expectations_met = true; - for (UntypedExpectations::const_iterator it = - untyped_expectations_.begin(); - it != untyped_expectations_.end(); ++it) { - ExpectationBase* const untyped_expectation = it->get(); - if (untyped_expectation->IsOverSaturated()) { - // There was an upper-bound violation. Since the error was - // already reported when it occurred, there is no need to do - // anything here. - expectations_met = false; - } else if (!untyped_expectation->IsSatisfied()) { - expectations_met = false; - ::std::stringstream ss; - ss << "Actual function call count doesn't match " - << untyped_expectation->source_text() << "...\n"; - // No need to show the source file location of the expectation - // in the description, as the Expect() call that follows already - // takes care of it. - untyped_expectation->MaybeDescribeExtraMatcherTo(&ss); - untyped_expectation->DescribeCallCountTo(&ss); - Expect(false, untyped_expectation->file(), - untyped_expectation->line(), ss.str()); - } - } - - // Deleting our expectations may trigger other mock objects to be deleted, for - // example if an action contains a reference counted smart pointer to that - // mock object, and that is the last reference. So if we delete our - // expectations within the context of the global mutex we may deadlock when - // this method is called again. Instead, make a copy of the set of - // expectations to delete, clear our set within the mutex, and then clear the - // copied set outside of it. - UntypedExpectations expectations_to_delete; - untyped_expectations_.swap(expectations_to_delete); - - g_gmock_mutex.Unlock(); - expectations_to_delete.clear(); - g_gmock_mutex.Lock(); - - return expectations_met; -} - -CallReaction intToCallReaction(int mock_behavior) { - if (mock_behavior >= kAllow && mock_behavior <= kFail) { - return static_cast(mock_behavior); - } - return kWarn; -} - -} // namespace internal - -// Class Mock. - -namespace { - -typedef std::set FunctionMockers; - -// The current state of a mock object. Such information is needed for -// detecting leaked mock objects and explicitly verifying a mock's -// expectations. -struct MockObjectState { - MockObjectState() - : first_used_file(NULL), first_used_line(-1), leakable(false) {} - - // Where in the source file an ON_CALL or EXPECT_CALL is first - // invoked on this mock object. - const char* first_used_file; - int first_used_line; - ::std::string first_used_test_case; - ::std::string first_used_test; - bool leakable; // true iff it's OK to leak the object. - FunctionMockers function_mockers; // All registered methods of the object. -}; - -// A global registry holding the state of all mock objects that are -// alive. A mock object is added to this registry the first time -// Mock::AllowLeak(), ON_CALL(), or EXPECT_CALL() is called on it. It -// is removed from the registry in the mock object's destructor. -class MockObjectRegistry { - public: - // Maps a mock object (identified by its address) to its state. - typedef std::map StateMap; - - // This destructor will be called when a program exits, after all - // tests in it have been run. By then, there should be no mock - // object alive. Therefore we report any living object as test - // failure, unless the user explicitly asked us to ignore it. - ~MockObjectRegistry() { - // "using ::std::cout;" doesn't work with Symbian's STLport, where cout is - // a macro. - - if (!GMOCK_FLAG(catch_leaked_mocks)) - return; - - int leaked_count = 0; - for (StateMap::const_iterator it = states_.begin(); it != states_.end(); - ++it) { - if (it->second.leakable) // The user said it's fine to leak this object. - continue; - - // TODO(wan@google.com): Print the type of the leaked object. - // This can help the user identify the leaked object. - std::cout << "\n"; - const MockObjectState& state = it->second; - std::cout << internal::FormatFileLocation(state.first_used_file, - state.first_used_line); - std::cout << " ERROR: this mock object"; - if (state.first_used_test != "") { - std::cout << " (used in test " << state.first_used_test_case << "." - << state.first_used_test << ")"; - } - std::cout << " should be deleted but never is. Its address is @" - << it->first << "."; - leaked_count++; - } - if (leaked_count > 0) { - std::cout << "\nERROR: " << leaked_count << " leaked mock " - << (leaked_count == 1 ? "object" : "objects") - << " found at program exit. Expectations on a mock object is " - "verified when the object is destructed. Leaking a mock " - "means that its expectations aren't verified, which is " - "usually a test bug. If you really intend to leak a mock, " - "you can suppress this error using " - "testing::Mock::AllowLeak(mock_object), or you may use a " - "fake or stub instead of a mock.\n"; - std::cout.flush(); - ::std::cerr.flush(); - // RUN_ALL_TESTS() has already returned when this destructor is - // called. Therefore we cannot use the normal Google Test - // failure reporting mechanism. - _exit(1); // We cannot call exit() as it is not reentrant and - // may already have been called. - } - } - - StateMap& states() { return states_; } - - private: - StateMap states_; -}; - -// Protected by g_gmock_mutex. -MockObjectRegistry g_mock_object_registry; - -// Maps a mock object to the reaction Google Mock should have when an -// uninteresting method is called. Protected by g_gmock_mutex. -std::map g_uninteresting_call_reaction; - -// Sets the reaction Google Mock should have when an uninteresting -// method of the given mock object is called. -void SetReactionOnUninterestingCalls(const void* mock_obj, - internal::CallReaction reaction) - GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { - internal::MutexLock l(&internal::g_gmock_mutex); - g_uninteresting_call_reaction[mock_obj] = reaction; -} - -} // namespace - -// Tells Google Mock to allow uninteresting calls on the given mock -// object. -void Mock::AllowUninterestingCalls(const void* mock_obj) - GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { - SetReactionOnUninterestingCalls(mock_obj, internal::kAllow); -} - -// Tells Google Mock to warn the user about uninteresting calls on the -// given mock object. -void Mock::WarnUninterestingCalls(const void* mock_obj) - GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { - SetReactionOnUninterestingCalls(mock_obj, internal::kWarn); -} - -// Tells Google Mock to fail uninteresting calls on the given mock -// object. -void Mock::FailUninterestingCalls(const void* mock_obj) - GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { - SetReactionOnUninterestingCalls(mock_obj, internal::kFail); -} - -// Tells Google Mock the given mock object is being destroyed and its -// entry in the call-reaction table should be removed. -void Mock::UnregisterCallReaction(const void* mock_obj) - GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { - internal::MutexLock l(&internal::g_gmock_mutex); - g_uninteresting_call_reaction.erase(mock_obj); -} - -// Returns the reaction Google Mock will have on uninteresting calls -// made on the given mock object. -internal::CallReaction Mock::GetReactionOnUninterestingCalls( - const void* mock_obj) - GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { - internal::MutexLock l(&internal::g_gmock_mutex); - return (g_uninteresting_call_reaction.count(mock_obj) == 0) ? - internal::intToCallReaction(GMOCK_FLAG(default_mock_behavior)) : - g_uninteresting_call_reaction[mock_obj]; -} - -// Tells Google Mock to ignore mock_obj when checking for leaked mock -// objects. -void Mock::AllowLeak(const void* mock_obj) - GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { - internal::MutexLock l(&internal::g_gmock_mutex); - g_mock_object_registry.states()[mock_obj].leakable = true; -} - -// Verifies and clears all expectations on the given mock object. If -// the expectations aren't satisfied, generates one or more Google -// Test non-fatal failures and returns false. -bool Mock::VerifyAndClearExpectations(void* mock_obj) - GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { - internal::MutexLock l(&internal::g_gmock_mutex); - return VerifyAndClearExpectationsLocked(mock_obj); -} - -// Verifies all expectations on the given mock object and clears its -// default actions and expectations. Returns true iff the -// verification was successful. -bool Mock::VerifyAndClear(void* mock_obj) - GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { - internal::MutexLock l(&internal::g_gmock_mutex); - ClearDefaultActionsLocked(mock_obj); - return VerifyAndClearExpectationsLocked(mock_obj); -} - -// Verifies and clears all expectations on the given mock object. If -// the expectations aren't satisfied, generates one or more Google -// Test non-fatal failures and returns false. -bool Mock::VerifyAndClearExpectationsLocked(void* mock_obj) - GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) { - internal::g_gmock_mutex.AssertHeld(); - if (g_mock_object_registry.states().count(mock_obj) == 0) { - // No EXPECT_CALL() was set on the given mock object. - return true; - } - - // Verifies and clears the expectations on each mock method in the - // given mock object. - bool expectations_met = true; - FunctionMockers& mockers = - g_mock_object_registry.states()[mock_obj].function_mockers; - for (FunctionMockers::const_iterator it = mockers.begin(); - it != mockers.end(); ++it) { - if (!(*it)->VerifyAndClearExpectationsLocked()) { - expectations_met = false; - } - } - - // We don't clear the content of mockers, as they may still be - // needed by ClearDefaultActionsLocked(). - return expectations_met; -} - -// Registers a mock object and a mock method it owns. -void Mock::Register(const void* mock_obj, - internal::UntypedFunctionMockerBase* mocker) - GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { - internal::MutexLock l(&internal::g_gmock_mutex); - g_mock_object_registry.states()[mock_obj].function_mockers.insert(mocker); -} - -// Tells Google Mock where in the source code mock_obj is used in an -// ON_CALL or EXPECT_CALL. In case mock_obj is leaked, this -// information helps the user identify which object it is. -void Mock::RegisterUseByOnCallOrExpectCall(const void* mock_obj, - const char* file, int line) - GTEST_LOCK_EXCLUDED_(internal::g_gmock_mutex) { - internal::MutexLock l(&internal::g_gmock_mutex); - MockObjectState& state = g_mock_object_registry.states()[mock_obj]; - if (state.first_used_file == NULL) { - state.first_used_file = file; - state.first_used_line = line; - const TestInfo* const test_info = - UnitTest::GetInstance()->current_test_info(); - if (test_info != NULL) { - // TODO(wan@google.com): record the test case name when the - // ON_CALL or EXPECT_CALL is invoked from SetUpTestCase() or - // TearDownTestCase(). - state.first_used_test_case = test_info->test_case_name(); - state.first_used_test = test_info->name(); - } - } -} - -// Unregisters a mock method; removes the owning mock object from the -// registry when the last mock method associated with it has been -// unregistered. This is called only in the destructor of -// FunctionMockerBase. -void Mock::UnregisterLocked(internal::UntypedFunctionMockerBase* mocker) - GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) { - internal::g_gmock_mutex.AssertHeld(); - for (MockObjectRegistry::StateMap::iterator it = - g_mock_object_registry.states().begin(); - it != g_mock_object_registry.states().end(); ++it) { - FunctionMockers& mockers = it->second.function_mockers; - if (mockers.erase(mocker) > 0) { - // mocker was in mockers and has been just removed. - if (mockers.empty()) { - g_mock_object_registry.states().erase(it); - } - return; - } - } -} - -// Clears all ON_CALL()s set on the given mock object. -void Mock::ClearDefaultActionsLocked(void* mock_obj) - GTEST_EXCLUSIVE_LOCK_REQUIRED_(internal::g_gmock_mutex) { - internal::g_gmock_mutex.AssertHeld(); - - if (g_mock_object_registry.states().count(mock_obj) == 0) { - // No ON_CALL() was set on the given mock object. - return; - } - - // Clears the default actions for each mock method in the given mock - // object. - FunctionMockers& mockers = - g_mock_object_registry.states()[mock_obj].function_mockers; - for (FunctionMockers::const_iterator it = mockers.begin(); - it != mockers.end(); ++it) { - (*it)->ClearDefaultActionsLocked(); - } - - // We don't clear the content of mockers, as they may still be - // needed by VerifyAndClearExpectationsLocked(). -} - -Expectation::Expectation() {} - -Expectation::Expectation( - const internal::linked_ptr& an_expectation_base) - : expectation_base_(an_expectation_base) {} - -Expectation::~Expectation() {} - -// Adds an expectation to a sequence. -void Sequence::AddExpectation(const Expectation& expectation) const { - if (*last_expectation_ != expectation) { - if (last_expectation_->expectation_base() != NULL) { - expectation.expectation_base()->immediate_prerequisites_ - += *last_expectation_; - } - *last_expectation_ = expectation; - } -} - -// Creates the implicit sequence if there isn't one. -InSequence::InSequence() { - if (internal::g_gmock_implicit_sequence.get() == NULL) { - internal::g_gmock_implicit_sequence.set(new Sequence); - sequence_created_ = true; - } else { - sequence_created_ = false; - } -} - -// Deletes the implicit sequence if it was created by the constructor -// of this object. -InSequence::~InSequence() { - if (sequence_created_) { - delete internal::g_gmock_implicit_sequence.get(); - internal::g_gmock_implicit_sequence.set(NULL); - } -} - -} // namespace testing - -#ifdef _MSC_VER -#if _MSC_VER <= 1900 -# pragma warning(pop) -#endif -#endif -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - - -namespace testing { - -// TODO(wan@google.com): support using environment variables to -// control the flag values, like what Google Test does. - -GMOCK_DEFINE_bool_(catch_leaked_mocks, true, - "true iff Google Mock should report leaked mock objects " - "as failures."); - -GMOCK_DEFINE_string_(verbose, internal::kWarningVerbosity, - "Controls how verbose Google Mock's output is." - " Valid values:\n" - " info - prints all messages.\n" - " warning - prints warnings and errors.\n" - " error - prints errors only."); - -GMOCK_DEFINE_int32_(default_mock_behavior, 1, - "Controls the default behavior of mocks." - " Valid values:\n" - " 0 - by default, mocks act as NiceMocks.\n" - " 1 - by default, mocks act as NaggyMocks.\n" - " 2 - by default, mocks act as StrictMocks."); - -namespace internal { - -// Parses a string as a command line flag. The string should have the -// format "--gmock_flag=value". When def_optional is true, the -// "=value" part can be omitted. -// -// Returns the value of the flag, or NULL if the parsing failed. -static const char* ParseGoogleMockFlagValue(const char* str, - const char* flag, - bool def_optional) { - // str and flag must not be NULL. - if (str == NULL || flag == NULL) return NULL; - - // The flag must start with "--gmock_". - const std::string flag_str = std::string("--gmock_") + flag; - const size_t flag_len = flag_str.length(); - if (strncmp(str, flag_str.c_str(), flag_len) != 0) return NULL; - - // Skips the flag name. - const char* flag_end = str + flag_len; - - // When def_optional is true, it's OK to not have a "=value" part. - if (def_optional && (flag_end[0] == '\0')) { - return flag_end; - } - - // If def_optional is true and there are more characters after the - // flag name, or if def_optional is false, there must be a '=' after - // the flag name. - if (flag_end[0] != '=') return NULL; - - // Returns the string after "=". - return flag_end + 1; -} - -// Parses a string for a Google Mock bool flag, in the form of -// "--gmock_flag=value". -// -// On success, stores the value of the flag in *value, and returns -// true. On failure, returns false without changing *value. -static bool ParseGoogleMockBoolFlag(const char* str, const char* flag, - bool* value) { - // Gets the value of the flag as a string. - const char* const value_str = ParseGoogleMockFlagValue(str, flag, true); - - // Aborts if the parsing failed. - if (value_str == NULL) return false; - - // Converts the string value to a bool. - *value = !(*value_str == '0' || *value_str == 'f' || *value_str == 'F'); - return true; -} - -// Parses a string for a Google Mock string flag, in the form of -// "--gmock_flag=value". -// -// On success, stores the value of the flag in *value, and returns -// true. On failure, returns false without changing *value. -template -static bool ParseGoogleMockStringFlag(const char* str, const char* flag, - String* value) { - // Gets the value of the flag as a string. - const char* const value_str = ParseGoogleMockFlagValue(str, flag, false); - - // Aborts if the parsing failed. - if (value_str == NULL) return false; - - // Sets *value to the value of the flag. - *value = value_str; - return true; -} - -static bool ParseGoogleMockIntFlag(const char* str, const char* flag, - int* value) { - // Gets the value of the flag as a string. - const char* const value_str = ParseGoogleMockFlagValue(str, flag, true); - - // Aborts if the parsing failed. - if (value_str == NULL) return false; - - // Sets *value to the value of the flag. - return ParseInt32(Message() << "The value of flag --" << flag, - value_str, value); -} - -// The internal implementation of InitGoogleMock(). -// -// The type parameter CharType can be instantiated to either char or -// wchar_t. -template -void InitGoogleMockImpl(int* argc, CharType** argv) { - // Makes sure Google Test is initialized. InitGoogleTest() is - // idempotent, so it's fine if the user has already called it. - InitGoogleTest(argc, argv); - if (*argc <= 0) return; - - for (int i = 1; i != *argc; i++) { - const std::string arg_string = StreamableToString(argv[i]); - const char* const arg = arg_string.c_str(); - - // Do we see a Google Mock flag? - if (ParseGoogleMockBoolFlag(arg, "catch_leaked_mocks", - &GMOCK_FLAG(catch_leaked_mocks)) || - ParseGoogleMockStringFlag(arg, "verbose", &GMOCK_FLAG(verbose)) || - ParseGoogleMockIntFlag(arg, "default_mock_behavior", - &GMOCK_FLAG(default_mock_behavior))) { - // Yes. Shift the remainder of the argv list left by one. Note - // that argv has (*argc + 1) elements, the last one always being - // NULL. The following loop moves the trailing NULL element as - // well. - for (int j = i; j != *argc; j++) { - argv[j] = argv[j + 1]; - } - - // Decrements the argument count. - (*argc)--; - - // We also need to decrement the iterator as we just removed - // an element. - i--; - } - } -} - -} // namespace internal - -// Initializes Google Mock. This must be called before running the -// tests. In particular, it parses a command line for the flags that -// Google Mock recognizes. Whenever a Google Mock flag is seen, it is -// removed from argv, and *argc is decremented. -// -// No value is returned. Instead, the Google Mock flag variables are -// updated. -// -// Since Google Test is needed for Google Mock to work, this function -// also initializes Google Test and parses its flags, if that hasn't -// been done. -GTEST_API_ void InitGoogleMock(int* argc, char** argv) { - internal::InitGoogleMockImpl(argc, argv); -} - -// This overloaded version can be used in Windows programs compiled in -// UNICODE mode. -GTEST_API_ void InitGoogleMock(int* argc, wchar_t** argv) { - internal::InitGoogleMockImpl(argc, argv); -} - -} // namespace testing diff --git a/inference-engine/thirdparty/clDNN/common/googletest-fused/gmock/gmock.h b/inference-engine/thirdparty/clDNN/common/googletest-fused/gmock/gmock.h deleted file mode 100644 index b10aae379bf..00000000000 --- a/inference-engine/thirdparty/clDNN/common/googletest-fused/gmock/gmock.h +++ /dev/null @@ -1,16697 +0,0 @@ -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Mock - a framework for writing C++ mock classes. -// -// This is the main header file a user should include. - -#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_H_ -#define GMOCK_INCLUDE_GMOCK_GMOCK_H_ - -// This file implements the following syntax: -// -// ON_CALL(mock_object.Method(...)) -// .With(...) ? -// .WillByDefault(...); -// -// where With() is optional and WillByDefault() must appear exactly -// once. -// -// EXPECT_CALL(mock_object.Method(...)) -// .With(...) ? -// .Times(...) ? -// .InSequence(...) * -// .WillOnce(...) * -// .WillRepeatedly(...) ? -// .RetiresOnSaturation() ? ; -// -// where all clauses are optional and WillOnce() can be repeated. - -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Mock - a framework for writing C++ mock classes. -// -// This file implements some commonly used actions. - -#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_ -#define GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_ - -#ifndef _WIN32_WCE -# include -#endif - -#include -#include - -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Mock - a framework for writing C++ mock classes. -// -// This file defines some utilities useful for implementing Google -// Mock. They are subject to change without notice, so please DO NOT -// USE THEM IN USER CODE. - -#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_ -#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_ - -#include -#include // NOLINT -#include -// This file was GENERATED by command: -// pump.py gmock-generated-internal-utils.h.pump -// DO NOT EDIT BY HAND!!! - -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Mock - a framework for writing C++ mock classes. -// -// This file contains template meta-programming utility classes needed -// for implementing Google Mock. - -#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_ -#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_ - -// Copyright 2008, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: vadimb@google.com (Vadim Berman) -// -// Low-level types and utilities for porting Google Mock to various -// platforms. All macros ending with _ and symbols defined in an -// internal namespace are subject to change without notice. Code -// outside Google Mock MUST NOT USE THEM DIRECTLY. Macros that don't -// end with _ are part of Google Mock's public API and can be used by -// code outside Google Mock. - -#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_ -#define GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_ - -#include -#include -#include - -// Most of the utilities needed for porting Google Mock are also -// required for Google Test and are defined in gtest-port.h. -// -// Note to maintainers: to reduce code duplication, prefer adding -// portability utilities to Google Test's gtest-port.h instead of -// here, as Google Mock depends on Google Test. Only add a utility -// here if it's truly specific to Google Mock. - -#include "gtest/gtest.h" -// Copyright 2015, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Injection point for custom user configurations. -// The following macros can be defined: -// -// Flag related macros: -// GMOCK_DECLARE_bool_(name) -// GMOCK_DECLARE_int32_(name) -// GMOCK_DECLARE_string_(name) -// GMOCK_DEFINE_bool_(name, default_val, doc) -// GMOCK_DEFINE_int32_(name, default_val, doc) -// GMOCK_DEFINE_string_(name, default_val, doc) -// -// ** Custom implementation starts here ** - -#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_ -#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_ - -#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_PORT_H_ - -// For MS Visual C++, check the compiler version. At least VS 2003 is -// required to compile Google Mock. -#if defined(_MSC_VER) && _MSC_VER < 1310 -# error "At least Visual C++ 2003 (7.1) is required to compile Google Mock." -#endif - -// Macro for referencing flags. This is public as we want the user to -// use this syntax to reference Google Mock flags. -#define GMOCK_FLAG(name) FLAGS_gmock_##name - -#if !defined(GMOCK_DECLARE_bool_) - -// Macros for declaring flags. -# define GMOCK_DECLARE_bool_(name) extern GTEST_API_ bool GMOCK_FLAG(name) -# define GMOCK_DECLARE_int32_(name) \ - extern GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name) -# define GMOCK_DECLARE_string_(name) \ - extern GTEST_API_ ::std::string GMOCK_FLAG(name) - -// Macros for defining flags. -# define GMOCK_DEFINE_bool_(name, default_val, doc) \ - GTEST_API_ bool GMOCK_FLAG(name) = (default_val) -# define GMOCK_DEFINE_int32_(name, default_val, doc) \ - GTEST_API_ ::testing::internal::Int32 GMOCK_FLAG(name) = (default_val) -# define GMOCK_DEFINE_string_(name, default_val, doc) \ - GTEST_API_ ::std::string GMOCK_FLAG(name) = (default_val) - -#endif // !defined(GMOCK_DECLARE_bool_) - -#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_PORT_H_ - -namespace testing { - -template -class Matcher; - -namespace internal { - -// An IgnoredValue object can be implicitly constructed from ANY value. -// This is used in implementing the IgnoreResult(a) action. -class IgnoredValue { - public: - // This constructor template allows any value to be implicitly - // converted to IgnoredValue. The object has no data member and - // doesn't try to remember anything about the argument. We - // deliberately omit the 'explicit' keyword in order to allow the - // conversion to be implicit. - template - IgnoredValue(const T& /* ignored */) {} // NOLINT(runtime/explicit) -}; - -// MatcherTuple::type is a tuple type where each field is a Matcher -// for the corresponding field in tuple type T. -template -struct MatcherTuple; - -template <> -struct MatcherTuple< ::testing::tuple<> > { - typedef ::testing::tuple< > type; -}; - -template -struct MatcherTuple< ::testing::tuple > { - typedef ::testing::tuple > type; -}; - -template -struct MatcherTuple< ::testing::tuple > { - typedef ::testing::tuple, Matcher > type; -}; - -template -struct MatcherTuple< ::testing::tuple > { - typedef ::testing::tuple, Matcher, Matcher > type; -}; - -template -struct MatcherTuple< ::testing::tuple > { - typedef ::testing::tuple, Matcher, Matcher, Matcher > - type; -}; - -template -struct MatcherTuple< ::testing::tuple > { - typedef ::testing::tuple, Matcher, Matcher, Matcher, - Matcher > - type; -}; - -template -struct MatcherTuple< ::testing::tuple > { - typedef ::testing::tuple, Matcher, Matcher, Matcher, - Matcher, Matcher > - type; -}; - -template -struct MatcherTuple< ::testing::tuple > { - typedef ::testing::tuple, Matcher, Matcher, Matcher, - Matcher, Matcher, Matcher > - type; -}; - -template -struct MatcherTuple< ::testing::tuple > { - typedef ::testing::tuple, Matcher, Matcher, Matcher, - Matcher, Matcher, Matcher, Matcher > - type; -}; - -template -struct MatcherTuple< ::testing::tuple > { - typedef ::testing::tuple, Matcher, Matcher, Matcher, - Matcher, Matcher, Matcher, Matcher, - Matcher > - type; -}; - -template -struct MatcherTuple< ::testing::tuple > { - typedef ::testing::tuple, Matcher, Matcher, Matcher, - Matcher, Matcher, Matcher, Matcher, - Matcher, Matcher > - type; -}; - -// Template struct Function, where F must be a function type, contains -// the following typedefs: -// -// Result: the function's return type. -// ArgumentN: the type of the N-th argument, where N starts with 1. -// ArgumentTuple: the tuple type consisting of all parameters of F. -// ArgumentMatcherTuple: the tuple type consisting of Matchers for all -// parameters of F. -// MakeResultVoid: the function type obtained by substituting void -// for the return type of F. -// MakeResultIgnoredValue: -// the function type obtained by substituting Something -// for the return type of F. -template -struct Function; - -template -struct Function { - typedef R Result; - typedef ::testing::tuple<> ArgumentTuple; - typedef typename MatcherTuple::type ArgumentMatcherTuple; - typedef void MakeResultVoid(); - typedef IgnoredValue MakeResultIgnoredValue(); -}; - -template -struct Function - : Function { - typedef A1 Argument1; - typedef ::testing::tuple ArgumentTuple; - typedef typename MatcherTuple::type ArgumentMatcherTuple; - typedef void MakeResultVoid(A1); - typedef IgnoredValue MakeResultIgnoredValue(A1); -}; - -template -struct Function - : Function { - typedef A2 Argument2; - typedef ::testing::tuple ArgumentTuple; - typedef typename MatcherTuple::type ArgumentMatcherTuple; - typedef void MakeResultVoid(A1, A2); - typedef IgnoredValue MakeResultIgnoredValue(A1, A2); -}; - -template -struct Function - : Function { - typedef A3 Argument3; - typedef ::testing::tuple ArgumentTuple; - typedef typename MatcherTuple::type ArgumentMatcherTuple; - typedef void MakeResultVoid(A1, A2, A3); - typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3); -}; - -template -struct Function - : Function { - typedef A4 Argument4; - typedef ::testing::tuple ArgumentTuple; - typedef typename MatcherTuple::type ArgumentMatcherTuple; - typedef void MakeResultVoid(A1, A2, A3, A4); - typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4); -}; - -template -struct Function - : Function { - typedef A5 Argument5; - typedef ::testing::tuple ArgumentTuple; - typedef typename MatcherTuple::type ArgumentMatcherTuple; - typedef void MakeResultVoid(A1, A2, A3, A4, A5); - typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5); -}; - -template -struct Function - : Function { - typedef A6 Argument6; - typedef ::testing::tuple ArgumentTuple; - typedef typename MatcherTuple::type ArgumentMatcherTuple; - typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6); - typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6); -}; - -template -struct Function - : Function { - typedef A7 Argument7; - typedef ::testing::tuple ArgumentTuple; - typedef typename MatcherTuple::type ArgumentMatcherTuple; - typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6, A7); - typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6, A7); -}; - -template -struct Function - : Function { - typedef A8 Argument8; - typedef ::testing::tuple ArgumentTuple; - typedef typename MatcherTuple::type ArgumentMatcherTuple; - typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6, A7, A8); - typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6, A7, A8); -}; - -template -struct Function - : Function { - typedef A9 Argument9; - typedef ::testing::tuple ArgumentTuple; - typedef typename MatcherTuple::type ArgumentMatcherTuple; - typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6, A7, A8, A9); - typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6, A7, A8, - A9); -}; - -template -struct Function - : Function { - typedef A10 Argument10; - typedef ::testing::tuple ArgumentTuple; - typedef typename MatcherTuple::type ArgumentMatcherTuple; - typedef void MakeResultVoid(A1, A2, A3, A4, A5, A6, A7, A8, A9, A10); - typedef IgnoredValue MakeResultIgnoredValue(A1, A2, A3, A4, A5, A6, A7, A8, - A9, A10); -}; - -} // namespace internal - -} // namespace testing - -#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_GENERATED_INTERNAL_UTILS_H_ - -namespace testing { -namespace internal { - -// Silence MSVC C4100 (unreferenced formal parameter) and -// C4805('==': unsafe mix of type 'const int' and type 'const bool') -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable:4100) -# pragma warning(disable:4805) -#endif - -// Joins a vector of strings as if they are fields of a tuple; returns -// the joined string. -GTEST_API_ std::string JoinAsTuple(const Strings& fields); - -// Converts an identifier name to a space-separated list of lower-case -// words. Each maximum substring of the form [A-Za-z][a-z]*|\d+ is -// treated as one word. For example, both "FooBar123" and -// "foo_bar_123" are converted to "foo bar 123". -GTEST_API_ std::string ConvertIdentifierNameToWords(const char* id_name); - -// PointeeOf::type is the type of a value pointed to by a -// Pointer, which can be either a smart pointer or a raw pointer. The -// following default implementation is for the case where Pointer is a -// smart pointer. -template -struct PointeeOf { - // Smart pointer classes define type element_type as the type of - // their pointees. - typedef typename Pointer::element_type type; -}; -// This specialization is for the raw pointer case. -template -struct PointeeOf { typedef T type; }; // NOLINT - -// GetRawPointer(p) returns the raw pointer underlying p when p is a -// smart pointer, or returns p itself when p is already a raw pointer. -// The following default implementation is for the smart pointer case. -template -inline const typename Pointer::element_type* GetRawPointer(const Pointer& p) { - return p.get(); -} -// This overloaded version is for the raw pointer case. -template -inline Element* GetRawPointer(Element* p) { return p; } - -// This comparator allows linked_ptr to be stored in sets. -template -struct LinkedPtrLessThan { - bool operator()(const ::testing::internal::linked_ptr& lhs, - const ::testing::internal::linked_ptr& rhs) const { - return lhs.get() < rhs.get(); - } -}; - -// Symbian compilation can be done with wchar_t being either a native -// type or a typedef. Using Google Mock with OpenC without wchar_t -// should require the definition of _STLP_NO_WCHAR_T. -// -// MSVC treats wchar_t as a native type usually, but treats it as the -// same as unsigned short when the compiler option /Zc:wchar_t- is -// specified. It defines _NATIVE_WCHAR_T_DEFINED symbol when wchar_t -// is a native type. -#if (GTEST_OS_SYMBIAN && defined(_STLP_NO_WCHAR_T)) || \ - (defined(_MSC_VER) && !defined(_NATIVE_WCHAR_T_DEFINED)) -// wchar_t is a typedef. -#else -# define GMOCK_WCHAR_T_IS_NATIVE_ 1 -#endif - -// signed wchar_t and unsigned wchar_t are NOT in the C++ standard. -// Using them is a bad practice and not portable. So DON'T use them. -// -// Still, Google Mock is designed to work even if the user uses signed -// wchar_t or unsigned wchar_t (obviously, assuming the compiler -// supports them). -// -// To gcc, -// wchar_t == signed wchar_t != unsigned wchar_t == unsigned int -#ifdef __GNUC__ -#if !defined(__WCHAR_UNSIGNED__) -// signed/unsigned wchar_t are valid types. -# define GMOCK_HAS_SIGNED_WCHAR_T_ 1 -#endif -#endif - -// In what follows, we use the term "kind" to indicate whether a type -// is bool, an integer type (excluding bool), a floating-point type, -// or none of them. This categorization is useful for determining -// when a matcher argument type can be safely converted to another -// type in the implementation of SafeMatcherCast. -enum TypeKind { - kBool, kInteger, kFloatingPoint, kOther -}; - -// KindOf::value is the kind of type T. -template struct KindOf { - enum { value = kOther }; // The default kind. -}; - -// This macro declares that the kind of 'type' is 'kind'. -#define GMOCK_DECLARE_KIND_(type, kind) \ - template <> struct KindOf { enum { value = kind }; } - -GMOCK_DECLARE_KIND_(bool, kBool); - -// All standard integer types. -GMOCK_DECLARE_KIND_(char, kInteger); -GMOCK_DECLARE_KIND_(signed char, kInteger); -GMOCK_DECLARE_KIND_(unsigned char, kInteger); -GMOCK_DECLARE_KIND_(short, kInteger); // NOLINT -GMOCK_DECLARE_KIND_(unsigned short, kInteger); // NOLINT -GMOCK_DECLARE_KIND_(int, kInteger); -GMOCK_DECLARE_KIND_(unsigned int, kInteger); -GMOCK_DECLARE_KIND_(long, kInteger); // NOLINT -GMOCK_DECLARE_KIND_(unsigned long, kInteger); // NOLINT - -#if GMOCK_WCHAR_T_IS_NATIVE_ -GMOCK_DECLARE_KIND_(wchar_t, kInteger); -#endif - -// Non-standard integer types. -GMOCK_DECLARE_KIND_(Int64, kInteger); -GMOCK_DECLARE_KIND_(UInt64, kInteger); - -// All standard floating-point types. -GMOCK_DECLARE_KIND_(float, kFloatingPoint); -GMOCK_DECLARE_KIND_(double, kFloatingPoint); -GMOCK_DECLARE_KIND_(long double, kFloatingPoint); - -#undef GMOCK_DECLARE_KIND_ - -// Evaluates to the kind of 'type'. -#define GMOCK_KIND_OF_(type) \ - static_cast< ::testing::internal::TypeKind>( \ - ::testing::internal::KindOf::value) - -// Evaluates to true iff integer type T is signed. -#define GMOCK_IS_SIGNED_(T) (static_cast(-1) < 0) - -// LosslessArithmeticConvertibleImpl::value -// is true iff arithmetic type From can be losslessly converted to -// arithmetic type To. -// -// It's the user's responsibility to ensure that both From and To are -// raw (i.e. has no CV modifier, is not a pointer, and is not a -// reference) built-in arithmetic types, kFromKind is the kind of -// From, and kToKind is the kind of To; the value is -// implementation-defined when the above pre-condition is violated. -template -struct LosslessArithmeticConvertibleImpl : public false_type {}; - -// Converting bool to bool is lossless. -template <> -struct LosslessArithmeticConvertibleImpl - : public true_type {}; // NOLINT - -// Converting bool to any integer type is lossless. -template -struct LosslessArithmeticConvertibleImpl - : public true_type {}; // NOLINT - -// Converting bool to any floating-point type is lossless. -template -struct LosslessArithmeticConvertibleImpl - : public true_type {}; // NOLINT - -// Converting an integer to bool is lossy. -template -struct LosslessArithmeticConvertibleImpl - : public false_type {}; // NOLINT - -// Converting an integer to another non-bool integer is lossless iff -// the target type's range encloses the source type's range. -template -struct LosslessArithmeticConvertibleImpl - : public bool_constant< - // When converting from a smaller size to a larger size, we are - // fine as long as we are not converting from signed to unsigned. - ((sizeof(From) < sizeof(To)) && - (!GMOCK_IS_SIGNED_(From) || GMOCK_IS_SIGNED_(To))) || - // When converting between the same size, the signedness must match. - ((sizeof(From) == sizeof(To)) && - (GMOCK_IS_SIGNED_(From) == GMOCK_IS_SIGNED_(To)))> {}; // NOLINT - -#undef GMOCK_IS_SIGNED_ - -// Converting an integer to a floating-point type may be lossy, since -// the format of a floating-point number is implementation-defined. -template -struct LosslessArithmeticConvertibleImpl - : public false_type {}; // NOLINT - -// Converting a floating-point to bool is lossy. -template -struct LosslessArithmeticConvertibleImpl - : public false_type {}; // NOLINT - -// Converting a floating-point to an integer is lossy. -template -struct LosslessArithmeticConvertibleImpl - : public false_type {}; // NOLINT - -// Converting a floating-point to another floating-point is lossless -// iff the target type is at least as big as the source type. -template -struct LosslessArithmeticConvertibleImpl< - kFloatingPoint, From, kFloatingPoint, To> - : public bool_constant {}; // NOLINT - -// LosslessArithmeticConvertible::value is true iff arithmetic -// type From can be losslessly converted to arithmetic type To. -// -// It's the user's responsibility to ensure that both From and To are -// raw (i.e. has no CV modifier, is not a pointer, and is not a -// reference) built-in arithmetic types; the value is -// implementation-defined when the above pre-condition is violated. -template -struct LosslessArithmeticConvertible - : public LosslessArithmeticConvertibleImpl< - GMOCK_KIND_OF_(From), From, GMOCK_KIND_OF_(To), To> {}; // NOLINT - -// This interface knows how to report a Google Mock failure (either -// non-fatal or fatal). -class FailureReporterInterface { - public: - // The type of a failure (either non-fatal or fatal). - enum FailureType { - kNonfatal, kFatal - }; - - virtual ~FailureReporterInterface() {} - - // Reports a failure that occurred at the given source file location. - virtual void ReportFailure(FailureType type, const char* file, int line, - const std::string& message) = 0; -}; - -// Returns the failure reporter used by Google Mock. -GTEST_API_ FailureReporterInterface* GetFailureReporter(); - -// Asserts that condition is true; aborts the process with the given -// message if condition is false. We cannot use LOG(FATAL) or CHECK() -// as Google Mock might be used to mock the log sink itself. We -// inline this function to prevent it from showing up in the stack -// trace. -inline void Assert(bool condition, const char* file, int line, - const std::string& msg) { - if (!condition) { - GetFailureReporter()->ReportFailure(FailureReporterInterface::kFatal, - file, line, msg); - } -} -inline void Assert(bool condition, const char* file, int line) { - Assert(condition, file, line, "Assertion failed."); -} - -// Verifies that condition is true; generates a non-fatal failure if -// condition is false. -inline void Expect(bool condition, const char* file, int line, - const std::string& msg) { - if (!condition) { - GetFailureReporter()->ReportFailure(FailureReporterInterface::kNonfatal, - file, line, msg); - } -} -inline void Expect(bool condition, const char* file, int line) { - Expect(condition, file, line, "Expectation failed."); -} - -// Severity level of a log. -enum LogSeverity { - kInfo = 0, - kWarning = 1 -}; - -// Valid values for the --gmock_verbose flag. - -// All logs (informational and warnings) are printed. -const char kInfoVerbosity[] = "info"; -// Only warnings are printed. -const char kWarningVerbosity[] = "warning"; -// No logs are printed. -const char kErrorVerbosity[] = "error"; - -// Returns true iff a log with the given severity is visible according -// to the --gmock_verbose flag. -GTEST_API_ bool LogIsVisible(LogSeverity severity); - -// Prints the given message to stdout iff 'severity' >= the level -// specified by the --gmock_verbose flag. If stack_frames_to_skip >= -// 0, also prints the stack trace excluding the top -// stack_frames_to_skip frames. In opt mode, any positive -// stack_frames_to_skip is treated as 0, since we don't know which -// function calls will be inlined by the compiler and need to be -// conservative. -GTEST_API_ void Log(LogSeverity severity, const std::string& message, - int stack_frames_to_skip); - -// A marker class that is used to resolve parameterless expectations to the -// correct overload. This must not be instantiable, to prevent client code from -// accidentally resolving to the overload; for example: -// -// ON_CALL(mock, Method({}, nullptr))... -// -class WithoutMatchers { - private: - WithoutMatchers() {} - friend GTEST_API_ WithoutMatchers GetWithoutMatchers(); -}; - -// Internal use only: access the singleton instance of WithoutMatchers. -GTEST_API_ WithoutMatchers GetWithoutMatchers(); - -// TODO(wan@google.com): group all type utilities together. - -// Type traits. - -// is_reference::value is non-zero iff T is a reference type. -template struct is_reference : public false_type {}; -template struct is_reference : public true_type {}; - -// type_equals::value is non-zero iff T1 and T2 are the same type. -template struct type_equals : public false_type {}; -template struct type_equals : public true_type {}; - -// remove_reference::type removes the reference from type T, if any. -template struct remove_reference { typedef T type; }; // NOLINT -template struct remove_reference { typedef T type; }; // NOLINT - -// DecayArray::type turns an array type U[N] to const U* and preserves -// other types. Useful for saving a copy of a function argument. -template struct DecayArray { typedef T type; }; // NOLINT -template struct DecayArray { - typedef const T* type; -}; -// Sometimes people use arrays whose size is not available at the use site -// (e.g. extern const char kNamePrefix[]). This specialization covers that -// case. -template struct DecayArray { - typedef const T* type; -}; - -// Disable MSVC warnings for infinite recursion, since in this case the -// the recursion is unreachable. -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable:4717) -#endif - -// Invalid() is usable as an expression of type T, but will terminate -// the program with an assertion failure if actually run. This is useful -// when a value of type T is needed for compilation, but the statement -// will not really be executed (or we don't care if the statement -// crashes). -template -inline T Invalid() { - Assert(false, "", -1, "Internal error: attempt to return invalid value"); - // This statement is unreachable, and would never terminate even if it - // could be reached. It is provided only to placate compiler warnings - // about missing return statements. - return Invalid(); -} - -#ifdef _MSC_VER -# pragma warning(pop) -#endif - -// Given a raw type (i.e. having no top-level reference or const -// modifier) RawContainer that's either an STL-style container or a -// native array, class StlContainerView has the -// following members: -// -// - type is a type that provides an STL-style container view to -// (i.e. implements the STL container concept for) RawContainer; -// - const_reference is a type that provides a reference to a const -// RawContainer; -// - ConstReference(raw_container) returns a const reference to an STL-style -// container view to raw_container, which is a RawContainer. -// - Copy(raw_container) returns an STL-style container view of a -// copy of raw_container, which is a RawContainer. -// -// This generic version is used when RawContainer itself is already an -// STL-style container. -template -class StlContainerView { - public: - typedef RawContainer type; - typedef const type& const_reference; - - static const_reference ConstReference(const RawContainer& container) { - // Ensures that RawContainer is not a const type. - testing::StaticAssertTypeEq(); - return container; - } - static type Copy(const RawContainer& container) { return container; } -}; - -// This specialization is used when RawContainer is a native array type. -template -class StlContainerView { - public: - typedef GTEST_REMOVE_CONST_(Element) RawElement; - typedef internal::NativeArray type; - // NativeArray can represent a native array either by value or by - // reference (selected by a constructor argument), so 'const type' - // can be used to reference a const native array. We cannot - // 'typedef const type& const_reference' here, as that would mean - // ConstReference() has to return a reference to a local variable. - typedef const type const_reference; - - static const_reference ConstReference(const Element (&array)[N]) { - // Ensures that Element is not a const type. - testing::StaticAssertTypeEq(); -#if GTEST_OS_SYMBIAN - // The Nokia Symbian compiler confuses itself in template instantiation - // for this call without the cast to Element*: - // function call '[testing::internal::NativeArray].NativeArray( - // {lval} const char *[4], long, testing::internal::RelationToSource)' - // does not match - // 'testing::internal::NativeArray::NativeArray( - // char *const *, unsigned int, testing::internal::RelationToSource)' - // (instantiating: 'testing::internal::ContainsMatcherImpl - // ::Matches(const char * (&)[4]) const') - // (instantiating: 'testing::internal::StlContainerView:: - // ConstReference(const char * (&)[4])') - // (and though the N parameter type is mismatched in the above explicit - // conversion of it doesn't help - only the conversion of the array). - return type(const_cast(&array[0]), N, - RelationToSourceReference()); -#else - return type(array, N, RelationToSourceReference()); -#endif // GTEST_OS_SYMBIAN - } - static type Copy(const Element (&array)[N]) { -#if GTEST_OS_SYMBIAN - return type(const_cast(&array[0]), N, RelationToSourceCopy()); -#else - return type(array, N, RelationToSourceCopy()); -#endif // GTEST_OS_SYMBIAN - } -}; - -// This specialization is used when RawContainer is a native array -// represented as a (pointer, size) tuple. -template -class StlContainerView< ::testing::tuple > { - public: - typedef GTEST_REMOVE_CONST_( - typename internal::PointeeOf::type) RawElement; - typedef internal::NativeArray type; - typedef const type const_reference; - - static const_reference ConstReference( - const ::testing::tuple& array) { - return type(get<0>(array), get<1>(array), RelationToSourceReference()); - } - static type Copy(const ::testing::tuple& array) { - return type(get<0>(array), get<1>(array), RelationToSourceCopy()); - } -}; - -// The following specialization prevents the user from instantiating -// StlContainer with a reference type. -template class StlContainerView; - -// A type transform to remove constness from the first part of a pair. -// Pairs like that are used as the value_type of associative containers, -// and this transform produces a similar but assignable pair. -template -struct RemoveConstFromKey { - typedef T type; -}; - -// Partially specialized to remove constness from std::pair. -template -struct RemoveConstFromKey > { - typedef std::pair type; -}; - -// Mapping from booleans to types. Similar to boost::bool_ and -// std::integral_constant. -template -struct BooleanConstant {}; - -// Emit an assertion failure due to incorrect DoDefault() usage. Out-of-lined to -// reduce code size. -GTEST_API_ void IllegalDoDefault(const char* file, int line); - -#if GTEST_LANG_CXX11 -// Helper types for Apply() below. -template struct int_pack { typedef int_pack type; }; - -template struct append; -template -struct append, I> : int_pack {}; - -template -struct make_int_pack : append::type, C - 1> {}; -template <> struct make_int_pack<0> : int_pack<> {}; - -template -auto ApplyImpl(F&& f, Tuple&& args, int_pack) -> decltype( - std::forward(f)(std::get(std::forward(args))...)) { - return std::forward(f)(std::get(std::forward(args))...); -} - -// Apply the function to a tuple of arguments. -template -auto Apply(F&& f, Tuple&& args) - -> decltype(ApplyImpl(std::forward(f), std::forward(args), - make_int_pack::value>())) { - return ApplyImpl(std::forward(f), std::forward(args), - make_int_pack::value>()); -} -#endif - - -#ifdef _MSC_VER -# pragma warning(pop) -#endif - -} // namespace internal -} // namespace testing - -#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_GMOCK_INTERNAL_UTILS_H_ - -#if GTEST_LANG_CXX11 // Defined by gtest-port.h via gmock-port.h. -#include -#include -#endif // GTEST_LANG_CXX11 - -namespace testing { - -// To implement an action Foo, define: -// 1. a class FooAction that implements the ActionInterface interface, and -// 2. a factory function that creates an Action object from a -// const FooAction*. -// -// The two-level delegation design follows that of Matcher, providing -// consistency for extension developers. It also eases ownership -// management as Action objects can now be copied like plain values. - -namespace internal { - -template -class ActionAdaptor; - -// BuiltInDefaultValueGetter::Get() returns a -// default-constructed T value. BuiltInDefaultValueGetter::Get() crashes with an error. -// -// This primary template is used when kDefaultConstructible is true. -template -struct BuiltInDefaultValueGetter { - static T Get() { return T(); } -}; -template -struct BuiltInDefaultValueGetter { - static T Get() { - Assert(false, __FILE__, __LINE__, - "Default action undefined for the function return type."); - return internal::Invalid(); - // The above statement will never be reached, but is required in - // order for this function to compile. - } -}; - -// BuiltInDefaultValue::Get() returns the "built-in" default value -// for type T, which is NULL when T is a raw pointer type, 0 when T is -// a numeric type, false when T is bool, or "" when T is string or -// std::string. In addition, in C++11 and above, it turns a -// default-constructed T value if T is default constructible. For any -// other type T, the built-in default T value is undefined, and the -// function will abort the process. -template -class BuiltInDefaultValue { - public: -#if GTEST_LANG_CXX11 - // This function returns true iff type T has a built-in default value. - static bool Exists() { - return ::std::is_default_constructible::value; - } - - static T Get() { - return BuiltInDefaultValueGetter< - T, ::std::is_default_constructible::value>::Get(); - } - -#else // GTEST_LANG_CXX11 - // This function returns true iff type T has a built-in default value. - static bool Exists() { - return false; - } - - static T Get() { - return BuiltInDefaultValueGetter::Get(); - } - -#endif // GTEST_LANG_CXX11 -}; - -// This partial specialization says that we use the same built-in -// default value for T and const T. -template -class BuiltInDefaultValue { - public: - static bool Exists() { return BuiltInDefaultValue::Exists(); } - static T Get() { return BuiltInDefaultValue::Get(); } -}; - -// This partial specialization defines the default values for pointer -// types. -template -class BuiltInDefaultValue { - public: - static bool Exists() { return true; } - static T* Get() { return NULL; } -}; - -// The following specializations define the default values for -// specific types we care about. -#define GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(type, value) \ - template <> \ - class BuiltInDefaultValue { \ - public: \ - static bool Exists() { return true; } \ - static type Get() { return value; } \ - } - -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(void, ); // NOLINT -#if GTEST_HAS_GLOBAL_STRING -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(::string, ""); -#endif // GTEST_HAS_GLOBAL_STRING -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(::std::string, ""); -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(bool, false); -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned char, '\0'); -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed char, '\0'); -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(char, '\0'); - -// There's no need for a default action for signed wchar_t, as that -// type is the same as wchar_t for gcc, and invalid for MSVC. -// -// There's also no need for a default action for unsigned wchar_t, as -// that type is the same as unsigned int for gcc, and invalid for -// MSVC. -#if GMOCK_WCHAR_T_IS_NATIVE_ -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(wchar_t, 0U); // NOLINT -#endif - -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned short, 0U); // NOLINT -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed short, 0); // NOLINT -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned int, 0U); -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed int, 0); -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(unsigned long, 0UL); // NOLINT -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(signed long, 0L); // NOLINT -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(UInt64, 0); -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(Int64, 0); -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(float, 0); -GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_(double, 0); - -#undef GMOCK_DEFINE_DEFAULT_ACTION_FOR_RETURN_TYPE_ - -} // namespace internal - -// When an unexpected function call is encountered, Google Mock will -// let it return a default value if the user has specified one for its -// return type, or if the return type has a built-in default value; -// otherwise Google Mock won't know what value to return and will have -// to abort the process. -// -// The DefaultValue class allows a user to specify the -// default value for a type T that is both copyable and publicly -// destructible (i.e. anything that can be used as a function return -// type). The usage is: -// -// // Sets the default value for type T to be foo. -// DefaultValue::Set(foo); -template -class DefaultValue { - public: - // Sets the default value for type T; requires T to be - // copy-constructable and have a public destructor. - static void Set(T x) { - delete producer_; - producer_ = new FixedValueProducer(x); - } - - // Provides a factory function to be called to generate the default value. - // This method can be used even if T is only move-constructible, but it is not - // limited to that case. - typedef T (*FactoryFunction)(); - static void SetFactory(FactoryFunction factory) { - delete producer_; - producer_ = new FactoryValueProducer(factory); - } - - // Unsets the default value for type T. - static void Clear() { - delete producer_; - producer_ = NULL; - } - - // Returns true iff the user has set the default value for type T. - static bool IsSet() { return producer_ != NULL; } - - // Returns true if T has a default return value set by the user or there - // exists a built-in default value. - static bool Exists() { - return IsSet() || internal::BuiltInDefaultValue::Exists(); - } - - // Returns the default value for type T if the user has set one; - // otherwise returns the built-in default value. Requires that Exists() - // is true, which ensures that the return value is well-defined. - static T Get() { - return producer_ == NULL ? - internal::BuiltInDefaultValue::Get() : producer_->Produce(); - } - - private: - class ValueProducer { - public: - virtual ~ValueProducer() {} - virtual T Produce() = 0; - }; - - class FixedValueProducer : public ValueProducer { - public: - explicit FixedValueProducer(T value) : value_(value) {} - virtual T Produce() { return value_; } - - private: - const T value_; - GTEST_DISALLOW_COPY_AND_ASSIGN_(FixedValueProducer); - }; - - class FactoryValueProducer : public ValueProducer { - public: - explicit FactoryValueProducer(FactoryFunction factory) - : factory_(factory) {} - virtual T Produce() { return factory_(); } - - private: - const FactoryFunction factory_; - GTEST_DISALLOW_COPY_AND_ASSIGN_(FactoryValueProducer); - }; - - static ValueProducer* producer_; -}; - -// This partial specialization allows a user to set default values for -// reference types. -template -class DefaultValue { - public: - // Sets the default value for type T&. - static void Set(T& x) { // NOLINT - address_ = &x; - } - - // Unsets the default value for type T&. - static void Clear() { - address_ = NULL; - } - - // Returns true iff the user has set the default value for type T&. - static bool IsSet() { return address_ != NULL; } - - // Returns true if T has a default return value set by the user or there - // exists a built-in default value. - static bool Exists() { - return IsSet() || internal::BuiltInDefaultValue::Exists(); - } - - // Returns the default value for type T& if the user has set one; - // otherwise returns the built-in default value if there is one; - // otherwise aborts the process. - static T& Get() { - return address_ == NULL ? - internal::BuiltInDefaultValue::Get() : *address_; - } - - private: - static T* address_; -}; - -// This specialization allows DefaultValue::Get() to -// compile. -template <> -class DefaultValue { - public: - static bool Exists() { return true; } - static void Get() {} -}; - -// Points to the user-set default value for type T. -template -typename DefaultValue::ValueProducer* DefaultValue::producer_ = NULL; - -// Points to the user-set default value for type T&. -template -T* DefaultValue::address_ = NULL; - -// Implement this interface to define an action for function type F. -template -class ActionInterface { - public: - typedef typename internal::Function::Result Result; - typedef typename internal::Function::ArgumentTuple ArgumentTuple; - - ActionInterface() {} - virtual ~ActionInterface() {} - - // Performs the action. This method is not const, as in general an - // action can have side effects and be stateful. For example, a - // get-the-next-element-from-the-collection action will need to - // remember the current element. - virtual Result Perform(const ArgumentTuple& args) = 0; - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(ActionInterface); -}; - -// An Action is a copyable and IMMUTABLE (except by assignment) -// object that represents an action to be taken when a mock function -// of type F is called. The implementation of Action is just a -// linked_ptr to const ActionInterface, so copying is fairly cheap. -// Don't inherit from Action! -// -// You can view an object implementing ActionInterface as a -// concrete action (including its current state), and an Action -// object as a handle to it. -template -class Action { - public: - typedef typename internal::Function::Result Result; - typedef typename internal::Function::ArgumentTuple ArgumentTuple; - - // Constructs a null Action. Needed for storing Action objects in - // STL containers. - Action() {} - -#if GTEST_LANG_CXX11 - // Construct an Action from a specified callable. - // This cannot take std::function directly, because then Action would not be - // directly constructible from lambda (it would require two conversions). - template , G>::value>::type> - Action(G&& fun) : fun_(::std::forward(fun)) {} // NOLINT -#endif - - // Constructs an Action from its implementation. - explicit Action(ActionInterface* impl) : impl_(impl) {} - - // This constructor allows us to turn an Action object into an - // Action, as long as F's arguments can be implicitly converted - // to Func's and Func's return type can be implicitly converted to - // F's. - template - explicit Action(const Action& action); - - // Returns true iff this is the DoDefault() action. - bool IsDoDefault() const { -#if GTEST_LANG_CXX11 - return impl_ == nullptr && fun_ == nullptr; -#else - return impl_ == NULL; -#endif - } - - // Performs the action. Note that this method is const even though - // the corresponding method in ActionInterface is not. The reason - // is that a const Action means that it cannot be re-bound to - // another concrete action, not that the concrete action it binds to - // cannot change state. (Think of the difference between a const - // pointer and a pointer to const.) - Result Perform(ArgumentTuple args) const { - if (IsDoDefault()) { - internal::IllegalDoDefault(__FILE__, __LINE__); - } -#if GTEST_LANG_CXX11 - if (fun_ != nullptr) { - return internal::Apply(fun_, ::std::move(args)); - } -#endif - return impl_->Perform(args); - } - - private: - template - friend class internal::ActionAdaptor; - - template - friend class Action; - - // In C++11, Action can be implemented either as a generic functor (through - // std::function), or legacy ActionInterface. In C++98, only ActionInterface - // is available. The invariants are as follows: - // * in C++98, impl_ is null iff this is the default action - // * in C++11, at most one of fun_ & impl_ may be nonnull; both are null iff - // this is the default action -#if GTEST_LANG_CXX11 - ::std::function fun_; -#endif - internal::linked_ptr > impl_; -}; - -// The PolymorphicAction class template makes it easy to implement a -// polymorphic action (i.e. an action that can be used in mock -// functions of than one type, e.g. Return()). -// -// To define a polymorphic action, a user first provides a COPYABLE -// implementation class that has a Perform() method template: -// -// class FooAction { -// public: -// template -// Result Perform(const ArgumentTuple& args) const { -// // Processes the arguments and returns a result, using -// // tr1::get(args) to get the N-th (0-based) argument in the tuple. -// } -// ... -// }; -// -// Then the user creates the polymorphic action using -// MakePolymorphicAction(object) where object has type FooAction. See -// the definition of Return(void) and SetArgumentPointee(value) for -// complete examples. -template -class PolymorphicAction { - public: - explicit PolymorphicAction(const Impl& impl) : impl_(impl) {} - - template - operator Action() const { - return Action(new MonomorphicImpl(impl_)); - } - - private: - template - class MonomorphicImpl : public ActionInterface { - public: - typedef typename internal::Function::Result Result; - typedef typename internal::Function::ArgumentTuple ArgumentTuple; - - explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {} - - virtual Result Perform(const ArgumentTuple& args) { - return impl_.template Perform(args); - } - - private: - Impl impl_; - - GTEST_DISALLOW_ASSIGN_(MonomorphicImpl); - }; - - Impl impl_; - - GTEST_DISALLOW_ASSIGN_(PolymorphicAction); -}; - -// Creates an Action from its implementation and returns it. The -// created Action object owns the implementation. -template -Action MakeAction(ActionInterface* impl) { - return Action(impl); -} - -// Creates a polymorphic action from its implementation. This is -// easier to use than the PolymorphicAction constructor as it -// doesn't require you to explicitly write the template argument, e.g. -// -// MakePolymorphicAction(foo); -// vs -// PolymorphicAction(foo); -template -inline PolymorphicAction MakePolymorphicAction(const Impl& impl) { - return PolymorphicAction(impl); -} - -namespace internal { - -// Allows an Action object to pose as an Action, as long as F2 -// and F1 are compatible. -template -class ActionAdaptor : public ActionInterface { - public: - typedef typename internal::Function::Result Result; - typedef typename internal::Function::ArgumentTuple ArgumentTuple; - - explicit ActionAdaptor(const Action& from) : impl_(from.impl_) {} - - virtual Result Perform(const ArgumentTuple& args) { - return impl_->Perform(args); - } - - private: - const internal::linked_ptr > impl_; - - GTEST_DISALLOW_ASSIGN_(ActionAdaptor); -}; - -// Helper struct to specialize ReturnAction to execute a move instead of a copy -// on return. Useful for move-only types, but could be used on any type. -template -struct ByMoveWrapper { - explicit ByMoveWrapper(T value) : payload(internal::move(value)) {} - T payload; -}; - -// Implements the polymorphic Return(x) action, which can be used in -// any function that returns the type of x, regardless of the argument -// types. -// -// Note: The value passed into Return must be converted into -// Function::Result when this action is cast to Action rather than -// when that action is performed. This is important in scenarios like -// -// MOCK_METHOD1(Method, T(U)); -// ... -// { -// Foo foo; -// X x(&foo); -// EXPECT_CALL(mock, Method(_)).WillOnce(Return(x)); -// } -// -// In the example above the variable x holds reference to foo which leaves -// scope and gets destroyed. If copying X just copies a reference to foo, -// that copy will be left with a hanging reference. If conversion to T -// makes a copy of foo, the above code is safe. To support that scenario, we -// need to make sure that the type conversion happens inside the EXPECT_CALL -// statement, and conversion of the result of Return to Action is a -// good place for that. -// -// The real life example of the above scenario happens when an invocation -// of gtl::Container() is passed into Return. -// -template -class ReturnAction { - public: - // Constructs a ReturnAction object from the value to be returned. - // 'value' is passed by value instead of by const reference in order - // to allow Return("string literal") to compile. - explicit ReturnAction(R value) : value_(new R(internal::move(value))) {} - - // This template type conversion operator allows Return(x) to be - // used in ANY function that returns x's type. - template - operator Action() const { - // Assert statement belongs here because this is the best place to verify - // conditions on F. It produces the clearest error messages - // in most compilers. - // Impl really belongs in this scope as a local class but can't - // because MSVC produces duplicate symbols in different translation units - // in this case. Until MS fixes that bug we put Impl into the class scope - // and put the typedef both here (for use in assert statement) and - // in the Impl class. But both definitions must be the same. - typedef typename Function::Result Result; - GTEST_COMPILE_ASSERT_( - !is_reference::value, - use_ReturnRef_instead_of_Return_to_return_a_reference); - return Action(new Impl(value_)); - } - - private: - // Implements the Return(x) action for a particular function type F. - template - class Impl : public ActionInterface { - public: - typedef typename Function::Result Result; - typedef typename Function::ArgumentTuple ArgumentTuple; - - // The implicit cast is necessary when Result has more than one - // single-argument constructor (e.g. Result is std::vector) and R - // has a type conversion operator template. In that case, value_(value) - // won't compile as the compiler doesn't known which constructor of - // Result to call. ImplicitCast_ forces the compiler to convert R to - // Result without considering explicit constructors, thus resolving the - // ambiguity. value_ is then initialized using its copy constructor. - explicit Impl(const linked_ptr& value) - : value_before_cast_(*value), - value_(ImplicitCast_(value_before_cast_)) {} - - virtual Result Perform(const ArgumentTuple&) { return value_; } - - private: - GTEST_COMPILE_ASSERT_(!is_reference::value, - Result_cannot_be_a_reference_type); - // We save the value before casting just in case it is being cast to a - // wrapper type. - R value_before_cast_; - Result value_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(Impl); - }; - - // Partially specialize for ByMoveWrapper. This version of ReturnAction will - // move its contents instead. - template - class Impl, F> : public ActionInterface { - public: - typedef typename Function::Result Result; - typedef typename Function::ArgumentTuple ArgumentTuple; - - explicit Impl(const linked_ptr& wrapper) - : performed_(false), wrapper_(wrapper) {} - - virtual Result Perform(const ArgumentTuple&) { - GTEST_CHECK_(!performed_) - << "A ByMove() action should only be performed once."; - performed_ = true; - return internal::move(wrapper_->payload); - } - - private: - bool performed_; - const linked_ptr wrapper_; - - GTEST_DISALLOW_ASSIGN_(Impl); - }; - - const linked_ptr value_; - - GTEST_DISALLOW_ASSIGN_(ReturnAction); -}; - -// Implements the ReturnNull() action. -class ReturnNullAction { - public: - // Allows ReturnNull() to be used in any pointer-returning function. In C++11 - // this is enforced by returning nullptr, and in non-C++11 by asserting a - // pointer type on compile time. - template - static Result Perform(const ArgumentTuple&) { -#if GTEST_LANG_CXX11 - return nullptr; -#else - GTEST_COMPILE_ASSERT_(internal::is_pointer::value, - ReturnNull_can_be_used_to_return_a_pointer_only); - return NULL; -#endif // GTEST_LANG_CXX11 - } -}; - -// Implements the Return() action. -class ReturnVoidAction { - public: - // Allows Return() to be used in any void-returning function. - template - static void Perform(const ArgumentTuple&) { - CompileAssertTypesEqual(); - } -}; - -// Implements the polymorphic ReturnRef(x) action, which can be used -// in any function that returns a reference to the type of x, -// regardless of the argument types. -template -class ReturnRefAction { - public: - // Constructs a ReturnRefAction object from the reference to be returned. - explicit ReturnRefAction(T& ref) : ref_(ref) {} // NOLINT - - // This template type conversion operator allows ReturnRef(x) to be - // used in ANY function that returns a reference to x's type. - template - operator Action() const { - typedef typename Function::Result Result; - // Asserts that the function return type is a reference. This - // catches the user error of using ReturnRef(x) when Return(x) - // should be used, and generates some helpful error message. - GTEST_COMPILE_ASSERT_(internal::is_reference::value, - use_Return_instead_of_ReturnRef_to_return_a_value); - return Action(new Impl(ref_)); - } - - private: - // Implements the ReturnRef(x) action for a particular function type F. - template - class Impl : public ActionInterface { - public: - typedef typename Function::Result Result; - typedef typename Function::ArgumentTuple ArgumentTuple; - - explicit Impl(T& ref) : ref_(ref) {} // NOLINT - - virtual Result Perform(const ArgumentTuple&) { - return ref_; - } - - private: - T& ref_; - - GTEST_DISALLOW_ASSIGN_(Impl); - }; - - T& ref_; - - GTEST_DISALLOW_ASSIGN_(ReturnRefAction); -}; - -// Implements the polymorphic ReturnRefOfCopy(x) action, which can be -// used in any function that returns a reference to the type of x, -// regardless of the argument types. -template -class ReturnRefOfCopyAction { - public: - // Constructs a ReturnRefOfCopyAction object from the reference to - // be returned. - explicit ReturnRefOfCopyAction(const T& value) : value_(value) {} // NOLINT - - // This template type conversion operator allows ReturnRefOfCopy(x) to be - // used in ANY function that returns a reference to x's type. - template - operator Action() const { - typedef typename Function::Result Result; - // Asserts that the function return type is a reference. This - // catches the user error of using ReturnRefOfCopy(x) when Return(x) - // should be used, and generates some helpful error message. - GTEST_COMPILE_ASSERT_( - internal::is_reference::value, - use_Return_instead_of_ReturnRefOfCopy_to_return_a_value); - return Action(new Impl(value_)); - } - - private: - // Implements the ReturnRefOfCopy(x) action for a particular function type F. - template - class Impl : public ActionInterface { - public: - typedef typename Function::Result Result; - typedef typename Function::ArgumentTuple ArgumentTuple; - - explicit Impl(const T& value) : value_(value) {} // NOLINT - - virtual Result Perform(const ArgumentTuple&) { - return value_; - } - - private: - T value_; - - GTEST_DISALLOW_ASSIGN_(Impl); - }; - - const T value_; - - GTEST_DISALLOW_ASSIGN_(ReturnRefOfCopyAction); -}; - -// Implements the polymorphic DoDefault() action. -class DoDefaultAction { - public: - // This template type conversion operator allows DoDefault() to be - // used in any function. - template - operator Action() const { return Action(); } // NOLINT -}; - -// Implements the Assign action to set a given pointer referent to a -// particular value. -template -class AssignAction { - public: - AssignAction(T1* ptr, T2 value) : ptr_(ptr), value_(value) {} - - template - void Perform(const ArgumentTuple& /* args */) const { - *ptr_ = value_; - } - - private: - T1* const ptr_; - const T2 value_; - - GTEST_DISALLOW_ASSIGN_(AssignAction); -}; - -#if !GTEST_OS_WINDOWS_MOBILE - -// Implements the SetErrnoAndReturn action to simulate return from -// various system calls and libc functions. -template -class SetErrnoAndReturnAction { - public: - SetErrnoAndReturnAction(int errno_value, T result) - : errno_(errno_value), - result_(result) {} - template - Result Perform(const ArgumentTuple& /* args */) const { - errno = errno_; - return result_; - } - - private: - const int errno_; - const T result_; - - GTEST_DISALLOW_ASSIGN_(SetErrnoAndReturnAction); -}; - -#endif // !GTEST_OS_WINDOWS_MOBILE - -// Implements the SetArgumentPointee(x) action for any function -// whose N-th argument (0-based) is a pointer to x's type. The -// template parameter kIsProto is true iff type A is ProtocolMessage, -// proto2::Message, or a sub-class of those. -template -class SetArgumentPointeeAction { - public: - // Constructs an action that sets the variable pointed to by the - // N-th function argument to 'value'. - explicit SetArgumentPointeeAction(const A& value) : value_(value) {} - - template - void Perform(const ArgumentTuple& args) const { - CompileAssertTypesEqual(); - *::testing::get(args) = value_; - } - - private: - const A value_; - - GTEST_DISALLOW_ASSIGN_(SetArgumentPointeeAction); -}; - -template -class SetArgumentPointeeAction { - public: - // Constructs an action that sets the variable pointed to by the - // N-th function argument to 'proto'. Both ProtocolMessage and - // proto2::Message have the CopyFrom() method, so the same - // implementation works for both. - explicit SetArgumentPointeeAction(const Proto& proto) : proto_(new Proto) { - proto_->CopyFrom(proto); - } - - template - void Perform(const ArgumentTuple& args) const { - CompileAssertTypesEqual(); - ::testing::get(args)->CopyFrom(*proto_); - } - - private: - const internal::linked_ptr proto_; - - GTEST_DISALLOW_ASSIGN_(SetArgumentPointeeAction); -}; - -// Implements the InvokeWithoutArgs(f) action. The template argument -// FunctionImpl is the implementation type of f, which can be either a -// function pointer or a functor. InvokeWithoutArgs(f) can be used as an -// Action as long as f's type is compatible with F (i.e. f can be -// assigned to a tr1::function). -template -class InvokeWithoutArgsAction { - public: - // The c'tor makes a copy of function_impl (either a function - // pointer or a functor). - explicit InvokeWithoutArgsAction(FunctionImpl function_impl) - : function_impl_(function_impl) {} - - // Allows InvokeWithoutArgs(f) to be used as any action whose type is - // compatible with f. - template - Result Perform(const ArgumentTuple&) { return function_impl_(); } - - private: - FunctionImpl function_impl_; - - GTEST_DISALLOW_ASSIGN_(InvokeWithoutArgsAction); -}; - -// Implements the InvokeWithoutArgs(object_ptr, &Class::Method) action. -template -class InvokeMethodWithoutArgsAction { - public: - InvokeMethodWithoutArgsAction(Class* obj_ptr, MethodPtr method_ptr) - : obj_ptr_(obj_ptr), method_ptr_(method_ptr) {} - - template - Result Perform(const ArgumentTuple&) const { - return (obj_ptr_->*method_ptr_)(); - } - - private: - Class* const obj_ptr_; - const MethodPtr method_ptr_; - - GTEST_DISALLOW_ASSIGN_(InvokeMethodWithoutArgsAction); -}; - -// Implements the InvokeWithoutArgs(callback) action. -template -class InvokeCallbackWithoutArgsAction { - public: - // The c'tor takes ownership of the callback. - explicit InvokeCallbackWithoutArgsAction(CallbackType* callback) - : callback_(callback) { - callback->CheckIsRepeatable(); // Makes sure the callback is permanent. - } - - // This type conversion operator template allows Invoke(callback) to - // be used wherever the callback's return type can be implicitly - // converted to that of the mock function. - template - Result Perform(const ArgumentTuple&) const { return callback_->Run(); } - - private: - const internal::linked_ptr callback_; - - GTEST_DISALLOW_ASSIGN_(InvokeCallbackWithoutArgsAction); -}; - -// Implements the IgnoreResult(action) action. -template -class IgnoreResultAction { - public: - explicit IgnoreResultAction(const A& action) : action_(action) {} - - template - operator Action() const { - // Assert statement belongs here because this is the best place to verify - // conditions on F. It produces the clearest error messages - // in most compilers. - // Impl really belongs in this scope as a local class but can't - // because MSVC produces duplicate symbols in different translation units - // in this case. Until MS fixes that bug we put Impl into the class scope - // and put the typedef both here (for use in assert statement) and - // in the Impl class. But both definitions must be the same. - typedef typename internal::Function::Result Result; - - // Asserts at compile time that F returns void. - CompileAssertTypesEqual(); - - return Action(new Impl(action_)); - } - - private: - template - class Impl : public ActionInterface { - public: - typedef typename internal::Function::Result Result; - typedef typename internal::Function::ArgumentTuple ArgumentTuple; - - explicit Impl(const A& action) : action_(action) {} - - virtual void Perform(const ArgumentTuple& args) { - // Performs the action and ignores its result. - action_.Perform(args); - } - - private: - // Type OriginalFunction is the same as F except that its return - // type is IgnoredValue. - typedef typename internal::Function::MakeResultIgnoredValue - OriginalFunction; - - const Action action_; - - GTEST_DISALLOW_ASSIGN_(Impl); - }; - - const A action_; - - GTEST_DISALLOW_ASSIGN_(IgnoreResultAction); -}; - -// A ReferenceWrapper object represents a reference to type T, -// which can be either const or not. It can be explicitly converted -// from, and implicitly converted to, a T&. Unlike a reference, -// ReferenceWrapper can be copied and can survive template type -// inference. This is used to support by-reference arguments in the -// InvokeArgument(...) action. The idea was from "reference -// wrappers" in tr1, which we don't have in our source tree yet. -template -class ReferenceWrapper { - public: - // Constructs a ReferenceWrapper object from a T&. - explicit ReferenceWrapper(T& l_value) : pointer_(&l_value) {} // NOLINT - - // Allows a ReferenceWrapper object to be implicitly converted to - // a T&. - operator T&() const { return *pointer_; } - private: - T* pointer_; -}; - -// Allows the expression ByRef(x) to be printed as a reference to x. -template -void PrintTo(const ReferenceWrapper& ref, ::std::ostream* os) { - T& value = ref; - UniversalPrinter::Print(value, os); -} - -// Does two actions sequentially. Used for implementing the DoAll(a1, -// a2, ...) action. -template -class DoBothAction { - public: - DoBothAction(Action1 action1, Action2 action2) - : action1_(action1), action2_(action2) {} - - // This template type conversion operator allows DoAll(a1, ..., a_n) - // to be used in ANY function of compatible type. - template - operator Action() const { - return Action(new Impl(action1_, action2_)); - } - - private: - // Implements the DoAll(...) action for a particular function type F. - template - class Impl : public ActionInterface { - public: - typedef typename Function::Result Result; - typedef typename Function::ArgumentTuple ArgumentTuple; - typedef typename Function::MakeResultVoid VoidResult; - - Impl(const Action& action1, const Action& action2) - : action1_(action1), action2_(action2) {} - - virtual Result Perform(const ArgumentTuple& args) { - action1_.Perform(args); - return action2_.Perform(args); - } - - private: - const Action action1_; - const Action action2_; - - GTEST_DISALLOW_ASSIGN_(Impl); - }; - - Action1 action1_; - Action2 action2_; - - GTEST_DISALLOW_ASSIGN_(DoBothAction); -}; - -} // namespace internal - -// An Unused object can be implicitly constructed from ANY value. -// This is handy when defining actions that ignore some or all of the -// mock function arguments. For example, given -// -// MOCK_METHOD3(Foo, double(const string& label, double x, double y)); -// MOCK_METHOD3(Bar, double(int index, double x, double y)); -// -// instead of -// -// double DistanceToOriginWithLabel(const string& label, double x, double y) { -// return sqrt(x*x + y*y); -// } -// double DistanceToOriginWithIndex(int index, double x, double y) { -// return sqrt(x*x + y*y); -// } -// ... -// EXPECT_CALL(mock, Foo("abc", _, _)) -// .WillOnce(Invoke(DistanceToOriginWithLabel)); -// EXPECT_CALL(mock, Bar(5, _, _)) -// .WillOnce(Invoke(DistanceToOriginWithIndex)); -// -// you could write -// -// // We can declare any uninteresting argument as Unused. -// double DistanceToOrigin(Unused, double x, double y) { -// return sqrt(x*x + y*y); -// } -// ... -// EXPECT_CALL(mock, Foo("abc", _, _)).WillOnce(Invoke(DistanceToOrigin)); -// EXPECT_CALL(mock, Bar(5, _, _)).WillOnce(Invoke(DistanceToOrigin)); -typedef internal::IgnoredValue Unused; - -// This constructor allows us to turn an Action object into an -// Action, as long as To's arguments can be implicitly converted -// to From's and From's return type cann be implicitly converted to -// To's. -template -template -Action::Action(const Action& from) - : -#if GTEST_LANG_CXX11 - fun_(from.fun_), -#endif - impl_(from.impl_ == NULL ? NULL - : new internal::ActionAdaptor(from)) { -} - -// Creates an action that returns 'value'. 'value' is passed by value -// instead of const reference - otherwise Return("string literal") -// will trigger a compiler error about using array as initializer. -template -internal::ReturnAction Return(R value) { - return internal::ReturnAction(internal::move(value)); -} - -// Creates an action that returns NULL. -inline PolymorphicAction ReturnNull() { - return MakePolymorphicAction(internal::ReturnNullAction()); -} - -// Creates an action that returns from a void function. -inline PolymorphicAction Return() { - return MakePolymorphicAction(internal::ReturnVoidAction()); -} - -// Creates an action that returns the reference to a variable. -template -inline internal::ReturnRefAction ReturnRef(R& x) { // NOLINT - return internal::ReturnRefAction(x); -} - -// Creates an action that returns the reference to a copy of the -// argument. The copy is created when the action is constructed and -// lives as long as the action. -template -inline internal::ReturnRefOfCopyAction ReturnRefOfCopy(const R& x) { - return internal::ReturnRefOfCopyAction(x); -} - -// Modifies the parent action (a Return() action) to perform a move of the -// argument instead of a copy. -// Return(ByMove()) actions can only be executed once and will assert this -// invariant. -template -internal::ByMoveWrapper ByMove(R x) { - return internal::ByMoveWrapper(internal::move(x)); -} - -// Creates an action that does the default action for the give mock function. -inline internal::DoDefaultAction DoDefault() { - return internal::DoDefaultAction(); -} - -// Creates an action that sets the variable pointed by the N-th -// (0-based) function argument to 'value'. -template -PolymorphicAction< - internal::SetArgumentPointeeAction< - N, T, internal::IsAProtocolMessage::value> > -SetArgPointee(const T& x) { - return MakePolymorphicAction(internal::SetArgumentPointeeAction< - N, T, internal::IsAProtocolMessage::value>(x)); -} - -#if !((GTEST_GCC_VER_ && GTEST_GCC_VER_ < 40000) || GTEST_OS_SYMBIAN) -// This overload allows SetArgPointee() to accept a string literal. -// GCC prior to the version 4.0 and Symbian C++ compiler cannot distinguish -// this overload from the templated version and emit a compile error. -template -PolymorphicAction< - internal::SetArgumentPointeeAction > -SetArgPointee(const char* p) { - return MakePolymorphicAction(internal::SetArgumentPointeeAction< - N, const char*, false>(p)); -} - -template -PolymorphicAction< - internal::SetArgumentPointeeAction > -SetArgPointee(const wchar_t* p) { - return MakePolymorphicAction(internal::SetArgumentPointeeAction< - N, const wchar_t*, false>(p)); -} -#endif - -// The following version is DEPRECATED. -template -PolymorphicAction< - internal::SetArgumentPointeeAction< - N, T, internal::IsAProtocolMessage::value> > -SetArgumentPointee(const T& x) { - return MakePolymorphicAction(internal::SetArgumentPointeeAction< - N, T, internal::IsAProtocolMessage::value>(x)); -} - -// Creates an action that sets a pointer referent to a given value. -template -PolymorphicAction > Assign(T1* ptr, T2 val) { - return MakePolymorphicAction(internal::AssignAction(ptr, val)); -} - -#if !GTEST_OS_WINDOWS_MOBILE - -// Creates an action that sets errno and returns the appropriate error. -template -PolymorphicAction > -SetErrnoAndReturn(int errval, T result) { - return MakePolymorphicAction( - internal::SetErrnoAndReturnAction(errval, result)); -} - -#endif // !GTEST_OS_WINDOWS_MOBILE - -// Various overloads for InvokeWithoutArgs(). - -// Creates an action that invokes 'function_impl' with no argument. -template -PolymorphicAction > -InvokeWithoutArgs(FunctionImpl function_impl) { - return MakePolymorphicAction( - internal::InvokeWithoutArgsAction(function_impl)); -} - -// Creates an action that invokes the given method on the given object -// with no argument. -template -PolymorphicAction > -InvokeWithoutArgs(Class* obj_ptr, MethodPtr method_ptr) { - return MakePolymorphicAction( - internal::InvokeMethodWithoutArgsAction( - obj_ptr, method_ptr)); -} - -// Creates an action that performs an_action and throws away its -// result. In other words, it changes the return type of an_action to -// void. an_action MUST NOT return void, or the code won't compile. -template -inline internal::IgnoreResultAction IgnoreResult(const A& an_action) { - return internal::IgnoreResultAction(an_action); -} - -// Creates a reference wrapper for the given L-value. If necessary, -// you can explicitly specify the type of the reference. For example, -// suppose 'derived' is an object of type Derived, ByRef(derived) -// would wrap a Derived&. If you want to wrap a const Base& instead, -// where Base is a base class of Derived, just write: -// -// ByRef(derived) -template -inline internal::ReferenceWrapper ByRef(T& l_value) { // NOLINT - return internal::ReferenceWrapper(l_value); -} - -} // namespace testing - -#endif // GMOCK_INCLUDE_GMOCK_GMOCK_ACTIONS_H_ -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Mock - a framework for writing C++ mock classes. -// -// This file implements some commonly used cardinalities. More -// cardinalities can be defined by the user implementing the -// CardinalityInterface interface if necessary. - -#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ -#define GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ - -#include -#include // NOLINT - -namespace testing { - -// To implement a cardinality Foo, define: -// 1. a class FooCardinality that implements the -// CardinalityInterface interface, and -// 2. a factory function that creates a Cardinality object from a -// const FooCardinality*. -// -// The two-level delegation design follows that of Matcher, providing -// consistency for extension developers. It also eases ownership -// management as Cardinality objects can now be copied like plain values. - -// The implementation of a cardinality. -class CardinalityInterface { - public: - virtual ~CardinalityInterface() {} - - // Conservative estimate on the lower/upper bound of the number of - // calls allowed. - virtual int ConservativeLowerBound() const { return 0; } - virtual int ConservativeUpperBound() const { return INT_MAX; } - - // Returns true iff call_count calls will satisfy this cardinality. - virtual bool IsSatisfiedByCallCount(int call_count) const = 0; - - // Returns true iff call_count calls will saturate this cardinality. - virtual bool IsSaturatedByCallCount(int call_count) const = 0; - - // Describes self to an ostream. - virtual void DescribeTo(::std::ostream* os) const = 0; -}; - -// A Cardinality is a copyable and IMMUTABLE (except by assignment) -// object that specifies how many times a mock function is expected to -// be called. The implementation of Cardinality is just a linked_ptr -// to const CardinalityInterface, so copying is fairly cheap. -// Don't inherit from Cardinality! -class GTEST_API_ Cardinality { - public: - // Constructs a null cardinality. Needed for storing Cardinality - // objects in STL containers. - Cardinality() {} - - // Constructs a Cardinality from its implementation. - explicit Cardinality(const CardinalityInterface* impl) : impl_(impl) {} - - // Conservative estimate on the lower/upper bound of the number of - // calls allowed. - int ConservativeLowerBound() const { return impl_->ConservativeLowerBound(); } - int ConservativeUpperBound() const { return impl_->ConservativeUpperBound(); } - - // Returns true iff call_count calls will satisfy this cardinality. - bool IsSatisfiedByCallCount(int call_count) const { - return impl_->IsSatisfiedByCallCount(call_count); - } - - // Returns true iff call_count calls will saturate this cardinality. - bool IsSaturatedByCallCount(int call_count) const { - return impl_->IsSaturatedByCallCount(call_count); - } - - // Returns true iff call_count calls will over-saturate this - // cardinality, i.e. exceed the maximum number of allowed calls. - bool IsOverSaturatedByCallCount(int call_count) const { - return impl_->IsSaturatedByCallCount(call_count) && - !impl_->IsSatisfiedByCallCount(call_count); - } - - // Describes self to an ostream - void DescribeTo(::std::ostream* os) const { impl_->DescribeTo(os); } - - // Describes the given actual call count to an ostream. - static void DescribeActualCallCountTo(int actual_call_count, - ::std::ostream* os); - - private: - internal::linked_ptr impl_; -}; - -// Creates a cardinality that allows at least n calls. -GTEST_API_ Cardinality AtLeast(int n); - -// Creates a cardinality that allows at most n calls. -GTEST_API_ Cardinality AtMost(int n); - -// Creates a cardinality that allows any number of calls. -GTEST_API_ Cardinality AnyNumber(); - -// Creates a cardinality that allows between min and max calls. -GTEST_API_ Cardinality Between(int min, int max); - -// Creates a cardinality that allows exactly n calls. -GTEST_API_ Cardinality Exactly(int n); - -// Creates a cardinality from its implementation. -inline Cardinality MakeCardinality(const CardinalityInterface* c) { - return Cardinality(c); -} - -} // namespace testing - -#endif // GMOCK_INCLUDE_GMOCK_GMOCK_CARDINALITIES_H_ -// This file was GENERATED by command: -// pump.py gmock-generated-actions.h.pump -// DO NOT EDIT BY HAND!!! - -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Mock - a framework for writing C++ mock classes. -// -// This file implements some commonly used variadic actions. - -#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_ -#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_ - - -namespace testing { -namespace internal { - -// InvokeHelper knows how to unpack an N-tuple and invoke an N-ary -// function, method, or callback with the unpacked values, where F is -// a function type that takes N arguments. -template -class InvokeHelper; - -template -class InvokeHelper > { - public: - template - static R Invoke(Function function, const ::testing::tuple<>&) { - return function(); - } - - template - static R InvokeMethod(Class* obj_ptr, - MethodPtr method_ptr, - const ::testing::tuple<>&) { - return (obj_ptr->*method_ptr)(); - } - - template - static R InvokeCallback(CallbackType* callback, - const ::testing::tuple<>&) { - return callback->Run(); - } -}; - -template -class InvokeHelper > { - public: - template - static R Invoke(Function function, const ::testing::tuple& args) { - return function(get<0>(args)); - } - - template - static R InvokeMethod(Class* obj_ptr, - MethodPtr method_ptr, - const ::testing::tuple& args) { - return (obj_ptr->*method_ptr)(get<0>(args)); - } - - template - static R InvokeCallback(CallbackType* callback, - const ::testing::tuple& args) { - return callback->Run(get<0>(args)); - } -}; - -template -class InvokeHelper > { - public: - template - static R Invoke(Function function, const ::testing::tuple& args) { - return function(get<0>(args), get<1>(args)); - } - - template - static R InvokeMethod(Class* obj_ptr, - MethodPtr method_ptr, - const ::testing::tuple& args) { - return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args)); - } - - template - static R InvokeCallback(CallbackType* callback, - const ::testing::tuple& args) { - return callback->Run(get<0>(args), get<1>(args)); - } -}; - -template -class InvokeHelper > { - public: - template - static R Invoke(Function function, const ::testing::tuple& args) { - return function(get<0>(args), get<1>(args), get<2>(args)); - } - - template - static R InvokeMethod(Class* obj_ptr, - MethodPtr method_ptr, - const ::testing::tuple& args) { - return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args), - get<2>(args)); - } - - template - static R InvokeCallback(CallbackType* callback, - const ::testing::tuple& args) { - return callback->Run(get<0>(args), get<1>(args), get<2>(args)); - } -}; - -template -class InvokeHelper > { - public: - template - static R Invoke(Function function, const ::testing::tuple& args) { - return function(get<0>(args), get<1>(args), get<2>(args), - get<3>(args)); - } - - template - static R InvokeMethod(Class* obj_ptr, - MethodPtr method_ptr, - const ::testing::tuple& args) { - return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args), - get<2>(args), get<3>(args)); - } - - template - static R InvokeCallback(CallbackType* callback, - const ::testing::tuple& args) { - return callback->Run(get<0>(args), get<1>(args), get<2>(args), - get<3>(args)); - } -}; - -template -class InvokeHelper > { - public: - template - static R Invoke(Function function, const ::testing::tuple& args) { - return function(get<0>(args), get<1>(args), get<2>(args), - get<3>(args), get<4>(args)); - } - - template - static R InvokeMethod(Class* obj_ptr, - MethodPtr method_ptr, - const ::testing::tuple& args) { - return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args), - get<2>(args), get<3>(args), get<4>(args)); - } - - template - static R InvokeCallback(CallbackType* callback, - const ::testing::tuple& args) { - return callback->Run(get<0>(args), get<1>(args), get<2>(args), - get<3>(args), get<4>(args)); - } -}; - -template -class InvokeHelper > { - public: - template - static R Invoke(Function function, const ::testing::tuple& args) { - return function(get<0>(args), get<1>(args), get<2>(args), - get<3>(args), get<4>(args), get<5>(args)); - } - - template - static R InvokeMethod(Class* obj_ptr, - MethodPtr method_ptr, - const ::testing::tuple& args) { - return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args), - get<2>(args), get<3>(args), get<4>(args), get<5>(args)); - } - - // There is no InvokeCallback() for 6-tuples, as google3 callbacks - // support 5 arguments at most. -}; - -template -class InvokeHelper > { - public: - template - static R Invoke(Function function, const ::testing::tuple& args) { - return function(get<0>(args), get<1>(args), get<2>(args), - get<3>(args), get<4>(args), get<5>(args), get<6>(args)); - } - - template - static R InvokeMethod(Class* obj_ptr, - MethodPtr method_ptr, - const ::testing::tuple& args) { - return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args), - get<2>(args), get<3>(args), get<4>(args), get<5>(args), - get<6>(args)); - } - - // There is no InvokeCallback() for 7-tuples, as google3 callbacks - // support 5 arguments at most. -}; - -template -class InvokeHelper > { - public: - template - static R Invoke(Function function, const ::testing::tuple& args) { - return function(get<0>(args), get<1>(args), get<2>(args), - get<3>(args), get<4>(args), get<5>(args), get<6>(args), - get<7>(args)); - } - - template - static R InvokeMethod(Class* obj_ptr, - MethodPtr method_ptr, - const ::testing::tuple& args) { - return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args), - get<2>(args), get<3>(args), get<4>(args), get<5>(args), - get<6>(args), get<7>(args)); - } - - // There is no InvokeCallback() for 8-tuples, as google3 callbacks - // support 5 arguments at most. -}; - -template -class InvokeHelper > { - public: - template - static R Invoke(Function function, const ::testing::tuple& args) { - return function(get<0>(args), get<1>(args), get<2>(args), - get<3>(args), get<4>(args), get<5>(args), get<6>(args), - get<7>(args), get<8>(args)); - } - - template - static R InvokeMethod(Class* obj_ptr, - MethodPtr method_ptr, - const ::testing::tuple& args) { - return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args), - get<2>(args), get<3>(args), get<4>(args), get<5>(args), - get<6>(args), get<7>(args), get<8>(args)); - } - - // There is no InvokeCallback() for 9-tuples, as google3 callbacks - // support 5 arguments at most. -}; - -template -class InvokeHelper > { - public: - template - static R Invoke(Function function, const ::testing::tuple& args) { - return function(get<0>(args), get<1>(args), get<2>(args), - get<3>(args), get<4>(args), get<5>(args), get<6>(args), - get<7>(args), get<8>(args), get<9>(args)); - } - - template - static R InvokeMethod(Class* obj_ptr, - MethodPtr method_ptr, - const ::testing::tuple& args) { - return (obj_ptr->*method_ptr)(get<0>(args), get<1>(args), - get<2>(args), get<3>(args), get<4>(args), get<5>(args), - get<6>(args), get<7>(args), get<8>(args), get<9>(args)); - } - - // There is no InvokeCallback() for 10-tuples, as google3 callbacks - // support 5 arguments at most. -}; - -// Implements the Invoke(callback) action. -template -class InvokeCallbackAction { - public: - // The c'tor takes ownership of the callback. - explicit InvokeCallbackAction(CallbackType* callback) - : callback_(callback) { - callback->CheckIsRepeatable(); // Makes sure the callback is permanent. - } - - // This type conversion operator template allows Invoke(callback) to - // be used wherever the callback's type is compatible with that of - // the mock function, i.e. if the mock function's arguments can be - // implicitly converted to the callback's arguments and the - // callback's result can be implicitly converted to the mock - // function's result. - template - Result Perform(const ArgumentTuple& args) const { - return InvokeHelper::InvokeCallback( - callback_.get(), args); - } - private: - const linked_ptr callback_; -}; - -// An INTERNAL macro for extracting the type of a tuple field. It's -// subject to change without notice - DO NOT USE IN USER CODE! -#define GMOCK_FIELD_(Tuple, N) \ - typename ::testing::tuple_element::type - -// SelectArgs::type is the -// type of an n-ary function whose i-th (1-based) argument type is the -// k{i}-th (0-based) field of ArgumentTuple, which must be a tuple -// type, and whose return type is Result. For example, -// SelectArgs, 0, 3>::type -// is int(bool, long). -// -// SelectArgs::Select(args) -// returns the selected fields (k1, k2, ..., k_n) of args as a tuple. -// For example, -// SelectArgs, 2, 0>::Select( -// ::testing::make_tuple(true, 'a', 2.5)) -// returns tuple (2.5, true). -// -// The numbers in list k1, k2, ..., k_n must be >= 0, where n can be -// in the range [0, 10]. Duplicates are allowed and they don't have -// to be in an ascending or descending order. - -template -class SelectArgs { - public: - typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1), - GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3), - GMOCK_FIELD_(ArgumentTuple, k4), GMOCK_FIELD_(ArgumentTuple, k5), - GMOCK_FIELD_(ArgumentTuple, k6), GMOCK_FIELD_(ArgumentTuple, k7), - GMOCK_FIELD_(ArgumentTuple, k8), GMOCK_FIELD_(ArgumentTuple, k9), - GMOCK_FIELD_(ArgumentTuple, k10)); - typedef typename Function::ArgumentTuple SelectedArgs; - static SelectedArgs Select(const ArgumentTuple& args) { - return SelectedArgs(get(args), get(args), get(args), - get(args), get(args), get(args), get(args), - get(args), get(args), get(args)); - } -}; - -template -class SelectArgs { - public: - typedef Result type(); - typedef typename Function::ArgumentTuple SelectedArgs; - static SelectedArgs Select(const ArgumentTuple& /* args */) { - return SelectedArgs(); - } -}; - -template -class SelectArgs { - public: - typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1)); - typedef typename Function::ArgumentTuple SelectedArgs; - static SelectedArgs Select(const ArgumentTuple& args) { - return SelectedArgs(get(args)); - } -}; - -template -class SelectArgs { - public: - typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1), - GMOCK_FIELD_(ArgumentTuple, k2)); - typedef typename Function::ArgumentTuple SelectedArgs; - static SelectedArgs Select(const ArgumentTuple& args) { - return SelectedArgs(get(args), get(args)); - } -}; - -template -class SelectArgs { - public: - typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1), - GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3)); - typedef typename Function::ArgumentTuple SelectedArgs; - static SelectedArgs Select(const ArgumentTuple& args) { - return SelectedArgs(get(args), get(args), get(args)); - } -}; - -template -class SelectArgs { - public: - typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1), - GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3), - GMOCK_FIELD_(ArgumentTuple, k4)); - typedef typename Function::ArgumentTuple SelectedArgs; - static SelectedArgs Select(const ArgumentTuple& args) { - return SelectedArgs(get(args), get(args), get(args), - get(args)); - } -}; - -template -class SelectArgs { - public: - typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1), - GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3), - GMOCK_FIELD_(ArgumentTuple, k4), GMOCK_FIELD_(ArgumentTuple, k5)); - typedef typename Function::ArgumentTuple SelectedArgs; - static SelectedArgs Select(const ArgumentTuple& args) { - return SelectedArgs(get(args), get(args), get(args), - get(args), get(args)); - } -}; - -template -class SelectArgs { - public: - typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1), - GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3), - GMOCK_FIELD_(ArgumentTuple, k4), GMOCK_FIELD_(ArgumentTuple, k5), - GMOCK_FIELD_(ArgumentTuple, k6)); - typedef typename Function::ArgumentTuple SelectedArgs; - static SelectedArgs Select(const ArgumentTuple& args) { - return SelectedArgs(get(args), get(args), get(args), - get(args), get(args), get(args)); - } -}; - -template -class SelectArgs { - public: - typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1), - GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3), - GMOCK_FIELD_(ArgumentTuple, k4), GMOCK_FIELD_(ArgumentTuple, k5), - GMOCK_FIELD_(ArgumentTuple, k6), GMOCK_FIELD_(ArgumentTuple, k7)); - typedef typename Function::ArgumentTuple SelectedArgs; - static SelectedArgs Select(const ArgumentTuple& args) { - return SelectedArgs(get(args), get(args), get(args), - get(args), get(args), get(args), get(args)); - } -}; - -template -class SelectArgs { - public: - typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1), - GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3), - GMOCK_FIELD_(ArgumentTuple, k4), GMOCK_FIELD_(ArgumentTuple, k5), - GMOCK_FIELD_(ArgumentTuple, k6), GMOCK_FIELD_(ArgumentTuple, k7), - GMOCK_FIELD_(ArgumentTuple, k8)); - typedef typename Function::ArgumentTuple SelectedArgs; - static SelectedArgs Select(const ArgumentTuple& args) { - return SelectedArgs(get(args), get(args), get(args), - get(args), get(args), get(args), get(args), - get(args)); - } -}; - -template -class SelectArgs { - public: - typedef Result type(GMOCK_FIELD_(ArgumentTuple, k1), - GMOCK_FIELD_(ArgumentTuple, k2), GMOCK_FIELD_(ArgumentTuple, k3), - GMOCK_FIELD_(ArgumentTuple, k4), GMOCK_FIELD_(ArgumentTuple, k5), - GMOCK_FIELD_(ArgumentTuple, k6), GMOCK_FIELD_(ArgumentTuple, k7), - GMOCK_FIELD_(ArgumentTuple, k8), GMOCK_FIELD_(ArgumentTuple, k9)); - typedef typename Function::ArgumentTuple SelectedArgs; - static SelectedArgs Select(const ArgumentTuple& args) { - return SelectedArgs(get(args), get(args), get(args), - get(args), get(args), get(args), get(args), - get(args), get(args)); - } -}; - -#undef GMOCK_FIELD_ - -// Implements the WithArgs action. -template -class WithArgsAction { - public: - explicit WithArgsAction(const InnerAction& action) : action_(action) {} - - template - operator Action() const { return MakeAction(new Impl(action_)); } - - private: - template - class Impl : public ActionInterface { - public: - typedef typename Function::Result Result; - typedef typename Function::ArgumentTuple ArgumentTuple; - - explicit Impl(const InnerAction& action) : action_(action) {} - - virtual Result Perform(const ArgumentTuple& args) { - return action_.Perform(SelectArgs::Select(args)); - } - - private: - typedef typename SelectArgs::type InnerFunctionType; - - Action action_; - }; - - const InnerAction action_; - - GTEST_DISALLOW_ASSIGN_(WithArgsAction); -}; - -// A macro from the ACTION* family (defined later in this file) -// defines an action that can be used in a mock function. Typically, -// these actions only care about a subset of the arguments of the mock -// function. For example, if such an action only uses the second -// argument, it can be used in any mock function that takes >= 2 -// arguments where the type of the second argument is compatible. -// -// Therefore, the action implementation must be prepared to take more -// arguments than it needs. The ExcessiveArg type is used to -// represent those excessive arguments. In order to keep the compiler -// error messages tractable, we define it in the testing namespace -// instead of testing::internal. However, this is an INTERNAL TYPE -// and subject to change without notice, so a user MUST NOT USE THIS -// TYPE DIRECTLY. -struct ExcessiveArg {}; - -// A helper class needed for implementing the ACTION* macros. -template -class ActionHelper { - public: - static Result Perform(Impl* impl, const ::testing::tuple<>& args) { - return impl->template gmock_PerformImpl<>(args, ExcessiveArg(), - ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), - ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), - ExcessiveArg()); - } - - template - static Result Perform(Impl* impl, const ::testing::tuple& args) { - return impl->template gmock_PerformImpl(args, get<0>(args), - ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), - ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), - ExcessiveArg()); - } - - template - static Result Perform(Impl* impl, const ::testing::tuple& args) { - return impl->template gmock_PerformImpl(args, get<0>(args), - get<1>(args), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), - ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), - ExcessiveArg()); - } - - template - static Result Perform(Impl* impl, const ::testing::tuple& args) { - return impl->template gmock_PerformImpl(args, get<0>(args), - get<1>(args), get<2>(args), ExcessiveArg(), ExcessiveArg(), - ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), - ExcessiveArg()); - } - - template - static Result Perform(Impl* impl, const ::testing::tuple& args) { - return impl->template gmock_PerformImpl(args, get<0>(args), - get<1>(args), get<2>(args), get<3>(args), ExcessiveArg(), - ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), - ExcessiveArg()); - } - - template - static Result Perform(Impl* impl, const ::testing::tuple& args) { - return impl->template gmock_PerformImpl(args, - get<0>(args), get<1>(args), get<2>(args), get<3>(args), get<4>(args), - ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), - ExcessiveArg()); - } - - template - static Result Perform(Impl* impl, const ::testing::tuple& args) { - return impl->template gmock_PerformImpl(args, - get<0>(args), get<1>(args), get<2>(args), get<3>(args), get<4>(args), - get<5>(args), ExcessiveArg(), ExcessiveArg(), ExcessiveArg(), - ExcessiveArg()); - } - - template - static Result Perform(Impl* impl, const ::testing::tuple& args) { - return impl->template gmock_PerformImpl(args, - get<0>(args), get<1>(args), get<2>(args), get<3>(args), get<4>(args), - get<5>(args), get<6>(args), ExcessiveArg(), ExcessiveArg(), - ExcessiveArg()); - } - - template - static Result Perform(Impl* impl, const ::testing::tuple& args) { - return impl->template gmock_PerformImpl(args, get<0>(args), get<1>(args), get<2>(args), get<3>(args), - get<4>(args), get<5>(args), get<6>(args), get<7>(args), ExcessiveArg(), - ExcessiveArg()); - } - - template - static Result Perform(Impl* impl, const ::testing::tuple& args) { - return impl->template gmock_PerformImpl(args, get<0>(args), get<1>(args), get<2>(args), get<3>(args), - get<4>(args), get<5>(args), get<6>(args), get<7>(args), get<8>(args), - ExcessiveArg()); - } - - template - static Result Perform(Impl* impl, const ::testing::tuple& args) { - return impl->template gmock_PerformImpl(args, get<0>(args), get<1>(args), get<2>(args), get<3>(args), - get<4>(args), get<5>(args), get<6>(args), get<7>(args), get<8>(args), - get<9>(args)); - } -}; - -} // namespace internal - -// Various overloads for Invoke(). - -// WithArgs(an_action) creates an action that passes -// the selected arguments of the mock function to an_action and -// performs it. It serves as an adaptor between actions with -// different argument lists. C++ doesn't support default arguments for -// function templates, so we have to overload it. -template -inline internal::WithArgsAction -WithArgs(const InnerAction& action) { - return internal::WithArgsAction(action); -} - -template -inline internal::WithArgsAction -WithArgs(const InnerAction& action) { - return internal::WithArgsAction(action); -} - -template -inline internal::WithArgsAction -WithArgs(const InnerAction& action) { - return internal::WithArgsAction(action); -} - -template -inline internal::WithArgsAction -WithArgs(const InnerAction& action) { - return internal::WithArgsAction(action); -} - -template -inline internal::WithArgsAction -WithArgs(const InnerAction& action) { - return internal::WithArgsAction(action); -} - -template -inline internal::WithArgsAction -WithArgs(const InnerAction& action) { - return internal::WithArgsAction(action); -} - -template -inline internal::WithArgsAction -WithArgs(const InnerAction& action) { - return internal::WithArgsAction(action); -} - -template -inline internal::WithArgsAction -WithArgs(const InnerAction& action) { - return internal::WithArgsAction(action); -} - -template -inline internal::WithArgsAction -WithArgs(const InnerAction& action) { - return internal::WithArgsAction(action); -} - -template -inline internal::WithArgsAction -WithArgs(const InnerAction& action) { - return internal::WithArgsAction(action); -} - -// Creates an action that does actions a1, a2, ..., sequentially in -// each invocation. -template -inline internal::DoBothAction -DoAll(Action1 a1, Action2 a2) { - return internal::DoBothAction(a1, a2); -} - -template -inline internal::DoBothAction > -DoAll(Action1 a1, Action2 a2, Action3 a3) { - return DoAll(a1, DoAll(a2, a3)); -} - -template -inline internal::DoBothAction > > -DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4) { - return DoAll(a1, DoAll(a2, a3, a4)); -} - -template -inline internal::DoBothAction > > > -DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5) { - return DoAll(a1, DoAll(a2, a3, a4, a5)); -} - -template -inline internal::DoBothAction > > > > -DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6) { - return DoAll(a1, DoAll(a2, a3, a4, a5, a6)); -} - -template -inline internal::DoBothAction > > > > > -DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6, - Action7 a7) { - return DoAll(a1, DoAll(a2, a3, a4, a5, a6, a7)); -} - -template -inline internal::DoBothAction > > > > > > -DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6, - Action7 a7, Action8 a8) { - return DoAll(a1, DoAll(a2, a3, a4, a5, a6, a7, a8)); -} - -template -inline internal::DoBothAction > > > > > > > -DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6, - Action7 a7, Action8 a8, Action9 a9) { - return DoAll(a1, DoAll(a2, a3, a4, a5, a6, a7, a8, a9)); -} - -template -inline internal::DoBothAction > > > > > > > > -DoAll(Action1 a1, Action2 a2, Action3 a3, Action4 a4, Action5 a5, Action6 a6, - Action7 a7, Action8 a8, Action9 a9, Action10 a10) { - return DoAll(a1, DoAll(a2, a3, a4, a5, a6, a7, a8, a9, a10)); -} - -} // namespace testing - -// The ACTION* family of macros can be used in a namespace scope to -// define custom actions easily. The syntax: -// -// ACTION(name) { statements; } -// -// will define an action with the given name that executes the -// statements. The value returned by the statements will be used as -// the return value of the action. Inside the statements, you can -// refer to the K-th (0-based) argument of the mock function by -// 'argK', and refer to its type by 'argK_type'. For example: -// -// ACTION(IncrementArg1) { -// arg1_type temp = arg1; -// return ++(*temp); -// } -// -// allows you to write -// -// ...WillOnce(IncrementArg1()); -// -// You can also refer to the entire argument tuple and its type by -// 'args' and 'args_type', and refer to the mock function type and its -// return type by 'function_type' and 'return_type'. -// -// Note that you don't need to specify the types of the mock function -// arguments. However rest assured that your code is still type-safe: -// you'll get a compiler error if *arg1 doesn't support the ++ -// operator, or if the type of ++(*arg1) isn't compatible with the -// mock function's return type, for example. -// -// Sometimes you'll want to parameterize the action. For that you can use -// another macro: -// -// ACTION_P(name, param_name) { statements; } -// -// For example: -// -// ACTION_P(Add, n) { return arg0 + n; } -// -// will allow you to write: -// -// ...WillOnce(Add(5)); -// -// Note that you don't need to provide the type of the parameter -// either. If you need to reference the type of a parameter named -// 'foo', you can write 'foo_type'. For example, in the body of -// ACTION_P(Add, n) above, you can write 'n_type' to refer to the type -// of 'n'. -// -// We also provide ACTION_P2, ACTION_P3, ..., up to ACTION_P10 to support -// multi-parameter actions. -// -// For the purpose of typing, you can view -// -// ACTION_Pk(Foo, p1, ..., pk) { ... } -// -// as shorthand for -// -// template -// FooActionPk Foo(p1_type p1, ..., pk_type pk) { ... } -// -// In particular, you can provide the template type arguments -// explicitly when invoking Foo(), as in Foo(5, false); -// although usually you can rely on the compiler to infer the types -// for you automatically. You can assign the result of expression -// Foo(p1, ..., pk) to a variable of type FooActionPk. This can be useful when composing actions. -// -// You can also overload actions with different numbers of parameters: -// -// ACTION_P(Plus, a) { ... } -// ACTION_P2(Plus, a, b) { ... } -// -// While it's tempting to always use the ACTION* macros when defining -// a new action, you should also consider implementing ActionInterface -// or using MakePolymorphicAction() instead, especially if you need to -// use the action a lot. While these approaches require more work, -// they give you more control on the types of the mock function -// arguments and the action parameters, which in general leads to -// better compiler error messages that pay off in the long run. They -// also allow overloading actions based on parameter types (as opposed -// to just based on the number of parameters). -// -// CAVEAT: -// -// ACTION*() can only be used in a namespace scope. The reason is -// that C++ doesn't yet allow function-local types to be used to -// instantiate templates. The up-coming C++0x standard will fix this. -// Once that's done, we'll consider supporting using ACTION*() inside -// a function. -// -// MORE INFORMATION: -// -// To learn more about using these macros, please search for 'ACTION' -// on https://github.com/google/googletest/blob/master/googlemock/docs/CookBook.md - -// An internal macro needed for implementing ACTION*(). -#define GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_\ - const args_type& args GTEST_ATTRIBUTE_UNUSED_, \ - arg0_type arg0 GTEST_ATTRIBUTE_UNUSED_, \ - arg1_type arg1 GTEST_ATTRIBUTE_UNUSED_, \ - arg2_type arg2 GTEST_ATTRIBUTE_UNUSED_, \ - arg3_type arg3 GTEST_ATTRIBUTE_UNUSED_, \ - arg4_type arg4 GTEST_ATTRIBUTE_UNUSED_, \ - arg5_type arg5 GTEST_ATTRIBUTE_UNUSED_, \ - arg6_type arg6 GTEST_ATTRIBUTE_UNUSED_, \ - arg7_type arg7 GTEST_ATTRIBUTE_UNUSED_, \ - arg8_type arg8 GTEST_ATTRIBUTE_UNUSED_, \ - arg9_type arg9 GTEST_ATTRIBUTE_UNUSED_ - -// Sometimes you want to give an action explicit template parameters -// that cannot be inferred from its value parameters. ACTION() and -// ACTION_P*() don't support that. ACTION_TEMPLATE() remedies that -// and can be viewed as an extension to ACTION() and ACTION_P*(). -// -// The syntax: -// -// ACTION_TEMPLATE(ActionName, -// HAS_m_TEMPLATE_PARAMS(kind1, name1, ..., kind_m, name_m), -// AND_n_VALUE_PARAMS(p1, ..., p_n)) { statements; } -// -// defines an action template that takes m explicit template -// parameters and n value parameters. name_i is the name of the i-th -// template parameter, and kind_i specifies whether it's a typename, -// an integral constant, or a template. p_i is the name of the i-th -// value parameter. -// -// Example: -// -// // DuplicateArg(output) converts the k-th argument of the mock -// // function to type T and copies it to *output. -// ACTION_TEMPLATE(DuplicateArg, -// HAS_2_TEMPLATE_PARAMS(int, k, typename, T), -// AND_1_VALUE_PARAMS(output)) { -// *output = T(::testing::get(args)); -// } -// ... -// int n; -// EXPECT_CALL(mock, Foo(_, _)) -// .WillOnce(DuplicateArg<1, unsigned char>(&n)); -// -// To create an instance of an action template, write: -// -// ActionName(v1, ..., v_n) -// -// where the ts are the template arguments and the vs are the value -// arguments. The value argument types are inferred by the compiler. -// If you want to explicitly specify the value argument types, you can -// provide additional template arguments: -// -// ActionName(v1, ..., v_n) -// -// where u_i is the desired type of v_i. -// -// ACTION_TEMPLATE and ACTION/ACTION_P* can be overloaded on the -// number of value parameters, but not on the number of template -// parameters. Without the restriction, the meaning of the following -// is unclear: -// -// OverloadedAction(x); -// -// Are we using a single-template-parameter action where 'bool' refers -// to the type of x, or are we using a two-template-parameter action -// where the compiler is asked to infer the type of x? -// -// Implementation notes: -// -// GMOCK_INTERNAL_*_HAS_m_TEMPLATE_PARAMS and -// GMOCK_INTERNAL_*_AND_n_VALUE_PARAMS are internal macros for -// implementing ACTION_TEMPLATE. The main trick we use is to create -// new macro invocations when expanding a macro. For example, we have -// -// #define ACTION_TEMPLATE(name, template_params, value_params) -// ... GMOCK_INTERNAL_DECL_##template_params ... -// -// which causes ACTION_TEMPLATE(..., HAS_1_TEMPLATE_PARAMS(typename, T), ...) -// to expand to -// -// ... GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(typename, T) ... -// -// Since GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS is a macro, the -// preprocessor will continue to expand it to -// -// ... typename T ... -// -// This technique conforms to the C++ standard and is portable. It -// allows us to implement action templates using O(N) code, where N is -// the maximum number of template/value parameters supported. Without -// using it, we'd have to devote O(N^2) amount of code to implement all -// combinations of m and n. - -// Declares the template parameters. -#define GMOCK_INTERNAL_DECL_HAS_1_TEMPLATE_PARAMS(kind0, name0) kind0 name0 -#define GMOCK_INTERNAL_DECL_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, \ - name1) kind0 name0, kind1 name1 -#define GMOCK_INTERNAL_DECL_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ - kind2, name2) kind0 name0, kind1 name1, kind2 name2 -#define GMOCK_INTERNAL_DECL_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ - kind2, name2, kind3, name3) kind0 name0, kind1 name1, kind2 name2, \ - kind3 name3 -#define GMOCK_INTERNAL_DECL_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ - kind2, name2, kind3, name3, kind4, name4) kind0 name0, kind1 name1, \ - kind2 name2, kind3 name3, kind4 name4 -#define GMOCK_INTERNAL_DECL_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ - kind2, name2, kind3, name3, kind4, name4, kind5, name5) kind0 name0, \ - kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5 -#define GMOCK_INTERNAL_DECL_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ - kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \ - name6) kind0 name0, kind1 name1, kind2 name2, kind3 name3, kind4 name4, \ - kind5 name5, kind6 name6 -#define GMOCK_INTERNAL_DECL_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ - kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \ - kind7, name7) kind0 name0, kind1 name1, kind2 name2, kind3 name3, \ - kind4 name4, kind5 name5, kind6 name6, kind7 name7 -#define GMOCK_INTERNAL_DECL_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ - kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \ - kind7, name7, kind8, name8) kind0 name0, kind1 name1, kind2 name2, \ - kind3 name3, kind4 name4, kind5 name5, kind6 name6, kind7 name7, \ - kind8 name8 -#define GMOCK_INTERNAL_DECL_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \ - name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \ - name6, kind7, name7, kind8, name8, kind9, name9) kind0 name0, \ - kind1 name1, kind2 name2, kind3 name3, kind4 name4, kind5 name5, \ - kind6 name6, kind7 name7, kind8 name8, kind9 name9 - -// Lists the template parameters. -#define GMOCK_INTERNAL_LIST_HAS_1_TEMPLATE_PARAMS(kind0, name0) name0 -#define GMOCK_INTERNAL_LIST_HAS_2_TEMPLATE_PARAMS(kind0, name0, kind1, \ - name1) name0, name1 -#define GMOCK_INTERNAL_LIST_HAS_3_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ - kind2, name2) name0, name1, name2 -#define GMOCK_INTERNAL_LIST_HAS_4_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ - kind2, name2, kind3, name3) name0, name1, name2, name3 -#define GMOCK_INTERNAL_LIST_HAS_5_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ - kind2, name2, kind3, name3, kind4, name4) name0, name1, name2, name3, \ - name4 -#define GMOCK_INTERNAL_LIST_HAS_6_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ - kind2, name2, kind3, name3, kind4, name4, kind5, name5) name0, name1, \ - name2, name3, name4, name5 -#define GMOCK_INTERNAL_LIST_HAS_7_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ - kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \ - name6) name0, name1, name2, name3, name4, name5, name6 -#define GMOCK_INTERNAL_LIST_HAS_8_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ - kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \ - kind7, name7) name0, name1, name2, name3, name4, name5, name6, name7 -#define GMOCK_INTERNAL_LIST_HAS_9_TEMPLATE_PARAMS(kind0, name0, kind1, name1, \ - kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, name6, \ - kind7, name7, kind8, name8) name0, name1, name2, name3, name4, name5, \ - name6, name7, name8 -#define GMOCK_INTERNAL_LIST_HAS_10_TEMPLATE_PARAMS(kind0, name0, kind1, \ - name1, kind2, name2, kind3, name3, kind4, name4, kind5, name5, kind6, \ - name6, kind7, name7, kind8, name8, kind9, name9) name0, name1, name2, \ - name3, name4, name5, name6, name7, name8, name9 - -// Declares the types of value parameters. -#define GMOCK_INTERNAL_DECL_TYPE_AND_0_VALUE_PARAMS() -#define GMOCK_INTERNAL_DECL_TYPE_AND_1_VALUE_PARAMS(p0) , typename p0##_type -#define GMOCK_INTERNAL_DECL_TYPE_AND_2_VALUE_PARAMS(p0, p1) , \ - typename p0##_type, typename p1##_type -#define GMOCK_INTERNAL_DECL_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , \ - typename p0##_type, typename p1##_type, typename p2##_type -#define GMOCK_INTERNAL_DECL_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \ - typename p0##_type, typename p1##_type, typename p2##_type, \ - typename p3##_type -#define GMOCK_INTERNAL_DECL_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \ - typename p0##_type, typename p1##_type, typename p2##_type, \ - typename p3##_type, typename p4##_type -#define GMOCK_INTERNAL_DECL_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \ - typename p0##_type, typename p1##_type, typename p2##_type, \ - typename p3##_type, typename p4##_type, typename p5##_type -#define GMOCK_INTERNAL_DECL_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ - p6) , typename p0##_type, typename p1##_type, typename p2##_type, \ - typename p3##_type, typename p4##_type, typename p5##_type, \ - typename p6##_type -#define GMOCK_INTERNAL_DECL_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ - p6, p7) , typename p0##_type, typename p1##_type, typename p2##_type, \ - typename p3##_type, typename p4##_type, typename p5##_type, \ - typename p6##_type, typename p7##_type -#define GMOCK_INTERNAL_DECL_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ - p6, p7, p8) , typename p0##_type, typename p1##_type, typename p2##_type, \ - typename p3##_type, typename p4##_type, typename p5##_type, \ - typename p6##_type, typename p7##_type, typename p8##_type -#define GMOCK_INTERNAL_DECL_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ - p6, p7, p8, p9) , typename p0##_type, typename p1##_type, \ - typename p2##_type, typename p3##_type, typename p4##_type, \ - typename p5##_type, typename p6##_type, typename p7##_type, \ - typename p8##_type, typename p9##_type - -// Initializes the value parameters. -#define GMOCK_INTERNAL_INIT_AND_0_VALUE_PARAMS()\ - () -#define GMOCK_INTERNAL_INIT_AND_1_VALUE_PARAMS(p0)\ - (p0##_type gmock_p0) : p0(::testing::internal::move(gmock_p0)) -#define GMOCK_INTERNAL_INIT_AND_2_VALUE_PARAMS(p0, p1)\ - (p0##_type gmock_p0, \ - p1##_type gmock_p1) : p0(::testing::internal::move(gmock_p0)), \ - p1(::testing::internal::move(gmock_p1)) -#define GMOCK_INTERNAL_INIT_AND_3_VALUE_PARAMS(p0, p1, p2)\ - (p0##_type gmock_p0, p1##_type gmock_p1, \ - p2##_type gmock_p2) : p0(::testing::internal::move(gmock_p0)), \ - p1(::testing::internal::move(gmock_p1)), \ - p2(::testing::internal::move(gmock_p2)) -#define GMOCK_INTERNAL_INIT_AND_4_VALUE_PARAMS(p0, p1, p2, p3)\ - (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ - p3##_type gmock_p3) : p0(::testing::internal::move(gmock_p0)), \ - p1(::testing::internal::move(gmock_p1)), \ - p2(::testing::internal::move(gmock_p2)), \ - p3(::testing::internal::move(gmock_p3)) -#define GMOCK_INTERNAL_INIT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)\ - (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ - p3##_type gmock_p3, \ - p4##_type gmock_p4) : p0(::testing::internal::move(gmock_p0)), \ - p1(::testing::internal::move(gmock_p1)), \ - p2(::testing::internal::move(gmock_p2)), \ - p3(::testing::internal::move(gmock_p3)), \ - p4(::testing::internal::move(gmock_p4)) -#define GMOCK_INTERNAL_INIT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)\ - (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ - p3##_type gmock_p3, p4##_type gmock_p4, \ - p5##_type gmock_p5) : p0(::testing::internal::move(gmock_p0)), \ - p1(::testing::internal::move(gmock_p1)), \ - p2(::testing::internal::move(gmock_p2)), \ - p3(::testing::internal::move(gmock_p3)), \ - p4(::testing::internal::move(gmock_p4)), \ - p5(::testing::internal::move(gmock_p5)) -#define GMOCK_INTERNAL_INIT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)\ - (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ - p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \ - p6##_type gmock_p6) : p0(::testing::internal::move(gmock_p0)), \ - p1(::testing::internal::move(gmock_p1)), \ - p2(::testing::internal::move(gmock_p2)), \ - p3(::testing::internal::move(gmock_p3)), \ - p4(::testing::internal::move(gmock_p4)), \ - p5(::testing::internal::move(gmock_p5)), \ - p6(::testing::internal::move(gmock_p6)) -#define GMOCK_INTERNAL_INIT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)\ - (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ - p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \ - p6##_type gmock_p6, \ - p7##_type gmock_p7) : p0(::testing::internal::move(gmock_p0)), \ - p1(::testing::internal::move(gmock_p1)), \ - p2(::testing::internal::move(gmock_p2)), \ - p3(::testing::internal::move(gmock_p3)), \ - p4(::testing::internal::move(gmock_p4)), \ - p5(::testing::internal::move(gmock_p5)), \ - p6(::testing::internal::move(gmock_p6)), \ - p7(::testing::internal::move(gmock_p7)) -#define GMOCK_INTERNAL_INIT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ - p7, p8)\ - (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ - p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \ - p6##_type gmock_p6, p7##_type gmock_p7, \ - p8##_type gmock_p8) : p0(::testing::internal::move(gmock_p0)), \ - p1(::testing::internal::move(gmock_p1)), \ - p2(::testing::internal::move(gmock_p2)), \ - p3(::testing::internal::move(gmock_p3)), \ - p4(::testing::internal::move(gmock_p4)), \ - p5(::testing::internal::move(gmock_p5)), \ - p6(::testing::internal::move(gmock_p6)), \ - p7(::testing::internal::move(gmock_p7)), \ - p8(::testing::internal::move(gmock_p8)) -#define GMOCK_INTERNAL_INIT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ - p7, p8, p9)\ - (p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ - p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \ - p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \ - p9##_type gmock_p9) : p0(::testing::internal::move(gmock_p0)), \ - p1(::testing::internal::move(gmock_p1)), \ - p2(::testing::internal::move(gmock_p2)), \ - p3(::testing::internal::move(gmock_p3)), \ - p4(::testing::internal::move(gmock_p4)), \ - p5(::testing::internal::move(gmock_p5)), \ - p6(::testing::internal::move(gmock_p6)), \ - p7(::testing::internal::move(gmock_p7)), \ - p8(::testing::internal::move(gmock_p8)), \ - p9(::testing::internal::move(gmock_p9)) - -// Declares the fields for storing the value parameters. -#define GMOCK_INTERNAL_DEFN_AND_0_VALUE_PARAMS() -#define GMOCK_INTERNAL_DEFN_AND_1_VALUE_PARAMS(p0) p0##_type p0; -#define GMOCK_INTERNAL_DEFN_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0; \ - p1##_type p1; -#define GMOCK_INTERNAL_DEFN_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0; \ - p1##_type p1; p2##_type p2; -#define GMOCK_INTERNAL_DEFN_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0; \ - p1##_type p1; p2##_type p2; p3##_type p3; -#define GMOCK_INTERNAL_DEFN_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \ - p4) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; -#define GMOCK_INTERNAL_DEFN_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \ - p5) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \ - p5##_type p5; -#define GMOCK_INTERNAL_DEFN_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ - p6) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \ - p5##_type p5; p6##_type p6; -#define GMOCK_INTERNAL_DEFN_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ - p7) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; p4##_type p4; \ - p5##_type p5; p6##_type p6; p7##_type p7; -#define GMOCK_INTERNAL_DEFN_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ - p7, p8) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \ - p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8; -#define GMOCK_INTERNAL_DEFN_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ - p7, p8, p9) p0##_type p0; p1##_type p1; p2##_type p2; p3##_type p3; \ - p4##_type p4; p5##_type p5; p6##_type p6; p7##_type p7; p8##_type p8; \ - p9##_type p9; - -// Lists the value parameters. -#define GMOCK_INTERNAL_LIST_AND_0_VALUE_PARAMS() -#define GMOCK_INTERNAL_LIST_AND_1_VALUE_PARAMS(p0) p0 -#define GMOCK_INTERNAL_LIST_AND_2_VALUE_PARAMS(p0, p1) p0, p1 -#define GMOCK_INTERNAL_LIST_AND_3_VALUE_PARAMS(p0, p1, p2) p0, p1, p2 -#define GMOCK_INTERNAL_LIST_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0, p1, p2, p3 -#define GMOCK_INTERNAL_LIST_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) p0, p1, \ - p2, p3, p4 -#define GMOCK_INTERNAL_LIST_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) p0, \ - p1, p2, p3, p4, p5 -#define GMOCK_INTERNAL_LIST_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ - p6) p0, p1, p2, p3, p4, p5, p6 -#define GMOCK_INTERNAL_LIST_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ - p7) p0, p1, p2, p3, p4, p5, p6, p7 -#define GMOCK_INTERNAL_LIST_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ - p7, p8) p0, p1, p2, p3, p4, p5, p6, p7, p8 -#define GMOCK_INTERNAL_LIST_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ - p7, p8, p9) p0, p1, p2, p3, p4, p5, p6, p7, p8, p9 - -// Lists the value parameter types. -#define GMOCK_INTERNAL_LIST_TYPE_AND_0_VALUE_PARAMS() -#define GMOCK_INTERNAL_LIST_TYPE_AND_1_VALUE_PARAMS(p0) , p0##_type -#define GMOCK_INTERNAL_LIST_TYPE_AND_2_VALUE_PARAMS(p0, p1) , p0##_type, \ - p1##_type -#define GMOCK_INTERNAL_LIST_TYPE_AND_3_VALUE_PARAMS(p0, p1, p2) , p0##_type, \ - p1##_type, p2##_type -#define GMOCK_INTERNAL_LIST_TYPE_AND_4_VALUE_PARAMS(p0, p1, p2, p3) , \ - p0##_type, p1##_type, p2##_type, p3##_type -#define GMOCK_INTERNAL_LIST_TYPE_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) , \ - p0##_type, p1##_type, p2##_type, p3##_type, p4##_type -#define GMOCK_INTERNAL_LIST_TYPE_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) , \ - p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type -#define GMOCK_INTERNAL_LIST_TYPE_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ - p6) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, p5##_type, \ - p6##_type -#define GMOCK_INTERNAL_LIST_TYPE_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ - p6, p7) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \ - p5##_type, p6##_type, p7##_type -#define GMOCK_INTERNAL_LIST_TYPE_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ - p6, p7, p8) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \ - p5##_type, p6##_type, p7##_type, p8##_type -#define GMOCK_INTERNAL_LIST_TYPE_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ - p6, p7, p8, p9) , p0##_type, p1##_type, p2##_type, p3##_type, p4##_type, \ - p5##_type, p6##_type, p7##_type, p8##_type, p9##_type - -// Declares the value parameters. -#define GMOCK_INTERNAL_DECL_AND_0_VALUE_PARAMS() -#define GMOCK_INTERNAL_DECL_AND_1_VALUE_PARAMS(p0) p0##_type p0 -#define GMOCK_INTERNAL_DECL_AND_2_VALUE_PARAMS(p0, p1) p0##_type p0, \ - p1##_type p1 -#define GMOCK_INTERNAL_DECL_AND_3_VALUE_PARAMS(p0, p1, p2) p0##_type p0, \ - p1##_type p1, p2##_type p2 -#define GMOCK_INTERNAL_DECL_AND_4_VALUE_PARAMS(p0, p1, p2, p3) p0##_type p0, \ - p1##_type p1, p2##_type p2, p3##_type p3 -#define GMOCK_INTERNAL_DECL_AND_5_VALUE_PARAMS(p0, p1, p2, p3, \ - p4) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4 -#define GMOCK_INTERNAL_DECL_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, \ - p5) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \ - p5##_type p5 -#define GMOCK_INTERNAL_DECL_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, \ - p6) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \ - p5##_type p5, p6##_type p6 -#define GMOCK_INTERNAL_DECL_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ - p7) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, \ - p5##_type p5, p6##_type p6, p7##_type p7 -#define GMOCK_INTERNAL_DECL_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ - p7, p8) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \ - p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8 -#define GMOCK_INTERNAL_DECL_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ - p7, p8, p9) p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \ - p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \ - p9##_type p9 - -// The suffix of the class template implementing the action template. -#define GMOCK_INTERNAL_COUNT_AND_0_VALUE_PARAMS() -#define GMOCK_INTERNAL_COUNT_AND_1_VALUE_PARAMS(p0) P -#define GMOCK_INTERNAL_COUNT_AND_2_VALUE_PARAMS(p0, p1) P2 -#define GMOCK_INTERNAL_COUNT_AND_3_VALUE_PARAMS(p0, p1, p2) P3 -#define GMOCK_INTERNAL_COUNT_AND_4_VALUE_PARAMS(p0, p1, p2, p3) P4 -#define GMOCK_INTERNAL_COUNT_AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4) P5 -#define GMOCK_INTERNAL_COUNT_AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5) P6 -#define GMOCK_INTERNAL_COUNT_AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6) P7 -#define GMOCK_INTERNAL_COUNT_AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ - p7) P8 -#define GMOCK_INTERNAL_COUNT_AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ - p7, p8) P9 -#define GMOCK_INTERNAL_COUNT_AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, \ - p7, p8, p9) P10 - -// The name of the class template implementing the action template. -#define GMOCK_ACTION_CLASS_(name, value_params)\ - GTEST_CONCAT_TOKEN_(name##Action, GMOCK_INTERNAL_COUNT_##value_params) - -#define ACTION_TEMPLATE(name, template_params, value_params)\ - template \ - class GMOCK_ACTION_CLASS_(name, value_params) {\ - public:\ - explicit GMOCK_ACTION_CLASS_(name, value_params)\ - GMOCK_INTERNAL_INIT_##value_params {}\ - template \ - class gmock_Impl : public ::testing::ActionInterface {\ - public:\ - typedef F function_type;\ - typedef typename ::testing::internal::Function::Result return_type;\ - typedef typename ::testing::internal::Function::ArgumentTuple\ - args_type;\ - explicit gmock_Impl GMOCK_INTERNAL_INIT_##value_params {}\ - virtual return_type Perform(const args_type& args) {\ - return ::testing::internal::ActionHelper::\ - Perform(this, args);\ - }\ - template \ - return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \ - arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \ - arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \ - arg9_type arg9) const;\ - GMOCK_INTERNAL_DEFN_##value_params\ - private:\ - GTEST_DISALLOW_ASSIGN_(gmock_Impl);\ - };\ - template operator ::testing::Action() const {\ - return ::testing::Action(\ - new gmock_Impl(GMOCK_INTERNAL_LIST_##value_params));\ - }\ - GMOCK_INTERNAL_DEFN_##value_params\ - private:\ - GTEST_DISALLOW_ASSIGN_(GMOCK_ACTION_CLASS_(name, value_params));\ - };\ - template \ - inline GMOCK_ACTION_CLASS_(name, value_params)<\ - GMOCK_INTERNAL_LIST_##template_params\ - GMOCK_INTERNAL_LIST_TYPE_##value_params> name(\ - GMOCK_INTERNAL_DECL_##value_params) {\ - return GMOCK_ACTION_CLASS_(name, value_params)<\ - GMOCK_INTERNAL_LIST_##template_params\ - GMOCK_INTERNAL_LIST_TYPE_##value_params>(\ - GMOCK_INTERNAL_LIST_##value_params);\ - }\ - template \ - template \ - template \ - typename ::testing::internal::Function::Result\ - GMOCK_ACTION_CLASS_(name, value_params)<\ - GMOCK_INTERNAL_LIST_##template_params\ - GMOCK_INTERNAL_LIST_TYPE_##value_params>::gmock_Impl::\ - gmock_PerformImpl(\ - GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const - -#define ACTION(name)\ - class name##Action {\ - public:\ - name##Action() {}\ - template \ - class gmock_Impl : public ::testing::ActionInterface {\ - public:\ - typedef F function_type;\ - typedef typename ::testing::internal::Function::Result return_type;\ - typedef typename ::testing::internal::Function::ArgumentTuple\ - args_type;\ - gmock_Impl() {}\ - virtual return_type Perform(const args_type& args) {\ - return ::testing::internal::ActionHelper::\ - Perform(this, args);\ - }\ - template \ - return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \ - arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \ - arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \ - arg9_type arg9) const;\ - private:\ - GTEST_DISALLOW_ASSIGN_(gmock_Impl);\ - };\ - template operator ::testing::Action() const {\ - return ::testing::Action(new gmock_Impl());\ - }\ - private:\ - GTEST_DISALLOW_ASSIGN_(name##Action);\ - };\ - inline name##Action name() {\ - return name##Action();\ - }\ - template \ - template \ - typename ::testing::internal::Function::Result\ - name##Action::gmock_Impl::gmock_PerformImpl(\ - GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const - -#define ACTION_P(name, p0)\ - template \ - class name##ActionP {\ - public:\ - explicit name##ActionP(p0##_type gmock_p0) : \ - p0(::testing::internal::forward(gmock_p0)) {}\ - template \ - class gmock_Impl : public ::testing::ActionInterface {\ - public:\ - typedef F function_type;\ - typedef typename ::testing::internal::Function::Result return_type;\ - typedef typename ::testing::internal::Function::ArgumentTuple\ - args_type;\ - explicit gmock_Impl(p0##_type gmock_p0) : \ - p0(::testing::internal::forward(gmock_p0)) {}\ - virtual return_type Perform(const args_type& args) {\ - return ::testing::internal::ActionHelper::\ - Perform(this, args);\ - }\ - template \ - return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \ - arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \ - arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \ - arg9_type arg9) const;\ - p0##_type p0;\ - private:\ - GTEST_DISALLOW_ASSIGN_(gmock_Impl);\ - };\ - template operator ::testing::Action() const {\ - return ::testing::Action(new gmock_Impl(p0));\ - }\ - p0##_type p0;\ - private:\ - GTEST_DISALLOW_ASSIGN_(name##ActionP);\ - };\ - template \ - inline name##ActionP name(p0##_type p0) {\ - return name##ActionP(p0);\ - }\ - template \ - template \ - template \ - typename ::testing::internal::Function::Result\ - name##ActionP::gmock_Impl::gmock_PerformImpl(\ - GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const - -#define ACTION_P2(name, p0, p1)\ - template \ - class name##ActionP2 {\ - public:\ - name##ActionP2(p0##_type gmock_p0, \ - p1##_type gmock_p1) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)) {}\ - template \ - class gmock_Impl : public ::testing::ActionInterface {\ - public:\ - typedef F function_type;\ - typedef typename ::testing::internal::Function::Result return_type;\ - typedef typename ::testing::internal::Function::ArgumentTuple\ - args_type;\ - gmock_Impl(p0##_type gmock_p0, \ - p1##_type gmock_p1) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)) {}\ - virtual return_type Perform(const args_type& args) {\ - return ::testing::internal::ActionHelper::\ - Perform(this, args);\ - }\ - template \ - return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \ - arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \ - arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \ - arg9_type arg9) const;\ - p0##_type p0;\ - p1##_type p1;\ - private:\ - GTEST_DISALLOW_ASSIGN_(gmock_Impl);\ - };\ - template operator ::testing::Action() const {\ - return ::testing::Action(new gmock_Impl(p0, p1));\ - }\ - p0##_type p0;\ - p1##_type p1;\ - private:\ - GTEST_DISALLOW_ASSIGN_(name##ActionP2);\ - };\ - template \ - inline name##ActionP2 name(p0##_type p0, \ - p1##_type p1) {\ - return name##ActionP2(p0, p1);\ - }\ - template \ - template \ - template \ - typename ::testing::internal::Function::Result\ - name##ActionP2::gmock_Impl::gmock_PerformImpl(\ - GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const - -#define ACTION_P3(name, p0, p1, p2)\ - template \ - class name##ActionP3 {\ - public:\ - name##ActionP3(p0##_type gmock_p0, p1##_type gmock_p1, \ - p2##_type gmock_p2) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)) {}\ - template \ - class gmock_Impl : public ::testing::ActionInterface {\ - public:\ - typedef F function_type;\ - typedef typename ::testing::internal::Function::Result return_type;\ - typedef typename ::testing::internal::Function::ArgumentTuple\ - args_type;\ - gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, \ - p2##_type gmock_p2) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)) {}\ - virtual return_type Perform(const args_type& args) {\ - return ::testing::internal::ActionHelper::\ - Perform(this, args);\ - }\ - template \ - return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \ - arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \ - arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \ - arg9_type arg9) const;\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - private:\ - GTEST_DISALLOW_ASSIGN_(gmock_Impl);\ - };\ - template operator ::testing::Action() const {\ - return ::testing::Action(new gmock_Impl(p0, p1, p2));\ - }\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - private:\ - GTEST_DISALLOW_ASSIGN_(name##ActionP3);\ - };\ - template \ - inline name##ActionP3 name(p0##_type p0, \ - p1##_type p1, p2##_type p2) {\ - return name##ActionP3(p0, p1, p2);\ - }\ - template \ - template \ - template \ - typename ::testing::internal::Function::Result\ - name##ActionP3::gmock_Impl::gmock_PerformImpl(\ - GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const - -#define ACTION_P4(name, p0, p1, p2, p3)\ - template \ - class name##ActionP4 {\ - public:\ - name##ActionP4(p0##_type gmock_p0, p1##_type gmock_p1, \ - p2##_type gmock_p2, \ - p3##_type gmock_p3) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)), \ - p3(::testing::internal::forward(gmock_p3)) {}\ - template \ - class gmock_Impl : public ::testing::ActionInterface {\ - public:\ - typedef F function_type;\ - typedef typename ::testing::internal::Function::Result return_type;\ - typedef typename ::testing::internal::Function::ArgumentTuple\ - args_type;\ - gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ - p3##_type gmock_p3) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)), \ - p3(::testing::internal::forward(gmock_p3)) {}\ - virtual return_type Perform(const args_type& args) {\ - return ::testing::internal::ActionHelper::\ - Perform(this, args);\ - }\ - template \ - return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \ - arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \ - arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \ - arg9_type arg9) const;\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - p3##_type p3;\ - private:\ - GTEST_DISALLOW_ASSIGN_(gmock_Impl);\ - };\ - template operator ::testing::Action() const {\ - return ::testing::Action(new gmock_Impl(p0, p1, p2, p3));\ - }\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - p3##_type p3;\ - private:\ - GTEST_DISALLOW_ASSIGN_(name##ActionP4);\ - };\ - template \ - inline name##ActionP4 name(p0##_type p0, p1##_type p1, p2##_type p2, \ - p3##_type p3) {\ - return name##ActionP4(p0, p1, \ - p2, p3);\ - }\ - template \ - template \ - template \ - typename ::testing::internal::Function::Result\ - name##ActionP4::gmock_Impl::gmock_PerformImpl(\ - GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const - -#define ACTION_P5(name, p0, p1, p2, p3, p4)\ - template \ - class name##ActionP5 {\ - public:\ - name##ActionP5(p0##_type gmock_p0, p1##_type gmock_p1, \ - p2##_type gmock_p2, p3##_type gmock_p3, \ - p4##_type gmock_p4) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)), \ - p3(::testing::internal::forward(gmock_p3)), \ - p4(::testing::internal::forward(gmock_p4)) {}\ - template \ - class gmock_Impl : public ::testing::ActionInterface {\ - public:\ - typedef F function_type;\ - typedef typename ::testing::internal::Function::Result return_type;\ - typedef typename ::testing::internal::Function::ArgumentTuple\ - args_type;\ - gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ - p3##_type gmock_p3, \ - p4##_type gmock_p4) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)), \ - p3(::testing::internal::forward(gmock_p3)), \ - p4(::testing::internal::forward(gmock_p4)) {}\ - virtual return_type Perform(const args_type& args) {\ - return ::testing::internal::ActionHelper::\ - Perform(this, args);\ - }\ - template \ - return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \ - arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \ - arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \ - arg9_type arg9) const;\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - p3##_type p3;\ - p4##_type p4;\ - private:\ - GTEST_DISALLOW_ASSIGN_(gmock_Impl);\ - };\ - template operator ::testing::Action() const {\ - return ::testing::Action(new gmock_Impl(p0, p1, p2, p3, p4));\ - }\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - p3##_type p3;\ - p4##_type p4;\ - private:\ - GTEST_DISALLOW_ASSIGN_(name##ActionP5);\ - };\ - template \ - inline name##ActionP5 name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \ - p4##_type p4) {\ - return name##ActionP5(p0, p1, p2, p3, p4);\ - }\ - template \ - template \ - template \ - typename ::testing::internal::Function::Result\ - name##ActionP5::gmock_Impl::gmock_PerformImpl(\ - GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const - -#define ACTION_P6(name, p0, p1, p2, p3, p4, p5)\ - template \ - class name##ActionP6 {\ - public:\ - name##ActionP6(p0##_type gmock_p0, p1##_type gmock_p1, \ - p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \ - p5##_type gmock_p5) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)), \ - p3(::testing::internal::forward(gmock_p3)), \ - p4(::testing::internal::forward(gmock_p4)), \ - p5(::testing::internal::forward(gmock_p5)) {}\ - template \ - class gmock_Impl : public ::testing::ActionInterface {\ - public:\ - typedef F function_type;\ - typedef typename ::testing::internal::Function::Result return_type;\ - typedef typename ::testing::internal::Function::ArgumentTuple\ - args_type;\ - gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ - p3##_type gmock_p3, p4##_type gmock_p4, \ - p5##_type gmock_p5) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)), \ - p3(::testing::internal::forward(gmock_p3)), \ - p4(::testing::internal::forward(gmock_p4)), \ - p5(::testing::internal::forward(gmock_p5)) {}\ - virtual return_type Perform(const args_type& args) {\ - return ::testing::internal::ActionHelper::\ - Perform(this, args);\ - }\ - template \ - return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \ - arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \ - arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \ - arg9_type arg9) const;\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - p3##_type p3;\ - p4##_type p4;\ - p5##_type p5;\ - private:\ - GTEST_DISALLOW_ASSIGN_(gmock_Impl);\ - };\ - template operator ::testing::Action() const {\ - return ::testing::Action(new gmock_Impl(p0, p1, p2, p3, p4, p5));\ - }\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - p3##_type p3;\ - p4##_type p4;\ - p5##_type p5;\ - private:\ - GTEST_DISALLOW_ASSIGN_(name##ActionP6);\ - };\ - template \ - inline name##ActionP6 name(p0##_type p0, p1##_type p1, p2##_type p2, \ - p3##_type p3, p4##_type p4, p5##_type p5) {\ - return name##ActionP6(p0, p1, p2, p3, p4, p5);\ - }\ - template \ - template \ - template \ - typename ::testing::internal::Function::Result\ - name##ActionP6::gmock_Impl::gmock_PerformImpl(\ - GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const - -#define ACTION_P7(name, p0, p1, p2, p3, p4, p5, p6)\ - template \ - class name##ActionP7 {\ - public:\ - name##ActionP7(p0##_type gmock_p0, p1##_type gmock_p1, \ - p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \ - p5##_type gmock_p5, \ - p6##_type gmock_p6) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)), \ - p3(::testing::internal::forward(gmock_p3)), \ - p4(::testing::internal::forward(gmock_p4)), \ - p5(::testing::internal::forward(gmock_p5)), \ - p6(::testing::internal::forward(gmock_p6)) {}\ - template \ - class gmock_Impl : public ::testing::ActionInterface {\ - public:\ - typedef F function_type;\ - typedef typename ::testing::internal::Function::Result return_type;\ - typedef typename ::testing::internal::Function::ArgumentTuple\ - args_type;\ - gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ - p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \ - p6##_type gmock_p6) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)), \ - p3(::testing::internal::forward(gmock_p3)), \ - p4(::testing::internal::forward(gmock_p4)), \ - p5(::testing::internal::forward(gmock_p5)), \ - p6(::testing::internal::forward(gmock_p6)) {}\ - virtual return_type Perform(const args_type& args) {\ - return ::testing::internal::ActionHelper::\ - Perform(this, args);\ - }\ - template \ - return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \ - arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \ - arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \ - arg9_type arg9) const;\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - p3##_type p3;\ - p4##_type p4;\ - p5##_type p5;\ - p6##_type p6;\ - private:\ - GTEST_DISALLOW_ASSIGN_(gmock_Impl);\ - };\ - template operator ::testing::Action() const {\ - return ::testing::Action(new gmock_Impl(p0, p1, p2, p3, p4, p5, \ - p6));\ - }\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - p3##_type p3;\ - p4##_type p4;\ - p5##_type p5;\ - p6##_type p6;\ - private:\ - GTEST_DISALLOW_ASSIGN_(name##ActionP7);\ - };\ - template \ - inline name##ActionP7 name(p0##_type p0, p1##_type p1, \ - p2##_type p2, p3##_type p3, p4##_type p4, p5##_type p5, \ - p6##_type p6) {\ - return name##ActionP7(p0, p1, p2, p3, p4, p5, p6);\ - }\ - template \ - template \ - template \ - typename ::testing::internal::Function::Result\ - name##ActionP7::gmock_Impl::gmock_PerformImpl(\ - GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const - -#define ACTION_P8(name, p0, p1, p2, p3, p4, p5, p6, p7)\ - template \ - class name##ActionP8 {\ - public:\ - name##ActionP8(p0##_type gmock_p0, p1##_type gmock_p1, \ - p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \ - p5##_type gmock_p5, p6##_type gmock_p6, \ - p7##_type gmock_p7) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)), \ - p3(::testing::internal::forward(gmock_p3)), \ - p4(::testing::internal::forward(gmock_p4)), \ - p5(::testing::internal::forward(gmock_p5)), \ - p6(::testing::internal::forward(gmock_p6)), \ - p7(::testing::internal::forward(gmock_p7)) {}\ - template \ - class gmock_Impl : public ::testing::ActionInterface {\ - public:\ - typedef F function_type;\ - typedef typename ::testing::internal::Function::Result return_type;\ - typedef typename ::testing::internal::Function::ArgumentTuple\ - args_type;\ - gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ - p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \ - p6##_type gmock_p6, \ - p7##_type gmock_p7) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)), \ - p3(::testing::internal::forward(gmock_p3)), \ - p4(::testing::internal::forward(gmock_p4)), \ - p5(::testing::internal::forward(gmock_p5)), \ - p6(::testing::internal::forward(gmock_p6)), \ - p7(::testing::internal::forward(gmock_p7)) {}\ - virtual return_type Perform(const args_type& args) {\ - return ::testing::internal::ActionHelper::\ - Perform(this, args);\ - }\ - template \ - return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \ - arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \ - arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \ - arg9_type arg9) const;\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - p3##_type p3;\ - p4##_type p4;\ - p5##_type p5;\ - p6##_type p6;\ - p7##_type p7;\ - private:\ - GTEST_DISALLOW_ASSIGN_(gmock_Impl);\ - };\ - template operator ::testing::Action() const {\ - return ::testing::Action(new gmock_Impl(p0, p1, p2, p3, p4, p5, \ - p6, p7));\ - }\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - p3##_type p3;\ - p4##_type p4;\ - p5##_type p5;\ - p6##_type p6;\ - p7##_type p7;\ - private:\ - GTEST_DISALLOW_ASSIGN_(name##ActionP8);\ - };\ - template \ - inline name##ActionP8 name(p0##_type p0, \ - p1##_type p1, p2##_type p2, p3##_type p3, p4##_type p4, p5##_type p5, \ - p6##_type p6, p7##_type p7) {\ - return name##ActionP8(p0, p1, p2, p3, p4, p5, \ - p6, p7);\ - }\ - template \ - template \ - template \ - typename ::testing::internal::Function::Result\ - name##ActionP8::gmock_Impl::gmock_PerformImpl(\ - GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const - -#define ACTION_P9(name, p0, p1, p2, p3, p4, p5, p6, p7, p8)\ - template \ - class name##ActionP9 {\ - public:\ - name##ActionP9(p0##_type gmock_p0, p1##_type gmock_p1, \ - p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \ - p5##_type gmock_p5, p6##_type gmock_p6, p7##_type gmock_p7, \ - p8##_type gmock_p8) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)), \ - p3(::testing::internal::forward(gmock_p3)), \ - p4(::testing::internal::forward(gmock_p4)), \ - p5(::testing::internal::forward(gmock_p5)), \ - p6(::testing::internal::forward(gmock_p6)), \ - p7(::testing::internal::forward(gmock_p7)), \ - p8(::testing::internal::forward(gmock_p8)) {}\ - template \ - class gmock_Impl : public ::testing::ActionInterface {\ - public:\ - typedef F function_type;\ - typedef typename ::testing::internal::Function::Result return_type;\ - typedef typename ::testing::internal::Function::ArgumentTuple\ - args_type;\ - gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ - p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \ - p6##_type gmock_p6, p7##_type gmock_p7, \ - p8##_type gmock_p8) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)), \ - p3(::testing::internal::forward(gmock_p3)), \ - p4(::testing::internal::forward(gmock_p4)), \ - p5(::testing::internal::forward(gmock_p5)), \ - p6(::testing::internal::forward(gmock_p6)), \ - p7(::testing::internal::forward(gmock_p7)), \ - p8(::testing::internal::forward(gmock_p8)) {}\ - virtual return_type Perform(const args_type& args) {\ - return ::testing::internal::ActionHelper::\ - Perform(this, args);\ - }\ - template \ - return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \ - arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \ - arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \ - arg9_type arg9) const;\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - p3##_type p3;\ - p4##_type p4;\ - p5##_type p5;\ - p6##_type p6;\ - p7##_type p7;\ - p8##_type p8;\ - private:\ - GTEST_DISALLOW_ASSIGN_(gmock_Impl);\ - };\ - template operator ::testing::Action() const {\ - return ::testing::Action(new gmock_Impl(p0, p1, p2, p3, p4, p5, \ - p6, p7, p8));\ - }\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - p3##_type p3;\ - p4##_type p4;\ - p5##_type p5;\ - p6##_type p6;\ - p7##_type p7;\ - p8##_type p8;\ - private:\ - GTEST_DISALLOW_ASSIGN_(name##ActionP9);\ - };\ - template \ - inline name##ActionP9 name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \ - p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, \ - p8##_type p8) {\ - return name##ActionP9(p0, p1, p2, \ - p3, p4, p5, p6, p7, p8);\ - }\ - template \ - template \ - template \ - typename ::testing::internal::Function::Result\ - name##ActionP9::gmock_Impl::gmock_PerformImpl(\ - GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const - -#define ACTION_P10(name, p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)\ - template \ - class name##ActionP10 {\ - public:\ - name##ActionP10(p0##_type gmock_p0, p1##_type gmock_p1, \ - p2##_type gmock_p2, p3##_type gmock_p3, p4##_type gmock_p4, \ - p5##_type gmock_p5, p6##_type gmock_p6, p7##_type gmock_p7, \ - p8##_type gmock_p8, \ - p9##_type gmock_p9) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)), \ - p3(::testing::internal::forward(gmock_p3)), \ - p4(::testing::internal::forward(gmock_p4)), \ - p5(::testing::internal::forward(gmock_p5)), \ - p6(::testing::internal::forward(gmock_p6)), \ - p7(::testing::internal::forward(gmock_p7)), \ - p8(::testing::internal::forward(gmock_p8)), \ - p9(::testing::internal::forward(gmock_p9)) {}\ - template \ - class gmock_Impl : public ::testing::ActionInterface {\ - public:\ - typedef F function_type;\ - typedef typename ::testing::internal::Function::Result return_type;\ - typedef typename ::testing::internal::Function::ArgumentTuple\ - args_type;\ - gmock_Impl(p0##_type gmock_p0, p1##_type gmock_p1, p2##_type gmock_p2, \ - p3##_type gmock_p3, p4##_type gmock_p4, p5##_type gmock_p5, \ - p6##_type gmock_p6, p7##_type gmock_p7, p8##_type gmock_p8, \ - p9##_type gmock_p9) : p0(::testing::internal::forward(gmock_p0)), \ - p1(::testing::internal::forward(gmock_p1)), \ - p2(::testing::internal::forward(gmock_p2)), \ - p3(::testing::internal::forward(gmock_p3)), \ - p4(::testing::internal::forward(gmock_p4)), \ - p5(::testing::internal::forward(gmock_p5)), \ - p6(::testing::internal::forward(gmock_p6)), \ - p7(::testing::internal::forward(gmock_p7)), \ - p8(::testing::internal::forward(gmock_p8)), \ - p9(::testing::internal::forward(gmock_p9)) {}\ - virtual return_type Perform(const args_type& args) {\ - return ::testing::internal::ActionHelper::\ - Perform(this, args);\ - }\ - template \ - return_type gmock_PerformImpl(const args_type& args, arg0_type arg0, \ - arg1_type arg1, arg2_type arg2, arg3_type arg3, arg4_type arg4, \ - arg5_type arg5, arg6_type arg6, arg7_type arg7, arg8_type arg8, \ - arg9_type arg9) const;\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - p3##_type p3;\ - p4##_type p4;\ - p5##_type p5;\ - p6##_type p6;\ - p7##_type p7;\ - p8##_type p8;\ - p9##_type p9;\ - private:\ - GTEST_DISALLOW_ASSIGN_(gmock_Impl);\ - };\ - template operator ::testing::Action() const {\ - return ::testing::Action(new gmock_Impl(p0, p1, p2, p3, p4, p5, \ - p6, p7, p8, p9));\ - }\ - p0##_type p0;\ - p1##_type p1;\ - p2##_type p2;\ - p3##_type p3;\ - p4##_type p4;\ - p5##_type p5;\ - p6##_type p6;\ - p7##_type p7;\ - p8##_type p8;\ - p9##_type p9;\ - private:\ - GTEST_DISALLOW_ASSIGN_(name##ActionP10);\ - };\ - template \ - inline name##ActionP10 name(p0##_type p0, p1##_type p1, p2##_type p2, p3##_type p3, \ - p4##_type p4, p5##_type p5, p6##_type p6, p7##_type p7, p8##_type p8, \ - p9##_type p9) {\ - return name##ActionP10(p0, \ - p1, p2, p3, p4, p5, p6, p7, p8, p9);\ - }\ - template \ - template \ - template \ - typename ::testing::internal::Function::Result\ - name##ActionP10::gmock_Impl::gmock_PerformImpl(\ - GMOCK_ACTION_ARG_TYPES_AND_NAMES_UNUSED_) const - -namespace testing { - - -// The ACTION*() macros trigger warning C4100 (unreferenced formal -// parameter) in MSVC with -W4. Unfortunately they cannot be fixed in -// the macro definition, as the warnings are generated when the macro -// is expanded and macro expansion cannot contain #pragma. Therefore -// we suppress them here. -#ifdef _MSC_VER -# pragma warning(push) -# pragma warning(disable:4100) -#endif - -// Various overloads for InvokeArgument(). -// -// The InvokeArgument(a1, a2, ..., a_k) action invokes the N-th -// (0-based) argument, which must be a k-ary callable, of the mock -// function, with arguments a1, a2, ..., a_k. -// -// Notes: -// -// 1. The arguments are passed by value by default. If you need to -// pass an argument by reference, wrap it inside ByRef(). For -// example, -// -// InvokeArgument<1>(5, string("Hello"), ByRef(foo)) -// -// passes 5 and string("Hello") by value, and passes foo by -// reference. -// -// 2. If the callable takes an argument by reference but ByRef() is -// not used, it will receive the reference to a copy of the value, -// instead of the original value. For example, when the 0-th -// argument of the mock function takes a const string&, the action -// -// InvokeArgument<0>(string("Hello")) -// -// makes a copy of the temporary string("Hello") object and passes a -// reference of the copy, instead of the original temporary object, -// to the callable. This makes it easy for a user to define an -// InvokeArgument action from temporary values and have it performed -// later. - -namespace internal { -namespace invoke_argument { - -// Appears in InvokeArgumentAdl's argument list to help avoid -// accidental calls to user functions of the same name. -struct AdlTag {}; - -// InvokeArgumentAdl - a helper for InvokeArgument. -// The basic overloads are provided here for generic functors. -// Overloads for other custom-callables are provided in the -// internal/custom/callback-actions.h header. - -template -R InvokeArgumentAdl(AdlTag, F f) { - return f(); -} -template -R InvokeArgumentAdl(AdlTag, F f, A1 a1) { - return f(a1); -} -template -R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2) { - return f(a1, a2); -} -template -R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3) { - return f(a1, a2, a3); -} -template -R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4) { - return f(a1, a2, a3, a4); -} -template -R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5) { - return f(a1, a2, a3, a4, a5); -} -template -R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6) { - return f(a1, a2, a3, a4, a5, a6); -} -template -R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, - A7 a7) { - return f(a1, a2, a3, a4, a5, a6, a7); -} -template -R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, - A7 a7, A8 a8) { - return f(a1, a2, a3, a4, a5, a6, a7, a8); -} -template -R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, - A7 a7, A8 a8, A9 a9) { - return f(a1, a2, a3, a4, a5, a6, a7, a8, a9); -} -template -R InvokeArgumentAdl(AdlTag, F f, A1 a1, A2 a2, A3 a3, A4 a4, A5 a5, A6 a6, - A7 a7, A8 a8, A9 a9, A10 a10) { - return f(a1, a2, a3, a4, a5, a6, a7, a8, a9, a10); -} -} // namespace invoke_argument -} // namespace internal - -ACTION_TEMPLATE(InvokeArgument, - HAS_1_TEMPLATE_PARAMS(int, k), - AND_0_VALUE_PARAMS()) { - using internal::invoke_argument::InvokeArgumentAdl; - return InvokeArgumentAdl( - internal::invoke_argument::AdlTag(), - ::testing::get(args)); -} - -ACTION_TEMPLATE(InvokeArgument, - HAS_1_TEMPLATE_PARAMS(int, k), - AND_1_VALUE_PARAMS(p0)) { - using internal::invoke_argument::InvokeArgumentAdl; - return InvokeArgumentAdl( - internal::invoke_argument::AdlTag(), - ::testing::get(args), p0); -} - -ACTION_TEMPLATE(InvokeArgument, - HAS_1_TEMPLATE_PARAMS(int, k), - AND_2_VALUE_PARAMS(p0, p1)) { - using internal::invoke_argument::InvokeArgumentAdl; - return InvokeArgumentAdl( - internal::invoke_argument::AdlTag(), - ::testing::get(args), p0, p1); -} - -ACTION_TEMPLATE(InvokeArgument, - HAS_1_TEMPLATE_PARAMS(int, k), - AND_3_VALUE_PARAMS(p0, p1, p2)) { - using internal::invoke_argument::InvokeArgumentAdl; - return InvokeArgumentAdl( - internal::invoke_argument::AdlTag(), - ::testing::get(args), p0, p1, p2); -} - -ACTION_TEMPLATE(InvokeArgument, - HAS_1_TEMPLATE_PARAMS(int, k), - AND_4_VALUE_PARAMS(p0, p1, p2, p3)) { - using internal::invoke_argument::InvokeArgumentAdl; - return InvokeArgumentAdl( - internal::invoke_argument::AdlTag(), - ::testing::get(args), p0, p1, p2, p3); -} - -ACTION_TEMPLATE(InvokeArgument, - HAS_1_TEMPLATE_PARAMS(int, k), - AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)) { - using internal::invoke_argument::InvokeArgumentAdl; - return InvokeArgumentAdl( - internal::invoke_argument::AdlTag(), - ::testing::get(args), p0, p1, p2, p3, p4); -} - -ACTION_TEMPLATE(InvokeArgument, - HAS_1_TEMPLATE_PARAMS(int, k), - AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)) { - using internal::invoke_argument::InvokeArgumentAdl; - return InvokeArgumentAdl( - internal::invoke_argument::AdlTag(), - ::testing::get(args), p0, p1, p2, p3, p4, p5); -} - -ACTION_TEMPLATE(InvokeArgument, - HAS_1_TEMPLATE_PARAMS(int, k), - AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)) { - using internal::invoke_argument::InvokeArgumentAdl; - return InvokeArgumentAdl( - internal::invoke_argument::AdlTag(), - ::testing::get(args), p0, p1, p2, p3, p4, p5, p6); -} - -ACTION_TEMPLATE(InvokeArgument, - HAS_1_TEMPLATE_PARAMS(int, k), - AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)) { - using internal::invoke_argument::InvokeArgumentAdl; - return InvokeArgumentAdl( - internal::invoke_argument::AdlTag(), - ::testing::get(args), p0, p1, p2, p3, p4, p5, p6, p7); -} - -ACTION_TEMPLATE(InvokeArgument, - HAS_1_TEMPLATE_PARAMS(int, k), - AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8)) { - using internal::invoke_argument::InvokeArgumentAdl; - return InvokeArgumentAdl( - internal::invoke_argument::AdlTag(), - ::testing::get(args), p0, p1, p2, p3, p4, p5, p6, p7, p8); -} - -ACTION_TEMPLATE(InvokeArgument, - HAS_1_TEMPLATE_PARAMS(int, k), - AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)) { - using internal::invoke_argument::InvokeArgumentAdl; - return InvokeArgumentAdl( - internal::invoke_argument::AdlTag(), - ::testing::get(args), p0, p1, p2, p3, p4, p5, p6, p7, p8, p9); -} - -// Various overloads for ReturnNew(). -// -// The ReturnNew(a1, a2, ..., a_k) action returns a pointer to a new -// instance of type T, constructed on the heap with constructor arguments -// a1, a2, ..., and a_k. The caller assumes ownership of the returned value. -ACTION_TEMPLATE(ReturnNew, - HAS_1_TEMPLATE_PARAMS(typename, T), - AND_0_VALUE_PARAMS()) { - return new T(); -} - -ACTION_TEMPLATE(ReturnNew, - HAS_1_TEMPLATE_PARAMS(typename, T), - AND_1_VALUE_PARAMS(p0)) { - return new T(p0); -} - -ACTION_TEMPLATE(ReturnNew, - HAS_1_TEMPLATE_PARAMS(typename, T), - AND_2_VALUE_PARAMS(p0, p1)) { - return new T(p0, p1); -} - -ACTION_TEMPLATE(ReturnNew, - HAS_1_TEMPLATE_PARAMS(typename, T), - AND_3_VALUE_PARAMS(p0, p1, p2)) { - return new T(p0, p1, p2); -} - -ACTION_TEMPLATE(ReturnNew, - HAS_1_TEMPLATE_PARAMS(typename, T), - AND_4_VALUE_PARAMS(p0, p1, p2, p3)) { - return new T(p0, p1, p2, p3); -} - -ACTION_TEMPLATE(ReturnNew, - HAS_1_TEMPLATE_PARAMS(typename, T), - AND_5_VALUE_PARAMS(p0, p1, p2, p3, p4)) { - return new T(p0, p1, p2, p3, p4); -} - -ACTION_TEMPLATE(ReturnNew, - HAS_1_TEMPLATE_PARAMS(typename, T), - AND_6_VALUE_PARAMS(p0, p1, p2, p3, p4, p5)) { - return new T(p0, p1, p2, p3, p4, p5); -} - -ACTION_TEMPLATE(ReturnNew, - HAS_1_TEMPLATE_PARAMS(typename, T), - AND_7_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6)) { - return new T(p0, p1, p2, p3, p4, p5, p6); -} - -ACTION_TEMPLATE(ReturnNew, - HAS_1_TEMPLATE_PARAMS(typename, T), - AND_8_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7)) { - return new T(p0, p1, p2, p3, p4, p5, p6, p7); -} - -ACTION_TEMPLATE(ReturnNew, - HAS_1_TEMPLATE_PARAMS(typename, T), - AND_9_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8)) { - return new T(p0, p1, p2, p3, p4, p5, p6, p7, p8); -} - -ACTION_TEMPLATE(ReturnNew, - HAS_1_TEMPLATE_PARAMS(typename, T), - AND_10_VALUE_PARAMS(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9)) { - return new T(p0, p1, p2, p3, p4, p5, p6, p7, p8, p9); -} - -#ifdef _MSC_VER -# pragma warning(pop) -#endif - -} // namespace testing - -// Include any custom callback actions added by the local installation. -// We must include this header at the end to make sure it can use the -// declarations from this file. -// This file was GENERATED by command: -// pump.py gmock-generated-actions.h.pump -// DO NOT EDIT BY HAND!!! - -#ifndef GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_ -#define GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_ - -#endif // GMOCK_INCLUDE_GMOCK_INTERNAL_CUSTOM_GMOCK_GENERATED_ACTIONS_H_ - -#endif // GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_ACTIONS_H_ -// This file was GENERATED by command: -// pump.py gmock-generated-function-mockers.h.pump -// DO NOT EDIT BY HAND!!! - -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Mock - a framework for writing C++ mock classes. -// -// This file implements function mockers of various arities. - -#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_ -#define GMOCK_INCLUDE_GMOCK_GMOCK_GENERATED_FUNCTION_MOCKERS_H_ - -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Mock - a framework for writing C++ mock classes. -// -// This file implements the ON_CALL() and EXPECT_CALL() macros. -// -// A user can use the ON_CALL() macro to specify the default action of -// a mock method. The syntax is: -// -// ON_CALL(mock_object, Method(argument-matchers)) -// .With(multi-argument-matcher) -// .WillByDefault(action); -// -// where the .With() clause is optional. -// -// A user can use the EXPECT_CALL() macro to specify an expectation on -// a mock method. The syntax is: -// -// EXPECT_CALL(mock_object, Method(argument-matchers)) -// .With(multi-argument-matchers) -// .Times(cardinality) -// .InSequence(sequences) -// .After(expectations) -// .WillOnce(action) -// .WillRepeatedly(action) -// .RetiresOnSaturation(); -// -// where all clauses are optional, and .InSequence()/.After()/ -// .WillOnce() can appear any number of times. - -#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_ -#define GMOCK_INCLUDE_GMOCK_GMOCK_SPEC_BUILDERS_H_ - -#include -#include -#include -#include -#include -// Copyright 2007, Google Inc. -// All rights reserved. -// -// Redistribution and use in source and binary forms, with or without -// modification, are permitted provided that the following conditions are -// met: -// -// * Redistributions of source code must retain the above copyright -// notice, this list of conditions and the following disclaimer. -// * Redistributions in binary form must reproduce the above -// copyright notice, this list of conditions and the following disclaimer -// in the documentation and/or other materials provided with the -// distribution. -// * Neither the name of Google Inc. nor the names of its -// contributors may be used to endorse or promote products derived from -// this software without specific prior written permission. -// -// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -// -// Author: wan@google.com (Zhanyong Wan) - -// Google Mock - a framework for writing C++ mock classes. -// -// This file implements some commonly used argument matchers. More -// matchers can be defined by the user implementing the -// MatcherInterface interface if necessary. - -#ifndef GMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_ -#define GMOCK_INCLUDE_GMOCK_GMOCK_MATCHERS_H_ - -#include -#include -#include -#include -#include // NOLINT -#include -#include -#include -#include - -#if GTEST_HAS_STD_INITIALIZER_LIST_ -# include // NOLINT -- must be after gtest.h -#endif - -namespace testing { - -// To implement a matcher Foo for type T, define: -// 1. a class FooMatcherImpl that implements the -// MatcherInterface interface, and -// 2. a factory function that creates a Matcher object from a -// FooMatcherImpl*. -// -// The two-level delegation design makes it possible to allow a user -// to write "v" instead of "Eq(v)" where a Matcher is expected, which -// is impossible if we pass matchers by pointers. It also eases -// ownership management as Matcher objects can now be copied like -// plain values. - -// MatchResultListener is an abstract class. Its << operator can be -// used by a matcher to explain why a value matches or doesn't match. -// -// TODO(wan@google.com): add method -// bool InterestedInWhy(bool result) const; -// to indicate whether the listener is interested in why the match -// result is 'result'. -class MatchResultListener { - public: - // Creates a listener object with the given underlying ostream. The - // listener does not own the ostream, and does not dereference it - // in the constructor or destructor. - explicit MatchResultListener(::std::ostream* os) : stream_(os) {} - virtual ~MatchResultListener() = 0; // Makes this class abstract. - - // Streams x to the underlying ostream; does nothing if the ostream - // is NULL. - template - MatchResultListener& operator<<(const T& x) { - if (stream_ != NULL) - *stream_ << x; - return *this; - } - - // Returns the underlying ostream. - ::std::ostream* stream() { return stream_; } - - // Returns true iff the listener is interested in an explanation of - // the match result. A matcher's MatchAndExplain() method can use - // this information to avoid generating the explanation when no one - // intends to hear it. - bool IsInterested() const { return stream_ != NULL; } - - private: - ::std::ostream* const stream_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(MatchResultListener); -}; - -inline MatchResultListener::~MatchResultListener() { -} - -// An instance of a subclass of this knows how to describe itself as a -// matcher. -class MatcherDescriberInterface { - public: - virtual ~MatcherDescriberInterface() {} - - // Describes this matcher to an ostream. The function should print - // a verb phrase that describes the property a value matching this - // matcher should have. The subject of the verb phrase is the value - // being matched. For example, the DescribeTo() method of the Gt(7) - // matcher prints "is greater than 7". - virtual void DescribeTo(::std::ostream* os) const = 0; - - // Describes the negation of this matcher to an ostream. For - // example, if the description of this matcher is "is greater than - // 7", the negated description could be "is not greater than 7". - // You are not required to override this when implementing - // MatcherInterface, but it is highly advised so that your matcher - // can produce good error messages. - virtual void DescribeNegationTo(::std::ostream* os) const { - *os << "not ("; - DescribeTo(os); - *os << ")"; - } -}; - -// The implementation of a matcher. -template -class MatcherInterface : public MatcherDescriberInterface { - public: - // Returns true iff the matcher matches x; also explains the match - // result to 'listener' if necessary (see the next paragraph), in - // the form of a non-restrictive relative clause ("which ...", - // "whose ...", etc) that describes x. For example, the - // MatchAndExplain() method of the Pointee(...) matcher should - // generate an explanation like "which points to ...". - // - // Implementations of MatchAndExplain() should add an explanation of - // the match result *if and only if* they can provide additional - // information that's not already present (or not obvious) in the - // print-out of x and the matcher's description. Whether the match - // succeeds is not a factor in deciding whether an explanation is - // needed, as sometimes the caller needs to print a failure message - // when the match succeeds (e.g. when the matcher is used inside - // Not()). - // - // For example, a "has at least 10 elements" matcher should explain - // what the actual element count is, regardless of the match result, - // as it is useful information to the reader; on the other hand, an - // "is empty" matcher probably only needs to explain what the actual - // size is when the match fails, as it's redundant to say that the - // size is 0 when the value is already known to be empty. - // - // You should override this method when defining a new matcher. - // - // It's the responsibility of the caller (Google Mock) to guarantee - // that 'listener' is not NULL. This helps to simplify a matcher's - // implementation when it doesn't care about the performance, as it - // can talk to 'listener' without checking its validity first. - // However, in order to implement dummy listeners efficiently, - // listener->stream() may be NULL. - virtual bool MatchAndExplain(T x, MatchResultListener* listener) const = 0; - - // Inherits these methods from MatcherDescriberInterface: - // virtual void DescribeTo(::std::ostream* os) const = 0; - // virtual void DescribeNegationTo(::std::ostream* os) const; -}; - -namespace internal { - -// Converts a MatcherInterface to a MatcherInterface. -template -class MatcherInterfaceAdapter : public MatcherInterface { - public: - explicit MatcherInterfaceAdapter(const MatcherInterface* impl) - : impl_(impl) {} - virtual ~MatcherInterfaceAdapter() { delete impl_; } - - virtual void DescribeTo(::std::ostream* os) const { impl_->DescribeTo(os); } - - virtual void DescribeNegationTo(::std::ostream* os) const { - impl_->DescribeNegationTo(os); - } - - virtual bool MatchAndExplain(const T& x, - MatchResultListener* listener) const { - return impl_->MatchAndExplain(x, listener); - } - - private: - const MatcherInterface* const impl_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(MatcherInterfaceAdapter); -}; - -} // namespace internal - -// A match result listener that stores the explanation in a string. -class StringMatchResultListener : public MatchResultListener { - public: - StringMatchResultListener() : MatchResultListener(&ss_) {} - - // Returns the explanation accumulated so far. - std::string str() const { return ss_.str(); } - - // Clears the explanation accumulated so far. - void Clear() { ss_.str(""); } - - private: - ::std::stringstream ss_; - - GTEST_DISALLOW_COPY_AND_ASSIGN_(StringMatchResultListener); -}; - -namespace internal { - -struct AnyEq { - template - bool operator()(const A& a, const B& b) const { return a == b; } -}; -struct AnyNe { - template - bool operator()(const A& a, const B& b) const { return a != b; } -}; -struct AnyLt { - template - bool operator()(const A& a, const B& b) const { return a < b; } -}; -struct AnyGt { - template - bool operator()(const A& a, const B& b) const { return a > b; } -}; -struct AnyLe { - template - bool operator()(const A& a, const B& b) const { return a <= b; } -}; -struct AnyGe { - template - bool operator()(const A& a, const B& b) const { return a >= b; } -}; - -// A match result listener that ignores the explanation. -class DummyMatchResultListener : public MatchResultListener { - public: - DummyMatchResultListener() : MatchResultListener(NULL) {} - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(DummyMatchResultListener); -}; - -// A match result listener that forwards the explanation to a given -// ostream. The difference between this and MatchResultListener is -// that the former is concrete. -class StreamMatchResultListener : public MatchResultListener { - public: - explicit StreamMatchResultListener(::std::ostream* os) - : MatchResultListener(os) {} - - private: - GTEST_DISALLOW_COPY_AND_ASSIGN_(StreamMatchResultListener); -}; - -// An internal class for implementing Matcher, which will derive -// from it. We put functionalities common to all Matcher -// specializations here to avoid code duplication. -template -class MatcherBase { - public: - // Returns true iff the matcher matches x; also explains the match - // result to 'listener'. - bool MatchAndExplain(GTEST_REFERENCE_TO_CONST_(T) x, - MatchResultListener* listener) const { - return impl_->MatchAndExplain(x, listener); - } - - // Returns true iff this matcher matches x. - bool Matches(GTEST_REFERENCE_TO_CONST_(T) x) const { - DummyMatchResultListener dummy; - return MatchAndExplain(x, &dummy); - } - - // Describes this matcher to an ostream. - void DescribeTo(::std::ostream* os) const { impl_->DescribeTo(os); } - - // Describes the negation of this matcher to an ostream. - void DescribeNegationTo(::std::ostream* os) const { - impl_->DescribeNegationTo(os); - } - - // Explains why x matches, or doesn't match, the matcher. - void ExplainMatchResultTo(GTEST_REFERENCE_TO_CONST_(T) x, - ::std::ostream* os) const { - StreamMatchResultListener listener(os); - MatchAndExplain(x, &listener); - } - - // Returns the describer for this matcher object; retains ownership - // of the describer, which is only guaranteed to be alive when - // this matcher object is alive. - const MatcherDescriberInterface* GetDescriber() const { - return impl_.get(); - } - - protected: - MatcherBase() {} - - // Constructs a matcher from its implementation. - explicit MatcherBase( - const MatcherInterface* impl) - : impl_(impl) {} - - template - explicit MatcherBase( - const MatcherInterface* impl, - typename internal::EnableIf< - !internal::IsSame::value>::type* = - NULL) - : impl_(new internal::MatcherInterfaceAdapter(impl)) {} - - virtual ~MatcherBase() {} - - private: - // shared_ptr (util/gtl/shared_ptr.h) and linked_ptr have similar - // interfaces. The former dynamically allocates a chunk of memory - // to hold the reference count, while the latter tracks all - // references using a circular linked list without allocating - // memory. It has been observed that linked_ptr performs better in - // typical scenarios. However, shared_ptr can out-perform - // linked_ptr when there are many more uses of the copy constructor - // than the default constructor. - // - // If performance becomes a problem, we should see if using - // shared_ptr helps. - ::testing::internal::linked_ptr< - const MatcherInterface > - impl_; -}; - -} // namespace internal - -// A Matcher is a copyable and IMMUTABLE (except by assignment) -// object that can check whether a value of type T matches. The -// implementation of Matcher is just a linked_ptr to const -// MatcherInterface, so copying is fairly cheap. Don't inherit -// from Matcher! -template -class Matcher : public internal::MatcherBase { - public: - // Constructs a null matcher. Needed for storing Matcher objects in STL - // containers. A default-constructed matcher is not yet initialized. You - // cannot use it until a valid value has been assigned to it. - explicit Matcher() {} // NOLINT - - // Constructs a matcher from its implementation. - explicit Matcher(const MatcherInterface* impl) - : internal::MatcherBase(impl) {} - - template - explicit Matcher(const MatcherInterface* impl, - typename internal::EnableIf::value>::type* = NULL) - : internal::MatcherBase(impl) {} - - // Implicit constructor here allows people to write - // EXPECT_CALL(foo, Bar(5)) instead of EXPECT_CALL(foo, Bar(Eq(5))) sometimes - Matcher(T value); // NOLINT -}; - -// The following two specializations allow the user to write str -// instead of Eq(str) and "foo" instead of Eq("foo") when a std::string -// matcher is expected. -template <> -class GTEST_API_ Matcher - : public internal::MatcherBase { - public: - Matcher() {} - - explicit Matcher(const MatcherInterface* impl) - : internal::MatcherBase(impl) {} - - // Allows the user to write str instead of Eq(str) sometimes, where - // str is a std::string object. - Matcher(const std::string& s); // NOLINT - -#if GTEST_HAS_GLOBAL_STRING - // Allows the user to write str instead of Eq(str) sometimes, where - // str is a ::string object. - Matcher(const ::string& s); // NOLINT -#endif // GTEST_HAS_GLOBAL_STRING - - // Allows the user to write "foo" instead of Eq("foo") sometimes. - Matcher(const char* s); // NOLINT -}; - -template <> -class GTEST_API_ Matcher - : public internal::MatcherBase { - public: - Matcher() {} - - explicit Matcher(const MatcherInterface* impl) - : internal::MatcherBase(impl) {} - explicit Matcher(const MatcherInterface* impl) - : internal::MatcherBase(impl) {} - - // Allows the user to write str instead of Eq(str) sometimes, where - // str is a string object. - Matcher(const std::string& s); // NOLINT - -#if GTEST_HAS_GLOBAL_STRING - // Allows the user to write str instead of Eq(str) sometimes, where - // str is a ::string object. - Matcher(const ::string& s); // NOLINT -#endif // GTEST_HAS_GLOBAL_STRING - - // Allows the user to write "foo" instead of Eq("foo") sometimes. - Matcher(const char* s); // NOLINT -}; - -#if GTEST_HAS_GLOBAL_STRING -// The following two specializations allow the user to write str -// instead of Eq(str) and "foo" instead of Eq("foo") when a ::string -// matcher is expected. -template <> -class GTEST_API_ Matcher - : public internal::MatcherBase { - public: - Matcher() {} - - explicit Matcher(const MatcherInterface* impl) - : internal::MatcherBase(impl) {} - - // Allows the user to write str instead of Eq(str) sometimes, where - // str is a std::string object. - Matcher(const std::string& s); // NOLINT - - // Allows the user to write str instead of Eq(str) sometimes, where - // str is a ::string object. - Matcher(const ::string& s); // NOLINT - - // Allows the user to write "foo" instead of Eq("foo") sometimes. - Matcher(const char* s); // NOLINT -}; - -template <> -class GTEST_API_ Matcher< ::string> - : public internal::MatcherBase< ::string> { - public: - Matcher() {} - - explicit Matcher(const MatcherInterface* impl) - : internal::MatcherBase< ::string>(impl) {} - explicit Matcher(const MatcherInterface< ::string>* impl) - : internal::MatcherBase< ::string>(impl) {} - - // Allows the user to write str instead of Eq(str) sometimes, where - // str is a std::string object. - Matcher(const std::string& s); // NOLINT - - // Allows the user to write str instead of Eq(str) sometimes, where - // str is a ::string object. - Matcher(const ::string& s); // NOLINT - - // Allows the user to write "foo" instead of Eq("foo") sometimes. - Matcher(const char* s); // NOLINT -}; -#endif // GTEST_HAS_GLOBAL_STRING - -#if GTEST_HAS_ABSL -// The following two specializations allow the user to write str -// instead of Eq(str) and "foo" instead of Eq("foo") when a absl::string_view -// matcher is expected. -template <> -class GTEST_API_ Matcher - : public internal::MatcherBase { - public: - Matcher() {} - - explicit Matcher(const MatcherInterface* impl) - : internal::MatcherBase(impl) {} - - // Allows the user to write str instead of Eq(str) sometimes, where - // str is a std::string object. - Matcher(const std::string& s); // NOLINT - -#if GTEST_HAS_GLOBAL_STRING - // Allows the user to write str instead of Eq(str) sometimes, where - // str is a ::string object. - Matcher(const ::string& s); // NOLINT -#endif // GTEST_HAS_GLOBAL_STRING - - // Allows the user to write "foo" instead of Eq("foo") sometimes. - Matcher(const char* s); // NOLINT - - // Allows the user to pass absl::string_views directly. - Matcher(absl::string_view s); // NOLINT -}; - -template <> -class GTEST_API_ Matcher - : public internal::MatcherBase { - public: - Matcher() {} - - explicit Matcher(const MatcherInterface* impl) - : internal::MatcherBase(impl) {} - explicit Matcher(const MatcherInterface* impl) - : internal::MatcherBase(impl) {} - - // Allows the user to write str instead of Eq(str) sometimes, where - // str is a std::string object. - Matcher(const std::string& s); // NOLINT - -#if GTEST_HAS_GLOBAL_STRING - // Allows the user to write str instead of Eq(str) sometimes, where - // str is a ::string object. - Matcher(const ::string& s); // NOLINT -#endif // GTEST_HAS_GLOBAL_STRING - - // Allows the user to write "foo" instead of Eq("foo") sometimes. - Matcher(const char* s); // NOLINT - - // Allows the user to pass absl::string_views directly. - Matcher(absl::string_view s); // NOLINT -}; -#endif // GTEST_HAS_ABSL - -// Prints a matcher in a human-readable format. -template -std::ostream& operator<<(std::ostream& os, const Matcher& matcher) { - matcher.DescribeTo(&os); - return os; -} - -// The PolymorphicMatcher class template makes it easy to implement a -// polymorphic matcher (i.e. a matcher that can match values of more -// than one type, e.g. Eq(n) and NotNull()). -// -// To define a polymorphic matcher, a user should provide an Impl -// class that has a DescribeTo() method and a DescribeNegationTo() -// method, and define a member function (or member function template) -// -// bool MatchAndExplain(const Value& value, -// MatchResultListener* listener) const; -// -// See the definition of NotNull() for a complete example. -template -class PolymorphicMatcher { - public: - explicit PolymorphicMatcher(const Impl& an_impl) : impl_(an_impl) {} - - // Returns a mutable reference to the underlying matcher - // implementation object. - Impl& mutable_impl() { return impl_; } - - // Returns an immutable reference to the underlying matcher - // implementation object. - const Impl& impl() const { return impl_; } - - template - operator Matcher() const { - return Matcher(new MonomorphicImpl(impl_)); - } - - private: - template - class MonomorphicImpl : public MatcherInterface { - public: - explicit MonomorphicImpl(const Impl& impl) : impl_(impl) {} - - virtual void DescribeTo(::std::ostream* os) const { - impl_.DescribeTo(os); - } - - virtual void DescribeNegationTo(::std::ostream* os) const { - impl_.DescribeNegationTo(os); - } - - virtual bool MatchAndExplain(T x, MatchResultListener* listener) const { - return impl_.MatchAndExplain(x, listener); - } - - private: - const Impl impl_; - - GTEST_DISALLOW_ASSIGN_(MonomorphicImpl); - }; - - Impl impl_; - - GTEST_DISALLOW_ASSIGN_(PolymorphicMatcher); -}; - -// Creates a matcher from its implementation. This is easier to use -// than the Matcher constructor as it doesn't require you to -// explicitly write the template argument, e.g. -// -// MakeMatcher(foo); -// vs -// Matcher(foo); -template -inline Matcher MakeMatcher(const MatcherInterface* impl) { - return Matcher(impl); -} - -// Creates a polymorphic matcher from its implementation. This is -// easier to use than the PolymorphicMatcher constructor as it -// doesn't require you to explicitly write the template argument, e.g. -// -// MakePolymorphicMatcher(foo); -// vs -// PolymorphicMatcher(foo); -template -inline PolymorphicMatcher MakePolymorphicMatcher(const Impl& impl) { - return PolymorphicMatcher(impl); -} - -// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION -// and MUST NOT BE USED IN USER CODE!!! -namespace internal { - -// The MatcherCastImpl class template is a helper for implementing -// MatcherCast(). We need this helper in order to partially -// specialize the implementation of MatcherCast() (C++ allows -// class/struct templates to be partially specialized, but not -// function templates.). - -// This general version is used when MatcherCast()'s argument is a -// polymorphic matcher (i.e. something that can be converted to a -// Matcher but is not one yet; for example, Eq(value)) or a value (for -// example, "hello"). -template -class MatcherCastImpl { - public: - static Matcher Cast(const M& polymorphic_matcher_or_value) { - // M can be a polymorphic matcher, in which case we want to use - // its conversion operator to create Matcher. Or it can be a value - // that should be passed to the Matcher's constructor. - // - // We can't call Matcher(polymorphic_matcher_or_value) when M is a - // polymorphic matcher because it'll be ambiguous if T has an implicit - // constructor from M (this usually happens when T has an implicit - // constructor from any type). - // - // It won't work to unconditionally implict_cast - // polymorphic_matcher_or_value to Matcher because it won't trigger - // a user-defined conversion from M to T if one exists (assuming M is - // a value). - return CastImpl( - polymorphic_matcher_or_value, - BooleanConstant< - internal::ImplicitlyConvertible >::value>(), - BooleanConstant< - internal::ImplicitlyConvertible::value>()); - } - - private: - template - static Matcher CastImpl(const M& polymorphic_matcher_or_value, - BooleanConstant /* convertible_to_matcher */, - BooleanConstant) { - // M is implicitly convertible to Matcher, which means that either - // M is a polymorphic matcher or Matcher has an implicit constructor - // from M. In both cases using the implicit conversion will produce a - // matcher. - // - // Even if T has an implicit constructor from M, it won't be called because - // creating Matcher would require a chain of two user-defined conversions - // (first to create T from M and then to create Matcher from T). - return polymorphic_matcher_or_value; - } - - // M can't be implicitly converted to Matcher, so M isn't a polymorphic - // matcher. It's a value of a type implicitly convertible to T. Use direct - // initialization to create a matcher. - static Matcher CastImpl( - const M& value, BooleanConstant /* convertible_to_matcher */, - BooleanConstant /* convertible_to_T */) { - return Matcher(ImplicitCast_(value)); - } - - // M can't be implicitly converted to either Matcher or T. Attempt to use - // polymorphic matcher Eq(value) in this case. - // - // Note that we first attempt to perform an implicit cast on the value and - // only fall back to the polymorphic Eq() matcher afterwards because the - // latter calls bool operator==(const Lhs& lhs, const Rhs& rhs) in the end - // which might be undefined even when Rhs is implicitly convertible to Lhs - // (e.g. std::pair vs. std::pair). - // - // We don't define this method inline as we need the declaration of Eq(). - static Matcher CastImpl( - const M& value, BooleanConstant /* convertible_to_matcher */, - BooleanConstant /* convertible_to_T */); -}; - -// This more specialized version is used when MatcherCast()'s argument -// is already a Matcher. This only compiles when type T can be -// statically converted to type U. -template -class MatcherCastImpl > { - public: - static Matcher Cast(const Matcher& source_matcher) { - return Matcher(new Impl(source_matcher)); - } - - private: - class Impl : public MatcherInterface { - public: - explicit Impl(const Matcher& source_matcher) - : source_matcher_(source_matcher) {} - - // We delegate the matching logic to the source matcher. - virtual bool MatchAndExplain(T x, MatchResultListener* listener) const { -#if GTEST_LANG_CXX11 - using FromType = typename std::remove_cv::type>::type>::type; - using ToType = typename std::remove_cv::type>::type>::type; - // Do not allow implicitly converting base*/& to derived*/&. - static_assert( - // Do not trigger if only one of them is a pointer. That implies a - // regular conversion and not a down_cast. - (std::is_pointer::type>::value != - std::is_pointer::type>::value) || - std::is_same::value || - !std::is_base_of::value, - "Can't implicitly convert from to "); -#endif // GTEST_LANG_CXX11 - - return source_matcher_.MatchAndExplain(static_cast(x), listener); - } - - virtual void DescribeTo(::std::ostream* os) const { - source_matcher_.DescribeTo(os); - } - - virtual void DescribeNegationTo(::std::ostream* os) const { - source_matcher_.DescribeNegationTo(os); - } - - private: - const Matcher source_matcher_; - - GTEST_DISALLOW_ASSIGN_(Impl); - }; -}; - -// This even more specialized version is used for efficiently casting -// a matcher to its own type. -template -class MatcherCastImpl > { - public: - static Matcher Cast(const Matcher& matcher) { return matcher; } -}; - -} // namespace internal - -// In order to be safe and clear, casting between different matcher -// types is done explicitly via MatcherCast(m), which takes a -// matcher m and returns a Matcher. It compiles only when T can be -// statically converted to the argument type of m. -template -inline Matcher MatcherCast(const M& matcher) { - return internal::MatcherCastImpl::Cast(matcher); -} - -// Implements SafeMatcherCast(). -// -// We use an intermediate class to do the actual safe casting as Nokia's -// Symbian compiler cannot decide between -// template ... (M) and -// template ... (const Matcher&) -// for function templates but can for member function templates. -template -class SafeMatcherCastImpl { - public: - // This overload handles polymorphic matchers and values only since - // monomorphic matchers are handled by the next one. - template - static inline Matcher Cast(const M& polymorphic_matcher_or_value) { - return internal::MatcherCastImpl::Cast(polymorphic_matcher_or_value); - } - - // This overload handles monomorphic matchers. - // - // In general, if type T can be implicitly converted to type U, we can - // safely convert a Matcher to a Matcher (i.e. Matcher is - // contravariant): just keep a copy of the original Matcher, convert the - // argument from type T to U, and then pass it to the underlying Matcher. - // The only exception is when U is a reference and T is not, as the - // underlying Matcher may be interested in the argument's address, which - // is not preserved in the conversion from T to U. - template - static inline Matcher Cast(const Matcher& matcher) { - // Enforce that T can be implicitly converted to U. - GTEST_COMPILE_ASSERT_((internal::ImplicitlyConvertible::value), - T_must_be_implicitly_convertible_to_U); - // Enforce that we are not converting a non-reference type T to a reference - // type U. - GTEST_COMPILE_ASSERT_( - internal::is_reference::value || !internal::is_reference::value, - cannot_convert_non_reference_arg_to_reference); - // In case both T and U are arithmetic types, enforce that the - // conversion is not lossy. - typedef GTEST_REMOVE_REFERENCE_AND_CONST_(T) RawT; - typedef GTEST_REMOVE_REFERENCE_AND_CONST_(U) RawU; - const bool kTIsOther = GMOCK_KIND_OF_(RawT) == internal::kOther; - const bool kUIsOther = GMOCK_KIND_OF_(RawU) == internal::kOther; - GTEST_COMPILE_ASSERT_( - kTIsOther || kUIsOther || - (internal::LosslessArithmeticConvertible::value), - conversion_of_arithmetic_types_must_be_lossless); - return MatcherCast(matcher); - } -}; - -template -inline Matcher SafeMatcherCast(const M& polymorphic_matcher) { - return SafeMatcherCastImpl::Cast(polymorphic_matcher); -} - -// A() returns a matcher that matches any value of type T. -template -Matcher A(); - -// Anything inside the 'internal' namespace IS INTERNAL IMPLEMENTATION -// and MUST NOT BE USED IN USER CODE!!! -namespace internal { - -// If the explanation is not empty, prints it to the ostream. -inline void PrintIfNotEmpty(const std::string& explanation, - ::std::ostream* os) { - if (explanation != "" && os != NULL) { - *os << ", " << explanation; - } -} - -// Returns true if the given type name is easy to read by a human. -// This is used to decide whether printing the type of a value might -// be helpful. -inline bool IsReadableTypeName(const std::string& type_name) { - // We consider a type name readable if it's short or doesn't contain - // a template or function type. - return (type_name.length() <= 20 || - type_name.find_first_of("<(") == std::string::npos); -} - -// Matches the value against the given matcher, prints the value and explains -// the match result to the listener. Returns the match result. -// 'listener' must not be NULL. -// Value cannot be passed by const reference, because some matchers take a -// non-const argument. -template -bool MatchPrintAndExplain(Value& value, const Matcher& matcher, - MatchResultListener* listener) { - if (!listener->IsInterested()) { - // If the listener is not interested, we do not need to construct the - // inner explanation. - return matcher.Matches(value); - } - - StringMatchResultListener inner_listener; - const bool match = matcher.MatchAndExplain(value, &inner_listener); - - UniversalPrint(value, listener->stream()); -#if GTEST_HAS_RTTI - const std::string& type_name = GetTypeName(); - if (IsReadableTypeName(type_name)) - *listener->stream() << " (of type " << type_name << ")"; -#endif - PrintIfNotEmpty(inner_listener.str(), listener->stream()); - - return match; -} - -// An internal helper class for doing compile-time loop on a tuple's -// fields. -template -class TuplePrefix { - public: - // TuplePrefix::Matches(matcher_tuple, value_tuple) returns true - // iff the first N fields of matcher_tuple matches the first N - // fields of value_tuple, respectively. - template - static bool Matches(const MatcherTuple& matcher_tuple, - const ValueTuple& value_tuple) { - return TuplePrefix::Matches(matcher_tuple, value_tuple) - && get(matcher_tuple).Matches(get(value_tuple)); - } - - // TuplePrefix::ExplainMatchFailuresTo(matchers, values, os) - // describes failures in matching the first N fields of matchers - // against the first N fields of values. If there is no failure, - // nothing will be streamed to os. - template - static void ExplainMatchFailuresTo(const MatcherTuple& matchers, - const ValueTuple& values, - ::std::ostream* os) { - // First, describes failures in the first N - 1 fields. - TuplePrefix::ExplainMatchFailuresTo(matchers, values, os); - - // Then describes the failure (if any) in the (N - 1)-th (0-based) - // field. - typename tuple_element::type matcher = - get(matchers); - typedef typename tuple_element::type Value; - GTEST_REFERENCE_TO_CONST_(Value) value = get(values); - StringMatchResultListener listener; - if (!matcher.MatchAndExplain(value, &listener)) { - // TODO(wan): include in the message the name of the parameter - // as used in MOCK_METHOD*() when possible. - *os << " Expected arg #" << N - 1 << ": "; - get(matchers).DescribeTo(os); - *os << "\n Actual: "; - // We remove the reference in type Value to prevent the - // universal printer from printing the address of value, which - // isn't interesting to the user most of the time. The - // matcher's MatchAndExplain() method handles the case when - // the address is interesting. - internal::UniversalPrint(value, os); - PrintIfNotEmpty(listener.str(), os); - *os << "\n"; - } - } -}; - -// The base case. -template <> -class TuplePrefix<0> { - public: - template - static bool Matches(const MatcherTuple& /* matcher_tuple */, - const ValueTuple& /* value_tuple */) { - return true; - } - - template - static void ExplainMatchFailuresTo(const MatcherTuple& /* matchers */, - const ValueTuple& /* values */, - ::std::ostream* /* os */) {} -}; - -// TupleMatches(matcher_tuple, value_tuple) returns true iff all -// matchers in matcher_tuple match the corresponding fields in -// value_tuple. It is a compiler error if matcher_tuple and -// value_tuple have different number of fields or incompatible field -// types. -template -bool TupleMatches(const MatcherTuple& matcher_tuple, - const ValueTuple& value_tuple) { - // Makes sure that matcher_tuple and value_tuple have the same - // number of fields. - GTEST_COMPILE_ASSERT_(tuple_size::value == - tuple_size::value, - matcher_and_value_have_different_numbers_of_fields); - return TuplePrefix::value>:: - Matches(matcher_tuple, value_tuple); -} - -// Describes failures in matching matchers against values. If there -// is no failure, nothing will be streamed to os. -template -void ExplainMatchFailureTupleTo(const MatcherTuple& matchers, - const ValueTuple& values, - ::std::ostream* os) { - TuplePrefix::value>::ExplainMatchFailuresTo( - matchers, values, os); -} - -// TransformTupleValues and its helper. -// -// TransformTupleValuesHelper hides the internal machinery that -// TransformTupleValues uses to implement a tuple traversal. -template -class TransformTupleValuesHelper { - private: - typedef ::testing::tuple_size TupleSize; - - public: - // For each member of tuple 't', taken in order, evaluates '*out++ = f(t)'. - // Returns the final value of 'out' in case the caller needs it. - static OutIter Run(Func f, const Tuple& t, OutIter out) { - return IterateOverTuple()(f, t, out); - } - - private: - template - struct IterateOverTuple { - OutIter operator() (Func f, const Tup& t, OutIter out) const { - *out++ = f(::testing::get(t)); - return IterateOverTuple()(f, t, out); - } - }; - template - struct IterateOverTuple { - OutIter operator() (Func /* f */, const Tup& /* t */, OutIter out) const { - return out; - } - }; -}; - -// Successively invokes 'f(element)' on each element of the tuple 't', -// appending each result to the 'out' iterator. Returns the final value -// of 'out'. -template -OutIter TransformTupleValues(Func f, const Tuple& t, OutIter out) { - return TransformTupleValuesHelper::Run(f, t, out); -} - -// Implements A(). -template -class AnyMatcherImpl : public MatcherInterface { - public: - virtual bool MatchAndExplain(GTEST_REFERENCE_TO_CONST_(T) /* x */, - MatchResultListener* /* listener */) const { - return true; - } - virtual void DescribeTo(::std::ostream* os) const { *os << "is anything"; } - virtual void DescribeNegationTo(::std::ostream* os) const { - // This is mostly for completeness' safe, as it's not very useful - // to write Not(A()). However we cannot completely rule out - // such a possibility, and it doesn't hurt to be prepared. - *os << "never matches"; - } -}; - -// Implements _, a matcher that matches any value of any -// type. This is a polymorphic matcher, so we need a template type -// conversion operator to make it appearing as a Matcher for any -// type T. -class AnythingMatcher { - public: - template - operator Matcher() const { return A(); } -}; - -// Implements a matcher that compares a given value with a -// pre-supplied value using one of the ==, <=, <, etc, operators. The -// two values being compared don't have to have the same type. -// -// The matcher defined here is polymorphic (for example, Eq(5) can be -// used to match an int, a short, a double, etc). Therefore we use -// a template type conversion operator in the implementation. -// -// The following template definition assumes that the Rhs parameter is -// a "bare" type (i.e. neither 'const T' nor 'T&'). -template -class ComparisonBase { - public: - explicit ComparisonBase(const Rhs& rhs) : rhs_(rhs) {} - template - operator Matcher() const { - return MakeMatcher(new Impl(rhs_)); - } - - private: - template - class Impl : public MatcherInterface { - public: - explicit Impl(const Rhs& rhs) : rhs_(rhs) {} - virtual bool MatchAndExplain( - Lhs lhs, MatchResultListener* /* listener */) const { - return Op()(lhs, rhs_); - } - virtual void DescribeTo(::std::ostream* os) const { - *os << D::Desc() << " "; - UniversalPrint(rhs_, os); - } - virtual void DescribeNegationTo(::std::ostream* os) const { - *os << D::NegatedDesc() << " "; - UniversalPrint(rhs_, os); - } - private: - Rhs rhs_; - GTEST_DISALLOW_ASSIGN_(Impl); - }; - Rhs rhs_; - GTEST_DISALLOW_ASSIGN_(ComparisonBase); -}; - -template -class EqMatcher : public ComparisonBase, Rhs, AnyEq> { - public: - explicit EqMatcher(const Rhs& rhs) - : ComparisonBase, Rhs, AnyEq>(rhs) { } - static const char* Desc() { return "is equal to"; } - static const char* NegatedDesc() { return "isn't equal to"; } -}; -template -class NeMatcher : public ComparisonBase, Rhs, AnyNe> { - public: - explicit NeMatcher(const Rhs& rhs) - : ComparisonBase, Rhs, AnyNe>(rhs) { } - static const char* Desc() { return "isn't equal to"; } - static const char* NegatedDesc() { return "is equal to"; } -}; -template -class LtMatcher : public ComparisonBase, Rhs, AnyLt> { - public: - explicit LtMatcher(const Rhs& rhs) - : ComparisonBase, Rhs, AnyLt>(rhs) { } - static const char* Desc() { return "is <"; } - static const char* NegatedDesc() { return "isn't <"; } -}; -template -class GtMatcher : public ComparisonBase, Rhs, AnyGt> { - public: - explicit GtMatcher(const Rhs& rhs) - : ComparisonBase, Rhs, AnyGt>(rhs) { } - static const char* Desc() { return "is >"; } - static const char* NegatedDesc() { return "isn't >"; } -}; -template -class LeMatcher : public ComparisonBase, Rhs, AnyLe> { - public: - explicit LeMatcher(const Rhs& rhs) - : ComparisonBase, Rhs, AnyLe>(rhs) { } - static const char* Desc() { return "is <="; } - static const char* NegatedDesc() { return "isn't <="; } -}; -template -class GeMatcher : public ComparisonBase, Rhs, AnyGe> { - public: - explicit GeMatcher(const Rhs& rhs) - : ComparisonBase, Rhs, AnyGe>(rhs) { } - static const char* Desc() { return "is >="; } - static const char* NegatedDesc() { return "isn't >="; } -}; - -// Implements the polymorphic IsNull() matcher, which matches any raw or smart -// pointer that is NULL. -class IsNullMatcher { - public: - template - bool MatchAndExplain(const Pointer& p, - MatchResultListener* /* listener */) const { -#if GTEST_LANG_CXX11 - return p == nullptr; -#else // GTEST_LANG_CXX11 - return GetRawPointer(p) == NULL; -#endif // GTEST_LANG_CXX11 - } - - void DescribeTo(::std::ostream* os) const { *os << "is NULL"; } - void DescribeNegationTo(::std::ostream* os) const { - *os << "isn't NULL"; - } -}; - -// Implements the polymorphic NotNull() matcher, which matches any raw or smart -// pointer that is not NULL. -class NotNullMatcher { - public: - template - bool MatchAndExplain(const Pointer& p, - MatchResultListener* /* listener */) const { -#if GTEST_LANG_CXX11 - return p != nullptr; -#else // GTEST_LANG_CXX11 - return GetRawPointer(p) != NULL; -#endif // GTEST_LANG_CXX11 - } - - void DescribeTo(::std::ostream* os) const { *os << "isn't NULL"; } - void DescribeNegationTo(::std::ostream* os) const { - *os << "is NULL"; - } -}; - -// Ref(variable) matches any argument that is a reference to -// 'variable'. This matcher is polymorphic as it can match any -// super type of the type of 'variable'. -// -// The RefMatcher template class implements Ref(variable). It can -// only be instantiated with a reference type. This prevents a user -// from mistakenly using Ref(x) to match a non-reference function -// argument. For example, the following will righteously cause a -// compiler error: -// -// int n; -// Matcher m1 = Ref(n); // This won't compile. -// Matcher m2 = Ref(n); // This will compile. -template -class RefMatcher; - -template -class RefMatcher { - // Google Mock is a generic framework and thus needs to support - // mocking any function types, including those that take non-const - // reference arguments. Therefore the template parameter T (and - // Super below) can be instantiated to either a const type or a - // non-const type. - public: - // RefMatcher() takes a T& instead of const T&, as we want the - // compiler to catch using Ref(const_value) as a matcher for a - // non-const reference. - explicit RefMatcher(T& x) : object_(x) {} // NOLINT - - template - operator Matcher() const { - // By passing object_ (type T&) to Impl(), which expects a Super&, - // we make sure that Super is a super type of T. In particular, - // this catches using Ref(const_value) as a matcher for a - // non-const reference, as you cannot implicitly convert a const - // reference to a non-const reference. - return MakeMatcher(new Impl(object_)); - } - - private: - template - class Impl : public MatcherInterface { - public: - explicit Impl(Super& x) : object_(x) {} // NOLINT - - // MatchAndExplain() takes a Super& (as opposed to const Super&) - // in order to match the interface MatcherInterface. - virtual bool MatchAndExplain( - Super& x, MatchResultListener* listener) const { - *listener << "which is located @" << static_cast(&x); - return &x == &object_; - } - - virtual void DescribeTo(::std::ostream* os) const { - *os << "references the variable "; - UniversalPrinter::Print(object_, os); - } - - virtual void DescribeNegationTo(::std::ostream* os) const { - *os << "does not reference the variable "; - UniversalPrinter::Print(object_, os); - } - - private: - const Super& object_; - - GTEST_DISALLOW_ASSIGN_(Impl); - }; - - T& object_; - - GTEST_DISALLOW_ASSIGN_(RefMatcher); -}; - -// Polymorphic helper functions for narrow and wide string matchers. -inline bool CaseInsensitiveCStringEquals(const char* lhs, const char* rhs) { - return String::CaseInsensitiveCStringEquals(lhs, rhs); -} - -inline bool CaseInsensitiveCStringEquals(const wchar_t* lhs, - const wchar_t* rhs) { - return String::CaseInsensitiveWideCStringEquals(lhs, rhs); -} - -// String comparison for narrow or wide strings that can have embedded NUL -// characters. -template -bool CaseInsensitiveStringEquals(const StringType& s1, - const StringType& s2) { - // Are the heads equal? - if (!CaseInsensitiveCStringEquals(s1.c_str(), s2.c_str())) { - return false; - } - - // Skip the equal heads. - const typename StringType::value_type nul = 0; - const size_t i1 = s1.find(nul), i2 = s2.find(nul); - - // Are we at the end of either s1 or s2? - if (i1 == StringType::npos || i2 == StringType::npos) { - return i1 == i2; - } - - // Are the tails equal? - return CaseInsensitiveStringEquals(s1.substr(i1 + 1), s2.substr(i2 + 1)); -} - -// String matchers. - -// Implements equality-based string matchers like StrEq, StrCaseNe, and etc. -template -class StrEqualityMatcher { - public: - StrEqualityMatcher(const StringType& str, bool expect_eq, - bool case_sensitive) - : string_(str), expect_eq_(expect_eq), case_sensitive_(case_sensitive) {} - -#if GTEST_HAS_ABSL - bool MatchAndExplain(const absl::string_view& s, - MatchResultListener* listener) const { - if (s.data() == NULL) { - return !expect_eq_; - } - // This should fail to compile if absl::string_view is used with wide - // strings. - const StringType& str = string(s); - return MatchAndExplain(str, listener); - } -#endif // GTEST_HAS_ABSL - - // Accepts pointer types, particularly: - // const char* - // char* - // const wchar_t* - // wchar_t* - template - bool MatchAndExplain(CharType* s, MatchResultListener* listener) const { - if (s == NULL) { - return !expect_eq_; - } - return MatchAndExplain(StringType(s), listener); - } - - // Matches anything that can convert to StringType. - // - // This is a template, not just a plain function with const StringType&, - // because absl::string_view has some interfering non-explicit constructors. - template - bool MatchAndExplain(const MatcheeStringType& s, - MatchResultListener* /* listener */) const { - const StringType& s2(s); - const bool eq = case_sensitive_ ? s2 == string_ : - CaseInsensitiveStringEquals(s2, string_); - return expect_eq_ == eq; - } - - void DescribeTo(::std::ostream* os) const { - DescribeToHelper(expect_eq_, os); - } - - void DescribeNegationTo(::std::ostream* os) const { - DescribeToHelper(!expect_eq_, os); - } - - private: - void DescribeToHelper(bool expect_eq, ::std::ostream* os) const { - *os << (expect_eq ? "is " : "isn't "); - *os << "equal to "; - if (!case_sensitive_) { - *os << "(ignoring case) "; - } - UniversalPrint(string_, os); - } - - const StringType string_; - const bool expect_eq_; - const bool case_sensitive_; - - GTEST_DISALLOW_ASSIGN_(StrEqualityMatcher); -}; - -// Implements the polymorphic HasSubstr(substring) matcher, which -// can be used as a Matcher as long as T can be converted to a -// string. -template -class HasSubstrMatcher { - public: - explicit HasSubstrMatcher(const StringType& substring) - : substring_(substring) {} - -#if GTEST_HAS_ABSL - bool MatchAndExplain(const absl::string_view& s, - MatchResultListener* listener) const { - if (s.data() == NULL) { - return false; - } - // This should fail to compile if absl::string_view is used with wide - // strings. - const StringType& str = string(s); - return MatchAndExplain(str, listener); - } -#endif // GTEST_HAS_ABSL - - // Accepts pointer types, particularly: - // const char* - // char* - // const wchar_t* - // wchar_t* - template - bool MatchAndExplain(CharType* s, MatchResultListener* listener) const { - return s != NULL && MatchAndExplain(StringType(s), listener); - } - - // Matches anything that can convert to StringType. - // - // This is a template, not just a plain function with const StringType&, - // because absl::string_view has some interfering non-explicit constructors. - template - bool MatchAndExplain(const MatcheeStringType& s, - MatchResultListener* /* listener */) const { - const StringType& s2(s); - return s2.find(substring_) != StringType::npos; - } - - // Describes what this matcher matches. - void DescribeTo(::std::ostream* os) const { - *os << "has substring "; - UniversalPrint(substring_, os); - } - - void DescribeNegationTo(::std::ostream* os) const { - *os << "has no substring "; - UniversalPrint(substring_, os); - } - - private: - const StringType substring_; - - GTEST_DISALLOW_ASSIGN_(HasSubstrMatcher); -}; - -// Implements the polymorphic StartsWith(substring) matcher, which -// can be used as a Matcher as long as T can be converted to a -// string. -template -class StartsWithMatcher { - public: - explicit StartsWithMatcher(const StringType& prefix) : prefix_(prefix) { - } - -#if GTEST_HAS_ABSL - bool MatchAndExplain(const absl::string_view& s, - MatchResultListener* listener) const { - if (s.data() == NULL) { - return false; - } - // This should fail to compile if absl::string_view is used with wide - // strings. - const StringType& str = string(s); - return MatchAndExplain(str, listener); - } -#endif // GTEST_HAS_ABSL - - // Accepts pointer types, particularly: - // const char* - // char* - // const wchar_t* - // wchar_t* - template - bool MatchAndExplain(CharType* s, MatchResultListener* listener) const { - return s != NULL && MatchAndExplain(StringType(s), listener); - } - - // Matches anything that can convert to StringType. - // - // This is a template, not just a plain function with const StringType&, - // because absl::string_view has some interfering non-explicit constructors. - template - bool MatchAndExplain(const MatcheeStringType& s, - MatchResultListener* /* listener */) const { - const StringType& s2(s); - return s2.length() >= prefix_.length() && - s2.substr(0, prefix_.length()) == prefix_; - } - - void DescribeTo(::std::ostream* os) const { - *os << "starts with "; - UniversalPrint(prefix_, os); - } - - void DescribeNegationTo(::std::ostream* os) const { - *os << "doesn't start with "; - UniversalPrint(prefix_, os); - } - - private: - const StringType prefix_; - - GTEST_DISALLOW_ASSIGN_(StartsWithMatcher); -}; - -// Implements the polymorphic EndsWith(substring) matcher, which -// can be used as a Matcher as long as T can be converted to a -// string. -template -class EndsWithMatcher { - public: - explicit EndsWithMatcher(const StringType& suffix) : suffix_(suffix) {} - -#if GTEST_HAS_ABSL - bool MatchAndExplain(const absl::string_view& s, - MatchResultListener* listener) const { - if (s.data() == NULL) { - return false; - } - // This should fail to compile if absl::string_view is used with wide - // strings. - const StringType& str = string(s); - return MatchAndExplain(str, listener); - } -#endif // GTEST_HAS_ABSL - - // Accepts pointer types, particularly: - // const char* - // char* - // const wchar_t* - // wchar_t* - template - bool MatchAndExplain(CharType* s, MatchResultListener* listener) const { - return s != NULL && MatchAndExplain(StringType(s), listener); - } - - // Matches anything that can convert to StringType. - // - // This is a template, not just a plain function with const StringType&, - // because absl::string_view has some interfering non-explicit constructors. - template - bool MatchAndExplain(const MatcheeStringType& s, - MatchResultListener* /* listener */) const { - const StringType& s2(s); - return s2.length() >= suffix_.length() && - s2.substr(s2.length() - suffix_.length()) == suffix_; - } - - void DescribeTo(::std::ostream* os) const { - *os << "ends with "; - UniversalPrint(suffix_, os); - } - - void DescribeNegationTo(::std::ostream* os) const { - *os << "doesn't end with "; - UniversalPrint(suffix_, os); - } - - private: - const StringType suffix_; - - GTEST_DISALLOW_ASSIGN_(EndsWithMatcher); -}; - -// Implements polymorphic matchers MatchesRegex(regex) and -// ContainsRegex(regex), which can be used as a Matcher as long as -// T can be converted to a string. -class MatchesRegexMatcher { - public: - MatchesRegexMatcher(const RE* regex, bool full_match) - : regex_(regex), full_match_(full_match) {} - -#if GTEST_HAS_ABSL - bool MatchAndExplain(const absl::string_view& s, - MatchResultListener* listener) const { - return s.data() && MatchAndExplain(string(s), listener); - } -#endif // GTEST_HAS_ABSL - - // Accepts pointer types, particularly: - // const char* - // char* - // const wchar_t* - // wchar_t* - template - bool MatchAndExplain(CharType* s, MatchResultListener* listener) const { - return s != NULL && MatchAndExplain(std::string(s), listener); - } - - // Matches anything that can convert to std::string. - // - // This is a template, not just a plain function with const std::string&, - // because absl::string_view has some interfering non-explicit constructors. - template - bool MatchAndExplain(const MatcheeStringType& s, - MatchResultListener* /* listener */) const { - const std::string& s2(s); - return full_match_ ? RE::FullMatch(s2, *regex_) : - RE::PartialMatch(s2, *regex_); - } - - void DescribeTo(::std::ostream* os) const { - *os << (full_match_ ? "matches" : "contains") - << " regular expression "; - UniversalPrinter::Print(regex_->pattern(), os); - } - - void DescribeNegationTo(::std::ostream* os) const { - *os << "doesn't " << (full_match_ ? "match" : "contain") - << " regular expression "; - UniversalPrinter::Print(regex_->pattern(), os); - } - - private: - const internal::linked_ptr regex_; - const bool full_match_; - - GTEST_DISALLOW_ASSIGN_(MatchesRegexMatcher); -}; - -// Implements a matcher that compares the two fields of a 2-tuple -// using one of the ==, <=, <, etc, operators. The two fields being -// compared don't have to have the same type. -// -// The matcher defined here is polymorphic (for example, Eq() can be -// used to match a tuple, a tuple, -// etc). Therefore we use a template type conversion operator in the -// implementation. -template -class PairMatchBase { - public: - template - operator Matcher< ::testing::tuple >() const { - return MakeMatcher(new Impl< ::testing::tuple >); - } - template - operator Matcher&>() const { - return MakeMatcher(new Impl&>); - } - - private: - static ::std::ostream& GetDesc(::std::ostream& os) { // NOLINT - return os << D::Desc(); - } - - template - class Impl : public MatcherInterface { - public: - virtual bool MatchAndExplain( - Tuple args, - MatchResultListener* /* listener */) const { - return Op()(::testing::get<0>(args), ::testing::get<1>(args)); - } - virtual void DescribeTo(::std::ostream* os) const { - *os << "are " << GetDesc; - } - virtual void DescribeNegationTo(::std::ostream* os) const { - *os << "aren't " << GetDesc; - } - }; -}; - -class Eq2Matcher : public PairMatchBase { - public: - static const char* Desc() { return "an equal pair"; } -}; -class Ne2Matcher : public PairMatchBase { - public: - static const char* Desc() { return "an unequal pair"; } -}; -class Lt2Matcher : public PairMatchBase { - public: - static const char* Desc() { return "a pair where the first < the second"; } -}; -class Gt2Matcher : public PairMatchBase { - public: - static const char* Desc() { return "a pair where the first > the second"; } -}; -class Le2Matcher : public PairMatchBase { - public: - static const char* Desc() { return "a pair where the first <= the second"; } -}; -class Ge2Matcher : public PairMatchBase { - public: - static const char* Desc() { return "a pair where the first >= the second"; } -}; - -// Implements the Not(...) matcher for a particular argument type T. -// We do not nest it inside the NotMatcher class template, as that -// will prevent different instantiations of NotMatcher from sharing -// the same NotMatcherImpl class. -template -class NotMatcherImpl : public MatcherInterface { - public: - explicit NotMatcherImpl(const Matcher& matcher) - : matcher_(matcher) {} - - virtual bool MatchAndExplain(GTEST_REFERENCE_TO_CONST_(T) x, - MatchResultListener* listener) const { - return !matcher_.MatchAndExplain(x, listener); - } - - virtual void DescribeTo(::std::ostream* os) const { - matcher_.DescribeNegationTo(os); - } - - virtual void DescribeNegationTo(::std::ostream* os) const { - matcher_.DescribeTo(os); - } - - private: - const Matcher matcher_; - - GTEST_DISALLOW_ASSIGN_(NotMatcherImpl); -}; - -// Implements the Not(m) matcher, which matches a value that doesn't -// match matcher m. -template -class NotMatcher { - public: - explicit NotMatcher(InnerMatcher matcher) : matcher_(matcher) {} - - // This template type conversion operator allows Not(m) to be used - // to match any type m can match. - template - operator Matcher() const { - return Matcher(new NotMatcherImpl(SafeMatcherCast(matcher_))); - } - - private: - InnerMatcher matcher_; - - GTEST_DISALLOW_ASSIGN_(NotMatcher); -}; - -// Implements the AllOf(m1, m2) matcher for a particular argument type -// T. We do not nest it inside the BothOfMatcher class template, as -// that will prevent different instantiations of BothOfMatcher from -// sharing the same BothOfMatcherImpl class. -template -class AllOfMatcherImpl - : public MatcherInterface { - public: - explicit AllOfMatcherImpl(std::vector > matchers) - : matchers_(internal::move(matchers)) {} - - virtual void DescribeTo(::std::ostream* os) const { - *os << "("; - for (size_t i = 0; i < matchers_.size(); ++i) { - if (i != 0) *os << ") and ("; - matchers_[i].DescribeTo(os); - } - *os << ")"; - } - - virtual void DescribeNegationTo(::std::ostream* os) const { - *os << "("; - for (size_t i = 0; i < matchers_.size(); ++i) { - if (i != 0) *os << ") or ("; - matchers_[i].DescribeNegationTo(os); - } - *os << ")"; - } - - virtual bool MatchAndExplain(GTEST_REFERENCE_TO_CONST_(T) x, - MatchResultListener* listener) const { - // If either matcher1_ or matcher2_ doesn't match x, we only need - // to explain why one of them fails. - std::string all_match_result; - - for (size_t i = 0; i < matchers_.size(); ++i) { - StringMatchResultListener slistener; - if (matchers_[i].MatchAndExplain(x, &slistener)) { - if (all_match_result.empty()) { - all_match_result = slistener.str(); - } else { - std::string result = slistener.str(); - if (!result.empty()) { - all_match_result += ", and "; - all_match_result += result; - } - } - } else { - *listener << slistener.str(); - return false; - } - } - - // Otherwise we need to explain why *both* of them match. - *listener << all_match_result; - return true; - } - - private: - const std::vector > matchers_; - - GTEST_DISALLOW_ASSIGN_(AllOfMatcherImpl); -}; - -#if GTEST_LANG_CXX11 -// VariadicMatcher is used for the variadic implementation of -// AllOf(m_1, m_2, ...) and AnyOf(m_1, m_2, ...). -// CombiningMatcher is used to recursively combine the provided matchers -// (of type Args...). -template