JBoss Rich Faces SVN: r12303 - trunk/ui/drag-drop/src/main/java/org/richfaces/component.
by richfaces-svn-commits＠lists.jboss.org
Author: nbelaevski
Date: 2009-01-15 15:35:17 -0500 (Thu, 15 Jan 2009)
New Revision: 12303
Modified:
trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java
trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java
Log:
https://jira.jboss.org/jira/browse/RF-5762
Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java
===================================================================
--- trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java 2009-01-15 19:53:17 UTC (rev 12302)
+++ trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDragSupport.java 2009-01-15 20:35:17 UTC (rev 12303)
@@ -73,6 +73,8 @@
if (event instanceof DragEvent) {
if (isImmediate()) {
event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
+ } else if (isBypassUpdates()) {
+ event.setPhaseId(PhaseId.PROCESS_VALIDATIONS);
} else {
event.setPhaseId(PhaseId.INVOKE_APPLICATION);
}
Modified: trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java
===================================================================
--- trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java 2009-01-15 19:53:17 UTC (rev 12302)
+++ trunk/ui/drag-drop/src/main/java/org/richfaces/component/UIDropSupport.java 2009-01-15 20:35:17 UTC (rev 12303)
@@ -71,6 +71,8 @@
if (event instanceof DropEvent) {
if (isImmediate()) {
event.setPhaseId(PhaseId.APPLY_REQUEST_VALUES);
+ } else if (isBypassUpdates()) {
+ event.setPhaseId(PhaseId.PROCESS_VALIDATIONS);
} else {
event.setPhaseId(PhaseId.INVOKE_APPLICATION);
}
16 years, 12 months
JBoss Rich Faces SVN: r12302 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2009-01-15 14:53:17 -0500 (Thu, 15 Jan 2009)
New Revision: 12302
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/EffectTest.java
Log:
Fix Effect test
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/EffectTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/EffectTest.java 2009-01-15 19:32:31 UTC (rev 12301)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/EffectTest.java 2009-01-15 19:53:17 UTC (rev 12302)
@@ -61,7 +61,7 @@
clickById(testLink);
pause(200, testLink);
assertStyleAttribute(testLink, "opacity", "Named effect does not work");
- pause(1500, testLink);
+ pause(2500, testLink);
if (isIE()) {
String style = getStyleAttributeString(testLink, "filter");
16 years, 12 months
JBoss Rich Faces SVN: r12301 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2009-01-15 14:32:31 -0500 (Thu, 15 Jan 2009)
New Revision: 12301
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dnd/dndTestAjaxSingleWithInternalValidation.xhtml
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DnDTest.java
Log:
Fix DnD failed methods
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dnd/dndTestAjaxSingleWithInternalValidation.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dnd/dndTestAjaxSingleWithInternalValidation.xhtml (rev 0)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/dnd/dndTestAjaxSingleWithInternalValidation.xhtml 2009-01-15 19:32:31 UTC (rev 12301)
@@ -0,0 +1,33 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml"
+ xmlns:a4j="http://richfaces.org/a4j"
+ xmlns:rich="http://richfaces.org/rich"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ui="http://java.sun.com/jsf/facelets">
+
+<ui:composition template="#{templateBean.autoTestTemplate}">
+ <ui:define name="component">
+ <h:outputLink id="drag">
+ <h:outputText value="Draggable" />
+ <rich:dragSupport
+ dragType="#{dndBean.frameworks[0].family}"
+ dragValue="#{dndBean.frameworks[0]}">
+
+ <rich:dndParam name="label" value="Draggable" />
+ </rich:dragSupport>
+ </h:outputLink>
+ <rich:panel id="PHP">
+ <rich:dropSupport id="componentId" acceptedTypes="PHP" dropValue="PHP"
+ dropListener="#{autoTestBean.actionListener}"
+ ajaxSingle="#{autoTestBean.ajaxSingle}"
+ reRender="#{autoTestBean.reRender}"
+ rendered="#{autoTestBean.rendered}"
+ oncomplete="#{autoTestBean.oncomplete}"
+ >
+ <h:inputText value="" required="true"></h:inputText>
+ </rich:dropSupport>
+ </rich:panel>
+ </ui:define>
+</ui:composition>
+</html>
\ No newline at end of file
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2009-01-15 18:38:28 UTC (rev 12300)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/AutoTester.java 2009-01-15 19:32:31 UTC (rev 12301)
@@ -76,6 +76,10 @@
public void renderPage(Template template, String resetMethodName) {
base.renderAutoTestPage(template, resetMethodName);
}
+
+ public void renderPage(String url, Template template, String resetMethodName) {
+ base.renderAutoTestPage(url, template, resetMethodName);
+ }
public void testAllAjaxAttributes() {
testRendered();
@@ -169,9 +173,10 @@
public void testAjaxSingleWithInternalValidationFailed() {
reset();
setupControl(TestSetupEntry.ajaxSingle, Boolean.TRUE);
+ setInternalValidation(true);
clickLoad();
- setInternalValidationFailed();
+ // setInternalValidation(true);
base.sendAjax();
checkActionListener(false);
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-01-15 18:38:28 UTC (rev 12300)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-01-15 19:32:31 UTC (rev 12301)
@@ -323,7 +323,11 @@
* Renders page
*/
protected void renderAutoTestPage(Template template, String resetMethodName) {
- selenium.open(protocol + "://" + host + ":" + port + "/" + APPLICATION_NAME + filterPrefix + getAutoTestUrl());
+ renderAutoTestPage(null, template, resetMethodName);
+ }
+
+ protected void renderAutoTestPage(String url, Template template, String resetMethodName) {
+ selenium.open(protocol + "://" + host + ":" + port + "/" + APPLICATION_NAME + filterPrefix + (url != null ? url : getAutoTestUrl()));
selenium.waitForPageToLoad(String.valueOf(pageRenderTime));
setParentId(template.getPrefix());
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DnDTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DnDTest.java 2009-01-15 18:38:28 UTC (rev 12300)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/DnDTest.java 2009-01-15 19:32:31 UTC (rev 12301)
@@ -37,6 +37,7 @@
public class DnDTest extends SeleniumTestBase {
+ static final String AJAX_SINGLE_WITH_I_FALIDATION_TEST = "/pages/dnd/dndTestAjaxSingleWithInternalValidation.xhtml";
static final String RESET_METHOD = "#{dndBean.reset}";
static final String FORMID = "_form:";
@@ -105,7 +106,7 @@
@Test
public void testAjaxSingleWithInternalValidationFailed(Template template) {
AutoTester tester = getAutoTester(this);
- tester.renderPage(template, RESET_METHOD);
+ tester.renderPage(AJAX_SINGLE_WITH_I_FALIDATION_TEST, template, RESET_METHOD);
tester.testAjaxSingleWithInternalValidationFailed();
}
16 years, 12 months
JBoss Rich Faces SVN: r12300 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2009-01-15 13:38:28 -0500 (Thu, 15 Jan 2009)
New Revision: 12300
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java
Log:
Fix tests
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java 2009-01-15 18:28:58 UTC (rev 12299)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/ContextMenuTest.java 2009-01-15 18:38:28 UTC (rev 12300)
@@ -253,8 +253,7 @@
clickCommandAndWait(controlId);
clickById(linkShowId);
waitForMenuShow(contextMenuId);
- clickById(itemId);
- waitForPageToLoad();
+ clickCommandAndWait(itemId);
AssertTextNotEquals(timeId, time, "Server submit mode does not work");
writeStatus("Test server submit mode");
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java 2009-01-15 18:28:58 UTC (rev 12299)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java 2009-01-15 18:38:28 UTC (rev 12300)
@@ -268,7 +268,7 @@
boolean tabSwitched = true;
try {
- clickById(tabId2);
+ selenium.click(tabId2);
waitForAjaxCompletion(3000);
}catch (SeleniumException e) {
tabSwitched = false;
16 years, 12 months
JBoss Rich Faces SVN: r12299 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/ajaxCommandButton and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: andrei_exadel
Date: 2009-01-15 13:28:58 -0500 (Thu, 15 Jan 2009)
New Revision: 12299
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/layout.xhtml
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandButton/autoTestCommandButton.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
Log:
Remove JS references to prototype functions
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/layout/layout.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandButton/autoTestCommandButton.xhtml
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandButton/autoTestCommandButton.xhtml 2009-01-15 18:09:30 UTC (rev 12298)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/ajaxCommandButton/autoTestCommandButton.xhtml 2009-01-15 18:28:58 UTC (rev 12299)
@@ -30,7 +30,6 @@
rendered="#{autoTestBean.rendered}"
>
</a4j:commandButton>
- <rich:effect></rich:effect>
</ui:define>
</ui:composition>
</html>
\ No newline at end of file
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-01-15 18:09:30 UTC (rev 12298)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/SeleniumTestBase.java 2009-01-15 18:28:58 UTC (rev 12299)
@@ -25,6 +25,7 @@
import java.io.FileFilter;
import java.io.FileInputStream;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.Map;
@@ -1232,14 +1233,11 @@
* @param isId - Pass true if ID is string, false - if ID is expression to load appropriate DOM element
*/
public void assertClassNames(String id, String[] classNames, String message, boolean isId) {
+ String clazz = runScript(((isId) ? "document.getElementById('"+id+"')" : id) + ".className");
+ List<String> classes = (clazz != null) ? Arrays.asList(clazz.split(" ")) : new ArrayList<String>();
for (String s : classNames) {
- String result = null;
- if (isId) {
- result = runScript("$('" + id + "').hasClassName('" + s + "')", false).toLowerCase();
- } else {
- result = runScript("$(" + id + ").hasClassName('" + s + "')", false).toLowerCase();
- }
- if (Boolean.FALSE.toString().toLowerCase().equals(result)) {
+ boolean result = classes.contains(s);
+ if (!result) {
Assert.fail(message + " Element [id=" + id + "] should contain class name '" + s + "'");
}
}
@@ -1392,7 +1390,7 @@
}
public String getStyleAttributeString (String id, String attr) {
- return runScript(getElementById(id) + ".getStyle('" + attr + "')");
+ return runScript("getStyle('"+id+"', '"+attr+"')");
}
16 years, 12 months
JBoss Rich Faces SVN: r12298 - in trunk/test-applications/seleniumTest/richfaces/src: main/webapp/pages/tabPanel and 1 other directories.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-01-15 13:09:30 -0500 (Thu, 15 Jan 2009)
New Revision: 12298
Added:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tabPanel/tabPanelAjaxSingleTest.xhtml
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/RichPanelTestBean.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java
Log:
Tab panel ajaxSingle test
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/RichPanelTestBean.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/RichPanelTestBean.java 2009-01-15 18:03:54 UTC (rev 12297)
+++ trunk/test-applications/seleniumTest/richfaces/src/main/java/org/ajax4jsf/bean/RichPanelTestBean.java 2009-01-15 18:09:30 UTC (rev 12298)
@@ -212,6 +212,12 @@
setImmediate(true);
return null;
}
+
+ public String initAjaxSingleTest() {
+ reset();
+ inputs = new HashMap<String, String>();
+ return null;
+ }
public String increment() {
if (4 == this.value2) {
Added: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tabPanel/tabPanelAjaxSingleTest.xhtml
===================================================================
(Binary files differ)
Property changes on: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tabPanel/tabPanelAjaxSingleTest.xhtml
___________________________________________________________________
Name: svn:mime-type
+ application/xhtml+xml
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java 2009-01-15 18:03:54 UTC (rev 12297)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java 2009-01-15 18:09:30 UTC (rev 12298)
@@ -42,8 +42,12 @@
private final static String INIT_AJAX_CORE_TEST = "#{panelBean.initAjaxCoreTest}";
private final static String INIT_IMMEDIATE_TEST = "#{panelBean.initImmediateTest}";
+
+ private final static String INIT_AJAX_SINGLE_TEST = "#{panelBean.initAjaxSingleTest}";
private final static String INIT_IMMEDIATE_TEST_URL = "pages/tabPanel/immediateTabPanelTest.xhtml";
+
+ private final static String INIT_AJAX_SINGLE_TEST_URL = "pages/tabPanel/tabPanelAjaxSingleTest.xhtml";
private final static String TAB_FACET_TEST_URL = "pages/tabPanel/tabFacetTest.xhtml";
@@ -188,6 +192,49 @@
}
@Test
+ public void testAjaxSingleTab(Template template) {
+ renderPage(INIT_AJAX_SINGLE_TEST_URL, template, INIT_AJAX_SINGLE_TEST);
+ String parentId = getParentId();
+
+ //FIXME https://jira.jboss.org/jira/browse/RF-5759
+ Assert.fail("https://jira.jboss.org/jira/browse/RF-5759");
+ String tabId1 = parentId + FORM_ID + "tab1";
+ String tabId2 = parentId + FORM_ID + "tab2";
+ String tabId3 = parentId + FORM_ID + "tab3";
+ String tabId4 = parentId + FORM_ID + "tab4";
+ String messages = parentId + FORM_ID + "messages";
+
+ setValueById(tabId1 + "_input", "text");
+ setValueById(tabId4 + "_input", "text");
+
+ // switch to second tab
+ clickCommandAndWait(tabId2 + "_lbl");
+ AssertNotPresent(tabId1);
+ AssertPresent(tabId2);
+ }
+
+ @Test
+ public void testAjaxSingleTabWithEXternalValidationFailure(Template template) {
+ renderPage(INIT_AJAX_SINGLE_TEST_URL, template, INIT_AJAX_SINGLE_TEST);
+ String parentId = getParentId();
+
+ //FIXME https://jira.jboss.org/jira/browse/RF-5759
+ Assert.fail("https://jira.jboss.org/jira/browse/RF-5759");
+ String tabId1 = parentId + FORM_ID + "tab1";
+ String tabId2 = parentId + FORM_ID + "tab2";
+ String tabId3 = parentId + FORM_ID + "tab3";
+ String tabId4 = parentId + FORM_ID + "tab4";
+ String messages = parentId + FORM_ID + "messages";
+
+ setValueById(tabId1 + "_input", "text");
+
+ // switch to second tab
+ clickCommandAndWait(tabId2 + "_lbl");
+ AssertNotPresent(tabId1);
+ AssertPresent(tabId2);
+ }
+
+ @Test
public void testDisabledTabs(Template template) {
renderPage(DISABLED_TAB_URL, template, RESET_METHOD);
16 years, 12 months
JBoss Rich Faces SVN: r12297 - in trunk/test-applications/seleniumTest/richfaces/src: test/java/org/richfaces/testng and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: dsvyatobatsko
Date: 2009-01-15 13:03:54 -0500 (Thu, 15 Jan 2009)
New Revision: 12297
Modified:
trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tabPanel/tabPanelAutoTest.xhtml
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java
Log:
https://jira.jboss.org/jira/browse/RF-5564
Modified: trunk/test-applications/seleniumTest/richfaces/src/main/webapp/pages/tabPanel/tabPanelAutoTest.xhtml
===================================================================
(Binary files differ)
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java 2009-01-15 17:40:42 UTC (rev 12296)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/TabPanelTest.java 2009-01-15 18:03:54 UTC (rev 12297)
@@ -111,6 +111,14 @@
}
@Test
+ public void testLimitToListAttribute(Template template) {
+ AutoTester tester = getAutoTester(this);
+ tester.renderPage(template, INIT_AJAX_CORE_TEST);
+ writeStatus("Test component with limitToList = true skips ajaxRendered areas update");
+ tester.testLimitToList();
+ }
+
+ @Test
public void testSubmissionModesAndListeners(Template template) {
renderPage(template, RESET_METHOD);
16 years, 12 months
JBoss Rich Faces SVN: r12296 - trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng.
by richfaces-svn-commits＠lists.jboss.org
Author: alevkovsky
Date: 2009-01-15 12:40:42 -0500 (Thu, 15 Jan 2009)
New Revision: 12296
Modified:
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractMessageTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessageTest.java
trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessagesTest.java
Log:
Fix messages tests
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractMessageTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractMessageTest.java 2009-01-15 17:10:52 UTC (rev 12295)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/AbstractMessageTest.java 2009-01-15 17:40:42 UTC (rev 12296)
@@ -78,13 +78,10 @@
assertStyleAttributes(message, styleAttributes);
}
- /**
- * showDetail and showSummary attributes work
- */
- @Test
- public void testShowDetailAndShowSummary(Template template) {
- init(template);
- Assert.assertTrue(selenium.getText(label).length() == 0);
+ public void assertShowDetailAndShowSummary(boolean shouldPresemtIfEmpty) {
+ if(shouldPresemtIfEmpty){
+ Assert.assertTrue(selenium.getText(label).length() == 0);
+ }
selenium.type(inputText, "fatal");
clickAjaxCommandAndWait(submit);
Assert.assertTrue("messageDetail".equals(selenium.getText(label)));
@@ -108,13 +105,12 @@
Assert.fail("This test should be completed after resolving bug RF-5107.");
}
- /**
- * check markers rendering
- */
- @Test
- public void testMarkers(Template template) {
- init(template);
- Assert.assertTrue(selenium.isElementPresent(mainForm + ":passedMarker"));
+
+
+ public void assertMarkers(boolean isPassedMarkerShouldPresent) {
+ if(isPassedMarkerShouldPresent){
+ Assert.assertTrue(selenium.isElementPresent(mainForm + ":passedMarker"));
+ }
selenium.type(inputText, "fatal");
clickAjaxCommandAndWait(submit);
Assert.assertTrue(selenium.isElementPresent(mainForm + ":fatalMarker"));
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessageTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessageTest.java 2009-01-15 17:10:52 UTC (rev 12295)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessageTest.java 2009-01-15 17:40:42 UTC (rev 12296)
@@ -39,6 +39,8 @@
@Test
public void testAjaxRendered(Template template) {
init(template);
+
+ //FIXME https://jira.jboss.org/jira/browse/RF-5145
Assert.assertTrue(selenium.isElementPresent(mainForm + ":passedMarker"));
selenium.type(inputText, "fatal");
clickAjaxCommandAndWait(mainForm + ":submitWithoutReRender");
@@ -48,6 +50,24 @@
Assert.assertTrue(selenium.isElementPresent(mainForm + ":fatalMarker"));
}
+ /**
+ * check markers rendering
+ */
+ @Test
+ public void testMarkers(Template template) {
+ init(template);
+ assertMarkers(true);
+ }
+
+ /**
+ * showDetail and showSummary attributes work
+ */
+ @Test
+ public void testShowDetailAndShowSummary(Template template) {
+ init(template);
+ assertShowDetailAndShowSummary(true);
+ }
+
@Override
public String getTestUrl() {
return "pages/message/message.xhtml";
Modified: trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessagesTest.java
===================================================================
--- trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessagesTest.java 2009-01-15 17:10:52 UTC (rev 12295)
+++ trunk/test-applications/seleniumTest/richfaces/src/test/java/org/richfaces/testng/MessagesTest.java 2009-01-15 17:40:42 UTC (rev 12296)
@@ -121,4 +121,22 @@
AssertNotPresent(mainForm + ":warnMarker");
AssertNotPresent(mainForm + ":infoMarker");
}
+
+ /**
+ * check markers rendering
+ */
+ @Test
+ public void testMarkers(Template template) {
+ init(template);
+ assertMarkers(false);
+ }
+
+ /**
+ * showDetail and showSummary attributes work
+ */
+ @Test
+ public void testShowDetailAndShowSummary(Template template) {
+ init(template);
+ assertShowDetailAndShowSummary(false);
+ }
}
16 years, 12 months
JBoss Rich Faces SVN: r12294 - in trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd: mojo and 1 other directory.
by richfaces-svn-commits＠lists.jboss.org
Author: abelevich
Date: 2009-01-15 11:46:05 -0500 (Thu, 15 Jan 2009)
New Revision: 12294
Modified:
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ScriptsHandler.java
trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/CreateScriptMojo.java
Log:
Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ScriptsHandler.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ScriptsHandler.java 2009-01-15 16:35:41 UTC (rev 12293)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/handler/ScriptsHandler.java 2009-01-15 16:46:05 UTC (rev 12294)
@@ -8,8 +8,6 @@
public class ScriptsHandler extends DefaultRichHandler {
- private Set result = new HashSet();
-
private Set lookUpResources;
private boolean collect = false;
@@ -17,11 +15,6 @@
private String temp;
- @Override
- public Set getResult() {
- return result;
- }
-
public ScriptsHandler(Set lookUpResources) {
this.lookUpResources = lookUpResources;
}
@@ -47,7 +40,7 @@
}
if(name.equalsIgnoreCase("script") && collect) {
- result.add(temp);
+ getResult().add(temp);
}
}
Modified: trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/CreateScriptMojo.java
===================================================================
--- trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/CreateScriptMojo.java 2009-01-15 16:35:41 UTC (rev 12293)
+++ trunk/sandbox/cdk/maven-resource-dependency-plugin/src/main/java/org/richfaces/cdk/rd/mojo/CreateScriptMojo.java 2009-01-15 16:46:05 UTC (rev 12294)
@@ -24,6 +24,7 @@
import java.io.File;
import java.io.IOException;
import java.util.Collections;
+import java.util.HashSet;
import java.util.Iterator;
import java.util.List;
import java.util.Set;
@@ -167,6 +168,7 @@
RichComponentsHandler handler = new RichComponentsHandler();
handler.setLog(getLog());
+ handler.setResult(new HashSet());
handler.addNamespaces(namespaces);
richSelector = new RichResourceSelector(saxParser,handler);
@@ -206,6 +208,7 @@
SAXParser saxParser = saxParserFactory.newSAXParser();
DefaultRichHandler handler = new ScriptsHandler(components);
handler.setLog(getLog());
+ handler.setResult(new HashSet());
RichResourceSelector selector = new RichResourceSelector(saxParser,handler);
for (FileObject dependency: richConfigs) {
16 years, 12 months