Author: abelevich Date: 2009-03-10 06:28:21 -0400 (Tue, 10 Mar 2009) New Revision: 12900 Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java Log: fix bugs 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 2009-03-09 23:19:03 UTC (rev 12899) +++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2009-03-10 10:28:21 UTC (rev 12900) @@ -52,7 +52,9 @@ static final String RESET_METHOD = "#{calendarBean.reset}"; static final String RESET_METHOD2 = "#{calendarBean.reset2}"; - + + static final String RESET_METHOD3 = "#{calendarBean.reset3}"; + static final String INIT_SHOW_ATTRIBUTES_TEST = "#{calendarBean.initShowAttributesTest}"; static final String INIT_REQUIRED_TEST = "#{calendarBean.initRequiredTest}"; @@ -985,7 +987,7 @@ @Test public void testValueAndCurrentDateOfCalendarInCaseOfPopupTrue(Template template) { - renderPage(template, RESET_METHOD); + renderPage(template, RESET_METHOD3); initIds(getParentId()); String expectedSelectedDate = "03/03/2007 11:00"; String expectedCurrentDate = "04/04/2008 13:00"; @@ -1824,7 +1826,7 @@ jointPoint = jointPoint.replaceAll("\\$", WINDOW_JS_RESOLVER + "\\$"); String expression; if ("==".equals(operation)) { - expression = "Math.abs(" + calendarPoint + " - " + jointPoint + ") < 2"; + expression = "Math.abs(" + calendarPoint + " - " + jointPoint + ") <= 2"; } else { expression = calendarPoint + " " + operation + " " + jointPoint; }