feat: update test

Author: phillychi3

dglabv3/__init__.py

@@ -1,4 +1,3 @@
 from .dglab import dglabv3  # noqa: F401
-from .dtype import Channel, StrengthType, Button  # noqa: F401
+from .dtype import Channel, StrengthType, Button, Strength  # noqa: F401
 from .waves import PULSES, ALL_PULSES, Pulse  # noqa: F401
-from .wsmessage import Strength  # noqa: F401

dglabv3/dglab.py

@@ -13,8 +13,9 @@
     StrengthMode,
     MessageType,
     ChannelStrength,
+    Strength
 )
-from dglabv3.wsmessage import Strength, WSMessage, WStype
+from dglabv3.wsmessage import WSMessage, WStype
 from dglabv3.event import EventEmitter
 
 logging.basicConfig(level=logging.DEBUG)

dglabv3/dtype.py

@@ -1,7 +1,6 @@
 from enum import Enum, IntEnum, StrEnum
 from typing import Final
 from dataclasses import dataclass, field
-from dglabv3.wsmessage import Strength
 
 __all__ = ["ChannelStrength", "StrengthType", "StrengthMode", "MessageType", "Channel"]
 
@@ -16,6 +15,14 @@ class Channel(IntEnum):
 MIN_STRENGTH: Final[int] = 0
 
 
+@dataclass
+class Strength:
+    A: int
+    B: int
+    MAXA: int
+    MAXB: int
+
+
 @dataclass
 class ChannelStrength:
     _A: int = field(default=0, init=False)
@@ -40,7 +47,7 @@ def MAX_A(self):
     @A.setter
     def A(self, value):
         if value > self.MAX_A:
-            raise ValueError(f"stronge is greater than {self.MAX_A}")
+            raise ValueError(f"stronger A cannot be greater than {self.MAX_A}")
         if value < MIN_STRENGTH:
             raise ValueError("stronger A cannot be less than 0")
         self._A = value
@@ -62,7 +69,7 @@ def MAX_B(self):
     @B.setter
     def B(self, value):
         if value > self.MAX_B:
-            raise ValueError(f"stronger is greater than {self.MAX_B}")
+            raise ValueError(f"stronger B cannot be greater than {self.MAX_B}")
         if value < MIN_STRENGTH:
             raise ValueError("stronger B cannot be less than 0")
         self._B = value

dglabv3/wsmessage.py

@@ -1,7 +1,6 @@
-from dataclasses import dataclass
 from enum import Enum
 from typing import Optional
-from dglabv3.dtype import Button
+from dglabv3.dtype import Button, Strength
 
 
 class WStype(Enum):
@@ -12,12 +11,7 @@ class WStype(Enum):
     ERROR = "error"
 
 
-@dataclass
-class Strength:
-    A: int
-    B: int
-    MAXA: int
-    MAXB: int
+
 
 
 class WSMessage:

tests/test_dtype.py

@@ -1,26 +1,26 @@
 import pytest
-
-from dglabv3.dtype import (
-    ChannelStrength,
-    Channel,
-    StrengthType,
-    StrengthMode,
-    MessageType,
-)
+import random
+from dglabv3.dtype import ChannelStrength, Channel, StrengthType, StrengthMode, MessageType, Button
 
 
 def test_channel_strength_initialization():
     cs = ChannelStrength()
     assert cs.A == 0
     assert cs.B == 0
+    assert cs.MAX_A == 200
+    assert cs.MAX_B == 200
 
 
 def test_channel_strength_set_valid_values():
     cs = ChannelStrength()
     cs.A = 100
     cs.B = 150
+    cs.MAX_A = 160
+    cs.MAX_B = 160
     assert cs.A == 100
     assert cs.B == 150
+    assert cs.MAX_A == 160
+    assert cs.MAX_B == 160
 
 
 def test_channel_strength_set_invalid_values():
@@ -35,6 +35,26 @@ def test_channel_strength_set_invalid_values():
         cs.B = -1
 
 
+def test_channel_strength_set_invalid_max_values():
+    cs = ChannelStrength()
+    with pytest.raises(ValueError, match="MAX_A cannot be less than 0"):
+        cs.MAX_A = -1
+    with pytest.raises(ValueError, match="MAX_B cannot be less than 0"):
+        cs.MAX_B = -1
+
+
+def test_channel_strength_set_random_values():
+    cs = ChannelStrength()
+    maxa = random.randint(50, 200)
+    maxb = random.randint(50, 200)
+    cs.MAX_A = maxa
+    cs.MAX_B = maxb
+    with pytest.raises(ValueError, match=f"stronger A cannot be greater than {maxa}"):
+        cs.A = maxa + 1
+    with pytest.raises(ValueError, match=f"stronger B cannot be greater than {maxb}"):
+        cs.B = maxb + 1
+
+
 def test_channel_enum():
     assert Channel.A == 1
     assert Channel.B == 2
@@ -55,8 +75,17 @@ def test_strength_mode_enum():
 
 
 def test_message_type_enum():
-    assert MessageType.SET_CHANNEL == "set channel"
     assert MessageType.HEARTBEAT == "heartbeat"
+    assert MessageType.SET_CHANNEL == "set channel"
     assert MessageType.BIND == "bind"
     assert MessageType.CLIENT_MSG == "clientMsg"
     assert MessageType.MSG == "msg"
+
+
+def test_button():
+    assert Button.button_1 == "1"
+    assert Button.button_2 == "2"
+    assert Button.button_3 == "3"
+    assert Button.button_4 == "4"
+    assert Button.button_5 == "5"
+    assert Button.button_6 == "6"