Merge branch 'master' of git+ssh://ctpug.org.za/naja

[naja.git] / naja / tests / test_player.py

diff --git a/naja/tests/test_player.py b/naja/tests/test_player.py
index 48b2ef8fa9af7cf7202b0c3cbe23bdb813279d93..d2b896e402b3983c6b594d5e3c12c24f0304b482 100644 (file)
--- a/naja/tests/test_player.py
+++ b/naja/tests/test_player.py
@@ -1,6 +1,6 @@
 from unittest import TestCase
 
-from naja.constants import NORTH, SOUTH, CYAN, MSB
+from naja.constants import BITS
 from naja.player import PlayerBits
 
 
@@ -23,63 +23,64 @@ class TestPlayerBits(TestCase):
 
     def test_check_bit(self):
         bits = PlayerBits(0x01)
-        self.assertEqual(bits.check_bit(NORTH), True)
-        self.assertEqual(bits.check_bit(SOUTH), False)
+        self.assertEqual(bits.check_bit(BITS.NORTH), True)
+        self.assertEqual(bits.check_bit(BITS.SOUTH), False)
 
     def test_set_bit(self):
         bits = PlayerBits(0x00)
         self.assertEqual(bits._bits, 0x00)
-        bits.set_bit(NORTH)
+        bits.set_bit(BITS.NORTH)
         self.assertEqual(bits._bits, 0x01)
-        bits.set_bit(NORTH)
+        bits.set_bit(BITS.NORTH)
         self.assertEqual(bits._bits, 0x01)
 
     def test_clear_bit(self):
         bits = PlayerBits(0x01)
         self.assertEqual(bits._bits, 0x01)
-        bits.clear_bit(NORTH)
+        bits.clear_bit(BITS.NORTH)
         self.assertEqual(bits._bits, 0x00)
-        bits.clear_bit(NORTH)
+        bits.clear_bit(BITS.NORTH)
         self.assertEqual(bits._bits, 0x00)
 
     def test_toggle_bit(self):
         bits = PlayerBits(0x00)
         self.assertEqual(bits._bits, 0x00)
-        bits.toggle_bit(NORTH)
+        bits.toggle_bit(BITS.NORTH)
         self.assertEqual(bits._bits, 0x01)
-        bits.toggle_bit(NORTH)
+        bits.toggle_bit(BITS.NORTH)
         self.assertEqual(bits._bits, 0x00)
 
     def test_check_bits(self):
         bits = PlayerBits(0x03)
-        self.assertEqual(bits.check_bits(NORTH), True)
-        self.assertEqual(bits.check_bits(NORTH, SOUTH), True)
-        self.assertEqual(bits.check_bits(CYAN), False)
-        self.assertEqual(bits.check_bits(CYAN, MSB), False)
-        self.assertEqual(bits.check_bits(NORTH, SOUTH, CYAN), False)
+        self.assertEqual(bits.check_bits([BITS.NORTH]), True)
+        self.assertEqual(bits.check_bits([BITS.NORTH, BITS.SOUTH]), True)
+        self.assertEqual(bits.check_bits([BITS.CYAN]), False)
+        self.assertEqual(bits.check_bits([BITS.CYAN, BITS.MSB]), False)
+        self.assertEqual(
+            bits.check_bits([BITS.NORTH, BITS.SOUTH, BITS.CYAN]), False)
 
     def test_set_bits(self):
         bits = PlayerBits(0x03)
         self.assertEqual(bits._bits, 0x03)
-        bits.set_bits(NORTH, CYAN)
+        bits.set_bits([BITS.NORTH, BITS.CYAN])
         self.assertEqual(bits._bits, 0x13)
-        bits.set_bits(NORTH, CYAN, MSB)
+        bits.set_bits([BITS.NORTH, BITS.CYAN, BITS.MSB])
         self.assertEqual(bits._bits, 0x93)
 
     def test_clear_bits(self):
         bits = PlayerBits(0x03)
         self.assertEqual(bits._bits, 0x03)
-        bits.clear_bits(NORTH, CYAN)
+        bits.clear_bits([BITS.NORTH, BITS.CYAN])
         self.assertEqual(bits._bits, 0x02)
-        bits.clear_bits(NORTH, CYAN, MSB)
+        bits.clear_bits([BITS.NORTH, BITS.CYAN, BITS.MSB])
         self.assertEqual(bits._bits, 0x02)
 
     def test_toggle_bits(self):
         bits = PlayerBits(0x03)
         self.assertEqual(bits._bits, 0x03)
-        bits.toggle_bits(NORTH, CYAN)
+        bits.toggle_bits([BITS.NORTH, BITS.CYAN])
         self.assertEqual(bits._bits, 0x12)
-        bits.toggle_bits(NORTH, CYAN)
+        bits.toggle_bits([BITS.NORTH, BITS.CYAN])
         self.assertEqual(bits._bits, 0x03)
-        bits.toggle_bits(NORTH, CYAN, MSB)
+        bits.toggle_bits([BITS.NORTH, BITS.CYAN, BITS.MSB])
         self.assertEqual(bits._bits, 0x92)