mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-08 01:53:19 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #24302 from dkurt:ts_setup_skip

Browse Source 
Skip test cases in case of SkipTestException in SetUp
This commit is contained in:
Alexander Smorkalov 2023-09-21 12:41:08 +03:00 committed by GitHub
commit b51a78d439
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
modules/core/test/test_misc.cpp
View File

@ -930,4 +930,15 @@ TEST_F(TestFixtureSkip, NoBodyRun) {
FAIL() << "Unreachable code called"; FAIL() << "Unreachable code called";
} }
// Expected that SkipTestException thrown in SetUp method should skip test but not fail
struct TestSetUpSkip: public ::testing::Test {
virtual void SetUp() CV_OVERRIDE {
throw SkipTestException("Skip test at SetUp");
}
};
TEST_F(TestSetUpSkip, NoBodyRun) {
FAIL() << "Unreachable code called";
}
}} // namespace }} // namespace

21
modules/ts/include/opencv2/ts/ts_ext.hpp
View File

@ -31,6 +31,8 @@ bool checkBigDataTests();
#define CV__TEST_INIT \ #define CV__TEST_INIT \
CV__TEST_NAMESPACE_CHECK \ CV__TEST_NAMESPACE_CHECK \
if (setUpSkipped) \
return; \
::cvtest::testSetUp(); ::cvtest::testSetUp();
#define CV__TEST_CLEANUP ::cvtest::testTearDown(); #define CV__TEST_CLEANUP ::cvtest::testTearDown();
#define CV__TEST_BODY_IMPL(name) \ #define CV__TEST_BODY_IMPL(name) \
@ -47,6 +49,16 @@ bool checkBigDataTests();
} \ } \
} \ } \
#define CV__TEST_SETUP_IMPL(parent_class) { \
setUpSkipped = false; \
try { \
parent_class::SetUp(); \
} catch (const cvtest::details::SkipTestExceptionBase& e) { \
setUpSkipped = true; \
printf("[ SKIP ] %s\n", e.what()); \
} \
} \
struct SkipThisTest : public ::testing::Test { struct SkipThisTest : public ::testing::Test {
SkipThisTest(const std::string& msg_) : msg(msg_) {} SkipThisTest(const std::string& msg_) : msg(msg_) {}
@ -63,8 +75,10 @@ struct SkipThisTest : public ::testing::Test {
public:\ public:\
GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\ GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {}\
private:\ private:\
bool setUpSkipped = false; \
virtual void TestBody() CV_OVERRIDE;\ virtual void TestBody() CV_OVERRIDE;\
virtual void bodyMethodName() BODY_ATTR;\ virtual void bodyMethodName() BODY_ATTR;\
virtual void SetUp() CV_OVERRIDE; \
static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;\ static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;\
GTEST_DISALLOW_COPY_AND_ASSIGN_(\ GTEST_DISALLOW_COPY_AND_ASSIGN_(\
GTEST_TEST_CLASS_NAME_(test_case_name, test_name));\ GTEST_TEST_CLASS_NAME_(test_case_name, test_name));\
@ -90,6 +104,7 @@ struct SkipThisTest : public ::testing::Test {
parent_class::TearDownTestCase, \ parent_class::TearDownTestCase, \
new test_case_name##test_name##_factory);\ new test_case_name##test_name##_factory);\
void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody() BODY_IMPL( #test_case_name "_" #test_name ) \ void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody() BODY_IMPL( #test_case_name "_" #test_name ) \
void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::SetUp() CV__TEST_SETUP_IMPL(parent_class) \
void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::bodyMethodName() void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::bodyMethodName()
#define TEST(test_case_name, test_name) TEST_(test_case_name, test_name, ::testing::Test, Body,, CV__TEST_BODY_IMPL) #define TEST(test_case_name, test_name) TEST_(test_case_name, test_name, ::testing::Test, Body,, CV__TEST_BODY_IMPL)
@ -125,8 +140,10 @@ struct SkipThisTest : public ::testing::Test {
public:\ public:\
GTEST_TEST_CLASS_NAME_(test_fixture, test_name)() {}\ GTEST_TEST_CLASS_NAME_(test_fixture, test_name)() {}\
private:\ private:\
bool setUpSkipped = false; \
virtual void TestBody() CV_OVERRIDE;\ virtual void TestBody() CV_OVERRIDE;\
virtual void Body(); \ virtual void Body(); \
virtual void SetUp() CV_OVERRIDE; \
static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;\ static ::testing::TestInfo* const test_info_ GTEST_ATTRIBUTE_UNUSED_;\
GTEST_DISALLOW_COPY_AND_ASSIGN_(\ GTEST_DISALLOW_COPY_AND_ASSIGN_(\
GTEST_TEST_CLASS_NAME_(test_fixture, test_name));\ GTEST_TEST_CLASS_NAME_(test_fixture, test_name));\
@ -152,6 +169,7 @@ struct SkipThisTest : public ::testing::Test {
test_fixture::TearDownTestCase, \ test_fixture::TearDownTestCase, \
new test_fixture##test_name##_factory);\ new test_fixture##test_name##_factory);\
void GTEST_TEST_CLASS_NAME_(test_fixture, test_name)::TestBody() CV__TEST_BODY_IMPL( #test_fixture "_" #test_name ) \ void GTEST_TEST_CLASS_NAME_(test_fixture, test_name)::TestBody() CV__TEST_BODY_IMPL( #test_fixture "_" #test_name ) \
void GTEST_TEST_CLASS_NAME_(test_fixture, test_name)::SetUp() CV__TEST_SETUP_IMPL(test_fixture) \
void GTEST_TEST_CLASS_NAME_(test_fixture, test_name)::Body() void GTEST_TEST_CLASS_NAME_(test_fixture, test_name)::Body()
// Don't use directly // Don't use directly
@ -161,8 +179,10 @@ struct SkipThisTest : public ::testing::Test {
public: \ public: \
GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \ GTEST_TEST_CLASS_NAME_(test_case_name, test_name)() {} \
private: \ private: \
bool setUpSkipped = false; \
virtual void bodyMethodName() BODY_ATTR; \ virtual void bodyMethodName() BODY_ATTR; \
virtual void TestBody() CV_OVERRIDE; \ virtual void TestBody() CV_OVERRIDE; \
virtual void SetUp() CV_OVERRIDE; \
static int AddToRegistry() { \ static int AddToRegistry() { \
::testing::UnitTest::GetInstance()->parameterized_test_registry(). \ ::testing::UnitTest::GetInstance()->parameterized_test_registry(). \
GetTestCasePatternHolder<test_case_name>(\ GetTestCasePatternHolder<test_case_name>(\
@ -184,6 +204,7 @@ struct SkipThisTest : public ::testing::Test {
test_name)::gtest_registering_dummy_ = \ test_name)::gtest_registering_dummy_ = \
GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \ GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::AddToRegistry(); \
void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody() BODY_IMPL( #test_case_name "_" #test_name ) \ void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::TestBody() BODY_IMPL( #test_case_name "_" #test_name ) \
void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::SetUp() CV__TEST_SETUP_IMPL(test_case_name) \
void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::bodyMethodName() void GTEST_TEST_CLASS_NAME_(test_case_name, test_name)::bodyMethodName()
#undef TEST_P #undef TEST_P