update usbh_init and test

2 files changed, 53 insertions, 33 deletions

diff --git a/tests/test/host/test_hid_host_keyboard.c b/tests/test/host/test_hid_host_keyboard.c
index 5cb91926c..1ee09c7a4 100644
--- a/tests/test/host/test_hid_host_keyboard.c
+++ b/tests/test/host/test_hid_host_keyboard.c
@@ -190,34 +190,3 @@ void test_keyboard_get_ok()
   TEST_ASSERT_EQUAL_MEMORY(&sample_key[1], &report, sizeof(tusb_keyboard_report_t));
 }
 
-#if 0
-void test_keyboard_open_invalid_para()
-{
-  tusb_handle_keyboard_t keyboard_handle;
-
-  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_keyboard_open(TUSB_CFG_HOST_DEVICE_MAX, 1, &keyboard_handle) );
-  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_keyboard_open(0, 0, &keyboard_handle) );
-  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_keyboard_open(0, TUSB_CFG_CONFIGURATION_MAX+1, &keyboard_handle) );
-  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_keyboard_open(0, 1, NULL) );
-}
-
-void test_keyboard_open_succeed()
-{
-  tusb_handle_keyboard_t keyboard_handle = 0;
-
-  TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, tusbh_keyboard_open(0, 1, &keyboard_handle));
-  TEST_ASSERT_TRUE( 0 != keyboard_handle);
-}
-
-void test_keyboard_callback__()
-{
-  TEST_IGNORE();
-  tusb_handle_device_t device_handle = __LINE__;
-  tusb_handle_configure_t configure_handle = __LINE__;
-  tusb_handle_interface_t interface_handle = __LINE__;
-  uint32_t configure_flags = BIT_(TUSB_CLASS_HID);
-  tusbh_usbd_device_mounted_cb_ExpectWithArray(TUSB_ERROR_NONE, device_handle, &configure_flags, 1, 1);
-}
-#endif
-
-
diff --git a/tests/test/host/test_usbd_host.c b/tests/test/host/test_usbd_host.c
index 195f2817c..e9af68d91 100644
--- a/tests/test/host/test_usbd_host.c
+++ b/tests/test/host/test_usbd_host.c
@@ -37,6 +37,7 @@
 
 #include "unity.h"
 #include "usbd_host.h"
+#include "mock_osal.h"
 
 extern usbh_device_info_t device_info_pool[TUSB_CFG_HOST_DEVICE_MAX];
 tusb_handle_device_t dev_hdl;
@@ -50,16 +51,26 @@ void tearDown(void)
 {
 }
 
-void test_usbh_init(void)
+//--------------------------------------------------------------------+
+// init, get_status
+//--------------------------------------------------------------------+
+void test_usbh_init_checkmem(void)
 {
   usbh_device_info_t device_info_zero[TUSB_CFG_HOST_DEVICE_MAX];
   memset(device_info_zero, 0, sizeof(usbh_device_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
 
-  usbh_init();
+  osal_queue_create_IgnoreAndReturn(TUSB_ERROR_NONE);
 
+  TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, usbh_init());
   TEST_ASSERT_EQUAL_MEMORY(device_info_zero, device_info_pool, sizeof(usbh_device_info_t)*TUSB_CFG_HOST_DEVICE_MAX);
 }
 
+void test_usbh_init_queue_create_fail(void)
+{
+  osal_queue_create_IgnoreAndReturn(TUSB_ERROR_OSAL_QUEUE_FAILED);
+  TEST_ASSERT_EQUAL(TUSB_ERROR_OSAL_QUEUE_FAILED, usbh_init());
+}
+
 void test_usbh_status_get_fail(void)
 {
   usbh_init();
@@ -73,3 +84,43 @@ void test_usbh_status_get_succeed(void)
   TEST_ASSERT_EQUAL( TUSB_DEVICE_STATUS_READY, tusbh_device_status_get(dev_hdl) );
 }
 
+//--------------------------------------------------------------------+
+// enum task
+//--------------------------------------------------------------------+
+void test_enum_task(void)
+{
+//  osal_queue_
+  TEST_IGNORE();
+  usbh_enumerate_task();
+}
+
+
+#if 0
+void test_keyboard_open_invalid_para()
+{
+  tusb_handle_keyboard_t keyboard_handle;
+
+  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_keyboard_open(TUSB_CFG_HOST_DEVICE_MAX, 1, &keyboard_handle) );
+  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_keyboard_open(0, 0, &keyboard_handle) );
+  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_keyboard_open(0, TUSB_CFG_CONFIGURATION_MAX+1, &keyboard_handle) );
+  TEST_ASSERT_EQUAL(TUSB_ERROR_INVALID_PARA, tusbh_keyboard_open(0, 1, NULL) );
+}
+
+void test_keyboard_open_succeed()
+{
+  tusb_handle_keyboard_t keyboard_handle = 0;
+
+  TEST_ASSERT_EQUAL(TUSB_ERROR_NONE, tusbh_keyboard_open(0, 1, &keyboard_handle));
+  TEST_ASSERT_TRUE( 0 != keyboard_handle);
+}
+
+void test_keyboard_callback__()
+{
+  TEST_IGNORE();
+  tusb_handle_device_t device_handle = __LINE__;
+  tusb_handle_configure_t configure_handle = __LINE__;
+  tusb_handle_interface_t interface_handle = __LINE__;
+  uint32_t configure_flags = BIT_(TUSB_CLASS_HID);
+  tusbh_usbd_device_mounted_cb_ExpectWithArray(TUSB_ERROR_NONE, device_handle, &configure_flags, 1, 1);
+}
+#endif