diff --git a/modules/dnn/test/test_layers_1d.cpp b/modules/dnn/test/test_layers_1d.cpp index abcb8412697b..8b3f4a58eaeb 100644 --- a/modules/dnn/test/test_layers_1d.cpp +++ b/modules/dnn/test/test_layers_1d.cpp @@ -42,7 +42,7 @@ TEST_P(Layer_1d_Test, Scale) cv::Mat output_ref = input.mul(weight); runLayer(layer, inputs, outputs); - ASSERT_EQ(1, outputs.size()); + ASSERT_EQ(outputs.size(), 1); ASSERT_EQ(shape(outputs[0]), shape(output_ref)); normAssert(output_ref, outputs[0]); } @@ -82,7 +82,7 @@ TEST_P(Layer_Gather_1d_Test, Accuracy) { std::vector outputs; runLayer(layer, inputs, outputs); - ASSERT_EQ(1, outputs.size()); + ASSERT_EQ(outputs.size(), 1); ASSERT_EQ(shape(outputs[0]), shape(output_ref)); normAssert(output_ref, outputs[0]); } @@ -130,7 +130,7 @@ TEST_P(Layer_Arg_1d_Test, Accuracy) { std::vector outputs; runLayer(layer, inputs, outputs); - ASSERT_EQ(1, outputs.size()); + ASSERT_EQ(outputs.size(), 1); ASSERT_EQ(shape(outputs[0]), shape(output_ref)); normAssert(output_ref, outputs[0]); } @@ -179,7 +179,7 @@ TEST_P(Layer_NaryElemwise_1d_Test, Accuracy) { runLayer(layer, inputs, outputs); if (!output_ref.empty()) { - ASSERT_EQ(1, outputs.size()); + ASSERT_EQ(outputs.size(), 1); ASSERT_EQ(shape(outputs[0]), shape(output_ref)); normAssert(output_ref, outputs[0]); } else { @@ -236,7 +236,7 @@ TEST_P(Layer_Elemwise_1d_Test, Accuracy) { runLayer(layer, inputs, outputs); if (!output_ref.empty()) { - ASSERT_EQ(1, outputs.size()); + ASSERT_EQ(outputs.size(), 1); ASSERT_EQ(shape(outputs[0]), shape(output_ref)); normAssert(output_ref, outputs[0]); } else { @@ -271,7 +271,7 @@ TEST(Layer_Reshape_Test, Accuracy_1D) std::vector outputs; runLayer(layer, inputs, outputs); - ASSERT_EQ(1, outputs.size()); + ASSERT_EQ(outputs.size(), 1); ASSERT_EQ(shape(outputs[0]), shape(output_ref)); normAssert(output_ref, outputs[0]); } @@ -296,10 +296,10 @@ TEST_P(Layer_Split_Test, Accuracy_01D) std::vector inputs{input}; std::vector outputs; runLayer(layer, inputs, outputs); - ASSERT_EQ(top_count, outputs.size()); + ASSERT_EQ(outputs.size(), top_count); for (int i = 0; i < top_count; i++) { - ASSERT_EQ(shape(output_ref), shape(outputs[i])); + ASSERT_EQ(shape(outputs[i]), shape(output_ref)); normAssert(output_ref, outputs[i]); } } @@ -336,7 +336,7 @@ TEST_P(Layer_Expand_Test, Accuracy_ND) { std::vector outputs; runLayer(layer, inputs, outputs); - ASSERT_EQ(1, outputs.size()); + ASSERT_EQ(outputs.size(), 1); ASSERT_EQ(shape(outputs[0]), shape(output_ref)); normAssert(output_ref, outputs[0]); } @@ -379,7 +379,7 @@ TEST_P(Layer_Concat_Test, Accuracy_01D) std::vector outputs; runLayer(layer, inputs, outputs); - ASSERT_EQ(1, outputs.size()); + ASSERT_EQ(outputs.size(), 1); ASSERT_EQ(shape(outputs[0]), shape(output_ref)); normAssert(output_ref, outputs[0]); } @@ -419,7 +419,7 @@ TEST_P(Layer_Softmax_Test, Accuracy_01D) { std::vector inputs{input}; std::vector outputs; runLayer(layer, inputs, outputs); - ASSERT_EQ(1, outputs.size()); + ASSERT_EQ(outputs.size(), 1); ASSERT_EQ(shape(outputs[0]), shape(output_ref)); normAssert(output_ref, outputs[0]); } @@ -477,7 +477,7 @@ TEST_P(Layer_Scatter_Test, Accuracy1D) { std::vector inputs{output, indices_mat, input}; std::vector outputs; runLayer(layer, inputs, outputs); - ASSERT_EQ(1, outputs.size()); + ASSERT_EQ(outputs.size(), 1); ASSERT_EQ(shape(outputs[0]), shape(output_ref)); normAssert(output_ref, outputs[0]); } @@ -510,7 +510,7 @@ TEST_P(Layer_Permute_Test, Accuracy_01D) std::vector outputs; runLayer(layer, inputs, outputs); - ASSERT_EQ(1, outputs.size()); + ASSERT_EQ(outputs.size(), 1); ASSERT_EQ(shape(outputs[0]), shape(output_ref)); normAssert(output_ref, outputs[0]); } @@ -564,9 +564,9 @@ TEST_P(Layer_Slice_Test, Accuracy_1D){ std::vector inputs{input}; std::vector outputs; runLayer(layer, inputs, outputs); - ASSERT_EQ(splits, outputs.size()); + ASSERT_EQ(outputs.size(), splits); for (int i = 0; i < splits; ++i){ - ASSERT_EQ(shape(output_refs[i]), shape(outputs[i])); + ASSERT_EQ(shape(outputs[i]), shape(output_refs[i])); normAssert(output_refs[i], outputs[i]); } } @@ -603,7 +603,7 @@ TEST_P(Layer_FullyConnected_Test, Accuracy_01D) std::vector inputs{input}; std::vector outputs; runLayer(layer, inputs, outputs); - ASSERT_EQ(1, outputs.size()); + ASSERT_EQ(outputs.size(), 1); ASSERT_EQ(shape(outputs[0]), shape(output_ref)); normAssert(output_ref, outputs[0]); } @@ -649,7 +649,7 @@ TEST_P(Layer_BatchNorm_Test, Accuracy_01D) cv::sqrt(varMat + 1e-5, varMat); output_ref = (output_ref - meanMat) / varMat; - ASSERT_EQ(1, outputs.size()); + ASSERT_EQ(outputs.size(), 1); ASSERT_EQ(shape(outputs[0]), shape(output_ref)); normAssert(output_ref, outputs[0]); @@ -682,7 +682,7 @@ TEST_P(Layer_Const_Test, Accuracy_01D) std::vector inputs; // No inputs are needed for a ConstLayer std::vector outputs; runLayer(layer, inputs, outputs); - ASSERT_EQ(1, outputs.size()); + ASSERT_EQ(outputs.size(), 1); ASSERT_EQ(shape(outputs[0]), shape(output_ref)); normAssert(output_ref, outputs[0]); }