Seam SVN: r15086 - branches/community/Seam_2_3/distribution/src/main/assembly.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-08-25 15:49:13 -0400 (Sat, 25 Aug 2012)
New Revision: 15086
Modified:
branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml
Log:
fixed wrong directory and file permissions for doc subdirectories
Modified: branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml
===================================================================
--- branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml 2012-08-24 15:56:18 UTC (rev 15085)
+++ branches/community/Seam_2_3/distribution/src/main/assembly/dist.xml 2012-08-25 19:49:13 UTC (rev 15086)
@@ -238,6 +238,8 @@
<exclude>META-INF/</exclude>
</excludes>
</unpackOptions>
+ <directoryMode>755</directoryMode>
+ <fileMode>755</fileMode>
<outputFileNameMapping>${artifact.artifactId}-${artifact.version}${dashClassifier?}.${artifact.extension}</outputFileNameMapping>
</dependencySet>
@@ -251,6 +253,8 @@
<exclude>META-INF/</exclude>
</excludes>
</unpackOptions>
+ <directoryMode>755</directoryMode>
+ <fileMode>755</fileMode>
<includes>
<include>org.jboss.seam:jboss-seam:*:javadoc</include>
</includes>
@@ -266,6 +270,8 @@
<exclude>META-INF/</exclude>
</excludes>
</unpackOptions>
+ <directoryMode>755</directoryMode>
+ <fileMode>755</fileMode>
<includes>
<include>org.jboss.seam:jboss-seam-ui:*:javadoc</include>
</includes>
12 years, 4 months
Seam SVN: r15085 - branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-08-24 11:56:18 -0400 (Fri, 24 Aug 2012)
New Revision: 15085
Modified:
branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties
Log:
update groovybooking ftest properties
Modified: branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties
===================================================================
--- branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties 2012-08-24 15:09:27 UTC (rev 15084)
+++ branches/community/Seam_2_3/examples-ee6/groovybooking/groovybooking-tests/src/test/resources/groovybooking.properties 2012-08-24 15:56:18 UTC (rev 15085)
@@ -28,14 +28,14 @@
LOGOUT id=logout
PASSWORD_UPDATED_MESSAGE Password updated
PASSWORD_REENTER_MESSAGE verify
-PASSWORD_VALUE_REQUIRED_MESSAGE //*[@id='setpassword:Message' or @id='setpassword:PasswordDecorate:Message']
+PASSWORD_VALUE_REQUIRED_MESSAGE //span[text() = 'value is required']
PASSWORD_LENGTH_MESSAGE size must be between
PASSWORD_PASSWORD id=setpassword:PasswordDecorate:password
PASSWORD_VERIFY id=setpassword:VerifyDecorate:verify
PASSWORD_SUBMIT id=setpassword:change
SETTINGS id=settings
-SEARCH_STRING_FIELD id=main:searchString
-SEARCH_SUBMIT id=main:findHotels
+SEARCH_STRING_FIELD id=searchCriteria:searchString
+SEARCH_SUBMIT id=searchCriteria:findHotels
NO_HOTELS_FOUND id=NoHotelsFoundMessage
SEARCH_RESULT_TABLE xpath=//table[@id = 'hotels']/tbody
SEARCH_RESULT_TABLE_FIRST_ROW_LINK id=hotels:0:viewHotel
@@ -44,9 +44,9 @@
HOTEL_BED_FIELD id=booking:bedsDecorate:beds
HOTEL_BED_FIELD_SELECT_CRITERIA value=
HOTEL_CHECKIN_DATE_FIELD id=booking:checkinDateDecorate:checkinDateInputDate
-HOTEL_CHECKIN_DATE_MESSAGE xpath=//*[@id='booking:Message' or @id='booking:checkinDateDecorate:Message']
+HOTEL_CHECKIN_DATE_MESSAGE xpath=//*[@id='booking:message' or @id='booking:checkinDateDecorate:message']
HOTEL_CHECKOUT_DATE_FIELD id=booking:checkoutDateDecorate:checkoutDateInputDate
-HOTEL_CHECKOUT_DATE_MESSAGE xpath=//*[@id='booking:Message' or @id='booking:checkoutDateDecorate:Message']
+HOTEL_CHECKOUT_DATE_MESSAGE xpath=//*[@id='booking:message' or @id='booking:checkoutDateDecorate:message']
HOTEL_SMOKING_1 id=booking:smokingDecorate:smoking:0
HOTEL_SMOKING_2 id=booking:smokingDecorate:smoking:1
HOTEL_CREDIT_CARD id=booking:creditCardDecorate:creditCard
@@ -54,17 +54,17 @@
HOTEL_PROCEED id=booking:proceed
HOTEL_CANCEL id=booking:cancel
HOTEL_CONFIRM id=confirm:confirm
-HOTEL_MESSAGE xpath=//ul[@id='main:messages']/li
+HOTEL_MESSAGE xpath=//ul[@id='messages']/li
REGISTRATION id=login:register
-REGISTRATION_USERNAME id=register:usernameDecorate:username
-REGISTRATION_USERNAME_MESSAGE id=register:usernameDecorate:message
-REGISTRATION_NAME id=register:nameDecorate:name
-REGISTRATION_NAME_MESSAGE id=register:nameDecorate:message
-REGISTRATION_PASSWORD id=register:passwordDecorate:password
-REGISTRATION_PASSWORD_MESSAGE id=register:passwordDecorate:message
-REGISTRATION_VERIFY id=register:verifyDecorate:verify
-REGISTRATION_VERIFY_MESSAGE id=register:verifyDecorate:message
-REGISTRATION_SUBMIT id=register:register
+REGISTRATION_USERNAME id=registration:usernameDecorate:username
+REGISTRATION_USERNAME_MESSAGE id=registration:usernameDecorate:message
+REGISTRATION_NAME id=registration:nameDecorate:name
+REGISTRATION_NAME_MESSAGE id=registration:nameDecorate:message
+REGISTRATION_PASSWORD id=registration:passwordDecorate:password
+REGISTRATION_PASSWORD_MESSAGE id=registration:passwordDecorate:message
+REGISTRATION_VERIFY id=registration:verifyDecorate:verify
+REGISTRATION_VERIFY_MESSAGE id=registration:verifyDecorate:message
+REGISTRATION_SUBMIT id=registration:register
REGISTRATION_REENTER_MESSAGE verify
REGISTRATION_LENGTH_MESSAGE size must be between
REGISTRATION_SUCCESSFUL_MESSAGE Successfully registered as {0}
@@ -81,4 +81,4 @@
WORKSPACE_VIEW_TEXT View hotel: {0}
WORKSPACE_TABLE_LINK_BY_ID id=ConversationListForm:ConversationListDataTable:{0}:EntryDescriptionLink
WORKSPACE_TABLE_ROW_COUNT = //table[@id\='ConversationListForm\:ConversationListDataTable']/tbody/tr
-SPINNER id\=main\:Spinner
+SPINNER id\=searchCriteria:SpinnerGif
12 years, 4 months
Seam SVN: r15084 - branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test/webdriver.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-08-24 11:09:27 -0400 (Fri, 24 Aug 2012)
New Revision: 15084
Modified:
branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test/webdriver/WebServicesTest.java
Log:
add a few delays to the seambay webservices webdriver test
Modified: branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test/webdriver/WebServicesTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test/webdriver/WebServicesTest.java 2012-08-24 12:07:13 UTC (rev 15083)
+++ branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test/webdriver/WebServicesTest.java 2012-08-24 15:09:27 UTC (rev 15084)
@@ -16,6 +16,7 @@
*/
public class WebServicesTest extends AjaxWebDriverTest
{
+ protected static final int WAIT_TIME = 1000;
protected static final By HERE_LINK = By.partialLinkText("here");
protected static final String SERVICE_PAGE_URL = "test.seam";
@@ -70,7 +71,16 @@
public void testGoToWSPage()
{
driver.get(serverURL + contextPath);
- driver.findElement(HERE_LINK).click();
+
+ try
+ {
+ Thread.sleep(WAIT_TIME);
+ }
+ catch (InterruptedException e)
+ {
+ }
+
+ driver.findElement(HERE_LINK).clickAndWait();
assertTrue("URL contains web services page", driver.getCurrentUrl().contains(SERVICE_PAGE_URL));
}
@@ -245,12 +255,19 @@
*/
protected void loginService()
{
-
String username = "demo";
String password = "demo";
driver.get(serverURL + contextPath);
- driver.findElement(HERE_LINK).click();
+ try
+ {
+ Thread.sleep(WAIT_TIME);
+ }
+ catch (InterruptedException e)
+ {
+ }
+
+ driver.findElement(HERE_LINK).clickAndWait();
driver.findElement(By.partialLinkText("Login")).clickAndWait();
12 years, 4 months
Seam SVN: r15083 - branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/synchronization.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-08-24 08:07:13 -0400 (Fri, 24 Aug 2012)
New Revision: 15083
Modified:
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/synchronization/FactoryLockTest.java
Log:
ignore FactoryLockTest seamSynchronizedFactoryLock test
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/synchronization/FactoryLockTest.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/synchronization/FactoryLockTest.java 2012-08-24 11:59:50 UTC (rev 15082)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/synchronization/FactoryLockTest.java 2012-08-24 12:07:13 UTC (rev 15083)
@@ -114,6 +114,7 @@
}
// This test is the same as sameFactoryLock test, except it uses a @Synchronized Seam component, instead of an SFSB
+ @Ignore // JBSEAM-5001
@Test
public void seamSynchronizedFactoryLock()
throws Exception
12 years, 4 months
Seam SVN: r15082 - branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-08-24 07:59:50 -0400 (Fri, 24 Aug 2012)
New Revision: 15082
Modified:
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/BoundComponentConversationTest.java
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/PageScopedUIIncludeTest.java
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/RestoreViewComponentAccessTest.java
Log:
disable known test failures
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/BoundComponentConversationTest.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/BoundComponentConversationTest.java 2012-08-24 11:34:37 UTC (rev 15081)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/BoundComponentConversationTest.java 2012-08-24 11:59:50 UTC (rev 15082)
@@ -64,7 +64,7 @@
"</html>"), "test.xhtml");
}
- @Ignore
+ @Ignore // JBSEAM-5020
@Test
public void testConversationRestoration() throws Exception
{
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/PageScopedUIIncludeTest.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/PageScopedUIIncludeTest.java 2012-08-24 11:34:37 UTC (rev 15081)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/PageScopedUIIncludeTest.java 2012-08-24 11:59:50 UTC (rev 15082)
@@ -17,6 +17,7 @@
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.api.asset.StringAsset;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -85,6 +86,7 @@
assertTrue(page.getBody().getTextContent().contains("Hello, xyzzy"));
}
+ @Ignore // JBSEAM-5002
@Test
public void testComponent2() throws Exception
{
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/RestoreViewComponentAccessTest.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/RestoreViewComponentAccessTest.java 2012-08-24 11:34:37 UTC (rev 15081)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/RestoreViewComponentAccessTest.java 2012-08-24 11:59:50 UTC (rev 15082)
@@ -21,6 +21,7 @@
import org.jboss.seam.test.integration.Deployments;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
+import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -82,8 +83,9 @@
return war;
}
+ @Ignore // JBSEAM-4976
@Test
- public void testJBSEAM4976() throws Exception {
+ public void testConversationWithValidator() throws Exception {
HtmlPage page = client.getPage(contextPath + "test.seam");
assertTrue(page.getBody().getTextContent().contains("Sequence: "));
12 years, 4 months
Seam SVN: r15081 - branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-08-24 07:34:37 -0400 (Fri, 24 Aug 2012)
New Revision: 15081
Modified:
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java
Log:
remove jboss-seam-ui from the SeamTest tests
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-08-24 11:07:07 UTC (rev 15080)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/Deployments.java 2012-08-24 11:34:37 UTC (rev 15081)
@@ -2,6 +2,7 @@
import java.io.File;
+import org.jboss.shrinkwrap.api.ArchivePath;
import org.jboss.shrinkwrap.api.ShrinkWrap;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.importer.ZipImporter;
@@ -9,27 +10,7 @@
public class Deployments {
public static WebArchive defaultSeamDeployment() {
- return ShrinkWrap.create(ZipImporter.class, "test.war").importFrom(new File("target/seam-integration-tests.war")).as(WebArchive.class)
- .addAsWebInfResource(new StringAsset(
- "<jboss-deployment-structure>" +
- "<deployment>" +
- "<dependencies>" +
- "<module name=\"org.javassist\"/>" +
- "<module name=\"org.dom4j\"/>" +
- "</dependencies>" +
- "</deployment>" +
- "</jboss-deployment-structure>"), "jboss-deployment-structure.xml")
- .addAsResource("seam.properties")
- .addAsResource("components.properties")
- .addAsResource("messages_en.properties")
- .addAsResource("META-INF/persistence.xml")
-
- .addAsResource("hibernate.cfg.xml")
- .addAsWebInfResource("WEB-INF/components.xml", "components.xml")
- .addAsWebInfResource("WEB-INF/pages.xml", "pages.xml")
- .addAsWebInfResource("WEB-INF/web.xml", "web.xml")
- .addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml")
- .addAsWebInfResource("WEB-INF/jboss-seam-integration-tests-hornetq-jms.xml", "jboss-seam-integration-tests-hornetq-jms.xml");
+ return defaultSeamDeployment("WEB-INF/components.xml");
}
// Deployment that use the proper SeamListener instead of the MockSeamListener
@@ -90,7 +71,7 @@
}
public static WebArchive defaultSeamDeployment(String customComponentsXml) {
- return ShrinkWrap.create(ZipImporter.class, "test.war").importFrom(new File("target/seam-integration-tests.war")).as(WebArchive.class)
+ WebArchive war = ShrinkWrap.create(ZipImporter.class, "test.war").importFrom(new File("target/seam-integration-tests.war")).as(WebArchive.class)
.addAsWebInfResource(new StringAsset(
"<jboss-deployment-structure>" +
"<deployment>" +
@@ -111,5 +92,15 @@
.addAsWebInfResource("WEB-INF/web.xml", "web.xml")
.addAsWebInfResource("WEB-INF/ejb-jar.xml", "ejb-jar.xml")
.addAsWebInfResource("WEB-INF/jboss-seam-integration-tests-hornetq-jms.xml", "jboss-seam-integration-tests-hornetq-jms.xml");
+
+ // Remove jboss-seam-ui for a Mock SeamTest test as it would cause Mojarra to initialize
+ for (ArchivePath path : war.getContent().keySet()) {
+ if (path.get().contains("jboss-seam-ui")) {
+ war.delete(path);
+ break;
+ }
+ }
+
+ return war;
}
}
12 years, 4 months
Seam SVN: r15080 - branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-08-24 07:07:07 -0400 (Fri, 24 Aug 2012)
New Revision: 15080
Modified:
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/SessionScopedOutjectionOverwriteTest.java
Log:
rename SessionScopedOutjectionOverwriteTest beans to avoid name conflict with other tests
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/SessionScopedOutjectionOverwriteTest.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/SessionScopedOutjectionOverwriteTest.java 2012-08-24 10:43:24 UTC (rev 15079)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/SessionScopedOutjectionOverwriteTest.java 2012-08-24 11:07:07 UTC (rev 15080)
@@ -35,7 +35,7 @@
@ArquillianResource
URL contextPath;
- @Deployment(name="SessionScopedIdlingTest", testable=false)
+ @Deployment(name="SessionScopedOutjectionOverwriteTest", testable=false)
@OverProtocol("Servlet 3.0")
public static Archive<?> createDeployment()
{
@@ -51,8 +51,8 @@
"<h:body>" +
"<h:form id='form'>" +
"<h:outputText value='Output: #{output}.'/>" +
- "<h:commandButton id='foo' action='#{foo.foo}' value='foo' />" +
- "<h:commandButton id='bar' action='#{bar.bar}' value='bar' />" +
+ "<h:commandButton id='foo' action='#{faces.foo.foo}' value='foo' />" +
+ "<h:commandButton id='bar' action='#{faces.bar.bar}' value='bar' />" +
"<h:commandButton id='nop' action='test' value='nop' />" +
"</h:form>" +
"</h:body>" +
@@ -75,7 +75,7 @@
}
@Scope(ScopeType.SESSION)
- @Name("foo")
+ @Name("faces.foo")
public static class Foo
{
@Out(scope=ScopeType.SESSION)
@@ -88,7 +88,7 @@
}
@Scope(ScopeType.EVENT)
- @Name("bar")
+ @Name("faces.bar")
public static class Bar
{
@Out(scope=ScopeType.SESSION)
12 years, 4 months
Seam SVN: r15079 - branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-08-24 06:43:24 -0400 (Fri, 24 Aug 2012)
New Revision: 15079
Removed:
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/SequenceAction.java
Modified:
branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/RestoreViewComponentAccessTest.java
Log:
JBSEAM-4976 fix RestoreViewComponentAccessTest
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/RestoreViewComponentAccessTest.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/RestoreViewComponentAccessTest.java 2012-08-24 09:48:02 UTC (rev 15078)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/RestoreViewComponentAccessTest.java 2012-08-24 10:43:24 UTC (rev 15079)
@@ -4,18 +4,23 @@
import static org.junit.Assert.assertFalse;
+import java.io.Serializable;
import java.net.URL;
+import java.util.Deque;
+import java.util.LinkedList;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.container.test.api.OverProtocol;
import org.jboss.arquillian.container.test.api.RunAsClient;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
+import org.jboss.seam.ScopeType;
+import org.jboss.seam.annotations.Create;
+import org.jboss.seam.annotations.Name;
+import org.jboss.seam.annotations.Scope;
import org.jboss.seam.test.integration.Deployments;
-import org.jboss.shrinkwrap.api.asset.Asset;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -23,13 +28,15 @@
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlTextInput;
+/**
+ * Test accessing conversation scoped component from a restore view phase (by a JSF validator attribute)
+ * Related to JBSEAM-4976
+ */
@RunWith(Arquillian.class)
@RunAsClient
public class RestoreViewComponentAccessTest
{
private final WebClient client = new WebClient();
- private static final String[] testScopes = {"page", "conversation", "session", "application"};
- private static final String componentNamePrefix = "sequence_";
@ArquillianResource
URL contextPath;
@@ -38,7 +45,6 @@
@OverProtocol("Servlet 3.0")
public static WebArchive createDeployment()
{
-
// This is a client test, use a real (non-mocked) Seam deployment
WebArchive war = Deployments.realSeamDeployment()
.addClasses(SequenceAction.class);
@@ -46,37 +52,7 @@
war.delete("WEB-INF/pages.xml");
war.delete("WEB-INF/components.xml");
- for (String scope : testScopes) {
- war.addAsWebResource(createView(scope), "test_" + scope + ".xhtml");
- }
-
- StringBuilder componentsXmlBuilder = new StringBuilder();
-
- componentsXmlBuilder.append("<components xmlns=\"http://jboss.org/schema/seam/components\">");
-
- for (String scope : testScopes) {
- String cname = componentNamePrefix + scope;
- componentsXmlBuilder.append("<component name='" + cname + "' scope='" + scope + "' class='org.jboss.seam.test.integration.faces.SequenceAction' />");
- }
-
- componentsXmlBuilder.append("</components>");
-
- war.addAsWebInfResource(new StringAsset(componentsXmlBuilder.toString()), "components.xml");
-
- war.addAsWebInfResource(new StringAsset(
- "<pages xmlns=\"http://jboss.org/schema/seam/pages\""+
- " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">"+
- "<page view-id='/test_conversation.xhtml'>" +
- "<begin-conversation join='true'/>" +
- "</page>" +
- "</pages>"), "pages.xml");
-
- return war;
- }
-
- private static Asset createView(String scope) {
- String cname = componentNamePrefix + scope;
- return new StringAsset(
+ war.addAsWebResource(new StringAsset(
"<html xmlns=\"http://www.w3.org/1999/xhtml\"" +
" xmlns:h=\"http://java.sun.com/jsf/html\"" +
" xmlns:f=\"http://java.sun.com/jsf/core\"" +
@@ -86,19 +62,29 @@
"<h:body>" +
"<h:form id='form'>" +
"<h:messages/>" +
- "<h:outputText id='output' value='Sequence: #{" + cname + ".output}'/>" +
- "<h:inputText id='input' value='#{" + cname + ".input}'>" +
- "<f:validateLongRange minimum='#{" + cname + ".minimum}' />" +
+ "<h:outputText id='output' value='Sequence: #{sequence.output}'/>" +
+ "<h:inputText id='input' value='#{sequence.input}'>" +
+ "<f:validateLongRange minimum='#{sequence.minimum}' />" +
"</h:inputText>" +
- "<h:commandButton id='append' value='Append' action='#{" + cname + ".append}'/>" +
+ "<h:commandButton id='append' value='Append' action='#{sequence.append}'/>" +
"</h:form>" +
"</h:body>" +
- "</html>");
+ "</html>"), "test.xhtml");
+
+ war.addAsWebInfResource(new StringAsset(
+ "<pages xmlns=\"http://jboss.org/schema/seam/pages\""+
+ " xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">" +
+ "<page view-id='/test.xhtml'>" +
+ "<begin-conversation join='true'/>" +
+ "<navigation><redirect view-id='/test.xhtml'/></navigation>" +
+ "</page></pages>"), "pages.xml");
+
+ return war;
}
-
- public void testBase(String scope) throws Exception {
- HtmlPage page = client.getPage(contextPath + "test_" + scope + ".seam");
+ @Test
+ public void testJBSEAM4976() throws Exception {
+ HtmlPage page = client.getPage(contextPath + "test.seam");
assertTrue(page.getBody().getTextContent().contains("Sequence: "));
((HtmlTextInput)page.getElementById("form:input")).setText("1");
@@ -118,27 +104,49 @@
assertTrue(page.getBody().getTextContent().contains("value must be greater than or equal to 2"));
}
- @Test
- @Ignore
- public void testPage() throws Exception {
- testBase("page");
+ @Name("sequence")
+ @Scope(ScopeType.CONVERSATION)
+ public static class SequenceAction implements Serializable {
+ private static final long serialVersionUID = 1L;
+
+ private Deque<Long> sequence;
+ private Long input;
+
+ @Create
+ public void create() {
+ sequence = new LinkedList<Long>();
+ }
+
+ public String getOutput() {
+ StringBuilder sb = new StringBuilder();
+ for (Long n : sequence) {
+ sb.append(n);
+ sb.append(", ");
+ }
+
+ return sb.toString();
+ }
+
+ public void append() {
+ sequence.add(input);
+ }
+
+ public Long getInput()
+ {
+ return input;
+ }
+
+ public void setInput(Long input)
+ {
+ this.input = input;
+ }
+
+ public Long getMinimum() {
+ if (sequence.isEmpty()) {
+ return 0L;
+ }
+
+ return sequence.getLast();
+ }
}
-
- @Test
- @Ignore
- public void testConversation() throws Exception {
- testBase("conversation");
- }
-
- @Test
- @Ignore
- public void testSession() throws Exception {
- testBase("session");
- }
-
- @Test
- @Ignore
- public void testApplication() throws Exception {
- testBase("application");
- }
}
Deleted: branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/SequenceAction.java
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/SequenceAction.java 2012-08-24 09:48:02 UTC (rev 15078)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/java/org/jboss/seam/test/integration/faces/SequenceAction.java 2012-08-24 10:43:24 UTC (rev 15079)
@@ -1,51 +0,0 @@
-package org.jboss.seam.test.integration.faces;
-
-import java.io.Serializable;
-import java.util.Deque;
-import java.util.LinkedList;
-
-import org.jboss.seam.annotations.Create;
-
-public class SequenceAction implements Serializable {
- private static final long serialVersionUID = 1L;
-
- private Deque<Long> sequence;
- private Long input;
-
- @Create
- public void create() {
- sequence = new LinkedList<Long>();
- }
-
- public String getOutput() {
- StringBuilder sb = new StringBuilder();
- for (Long n : sequence) {
- sb.append(n);
- sb.append(", ");
- }
-
- return sb.toString();
- }
-
- public void append() {
- sequence.add(input);
- }
-
- public Long getInput()
- {
- return input;
- }
-
- public void setInput(Long input)
- {
- this.input = input;
- }
-
- public Long getMinimum() {
- if (sequence.isEmpty()) {
- return 0L;
- }
-
- return sequence.getLast();
- }
-}
\ No newline at end of file
12 years, 4 months
Seam SVN: r15078 - branches/community/Seam_2_3/distribution.
by seam-commits＠lists.jboss.org
Author: manaRH
Date: 2012-08-24 05:48:02 -0400 (Fri, 24 Aug 2012)
New Revision: 15078
Modified:
branches/community/Seam_2_3/distribution/pom.xml
Log:
commented cleaning of jar-dependencies directory
Modified: branches/community/Seam_2_3/distribution/pom.xml
===================================================================
--- branches/community/Seam_2_3/distribution/pom.xml 2012-08-24 05:24:31 UTC (rev 15077)
+++ branches/community/Seam_2_3/distribution/pom.xml 2012-08-24 09:48:02 UTC (rev 15078)
@@ -14,7 +14,7 @@
<build>
<plugins>
- <plugin>
+ <!-- <plugin>
<artifactId>maven-clean-plugin</artifactId>
<configuration>
<filesets>
@@ -23,7 +23,7 @@
</fileset>
</filesets>
</configuration>
- </plugin>
+ </plugin> -->
<plugin>
<artifactId>maven-antrun-plugin</artifactId>
<executions>
12 years, 4 months
Seam SVN: r15077 - branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse.
by seam-commits＠lists.jboss.org
Author: dhinojosa
Date: 2012-08-24 01:24:31 -0400 (Fri, 24 Aug 2012)
New Revision: 15077
Modified:
branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath
Log:
JBSEAM-4995
Modified: branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath
===================================================================
--- branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2012-08-23 16:24:06 UTC (rev 15076)
+++ branches/community/Seam_2_3/jboss-seam-gen/dist/ide-project-files/eclipse/.classpath 2012-08-24 05:24:31 UTC (rev 15077)
@@ -307,5 +307,6 @@
<classpathentry kind="lib" path="lib/jboss-seam-ui.jar"/>
<classpathentry kind="lib" path="lib/wicket-datetime.jar"/>
<classpathentry kind="lib" path="lib/wicket-extensions.jar"/>
+ <classpathentry kind="lib" path="lib/@driverJar@"/>
<classpathentry kind="output" path="test-build"/>
</classpath>
12 years, 4 months