fix: test for return argument

Author: edmBernard

tests/cpp/test.cpp

@@ -145,7 +145,7 @@ cv::Mat cloneimg(cv::Mat image) {
 class ClassForReturn {
 public:
   ClassForReturn() {
-    m_image = cv::Mat(2, 2, CV_8UC3, cv::Scalar(1,2,3));
+    m_image = generateMatrix();
   }
 
   cv::Mat& returnByRef() { return m_image; };
@@ -160,7 +160,7 @@ class ClassForReturn {
   void returnInArgumentByPointer(cv::Mat* image) {};
 
   void changeInternal() {
-    m_image.at<cv::Vec3b>(0, 0) = cv::Vec3b(4,5,6);
+    m_image.at<cv::Vec3w>(0, 0) = cv::Vec3w(4,5,6);
   }
 
 private:

tests/test_return.py

@@ -2,37 +2,43 @@
 from tests import test_module as tm
 from tests.utils import generate_matrix, check_matrix_content
 
+
 def test_return_by_value():
   a = tm.ClassForReturn()
-  assert(id(a.returnByValue()) != id(a.returnByValue()))
   mat = a.returnByValue()
   a.changeInternal()
-  assert(np.any(mat != a.returnByValue()))
+  assert(check_matrix_content(mat))
+  changed_mat = a.returnByValue()
+  assert(not check_matrix_content(changed_mat))
 
 
 def test_return_by_ref_but_copy():
   a = tm.ClassForReturn()
-  assert(id(a.returnByRef()) != id(a.returnByRef()))
   mat = a.returnByRef()
   a.changeInternal()
-  assert(np.any(mat != a.returnByValue()))
+  assert(check_matrix_content(mat))
+  changed_mat = a.returnByValue()
+  assert(not check_matrix_content(changed_mat))
 
 
 def test_return_by_ref():
   a = tm.ClassForReturn()
-  assert(id(a.returnByRef()) != id(a.returnByRef()))
   mat = a.viewMatrix()
   a.changeInternal()
-  assert(np.all(mat == a.returnByValue()))
+  # Currently return parameter perform a copy of the data, so the change is not repercuted to mat
+  assert(check_matrix_content(mat))
+  changed_mat = a.returnByValue()
+  assert(not check_matrix_content(changed_mat))
 
 
 def test_return_by_pointer():
   a = tm.ClassForReturn()
-  assert(id(a.returnByPointer()) != id(a.returnByPointer()))
   mat = a.returnByPointer()
   a.changeInternal()
-  assert(np.all(mat == a.returnByValue()))
-
+  # Currently return parameter perform a copy of the data, so the change is not repercuted to mat
+  assert(check_matrix_content(mat))
+  changed_mat = a.returnByValue()
+  assert(not check_matrix_content(changed_mat))
 
 
 def test_return_by_argument_by_value():