Author: ppitonak(a)redhat.com
Date: 2011-09-20 09:18:45 -0400 (Tue, 20 Sep 2011)
New Revision: 22728
Removed:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/testng/
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/SeleniumGetter.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MetamerFailureLoggingTestListener.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/TestA4JCommandLink.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java
Log:
unused logger removed from rich:editor test
empty testng directory removed
tests refactored in order not to use deprecated methods
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/SeleniumGetter.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/SeleniumGetter.java 2011-09-19
17:09:40 UTC (rev 22727)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/jboss/test/selenium/SeleniumGetter.java 2011-09-20
13:18:45 UTC (rev 22728)
@@ -69,11 +69,11 @@
return converter.forwardConversion(obtainValue());
}
- public static ValueGetter getValue(ElementLocator elementLocator) {
+ public static ValueGetter getValue(ElementLocator<?> elementLocator) {
return new ValueGetter(elementLocator);
}
- public static TextGetter getText(ElementLocator elementLocator) {
+ public static TextGetter getText(ElementLocator<?> elementLocator) {
return new TextGetter(elementLocator);
}
@@ -81,9 +81,9 @@
return new Evaluator(script);
}
- public static class ValueGetter extends SeleniumGetter<ElementLocator> {
+ public static class ValueGetter extends SeleniumGetter<ElementLocator<?>>
{
- public ValueGetter(ElementLocator parameter) {
+ public ValueGetter(ElementLocator<?> parameter) {
super(parameter);
}
@@ -94,9 +94,9 @@
}
- public static class TextGetter extends SeleniumGetter<ElementLocator> {
+ public static class TextGetter extends SeleniumGetter<ElementLocator<?>>
{
- public TextGetter(ElementLocator parameter) {
+ public TextGetter(ElementLocator<?> parameter) {
super(parameter);
}
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-09-19
17:09:40 UTC (rev 22727)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/AbstractMetamerTest.java 2011-09-20
13:18:45 UTC (rev 22728)
@@ -46,8 +46,6 @@
import java.util.List;
import java.util.Locale;
-import javax.faces.event.PhaseId;
-
import org.apache.commons.lang.LocaleUtils;
import org.jboss.cheiron.retriever.ScriptEvaluationRetriever;
import org.jboss.test.selenium.AbstractTestCase;
@@ -80,7 +78,7 @@
* @version $Revision$
*/
public abstract class AbstractMetamerTest extends AbstractTestCase {
-
+
/**
* timeout in miliseconds
*/
@@ -97,8 +95,8 @@
protected TextRetriever retrieveStatusChecker =
retrieveText.locator(jq("#statusCheckerOutput"));
protected PhaseInfo phaseInfo = new PhaseInfo();
protected LocatorReference<JQueryLocator> attributesRoot = new
LocatorReference<JQueryLocator>(
- pjq("span[id$=:attributes:panel]"));
-
+ pjq("span[id$=:attributes:panel]"));
+
@Inject
@Templates({ "plain", "richAccordion", "richDataTable",
"richCollapsibleSubTable", "richExtendedDataTable",
"richDataGrid", "richList", "richCollapsiblePanel",
"richPanel", "richTabPanel", "richTogglePanel",
@@ -152,7 +150,7 @@
/**
* Do a full page refresh (regular HTTP request) by triggering a command with no
action bound.
*/
- public void fullPageRefresh() {
+ public void fullPageRefresh() {
waitGui.until(elementPresent.locator(fullPageRefreshIcon));
guardHttp(selenium).click(fullPageRefreshIcon);
}
@@ -160,7 +158,7 @@
/**
* Rerender all content of the page (AJAX request) by trigerring a command with no
action but render bound.
*/
- public void rerenderAll() {
+ public void rerenderAll() {
waitGui.until(elementPresent.locator(rerenderAllIcon));
guardXhr(selenium).click(rerenderAllIcon);
}
@@ -212,7 +210,7 @@
selenium.fireEvent(element, event);
waitGui.failWith("Attribute on" + attributeName + " does not work
correctly").until(
- new EventFiredCondition(event));
+ new EventFiredCondition(event));
}
/**
@@ -287,9 +285,9 @@
public void testRequestEventsAfter(String... events) {
String[] actualEvents = selenium.getEval(new
JavaScript("window.metamerEvents")).split(" ");
assertEquals(
- actualEvents,
- events,
- format("The events ({0}) don't came in right order ({1})",
Arrays.deepToString(actualEvents),
+ actualEvents,
+ events,
+ format("The events ({0}) don't came in right order ({1})",
Arrays.deepToString(actualEvents),
Arrays.deepToString(events)));
}
@@ -305,9 +303,9 @@
String[] actualEvents = list.toArray(new String[list.size()]);
assertEquals(
- actualEvents,
- events,
- format("The events ({0}) don't came in right order ({1})",
Arrays.deepToString(actualEvents),
+ actualEvents,
+ events,
+ format("The events ({0}) don't came in right order ({1})",
Arrays.deepToString(actualEvents),
Arrays.deepToString(events)));
}
@@ -406,7 +404,7 @@
selenium.waitForPageToLoad();
assertTrue(selenium.getAttribute(attr).contains(value), "Attribute " +
attribute + " should contain \"" + value
- + "\".");
+ + "\".");
}
/**
@@ -423,17 +421,6 @@
selenium.getEval(new JavaScript("window.showControls()"));
}
- /**
- * Verifies that only given phases were executed. It uses the list of phases in the
header of the page.
- *
- * @param phases
- * phases that are expected to have been executed
- */
- @Deprecated
- protected void assertPhases(PhaseId... phases) {
- phaseInfo.assertPhases(phases);
- }
-
protected void fireEventNatively(ElementLocator<?> target, Event event) {
if (event == CLICK) {
selenium.click(target);
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java 2011-09-19
17:09:40 UTC (rev 22727)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MatrixConfigurator.java 2011-09-20
13:18:45 UTC (rev 22728)
@@ -82,7 +82,7 @@
for (IMethodInstance methodInstance : methodInstances) {
for (int i = 0; i < methodInstance.getMethod().getInvocationCount(); i++)
{
- methods.add(methodInstance.getMethod().getMethod());
+
methods.add(methodInstance.getMethod().getConstructorOrMethod().getMethod());
}
if (methodInstance.getMethod().getInvocationCount() > 0) {
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MetamerFailureLoggingTestListener.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MetamerFailureLoggingTestListener.java 2011-09-19
17:09:40 UTC (rev 22727)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/MetamerFailureLoggingTestListener.java 2011-09-20
13:18:45 UTC (rev 22728)
@@ -55,7 +55,7 @@
super.onFailure(result);
List<String> issueList = new LinkedList<String>();
- IssueTracking issueTracking =
result.getMethod().getMethod().getAnnotation(IssueTracking.class);
+ IssueTracking issueTracking =
result.getMethod().getConstructorOrMethod().getMethod().getAnnotation(IssueTracking.class);
if (issueTracking != null) {
issueList.addAll(asList(issueTracking.value()));
}
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/TestA4JCommandLink.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/TestA4JCommandLink.java 2011-09-19
17:09:40 UTC (rev 22727)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/a4jCommandLink/TestA4JCommandLink.java 2011-09-20
13:18:45 UTC (rev 22728)
@@ -101,21 +101,24 @@
selenium.typeKeys(input, "RichFaces 4");
guardXhr(selenium).click(link);
waitGui.until(textEquals.locator(output1).text("RichFaces 4"));
- assertEquals(selenium.getText(output2), "RichFaces 4RichFaces 4",
"output2 when 'RichFaces 4' in input and doubleStringAction selected");
+ assertEquals(selenium.getText(output2), "RichFaces 4RichFaces 4",
+ "output2 when 'RichFaces 4' in input and doubleStringAction
selected");
selenium.click(pjq("input[name$=actionInput][value=first6CharsAction]"));
selenium.waitForPageToLoad();
selenium.typeKeys(input, "RichFaces 4ň");
guardXhr(selenium).click(link);
waitGui.until(textEquals.locator(output1).text("RichFaces 4ň"));
- assertEquals(selenium.getText(output2), "RichFa", "output2 when
'RichFaces 4ň' in input and first6CharsAction selected");
+ assertEquals(selenium.getText(output2), "RichFa",
+ "output2 when 'RichFaces 4ň' in input and first6CharsAction
selected");
selenium.click(pjq("input[name$=actionInput][value=toUpperCaseAction]"));
selenium.waitForPageToLoad();
selenium.typeKeys(input, "RichFaces 4ě");
guardXhr(selenium).click(link);
waitGui.until(textEquals.locator(output1).text("RichFaces 4ě"));
- assertEquals(selenium.getText(output2), "RICHFACES 4Ě", "output2
when 'RichFaces 4ě' in input and toUpperCaseAction selected");
+ assertEquals(selenium.getText(output2), "RICHFACES 4Ě",
+ "output2 when 'RichFaces 4ě' in input and toUpperCaseAction
selected");
}
@Test
@@ -126,21 +129,23 @@
guardXhr(selenium).click(link);
waitGui.until(textEquals.locator(output1).text("RichFaces 4"));
assertEquals(selenium.getText(output3), "RichFaces 4RichFaces 4",
- "output3 when 'RichFaces 4' in input and
doubleStringActionListener selected");
+ "output3 when 'RichFaces 4' in input and
doubleStringActionListener selected");
selenium.click(pjq("input[name$=actionListenerInput][value=first6CharsActionListener]"));
selenium.waitForPageToLoad();
selenium.typeKeys(input, "RichFaces 4ň");
guardXhr(selenium).click(link);
waitGui.until(textEquals.locator(output1).text("RichFaces 4ň"));
- assertEquals(selenium.getText(output3), "RichFa", "output3 when
'RichFaces 4ň' in input and first6CharsActionListener selected");
+ assertEquals(selenium.getText(output3), "RichFa",
+ "output3 when 'RichFaces 4ň' in input and
first6CharsActionListener selected");
selenium.click(pjq("input[name$=actionListenerInput][value=toUpperCaseActionListener]"));
selenium.waitForPageToLoad();
selenium.typeKeys(input, "RichFaces 4ě");
guardXhr(selenium).click(link);
waitGui.until(textEquals.locator(output1).text("RichFaces 4ě"));
- assertEquals(selenium.getText(output3), "RICHFACES 4Ě", "output3
when 'RichFaces 4ě' in input and toUpperCaseActionListener selected");
+ assertEquals(selenium.getText(output3), "RICHFACES 4Ě",
+ "output3 when 'RichFaces 4ě' in input and
toUpperCaseActionListener selected");
}
@Test
@@ -155,8 +160,8 @@
assertEquals(selenium.getText(output1), "", "Output 1 should not
change");
assertEquals(selenium.getText(output2), "", "Output 2 should not
change");
assertEquals(selenium.getText(output3), "", "Output 3 should not
change");
- assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES,
PhaseId.PROCESS_VALIDATIONS,
- PhaseId.RENDER_RESPONSE);
+ phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES,
PhaseId.PROCESS_VALIDATIONS,
+ PhaseId.RENDER_RESPONSE);
String listenerOutput = selenium.getText(jq("div#phasesPanel
li:eq(3)"));
assertEquals(listenerOutput, "* action listener invoked", "Action
listener's output");
@@ -199,8 +204,10 @@
selenium.click(pjq("input[name$=disabledInput][value=true]"));
selenium.waitForPageToLoad();
- assertFalse(selenium.isElementPresent(link), link.getAsString() + " should
not be on page when the link is disabled");
- assertTrue(selenium.isElementPresent(newLink), newLink.getAsString() + "
should be on page when the link is disabled");
+ assertFalse(selenium.isElementPresent(link), link.getAsString()
+ + " should not be on page when the link is disabled");
+ assertTrue(selenium.isElementPresent(newLink), newLink.getAsString()
+ + " should be on page when the link is disabled");
}
@Test
@@ -239,8 +246,8 @@
assertEquals(selenium.getText(output1), "", "Output 1 should not
change");
assertEquals(selenium.getText(output2), "", "Output 2 should not
change");
assertEquals(selenium.getText(output3), "", "Output 3 should not
change");
- assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES,
PhaseId.RENDER_RESPONSE);
-
+ phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES,
PhaseId.RENDER_RESPONSE);
+
String listenerOutput = selenium.getText(jq("div#phasesPanel
li:eq(2)"));
assertEquals(listenerOutput, "* action listener invoked", "Action
listener's output");
listenerOutput = selenium.getText(jq("div#phasesPanel li:eq(3)"));
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java 2011-09-19
17:09:40 UTC (rev 22727)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richEditor/TestRichEditor.java 2011-09-20
13:18:45 UTC (rev 22728)
@@ -20,8 +20,6 @@
import org.jboss.test.selenium.waiting.selenium.SeleniumCondition;
import org.richfaces.tests.metamer.ftest.AbstractMetamerTest;
import org.richfaces.tests.metamer.ftest.annotations.IssueTracking;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.testng.annotations.BeforeMethod;
import org.testng.annotations.Test;
@@ -33,8 +31,6 @@
*/
public class TestRichEditor extends AbstractMetamerTest {
- private static final Logger LOG = LoggerFactory.getLogger(TestRichEditor.class);
-
private JQueryLocator editor = pjq("span[id$=editor:inp]");
private JQueryLocator editorTextArea = pjq("textarea[id$=editor:inp]");
private JQueryLocator editorArea = jq("body");
Modified:
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java
===================================================================
---
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java 2011-09-19
17:09:40 UTC (rev 22727)
+++
modules/tests/metamer/trunk/ftest-source/src/main/java/org/richfaces/tests/metamer/ftest/richMenuItem/TestRichMenuItem.java 2011-09-20
13:18:45 UTC (rev 22728)
@@ -83,7 +83,8 @@
assertTrue(selenium.isElementPresent(menuItem2), "Menu item
\"Open\" should be present on the page.");
assertTrue(selenium.isVisible(menuItem2), "Menu item \"Open\"
should be visible on the page.");
- assertTrue(selenium.isElementPresent(menuGroup3), "Menu group \"Open
Recent...\" should be present on the page.");
+ assertTrue(selenium.isElementPresent(menuGroup3),
+ "Menu group \"Open Recent...\" should be present on the
page.");
assertTrue(selenium.isVisible(menuGroup3), "Menu group \"Open
Recent...\" should be visible on the page.");
assertTrue(selenium.isElementPresent(image), "Icon of menu item 1 should be
present on the page.");
@@ -93,8 +94,9 @@
assertTrue(selenium.isVisible(label), "Label of menu item 1 should be
visible on the page.");
assertEquals(selenium.getText(label), "New", "Label of first menu
item.");
- AttributeLocator attr = image.getAttribute(Attribute.SRC);
- assertTrue(selenium.getAttribute(attr).contains("create_doc.gif"),
"Image's src attribute should contain \"create_doc.gif\".");
+ AttributeLocator<?> attr = image.getAttribute(Attribute.SRC);
+ assertTrue(selenium.getAttribute(attr).contains("create_doc.gif"),
+ "Image's src attribute should contain
\"create_doc.gif\".");
}
@Test
@@ -129,8 +131,8 @@
guardXhr(selenium).click(menuItem1);
waitGui.failWith("Page was not updated").waitForChange(reqTime,
retrieveText.locator(time));
- assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES,
PhaseId.PROCESS_VALIDATIONS,
- PhaseId.RENDER_RESPONSE);
+ phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES,
PhaseId.PROCESS_VALIDATIONS,
+ PhaseId.RENDER_RESPONSE);
String listenerOutput = selenium.getText(jq("div#phasesPanel
li:eq(3)"));
assertEquals(listenerOutput, "* action listener invoked", "Action
listener's output");
@@ -165,8 +167,10 @@
selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]"));
selenium.waitForPageToLoad();
- assertTrue(selenium.belongsClass(menuItem1, "rf-ddm-itm-dis"),
"Menu item should have class \"rf-ddm-itm-dis\".");
-
assertTrue(selenium.isElementPresent(menuItem1.getDescendant(jq("div.rf-ddm-emptyIcon"))),
"Empty icon should be present.");
+ assertTrue(selenium.belongsClass(menuItem1, "rf-ddm-itm-dis"),
+ "Menu item should have class \"rf-ddm-itm-dis\".");
+
assertTrue(selenium.isElementPresent(menuItem1.getDescendant(jq("div.rf-ddm-emptyIcon"))),
+ "Empty icon should be present.");
assertFalse(selenium.isElementPresent(image), "Icon should not be
present.");
}
@@ -192,20 +196,23 @@
@Test
public void testIcon() {
- AttributeLocator attr = image.getAttribute(Attribute.SRC);
+ AttributeLocator<?> attr = image.getAttribute(Attribute.SRC);
selenium.select(pjq("select[id$=iconInput]"),
optionLabel("star"));
selenium.waitForPageToLoad();
- assertTrue(selenium.getAttribute(attr).contains("star.png"),
"Image's src attribute should contain \"star.png\".");
+ assertTrue(selenium.getAttribute(attr).contains("star.png"),
+ "Image's src attribute should contain
\"star.png\".");
selenium.select(pjq("select[id$=iconInput]"),
optionLabel("nonexisting"));
selenium.waitForPageToLoad();
- assertTrue(selenium.getAttribute(attr).contains("nonexisting"),
"Image's src attribute should contain \"nonexisting\".");
+ assertTrue(selenium.getAttribute(attr).contains("nonexisting"),
+ "Image's src attribute should contain
\"nonexisting\".");
selenium.select(pjq("select[id$=iconInput]"),
optionLabel("null"));
selenium.waitForPageToLoad();
assertFalse(selenium.isElementPresent(image), "Icon should not be
present.");
-
assertTrue(selenium.isElementPresent(menuItem1.getDescendant(jq("div.rf-ddm-emptyIcon"))),
"Empty icon should be present.");
+
assertTrue(selenium.isElementPresent(menuItem1.getDescendant(jq("div.rf-ddm-emptyIcon"))),
+ "Empty icon should be present.");
}
@Test
@@ -213,18 +220,21 @@
selenium.click(pjq("input[type=radio][name$=disabledInput][value=true]"));
selenium.waitForPageToLoad();
- AttributeLocator attr = image.getAttribute(Attribute.SRC);
+ AttributeLocator<?> attr = image.getAttribute(Attribute.SRC);
assertFalse(selenium.isElementPresent(image), "Icon should not be
present.");
-
assertTrue(selenium.isElementPresent(menuItem1.getDescendant(jq("div.rf-ddm-emptyIcon"))),
"Empty icon should be present.");
+
assertTrue(selenium.isElementPresent(menuItem1.getDescendant(jq("div.rf-ddm-emptyIcon"))),
+ "Empty icon should be present.");
selenium.select(pjq("select[id$=iconDisabledInput]"),
optionLabel("star"));
selenium.waitForPageToLoad();
- assertTrue(selenium.getAttribute(attr).contains("star.png"),
"Image's src attribute should contain \"star.png\".");
+ assertTrue(selenium.getAttribute(attr).contains("star.png"),
+ "Image's src attribute should contain
\"star.png\".");
selenium.select(pjq("select[id$=iconDisabledInput]"),
optionLabel("nonexisting"));
selenium.waitForPageToLoad();
- assertTrue(selenium.getAttribute(attr).contains("nonexisting"),
"Image's src attribute should contain \"nonexisting\".");
+ assertTrue(selenium.getAttribute(attr).contains("nonexisting"),
+ "Image's src attribute should contain
\"nonexisting\".");
}
@Test
@@ -237,7 +247,7 @@
guardXhr(selenium).click(menuItem1);
waitGui.failWith("Page was not updated").waitForChange(reqTime,
retrieveText.locator(time));
- assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES,
PhaseId.RENDER_RESPONSE);
+ phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES,
PhaseId.RENDER_RESPONSE);
String listenerOutput = selenium.getText(jq("div#phasesPanel
li:eq(2)"));
assertEquals(listenerOutput, "* action listener invoked", "Action
listener's output");
@@ -278,8 +288,8 @@
guardXhr(selenium).click(menuItem1);
waitGui.failWith("Page was not updated").waitForChange(reqTime,
retrieveText.locator(time));
- assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES,
PhaseId.PROCESS_VALIDATIONS,
- PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION,
PhaseId.RENDER_RESPONSE);
+ phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES,
PhaseId.PROCESS_VALIDATIONS,
+ PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION,
PhaseId.RENDER_RESPONSE);
String listenerOutput = selenium.getText(jq("div#phasesPanel
li:eq(5)"));
assertEquals(listenerOutput, "* action listener invoked", "Action
listener's output");
@@ -293,7 +303,7 @@
guardHttp(selenium).click(menuItem1);
phaseInfo.assertPhases(PhaseId.RESTORE_VIEW, PhaseId.APPLY_REQUEST_VALUES,
PhaseId.PROCESS_VALIDATIONS,
- PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION,
PhaseId.RENDER_RESPONSE);
+ PhaseId.UPDATE_MODEL_VALUES, PhaseId.INVOKE_APPLICATION,
PhaseId.RENDER_RESPONSE);
listenerOutput = selenium.getText(jq("div#phasesPanel li:eq(5)"));
assertEquals(listenerOutput, "* action listener invoked", "Action
listener's output");