remove hcd_port_reset before set address in enumeration

add test & implement tusbh_hid_mouse_is_supported

2 files changed, 33 insertions, 1 deletions

diff --git a/tests/test/host/hid/test_hidh_keyboard.c b/tests/test/host/hid/test_hidh_keyboard.c
index a3ef34542..56ba9dfbd 100644
--- a/tests/test/host/hid/test_hidh_keyboard.c
+++ b/tests/test/host/hid/test_hidh_keyboard.c
@@ -60,9 +60,10 @@ tusb_keyboard_report_t sample_key[2] =
 };
 
 uint8_t dev_addr;
-tusb_keyboard_report_t report;
 hidh_interface_info_t *p_hidh_kbd;
 
+tusb_keyboard_report_t report;
+
 tusb_descriptor_interface_t const *p_kbd_interface_desc = &desc_configuration.keyboard_interface;
 tusb_descriptor_endpoint_t  const *p_kdb_endpoint_desc  = &desc_configuration.keyboard_endpoint;
 
diff --git a/tests/test/host/hid/test_hidh_mouse.c b/tests/test/host/hid/test_hidh_mouse.c
index e1e0d8fa0..b2086b9ad 100644
--- a/tests/test/host/hid/test_hidh_mouse.c
+++ b/tests/test/host/hid/test_hidh_mouse.c
@@ -46,9 +46,23 @@
 #include "descriptor_test.h"
 
 extern hidh_interface_info_t mouse_data[TUSB_CFG_HOST_DEVICE_MAX];
+hidh_interface_info_t *p_hidh_mouse;
+uint8_t dev_addr;
 
 void setUp(void)
 {
+  hidh_init();
+
+  dev_addr = RANDOM(TUSB_CFG_HOST_DEVICE_MAX)+1;
+
+  p_hidh_mouse = &mouse_data[dev_addr-1];
+
+  p_hidh_mouse->report_size = sizeof(tusb_mouse_report_t);
+  p_hidh_mouse->pipe_hdl = (pipe_handle_t) {
+    .dev_addr  = dev_addr,
+    .xfer_type = TUSB_XFER_INTERRUPT,
+    .index     = 1
+  };
 }
 
 void tearDown(void)
@@ -63,7 +77,24 @@ void test_mouse_init(void)
   TEST_ASSERT_MEM_ZERO(mouse_data, sizeof(hidh_interface_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
 }
 
+void test_mouse_is_supported_fail_unplug(void)
+{
+  tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_UNPLUG);
+  TEST_ASSERT_FALSE( tusbh_hid_mouse_is_supported(dev_addr) );
+}
+
+void test_mouse_is_supported_fail_not_opened(void)
+{
+  hidh_init();
+  tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED);
+  TEST_ASSERT_FALSE( tusbh_hid_mouse_is_supported(dev_addr) );
+}
 
+void test_mouse_is_supported_ok(void)
+{
+  tusbh_device_get_state_IgnoreAndReturn(TUSB_DEVICE_STATE_CONFIGURED);
+  TEST_ASSERT_TRUE( tusbh_hid_mouse_is_supported(dev_addr) );
+}