You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@harmony.apache.org by to...@apache.org on 2008/01/29 06:04:49 UTC
svn commit: r616165 - in /harmony/enhanced/classlib/trunk/modules/luni: make/exclude.common src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java

Author: tonywu
Date: Mon Jan 28 21:04:48 2008
New Revision: 616165

URL: http://svn.apache.org/viewvc?rev=616165&view=rev
Log:
Applay patch HARMONY-5439 ([classlib][luni] test_getMinimalDaysInFirstWeek in org.apache.harmony.luni.tests.java.util.GregorianCalendarTest fails on RI)

Modified:
    harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common
    harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common?rev=616165&r1=616164&r2=616165&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/make/exclude.common Mon Jan 28 21:04:48 2008
@@ -1,6 +1,5 @@
 org/apache/harmony/luni/tests/java/net/URLClassLoaderTest.java
 org/apache/harmony/luni/tests/java/net/ExcludedProxyTest.java
 org/apache/harmony/luni/tests/java/util/FormatterTest.java
-org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java
 org/apache/harmony/luni/tests/java/util/LocaleTest.java
 org/apache/harmony/luni/tests/java/util/ScannerTest.java

Modified: harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java?rev=616165&r1=616164&r2=616165&view=diff
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java (original)
+++ harmony/enhanced/classlib/trunk/modules/luni/src/test/api/common/org/apache/harmony/luni/tests/java/util/GregorianCalendarTest.java Mon Jan 28 21:04:48 2008
@@ -674,20 +674,21 @@
      */
     public void test_getMinimalDaysInFirstWeek() {
         // Regression for Harmony-1037
+        // Some non-bug differences below because of different CLDR data of Harmony
         GregorianCalendar g = new GregorianCalendar(TimeZone
                 .getTimeZone("Europe/London"), new Locale("en", "GB"));
         int minimalDaysInFirstWeek = g.getMinimalDaysInFirstWeek();
-        assertEquals(4, minimalDaysInFirstWeek);
+        assertEquals(1, minimalDaysInFirstWeek);
 
         g = new GregorianCalendar(TimeZone.getTimeZone("Europe/London"),
                 new Locale("fr"));
         minimalDaysInFirstWeek = g.getMinimalDaysInFirstWeek();
-        assertEquals(4, minimalDaysInFirstWeek);
+        assertEquals(1, minimalDaysInFirstWeek);
         
         g = new GregorianCalendar(TimeZone.getTimeZone("Europe/London"),
                 new Locale("fr", "CA"));
         minimalDaysInFirstWeek = g.getMinimalDaysInFirstWeek();
-        assertEquals(1, minimalDaysInFirstWeek);
+        assertEquals(4, minimalDaysInFirstWeek);
 
     }