Seam SVN: r14582 - in branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests: src/test/java/org/jboss/seam/example/contactlist/test and 1 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-13 12:19:32 -0400 (Fri, 13 Apr 2012)
New Revision: 14582
Added:
branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/resources-integration/web.xml
Modified:
branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java
Log:
fix contactlist tests
Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-04-13 16:16:04 UTC (rev 14581)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-04-13 16:19:32 UTC (rev 14582)
@@ -77,12 +77,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.arquillian.extension</groupId>
- <artifactId>arquillian-seam2</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.jboss.spec.javax.el</groupId>
<artifactId>jboss-el-api_2.2_spec</artifactId>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java 2012-04-13 16:16:04 UTC (rev 14581)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/java/org/jboss/seam/example/contactlist/test/ContactListTest.java 2012-04-13 16:19:32 UTC (rev 14582)
@@ -25,6 +25,10 @@
WebArchive web = er.getAsType(WebArchive.class, "contactlist-web.war");
web.addClasses(ContactListTest.class);
+
+ // Install org.jboss.seam.mock.MockSeamListener
+ web.delete("/WEB-INF/web.xml");
+ web.addAsWebInfResource("web.xml");
return er;
}
Added: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/resources-integration/web.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/resources-integration/web.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/src/test/resources-integration/web.xml 2012-04-13 16:19:32 UTC (rev 14582)
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<web-app version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+ <listener>
+ <listener-class>org.jboss.seam.mock.MockSeamListener</listener-class>
+ </listener>
+
+</web-app>
13 years, 9 months
Seam SVN: r14581 - in branches/community/Seam_2_3/examples-ee6/drools/drools-tests: src/test/java/org/jboss/seam/example/numberguess/test and 1 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-13 12:16:04 -0400 (Fri, 13 Apr 2012)
New Revision: 14581
Added:
branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/resources-integration/web.xml
Modified:
branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java
Log:
fix drools example seamtests
Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml 2012-04-13 16:06:03 UTC (rev 14580)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml 2012-04-13 16:16:04 UTC (rev 14581)
@@ -72,12 +72,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.arquillian.extension</groupId>
- <artifactId>arquillian-seam2</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
</dependency>
Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java 2012-04-13 16:06:03 UTC (rev 14580)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/java/org/jboss/seam/example/numberguess/test/DroolsNumberGuessTest.java 2012-04-13 16:16:04 UTC (rev 14581)
@@ -14,7 +14,6 @@
import org.jboss.seam.pageflow.Pageflow;
import org.jboss.shrinkwrap.api.Archive;
import org.jboss.shrinkwrap.api.ShrinkWrap;
-import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.importer.ZipImporter;
import org.jboss.shrinkwrap.api.spec.EnterpriseArchive;
import org.jboss.shrinkwrap.api.spec.WebArchive;
@@ -35,8 +34,11 @@
EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-drools.ear").importFrom(new File("../drools-ear/target/seam-drools.ear"))
.as(EnterpriseArchive.class);
WebArchive web = er.getAsType(WebArchive.class, "drools-web.war");
- web.addAsWebInfResource(new StringAsset("org.jboss.seam.mock.MockFacesContextFactory"), "classes/META-INF/services/javax.faces.context.FacesContextFactory");
web.addClasses(DroolsNumberGuessTest.class);
+
+ // Install org.jboss.seam.mock.MockSeamListener
+ web.delete("/WEB-INF/web.xml");
+ web.addAsWebInfResource("web.xml");
return er;
}
Added: branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/resources-integration/web.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/resources-integration/web.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-tests/src/test/resources-integration/web.xml 2012-04-13 16:16:04 UTC (rev 14581)
@@ -0,0 +1,17 @@
+<?xml version="1.0" ?>
+
+<web-app version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+ <listener>
+ <listener-class>org.jboss.seam.mock.MockSeamListener</listener-class>
+ </listener>
+
+ <context-param>
+ <param-name>javax.faces.DEFAULT_SUFFIX</param-name>
+ <param-value>.jsp</param-value>
+ </context-param>
+
+</web-app>
13 years, 9 months
Seam SVN: r14580 - in branches/community/Seam_2_3/examples-ee6/dvdstore: dvdstore-tests/src/test/java/com/jboss/dvd/seam/test and 1 other directory.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-13 12:06:03 -0400 (Fri, 13 Apr 2012)
New Revision: 14580
Modified:
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/BestSellersTest.java
Log:
forgot file in the previous commit
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml 2012-04-13 16:02:36 UTC (rev 14579)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/pom.xml 2012-04-13 16:06:03 UTC (rev 14580)
@@ -95,10 +95,6 @@
<groupId>org.apache.jackrabbit</groupId>
<artifactId>jackrabbit-core</artifactId>
</exclusion>
- <exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
- </exclusion>
<exclusion>
<groupId>cglib</groupId>
<artifactId>cglib</artifactId>
@@ -121,6 +117,10 @@
<groupId>org.beanshell</groupId>
<artifactId>bsh</artifactId>
</dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ </dependency>
</dependencies>
<profiles>
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/BestSellersTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/BestSellersTest.java 2012-04-13 16:02:36 UTC (rev 14579)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/BestSellersTest.java 2012-04-13 16:06:03 UTC (rev 14580)
@@ -32,7 +32,7 @@
WebArchive web = er.getAsType(WebArchive.class, "dvdstore-web.war");
web.addClasses(BestSellersTest.class);
- // Install org.jboss.seam.mock.MockSeamListener
+ // Install org.jboss.seam.mock.MockSeamListener
web.delete("/WEB-INF/web.xml");
web.addAsWebInfResource("web.xml");
13 years, 9 months
Seam SVN: r14579 - in branches/community/Seam_2_3/examples-ee6/dvdstore: dvdstore-ejb/src/main/java/com/jboss/dvd/seam and 2 other directories.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-13 12:02:36 -0400 (Fri, 13 Apr 2012)
New Revision: 14579
Added:
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources-integration/web.xml
Modified:
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/application/META-INF/jboss-deployment-structure.xml
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/src/main/java/com/jboss/dvd/seam/Product.java
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/BestSellersTest.java
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/OrderTest.java
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/ProductUnitTest.java
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/SearchTest.java
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/StoreManagerTest.java
Log:
dvdstore testsuite fixes
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/application/META-INF/jboss-deployment-structure.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-13 15:48:58 UTC (rev 14578)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ear/src/main/application/META-INF/jboss-deployment-structure.xml 2012-04-13 16:02:36 UTC (rev 14579)
@@ -2,7 +2,6 @@
<deployment>
<dependencies>
<module name="org.apache.log4j" export="true"/>
- <module name="org.dom4j" export="true"/>
<module name="org.apache.commons.logging" export="true"/>
<module name="org.apache.commons.collections" export="true"/>
<module name="org.slf4j" export="true"/>
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/src/main/java/com/jboss/dvd/seam/Product.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/src/main/java/com/jboss/dvd/seam/Product.java 2012-04-13 15:48:58 UTC (rev 14578)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/src/main/java/com/jboss/dvd/seam/Product.java 2012-04-13 16:02:36 UTC (rev 14579)
@@ -15,6 +15,7 @@
import javax.persistence.Entity;
import javax.persistence.FetchType;
import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.JoinColumn;
import javax.persistence.JoinTable;
@@ -61,7 +62,7 @@
Set<Category> categories;
Inventory inventory;
- @Id @GeneratedValue
+ @Id @GeneratedValue(strategy = GenerationType.IDENTITY)
@Column(name="PROD_ID")
@DocumentId
public long getProductId() {
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/BestSellersTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/BestSellersTest.java 2012-04-13 15:48:58 UTC (rev 14578)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/BestSellersTest.java 2012-04-13 16:02:36 UTC (rev 14579)
@@ -31,6 +31,10 @@
EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-dvdstore.ear").importFrom(new File("../dvdstore-ear/target/seam-dvdstore.ear")).as(EnterpriseArchive.class);
WebArchive web = er.getAsType(WebArchive.class, "dvdstore-web.war");
web.addClasses(BestSellersTest.class);
+
+ // Install org.jboss.seam.mock.MockSeamListener
+ web.delete("/WEB-INF/web.xml");
+ web.addAsWebInfResource("web.xml");
return er;
}
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/OrderTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/OrderTest.java 2012-04-13 15:48:58 UTC (rev 14578)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/OrderTest.java 2012-04-13 16:02:36 UTC (rev 14579)
@@ -39,6 +39,10 @@
EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-dvdstore.ear").importFrom(new File("../dvdstore-ear/target/seam-dvdstore.ear")).as(EnterpriseArchive.class);
WebArchive web = er.getAsType(WebArchive.class, "dvdstore-web.war");
web.addClasses(OrderTest.class);
+
+ // Install org.jboss.seam.mock.MockSeamListener
+ web.delete("/WEB-INF/web.xml");
+ web.addAsWebInfResource("web.xml");
return er;
}
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/ProductUnitTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/ProductUnitTest.java 2012-04-13 15:48:58 UTC (rev 14578)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/ProductUnitTest.java 2012-04-13 16:02:36 UTC (rev 14579)
@@ -32,6 +32,10 @@
EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-dvdstore.ear").importFrom(new File("../dvdstore-ear/target/seam-dvdstore.ear")).as(EnterpriseArchive.class);
WebArchive web = er.getAsType(WebArchive.class, "dvdstore-web.war");
web.addClasses(ProductUnitTest.class);
+
+ // Install org.jboss.seam.mock.MockSeamListener
+ web.delete("/WEB-INF/web.xml");
+ web.addAsWebInfResource("web.xml");
return er;
}
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/SearchTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/SearchTest.java 2012-04-13 15:48:58 UTC (rev 14578)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/SearchTest.java 2012-04-13 16:02:36 UTC (rev 14579)
@@ -32,6 +32,10 @@
EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-dvdstore.ear").importFrom(new File("../dvdstore-ear/target/seam-dvdstore.ear")).as(EnterpriseArchive.class);
WebArchive web = er.getAsType(WebArchive.class, "dvdstore-web.war");
web.addClasses(SearchTest.class);
+
+ // Install org.jboss.seam.mock.MockSeamListener
+ web.delete("/WEB-INF/web.xml");
+ web.addAsWebInfResource("web.xml");
return er;
}
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/StoreManagerTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/StoreManagerTest.java 2012-04-13 15:48:58 UTC (rev 14578)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/StoreManagerTest.java 2012-04-13 16:02:36 UTC (rev 14579)
@@ -30,6 +30,10 @@
EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class, "seam-dvdstore.ear").importFrom(new File("../dvdstore-ear/target/seam-dvdstore.ear")).as(EnterpriseArchive.class);
WebArchive web = er.getAsType(WebArchive.class, "dvdstore-web.war");
web.addClasses(StoreManagerTest.class);
+
+ // Install org.jboss.seam.mock.MockSeamListener
+ web.delete("/WEB-INF/web.xml");
+ web.addAsWebInfResource("web.xml");
return er;
}
Added: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources-integration/web.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources-integration/web.xml (rev 0)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/resources-integration/web.xml 2012-04-13 16:02:36 UTC (rev 14579)
@@ -0,0 +1,12 @@
+<?xml version="1.0" ?>
+
+<web-app version="3.0"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
+
+ <listener>
+ <listener-class>org.jboss.seam.mock.MockSeamListener</listener-class>
+ </listener>
+
+</web-app>
13 years, 9 months
Seam SVN: r14578 - in branches/community/Seam_2_3: seam-integration-tests/src/test/resources/WEB-INF and 1 other directory.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-13 11:48:58 -0400 (Fri, 13 Apr 2012)
New Revision: 14578
Added:
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockSeamListener.java
Modified:
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java
branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/JUnitSeamTest.java
branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/web.xml
Log:
implementation of MockSeamListener
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java 2012-04-13 15:25:03 UTC (rev 14577)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/AbstractSeamTest.java 2012-04-13 15:48:58 UTC (rev 14578)
@@ -934,12 +934,16 @@
*/
protected void startSeam() throws Exception
{
+ if (realServletContext == null && MockSeamListener.getServletContext() != null) {
+ realServletContext = MockSeamListener.getServletContext();
+ }
+
// If the Seam Filter is already initialized, we can grab the real servlet context
- if (realServletContext == null && ServletLifecycle.getServletContext() != null) {
- realServletContext = ServletLifecycle.getServletContext();
- }
-
- ServletContext realContext = realServletContext;
+ if (realServletContext == null && ServletLifecycle.getServletContext() != null) {
+ realServletContext = ServletLifecycle.getServletContext();
+ }
+
+ ServletContext realContext = realServletContext;
this.servletContext = createServletContext(realContext);
ServletLifecycle.beginApplication(servletContext);
FactoryFinder.setFactory(FactoryFinder.APPLICATION_FACTORY, MockApplicationFactory.class.getName());
Modified: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/JUnitSeamTest.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/JUnitSeamTest.java 2012-04-13 15:25:03 UTC (rev 14577)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/JUnitSeamTest.java 2012-04-13 15:48:58 UTC (rev 14578)
@@ -30,8 +30,8 @@
try {
if (!seamStarted) {
startSeam();
+ setupClass();
seamStarted = true;
- setupClass();
}
}
catch (Exception x) {
Added: branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockSeamListener.java
===================================================================
--- branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockSeamListener.java (rev 0)
+++ branches/community/Seam_2_3/jboss-seam/src/main/java/org/jboss/seam/mock/MockSeamListener.java 2012-04-13 15:48:58 UTC (rev 14578)
@@ -0,0 +1,42 @@
+/*
+ * JBoss, Home of Professional Open Source
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+package org.jboss.seam.mock;
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import org.jboss.seam.Seam;
+import org.jboss.seam.log.LogProvider;
+import org.jboss.seam.log.Logging;
+
+/**
+ * Used to retrieve real ServletContext for the AbstractSeamTest startSeam
+ *
+ * @author Marek Schmidt
+ */
+public class MockSeamListener implements ServletContextListener
+{
+ private static final LogProvider log = Logging.getLogProvider(ServletContextListener.class);
+
+ private static ServletContext servletContext;
+
+ public void contextInitialized(ServletContextEvent event)
+ {
+ log.info( "Welcome to Mock Seam " + Seam.getVersion() );
+ event.getServletContext().setAttribute( Seam.VERSION, Seam.getVersion() );
+ servletContext = event.getServletContext();
+ }
+
+ public void contextDestroyed(ServletContextEvent event)
+ {
+ }
+
+ public static ServletContext getServletContext() {
+ return servletContext;
+ }
+}
Modified: branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/web.xml
===================================================================
--- branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/web.xml 2012-04-13 15:25:03 UTC (rev 14577)
+++ branches/community/Seam_2_3/seam-integration-tests/src/test/resources/WEB-INF/web.xml 2012-04-13 15:48:58 UTC (rev 14578)
@@ -5,7 +5,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
<listener>
- <listener-class>org.jboss.seam.servlet.SeamListener</listener-class>
+ <listener-class>org.jboss.seam.mock.MockSeamListener</listener-class>
</listener>
</web-app>
13 years, 9 months
Seam SVN: r14577 - branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-13 11:25:03 -0400 (Fri, 13 Apr 2012)
New Revision: 14577
Modified:
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/ProductUnitTest.java
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/SearchTest.java
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/StoreManagerTest.java
Log:
dvdstore test fixes
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/ProductUnitTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/ProductUnitTest.java 2012-04-13 14:17:23 UTC (rev 14576)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/ProductUnitTest.java 2012-04-13 15:25:03 UTC (rev 14577)
@@ -49,13 +49,14 @@
Product p = new Product();
EntityManager em = (EntityManager) getValue("#{entityManager}");
+
try {
- em.persist(p);
- Assert.fail("empty product persisted");
+ em.persist(p);
+ Assert.fail("empty product persisted");
} catch (PersistenceException e) {
// good
- }
- }
+ }
+ }
}.run();
}
@@ -69,8 +70,8 @@
new FacesRequest() {
protected void invokeApplication()
{
- EntityManager em = (EntityManager) getValue("#{entityManager}");
- em.persist(p);
+ EntityManager em = (EntityManager) getValue("#{entityManager}");
+ em.persist(p);
}
@@ -85,7 +86,7 @@
Assert.assertEquals("id", p.getProductId(), found.getProductId());
Assert.assertEquals("title", "test", found.getTitle());
- em.remove(found);
+ em.remove(found);
}
}.run();
@@ -95,7 +96,7 @@
EntityManager em = (EntityManager) getValue("#{entityManager}");
Product found = em.find(Product.class ,p.getProductId());
- Assert.assertEquals("deleted product", found);
+ Assert.assertNull("deleted product", found);
}
}.run();
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/SearchTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/SearchTest.java 2012-04-13 14:17:23 UTC (rev 14576)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/SearchTest.java 2012-04-13 15:25:03 UTC (rev 14577)
@@ -40,6 +40,8 @@
public void testNoParamSearch()
throws Exception
{
+ // Wait a while for the indexing
+ Thread.sleep(10000);
new FacesRequest() {
FullTextSearch search;
@@ -61,11 +63,13 @@
ListDataModel model = (ListDataModel) lookup("searchResults");
//exact number of matches depends on search algorithm,
//so we only check that at least something was found:
- Assert.assertEquals("should have found something",model.isRowAvailable());
+
+
+ Assert.assertTrue("should have found something", model.isRowAvailable());
Product firstMatch = (Product) model.getRowData();
- Assert.assertEquals("at least top match should have keyword in title",
+ Assert.assertTrue("at least top match should have keyword in title",
firstMatch.getTitle().toLowerCase().contains("king"));
- Assert.assertEquals("in conversation", isLongRunningConversation());
+ Assert.assertTrue("in conversation", isLongRunningConversation());
}
}.run();
}
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/StoreManagerTest.java
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/StoreManagerTest.java 2012-04-13 14:17:23 UTC (rev 14576)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-tests/src/test/java/com/jboss/dvd/seam/test/StoreManagerTest.java 2012-04-13 15:25:03 UTC (rev 14577)
@@ -54,7 +54,7 @@
Assert.assertEquals("total sales", BigDecimal.ZERO, manager.getTotalSales());
// these are from inventory
- Assert.assertEquals("units sold", 5734, manager.getUnitsSold());
+ Assert.assertEquals("units sold", 5735, manager.getUnitsSold());
Assert.assertEquals("total inventory", 23432, manager.getTotalInventory());
}
}.run();
13 years, 9 months
Seam SVN: r14576 - branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/src/main/resources.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-13 10:17:23 -0400 (Fri, 13 Apr 2012)
New Revision: 14576
Modified:
branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/src/main/resources/import.sql
Log:
dvdstore example, make the top three sales clearly defined for the test
Modified: branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/src/main/resources/import.sql
===================================================================
--- branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/src/main/resources/import.sql 2012-04-13 12:24:56 UTC (rev 14575)
+++ branches/community/Seam_2_3/examples-ee6/dvdstore/dvdstore-ejb/src/main/resources/import.sql 2012-04-13 14:17:23 UTC (rev 14576)
@@ -3474,7 +3474,7 @@
insert into PRODUCT_CATEGORY (PROD_ID, CATEGORY) values (436, 2);
insert into PRODUCT_CATEGORY (PROD_ID, CATEGORY) values (436, 4);
insert into PRODUCT_CATEGORY (PROD_ID, CATEGORY) values (436, 29);
-insert into INVENTORY (INV_ID, PROD_ID, QUAN_IN_STOCK, SALES) values (436, 436, 25, 24);
+insert into INVENTORY (INV_ID, PROD_ID, QUAN_IN_STOCK, SALES) values (436, 436, 25, 25);
insert into PRODUCTS (PROD_ID, ASIN, TITLE, PRICE, IMAGE_URL, DESCRIPTION) values ('437', 'B00004RF97', 'The Philadelphia Story', 19.97, 'http://images.amazon.com/images/P/B00004RF97.01.MZZZZZZZ.jpg', 'Recreating the role she originated in Philip Barry''s wickedly witty Broadway play, Katharine Hepburn stars as the spoiled and snobby socialite Tracy Lord in this sparkling 1940 screen adaptation of The Philadelphia Story, one of the great romantic comedies from the golden age of MGM studios. Applying her impossibly high ideals to everyone but herself, Tracy is about to marry a stuffy executive when her congenial ex-husband (Cary Grant), arrives to protect his former father-in-law from a potentially scandalous tabloid expose. In an Oscar-winning role, James Stewart is the scandal reporter who falls for Tracy as her wedding day arrives, throwing her into a dizzying state of premarital jitters. Who will join Tracy at the altar? Snappy dialogue flows like sparkling wine under th!
e sophisticated direction of George Cukor in this film that turned the tide of Hepburn''s career from "box-office poison" to glamorous Hollywood star. ');
insert into PRODUCT_ACTORS (PROD_ID,ACTOR_ID) values (437, 62)
insert into PRODUCT_CATEGORY (PROD_ID, CATEGORY) values (437, 7);
13 years, 9 months
Seam SVN: r14575 - branches/community/Seam_2_3/examples-ee6/drools/drools-tests.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-13 08:24:56 -0400 (Fri, 13 Apr 2012)
New Revision: 14575
Modified:
branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml
Log:
drools example add arq-seam2 extension dependency
Modified: branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml 2012-04-13 12:24:22 UTC (rev 14574)
+++ branches/community/Seam_2_3/examples-ee6/drools/drools-tests/pom.xml 2012-04-13 12:24:56 UTC (rev 14575)
@@ -72,6 +72,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.arquillian.extension</groupId>
+ <artifactId>arquillian-seam2</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jbpm.jbpm3</groupId>
<artifactId>jbpm-jpdl</artifactId>
</dependency>
13 years, 9 months
Seam SVN: r14574 - branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests.
by seam-commits＠lists.jboss.org
Author: maschmid
Date: 2012-04-13 08:24:22 -0400 (Fri, 13 Apr 2012)
New Revision: 14574
Modified:
branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml
Log:
contactlist example add arq-seam2 extension dependency
Modified: branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-04-13 12:21:11 UTC (rev 14573)
+++ branches/community/Seam_2_3/examples-ee6/contactlist/contactlist-tests/pom.xml 2012-04-13 12:24:22 UTC (rev 14574)
@@ -77,6 +77,12 @@
</dependency>
<dependency>
+ <groupId>org.jboss.arquillian.extension</groupId>
+ <artifactId>arquillian-seam2</artifactId>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
<groupId>org.jboss.spec.javax.el</groupId>
<artifactId>jboss-el-api_2.2_spec</artifactId>
</dependency>
13 years, 9 months
