Merge pull request stleary#52 from bpieber/patch-1

douglascrockford · douglascrockford · commit d99ecc46463c · 2012-04-13T07:16:02.000-07:00
Make test run on german locale.
diff --git a/tests/TestJSONObject.java b/tests/TestJSONObject.java
@@ -801,7 +801,7 @@ public static void testConstructor_UsResourceBundle()
     {
         try
         {
-            Locale currentLocale = new Locale("en");
+            Locale currentLocale = new Locale("en", "US");
             assertEquals(
                     "{\"ASCII\":\"American Standard Code for Information Interchange\",\"JSON\":\"JavaScript Object Notation\",\"JAVA\":{\"desc\":\"Just Another Vague Acronym\",\"data\":\"Sweet language\"}}",
                     new JSONObject("org.json.tests.SampleResourceBundle",

Original file line number	Diff line number	Diff line change
`@@ -801,7 +801,7 @@ public static void testConstructor_UsResourceBundle()`
`801`	`801`	`{`
`802`	`802`	`try`
`803`	`803`	`{`
`804`		`- Locale currentLocale = new Locale("en");`
	`804`	`+ Locale currentLocale = new Locale("en", "US");`
`805`	`805`	`assertEquals(`
`806`	`806`	`"{\"ASCII\":\"American Standard Code for Information Interchange\",\"JSON\":\"JavaScript Object Notation\",\"JAVA\":{\"desc\":\"Just Another Vague Acronym\",\"data\":\"Sweet language\"}}",`
`807`	`807`	`new JSONObject("org.json.tests.SampleResourceBundle",`