Improve tests

Signed-off-by: Nicolai Buchwitz <nb@tipi-net.de>

Author: nbuchwitz

tests/helper.py

@@ -8,9 +8,9 @@
 parentdir = os.path.dirname(currentdir)
 sys.path.append(parentdir)
 
-from uhubctl import *
+import uhubctl
 
-class MockHub(Hub):
+class MockHub(uhubctl.Hub):
     def __init__(self, path: str, num_ports: int = 5) -> None:
         self.path = path
         self.num_ports = num_ports
@@ -30,7 +30,8 @@ def __stdout(self, prefix: str = "Current", port_filter: int = None):
             if port_filter is not None and idx+1 != int(port_filter):
                 continue
 
-            stdout.append(f"  Port {idx+1}: 0100 {self.__power_status(idx)}".encode())
+            stdout.append(
+                f"  Port {idx+1}: 0100 {self.__power_status(idx)}".encode())
 
         return stdout
 
@@ -53,7 +54,7 @@ def cmd(self, fp: pytest_subprocess.FakeProcess, port_number: int = None, new_st
         stdout = self.__stdout(port_filter=port_number)
 
         if port_number is not None:
-            cmd += [ "-p", str(port_number)]
+            cmd += ["-p", str(port_number)]
 
         if new_status is not None:
             self.status[port_number] = new_status
@@ -66,10 +67,11 @@ def cmd(self, fp: pytest_subprocess.FakeProcess, port_number: int = None, new_st
 
         fp.register(cmd, stdout=stdout)
 
+
 @pytest.fixture
 def mock_hub():
     path = "1-2"
     num_ports = 5
     hub = MockHub(path, num_ports)
 
-    return hub
+    return hub

tests/test_hub.py

@@ -3,15 +3,27 @@
 
 import helper
 from helper import MockHub, mock_hub
+
+import uhubctl
 from uhubctl import Hub
 
+
 def test_empty_hub():
     hub_path = "1-2"
     hub = Hub(hub_path, enumerate_ports=False)
 
     assert hub.path == hub_path
     assert hub.ports == []
 
+
+def test_wrong_or_missing_parameter():
+    with pytest.raises(TypeError):
+        Hub()
+
+    with pytest.raises(TypeError):
+        Hub(1)
+
+
 def test_multiple_manual_ports():
     hub_path = "1-2"
     hub = Hub(hub_path, enumerate_ports=False)
@@ -20,14 +32,37 @@ def test_multiple_manual_ports():
 
     assert len(hub.ports) == 1
 
-    hub.add_ports(2,10)
+    hub.add_ports(2, 10)
 
     assert len(hub.ports) == 10
 
 
+def test_str():
+    hub_path = "1-2"
+    hub = Hub(hub_path, enumerate_ports=False)
+
+    assert str(hub) == f"USB Hub {hub_path}"
+
 
 def test_port_enumeration(mock_hub: MockHub, fp: pytest_subprocess.FakeProcess):
     mock_hub.cmd(fp)
     mock_hub.discover_ports()
 
     assert len(mock_hub.ports) == 5
+
+
+def test_no_devices(fp: pytest_subprocess.FakeProcess):
+    fp.register(["uhubctl", "-N"],
+                stdout=["No compatible devices detected!".encode()])
+
+    hubs = uhubctl.discover_hubs()
+
+    assert hubs == []
+
+
+def test_find_port(mock_hub: MockHub, fp: pytest_subprocess.FakeProcess):
+    mock_hub.cmd(fp)
+    mock_hub.discover_ports()
+
+    assert mock_hub.find_port(1) is not None
+    assert mock_hub.find_port(10) is None

tests/test_port.py

@@ -1,3 +1,4 @@
+from random import randint
 import pytest
 import pytest_subprocess
 
@@ -6,16 +7,39 @@
 from uhubctl import Hub, Port
 
 
-def test_manual_port_creation():
-    port_number = 1
-    hub_path = "1"
+@pytest.fixture
+def demo_hub():
+    return Hub("1", enumerate_ports=False)
 
-    hub = Hub(hub_path, enumerate_ports=False)
-    port = Port(hub, port_number)
+
+@pytest.mark.parametrize("port_number", [randint(1, 20)])
+def test_str(demo_hub: Hub, port_number: int):
+    port = Port(demo_hub, port_number)
+
+    assert str(port) == f"USB Port {demo_hub.path}.{port_number}"
+
+
+@pytest.mark.parametrize("port_number", [randint(1, 20)])
+def test_manual_port_creation(demo_hub: Hub, port_number: int):
+    port = Port(demo_hub, port_number)
 
     assert port.port_number == port_number
 
 
+def test_wrong_or_missing_parameter(demo_hub: Hub):
+    with pytest.raises(TypeError):
+        Port()
+
+    with pytest.raises(TypeError):
+        Port(demo_hub)
+
+    port = Port(demo_hub, "1")
+    assert port.port_number == 1
+
+    with pytest.raises(ValueError):
+        Port(demo_hub, "a")
+
+
 def test_port_status(mock_hub: MockHub, fp: pytest_subprocess.FakeProcess):
     for port in mock_hub.ports:
         mock_hub.cmd(fp, port.port_number)

tests/test_uhubctl_binary.py

@@ -15,4 +15,4 @@ def test_uhubctl_binary_echo():
     import uhubctl
     uhubctl.utils.UHUBCTL_BINARY = "/bin/echo"
 
-    assert uhubctl.discover_hubs() == []
+    assert uhubctl.discover_hubs() == []