C#: use Java locale information and fix the geocoder

twcclegg · Oct 19, 2011 · b81de60 · b81de60
1 parent 2a39e7e
commit b81de60
Show file tree

Hide file tree

Showing 7 changed files with 47,277 additions and 38 deletions.
diff --git a/.hgignore b/.hgignore
@@ -6,4 +6,5 @@
 ^csharp/PhoneNumbers.Test/bin/
 ~$
 csharp/lib/Phonenumber.cs
-csharp/lib/Phonemetadata.cs
+csharp/lib/Phonemetadata.cs
+csharp/lib/DumpLocale.class
diff --git a/csharp/PhoneNumbers.Test/TestPhoneNumberOfflineGeocoder.cs b/csharp/PhoneNumbers.Test/TestPhoneNumberOfflineGeocoder.cs
@@ -66,8 +66,6 @@ public void SetupFixture()
             geocoder = new PhoneNumberOfflineGeocoder(TEST_MAPPING_DATA_DIRECTORY);
         }
 
-        /* This test is disabled as we do not have localized country names by
-         * default on .NET. Also, Bahamas RegionInfo does not exist.
         [Test]
         public void testGetDescriptionForNumberWithNoDataFile()
         {
@@ -82,7 +80,6 @@ public void testGetDescriptionForNumberWithNoDataFile()
             Assert.AreEqual("", geocoder.GetDescriptionForNumber(NUMBER_WITH_INVALID_COUNTRY_CODE,
                                                               new Locale("en", "US")));
         }
-        */
 
         [Test]
         public void testGetDescriptionForNumberWithMissingPrefix()
@@ -133,8 +130,7 @@ public void TestGetDescriptionForFallBack()
             Assert.AreEqual("CA",
                 geocoder.GetDescriptionForNumber(US_NUMBER1, Locale.ITALIAN));
             // Korean doesn't fall back to English.
-            // C#: changed from Java because we lack korean locale information
-            Assert.AreEqual("Korea",
+            Assert.AreEqual("\uB300\uD55C\uBBFC\uAD6D",
                 geocoder.GetDescriptionForNumber(KO_NUMBER3, Locale.KOREAN));
         }