harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From py...@apache.org
Subject svn commit: r428266 - in /incubator/harmony/enhanced/classlib/trunk/modules/luni/src: main/java/org/apache/harmony/luni/internal/locale/ test/java/tests/api/java/util/
Date Thu, 03 Aug 2006 07:06:48 GMT
Author: pyang
Date: Thu Aug  3 00:06:47 2006
New Revision: 428266

URL: http://svn.apache.org/viewvc?rev=428266&view=rev
Log:
Fix for HARMONY-1043 ([classlib][luni] java.util.Locale is lack of data)

Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/ISO3Countries.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/ISO3Languages.java
    incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/LocaleTest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/ISO3Countries.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/ISO3Countries.java?rev=428266&r1=428265&r2=428266&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/ISO3Countries.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/ISO3Countries.java
Thu Aug  3 00:06:47 2006
@@ -1,4 +1,4 @@
-/* Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable
+/* Copyright 1998, 2006 The Apache Software Foundation or its licensors, as applicable
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -58,6 +58,7 @@
 		{"BZ", "BLZ"},
 		{"CA", "CAN"},
 		{"CC", "CCK"},
+        {"CD", "COD"},
 		{"CF", "CAF"},
 		{"CG", "COG"},
 		{"CH", "CHE"},

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/ISO3Languages.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/ISO3Languages.java?rev=428266&r1=428265&r2=428266&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/ISO3Languages.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/ISO3Languages.java
Thu Aug  3 00:06:47 2006
@@ -1,4 +1,4 @@
-/* Copyright 1998, 2004 The Apache Software Foundation or its licensors, as applicable
+/* Copyright 1998, 2006 The Apache Software Foundation or its licensors, as applicable
  * 
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -23,6 +23,7 @@
 	Object [][] contents = {
 		{"aa", "aar"},
 		{"ab", "abk"},
+        {"ae", "ave"},
 		{"af", "afr"},
 		{"am", "amh"},
 		{"ar", "ara"},

Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/LocaleTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/LocaleTest.java?rev=428266&r1=428265&r2=428266&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/LocaleTest.java
(original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/LocaleTest.java
Thu Aug  3 00:06:47 2006
@@ -211,6 +211,9 @@
 		assertTrue("Returned incorrect ISO3 country: "
 				+ testLocale.getISO3Country(), testLocale.getISO3Country()
 				.equals("CAN"));
+        
+        Locale l = new Locale("", "CD");
+        assertEquals("COD", l.getISO3Country());
 	}
 
 	/**
@@ -221,6 +224,9 @@
 		assertTrue("Returned incorrect ISO3 language: "
 				+ testLocale.getISO3Language(), testLocale.getISO3Language()
 				.equals("eng"));
+        
+        Locale l = new Locale("ae");
+        assertEquals("ave", l.getISO3Language());
 	}
 
 	/**



Mime
View raw message