correct zone tests

tests/geometry/test_zone.py

@@ -9,27 +9,29 @@ from core import constants
 from core.geometry import gzone
 
 
+
 class Test(unittest.TestCase):
     """ test the zone algorithm """
 
+
     def test_hex_zone(self):
         """ test the zone algo for hexagonal grid """
         geometry = constants.HEX
-        self.assertEqual( gzone.zone( geometry, 3, 3, 0 ), [(3,3)])
-        self.assertEqual( gzone.zone( geometry, 3, 3, 1 ), [(3, 2), (2, 3), (3, 3), (4, 3), (4, 4), (3, 4), (2, 4)])
-        self.assertEqual( gzone.zone( geometry, 3, 3, 2 ), [(3, 2), (1, 3), (5, 4), (4, 5), (1, 4), (2, 3), (4, 2), \
+        self.assertCountEqual( gzone.zone( geometry, 3, 3, 0 ), [(3,3)])
+        self.assertCountEqual( gzone.zone( geometry, 3, 3, 1 ), [(3, 2), (2, 3), (3, 3), (4, 3), (4, 4), (3, 4), (2, 4)])
+        self.assertCountEqual( gzone.zone( geometry, 3, 3, 2 ), [(3, 2), (1, 3), (5, 4), (4, 5), (1, 4), (2, 3), (4, 2), \
                                                             (2, 5), (5, 3), (1, 2), (3, 5), (3, 3), (4, 4), (3, 1), \
                                                             (4, 3), (2, 2), (3, 4), (2, 4), (5, 2)] )
 
     def test_squ_zone(self):
         """ test the zone algo for square grid """
         geometry = constants.SQUARE
-        self.assertEqual( gzone.zone( geometry, 3, 3, 0 ), [(3,3)])
-        self.assertEqual( gzone.zone( geometry, 3, 3, 1 ), [(3, 2), (3, 3), (4, 4), (2, 3), (4, 3), (2, 2), (4, 2), (3, 4), (2, 4)])
-        self.assertEqual( gzone.zone( geometry, 3, 3, 2 ), [(2, 4), (3, 2), (5, 4), (1, 3), (4, 5), (2, 1), (1, 4), (2, 3), (4, 2), \
-                                                            (5, 1), (2, 5), (3, 5), (5, 3), (1, 2), (3, 3), (5, 5), (4, 4), (3, 1), \
-                                                            (1, 5), (4, 3), (2, 2), (4, 1), (5, 2), (3, 4), (1, 1)])
-        
+        self.assertCountEqual( gzone.zone( geometry, 3, 3, 0 ), [(3,3)])
+        self.assertCountEqual( gzone.zone( geometry, 3, 3, 1 ), [(3, 2), (3, 3), (4, 4), (2, 3), (4, 3), (2, 2), (4, 2), (3, 4), (2, 4)])
+        self.assertCountEqual( gzone.zone( geometry, 3, 3, 2 ), [(2, 4), (3, 2), (5, 4), (1, 3), (4, 5), (2, 1), (1, 4), (2, 3), (4, 2), \
+                                                                    (5, 1), (2, 5), (3, 5), (5, 3), (1, 2), (3, 3), (5, 5), (4, 4), (3, 1), \
+                                                                    (1, 5), (4, 3), (2, 2), (4, 1), (5, 2), (3, 4), (1, 1)])
+
     def test_errors(self):
         """test the errors due to bad parameters"""
         self.assertRaises( TypeError, gzone.zone, 5, 0, 0, "a")

tests/test_grid.py

@@ -94,7 +94,7 @@ class Test(unittest.TestCase):
         
         grid = HexGrid(10,10)
         zone = grid.zone( 0, 0, 0 )
-        self.assertEqual(zone, [(0,0)])
+        self.assertCountEqual(zone, [(0,0)])
 
 
 if __name__ == "__main__":