Fix toString method of SimpleUsbInterfaceDescriptor class

Author: kayahr

src/main/java/org/usb4java/javax/descriptors/SimpleUsbInterfaceDescriptor.java

@@ -181,19 +181,6 @@ public boolean equals(final Object obj)
 
     @Override
     public String toString()
-    {
-        return dump(this);
-    }
-
-    /**
-     * Dumps the specified USB interface descriptor into a string and returns
-     * it.
-     *
-     * @param descriptor
-     *            The USB interface descriptor to dump.
-     * @return The descriptor dump.
-     */
-    public static String dump(final UsbInterfaceDescriptor descriptor)
     {
         return String.format(
             "Interface Descriptor:%n" +
@@ -206,15 +193,15 @@ public static String dump(final UsbInterfaceDescriptor descriptor)
             "  bInterfaceSubClass %7d%n" +
             "  bInterfaceProtocol %7d%n" +
             "  iInterface %15d%n",
-            descriptor.bLength(),
-            descriptor.bDescriptorType(),
-            descriptor.bInterfaceNumber() & 0xff,
-            descriptor.bAlternateSetting() & 0xff,
-            descriptor.bNumEndpoints() & 0xff,
-            descriptor.bInterfaceClass() & 0xff,
-            DescriptorUtils.getUSBClassName(descriptor.bInterfaceClass()),
-            descriptor.bInterfaceSubClass() & 0xff,
-            descriptor.bInterfaceProtocol() & 0xff,
-            descriptor.iInterface() & 0xff);
+            bLength() & 0xff,
+            bDescriptorType() & 0xff,
+            bInterfaceNumber() & 0xff,
+            bAlternateSetting() & 0xff,
+            bNumEndpoints() & 0xff,
+            bInterfaceClass() & 0xff,
+            DescriptorUtils.getUSBClassName(bInterfaceClass()),
+            bInterfaceSubClass() & 0xff,
+            bInterfaceProtocol() & 0xff,
+            iInterface() & 0xff);
     }
 }

src/test/java/org/usb4java/javax/descriptors/SimpleUsbInterfaceDescriptorTest.java

@@ -7,12 +7,10 @@
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotEquals;
 import static org.junit.Assert.assertTrue;
 
 import org.junit.BeforeClass;
 import org.junit.Test;
-import org.usb4java.javax.descriptors.SimpleUsbInterfaceDescriptor;
 
 /**
  * Tests the {@link SimpleUsbInterfaceDescriptor}.
@@ -25,31 +23,31 @@ public class SimpleUsbInterfaceDescriptorTest
     private static SimpleUsbInterfaceDescriptor descriptor;
 
     /** Value for {@link SimpleUsbInterfaceDescriptor#bLength()}. */
-    private static final byte LENGTH = 1;
+    private static final byte LENGTH = (byte) 0xff;
 
     /** Value for {@link SimpleUsbInterfaceDescriptor#bDescriptorType()}. */
-    private static final byte DESCRIPTOR_TYPE = 2;
+    private static final byte DESCRIPTOR_TYPE = (byte) 0xfe;
 
     /** Value for {@link SimpleUsbInterfaceDescriptor#bInterfaceNumber()}. */
-    private static final byte INTERFACE_NUMBER = 3;
+    private static final byte INTERFACE_NUMBER = (byte) 0xfd;
 
     /** Value for {@link SimpleUsbInterfaceDescriptor#bAlternateSetting()}. */
-    private static final byte ALTERNATE_SETTING = 4;
+    private static final byte ALTERNATE_SETTING = (byte) 0xfc;
 
     /** Value for {@link SimpleUsbInterfaceDescriptor#bNumEndpoints()}. */
-    private static final byte NUM_ENDPOINTS = 5;
+    private static final byte NUM_ENDPOINTS = (byte) 0xfb;
 
     /** Value for {@link SimpleUsbInterfaceDescriptor#bInterfaceClass()}. */
-    private static final byte INTERFACE_CLASS = 6;
+    private static final byte INTERFACE_CLASS = (byte) 0xfa;
 
     /** Value for {@link SimpleUsbInterfaceDescriptor#bInterfaceSubClass()}. */
-    private static final byte INTERFACE_SUB_CLASS = 7;
+    private static final byte INTERFACE_SUB_CLASS = (byte) 0xf9;
 
     /** Value for {@link SimpleUsbInterfaceDescriptor#bInterfaceProtocol()}. */
-    private static final byte INTERFACE_PROTOCOL = 8;
+    private static final byte INTERFACE_PROTOCOL = (byte) 0xf8;
 
     /** Value for {@link SimpleUsbInterfaceDescriptor#iInterface()}. */
