You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by py...@apache.org on 2006/08/10 11:11:17 UTC
svn commit: r430330 - in
/incubator/harmony/enhanced/classlib/trunk/modules/luni/src:
main/java/org/apache/harmony/luni/internal/locale/Locale_fr_CA.java
test/java/tests/api/java/util/GregorianCalendarTest.java
Author: pyang
Date: Thu Aug 10 02:11:16 2006
New Revision: 430330
URL: http://svn.apache.org/viewvc?rev=430330&view=rev
Log:
Patch applid for HARMONY-1128([classlib][luni] java.util.GregorianCalendar.getMinimalDaysInFirstWeek() method does not return correct value)
Modified:
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fr_CA.java
incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fr_CA.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fr_CA.java?rev=430330&r1=430329&r2=430330&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fr_CA.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/main/java/org/apache/harmony/luni/internal/locale/Locale_fr_CA.java Thu Aug 10 02:11:16 2006
@@ -1,4 +1,4 @@
-/* Copyright 1998, 2005 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.
@@ -20,6 +20,7 @@
protected Object[][] getContents() {
Object[][] contents = {
{"First_Day",new java.lang.Integer(1),},
+ {"Minimal_Days",new java.lang.Integer(1),}, //$NON-NLS-1$
{"LocalPatternChars","GanjkHmsSEDFwWxhKzZ",},
{"Date_SHORT","yy-MM-dd",},
{"Date_MEDIUM","yyyy-MM-dd",},
Modified: incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java?rev=430330&r1=430329&r2=430330&view=diff
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/luni/src/test/java/tests/api/java/util/GregorianCalendarTest.java Thu Aug 10 02:11:16 2006
@@ -579,6 +579,12 @@
new Locale("fr"));
minimalDaysInFirstWeek = g.getMinimalDaysInFirstWeek();
assertEquals(4, minimalDaysInFirstWeek);
+
+ g = new GregorianCalendar(TimeZone.getTimeZone("Europe/London"),
+ new Locale("fr", "CA"));
+ minimalDaysInFirstWeek = g.getMinimalDaysInFirstWeek();
+ assertEquals(1, minimalDaysInFirstWeek);
+
}
/**