From 147f3e473bbd0e35cbe754baea329c6b5cb7c2d2 Mon Sep 17 00:00:00 2001
From: Théo de la Hogue
Date: Wed, 29 Mar 2023 10:03:39 +0200
Subject: Making ArUcoBoard as dataclass.

---
 src/argaze.test/ArUcoMarkers/ArUcoBoard.py | 31 +++++++-----------------------
 1 file changed, 7 insertions(+), 24 deletions(-)

(limited to 'src/argaze.test')

diff --git a/src/argaze.test/ArUcoMarkers/ArUcoBoard.py b/src/argaze.test/ArUcoMarkers/ArUcoBoard.py
index 2c0e3da..65562ad 100644
--- a/src/argaze.test/ArUcoMarkers/ArUcoBoard.py
+++ b/src/argaze.test/ArUcoMarkers/ArUcoBoard.py
@@ -10,41 +10,24 @@ import numpy
 class TestArUcoBoardClass(unittest.TestCase):
     """Test ArUcoBoard class."""
 
-    def test_new_from_dictionary_string(self):
-        """Test ArUcoBoard creation using a dictionary string."""
+    def test_new(self):
+        """Test ArUcoBoard creation using a dictionary instance."""
 
-        # Check ArUco board creation
         columns = 4
         rows = 3
         square_size = 2 
         marker_size = 1
 
-        aruco_board = ArUcoBoard.ArUcoBoard(columns, rows, square_size, marker_size, 'DICT_ARUCO_ORIGINAL')
-
-        # Check ArUco board
-        self.assertIsNone(numpy.testing.assert_array_equal(aruco_board.identifiers, [i for i in range(int((columns*rows)/2))]))
-        self.assertIsNone(numpy.testing.assert_array_equal(aruco_board.size, [columns, rows]))
-        self.assertEqual(aruco_board.markers_number, int((columns*rows)/2))
-        self.assertEqual(aruco_board.corners_number, (columns-1)*(rows-1))
-
-    def test_new_from_dictionary_instance(self):
-        """Test ArUcoBoard creation using a dictionary instance."""
-
         # Check ArUco board creation
         aruco_dictionary = ArUcoMarkersDictionary.ArUcoMarkersDictionary('DICT_APRILTAG_16h5')
-        aruco_board = ArUcoBoard.ArUcoBoard(4, 3, 2, 1, aruco_dictionary)
+        aruco_board = ArUcoBoard.ArUcoBoard(columns, rows, square_size, marker_size, aruco_dictionary)
 
         # Check ArUco board dictionary name
         self.assertEqual(aruco_board.dictionary.name, 'DICT_APRILTAG_16h5')
-
-    def test_new_with_no_dictionary(self):
-        """Test ArUcoBoard creation using a dictionary instance."""
-
-        # Check ArUco board creation
-        aruco_board = ArUcoBoard.ArUcoBoard(4, 3, 2, 1)
-
-        # Check ArUco board dictionary name
-        self.assertEqual(aruco_board.dictionary.name, 'DICT_ARUCO_ORIGINAL')
+        self.assertIsNone(numpy.testing.assert_array_equal(aruco_board.identifiers, [i for i in range(int((columns*rows)/2))]))
+        self.assertIsNone(numpy.testing.assert_array_equal(aruco_board.size, [columns, rows]))
+        self.assertEqual(aruco_board.markers_number, int((columns*rows)/2))
+        self.assertEqual(aruco_board.corners_number, (columns-1)*(rows-1))
 
 if __name__ == '__main__':
 
-- 
cgit v1.1