Skip to content

Commit a0c6eb6

Browse files
sbalandisbalandi
authored
Move gtest assert to ov_assert (openvinotoolkit#24933)
### Details: - *item1* - *...* ### Tickets: - *CVS-136937*
1 parent c89db83 commit a0c6eb6

File tree

173 files changed

+1162
-1126
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

173 files changed

+1162
-1126
lines changed

‎src/common/low_precision_transformations/tests/transformations_after_split_transformation.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ TEST_P(TransformationsAfterSplitTransformation, Run) {
176176
SimpleLowPrecisionTransformer transformer;
177177
getTransformerWithTransformationByName(transformer, params, layerName);
178178

179-
ASSERT_NO_THROW(transformer.transform(model));
179+
OV_ASSERT_NO_THROW(transformer.transform(model));
180180
}
181181

182182
const std::vector<std::string> transformationNames = {

‎src/common/snippets/tests/src/lowering_utils.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ void LoweringTests::TearDown() {
8282
model_ref = cloned_model;
8383
}
8484
manager.run_passes(model);
85-
ASSERT_NO_THROW(check_rt_info(model));
85+
OV_ASSERT_NO_THROW(check_rt_info(model));
8686

8787
if (comparator.should_compare(FunctionsComparator::ACCURACY)) {
8888
auto acc_comparator = FunctionsComparator::no_default();

‎src/common/transformations/tests/common_optimizations/conv_to_binary_conv.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ TEST(TransformationTests, ConvToBinaryConvOutputLowZeroOutputHighOne) {
4747
m.register_pass<ov::pass::ConvToBinaryConv>();
4848
m.register_pass<ov::pass::ConstantFolding>();
4949
m.run_passes(f);
50-
ASSERT_NO_THROW(check_rt_info(f));
50+
OV_ASSERT_NO_THROW(check_rt_info(f));
5151
}
5252

5353
{
@@ -106,7 +106,7 @@ TEST(TransformationTests, ConvToBinaryConvOutputLowMinusOneOutputHighOne) {
106106
m.register_pass<ov::pass::ConvToBinaryConv>();
107107
m.register_pass<ov::pass::ConstantFolding>();
108108
m.run_passes(f);
109-
ASSERT_NO_THROW(check_rt_info(f));
109+
OV_ASSERT_NO_THROW(check_rt_info(f));
110110
}
111111

112112
{
@@ -163,7 +163,7 @@ TEST(TransformationTests, NegativeConvToBinaryConvInvalidWeights) {
163163
m.register_pass<ov::pass::ConvToBinaryConv>();
164164
m.register_pass<ov::pass::ConstantFolding>();
165165
m.run_passes(f);
166-
ASSERT_NO_THROW(check_rt_info(f));
166+
OV_ASSERT_NO_THROW(check_rt_info(f));
167167
}
168168

169169
{
@@ -216,7 +216,7 @@ TEST(TransformationTests, NegativeConvToBinaryConvInvalidLevels) {
216216
m.register_pass<ov::pass::ConvToBinaryConv>();
217217
m.register_pass<ov::pass::ConstantFolding>();
218218
m.run_passes(f);
219-
ASSERT_NO_THROW(check_rt_info(f));
219+
OV_ASSERT_NO_THROW(check_rt_info(f));
220220
}
221221

222222
{
@@ -269,7 +269,7 @@ TEST(TransformationTests, NegativeConvToBinaryConvOutputLowHigh) {
269269
m.register_pass<ov::pass::ConvToBinaryConv>();
270270
m.register_pass<ov::pass::ConstantFolding>();
271271
m.run_passes(f);
272-
ASSERT_NO_THROW(check_rt_info(f));
272+
OV_ASSERT_NO_THROW(check_rt_info(f));
273273
}
274274

275275
{

‎src/common/transformations/tests/common_optimizations/convert_compression_only_to_legacy_test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ TEST(TransformationTests, ConvertCompressionOnlyToLegacy) {
4242
manager.register_pass<ov::pass::InitNodeInfo>();
4343
manager.register_pass<ov::pass::ConvertCompressedOnlyToLegacy>();
4444
manager.run_passes(f);
45-
ASSERT_NO_THROW(check_rt_info(f));
45+
OV_ASSERT_NO_THROW(check_rt_info(f));
4646
}
4747

4848
{
@@ -86,7 +86,7 @@ TEST(TransformationTests, ConvertCompressionOnlyToLegacyNoConvertion) {
8686
manager.register_pass<ov::pass::InitNodeInfo>();
8787
manager.register_pass<ov::pass::ConvertCompressedOnlyToLegacy>();
8888
manager.run_passes(f);
89-
ASSERT_NO_THROW(check_rt_info(f));
89+
OV_ASSERT_NO_THROW(check_rt_info(f));
9090
}
9191

9292
{

‎src/common/transformations/tests/common_optimizations/convert_convertlike.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ TEST(TransformationTests, ConvertConvertLike) {
3333
m.register_pass<ov::pass::InitNodeInfo>();
3434
m.register_pass<ov::pass::ConvertConvertLike>();
3535
m.run_passes(f);
36-
ASSERT_NO_THROW(check_rt_info(f));
36+
OV_ASSERT_NO_THROW(check_rt_info(f));
3737
}
3838

3939
{
@@ -62,7 +62,7 @@ TEST(TransformationTests, ConvertConvertLike2) {
6262
m.register_pass<ov::pass::InitNodeInfo>();
6363
m.register_pass<ov::pass::ConvertConvertLike>();
6464
m.run_passes(f);
65-
ASSERT_NO_THROW(check_rt_info(f));
65+
OV_ASSERT_NO_THROW(check_rt_info(f));
6666
}
6767

6868
{
@@ -89,7 +89,7 @@ TEST(TransformationTests, ConvertConvertLike_Negative) {
8989
m.register_pass<ov::pass::InitNodeInfo>();
9090
m.register_pass<ov::pass::ConvertConvertLike>();
9191
m.run_passes(f);
92-
ASSERT_NO_THROW(check_rt_info(f));
92+
OV_ASSERT_NO_THROW(check_rt_info(f));
9393
}
9494

9595
{

‎src/common/transformations/tests/common_optimizations/convert_nms_gather_path_to_unsigned_test.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ TEST(TransformationTests, test_convert_to_unsigned_nms_gather_3) {
202202
manager.register_pass<ov::pass::InitNodeInfo>();
203203
manager.register_pass<ov::pass::ConvertNmsGatherPathToUnsigned>();
204204
manager.run_passes(f);
205-
ASSERT_NO_THROW(check_rt_info(f));
205+
OV_ASSERT_NO_THROW(check_rt_info(f));
206206
ASSERT_EQ(count_ops_of_type<ov::op::v0::Convert>(f), 0);
207207
}
208208

@@ -260,7 +260,7 @@ TEST(TransformationTests, test_convert_to_unsigned_nms_gather_with_if_condition)
260260
manager.register_pass<pass::InitNodeInfo>();
261261
manager.register_pass<pass::ConvertNmsGatherPathToUnsigned>();
262262
manager.run_passes(f);
263-
ASSERT_NO_THROW(check_rt_info(f));
263+
OV_ASSERT_NO_THROW(check_rt_info(f));
264264

265265
const auto& ops = f->get_ops();
266266
const auto& gather_it = find(ops.begin(), ops.end(), target_gather);

‎src/common/transformations/tests/common_optimizations/convert_quantize_dequantize.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ void positive_test(const Shape& data_shape,
8383
m.register_pass<ov::pass::ConstantFolding>();
8484
m.run_passes(f);
8585

86-
ASSERT_NO_THROW(check_rt_info(f));
86+
OV_ASSERT_NO_THROW(check_rt_info(f));
8787
}
8888

8989
{
@@ -229,7 +229,7 @@ void negative_test(const Shape& data_shape,
229229
m.register_pass<ov::pass::InitNodeInfo>();
230230
m.register_pass<ov::pass::ConvertQuantizeDequantize>();
231231
m.run_passes(f);
232-
ASSERT_NO_THROW(check_rt_info(f));
232+
OV_ASSERT_NO_THROW(check_rt_info(f));
233233
}
234234

235235
{

‎src/common/transformations/tests/common_optimizations/dimension_tracking.cpp

+9-9
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_Transpose_and_Convolution) {
8383
m.register_pass<ov::pass::InitNodeInfo>();
8484
m.register_pass<ov::pass::FindBatch>();
8585
m.run_passes(f);
86-
ASSERT_NO_THROW(check_rt_info(f));
86+
OV_ASSERT_NO_THROW(check_rt_info(f));
8787

8888
const auto& shape = data->get_partial_shape();
8989
ASSERT_TRUE(!shape[0].get_symbol()) << shape;
@@ -118,7 +118,7 @@ TEST(TransformationTests, AutoBatch_LabelPropagation_Convolution_Reshape) {
118118
m.register_pass<ov::pass::InitNodeInfo>();
119119
m.register_pass<ov::pass::FindBatch>();
120120
m.run_passes(model);
121-
ASSERT_NO_THROW(check_rt_info(model));
121+
OV_ASSERT_NO_THROW(check_rt_info(model));
122122

123123
const auto& shape = data->get_partial_shape();
124124
ASSERT_TRUE(shape[0].get_symbol()) << shape;
@@ -144,7 +144,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_SingleMultiply) {
144144
m.register_pass<ov::pass::InitNodeInfo>();
145145
m.register_pass<ov::pass::FindBatch>();
146146
m.run_passes(f);
147-
ASSERT_NO_THROW(check_rt_info(f));
147+
OV_ASSERT_NO_THROW(check_rt_info(f));
148148

149149
const auto& shape = data->get_partial_shape();
150150
ASSERT_TRUE(shape[0].get_symbol()) << shape;
@@ -174,7 +174,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_Two_Outputs) {
174174
m.register_pass<ov::pass::InitNodeInfo>();
175175
m.register_pass<ov::pass::FindBatch>();
176176
m.run_passes(f);
177-
ASSERT_NO_THROW(check_rt_info(f));
177+
OV_ASSERT_NO_THROW(check_rt_info(f));
178178

179179
const auto& shape = data->get_partial_shape();
180180
ASSERT_TRUE(shape[0].get_symbol()) << shape;
@@ -204,7 +204,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_TwoOutputsReversed) {
204204
m.register_pass<ov::pass::InitNodeInfo>();
205205
m.register_pass<ov::pass::FindBatch>();
206206
m.run_passes(f);
207-
ASSERT_NO_THROW(check_rt_info(f));
207+
OV_ASSERT_NO_THROW(check_rt_info(f));
208208

209209
const auto& shape = data->get_partial_shape();
210210
ASSERT_TRUE(shape[0].get_symbol()) << shape;
@@ -238,7 +238,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_IndependentBranchesConcated) {
238238
m.register_pass<ov::pass::InitNodeInfo>();
239239
m.register_pass<ov::pass::FindBatch>();
240240
m.run_passes(f);
241-
ASSERT_NO_THROW(check_rt_info(f));
241+
OV_ASSERT_NO_THROW(check_rt_info(f));
242242

243243
const auto& shape = data->get_partial_shape();
244244
ASSERT_TRUE(shape[0].get_symbol()) << shape;
@@ -271,7 +271,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_TwoConvNetwork) {
271271
m.register_pass<ov::pass::InitNodeInfo>();
272272
m.register_pass<ov::pass::FindBatch>();
273273
m.run_passes(f);
274-
ASSERT_NO_THROW(check_rt_info(f));
274+
OV_ASSERT_NO_THROW(check_rt_info(f));
275275

276276
const auto& shape = data->get_partial_shape();
277277
ASSERT_TRUE(shape[0].get_symbol()) << shape;
@@ -299,7 +299,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_NegativeTracking) {
299299
m.register_pass<ov::pass::InitNodeInfo>();
300300
m.register_pass<ov::pass::FindBatch>(false, false);
301301
m.run_passes(f);
302-
ASSERT_NO_THROW(check_rt_info(f));
302+
OV_ASSERT_NO_THROW(check_rt_info(f));
303303

304304
const auto& shape = data->get_partial_shape();
305305
ASSERT_TRUE(shape[0].get_symbol()) << shape;
@@ -319,7 +319,7 @@ TEST(TransformationTests, AutoBatch_FindBatch_AutoBatch_LabelPropagation_DO_deta
319319
m.register_pass<ov::pass::InitNodeInfo>();
320320
m.register_pass<ov::pass::FindBatch>(true);
321321
m.run_passes(f);
322-
ASSERT_NO_THROW(check_rt_info(f));
322+
OV_ASSERT_NO_THROW(check_rt_info(f));
323323

324324
const auto& shape = data->get_partial_shape();
325325
ASSERT_TRUE(shape[0].get_symbol()) << shape;

‎src/common/transformations/tests/common_optimizations/divide_fusion.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ TEST(TransformationTests, DivideFusion) {
3434
m.register_pass<ov::pass::InitNodeInfo>();
3535
m.register_pass<ov::pass::DivideFusion>();
3636
m.run_passes(f);
37-
ASSERT_NO_THROW(check_rt_info(f));
37+
OV_ASSERT_NO_THROW(check_rt_info(f));
3838
}
3939

4040
{
@@ -67,7 +67,7 @@ TEST(TransformationTests, DivideFusionNegative) {
6767
m.register_pass<ov::pass::InitNodeInfo>();
6868
m.register_pass<ov::pass::DivideFusion>();
6969
m.run_passes(f);
70-
ASSERT_NO_THROW(check_rt_info(f));
70+
OV_ASSERT_NO_THROW(check_rt_info(f));
7171
}
7272

7373
{

‎src/common/transformations/tests/common_optimizations/fq_mul_fusion_test.cpp

+7-7
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ TEST_P(FQMulFusion, ExpectFusion) {
7777
manager.register_pass<ov::pass::CheckUniqueNames>(unh);
7878

7979
manager.run_passes(m_model);
80-
ASSERT_NO_THROW(check_rt_info(m_model));
80+
OV_ASSERT_NO_THROW(check_rt_info(m_model));
8181

8282
auto fc =
8383
FunctionsComparator::no_default().enable(FunctionsComparator::PRECISIONS).enable(FunctionsComparator::NODES);
@@ -219,7 +219,7 @@ TEST(FQMulFusion_NonConstInputs, AllInputsNonConst) {
219219
manager.register_pass<ov::pass::FakeQuantizeMulFusion>();
220220

221221
manager.run_passes(model);
222-
ASSERT_NO_THROW(check_rt_info(model));
222+
OV_ASSERT_NO_THROW(check_rt_info(model));
223223

224224
const auto res = compare_functions(model, expected_function);
225225
ASSERT_TRUE(res.first) << res.second;
@@ -253,7 +253,7 @@ TEST(FQMulFusion_NonConstInputs, FQ_out_high_const) {
253253
manager.register_pass<ov::pass::FakeQuantizeMulFusion>();
254254

255255
manager.run_passes(model);
256-
ASSERT_NO_THROW(check_rt_info(model));
256+
OV_ASSERT_NO_THROW(check_rt_info(model));
257257

258258
const auto res = compare_functions(model, expected_function);
259259
ASSERT_TRUE(res.first) << res.second;
@@ -286,7 +286,7 @@ TEST(FQMulFusion_FQ_Mul_inputs, FQ_out_to_mul_input_2) {
286286
manager.register_pass<ov::pass::FakeQuantizeMulFusion>();
287287

288288
manager.run_passes(model);
289-
ASSERT_NO_THROW(check_rt_info(model));
289+
OV_ASSERT_NO_THROW(check_rt_info(model));
290290

291291
const auto res = compare_functions(model, expected_function);
292292
ASSERT_TRUE(res.first) << res.second;
@@ -320,7 +320,7 @@ TEST(FQMulFusion_FQ_Mul_inputs, FQ_out_to_mul_input_2_param) {
320320
manager.register_pass<ov::pass::FakeQuantizeMulFusion>();
321321

322322
manager.run_passes(model);
323-
ASSERT_NO_THROW(check_rt_info(model));
323+
OV_ASSERT_NO_THROW(check_rt_info(model));
324324

325325
const auto res = compare_functions(model, expected_function);
326326
ASSERT_TRUE(res.first) << res.second;
@@ -346,7 +346,7 @@ TEST(TransformationTests, FakeQuantizeMultiplyFusionNegative) {
346346
manager.register_pass<ov::pass::FakeQuantizeMulFusion>();
347347

348348
manager.run_passes(model);
349-
ASSERT_NO_THROW(check_rt_info(model));
349+
OV_ASSERT_NO_THROW(check_rt_info(model));
350350

351351
ASSERT_EQ(model->get_output_shape(0), Shape({1, 300, 16}));
352352
}
@@ -379,7 +379,7 @@ TEST(TransformationTests, FakeQuantizeMultiplyFusionMulConstWithEqualValues) {
379379
manager.register_pass<ov::pass::FakeQuantizeMulFusion>();
380380

381381
manager.run_passes(model);
382-
ASSERT_NO_THROW(check_rt_info(model));
382+
OV_ASSERT_NO_THROW(check_rt_info(model));
383383

384384
const auto res = compare_functions(model, expected_function, true);
385385
ASSERT_TRUE(res.first) << res.second;

‎src/common/transformations/tests/common_optimizations/fq_reshape_fusion.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ TEST_P(FQReshapeFusionTests, ReshapeMatMul) {
122122
manager.register_pass<ov::pass::CheckUniqueNames>(unh);
123123

124124
manager.run_passes(f);
125-
ASSERT_NO_THROW(check_rt_info(f));
125+
OV_ASSERT_NO_THROW(check_rt_info(f));
126126

127127
auto fc =
128128
FunctionsComparator::no_default().enable(FunctionsComparator::PRECISIONS).enable(FunctionsComparator::NODES);

‎src/common/transformations/tests/common_optimizations/fused_names_cleanup.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ TEST(TransformationTests, FusedNamesCleanup) {
3333
manager.register_pass<ov::pass::InitNodeInfo>();
3434
manager.register_pass<ov::pass::ConstantFolding>();
3535
manager.run_passes(model);
36-
ASSERT_NO_THROW(check_rt_info(model));
36+
OV_ASSERT_NO_THROW(check_rt_info(model));
3737

3838
manager.register_pass<ov::pass::FusedNamesCleanup>();
3939
manager.run_passes(model);

‎src/common/transformations/tests/common_optimizations/low_latency_v2_test.cpp

+8-8
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ TEST(TransformationTests, LowLatency2_LSTM) {
100100
manager.register_pass<ov::pass::InitNodeInfo>();
101101
manager.register_pass<ov::pass::LowLatency2>();
102102
manager.run_passes(f);
103-
ASSERT_NO_THROW(check_rt_info(f));
103+
OV_ASSERT_NO_THROW(check_rt_info(f));
104104
}
105105
{
106106
auto Xi = std::make_shared<Parameter>(element::f32, Shape{1, 1, 16});
@@ -188,7 +188,7 @@ TEST(TransformationTests, LowLatency2_GRU) {
188188

189189
manager.run_passes(f);
190190

191-
ASSERT_NO_THROW(check_rt_info(f));
191+
OV_ASSERT_NO_THROW(check_rt_info(f));
192192
}
193193
{
194194
auto Xi = std::make_shared<Parameter>(element::f32, Shape{1, 1, 16});
@@ -269,7 +269,7 @@ TEST(TransformationTests, LowLatency2_RNN) {
269269

270270
manager.run_passes(f);
271271

272-
ASSERT_NO_THROW(check_rt_info(f));
272+
OV_ASSERT_NO_THROW(check_rt_info(f));
273273
}
274274
{
275275
auto Xi = std::make_shared<Parameter>(element::f32, Shape{1, 1, 16});
@@ -346,7 +346,7 @@ TEST(TransformationTests, LowLatency2_LSTMReshape) {
346346
manager.register_pass<ov::pass::LowLatency2>();
347347

348348
manager.run_passes(f);
349-
ASSERT_NO_THROW(check_rt_info(f));
349+
OV_ASSERT_NO_THROW(check_rt_info(f));
350350
}
351351
{
352352
auto Xi = std::make_shared<Parameter>(element::f32, Shape{1, 1, 16});
@@ -431,7 +431,7 @@ TEST(TransformationTests, LowLatency2_LSTM_Loop) {
431431
manager.register_pass<ov::pass::LowLatency2>();
432432

433433
manager.run_passes(f);
434-
ASSERT_NO_THROW(check_rt_info(f));
434+
OV_ASSERT_NO_THROW(check_rt_info(f));
435435
}
436436
{
437437
auto Xi = std::make_shared<Parameter>(element::f32, Shape{1, 1, 16});
@@ -510,7 +510,7 @@ TEST(TransformationTests, LowLatency2_LSTM_several_iterations) {
510510
manager.register_pass<ov::pass::LowLatency2>();
511511

512512
manager.run_passes(f);
513-
ASSERT_NO_THROW(check_rt_info(f));
513+
OV_ASSERT_NO_THROW(check_rt_info(f));
514514
}
515515

516516
// TensorIterator not unrolled.
@@ -625,7 +625,7 @@ TEST(TransformationTests, LowLatency2_LSTM_Loop_Reshape) {
625625
manager.register_pass<ov::pass::LowLatency2>();
626626

627627
manager.run_passes(f);
628-
ASSERT_NO_THROW(check_rt_info(f));
628+
OV_ASSERT_NO_THROW(check_rt_info(f));
629629
}
630630
{
631631
auto Xi = std::make_shared<Parameter>(element::f32, Shape{1, 1, 16});
@@ -706,7 +706,7 @@ TEST(TransformationTests, LowLatency2_LSTM_Loop_several_iterations) {
706706
manager.register_pass<ov::pass::LowLatency2>(true);
707707

708708
manager.run_passes(f);
709-
ASSERT_NO_THROW(check_rt_info(f));
709+
OV_ASSERT_NO_THROW(check_rt_info(f));
710710
}
711711
{
712712
auto X = std::make_shared<Parameter>(element::f32, Shape{10, 1, 16});

0 commit comments

Comments
 (0)