You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2012/07/18 10:06:30 UTC
svn commit: r1362804 - in /myfaces/tobago/branches/tobago-1.5.x: ./
tobago-example/tobago-example-test/src/main/webapp/tc/
tobago-example/tobago-example-test/src/main/webapp/tc/button/
tobago-example/tobago-example-test/src/main/webapp/tc/popup/ tobago...
Author: lofwyr
Date: Wed Jul 18 08:06:30 2012
New Revision: 1362804
URL: http://svn.apache.org/viewvc?rev=1362804&view=rev
Log:
replace Java-Selenium-Test with HTML-Selenium-Test
Merged from trunk [from revision 1362393]
Added:
myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/button/link-attribute.selenium.html
- copied unchanged from r1362393, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/button/link-attribute.selenium.html
myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/button/resource-attribute.selenium.html
- copied unchanged from r1362393, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/button/resource-attribute.selenium.html
myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/popup/popup-bug-tobago-1103.selenium.html
- copied unchanged from r1362393, myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc/popup/popup-bug-tobago-1103.selenium.html
Modified:
myfaces/tobago/branches/tobago-1.5.x/ (props changed)
myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/ (props changed)
myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/button/link-attribute.xhtml
myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java (contents, props changed)
Propchange: myfaces/tobago/branches/tobago-1.5.x/
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk:r1362393
Propchange: myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk/tobago-example/tobago-example-test/src/main/webapp/tc:r1362393
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/button/link-attribute.xhtml
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/button/link-attribute.xhtml?rev=1362804&r1=1362803&r2=1362804&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/button/link-attribute.xhtml (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/main/webapp/tc/button/link-attribute.xhtml Wed Jul 18 08:06:30 2012
@@ -18,8 +18,6 @@
<f:view
xmlns:tc="http://myfaces.apache.org/tobago/component"
- xmlns:tx="http://myfaces.apache.org/tobago/extension"
- xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:f="http://java.sun.com/jsf/core">
<tc:page id="page">
<tc:gridLayoutConstraint width="300px"/>
@@ -29,7 +27,7 @@
<tc:button id="button-internal-link-with-slash" label="internal link with slash" link="/tc/button/plain.html"/>
<tc:button id="button-internal-link-without-slash" label="internal link without slash" link="plain.html"/>
- <tc:button id="button-external-link" label="external link" link="http://www.apache.org/"/>
+ <tc:button id="button-external-link" label="external link" link="http://www.apache.org/licenses/LICENSE-2.0.txt"/>
</tc:page>
</f:view>
Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java?rev=1362804&r1=1362803&r2=1362804&view=diff
==============================================================================
--- myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java (original)
+++ myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java Wed Jul 18 08:06:30 2012
@@ -79,12 +79,14 @@ public abstract class SeleniumTest {
if (errorOnServer()) {
Assert.fail(format(ERROR_ON_SERVER, location, html, ""));
}
- try {
- if (isErrorOnPage()) {
- Assert.fail(format(HAS_ERROR_SEVERITY, location, html, getErrors()));
+ if (location.endsWith(".xhtml") || location.endsWith(".jspx")) {
+ try {
+ if (isErrorOnPage()) {
+ Assert.fail(format(HAS_ERROR_SEVERITY, location, html, getErrors()));
+ }
+ } catch (SeleniumException e) {
+ Assert.fail(format(IS_BROKEN, location, html, "Not a Tobago page? Exception=" + e));
}
- } catch (SeleniumException e) {
- Assert.fail(format(IS_BROKEN, location, html, "Not a Tobago page? Exception=" + e));
}
}
Propchange: myfaces/tobago/branches/tobago-1.5.x/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java
------------------------------------------------------------------------------
Merged /myfaces/tobago/trunk/tobago-example/tobago-example-test/src/test/java/org/apache/myfaces/tobago/example/test/SeleniumTest.java:r1362393