Merge lp:~pbeaman/akiban-persistit/fix-nls-test-issues into lp:akiban-persistit

[Peter Beaman]

Fix https://bugs.launchpad.net/akiban-persistit/+bug/1079288.

Modify StatisticsTaskTest to compare locale-sensitive output from StatisticsTask to expected results.

This version of Persistit has built successfully in the following locales:

de-DE.UTF-8
fr_FR.UTF-8
es_ES.UTF-8
zh_CH.UTF-8

This branch comes with a commitment to ensure all future versions of Persistit build correctly in multiple -- and hopefully all -- locales.

[Nathan Williams (nwilliams)]

Makes sense.

review: Approve

=== modified file 'src/main/java/com/persistit/StatisticsTask.java'
--- src/main/java/com/persistit/StatisticsTask.java	2012-08-24 13:57:19 +0000
+++ src/main/java/com/persistit/StatisticsTask.java	2012-11-19 16:45:27 +0000
@@ -41,6 +41,16 @@
     static final long NANOS_PER_MILLI = 1000000;
     static final long NANOS_PER_SECOND = 1000000000;
 
+    final static String COUNT_FORMAT = "%s=%d";
+    final static String RATE_FORMAT = "%s=%.3f";
+
+    final static String PHEADER_FORMAT = " %10s";
+    final static String PCOUNT_FORMAT = " %,10d";
+    final static String PRATE_FORMAT = " %,10.3f";
+
+    final static String TIME_HEADER_FORMAT = "%12s ";
+    final static String TIME_FORMAT = "%,12d ";
+
     long _delay;
     long _count;
     boolean _bpool;
@@ -86,30 +96,30 @@
         public String toString(final Display display) {
             switch (display) {
             case TOTAL:
-                return String.format("%s=%d", _name, _value);
+                return String.format(COUNT_FORMAT, _name, _value);
             case CHANGE:
-                return String.format("%s=%d", _name, _change);
+                return String.format(COUNT_FORMAT, _name, _change);
             case RATE:
-                return String.format("%s=%.3f", _name, rate());
+                return String.format(RATE_FORMAT, _name, rate());
             default:
                 throw new IllegalStateException();
             }
         }
 
         public void printHeader(final PrintWriter pw) throws IOException {
-            pw.print(String.format(" %10s", _name));
+            pw.print(String.format(PHEADER_FORMAT, _name));
         }
 
         public void printValue(final PrintWriter pw, final Display display) throws IOException {
             switch (display) {
             case TOTAL:
-                pw.print(String.format(" %,10d", _value));
+                pw.print(String.format(PCOUNT_FORMAT, _value));
                 break;
             case CHANGE:
-                pw.print(String.format(" %,10d", _change));
+                pw.print(String.format(PCOUNT_FORMAT, _change));
                 break;
             case RATE:
-                pw.print(String.format(" %,10.3f", rate()));
+                pw.print(String.format(PRATE_FORMAT, rate()));
                 break;
             default:
                 throw new IllegalStateException();
@@ -193,14 +203,14 @@
                 _lastUpdate = line;
                 if (_pw != null) {
                     if (first) {
-                        _pw.printf("%12s ", "elapsed ms");
+                        _pw.printf(TIME_HEADER_FORMAT, "elapsed ms");
                         for (final Stat stat : _statsList) {
                             stat.printHeader(_pw);
                         }
                         _pw.println();
                         first = false;
                     }
-                    _pw.printf("%,12d ", _persistit.elapsedTime());
+                    _pw.printf(TIME_FORMAT, _persistit.elapsedTime());
                     for (final Stat stat : _statsList) {
                         stat.printValue(_pw, d);
                     }

=== modified file 'src/test/java/com/persistit/StatisticsTaskTest.java'
--- src/test/java/com/persistit/StatisticsTaskTest.java	2012-08-07 22:50:34 +0000
+++ src/test/java/com/persistit/StatisticsTaskTest.java	2012-11-19 16:45:27 +0000
@@ -15,6 +15,7 @@
 
 package com.persistit;
 
+import static com.persistit.StatisticsTask.*;
 import static org.junit.Assert.assertEquals;
 
 import java.io.BufferedReader;
@@ -35,23 +36,23 @@
         final Stat stat = new Stat("foo");
         stat.update(0, 1234);
         stat.update(10000000000L, 2345);
-        assertEquals("foo=2345", stat.toString(Display.TOTAL));
-        assertEquals("foo=1111", stat.toString(Display.CHANGE));
-        assertEquals("foo=111.100", stat.toString(Display.RATE));
+        assertEquals(String.format(COUNT_FORMAT, "foo", 2345), stat.toString(Display.TOTAL));
+        assertEquals(String.format(COUNT_FORMAT, "foo", 1111), stat.toString(Display.CHANGE));
+        assertEquals(String.format(RATE_FORMAT, "foo", 111.1f), stat.toString(Display.RATE));
         final StringWriter sw = new StringWriter();
         final PrintWriter pw = new PrintWriter(sw);
         sw.getBuffer().setLength(0);
         stat.printHeader(pw);
-        assertEquals("        foo", sw.toString());
+        assertEquals(String.format(PHEADER_FORMAT, "foo"), sw.toString());
         sw.getBuffer().setLength(0);
         stat.printValue(pw, Display.TOTAL);
-        assertEquals("      2,345", sw.toString());
+        assertEquals(String.format(PCOUNT_FORMAT, 2345), sw.toString());
         sw.getBuffer().setLength(0);
         stat.printValue(pw, Display.CHANGE);
-        assertEquals("      1,111", sw.toString());
+        assertEquals(String.format(PCOUNT_FORMAT, 1111), sw.toString());
         sw.getBuffer().setLength(0);
         stat.printValue(pw, Display.RATE);
-        assertEquals("    111.100", sw.toString());
+        assertEquals(String.format(PRATE_FORMAT, 111.1f), sw.toString());
 
     }
 
@@ -73,6 +74,7 @@
             System.out.println(line);
         }
         assertEquals(5, lines);
+        reader.close();
     }
 
     @Override