ts: refactor OpenCV tests
- removed tr1 usage (dropped in C++17) - moved includes of vector/map/iostream/limits into ts.hpp - require opencv_test + anonymous namespace (added compile check) - fixed norm() usage (must be from cvtest::norm for checks) and other conflict functions - added missing license headers
This commit is contained in:
@@ -41,6 +41,8 @@
|
||||
|
||||
#include "test_precomp.hpp"
|
||||
|
||||
namespace opencv_test { namespace {
|
||||
|
||||
#ifdef GTEST_CAN_COMPARE_NULL
|
||||
# define EXPECT_NULL(ptr) EXPECT_EQ(NULL, ptr)
|
||||
#else
|
||||
@@ -366,6 +368,8 @@ TEST(Core_Ptr, make)
|
||||
EXPECT_TRUE(deleted);
|
||||
}
|
||||
|
||||
}} // namespace
|
||||
|
||||
namespace {
|
||||
|
||||
struct SpeciallyDeletable
|
||||
@@ -385,6 +389,8 @@ void DefaultDeleter<SpeciallyDeletable>::operator()(SpeciallyDeletable * obj) co
|
||||
|
||||
}
|
||||
|
||||
namespace opencv_test { namespace {
|
||||
|
||||
TEST(Core_Ptr, specialized_deleter)
|
||||
{
|
||||
SpeciallyDeletable sd;
|
||||
@@ -393,3 +399,5 @@ TEST(Core_Ptr, specialized_deleter)
|
||||
|
||||
ASSERT_TRUE(sd.deleted);
|
||||
}
|
||||
|
||||
}} // namespace
|
||||
|
||||
Reference in New Issue
Block a user