JBoss Rich Faces SVN: r11513 - trunk/test-applications/seleniumTest.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-12-03 08:29:52 -0500 (Wed, 03 Dec 2008)
New Revision: 11513
Modified:
trunk/test-applications/seleniumTest/pom.xml
Log:
RF-5197
only for test
Modified: trunk/test-applications/seleniumTest/pom.xml
===================================================================
--- trunk/test-applications/seleniumTest/pom.xml 2008-12-03 13:13:07 UTC (rev 11512)
+++ trunk/test-applications/seleniumTest/pom.xml 2008-12-03 13:29:52 UTC (rev 11513)
@@ -206,6 +206,11 @@
<module>samples</module>
</modules>
<dependencies>
+ <dependency>
+ <groupId>com.sun.facelets</groupId>
+ <artifactId>jsf-facelets</artifactId>
+ <version>1.1.14</version>
+ </dependency>
<dependency>
<groupId>javax.el</groupId>
<artifactId>el-api</artifactId>
16 years
JBoss Rich Faces SVN: r11512 - trunk/test-applications/seleniumTest.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-12-03 08:13:07 -0500 (Wed, 03 Dec 2008)
New Revision: 11512
Modified:
trunk/test-applications/seleniumTest/pom.xml
Log:
RF-5197
only for test
Modified: trunk/test-applications/seleniumTest/pom.xml
===================================================================
--- trunk/test-applications/seleniumTest/pom.xml 2008-12-03 12:49:44 UTC (rev 11511)
+++ trunk/test-applications/seleniumTest/pom.xml 2008-12-03 13:13:07 UTC (rev 11512)
@@ -207,6 +207,16 @@
</modules>
<dependencies>
<dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
+ <groupId>el-impl</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>1.0</version>
+ </dependency>
+ <dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
<version>2.5</version>
16 years
JBoss Rich Faces SVN: r11511 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/calendar and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2008-12-03 07:49:44 -0500 (Wed, 03 Dec 2008)
New Revision: 11511
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/calendarTest.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java
Log:
https://jira.jboss.org/jira/browse/RF-5153 started
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java 2008-12-03 12:42:14 UTC (rev 11510)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/CalendarTestBean.java 2008-12-03 12:49:44 UTC (rev 11511)
@@ -35,11 +35,11 @@
import org.richfaces.event.CurrentDateChangeEvent;
public class CalendarTestBean {
-
- public static final String valueChangeListener = "valueChangeListener";
-
- public static final String currentDateChangeListener = "currentDateChangeListener";
+ public static final String valueChangeListener = "valueChangeListener";
+
+ public static final String currentDateChangeListener = "currentDateChangeListener";
+
public static final String DATE_PATTERN = "MM/dd/yyyy HH:mm";
public static final Locale LOCALE = new Locale("US");
@@ -52,35 +52,35 @@
public static DateFormat DATE_FORMAT;
- // constructor for static fields
+ // constructor for static fields
static {
- setupDefaultConverter();
- setupDefaultDate();
+ setupDefaultConverter();
+ setupDefaultDate();
}
-
- private String datePattern ;
-
+
+ private String datePattern;
+
private Locale locale;
-
+
private TimeZone timeZone;
-
+
private Date selectedDate;
-
+
private String selectedDateString;
-
+
private CalendarDataModel model;
-
- private String mode = UICalendar.AJAX_MODE;
-
+
+ private String mode = UICalendar.AJAX_MODE;
+
private String status;
-
+
public CalendarTestBean() {
- selectedDate = DEFAULT_DATE;
- resetSelectedDateString();
-
- datePattern = DATE_PATTERN;
- locale = LOCALE;
- timeZone = TIME_ZONE;
+ selectedDate = DEFAULT_DATE;
+ resetSelectedDateString();
+
+ datePattern = DATE_PATTERN;
+ locale = LOCALE;
+ timeZone = TIME_ZONE;
}
public Date getSelectedDate() {
@@ -91,11 +91,11 @@
this.selectedDate = selectedDate;
resetSelectedDateString();
}
-
+
public void resetSelectedDateString() {
- setSelectedDateString(DATE_FORMAT.format(getSelectedDate()));
+ setSelectedDateString(DATE_FORMAT.format(getSelectedDate()));
}
-
+
public String getSelectedDateString() {
return selectedDateString;
}
@@ -121,112 +121,134 @@
}
public void setLocale(Locale locale) {
- this.locale = locale;
+ this.locale = locale;
}
public void setTimeZone(TimeZone timeZone) {
- this.timeZone = timeZone;
+ this.timeZone = timeZone;
}
-
+
public static Calendar getCalendar() {
- return Calendar.getInstance(CalendarTestBean.TIME_ZONE, CalendarTestBean.LOCALE);
+ return Calendar.getInstance(CalendarTestBean.TIME_ZONE, CalendarTestBean.LOCALE);
}
-
+
/**
* Setup the default date
*/
private static void setupDefaultDate() {
- DEFAULT_DATE = getDayInMay(10);
+ DEFAULT_DATE = getDayInMay(10);
}
-
+
public static Date getDayInMay(int dayOfMonth) {
- Calendar calendar = getCalendar();
- calendar.set(Calendar.DAY_OF_MONTH, dayOfMonth);
- calendar.set(Calendar.MONTH, Calendar.MAY);
- calendar.set(Calendar.YEAR, 2008);
- calendar.set(Calendar.HOUR_OF_DAY, 18);
- calendar.set(Calendar.MINUTE, 25);
- calendar.set(Calendar.SECOND, 0);
- calendar.set(Calendar.MILLISECOND, 0);
-
- return calendar.getTime();
+ Calendar calendar = getCalendar();
+ calendar.set(Calendar.DAY_OF_MONTH, dayOfMonth);
+ calendar.set(Calendar.MONTH, Calendar.MAY);
+ calendar.set(Calendar.YEAR, 2008);
+ calendar.set(Calendar.HOUR_OF_DAY, 18);
+ calendar.set(Calendar.MINUTE, 25);
+ calendar.set(Calendar.SECOND, 0);
+ calendar.set(Calendar.MILLISECOND, 0);
+
+ return calendar.getTime();
}
-
+
/**
* Setup the default converter
*/
- private static void setupDefaultConverter() {
- DEFAULT_CONVERTER = new DateTimeConverter();
+ private static void setupDefaultConverter() {
+ DEFAULT_CONVERTER = new DateTimeConverter();
- DEFAULT_CONVERTER.setPattern(DATE_PATTERN);
- DEFAULT_CONVERTER.setLocale(LOCALE);
- DEFAULT_CONVERTER.setTimeZone(TIME_ZONE);
-
- try {
- Method method = null;
- Method[] declaredMethods = DateTimeConverter.class.getDeclaredMethods();
- for (int i = 0; i < declaredMethods.length; i++) {
- if (declaredMethods[i].getName().equals("getDateFormat")) {
- method = declaredMethods[i];
- break;
- }
- }
- if (method != null) {
+ DEFAULT_CONVERTER.setPattern(DATE_PATTERN);
+ DEFAULT_CONVERTER.setLocale(LOCALE);
+ DEFAULT_CONVERTER.setTimeZone(TIME_ZONE);
- method.setAccessible(true);
- DATE_FORMAT = (DateFormat) method.invoke(DEFAULT_CONVERTER, DEFAULT_CONVERTER.getLocale());
- DATE_FORMAT.setTimeZone(DEFAULT_CONVERTER.getTimeZone());
- }
- } catch (Exception e) {
- // skip exception
- }
+ try {
+ Method method = null;
+ Method[] declaredMethods = DateTimeConverter.class.getDeclaredMethods();
+ for (int i = 0; i < declaredMethods.length; i++) {
+ if (declaredMethods[i].getName().equals("getDateFormat")) {
+ method = declaredMethods[i];
+ break;
+ }
+ }
+ if (method != null) {
+
+ method.setAccessible(true);
+ DATE_FORMAT = (DateFormat) method.invoke(DEFAULT_CONVERTER, DEFAULT_CONVERTER.getLocale());
+ DATE_FORMAT.setTimeZone(DEFAULT_CONVERTER.getTimeZone());
+ }
+ } catch (Exception e) {
+ // skip exception
+ }
}
-
+
public void valueChangeListener(ValueChangeEvent event) {
- status = getStatus() + valueChangeListener;
+ status = getStatus() + valueChangeListener;
}
-
+
public void currectDateChangeListener(CurrentDateChangeEvent event) {
- status = getStatus() + currentDateChangeListener;
+ status = getStatus() + currentDateChangeListener;
}
-
+
public String testClientMode() {
- mode = UICalendar.CLIENT_MODE;
- return null;
+ mode = UICalendar.CLIENT_MODE;
+ return null;
}
-
+
public void reset() {
- mode = UICalendar.AJAX_MODE;
- status = "";
- selectedDate = new Date();
+ mode = UICalendar.AJAX_MODE;
+ status = "";
+ selectedDate = new Date();
}
-
+
public String resetAction() {
- reset();
- return null;
+ reset();
+ return null;
}
- public String getStatus() {
- return status;
- }
+ public String getStatus() {
+ return status;
+ }
- public void setStatus(String status) {
- this.status = status;
- }
+ public void setStatus(String status) {
+ this.status = status;
+ }
- public String getMode() {
- return mode;
- }
+ public String getMode() {
+ return mode;
+ }
- public void setMode(String mode) {
- this.mode = mode;
- }
+ public void setMode(String mode) {
+ this.mode = mode;
+ }
- public CalendarDataModel getModel() {
- return model;
- }
+ public CalendarDataModel getModel() {
+ return model;
+ }
- public void setModel(CalendarDataModel model) {
- this.model = model;
- }
+ public void setModel(CalendarDataModel model) {
+ this.model = model;
+ }
+
+ private Date currentDate = null;
+
+ /**
+ * Gets value of currentDate field.
+ *
+ * @return value of currentDate field
+ */
+ public Date getCurrentDate() {
+ return currentDate;
+ }
+
+ /**
+ * Set a new value for currentDate field.
+ *
+ * @param currentDate
+ * a new value for currentDate field
+ */
+ public void setCurrentDate(Date currentDate) {
+ this.currentDate = currentDate;
+ }
+
}
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/calendar/calendarTest.xhtml
===================================================================
(Binary files differ)
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-03 12:42:14 UTC (rev 11510)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/CalendarTest.java 2008-12-03 12:49:44 UTC (rev 11511)
@@ -32,203 +32,197 @@
public class CalendarTest extends SeleniumTestBase {
- static final String RESET_METHOD = "#{calendarBean.reset}";
+ static final String RESET_METHOD = "#{calendarBean.reset}";
- static final String FORM_ID = "_form:";
- static final String CONTROLS_FORM_ID = "_controls:";
-
- static final String availableDayCellClass = "rich-calendar-cell-size rich-calendar-cell rich-calendar-btn";
-
- String calendarId;
- String calendarHeaderId;
- String ajaxSubmitId;
- String serverSubmitId;
- String statusId;
- String resetActionId;
- String testClientModeId;
+ static final String FORM_ID = "_form:";
- void initIds(String parentId) {
- calendarId = parentId + FORM_ID + "calendar";
- calendarHeaderId = calendarId + "Header";
- ajaxSubmitId = parentId + FORM_ID + "ajaxSubmit";
- serverSubmitId = parentId + FORM_ID + "serverSubmit";
- statusId = parentId + FORM_ID + "status";
- resetActionId = parentId + CONTROLS_FORM_ID + "resetAction";
- testClientModeId = parentId + CONTROLS_FORM_ID + "testClientMode";
- }
+ static final String CONTROLS_FORM_ID = "_controls:";
- String getStatus() {
- return getTextById(statusId);
- }
+ static final String availableDayCellClass = "rich-calendar-cell-size rich-calendar-cell rich-calendar-btn";
- void assertListeners(String... listener) {
- String status = getStatus();
- String s = status;
- String sum = "";
- for (String l : listener) {
- if (status.indexOf(l) == -1) {
- Assert.fail(l + " has been skipped");
- } else {
- s = s.replace(l, "");
- }
- sum += l;
- }
- if (s.length() > 0) {
- Assert.fail("The following listener were called but shouldn't: "
- + s);
- }
- if (!status.equals(sum)) {
- Assert.fail("Order of listeners call is incorrect. Should be: "
- + sum + ". But was : " + status);
- }
- }
-
- void changeDate() {
- String weekNumId = calendarId + "WeekNum2";
- selenium.click("//tr[@id='"+weekNumId+"']/td[@class='"+availableDayCellClass+"']");
- }
-
- void changeCurrentDate(boolean wait4ajax) {
- selenium.click("//td[@id='"+calendarHeaderId+"']/table/tbody/tr/td/div");
- if (wait4ajax) {
- waitForAjaxCompletion();
- }
- }
-
- void reset() {
- clickCommandAndWait(resetActionId);
- }
-
- void switchToClientMode() {
- clickCommandAndWait(testClientModeId);
- }
-
- @Test
- public void testListenersInAjaxMode(Template template) {
- renderPage(template, RESET_METHOD);
- initIds(getParentId());
+ String calendarId;
- changeDate();
-
- clickAjaxCommandAndWait(ajaxSubmitId);
- assertListeners(CalendarTestBean.valueChangeListener);
-
- reset();
-
- changeCurrentDate(true);
- changeDate();
- clickAjaxCommandAndWait(ajaxSubmitId);
- assertListeners(CalendarTestBean.valueChangeListener, CalendarTestBean.currentDateChangeListener);
-
- }
-
-
- @Test
- public void testListenersInClientMode(Template template) {
- renderPage(template, RESET_METHOD);
- initIds(getParentId());
- switchToClientMode();
-
- changeDate();
-
- clickCommandAndWait(serverSubmitId);
- assertListeners(CalendarTestBean.valueChangeListener);
-
- reset();
- switchToClientMode();
-
- changeCurrentDate(false);
- changeDate();
- clickCommandAndWait(serverSubmitId);
- assertListeners(CalendarTestBean.valueChangeListener, CalendarTestBean.currentDateChangeListener);
-
- }
+ String calendarHeaderId;
+ String ajaxSubmitId;
- // @Test
- public void testCalendarComponent(Template template) {
- renderPage(template);
+ String serverSubmitId;
- String containerId = getParentId() + "_form:";
- String calendarOpenedId = containerId + "calendar";
- String calendarCollapsedId = calendarOpenedId + "Popup";
- String calendarInputDate = calendarOpenedId + "InputDate";
- String calendarPopupButton = calendarCollapsedId + "Button";
- String outputPanel = containerId + "outputPanel";
+ String statusId;
- Assert.assertFalse(isVisibleById(calendarOpenedId),
- "Calendar window should NOT be visible on the component!");
+ String resetActionId;
- writeStatus("Mouse click on calendar InputDate field");
- clickById(calendarInputDate);
+ String testClientModeId;
- Assert.assertTrue(isVisibleById(calendarOpenedId),
- "Calendar window should be visible on the component!");
+ void initIds(String parentId) {
+ calendarId = parentId + FORM_ID + "calendar";
+ calendarHeaderId = calendarId + "Header";
+ ajaxSubmitId = parentId + FORM_ID + "ajaxSubmit";
+ serverSubmitId = parentId + FORM_ID + "serverSubmit";
+ statusId = parentId + FORM_ID + "status";
+ resetActionId = parentId + CONTROLS_FORM_ID + "resetAction";
+ testClientModeId = parentId + CONTROLS_FORM_ID + "testClientMode";
+ }
- writeStatus("Mouse click outside calendar");
- clickById(outputPanel);
+ String getStatus() {
+ return getTextById(statusId);
+ }
- Assert.assertFalse(isVisibleById(calendarOpenedId),
- "Calendar window should NOT be visible on the component!");
+ void assertListeners(String... listener) {
+ String status = getStatus();
+ String s = status;
+ String sum = "";
+ for (String l : listener) {
+ if (status.indexOf(l) == -1) {
+ Assert.fail(l + " has been skipped");
+ } else {
+ s = s.replace(l, "");
+ }
+ sum += l;
+ }
+ if (s.length() > 0) {
+ Assert.fail("The following listener were called but shouldn't: " + s);
+ }
+ if (!status.equals(sum)) {
+ Assert.fail("Order of listeners call is incorrect. Should be: " + sum + ". But was : " + status);
+ }
+ }
- writeStatus("Mouse click on calendar popup button");
- clickById(calendarPopupButton);
+ void changeDate() {
+ String weekNumId = calendarId + "WeekNum2";
+ selenium.click("//tr[@id='" + weekNumId + "']/td[@class='" + availableDayCellClass + "']");
+ }
- Assert.assertTrue(isVisibleById(calendarOpenedId),
- "Calendar window should be visible on the component!");
- }
+ void changeCurrentDate(boolean wait4ajax) {
+ selenium.click("//td[@id='" + calendarHeaderId + "']/table/tbody/tr/td/div");
+ if (wait4ajax) {
+ waitForAjaxCompletion();
+ }
+ }
- // @Test
- public void testSelectDateComponent(Template template) {
- renderPage(template);
+ void reset() {
+ clickCommandAndWait(resetActionId);
+ }
- Date newSelectedDate = CalendarTestBean.getDayInMay(15);
+ void switchToClientMode() {
+ clickCommandAndWait(testClientModeId);
+ }
- String containerId = getParentId() + "_form:";
- String calendarOpenedId = containerId + "calendar";
- String calendarCollapsedId = calendarOpenedId + "Popup";
- String calendarInputDate = calendarOpenedId + "InputDate";
- String calendarPopupButton = calendarCollapsedId + "Button";
- String outputPanel = containerId + "outputPanel";
+ @Test
+ public void testListenersInAjaxMode(Template template) {
+ renderPage(template, RESET_METHOD);
+ initIds(getParentId());
- Assert.assertFalse(isVisibleById(calendarOpenedId),
- "Calendar window should NOT be visible on the component!");
- writeStatus("Mouse click on calendar popup button");
- clickById(calendarPopupButton);
- Assert.assertTrue(isVisibleById(calendarOpenedId),
- "Calendar window should be visible on the component!");
+ changeDate();
- String inputDateString = getValueById(calendarInputDate);
- Date readDate = null;
- try {
- readDate = CalendarTestBean.DATE_FORMAT.parse(inputDateString);
- } catch (ParseException parseException) {
- // skip exception
- }
- Assert.assertEquals(readDate, CalendarTestBean.DEFAULT_DATE,
- "Default date representation is wrong!");
+ clickAjaxCommandAndWait(ajaxSubmitId);
+ assertListeners(CalendarTestBean.valueChangeListener);
- // click on 15th of May
- String newSelectedDateId = calendarOpenedId + "DayCell18";
- clickById(newSelectedDateId);
+ reset();
- writeStatus("Mouse click outside calendar");
- clickById(outputPanel);
+ changeCurrentDate(true);
+ changeDate();
+ clickAjaxCommandAndWait(ajaxSubmitId);
+ assertListeners(CalendarTestBean.valueChangeListener, CalendarTestBean.currentDateChangeListener);
- inputDateString = getValueById(calendarInputDate);
- try {
- readDate = CalendarTestBean.DATE_FORMAT.parse(inputDateString);
- } catch (ParseException parseException) {
- // skip exception
- }
- Assert.assertEquals(readDate, newSelectedDate,
- "Date representation after selecting 15.May.2008 is wrong!");
+ }
- Assert.assertFalse(isVisibleById(calendarOpenedId),
- "Calendar window should NOT be visible on the component!");
- }
+ @Test
+ public void testListenersInClientMode(Template template) {
+ renderPage(template, RESET_METHOD);
+ initIds(getParentId());
+ switchToClientMode();
- public String getTestUrl() {
- return "pages/calendar/calendarTest.xhtml";
- }
+ changeDate();
+
+ clickCommandAndWait(serverSubmitId);
+ assertListeners(CalendarTestBean.valueChangeListener);
+
+ reset();
+ switchToClientMode();
+
+ changeCurrentDate(false);
+ changeDate();
+ clickCommandAndWait(serverSubmitId);
+ assertListeners(CalendarTestBean.valueChangeListener, CalendarTestBean.currentDateChangeListener);
+
+ }
+
+ // @Test
+ public void testCalendarComponent(Template template) {
+ renderPage(template);
+
+ String containerId = getParentId() + "_form:";
+ String calendarOpenedId = containerId + "calendar";
+ String calendarCollapsedId = calendarOpenedId + "Popup";
+ String calendarInputDate = calendarOpenedId + "InputDate";
+ String calendarPopupButton = calendarCollapsedId + "Button";
+ String outputPanel = containerId + "outputPanel";
+
+ Assert.assertFalse(isVisibleById(calendarOpenedId), "Calendar window should NOT be visible on the component!");
+
+ writeStatus("Mouse click on calendar InputDate field");
+ clickById(calendarInputDate);
+
+ Assert.assertTrue(isVisibleById(calendarOpenedId), "Calendar window should be visible on the component!");
+
+ writeStatus("Mouse click outside calendar");
+ clickById(outputPanel);
+
+ Assert.assertFalse(isVisibleById(calendarOpenedId), "Calendar window should NOT be visible on the component!");
+
+ writeStatus("Mouse click on calendar popup button");
+ clickById(calendarPopupButton);
+
+ Assert.assertTrue(isVisibleById(calendarOpenedId), "Calendar window should be visible on the component!");
+ }
+
+ // @Test
+ public void testSelectDateComponent(Template template) {
+ renderPage(template);
+
+ Date newSelectedDate = CalendarTestBean.getDayInMay(15);
+
+ String containerId = getParentId() + "_form:";
+ String calendarOpenedId = containerId + "calendar";
+ String calendarCollapsedId = calendarOpenedId + "Popup";
+ String calendarInputDate = calendarOpenedId + "InputDate";
+ String calendarPopupButton = calendarCollapsedId + "Button";
+ String outputPanel = containerId + "outputPanel";
+
+ Assert.assertFalse(isVisibleById(calendarOpenedId), "Calendar window should NOT be visible on the component!");
+ writeStatus("Mouse click on calendar popup button");
+ clickById(calendarPopupButton);
+ Assert.assertTrue(isVisibleById(calendarOpenedId), "Calendar window should be visible on the component!");
+
+ String inputDateString = getValueById(calendarInputDate);
+ Date readDate = null;
+ try {
+ readDate = CalendarTestBean.DATE_FORMAT.parse(inputDateString);
+ } catch (ParseException parseException) {
+ // skip exception
+ }
+ Assert.assertEquals(readDate, CalendarTestBean.DEFAULT_DATE, "Default date representation is wrong!");
+
+ // click on 15th of May
+ String newSelectedDateId = calendarOpenedId + "DayCell18";
+ clickById(newSelectedDateId);
+
+ writeStatus("Mouse click outside calendar");
+ clickById(outputPanel);
+
+ inputDateString = getValueById(calendarInputDate);
+ try {
+ readDate = CalendarTestBean.DATE_FORMAT.parse(inputDateString);
+ } catch (ParseException parseException) {
+ // skip exception
+ }
+ Assert.assertEquals(readDate, newSelectedDate, "Date representation after selecting 15.May.2008 is wrong!");
+
+ Assert.assertFalse(isVisibleById(calendarOpenedId), "Calendar window should NOT be visible on the component!");
+ }
+
+ public String getTestUrl() {
+ return "pages/calendar/calendarTest.xhtml";
+ }
}
16 years
JBoss Rich Faces SVN: r11510 - trunk/test-applications/seleniumTest.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-12-03 07:42:14 -0500 (Wed, 03 Dec 2008)
New Revision: 11510
Modified:
trunk/test-applications/seleniumTest/pom.xml
Log:
RF-5197
only for test
Modified: trunk/test-applications/seleniumTest/pom.xml
===================================================================
--- trunk/test-applications/seleniumTest/pom.xml 2008-12-03 12:39:53 UTC (rev 11509)
+++ trunk/test-applications/seleniumTest/pom.xml 2008-12-03 12:42:14 UTC (rev 11510)
@@ -207,6 +207,18 @@
</modules>
<dependencies>
<dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet.jsp</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.1</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
<groupId>javax.faces</groupId>
<artifactId>jsf-api</artifactId>
<version>1.2_10</version>
16 years
JBoss Rich Faces SVN: r11509 - trunk/test-applications/seleniumTest.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-12-03 07:39:53 -0500 (Wed, 03 Dec 2008)
New Revision: 11509
Modified:
trunk/test-applications/seleniumTest/pom.xml
Log:
RF-5197
only for test
Modified: trunk/test-applications/seleniumTest/pom.xml
===================================================================
--- trunk/test-applications/seleniumTest/pom.xml 2008-12-03 12:35:40 UTC (rev 11508)
+++ trunk/test-applications/seleniumTest/pom.xml 2008-12-03 12:39:53 UTC (rev 11509)
@@ -206,6 +206,17 @@
<module>samples</module>
</modules>
<dependencies>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-api</artifactId>
+ <version>1.2_10</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.faces</groupId>
+ <artifactId>jsf-impl</artifactId>
+ <version>1.2_10</version>
+ <scope>runtime</scope>
+ </dependency>
<dependency>
<groupId>org.testng</groupId>
<artifactId>testng</artifactId>
16 years
JBoss Rich Faces SVN: r11508 - trunk/test-applications/seleniumTest.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-12-03 07:35:40 -0500 (Wed, 03 Dec 2008)
New Revision: 11508
Modified:
trunk/test-applications/seleniumTest/pom.xml
Log:
RF-5197
only for test
Modified: trunk/test-applications/seleniumTest/pom.xml
===================================================================
--- trunk/test-applications/seleniumTest/pom.xml 2008-12-03 12:28:30 UTC (rev 11507)
+++ trunk/test-applications/seleniumTest/pom.xml 2008-12-03 12:35:40 UTC (rev 11508)
@@ -62,6 +62,14 @@
<build>
<plugins>
<plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <source>1.5</source>
+ <target>1.5</target>
+ </configuration>
+ </plugin>
+ <plugin>
<groupId>org.codehaus.cargo</groupId>
<artifactId>cargo-maven2-plugin</artifactId>
<version>0.3.1</version>
16 years
JBoss Rich Faces SVN: r11507 - trunk/test-applications/seleniumTest.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-12-03 07:28:30 -0500 (Wed, 03 Dec 2008)
New Revision: 11507
Modified:
trunk/test-applications/seleniumTest/pom.xml
Log:
RF-5197
only for test
Modified: trunk/test-applications/seleniumTest/pom.xml
===================================================================
--- trunk/test-applications/seleniumTest/pom.xml 2008-12-03 12:23:06 UTC (rev 11506)
+++ trunk/test-applications/seleniumTest/pom.xml 2008-12-03 12:28:30 UTC (rev 11507)
@@ -37,6 +37,27 @@
<enabled>false</enabled>
</releases>
</repository>
+ <repository>
+ <releases />
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ <id>maven-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
+
+ <repository>
+ <releases />
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
</repositories>
<build>
<plugins>
@@ -230,27 +251,4 @@
<version>1.4.2</version>
</dependency>
</dependencies>
- <repositories>
- <repository>
- <releases />
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- <id>maven-repository.dev.java.net</id>
- <name>Java.net Repository for Maven</name>
- <url>http://download.java.net/maven/1</url>
- <layout>legacy</layout>
- </repository>
-
- <repository>
- <releases />
- <snapshots>
- <enabled>false</enabled>
- <updatePolicy>never</updatePolicy>
- </snapshots>
- <id>repository.jboss.org</id>
- <url>http://repository.jboss.org/maven2</url>
- </repository>
- </repositories>
</project>
\ No newline at end of file
16 years
JBoss Rich Faces SVN: r11506 - trunk/test-applications/seleniumTest.
by richfaces-svn-commits＠lists.jboss.org
Author: konstantin.mishin
Date: 2008-12-03 07:23:06 -0500 (Wed, 03 Dec 2008)
New Revision: 11506
Modified:
trunk/test-applications/seleniumTest/pom.xml
Log:
RF-5197
only for test
Modified: trunk/test-applications/seleniumTest/pom.xml
===================================================================
--- trunk/test-applications/seleniumTest/pom.xml 2008-12-03 12:10:22 UTC (rev 11505)
+++ trunk/test-applications/seleniumTest/pom.xml 2008-12-03 12:23:06 UTC (rev 11506)
@@ -230,4 +230,27 @@
<version>1.4.2</version>
</dependency>
</dependencies>
+ <repositories>
+ <repository>
+ <releases />
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ <id>maven-repository.dev.java.net</id>
+ <name>Java.net Repository for Maven</name>
+ <url>http://download.java.net/maven/1</url>
+ <layout>legacy</layout>
+ </repository>
+
+ <repository>
+ <releases />
+ <snapshots>
+ <enabled>false</enabled>
+ <updatePolicy>never</updatePolicy>
+ </snapshots>
+ <id>repository.jboss.org</id>
+ <url>http://repository.jboss.org/maven2</url>
+ </repository>
+ </repositories>
</project>
\ No newline at end of file
16 years
JBoss Rich Faces SVN: r11504 - trunk/ui/editor/src/main/antlr.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2008-12-03 06:59:01 -0500 (Wed, 03 Dec 2008)
New Revision: 11504
Modified:
trunk/ui/editor/src/main/antlr/html-seamtext.g
Log:
https://jira.jboss.org/jira/browse/RF-5106
Modified: trunk/ui/editor/src/main/antlr/html-seamtext.g
===================================================================
--- trunk/ui/editor/src/main/antlr/html-seamtext.g 2008-12-03 11:41:26 UTC (rev 11503)
+++ trunk/ui/editor/src/main/antlr/html-seamtext.g 2008-12-03 11:59:01 UTC (rev 11504)
@@ -537,7 +537,7 @@
)
{
-
+
String plain = endCapture();
if(valueCollector == null) {
valueCollector = new StringBuilder();
@@ -546,6 +546,7 @@
}
|html
{
+
if(valueCollector != null) {
append(valueCollector.toString());
}
@@ -569,8 +570,11 @@
if(!isPlainHtmlRequired(name, htmlElementStack)) {
if (isFormattedHtmlSeamTextElement(name)) {
-
- if(isList(name)) {
+
+ if(isLink(name) && valueCollector != null) {
+ append(valueCollector.toString());
+ valueCollector = null;
+ }if(isList(name)) {
append(BLANK_LINE);
} else if (isListItem(name)) {
append(createSeamTextList(name, htmlElementStack));
16 years