[richfaces-svn-commits] JBoss Rich Faces SVN: r11774 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.

[richfaces-svn-commits at lists.jboss.org]

Author: andrei_exadel
Date: 2008-12-15 09:16:36 -0500 (Mon, 15 Dec 2008)
New Revision: 11774

Modified:
   trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
Log:
Fix compilation error under SDK 1.5

Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java	2008-12-15 14:16:31 UTC (rev 11773)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java	2008-12-15 14:16:36 UTC (rev 11774)
@@ -28,6 +28,7 @@
 import static org.ajax4jsf.bean.CalendarTestBean.getDayInMay;
 import static org.ajax4jsf.bean.CalendarTestBean.valueChangeListener;
 
+import java.text.DateFormatSymbols;
 import java.text.ParseException;
 import java.text.SimpleDateFormat;
 import java.util.ArrayList;
@@ -80,6 +81,10 @@
     	WEEK_DAYS_RU.add("Сб");
     	WEEK_DAYS_RU.add("Вс");  	
     }
+    
+    static final DateFormatSymbols symbolsUS = new DateFormatSymbols(Locale.US); 
+    
+    static final DateFormatSymbols symbolsRU = new DateFormatSymbols(new Locale("ru"));
 
     String calendarId;
 
@@ -368,7 +373,7 @@
     	if (!date.contains(String.valueOf(c.get(Calendar.YEAR)))) {
     		Assert.fail(message + "Current date is invalid. Date string ["+date+"] does not contain current year");
     	}
-    	if (!date.contains(String.valueOf(c.getDisplayName(Calendar.MONTH, Calendar.SHORT, Locale.US)))) {
+    	if (!date.contains(symbolsUS.getShortMonths()[c.get(Calendar.MONTH)])) {
     		Assert.fail(message + "Current date is invalid. Date string ["+date+"] does not contain current month");
     	}
 
@@ -376,7 +381,7 @@
     		Assert.fail(message + "Current date is invalid. Date string ["+date+"] does not contain current day");
     	}
 
-    	if (!date.contains(String.valueOf(c.getDisplayName(Calendar.DAY_OF_WEEK, Calendar.SHORT, Locale.US)))) {
+    	if (!date.contains(symbolsUS.getShortWeekdays()[c.get(Calendar.DAY_OF_WEEK)])) {
     		Assert.fail(message + "Current date is invalid. Date string ["+date+"] does not contain current day of week");
     	}
 
@@ -385,7 +390,7 @@
     
     private void checkCurrentDate(Calendar c) {
     	String headerDate = getCalendarDate();
-    	String expected = c.getDisplayName(Calendar.MONTH, Calendar.LONG, Locale.US);
+    	String expected = symbolsUS.getMonths()[c.get(Calendar.MONTH)];//   c.getDisplayName(Calendar.MONTH, Calendar.LONG, Locale.US);
     	if (!headerDate.contains(expected)) {
     		Assert.fail("Calendar displays invalid date. It should contain ["+expected+"]. But was ["+headerDate+"]");
     	}