[richfaces-svn-commits] JBoss Rich Faces SVN: r4559 - branches/3.1.x/ui/calendar/src/test/java/org/richfaces/component.

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

Author: akushunin
Date: 2007-12-06 08:41:29 -0500 (Thu, 06 Dec 2007)
New Revision: 4559

Modified:
   branches/3.1.x/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java
Log:
RF-1200

Modified: branches/3.1.x/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java
===================================================================
--- branches/3.1.x/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java	2007-12-06 13:40:26 UTC (rev 4558)
+++ branches/3.1.x/ui/calendar/src/test/java/org/richfaces/component/CalendarComponentTest.java	2007-12-06 13:41:29 UTC (rev 4559)
@@ -39,6 +39,8 @@
 
 	private UICalendar calendar1;
 
+	private UICalendar calendar2;
+	
 	private static Set javaScripts = new HashSet();
 
 	static {
@@ -50,6 +52,8 @@
 				.add("org/richfaces/renderkit/html/scripts/json/json-dom.js");
 		javaScripts.add("org/richfaces/renderkit/html/scripts/calendar.js");
 		javaScripts.add("org/richfaces/renderkit/html/scripts/scriptaculous/effects.js");
+		javaScripts.add("org/richfaces/renderkit/html/scripts/JQuerySpinBtn.js");
+		javaScripts.add("org/richfaces/renderkit/html/scripts/jquery/jquery.js");
 	}
 
 	public CalendarComponentTest(String name) {
@@ -69,7 +73,7 @@
 				.createComponent(UICalendar.COMPONENT_TYPE);
 		calendar.setLocale(Locale.UK);
 		calendar.setDatePattern("d/MM/yyyy");
-		calendar.setTimeZone(TimeZone.getTimeZone("Europe/London"));
+		calendar.setTimeZone(TimeZone.getTimeZone("GMT+10:00"));
 		/*
 		 * String[] strarr = TimeZone.getAvailableIDs(); for(int i=0; i <
 		 * strarr.length; i++){ System.out.println(strarr[i]); }
@@ -79,14 +83,22 @@
 		// XXX test CurrentDate = null
 		calendar.setPopup(true);
 		Calendar calendarObject = Calendar.getInstance();
-		calendarObject.set(2001, Calendar.SEPTEMBER, 11, 1, 1, 1);
+		calendarObject.set(2001, Calendar.SEPTEMBER, 11);
 		calendar.setId("calendar");
 		calendar.setSubmittedValue(calendarObject.getTime());
 		form.getChildren().add(calendar);
 		calendar1.setId("_calendar");
 		calendar1.setPopup(false);
 		calendar1.setCurrentDate(null);
-		form.getChildren().add(calendar1);
+		form.getChildren().add(calendar1);	
+		
+		calendar2 = (UICalendar) application
+		.createComponent(UICalendar.COMPONENT_TYPE);
+		calendar2.setDatePattern("dd/M/yy HH:mm");
+		calendarObject.set(2001, Calendar.SEPTEMBER, 11, 13, 36);
+		calendar2.setSubmittedValue(calendarObject.getTime());
+		calendar2.setId("timecalendar");
+		form.getChildren().add(calendar2);
 	}
 
 	/*
@@ -159,23 +171,15 @@
 		assertEquals(calendar.getPreloadDateRangeEnd(), range[range.length - 1]);
 		assertEquals(30, range.length);
 	}
-
+		
 	public void testCalendarRenderer() throws Exception {
 
-		/*
-		 * UIViewRoot root = facesContext.getViewRoot();
-		 * root.processDecodes(facesContext);
-		 * root.processValidators(facesContext);
-		 * root.processUpdates(facesContext);
-		 * root.processApplication(facesContext);
-		 */
 		HtmlPage page = renderView();
 		assertNotNull(page);
 		//System.out.println(page.asXml());
 
-		HtmlElement htmlCalendar = page.getHtmlElementById(calendar
-				.getClientId(facesContext));
-		assertNotNull(htmlCalendar);
+		HtmlElement htmlSpan = page.getHtmlElementById(calendar.getClientId(facesContext)+"Popup");
+		assertNotNull(htmlSpan);
 
 		HtmlInput htmlCalendarInput = (HtmlInput) page
 				.getHtmlElementById(calendar.getClientId(facesContext)
@@ -190,11 +194,12 @@
 		assertNotNull(htmlCalendarButton);
 		assertNotNull(htmlCalendarSpan);
 
-		assertEquals("10/09/2001", htmlCalendarInput.getValueAttribute());
+		assertEquals("11/09/2001", htmlCalendarInput.getValueAttribute());
 
-		HtmlElement htmlCalendar1 = page.getHtmlElementById(calendar1
-				.getClientId(facesContext));
-		assertNotNull(htmlCalendar1);
+		HtmlElement htmlCalendar1Span = page.getHtmlElementById(calendar1
+				.getClientId(facesContext)+"Popup");
+		assertNotNull(htmlCalendar1Span);
+		assertEquals("display: none", htmlCalendar1Span.getAttributeValue("style"));
 
 		try {
 			HtmlInput htmlCalendarInput1 = (HtmlInput) page
@@ -203,6 +208,7 @@
 		} catch (ElementNotFoundException e) {
 			assertNotNull(e);
 		}
+		
 		try {
 			HtmlButton htmlCalendarButton1 = (HtmlButton) page
 					.getHtmlElementById(calendar1.getClientId(facesContext)
@@ -221,9 +227,9 @@
 	}
 
 	public void testCalendarDecode() throws Exception {
-		// XXX Add set Date and time
+		
 		Calendar calendarObject = Calendar.getInstance();
-		calendarObject.set(2001, Calendar.SEPTEMBER, 11, 1, 1, 1);
+		calendarObject.set(2001, Calendar.SEPTEMBER, 11);
 		calendar.decode(facesContext);
 		assertEquals(calendarObject.getTime(), calendar.getSubmittedValue());
 		calendarObject.set(2002, Calendar.SEPTEMBER, 11, 1, 1, 1);
@@ -235,7 +241,7 @@
 	public void testCalendarStyles() throws Exception {
 		HtmlPage page = renderView();
 		assertNotNull(page);
-		// System.out.println(page.asXml());
+		//System.out.println(page.asXml());
 		List links = page.getDocumentElement().getHtmlElementsByTagName("link");
 		assertEquals(1, links.size());
 		HtmlElement link = (HtmlElement) links.get(0);
@@ -258,11 +264,15 @@
 					assertTrue(scriptBodyString.contains("datePattern"));
 					assertTrue(scriptBodyString.contains("d/MM/yyyy"));
 					assertTrue(scriptBodyString.contains("selectedDate"));
-					assertTrue(scriptBodyString.contains("Date(2001,8,11)"));
 					assertTrue(scriptBodyString.contains("popup: true"));
-
+					assertTrue(scriptBodyString.contains("currentDate:"));
+					assertTrue(scriptBodyString.contains("selectedDate:"));
+				}else if(scriptBodyString.contains("form:timecalendar")){
+					
+					assertTrue(scriptBodyString.contains("selectedDate: new Date(2001,8,11,13,36,0)"));					
 				}
 			}
+			
 
 			if (StringUtils.isNotBlank(srcAttr)) {
 				boolean found = false;
@@ -278,6 +288,15 @@
 		}
 	}
 
+	public void testCalendarTime() throws Exception{
+		
+			Date time =  (Date) calendar2.getValue();
+			Calendar calendarObject = Calendar.getInstance();
+			calendarObject.set(2001, Calendar.SEPTEMBER, 11, 13, 36);
+			assertEquals(calendarObject.getTime(), calendar2.getSubmittedValue());
+			
+	}
+	
 	public void tearDown() throws Exception {
 		super.tearDown();
 		form = null;