[richfaces-svn-commits] JBoss Rich Faces SVN: r11960 - in trunk/ui/calendar/src/test: java/org/richfaces/component and 5 other directories.

Author: alevkovsky Date: 2008-12-22 08:08:17 -0500 (Mon, 22 Dec 2008) New Revision: 11960 Added: trunk/ui/calendar/src/test/resources/ trunk/ui/calendar/src/test/resources/org/ trunk/ui/calendar/src/test/resources/org/richfaces/ trunk/ui/calendar/src/test/resources/org/richfaces/renderkit/ trunk/ui/calendar/src/test/resources/org/richfaces/renderkit/calendar_ru_RU.properties Modified: trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java trunk/ui/calendar/src/test/java/org/richfaces/renderkit/html/iconimages/CalendarIconTest.java Log: Add JUnits for calendar Modified: trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java =================================================================== --- trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java 2008-12-22 13:06:14 UTC (rev 11959) +++ trunk/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java 2008-12-22 13:08:17 UTC (rev 11960) @@ -35,6 +35,8 @@ import org.ajax4jsf.renderkit.RendererUtils.HTML; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.apache.commons.lang.StringUtils; +import org.richfaces.renderkit.CalendarRendererBase; +import org.richfaces.renderkit.html.CalendarRenderer; import com.gargoylesoftware.htmlunit.ElementNotFoundException; import com.gargoylesoftware.htmlunit.html.HtmlButton; @@ -43,6 +45,7 @@ import com.gargoylesoftware.htmlunit.html.HtmlPage; import com.gargoylesoftware.htmlunit.html.HtmlScript; import com.gargoylesoftware.htmlunit.html.HtmlSpan; +import com.sun.org.apache.bcel.internal.generic.NEW; /** * @author Nick Belaevski - mailto:nbelaevski@exadel.com created 08.06.2007 @@ -58,6 +61,8 @@ private UICalendar calendar2; + private UICalendar calendar3; + private static Set<String> javaScripts = new HashSet<String>(); static { @@ -114,6 +119,18 @@ calendar2.setValue(calendarObject.getTime()); calendar2.setId("timecalendar"); form.getChildren().add(calendar2); + + calendar3 = (UICalendar) application + .createComponent(UICalendar.COMPONENT_TYPE); + calendar3.setDatePattern("dd/M/yy HH:mm"); + calendarObject.set(2001, Calendar.SEPTEMBER, 11, 13, 36); + calendar3.setValue(calendarObject.getTime()); + calendar3.setId("timecalendar"); + calendar3.setMode(UICalendar.AJAX_MODE); + calendar3.setLocale(new Locale("ru", "RU", "")); + calendar3.setCellHeight("50"); + calendar3.setCellWidth("50"); + form.getChildren().add(calendar3); } /* @@ -313,6 +330,22 @@ } + public void testCalendarGetConvertedValue() throws Exception{ + UICalendar calendar = (UICalendar) application + .createComponent(UICalendar.COMPONENT_TYPE); + Calendar calendarObject = Calendar.getInstance(); + calendarObject.clear(); + calendarObject.set(2007, Calendar.JUNE, 10); + calendar.setCurrentDate(calendarObject.getTime()); + calendar2.setDatePattern("dd/M/yy"); + calendar.getConvertedValue(facesContext, "01/01/01"); + calendar.getAsDate(new Date()); + calendar.getAsLocale("ru_RU"); + CalendarRendererBase renderer = new CalendarRenderer(); + + renderer.getConvertedValue(facesContext, calendar, new Date()); + } + public void tearDown() throws Exception { super.tearDown(); form = null; Modified: trunk/ui/calendar/src/test/java/org/richfaces/renderkit/html/iconimages/CalendarIconTest.java =================================================================== --- trunk/ui/calendar/src/test/java/org/richfaces/renderkit/html/iconimages/CalendarIconTest.java 2008-12-22 13:06:14 UTC (rev 11959) +++ trunk/ui/calendar/src/test/java/org/richfaces/renderkit/html/iconimages/CalendarIconTest.java 2008-12-22 13:08:17 UTC (rev 11960) @@ -21,7 +21,9 @@ package org.richfaces.renderkit.html.iconimages; import java.awt.Color; +import java.awt.image.BufferedImage; +import org.ajax4jsf.resource.ResourceContext; import org.ajax4jsf.tests.AbstractAjax4JsfTestCase; import org.ajax4jsf.util.HtmlColor; import org.richfaces.skin.Skin; @@ -74,5 +76,8 @@ assertEquals(color1, results[0]); assertEquals(color2, results[1]); + BufferedImage img = icon.paintImage(results); + assertNotNull(img); } + } Added: trunk/ui/calendar/src/test/resources/org/richfaces/renderkit/calendar_ru_RU.properties =================================================================== --- trunk/ui/calendar/src/test/resources/org/richfaces/renderkit/calendar_ru_RU.properties (rev 0) +++ trunk/ui/calendar/src/test/resources/org/richfaces/renderkit/calendar_ru_RU.properties 2008-12-22 13:08:17 UTC (rev 11960) @@ -0,0 +1,6 @@ +RICH_CALENDAR_APPLY_LABEL=\u043F\u0440\u0438\u043C\u0435\u043D\u0438\u0442\u044C +RICH_CALENDAR_TODAY_LABEL=\u0441\u0435\u0433\u043E\u0434\u043D\u044F +RICH_CALENDAR_CLOSE_LABEL=\u0437\u0430\u043A\u0440\u044B\u0442\u044C +RICH_CALENDAR_OK_LABEL=\u043E\u043A\u0435\u0439 +RICH_CALENDAR_CLEAN_LABEL=\u043E\u0447\u0438\u0441\u0442\u0438\u0442\u044C +RICH_CALENDAR_CANCEL_LABEL=\u043E\u0442\u043C\u0435\u043D\u0438\u0442\u044C Property changes on: trunk/ui/calendar/src/test/resources/org/richfaces/renderkit/calendar_ru_RU.properties ___________________________________________________________________ Name: svn:mime-type + text/plain Name: svn:eol-style + native