Properly encode multibyte codepoints (#12)

Author: manuel-sugawara

src/main/java/com/dampcake/bencode/BencodeOutputStream.java

@@ -144,9 +144,10 @@ private byte[] encode(final String s) throws IOException {
         if (s == null) throw new NullPointerException("s cannot be null");
 
         ByteArrayOutputStream buffer = new ByteArrayOutputStream();
-        buffer.write(Integer.toString(s.length()).getBytes(charset));
+        byte[] bytes = s.getBytes(charset);
+        buffer.write(Integer.toString(bytes.length).getBytes(charset));
         buffer.write(Bencode.SEPARATOR);
-        buffer.write(s.getBytes(charset));
+        buffer.write(bytes);
 
         return buffer.toByteArray();
     }

src/test/java/com/dampcake/bencode/BencodeTest.java

@@ -127,6 +127,13 @@ public void testDecodeString() {
         assertEquals("Hello World!", decoded);
     }
 
+    @Test
+    public void testDecodeStringMultiByteCodePoints() {
+        String decoded = instance.decode("7:Garçon".getBytes(), Type.STRING);
+
+        assertEquals("Garçon", decoded);
+    }
+
     @Test
     public void testDecodeEmptyString() {
         String decoded = instance.decode("0:123".getBytes(), Type.STRING);
@@ -319,6 +326,12 @@ public void testWriteString() throws Exception {
         assertEquals("12:Hello World!", new String(encoded, instance.getCharset()));
     }
 
+    @Test
+    public void testWriteStringMultiByteCodePoints() throws Exception {
+        byte[] encoded = instance.encode("Garçon");
+
+        assertEquals("7:Garçon", new String(encoded, instance.getCharset()));
+    }
     @Test
     public void testWriteStringEmpty() throws Exception {
         byte[] encoded = instance.encode("");