This is the mail archive of the
mauve-patches@sourceware.org
mailing list for the Mauve project.
Re: FYI: Test Fixes
Attached is the patch.
On Tue, 2007-06-19 at 11:49 -0400, Lillian Angel wrote:
> I forgot to send this earlier. I fixed up a few tests so they pass on openJDK. I committed a couple of patches for Josh.
>
>
>
> 2007-06-19 Lillian Angel <langel@redhat.com>
>
> * gnu/testlet/java/io/FilePermission/simple.java: Removed invalid
> test. Bug has been fixed in the JDK.
>
> 2007-06-18 Lillian Angel <langel@redhat.com>
>
> * gnu/testlet/java/sql/Array/ArrayTest.java: Added missing functions
> * gnu/testlet/java/sql/Blob/BlobTest.java: Likewise
> * gnu/testlet/java/sql/Clob/ClobTest.java: Likewise
>
> 2007-06-18 Lillian Angel <langel@redhat.com>
>
> * gnu/testlet/java/math/BigInteger/TestOfToByteArray.java: Removed
> verbose call to prevent compilation error.
>
> 2007-06-18 Lillian Angel <langel@redhat.com>
>
> * gnu/testlet/java/util/Properties/AcuniaPropertiesTest.java: Added
> casts to prevent compilation errors.
>
> 2007-06-18 Lillian Angel <langel@redhat.com>
>
> * gnu/testlet/java/util/Currency/Canada.java:
> * gnu/testlet/java/util/Currency/CanadaFrench.java:
> * gnu/testlet/java/util/Currency/China.java:
> * gnu/testlet/java/util/Currency/France.java:
> * gnu/testlet/java/util/Currency/Germany.java:
> * gnu/testlet/java/util/Currency/Italy.java:
> * gnu/testlet/java/util/Currency/Japan.java:
> * gnu/testlet/java/util/Currency/Korea.java:
> * gnu/testlet/java/util/Currency/PRC.java:
> * gnu/testlet/java/util/Currency/Taiwan.java:
> * gnu/testlet/java/util/Currency/UK.java: Set default locale.
>
> 2007-06-15 Joshua Sumali <jsumali@redhat.com>
>
> * gnu/testlet/locales/LocaleTest.java: Fixed TimeZone issue.
>
> 2007-06-15 Joshua Sumali <jsumali@redhat.com>
>
> * gnu/testlet/locales/LocaleTest.java: Fixed language errors. Now
> passes on openJDK.
>
>
Index: gnu/testlet/java/math/BigInteger/TestOfToByteArray.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/math/BigInteger/TestOfToByteArray.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- gnu/testlet/java/math/BigInteger/TestOfToByteArray.java 3 Sep 2006 03:25:42 -0000 1.1
+++ gnu/testlet/java/math/BigInteger/TestOfToByteArray.java 18 Jun 2007 20:51:54 -0000 1.2
@@ -45,7 +45,6 @@
BigInteger x = new BigInteger(BYTES);
harness.verbose("*** x = 0x" + x.toString(16));
byte[] ba = x.toByteArray();
- harness.verbose("*** y = 0x" + gnu.java.security.util.Util.dumpString(ba));
harness.check(Arrays.equals(ba, BYTES), true, "Byte arrays MUST be equal");
}
catch (Exception x)
Index: gnu/testlet/java/sql/Array/ArrayTest.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/sql/Array/ArrayTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- gnu/testlet/java/sql/Array/ArrayTest.java 4 Feb 1999 19:23:05 -0000 1.1
+++ gnu/testlet/java/sql/Array/ArrayTest.java 18 Jun 2007 21:12:31 -0000 1.2
@@ -42,6 +42,11 @@
return(null);
}
+public void
+free() throws SQLException
+{
+}
+
public int
getBaseType() throws SQLException
{
Index: gnu/testlet/java/sql/Blob/BlobTest.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/sql/Blob/BlobTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- gnu/testlet/java/sql/Blob/BlobTest.java 11 Oct 2002 10:44:16 -0000 1.2
+++ gnu/testlet/java/sql/Blob/BlobTest.java 18 Jun 2007 21:12:31 -0000 1.3
@@ -38,6 +38,17 @@
harness.check(true, "java.sql.Blob");
}
+public void
+free() throws SQLException
+{
+}
+
+public InputStream
+getBinaryStream (long a, long b) throws SQLException
+{
+ return(null);
+}
+
public long
length() throws SQLException
{
Index: gnu/testlet/java/sql/Clob/ClobTest.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/sql/Clob/ClobTest.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -u -r1.2 -r1.3
--- gnu/testlet/java/sql/Clob/ClobTest.java 11 Oct 2002 10:44:16 -0000 1.2
+++ gnu/testlet/java/sql/Clob/ClobTest.java 18 Jun 2007 21:12:31 -0000 1.3
@@ -46,6 +46,17 @@
return(0);
}
+public void
+free() throws SQLException
+{
+}
+
+public Reader
+getCharacterStream (long a, long b) throws SQLException
+{
+ return(null);
+}
+
public String
getSubString(long offset, int length) throws SQLException
{
Index: gnu/testlet/java/util/Currency/Canada.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/Currency/Canada.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- gnu/testlet/java/util/Currency/Canada.java 7 Nov 2004 14:17:44 -0000 1.1
+++ gnu/testlet/java/util/Currency/Canada.java 18 Jun 2007 15:01:54 -0000 1.2
@@ -43,6 +43,8 @@
{
Currency currency;
+ /* Set the default Locale for the JVM */
+ Locale.setDefault(TEST_LOCALE);
/* Get an instance of the currency */
currency = Currency.getInstance(TEST_LOCALE);
/* Check for the correct currency code */
Index: gnu/testlet/java/util/Currency/CanadaFrench.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/Currency/CanadaFrench.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- gnu/testlet/java/util/Currency/CanadaFrench.java 7 Nov 2004 14:17:44 -0000 1.1
+++ gnu/testlet/java/util/Currency/CanadaFrench.java 18 Jun 2007 15:01:54 -0000 1.2
@@ -43,6 +43,8 @@
{
Currency currency;
+ /* Set default Locale for the JVM */
+ Locale.setDefault(TEST_LOCALE);
/* Get an instance of the currency */
currency = Currency.getInstance(TEST_LOCALE);
/* Check for the correct currency code */
Index: gnu/testlet/java/util/Currency/China.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/Currency/China.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- gnu/testlet/java/util/Currency/China.java 7 Nov 2004 14:17:44 -0000 1.1
+++ gnu/testlet/java/util/Currency/China.java 18 Jun 2007 15:01:54 -0000 1.2
@@ -43,6 +43,8 @@
{
Currency currency;
+ /* Set default Locale for the JVM */
+ Locale.setDefault(TEST_LOCALE);
/* Get an instance of the currency */
currency = Currency.getInstance(TEST_LOCALE);
/* Check for the correct currency code */
Index: gnu/testlet/java/util/Currency/France.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/Currency/France.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- gnu/testlet/java/util/Currency/France.java 7 Nov 2004 14:17:44 -0000 1.1
+++ gnu/testlet/java/util/Currency/France.java 18 Jun 2007 15:01:54 -0000 1.2
@@ -52,6 +52,8 @@
Calendar calendar;
Calendar euroCalendar;
+ /* Set default Locale for the JVM */
+ Locale.setDefault(TEST_LOCALE);
/* Get an instance of the currency */
currency = Currency.getInstance(TEST_LOCALE);
/* Get the current time in the locale */
Index: gnu/testlet/java/util/Currency/Germany.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/Currency/Germany.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- gnu/testlet/java/util/Currency/Germany.java 7 Nov 2004 14:17:44 -0000 1.1
+++ gnu/testlet/java/util/Currency/Germany.java 18 Jun 2007 15:01:54 -0000 1.2
@@ -52,6 +52,8 @@
Calendar calendar;
Calendar euroCalendar;
+ /* Set default Locale for the JVM */
+ Locale.setDefault(TEST_LOCALE);
/* Get an instance of the currency */
currency = Currency.getInstance(TEST_LOCALE);
/* Get the current time in the locale */
Index: gnu/testlet/java/util/Currency/Italy.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/Currency/Italy.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- gnu/testlet/java/util/Currency/Italy.java 7 Nov 2004 14:17:44 -0000 1.1
+++ gnu/testlet/java/util/Currency/Italy.java 18 Jun 2007 15:01:54 -0000 1.2
@@ -52,6 +52,8 @@
Calendar calendar;
Calendar euroCalendar;
+ /* Set default Locale for the JVM */
+ Locale.setDefault(TEST_LOCALE);
/* Get an instance of the currency */
currency = Currency.getInstance(TEST_LOCALE);
/* Get the current time in the locale */
Index: gnu/testlet/java/util/Currency/Japan.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/Currency/Japan.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- gnu/testlet/java/util/Currency/Japan.java 7 Nov 2004 14:17:44 -0000 1.1
+++ gnu/testlet/java/util/Currency/Japan.java 18 Jun 2007 15:01:54 -0000 1.2
@@ -43,6 +43,8 @@
{
Currency currency;
+ /* Set default Locale for the JVM */
+ Locale.setDefault(TEST_LOCALE);
/* Get an instance of the currency */
currency = Currency.getInstance(TEST_LOCALE);
/* Check for the correct currency code */
Index: gnu/testlet/java/util/Currency/Korea.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/Currency/Korea.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- gnu/testlet/java/util/Currency/Korea.java 7 Nov 2004 14:17:44 -0000 1.1
+++ gnu/testlet/java/util/Currency/Korea.java 18 Jun 2007 15:01:54 -0000 1.2
@@ -43,6 +43,8 @@
{
Currency currency;
+ /* Set default Locale for the JVM */
+ Locale.setDefault(TEST_LOCALE);
/* Get an instance of the currency */
currency = Currency.getInstance(TEST_LOCALE);
/* Check for the correct currency code */
Index: gnu/testlet/java/util/Currency/PRC.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/Currency/PRC.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- gnu/testlet/java/util/Currency/PRC.java 7 Nov 2004 14:17:44 -0000 1.1
+++ gnu/testlet/java/util/Currency/PRC.java 18 Jun 2007 15:01:54 -0000 1.2
@@ -43,6 +43,8 @@
{
Currency currency;
+ /* Set default Locale for the JVM */
+ Locale.setDefault(TEST_LOCALE);
/* Get an instance of the currency */
currency = Currency.getInstance(TEST_LOCALE);
/* Check for the correct currency code */
Index: gnu/testlet/java/util/Currency/Taiwan.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/Currency/Taiwan.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- gnu/testlet/java/util/Currency/Taiwan.java 7 Nov 2004 14:17:44 -0000 1.1
+++ gnu/testlet/java/util/Currency/Taiwan.java 18 Jun 2007 15:01:54 -0000 1.2
@@ -43,6 +43,8 @@
{
Currency currency;
+ /* Set default Locale for the JVM */
+ Locale.setDefault(TEST_LOCALE);
/* Get an instance of the currency */
currency = Currency.getInstance(TEST_LOCALE);
/* Check for the correct currency code */
Index: gnu/testlet/java/util/Currency/UK.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/Currency/UK.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -u -r1.1 -r1.2
--- gnu/testlet/java/util/Currency/UK.java 7 Nov 2004 14:17:44 -0000 1.1
+++ gnu/testlet/java/util/Currency/UK.java 18 Jun 2007 15:01:54 -0000 1.2
@@ -43,6 +43,8 @@
{
Currency currency;
+ /* Set default Locale for the JVM */
+ Locale.setDefault(TEST_LOCALE);
/* Get an instance of the UK currency */
currency = Currency.getInstance(TEST_LOCALE);
/* Check for the correct currency code */
Index: gnu/testlet/java/util/Properties/AcuniaPropertiesTest.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/java/util/Properties/AcuniaPropertiesTest.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -u -r1.6 -r1.7
--- gnu/testlet/java/util/Properties/AcuniaPropertiesTest.java 21 Feb 2005 15:52:52 -0000 1.6
+++ gnu/testlet/java/util/Properties/AcuniaPropertiesTest.java 18 Jun 2007 20:27:29 -0000 1.7
@@ -250,7 +250,7 @@
public void test_load(){
th.checkPoint("load(java.io.InputStream)void");
Properties p = new Properties();
- try { p.load(null);
+ try { p.load((ByteArrayInputStream) null);
th.fail("should throw NullPointerException");
}
catch (NullPointerException ne) { th.check(true); }
@@ -397,7 +397,7 @@
public void test_store(){
th.checkPoint("store(java.io.OutputStream,java.lang.String)void");
Properties p = new Properties(defProps);
- try { p.store(null , "no comment");
+ try { p.store((ByteArrayOutputStream) null , "no comment");
th.fail("should throw NullPointerException");
}
catch (NullPointerException ne) { th.check(true); }
Index: gnu/testlet/locales/LocaleTest.java
===================================================================
RCS file: /cvs/mauve/mauve/gnu/testlet/locales/LocaleTest.java,v
retrieving revision 1.7
retrieving revision 1.9
diff -u -u -r1.7 -r1.9
--- gnu/testlet/locales/LocaleTest.java 25 Mar 2006 23:34:34 -0000 1.7
+++ gnu/testlet/locales/LocaleTest.java 15 Jun 2007 20:58:50 -0000 1.9
@@ -114,7 +114,8 @@
// Force GERMAN as default locale.
Locale.setDefault(Locale.GERMAN);
-
+ TimeZone.setDefault(TimeZone.getTimeZone("GMT"));
+
// Locale
if (expected != null)
@@ -284,7 +285,7 @@
checkLocale(h, new Locale("de", "DE"),
new ExpectedValues("de", "DE", "", "de_DE", "deu", "DEU",
"Deutsch", "Deutschland", "", "Deutsch (Deutschland)",
- "EUR", 2, "\u20ac"),
+ "EUR", 2, "EUR"),
new ExpectedDateValues("18.03.1974", "18.03.74", "18.03.1974", "18. M\u00e4rz 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 GMT"),
new ExpectedNumberValues("1.000", "1.000.000", "100", "100,123", "10.000.000,123"),
new ExpectedNumberValues("1.000,00 \u20ac", "1.000.000,00 \u20ac", "100,00 \u20ac", "100,12 \u20ac", "10.000.000,12 \u20ac"),
@@ -296,8 +297,8 @@
checkLocale(h, new Locale("fr", "BE"),
new ExpectedValues("fr", "BE", "", "fr_BE", "fra", "BEL",
"Franz\u00f6sisch", "Belgien", "", "Franz\u00f6sisch (Belgien)",
- "EUR", 2, "\u20ac"),
- new ExpectedDateValues("18-mars-74", "18/03/74", "18-mars-74", "18 mars 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 GMT"),
+ "EUR", 2, "EUR"),
+ new ExpectedDateValues("18-mars-1974", "18/03/74", "18-mars-1974", "18 mars 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 GMT"),
new ExpectedNumberValues("1.000", "1.000.000", "100", "100,123", "10.000.000,123"),
new ExpectedNumberValues("1.000,00 \u20ac", "1.000.000,00 \u20ac", "100,00 \u20ac", "100,12 \u20ac", "10.000.000,12 \u20ac"),
new ExpectedNumberValues("-1.000,00 \u20ac", "-1.000.000,00 \u20ac", "-100,00 \u20ac", "-100,12 \u20ac", "-10.000.000,12 \u20ac"),
@@ -323,8 +324,8 @@
checkLocale(h, new Locale("en", "IE"),
new ExpectedValues("en", "IE", "", "en_IE", "eng", "IRL",
"Englisch", "Irland", "", "Englisch (Irland)",
- "EUR", 2, "\u20ac"),
- new ExpectedDateValues("18 Mar 1974", "18/03/1974", "18 Mar 1974", "18 March 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 GMT"),
+ "EUR", 2, "EUR"),
+ new ExpectedDateValues("18-Mar-1974", "18/03/74", "18-Mar-1974", "18 March 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 GMT"),
new ExpectedNumberValues("1,000", "1,000,000", "100", "100.123", "10,000,000.123"),
new ExpectedNumberValues("\u20ac1,000.00", "\u20ac1,000,000.00", "\u20ac100.00", "\u20ac100.12", "\u20ac10,000,000.12"),
new ExpectedNumberValues("-\u20ac1,000.00", "-\u20ac1,000,000.00", "-\u20ac100.00", "-\u20ac100.12", "-\u20ac10,000,000.12"),
@@ -335,7 +336,7 @@
checkLocale(h, new Locale("fr", "FR"),
new ExpectedValues("fr", "FR", "", "fr_FR", "fra", "FRA",
"Franz\u00f6sisch", "Frankreich", "", "Franz\u00f6sisch (Frankreich)",
- "EUR", 2, "\u20ac"),
+ "EUR", 2, "EUR"),
null,
null,
null,
@@ -347,7 +348,7 @@
checkLocale(h, new Locale("es", "ES"),
new ExpectedValues("es", "ES", "", "es_ES", "spa", "ESP",
"Spanisch", "Spanien", "", "Spanisch (Spanien)",
- "EUR", 2, "\u20ac"),
+ "EUR", 2, "EUR"),
null,
null,
null,
@@ -359,7 +360,7 @@
checkLocale(h, new Locale("pt", "PT"),
new ExpectedValues("pt", "PT", "", "pt_PT", "por", "PRT",
"Portugiesisch", "Portugal", "", "Portugiesisch (Portugal)",
- "EUR", 2, "\u20ac"),
+ "EUR", 2, "EUR"),
null,
null,
null,
@@ -371,7 +372,7 @@
checkLocale(h, new Locale("it", "IT"),
new ExpectedValues("it", "IT", "", "it_IT", "ita", "ITA",
"Italienisch", "Italien", "", "Italienisch (Italien)",
- "EUR", 2, "\u20ac"),
+ "EUR", 2, "EUR"),
null,
null,
null,
@@ -383,7 +384,7 @@
checkLocale(h, new Locale("nl", "NL"),
new ExpectedValues("nl", "NL", "", "nl_NL", "nld", "NLD",
"Niederl\u00e4ndisch", "Niederlande", "", "Niederl\u00e4ndisch (Niederlande)",
- "EUR", 2, "\u20ac"),
+ "EUR", 2, "EUR"),
new ExpectedDateValues("18-mrt-1974", "18-3-74", "18-mrt-1974", "18 maart 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 GMT"),
new ExpectedNumberValues("1.000", "1.000.000", "100", "100,123", "10.000.000,123"),
new ExpectedNumberValues("\u20ac 1.000,00", "\u20ac 1.000.000,00", "\u20ac 100,00", "\u20ac 100,12", "\u20ac 10.000.000,12"),
@@ -395,7 +396,7 @@
checkLocale(h, new Locale("fr", "LU"),
new ExpectedValues("fr", "LU", "", "fr_LU", "fra", "LUX",
"Franz\u00f6sisch", "Luxemburg", "", "Franz\u00f6sisch (Luxemburg)",
- "EUR", 2, "\u20ac"),
+ "EUR", 2, "EUR"),
null,
null,
null,
@@ -407,8 +408,8 @@
checkLocale(h, Locale.UK,
new ExpectedValues("en", "GB", "", "en_GB", "eng", "GBR",
"Englisch", "Vereinigtes K\u00f6nigreich", "", "Englisch (Vereinigtes K\u00f6nigreich)",
- "GBP", 2, "\u00a3"),
- new ExpectedDateValues("18 Mar 1974", "18/03/1974", "18 Mar 1974", "18 March 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 GMT"),
+ "GBP", 2, "GBP"),
+ new ExpectedDateValues("18-Mar-1974", "18/03/74", "18-Mar-1974", "18 March 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 GMT"),
new ExpectedNumberValues("1,000", "1,000,000", "100", "100.123", "10,000,000.123"),
new ExpectedNumberValues("\u00a31,000.00", "\u00a31,000,000.00", "\u00a3100.00", "\u00a3100.12", "\u00a310,000,000.12"),
new ExpectedNumberValues("-\u00a31,000.00", "-\u00a31,000,000.00", "-\u00a3100.00", "-\u00a3100.12", "-\u00a310,000,000.12"),
@@ -418,8 +419,8 @@
// Locale: United States
checkLocale(h, Locale.US,
new ExpectedValues("en", "US", "", "en_US", "eng", "USA",
- "Englisch", "Vereinigte Staaten", "", "Englisch (Vereinigte Staaten)",
- "USD", 2, "$"),
+ "Englisch", "Vereinigte Staaten von Amerika", "", "Englisch (Vereinigte Staaten von Amerika)",
+ "USD", 2, "USD"),
new ExpectedDateValues("Mar 18, 1974", "3/18/74", "Mar 18, 1974", "March 18, 1974", "5:20:30 PM", "5:20 PM", "5:20:30 PM", "5:20:30 PM GMT"),
new ExpectedNumberValues("1,000", "1,000,000", "100", "100.123", "10,000,000.123"),
new ExpectedNumberValues("$1,000.00", "$1,000,000.00", "$100.00", "$100.12", "$10,000,000.12"),
@@ -431,23 +432,23 @@
checkLocale(h, new Locale("fi", "FI"),
new ExpectedValues("fi", "FI", "", "fi_FI", "fin", "FIN",
"Finnisch", "Finnland", "", "Finnisch (Finnland)",
- "EUR", 2, "\u20ac"),
- new ExpectedDateValues("18.3.1974", "18.3.1974", "18.3.1974", "18. maaliskuuta 1974", "17.20.30", "17.20", "17.20.30", "klo 17.20.30"),
- new ExpectedNumberValues("1,000", "1,000,000", "100", "100,123", "10,000,000,123"),
- new ExpectedNumberValues("1,000,00 \u20ac", "1,000,000,00 \u20ac", "100,00 \u20ac", "100,12 \u20ac", "10,000,000,12 \u20ac"),
- new ExpectedNumberValues("-1,000,00 \u20ac", "-1,000,000,00 \u20ac", "-100,00 \u20ac", "-100,12 \u20ac", "-10,000,000,12 \u20ac"),
- new ExpectedNumberValues("1,000", "1,000,000", "100", "100", "10,000,000"),
- new ExpectedNumberValues("1,000", "1,000,000", "100", "100,123", "10,000,000,123"),
- new ExpectedNumberValues("100,000%", "100,000,000%", "10,000%", "10,012%", "1,000,000,012%"));
+ "EUR", 2, "EUR"),
+ new ExpectedDateValues("18.3.1974", "18.3.1974", "18.3.1974", "18. maaliskuuta 1974", "17:20:30", "17:20", "17:20:30", "klo 17.20.30"),
+ new ExpectedNumberValues("1\u00a0000", "1\u00a0000\u00a0000", "100", "100,123", "10\u00a0000\u00a0000,123"),
+ new ExpectedNumberValues("1\u00a0000,00 \u20ac", "1\u00a0000\u00a0000,00 \u20ac", "100,00 \u20ac", "100,12 \u20ac", "10\u00a0000\u00a0000,12 \u20ac"),
+ new ExpectedNumberValues("-1\u00a0000,00 \u20ac", "-1\u00a0000\u00a0000,00 \u20ac", "-100,00 \u20ac", "-100,12 \u20ac", "-10\u00a0000\u00a0000,12 \u20ac"),
+ new ExpectedNumberValues("1\u00a0000", "1\u00a0000\u00a0000", "100", "100", "10\u00a0000\u00a0000"),
+ new ExpectedNumberValues("1\u00a0000", "1\u00a0000\u00a0000", "100", "100,123", "10\u00a0000\u00a0000,123"),
+ new ExpectedNumberValues("100\u00a0000%", "100\u00a0000\u00a0000%", "10\u00a0000%", "10\u00a0012%", "1\u00a0000\u00a0000\u00a0012%"));
// Locale: Turkey
checkLocale(h, new Locale("tr", "TR"),
new ExpectedValues("tr", "TR", "", "tr_TR", "tur", "TUR",
"T\u00fcrkisch", "T\u00fcrkei", "", "T\u00fcrkisch (T\u00fcrkei)",
- "TRL", 0, "TRL"),
+ "TRY", 2, "TRY"),
new ExpectedDateValues("18.Mar.1974", "18.03.1974", "18.Mar.1974", "18 Mart 1974 Pazartesi", "17:20:30", "17:20", "17:20:30", "17:20:30 GMT"),
new ExpectedNumberValues("1.000", "1.000.000", "100", "100,123", "10.000.000,123"),
- new ExpectedNumberValues("1.000 TRL", "1.000.000 TRL", "100 TRL", "100 TRL", "10.000.000 TRL"),
- new ExpectedNumberValues("-1.000 TRL", "-1.000.000 TRL", "-100 TRL", "-100 TRL", "-10.000.000 TRL"),
+ new ExpectedNumberValues("1.000,00 YTL", "1.000.000,00 YTL", "100,00 YTL", "100,12 YTL", "10.000.000,12 YTL"),
+ new ExpectedNumberValues("-1.000,00 YTL", "-1.000.000,00 YTL", "-100,00 YTL", "-100,12 YTL", "-10.000.000,12 YTL"),
new ExpectedNumberValues("1.000", "1.000.000", "100", "100", "10.000.000"),
new ExpectedNumberValues("1.000", "1.000.000", "100", "100,123", "10.000.000,123"),
new ExpectedNumberValues("100.000%", "100.000.000%", "10.000%", "10.012%", "1.000.000.012%"));
@@ -468,10 +469,10 @@
new ExpectedValues("et", "EE", "", "et_EE", "est", "EST",
"Estnisch", "Estland", "", "Estnisch (Estland)",
"EEK", 2, "EEK"),
- new ExpectedDateValues("18.03.1974", "18.03.74", "18.03.1974", "18 m\u00e4rts 1974", "17:20:30", "17:20", "17:20:30", "17:20:30 GMT"),
+ new ExpectedDateValues("18.03.1974", "18.03.74", "18.03.1974", "esmasp\u00e4ev, 18. M\u00e4rts 1974. a", "17:20:30", "17:20", "17:20:30", "17:20:30 GMT"),
new ExpectedNumberValues("1\u00a0000", "1\u00a0000\u00a0000", "100", "100,123", "10\u00a0000\u00a0000,123"),
- new ExpectedNumberValues("1\u00a0000,00 EEK", "1\u00a0000\u00a0000,00 EEK", "100,00 EEK", "100,12 EEK", "10\u00a0000\u00a0000,12 EEK"),
- new ExpectedNumberValues("-1\u00a0000,00 EEK", "-1\u00a0000\u00a0000,00 EEK", "-100,00 EEK", "-100,12 EEK", "-10\u00a0000\u00a0000,12 EEK"),
+ new ExpectedNumberValues("1\u00a0000 kr", "1\u00a0000\u00a0000 kr", "100 kr", "100,12 kr", "10\u00a0000\u00a0000,12 kr"),
+ new ExpectedNumberValues("-1\u00a0000 kr", "-1\u00a0000\u00a0000 kr", "-100 kr", "-100,12 kr", "-10\u00a0000\u00a0000,12 kr"),
new ExpectedNumberValues("1\u00a0000", "1\u00a0000\u00a0000", "100", "100", "10\u00a0000\u00a0000"),
new ExpectedNumberValues("1\u00a0000", "1\u00a0000\u00a0000", "100", "100,123", "10\u00a0000\u00a0000,123"),
new ExpectedNumberValues("100\u00a0000%", "100\u00a0000\u00a0000%", "10\u00a0000%", "10\u00a0012%", "1\u00a0000\u00a0000\u00a0012%"));