Merge pull request #107 from mciantyre/test-class-bulk-zlp-high-speed

Device tests: Send bulk packet ZLP based on max packet size

Author: Disasm

tests/test_class_host/device.rs

@@ -12,6 +12,30 @@ pub struct DeviceHandles {
     pub en_us: Language,
 }
 
+impl DeviceHandles {
+    /// Indicates if this device is (true) or isn't (false) a
+    /// high-speed device.
+    pub fn is_high_speed(&self) -> bool {
+        self.handle.device().speed() == rusb::Speed::High
+    }
+    /// Returns the max packet size for the `TestClass` bulk endpoint(s).
+    pub fn bulk_max_packet_size(&self) -> u16 {
+        self.config_descriptor
+            .interfaces()
+            .flat_map(|intf| intf.descriptors())
+            .flat_map(|desc| {
+                desc.endpoint_descriptors()
+                    .find(|ep| {
+                        // Assumes that IN and OUT endpoint MPSes are the same.
+                        ep.transfer_type() == rusb::TransferType::Bulk
+                    })
+                    .map(|ep| ep.max_packet_size())
+            })
+            .next()
+            .expect("TestClass has at least one bulk endpoint")
+    }
+}
+
 impl ::std::ops::Deref for DeviceHandles {
     type Target = DeviceHandle<Context>;
 

tests/test_class_host/tests.rs

@@ -164,7 +164,13 @@ fn interface_descriptor(dev, _out) {
 }
 
 fn bulk_loopback(dev, _out) {
-    for len in &[0, 1, 2, 32, 63, 64, 65, 127, 128, 129] {
+    let mut lens = vec![0, 1, 2, 32, 63, 64, 65, 127, 128, 129];
+    if dev.is_high_speed() {
+        lens.extend([255, 256, 257, 511, 512, 513, 1023, 1024, 1025]);
+    }
+
+    let max_packet_size: usize = dev.bulk_max_packet_size().into();
+    for len in &lens {
         let data = random_data(*len);
 
         assert_eq!(
@@ -173,7 +179,7 @@ fn bulk_loopback(dev, _out) {
             data.len(),
             "bulk write len {}", len);
 
-        if *len > 0 && *len % 64 == 0 {
+        if *len > 0 && *len % max_packet_size == 0 {
             assert_eq!(
                 dev.write_bulk(0x01, &[], TIMEOUT)
                     .expect("bulk write zero-length packet"),