Fix toString method of SimpleUsbEndpointDescriptor class

Author: kayahr

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

@@ -135,18 +135,6 @@ public boolean equals(final Object obj)
 
     @Override
     public String toString()
-    {
-        return dump(this);
-    }
-
-    /**
-     * Dumps the specified USB endpoint descriptor into a string and returns it.
-     *
-     * @param descriptor
-     *            The USB endpoint descriptor to dump.
-     * @return The descriptor dump.
-     */
-    public static String dump(final UsbEndpointDescriptor descriptor)
     {
         return String.format(
             "Endpoint Descriptor:%n" +
@@ -159,16 +147,16 @@ public static String dump(final UsbEndpointDescriptor descriptor)
             "    Usage Type                %s%n" +
             "  wMaxPacketSize %11d%n" +
             "  bInterval %16d%n",
-            descriptor.bLength(),
-            descriptor.bDescriptorType(),
-            String.format("0x%02x", descriptor.bEndpointAddress() & 0xff),
-            descriptor.bEndpointAddress() & 0x0f,
-            DescriptorUtils.getDirectionName(descriptor.bEndpointAddress()),
-            descriptor.bmAttributes() & 0xff,
-            DescriptorUtils.getTransferTypeName(descriptor.bmAttributes()),
-            DescriptorUtils.getSynchTypeName(descriptor.bmAttributes()),
-            DescriptorUtils.getUsageTypeName(descriptor.bmAttributes()),
-            descriptor.wMaxPacketSize() & 0xffff,
-            descriptor.bInterval() & 0xff);
+            bLength() & 0xff,
+            bDescriptorType() & 0xff,
+            String.format("0x%02x", bEndpointAddress() & 0xff),
+            bEndpointAddress() & 0x0f,
+            DescriptorUtils.getDirectionName(bEndpointAddress()),
+            bmAttributes() & 0xff,
+            DescriptorUtils.getTransferTypeName(bmAttributes()),
+            DescriptorUtils.getSynchTypeName(bmAttributes()),
+            DescriptorUtils.getUsageTypeName(bmAttributes()),
+            wMaxPacketSize() & 0xffff,
+            bInterval() & 0xff);
     }
 }

src/test/java/org/usb4java/javax/descriptors/SimpleUsbEndpointDescriptorTest.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.SimpleUsbEndpointDescriptor;
 
 /**
  * Tests the {@link SimpleUsbEndpointDescriptor}.
@@ -25,22 +23,22 @@ public class SimpleUsbEndpointDescriptorTest
     private static SimpleUsbEndpointDescriptor descriptor;
 
     /** Value for {@link SimpleUsbEndpointDescriptor#bLength()}. */
-    private static final byte LENGTH = 1;
+    private static final byte LENGTH = (byte) 0xff;
 
     /** Value for {@link SimpleUsbEndpointDescriptor#bDescriptorType()}. */
-    private static final byte DESCRIPTOR_TYPE = 2;
+    private static final byte DESCRIPTOR_TYPE = (byte) 0xfe;
 
     /** Value for {@link SimpleUsbEndpointDescriptor#bEndpointAddress()}. */
-    private static final byte ENDPOINT_ADDRESS = 3;
+    private static final byte ENDPOINT_ADDRESS = (byte) 0xfd;
 
     /** Value for {@link SimpleUsbEndpointDescriptor#bmAttributes()}. */
-    private static final byte ATTRIBUTES = 4;
+    private static final byte ATTRIBUTES = (byte) 0xfc;
 
     /** Value for {@link SimpleUsbEndpointDescriptor#wMaxPacketSize()}. */
-    private static final short MAX_PACKET_SIZE = 5;
+    private static final short MAX_PACKET_SIZE = (short) 0xffff;
 
     /** Value for {@link SimpleUsbEndpointDescriptor#bInterval()}. */
-    private static final byte INTERVAL = 6;
+    private static final byte INTERVAL = (byte) 0xfb;
 
     /** A wrong value for equality test. */
     private static final byte WRONG = 0;
@@ -55,7 +53,7 @@ public static void setUp()
             LENGTH, DESCRIPTOR_TYPE, ENDPOINT_ADDRESS, ATTRIBUTES,
             MAX_PACKET_SIZE, INTERVAL);
     }
-    
+
     /**
      * Tests the {@link SimpleUsbEndpointDescriptor#bLength()} method.
      */
@@ -161,27 +159,15 @@ public void testEquals()
     @Test
     public void testToString()
     {
-        assertEquals(descriptor.toString(), descriptor.toString());
-        assertEquals(descriptor.toString(), new SimpleUsbEndpointDescriptor(
-            LENGTH, DESCRIPTOR_TYPE, ENDPOINT_ADDRESS, ATTRIBUTES,
-            MAX_PACKET_SIZE, INTERVAL).toString());
-        assertNotEquals(descriptor.toString(), new SimpleUsbEndpointDescriptor(
-            WRONG, DESCRIPTOR_TYPE, ENDPOINT_ADDRESS, ATTRIBUTES,
-            MAX_PACKET_SIZE, INTERVAL).toString());
-        assertNotEquals(descriptor.toString(), new SimpleUsbEndpointDescriptor(
-            LENGTH, WRONG, ENDPOINT_ADDRESS, ATTRIBUTES,
-            MAX_PACKET_SIZE, INTERVAL).toString());
-        assertNotEquals(descriptor.toString(), new SimpleUsbEndpointDescriptor(
-            LENGTH, DESCRIPTOR_TYPE, WRONG, ATTRIBUTES,
-            MAX_PACKET_SIZE, INTERVAL).toString());
-        assertNotEquals(descriptor.toString(), new SimpleUsbEndpointDescriptor(
-            LENGTH, DESCRIPTOR_TYPE, ENDPOINT_ADDRESS, WRONG,
-            MAX_PACKET_SIZE, INTERVAL).toString());
-        assertNotEquals(descriptor.toString(), new SimpleUsbEndpointDescriptor(
-            LENGTH, DESCRIPTOR_TYPE, ENDPOINT_ADDRESS, ATTRIBUTES,
-            WRONG, INTERVAL).toString());
-        assertNotEquals(descriptor.toString(), new SimpleUsbEndpointDescriptor(
-            LENGTH, DESCRIPTOR_TYPE, ENDPOINT_ADDRESS, ATTRIBUTES,
-            MAX_PACKET_SIZE, WRONG).toString());
+        assertEquals(String.format("Endpoint Descriptor:%n"
+            + "  bLength                255%n"
+            + "  bDescriptorType        254%n"
+            + "  bEndpointAddress      0xfd  EP 13 IN%n"
+            + "  bmAttributes           252%n"
+            + "    Transfer Type             Control%n"
+            + "    Synch Type                Synchronous%n"
+            + "    Usage Type                Reserved%n"
+            + "  wMaxPacketSize       65535%n"
+            + "  bInterval              251%n"), descriptor.toString());
     }
 }