Merge pull request #3 from EonTechnology/master

Fix encoding on locales with non-arabic digits (as Hindi (India))

Author: Adam Peck

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

@@ -19,6 +19,7 @@
 import java.io.IOException;
 import java.io.OutputStream;
 import java.nio.charset.Charset;
+import java.util.Locale;
 import java.util.Map;
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -126,13 +127,13 @@ public void writeDictionary(final Map<?, ?> m) throws IOException {
     private static String encode(final String s) {
         if (s == null) throw new NullPointerException("s cannot be null");
 
-        return String.format("%d%s%s", s.length(), Bencode.SEPARATOR, s);
+        return String.format(Locale.ENGLISH, "%d%s%s", s.length(), Bencode.SEPARATOR, s);
     }
 
     private static String encode(final Number n) {
         if (n == null) throw new NullPointerException("n cannot be null");
 
-        return String.format("%s%d%s", Bencode.NUMBER, n.longValue(), Bencode.TERMINATOR);
+        return String.format(Locale.ENGLISH, "%s%d%s", Bencode.NUMBER, n.longValue(), Bencode.TERMINATOR);
     }
 
     private static String encode(final Iterable<?> l) {

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

@@ -1,11 +1,17 @@
 package com.dampcake.bencode;
 
+import org.junit.AfterClass;
 import org.junit.Before;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
 import java.io.ByteArrayOutputStream;
 import java.util.ArrayList;
+import java.util.Collection;
 import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.Locale;
 import java.util.concurrent.ConcurrentSkipListMap;
 
 import static com.dampcake.bencode.Assert.assertThrows;
@@ -16,13 +22,35 @@
  *
  * @author Adam Peck
  */
+@RunWith(Parameterized.class)
 public class BencodeOutputStreamTest {
 
+    private static Locale startLocale = Locale.getDefault();
+
+    @Parameterized.Parameter
+    public Locale testLocale;
+
+    @AfterClass
+    public static void restore() throws Exception {
+        Locale.setDefault(startLocale);
+    }
+
+    @Parameterized.Parameters(name = "{index}: {0}")
+    public static Collection<Object[]> data() {
+        LinkedList<Object[]> res = new LinkedList<Object[]>();
+        for (Locale locale : Locale.getAvailableLocales()) {
+            res.add(new Object[] {locale});
+        }
+        return res;
+    }
+
     private ByteArrayOutputStream out;
     private BencodeOutputStream instance;
 
     @Before
     public void setUp() {
+        Locale.setDefault(testLocale);
+
         out = new ByteArrayOutputStream();
         instance = new BencodeOutputStream(out);
     }