[usb][test] Migrate to zxtest
ZX-4557 #done
TESTED: runtests -t usb-wrapper-test-test
Change-Id: I5690f490e271e82a2d80c9ccfcca975bad94e580
diff --git a/zircon/system/dev/lib/usb/BUILD.gn b/zircon/system/dev/lib/usb/BUILD.gn
index 9979bbe..d9ce908 100644
--- a/zircon/system/dev/lib/usb/BUILD.gn
+++ b/zircon/system/dev/lib/usb/BUILD.gn
@@ -44,7 +44,7 @@
"$zx/system/ulib/driver",
"$zx/system/ulib/fbl",
"$zx/system/ulib/fdio",
- "$zx/system/ulib/unittest",
+ "$zx/system/ulib/zxtest",
"$zx/system/ulib/zircon",
]
}
diff --git a/zircon/system/dev/lib/usb/tests/usb-wrapper-tests.cc b/zircon/system/dev/lib/usb/tests/usb-wrapper-tests.cc
index ec0aa8b..cdce273 100644
--- a/zircon/system/dev/lib/usb/tests/usb-wrapper-tests.cc
+++ b/zircon/system/dev/lib/usb/tests/usb-wrapper-tests.cc
@@ -4,7 +4,7 @@
#include <usb/usb.h>
-#include <unittest/unittest.h>
+#include <zxtest/zxtest.h>
namespace {
@@ -55,8 +55,7 @@
return sizeof(kDescriptors);
}
-bool InterfaceListTest() {
- BEGIN_TEST;
+TEST(UsbWrapperTest, InterfaceListTest) {
usb_protocol_ops_t ops;
ops.get_descriptors_length = GetDescriptorsLength;
ops.get_descriptors = GetDescriptors;
@@ -65,7 +64,7 @@
ddk::UsbProtocolClient client(&proto);
std::optional<usb::InterfaceList> list;
- ASSERT_EQ(ZX_OK, usb::InterfaceList::Create(client, true, &list), "");
+ ASSERT_OK(usb::InterfaceList::Create(client, true, &list), "");
size_t count = 0;
for (auto interface : *list) {
ASSERT_EQ(
@@ -123,10 +122,5 @@
ASSERT_EQ(count ? 0U : 2U, endpoint_count, "");
count++;
}
- END_TEST;
}
} // namespace
-
-BEGIN_TEST_CASE(usb_wrapper_tests)
-RUN_NAMED_TEST("InterfaceList test", InterfaceListTest)
-END_TEST_CASE(usb_wrapper_tests)
