From 253a4c113e207748843d7aa4c8d68c8efa444f54 Mon Sep 17 00:00:00 2001 From: Vadim Levin Date: Tue, 13 Dec 2022 19:14:52 +0300 Subject: [PATCH] fix: remove function duplicates in test_misc.py --- modules/python/test/test_misc.py | 38 +++++++++----------------------- 1 file changed, 10 insertions(+), 28 deletions(-) diff --git a/modules/python/test/test_misc.py b/modules/python/test/test_misc.py index ec56585ace..b5c8c936d4 100644 --- a/modules/python/test/test_misc.py +++ b/modules/python/test/test_misc.py @@ -628,35 +628,14 @@ class Arguments(NewOpenCVTests): msg="Classes from submodules and global module don't refer " "to the same type") - def test_inner_class_has_global_alias(self): - self.assertTrue(hasattr(cv.SimpleBlobDetector, "Params"), - msg="Class is not registered as inner class") - self.assertEqual(cv.SimpleBlobDetector.Params, cv.SimpleBlobDetector_Params, - msg="Inner class and class in global module don't refer " - "to the same type") - self.assertTrue(hasattr(cv, "SimpleBlobDetector_Params"), - msg="Inner class doesn't have alias in the global module") - - def test_class_from_submodule_has_global_alias(self): - self.assertTrue(hasattr(cv.ml, "Boost"), - msg="Class is not registered in the submodule") - self.assertTrue(hasattr(cv, "ml_Boost"), - msg="Class from submodule doesn't have alias in the " - "global module") - self.assertEqual(cv.ml.Boost, cv.ml_Boost, - msg="Classes from submodules and global module don't refer " - "to the same type") - def test_inner_class_has_global_alias(self): self.assertTrue(hasattr(cv.SimpleBlobDetector, "Params"), msg="Class is not registered as inner class") self.assertTrue(hasattr(cv, "SimpleBlobDetector_Params"), msg="Inner class doesn't have alias in the global module") self.assertEqual(cv.SimpleBlobDetector.Params, cv.SimpleBlobDetector_Params, - msg="Inner class and class in global module don't refer " - "to the same type") - self.assertTrue(hasattr(cv, "SimpleBlobDetector_Params"), - msg="Inner class doesn't have alias in the global module") + msg="Inner class and class in global module don't refer " + "to the same type") def test_export_class_with_different_name(self): self.assertTrue(hasattr(cv.utils.nested, "ExportClassName"), @@ -677,7 +656,8 @@ class Arguments(NewOpenCVTests): def test_export_inner_class_of_class_exported_with_different_name(self): if not hasattr(cv.utils.nested, "ExportClassName"): - raise unittest.SkipTest("Outer class with export alias is not registered in the submodule") + raise unittest.SkipTest( + "Outer class with export alias is not registered in the submodule") self.assertTrue(hasattr(cv.utils.nested.ExportClassName, "Params"), msg="Inner class with export alias is not registered in " @@ -695,13 +675,15 @@ class Arguments(NewOpenCVTests): self.assertEqual( params.int_value, instance.getIntParam(), msg="Class initialized with wrong integer parameter. Expected: {}. Actual: {}".format( - params.int_value, instance.getIntParam() - )) + params.int_value, instance.getIntParam() + ) + ) self.assertEqual( params.float_value, instance.getFloatParam(), msg="Class initialized with wrong integer parameter. Expected: {}. Actual: {}".format( - params.float_value, instance.getFloatParam() - )) + params.float_value, instance.getFloatParam() + ) + ) class SamplesFindFile(NewOpenCVTests):