Update test code to be more certain our outcome is correct

Give all the bundles a prefix, not just some - now we are certain we got the right response
PLX-257 - Add some properties test to demonstrate the correct usage under a non-english locale

Author: handyande

src/test/java/org/codehaus/plexus/i18n/BarBundle.java

@@ -10,10 +10,10 @@ public class BarBundle
 {
     private static final Object[][] CONTENTS =
     {
-        { "key1", "value1" },
-        { "key2", "value2" },
-        { "key3", "value3" },
-        { "key4", "value4" }
+        { "key1", "[] value1" },
+        { "key2", "[] value2" },
+        { "key3", "[] value3" },
+        { "key4", "[] value4" }
     };
 
     protected Object[][] getContents()

src/test/java/org/codehaus/plexus/i18n/BarBundle_en_US.java

@@ -10,10 +10,10 @@ public class BarBundle_en_US
 {
     private static final Object[][] CONTENTS =
     {
-        { "key1", "value1" },
-        { "key2", "value2" },
-        { "key3", "value3" },
-        { "key4", "value4" }
+        { "key1", "[en_US] value1" },
+        { "key2", "[en_US] value2" },
+        { "key3", "[en_US] value3" },
+        { "key4", "[en_US] value4" }
     };
 
     protected Object[][] getContents()

src/test/java/org/codehaus/plexus/i18n/DefaultI18NTest.java

@@ -83,23 +83,47 @@ public void testLocalization()
     {
         String s0 = i18n.getString( null, null, "key1" );
 
-        assertEquals( "Unable to retrieve localized text for locale: default", s0, "value1" );
+        assertEquals( "Unable to retrieve localized text for locale: default", s0, "[] value1" );
 
         String s1 = i18n.getString( null, new Locale( "en", "US" ), "key2" );
 
-        assertEquals( "Unable to retrieve localized text for locale: en-US", s1, "value2" );
+        assertEquals( "Unable to retrieve localized text for locale: en-US", s1, "[en_US] value2" );
 
         String s2 = i18n.getString( "org.codehaus.plexus.i18n.BarBundle", new Locale( "ko", "KR" ), "key3" );
 
         assertEquals( "Unable to retrieve localized text for locale: ko-KR", s2, "[ko] value3" );
 
+        String s3 = i18n.getString( "org.codehaus.plexus.i18n.BarBundle", new Locale( "ja" ), "key1" );
+
+        assertEquals( "Unable to fall back from non-existant locale: jp", "[] value1", s3 );
+
         String s4 = i18n.getString( "org.codehaus.plexus.i18n.FooBundle", new Locale( "fr" ), "key3" );
 
-        assertEquals( "Unable to retrieve localized text for locale: fr-US", s4, "[fr] value3" );
+        assertEquals( "Unable to retrieve localized text for locale: fr", s4, "[fr] value3" );
+
+        String s5 = i18n.getString( "org.codehaus.plexus.i18n.FooBundle", new Locale( "fr", "FR" ), "key3" );
+
+        assertEquals( "Unable to retrieve localized text for locale: fr-FR", s5, "[fr] value3" );
+
+        String s6 = i18n.getString( "org.codehaus.plexus.i18n.i18n", null, "key1" );
+
+        assertEquals( "Unable to retrieve localized properties for locale: default", "[] value1", s6 );
+
+        Locale old = Locale.getDefault();
+        Locale.setDefault(Locale.FRENCH);
+        try
+        {
+            String s7 = i18n.getString( "org.codehaus.plexus.i18n.i18n", Locale.ENGLISH, "key1" );
+
+            assertEquals( "Not picking up new default locale: fr", "[fr] value1", s7 );
+
+            String s8 = i18n.getString( "org.codehaus.plexus.i18n.i18n", Locale.ITALIAN, "key1" );
 
-        String s5 = i18n.getString( "org.codehaus.plexus.i18n.i18n", null, "key1" );
+            assertEquals( "Unable to retrieve localized properties for locale: it", "[it] value1", s8 );
 
-        assertEquals( "value1", s5 );
+        } finally {
+            Locale.setDefault(old);
+        }
     }
 
     public void testLocalizedMessagesWithFormatting()

src/test/java/org/codehaus/plexus/i18n/FooBundle_en.java

@@ -9,10 +9,10 @@ public class FooBundle_en extends ListResourceBundle
 {
     private static final Object[][] CONTENTS =
     {
-        { "key1", "value1" },
-        { "key2", "value2" },
-        { "key3", "value3" },
-        { "key4", "value4" }
+        { "key1", "[en] value1" },
+        { "key2", "[en] value2" },
+        { "key3", "[en] value3" },
+        { "key4", "[en] value4" }
     };
 
     protected Object[][] getContents()

src/test/resources/org/codehaus/plexus/i18n/i18n.properties

@@ -1,4 +1,4 @@
-key1 = value1
+key1 = [] value1
 thanks.message = Thanks {0}!
 thanks.message1 = Thanks {0} {1}!
 thanks.message2 = Thanks {0} {1}!

src/test/resources/org/codehaus/plexus/i18n/i18n_fr.properties

@@ -0,0 +1,4 @@
+key1 = [fr] value1
+thanks.message = Merci {0}!
+thanks.message1 = Merci {0} {1}!
+thanks.message2 = Merci {0} {1}!

src/test/resources/org/codehaus/plexus/i18n/i18n_it.properties

@@ -0,0 +1,4 @@
+key1 = [it] value1
+thanks.message = Grazie {0}!
+thanks.message1 = Grazie {0} {1}!
+thanks.message2 = Grazie {0} {1}!