diff --git a/modules/gapi/test/gapi_transform_tests.cpp b/modules/gapi/test/gapi_transform_tests.cpp index 832d32143a..01492e56df 100644 --- a/modules/gapi/test/gapi_transform_tests.cpp +++ b/modules/gapi/test/gapi_transform_tests.cpp @@ -166,50 +166,30 @@ TEST(KernelPackageTransform, gmat_gsc_garray_in_gmat2_out) namespace { - template - typename std::enable_if<(cv::detail::GTypeTraits::kind == cv::detail::ArgKind::GARRAY), void>::type - array_check(const cv::GComputation::Priv &p) + template + typename std::enable_if<(cv::detail::GTypeTraits::kind == cv::detail::ArgKind::GARRAY), void>::type + arg_check(const cv::GProtoArg &arg) { - EXPECT_TRUE(ProtoContainsT(p.m_ins[0])); + EXPECT_TRUE(ProtoContainsT(arg)); + EXPECT_TRUE(cv::util::get(arg).holds()); + EXPECT_FALSE(cv::util::get(arg).holds()); + } - EXPECT_TRUE(ProtoContainsT(p.m_outs[0])); - EXPECT_TRUE(cv::util::get(p.m_outs[0]).holds()); - EXPECT_FALSE(cv::util::get(p.m_outs[0]).holds()); + template + typename std::enable_if<(cv::detail::GTypeTraits::kind != cv::detail::ArgKind::GARRAY), void>::type + arg_check(const cv::GProtoArg &arg) + { + EXPECT_TRUE(ProtoContainsT(arg)); } template - typename std::enable_if<(cv::detail::GTypeTraits::kind == cv::detail::ArgKind::GARRAY), void>::type - array_check(const cv::GComputation::Priv &p) - { - EXPECT_TRUE(ProtoContainsT(p.m_outs[0])); - - EXPECT_TRUE(ProtoContainsT(p.m_ins[0])); - EXPECT_TRUE(cv::util::get(p.m_ins[0]).holds()); - EXPECT_FALSE(cv::util::get(p.m_ins[0]).holds()); - } - - template - typename std::enable_if<(cv::detail::GTypeTraits::kind == cv::detail::ArgKind::GARRAY || - cv::detail::GTypeTraits::kind == cv::detail::ArgKind::GARRAY), void>::type - args_check(const cv::GComputation &comp) + void args_check(const cv::GComputation &comp) { const auto &p = comp.priv(); EXPECT_EQ(1u, p.m_ins.size()); EXPECT_EQ(1u, p.m_outs.size()); - - array_check(p); - }; - - template - typename std::enable_if<(cv::detail::GTypeTraits::kind != cv::detail::ArgKind::GARRAY && - cv::detail::GTypeTraits::kind != cv::detail::ArgKind::GARRAY), void>::type - args_check(const cv::GComputation &comp) - { - const auto &p = comp.priv(); - EXPECT_EQ(1u, p.m_ins.size()); - EXPECT_EQ(1u, p.m_outs.size()); - EXPECT_TRUE(ProtoContainsT(p.m_ins[0])); - EXPECT_TRUE(ProtoContainsT(p.m_outs[0])); + arg_check(p.m_ins[0]); + arg_check(p.m_outs[0]); } } // anonymous namespace