Skip to content

GAPI: Align EXPECT/ASSERT macros #20922

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
merged 3 commits into from
Oct 29, 2021
Merged

GAPI: Align EXPECT/ASSERT macros #20922

merged 3 commits into from
Oct 29, 2021

Conversation

alexgiving
Copy link
Member

@alexgiving alexgiving commented Oct 21, 2021 •
edited
Loading

Follow one way of TEST style
EXPECT_EQ(reference, result);

Reference: https://github.com/opencv/opencv/blob/4.0.0/modules/ts/include/opencv2/ts/ts_gtest.h#L8196-L8200

GTEST_API_ AssertionResult EqFailure(const char* expected_expression,
                                     const char* actual_expression,
                                     const std::string& expected_value,
                                     const std::string& actual_value,
                                     bool ignoring_case);

Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

  • I agree to contribute to the project under Apache 2 License.
  • To the best of my knowledge, the proposed patch is not based on a code under GPL or other license that is incompatible with OpenCV
  • The PR is proposed to proper branch
  • There is reference to original bug report and related work
  • There is accuracy test, performance test and test data in opencv_extra repository, if applicable
    Patch to opencv_extra has the same branch name.
  • The feature is well documented and sample code can be built with the project CMake

Build configuration

force_builders=Custom,Custom Win,Custom Mac
build_gapi_standalone:Linux x64=ade-0.1.1f
build_gapi_standalone:Win64=ade-0.1.1f
build_gapi_standalone:Mac=ade-0.1.1f
build_gapi_standalone:Linux x64 Debug=ade-0.1.1f

Xbuild_image:Custom=centos:7
Xbuildworker:Custom=linux-1
build_gapi_standalone:Custom=ade-0.1.1f

build_image:Custom=ubuntu-openvino-2021.4.1:20.04
build_image:Custom Win=openvino-2021.2.0
build_image:Custom Mac=openvino-2021.2.0

test_modules:Custom=gapi,python2,python3,java
test_modules:Custom Win=gapi,python2,python3,java
test_modules:Custom Mac=gapi,python2,python3,java

buildworker:Custom=linux-1
# disabled due high memory usage: test_opencl:Custom=ON
test_opencl:Custom=OFF
test_bigdata:Custom=1
test_filter:Custom=*

@alexgiving alexgiving force-pushed the atrutnev/align_expect_assert_macros branch from dc7dffb to 547253f Compare October 21, 2021 18:51
@dbudniko
Copy link

LGTM. @alalek please merge when pre-commit will be "green"

@alexgiving
Copy link
Member Author

@alalek

LGTM. @alalek please merge when pre-commit will be "green"

@alexgiving alexgiving requested a review from dbudniko October 29, 2021 16:17
@alalek alalek merged commit 6a73e5a into opencv:master Oct 29, 2021
@alalek alalek mentioned this pull request Dec 30, 2021
Merged
@alalek alalek mentioned this pull request Feb 22, 2022
Merged
a-sajjad72 pushed a commit to a-sajjad72/opencv that referenced this pull request Mar 30, 2023
Merge pull request opencv#20922 from alexgiving:atrutnev/align_expect…
bdc4750 
…_assert_macros

GAPI: Align EXPECT/ASSERT macros

* Align TEST macros

* restart CI

* Fix ASSERT_GT in gapi_async_test
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@alalek alalek alalek approved these changes

@dbudniko dbudniko Awaiting requested review from dbudniko

Assignees

@alalek alalek

Labels
category: g-api / gapi test
Projects
None yet
Milestone
4.5.5
Development

Successfully merging this pull request may close these issues.
3 participants
@alexgiving @dbudniko @alalek