-    private static final byte INTERFACE = 9;
+    private static final byte INTERFACE = (byte) 0xf7;
 
     /** A wrong value for equality test. */
     private static final byte WRONG = 0;
@@ -221,56 +219,15 @@ public void testEquals()
     @Test
     public void testToString()
     {
-        assertEquals(descriptor.toString(), descriptor.toString());
-        assertEquals(descriptor.toString(),
-            new SimpleUsbInterfaceDescriptor(
-                LENGTH, DESCRIPTOR_TYPE, INTERFACE_NUMBER, ALTERNATE_SETTING,
-                NUM_ENDPOINTS, INTERFACE_CLASS, INTERFACE_SUB_CLASS,
-                INTERFACE_PROTOCOL, INTERFACE).toString());
-        assertNotEquals(descriptor.toString(),
-            new SimpleUsbInterfaceDescriptor(
-                WRONG, DESCRIPTOR_TYPE, INTERFACE_NUMBER, ALTERNATE_SETTING,
-                NUM_ENDPOINTS, INTERFACE_CLASS, INTERFACE_SUB_CLASS,
-                INTERFACE_PROTOCOL, INTERFACE).toString());
-        assertNotEquals(descriptor.toString(),
-            new SimpleUsbInterfaceDescriptor(
-                LENGTH, WRONG, INTERFACE_NUMBER, ALTERNATE_SETTING,
-                NUM_ENDPOINTS, INTERFACE_CLASS, INTERFACE_SUB_CLASS,
-                INTERFACE_PROTOCOL, INTERFACE).toString());
-        assertNotEquals(descriptor.toString(),
-            new SimpleUsbInterfaceDescriptor(
-                LENGTH, DESCRIPTOR_TYPE, WRONG, ALTERNATE_SETTING,
-                NUM_ENDPOINTS, INTERFACE_CLASS, INTERFACE_SUB_CLASS,
-                INTERFACE_PROTOCOL, INTERFACE).toString());
-        assertNotEquals(descriptor.toString(),
-            new SimpleUsbInterfaceDescriptor(
-                LENGTH, DESCRIPTOR_TYPE, INTERFACE_NUMBER, WRONG,
-                NUM_ENDPOINTS, INTERFACE_CLASS, INTERFACE_SUB_CLASS,
-                INTERFACE_PROTOCOL, INTERFACE).toString());
-        assertNotEquals(descriptor.toString(),
-            new SimpleUsbInterfaceDescriptor(
-                LENGTH, DESCRIPTOR_TYPE, INTERFACE_NUMBER, ALTERNATE_SETTING,
-                WRONG, INTERFACE_CLASS, INTERFACE_SUB_CLASS,
-                INTERFACE_PROTOCOL, INTERFACE).toString());
-        assertNotEquals(descriptor.toString(),
-            new SimpleUsbInterfaceDescriptor(
-                LENGTH, DESCRIPTOR_TYPE, INTERFACE_NUMBER, ALTERNATE_SETTING,
-                NUM_ENDPOINTS, WRONG, INTERFACE_SUB_CLASS,
-                INTERFACE_PROTOCOL, INTERFACE).toString());
-        assertNotEquals(descriptor.toString(),
-            new SimpleUsbInterfaceDescriptor(
-                LENGTH, DESCRIPTOR_TYPE, INTERFACE_NUMBER, ALTERNATE_SETTING,
-                NUM_ENDPOINTS, INTERFACE_CLASS, WRONG,
-                INTERFACE_PROTOCOL, INTERFACE).toString());
-        assertNotEquals(descriptor.toString(),
-            new SimpleUsbInterfaceDescriptor(
-                LENGTH, DESCRIPTOR_TYPE, INTERFACE_NUMBER, ALTERNATE_SETTING,
-                NUM_ENDPOINTS, INTERFACE_CLASS, INTERFACE_SUB_CLASS,
-                WRONG, INTERFACE).toString());
-        assertNotEquals(descriptor.toString(),
-            new SimpleUsbInterfaceDescriptor(
-                LENGTH, DESCRIPTOR_TYPE, INTERFACE_NUMBER, ALTERNATE_SETTING,
-                NUM_ENDPOINTS, INTERFACE_CLASS, INTERFACE_SUB_CLASS,
-                INTERFACE_PROTOCOL, WRONG).toString());
+        assertEquals(String.format("Interface Descriptor:%n"
+            + "  bLength                255%n"
+            + "  bDescriptorType        254%n"
+            + "  bInterfaceNumber       253%n"
+            + "  bAlternateSetting      252%n"
+            + "  bNumEndpoints          251%n"
+            + "  bInterfaceClass        250 Unknown%n"
+            + "  bInterfaceSubClass     249%n"
+            + "  bInterfaceProtocol     248%n"
+            + "  iInterface             247%n"), descriptor.toString());
     }
 }