Seam SVN: r14852 - in branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test: selenium and 1 other directory.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-06-07 06:33:09 -0400 (Thu, 07 Jun 2012)
New Revision: 14852
Modified:
branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java
branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java
branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/selenium/SeleniumFunctionalTestListener.java
Log:
functional tests, fix calling stopBrowser after @AfterMethod
Modified: branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java
===================================================================
--- branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java 2012-06-07 10:32:55 UTC (rev 14851)
+++ branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java 2012-06-07 10:33:09 UTC (rev 14852)
@@ -51,7 +51,7 @@
@Override
@AfterMethod
public void tearDown() {
-// logout();
+ logout();
super.tearDown();
}
Modified: branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java
===================================================================
--- branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2012-06-07 10:32:55 UTC (rev 14851)
+++ branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/selenium/SeamSeleniumTest.java 2012-06-07 10:33:09 UTC (rev 14852)
@@ -88,7 +88,7 @@
@AfterMethod
public void tearDown() {
/*browser is being closed from SeleniumFunctionalTestListener class*/
- //stopBrowser();
+ stopBrowser();
}
public SeamSelenium startBrowser() {
Modified: branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/selenium/SeleniumFunctionalTestListener.java
===================================================================
--- branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/selenium/SeleniumFunctionalTestListener.java 2012-06-07 10:32:55 UTC (rev 14851)
+++ branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/selenium/SeleniumFunctionalTestListener.java 2012-06-07 10:33:09 UTC (rev 14852)
@@ -55,13 +55,13 @@
SeamSeleniumTest.browser.logHTMLContext(logPath + ".html");
} catch (Exception e) {
} finally {
- stopBrowser();
+ // stopBrowser();
}
}
public void onTestSkipped(ITestResult arg0)
{
- stopBrowser();
+ //stopBrowser();
}
public void onTestStart(ITestResult arg0)
@@ -70,6 +70,6 @@
public void onTestSuccess(ITestResult arg0)
{
- stopBrowser();
+ //stopBrowser();
}
}
11 years, 10 months
Seam SVN: r14851 - branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-06-07 06:32:55 -0400 (Thu, 07 Jun 2012)
New Revision: 14851
Added:
branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/login.xhtml
branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/todo.xhtml
Removed:
branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/login.jsp
branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/todo.jsp
Log:
JBSEAM-4967 migrated todo example to facelets from JSP template
Deleted: branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/login.jsp
===================================================================
--- branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/login.jsp 2012-06-07 10:32:42 UTC (rev 14850)
+++ branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/login.jsp 2012-06-07 10:32:55 UTC (rev 14851)
@@ -1,18 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<html>
-<head>
-<title>Login</title>
-</head>
-<body>
-<h1>Login</h1>
-<f:view>
- <h:form id="login">
- <div>
- <h:inputText id="username" value="#{login.user}"/>
- <h:commandButton id="submit" value="Login" action="#{login.login}"/>
- </div>
- </h:form>
-</f:view>
-</body>
-</html>
Added: branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/login.xhtml
===================================================================
--- branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/login.xhtml (rev 0)
+++ branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/login.xhtml 2012-06-07 10:32:55 UTC (rev 14851)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!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:s="http://jboss.org/schema/seam/taglib"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+ <head>
+ <title>Login</title>
+ </head>
+ <body>
+ <h1>Login</h1>
+ <f:view>
+ <h:form id="login">
+ <div>
+ <h:inputText id="username" value="#{login.user}"/>
+ <h:commandButton id="submit" value="Login" action="#{login.login}"/>
+ </div>
+ </h:form>
+ </f:view>
+ </body>
+</html>
Deleted: branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/todo.jsp
===================================================================
--- branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/todo.jsp 2012-06-07 10:32:42 UTC (rev 14850)
+++ branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/todo.jsp 2012-06-07 10:32:55 UTC (rev 14851)
@@ -1,63 +0,0 @@
-<%@ taglib uri="http://java.sun.com/jsf/html" prefix="h"%>
-<%@ taglib uri="http://java.sun.com/jsf/core" prefix="f"%>
-<%@ taglib uri="http://jboss.com/products/seam/taglib" prefix="s"%>
-<html>
-<head>
-<title>Todo List</title>
-</head>
-<body>
-<h1>Todo List</h1>
-<f:view>
- <h:form id="list">
- <div>
- <h:outputText id="noItems" value="There are no todo items." rendered="#{empty taskInstancePriorityList}"/>
- <h:dataTable id="items" value="#{taskInstancePriorityList}" var="task" rendered="#{not empty taskInstancePriorityList}">
- <h:column>
- <f:facet name="header">
- <h:outputText value="Description"/>
- </f:facet>
- <h:inputText id="description" value="#{task.description}" style="width: 400"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Created"/>
- </f:facet>
- <h:outputText value="#{task.taskMgmtInstance.processInstance.start}">
- <f:convertDateTime type="date"/>
- </h:outputText>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Priority"/>
- </f:facet>
- <h:inputText id="priority" value="#{task.priority}" style="width: 30"/>
- </h:column>
- <h:column>
- <f:facet name="header">
- <h:outputText value="Due Date"/>
- </f:facet>
- <h:inputText id="dueDate" value="#{task.dueDate}" style="width: 100">
- <f:convertDateTime type="date" dateStyle="short"/>
- </h:inputText>
- </h:column>
- <h:column>
- <s:button id="done" action="#{todoList.done}" taskInstance="#{task}" value="Done"/>
- </h:column>
- </h:dataTable>
- </div>
- <div>
- <h:messages/>
- </div>
- <div>
- <h:commandButton id="update" value="Update Items" rendered="#{not empty taskInstanceList}"/>
- </div>
- </h:form>
- <h:form id="new">
- <div>
- <h:inputText id="description" value="#{todoList.description}" style="width: 400"/>
- <h:commandButton id="create" value="Create New Item" action="#{todoList.createTodo}"/>
- </div>
- </h:form>
-</f:view>
-</body>
-</html>
Copied: branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/todo.xhtml (from rev 14850, branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/todo.jsp)
===================================================================
--- branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/todo.xhtml (rev 0)
+++ branches/enterprise/WFK-2_0/examples-ee6/todo/todo-web/src/main/webapp/todo.xhtml 2012-06-07 10:32:55 UTC (rev 14851)
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!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:s="http://jboss.org/schema/seam/taglib"
+ xmlns:h="http://java.sun.com/jsf/html"
+ xmlns:f="http://java.sun.com/jsf/core">
+<head>
+<title>Todo List</title>
+</head>
+<body>
+<h1>Todo List</h1>
+<f:view>
+ <h:form id="list">
+ <div>
+ <h:outputText id="noItems" value="There are no todo items." rendered="#{empty taskInstancePriorityList}"/>
+ <h:dataTable id="items" value="#{taskInstancePriorityList}" var="task" rendered="#{not empty taskInstancePriorityList}">
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Description"/>
+ </f:facet>
+ <h:inputText id="description" value="#{task.description}" style="width: 400"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Created"/>
+ </f:facet>
+ <h:outputText value="#{task.taskMgmtInstance.processInstance.start}">
+ <f:convertDateTime type="date"/>
+ </h:outputText>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Priority"/>
+ </f:facet>
+ <h:inputText id="priority" value="#{task.priority}" style="width: 30"/>
+ </h:column>
+ <h:column>
+ <f:facet name="header">
+ <h:outputText value="Due Date"/>
+ </f:facet>
+ <h:inputText id="dueDate" value="#{task.dueDate}" style="width: 100">
+ <f:convertDateTime type="date" dateStyle="short"/>
+ </h:inputText>
+ </h:column>
+ <h:column>
+ <s:button id="done" action="#{todoList.done}" taskInstance="#{task}" value="Done"/>
+ </h:column>
+ </h:dataTable>
+ </div>
+ <div>
+ <h:messages/>
+ </div>
+ <div>
+ <h:commandButton id="update" value="Update Items" rendered="#{not empty taskInstanceList}"/>
+ </div>
+ </h:form>
+ <h:form id="new">
+ <div>
+ <h:inputText id="description" value="#{todoList.description}" style="width: 400"/>
+ <h:commandButton id="create" value="Create New Item" action="#{todoList.createTodo}"/>
+ </div>
+ </h:form>
+</f:view>
+</body>
+</html>
11 years, 10 months
Seam SVN: r14850 - branches/enterprise/WFK-2_0/examples-ee6/spring/spring-web/src/main/webapp.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-06-07 06:32:42 -0400 (Thu, 07 Jun 2012)
New Revision: 14850
Modified:
branches/enterprise/WFK-2_0/examples-ee6/spring/spring-web/src/main/webapp/password.xhtml
Log:
remove the s:validate from the spring example
Modified: branches/enterprise/WFK-2_0/examples-ee6/spring/spring-web/src/main/webapp/password.xhtml
===================================================================
--- branches/enterprise/WFK-2_0/examples-ee6/spring/spring-web/src/main/webapp/password.xhtml 2012-06-07 10:32:30 UTC (rev 14849)
+++ branches/enterprise/WFK-2_0/examples-ee6/spring/spring-web/src/main/webapp/password.xhtml 2012-06-07 10:32:42 UTC (rev 14850)
@@ -28,7 +28,6 @@
<div class="input">
<s:decorate id="PasswordDecorate">
<h:inputSecret id="password" value="#{user.password}" required="true">
- <s:validate />
</h:inputSecret>
<br/>
</s:decorate>
11 years, 10 months
Seam SVN: r14849 - branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/booking/selenium.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-06-07 06:32:30 -0400 (Thu, 07 Jun 2012)
New Revision: 14849
Modified:
branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java
Log:
don't call any selenium in tearDown, as the session ought to be closed there already.
Modified: branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java
===================================================================
--- branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java 2012-06-07 10:32:15 UTC (rev 14848)
+++ branches/enterprise/WFK-2_0/functional-tests/src/main/java/org/jboss/seam/example/common/test/booking/selenium/SeleniumBookingTest.java 2012-06-07 10:32:30 UTC (rev 14849)
@@ -51,7 +51,7 @@
@Override
@AfterMethod
public void tearDown() {
- logout();
+// logout();
super.tearDown();
}
11 years, 10 months
Seam SVN: r14848 - branches/enterprise/WFK-2_0/examples-ee6/remoting/chatroom/chatroom-tests/src/test/java/org/jboss/seam/example/remoting/chatroom/test/webdriver.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-06-07 06:32:15 -0400 (Thu, 07 Jun 2012)
New Revision: 14848
Modified:
branches/enterprise/WFK-2_0/examples-ee6/remoting/chatroom/chatroom-tests/src/test/java/org/jboss/seam/example/remoting/chatroom/test/webdriver/WebDriverChatroomTest.java
Log:
fix chatroom ftest
Modified: branches/enterprise/WFK-2_0/examples-ee6/remoting/chatroom/chatroom-tests/src/test/java/org/jboss/seam/example/remoting/chatroom/test/webdriver/WebDriverChatroomTest.java
===================================================================
--- branches/enterprise/WFK-2_0/examples-ee6/remoting/chatroom/chatroom-tests/src/test/java/org/jboss/seam/example/remoting/chatroom/test/webdriver/WebDriverChatroomTest.java 2012-06-06 17:41:05 UTC (rev 14847)
+++ branches/enterprise/WFK-2_0/examples-ee6/remoting/chatroom/chatroom-tests/src/test/java/org/jboss/seam/example/remoting/chatroom/test/webdriver/WebDriverChatroomTest.java 2012-06-07 10:32:15 UTC (rev 14848)
@@ -69,9 +69,9 @@
public static final By JOZEF_LISTED = By.xpath("//div/select[@id='userList']/option[contains(text(),'Jozef')]");
public static final By JOZEF_DISCONNECTED = By.xpath("//div[@id='channelDisplay']/span[contains(text(),'Jozef disconnected.')]");
public static final By MARTIN_GT = By.xpath("//div[@id='channelDisplay']/span[contains(text(),'Martin>')]");
- public static final By HELLO = By.xpath("//div[@id='channelDisplay']/text()[contains(.,'"+ MESSAGE_FROM_MARTIN +"')]");
+ public static final By HELLO = By.xpath("//div[@id='channelDisplay']/text()[contains(.,'"+ MESSAGE_FROM_MARTIN +"')]/..");
public static final By JOZEF_GT = By.xpath("//div[@id='channelDisplay']/span[contains(text(),'Jozef>')]");
- public static final By GOOD_MORNING = By.xpath("//div[@id='channelDisplay']/text()[contains(.,'" + MESSAGE_FROM_JOZEF + "')]");
+ public static final By GOOD_MORNING = By.xpath("//div[@id='channelDisplay']/text()[contains(.,'" + MESSAGE_FROM_JOZEF + "')]/..");
protected AjaxWebDriver driver2;
@@ -118,7 +118,7 @@
driver.setWaitTime(timeout);
//more reliable than simple click
- driver.findElement(CONNECT_BUTTON).clearAndSendKeys(Keys.RETURN);
+ driver.findElement(CONNECT_BUTTON).sendKeys(Keys.RETURN);
try
{
11 years, 10 months
Seam SVN: r14846 - branches/enterprise/WFK-2_0.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-06-06 13:36:01 -0400 (Wed, 06 Jun 2012)
New Revision: 14846
Removed:
branches/enterprise/WFK-2_0/jboss-seam-wicket/
Log:
svn removing empty dirs
11 years, 10 months
Seam SVN: r14845 - branches/enterprise/WFK-2_0.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-06-06 13:34:57 -0400 (Wed, 06 Jun 2012)
New Revision: 14845
Removed:
branches/enterprise/WFK-2_0/jboss-seam-rss/
Log:
svn removing empty dirs
11 years, 10 months
Seam SVN: r14844 - branches/enterprise/WFK-2_0.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-06-06 13:34:16 -0400 (Wed, 06 Jun 2012)
New Revision: 14844
Removed:
branches/enterprise/WFK-2_0/jboss-seam-flex/
Log:
bz #828702 svn removing empty dirs
11 years, 10 months
Seam SVN: r14843 - branches/enterprise/WFK-2_0.
by seam-commits@lists.jboss.org
Author: manaRH
Date: 2012-06-06 13:32:28 -0400 (Wed, 06 Jun 2012)
New Revision: 14843
Removed:
branches/enterprise/WFK-2_0/extras/
Log:
bz #827425 svn does removing of dirs uncorrectly
11 years, 10 months