Author: maschmid Date: 2013-06-03 13:07:17 -0400 (Mon, 03 Jun 2013) New Revision: 15530 Added: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/seam/ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/seam/example/ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/seam/example/seambay/ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/seam/example/seambay/test/ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/seam/example/seambay/test/AuctionTest.java branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/arquillian.xml branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/components.xml branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/jboss-deployment-structure.xml branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/pages.xml branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/persistence.xml branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/urlrewrite.xml branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/web.xml Removed: branches/enterprise/WFK-2_1/examples/seambay/seambay-tests/ Modified: branches/enterprise/WFK-2_1/examples/seambay/pom.xml branches/enterprise/WFK-2_1/examples/seambay/seambay-ear/pom.xml branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/pom.xml branches/enterprise/WFK-2_1/examples/seambay/seambay-web/pom.xml Log: seambay migrated Modified: branches/enterprise/WFK-2_1/examples/seambay/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/seambay/pom.xml 2013-06-03 17:00:28 UTC (rev 15529) +++ branches/enterprise/WFK-2_1/examples/seambay/pom.xml 2013-06-03 17:07:17 UTC (rev 15530) @@ -3,27 +3,49 @@ <modelVersion>4.0.0</modelVersion> <groupId>org.jboss.seam.examples</groupId> <artifactId>seambay</artifactId> - <parent> - <groupId>org.jboss.seam</groupId> - <artifactId>examples</artifactId> - <version>2.3.1.Final-redhat-2</version> - </parent> + <version>2.3.1.Final-redhat-2</version> + <packaging>pom</packaging> <name>Seambay Example (EE6)</name> <properties> <example.name>seambay</example.name> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> + <maven.compiler.target>1.6</maven.compiler.target> + <maven.compiler.source>1.6</maven.compiler.source> + + <!-- To use jacoco, set jacoco.agent system property to something like + -javaagent:/path/to/jacocoagent.jar=append=true,destfile=/path/to/output/jacoco.exec --> + <jacoco.agent /> + + <!-- To use custom Maven settings with ShrinkWrap Resolver, uncomment + and customize the following property. --> + <!--<maven.user.settings>/path/to/custom/settings.xml</maven.user.settings>--> + + <version.commons.logging>1.1.1</version.commons.logging> + <version.shrinkwrap.resolver>2.0.0-beta-4</version.shrinkwrap.resolver> + + <!-- Plugin versions --> + <version.dependency.plugin>2.5.1</version.dependency.plugin> + <version.surefire.plugin>2.10</version.surefire.plugin> + <version.resources.plugin>2.6</version.resources.plugin> + <version.compiler.plugin>2.3.1</version.compiler.plugin> + <version.ear.plugin>2.6</version.ear.plugin> + <version.war.plugin>2.1.1</version.war.plugin> + <version.ejb.plugin>2.3</version.ejb.plugin> + <version.jboss.maven.plugin>7.4.Final</version.jboss.maven.plugin> </properties> <modules> <module>seambay-ear</module> <module>seambay-ejb</module> <module>seambay-web</module> - <module>seambay-tests</module> + </modules> <dependencyManagement> <dependencies> + <!-- Modules --> <dependency> <groupId>org.jboss.seam.examples.seambay</groupId> <artifactId>seambay-ejb</artifactId> @@ -41,6 +63,82 @@ <artifactId>seambay-ear</artifactId> <version>${project.version}</version> </dependency> + + <!-- BOMs --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-bom</artifactId> + <version>${version.shrinkwrap.resolver}</version> + <scope>import</scope> + <type>pom</type> + </dependency> + + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>bom</artifactId> + <version>${project.version}</version> + <type>pom</type> + <scope>import</scope> + </dependency> + + <!-- Common provided dependencies --> + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + <version>${version.commons.logging}</version> + <scope>provided</scope> + </dependency> + + <!-- TestNG is not necessary --> + <dependency> + <groupId>org.jboss.seam</groupId> + <artifactId>jboss-seam</artifactId> + <version>${project.version}</version> + <exclusions> + <exclusion> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + </exclusion> + <exclusion> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + </exclusion> + </exclusions> + </dependency> + </dependencies> </dependencyManagement> + + <build> + <pluginManagement> + <plugins> + <!-- Manage plugin versions for build stability --> + <plugin> + <artifactId>maven-surefire-plugin</artifactId> + <version>${version.surefire.plugin}</version> + <configuration> + <systemPropertyVariables> + <org.apache.maven.user-settings>${maven.user.settings}</org.apache.maven.user-settings> + </systemPropertyVariables> + </configuration> + </plugin> + <plugin> + <artifactId>maven-dependency-plugin</artifactId> + <version>${version.dependency.plugin}</version> + </plugin> + <plugin> + <artifactId>maven-resources-plugin</artifactId> + <version>${version.resources.plugin}</version> + </plugin> + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <version>${version.compiler.plugin}</version> + <configuration> + <source>${maven.compiler.source}</source> + <target>${maven.compiler.target}</target> + </configuration> + </plugin> + </plugins> + </pluginManagement> + </build> </project> Modified: branches/enterprise/WFK-2_1/examples/seambay/seambay-ear/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/seambay/seambay-ear/pom.xml 2013-06-03 17:00:28 UTC (rev 15529) +++ branches/enterprise/WFK-2_1/examples/seambay/seambay-ear/pom.xml 2013-06-03 17:07:17 UTC (rev 15530) @@ -48,10 +48,20 @@ <build> <finalName>seam-seambay</finalName> + <pluginManagement> + <plugins> + <plugin> + <groupId>org.jboss.as.plugins</groupId> + <artifactId>jboss-as-maven-plugin</artifactId> + <version>${version.jboss.maven.plugin}</version> + </plugin> + </plugins> + </pluginManagement> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-ear-plugin</artifactId> + <version>${version.ear.plugin}</version> <configuration> <version>6</version> <defaultLibBundleDir>lib</defaultLibBundleDir> Modified: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/pom.xml 2013-06-03 17:00:28 UTC (rev 15529) +++ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/pom.xml 2013-06-03 17:07:17 UTC (rev 15530) @@ -57,6 +57,110 @@ <groupId>org.opensymphony.quartz</groupId> <artifactId>quartz</artifactId> </dependency> + + <!-- Test dependencies --> + <dependency> + <groupId>org.jboss.shrinkwrap.resolver</groupId> + <artifactId>shrinkwrap-resolver-depchain</artifactId> + <type>pom</type> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian.junit</groupId> + <artifactId>arquillian-junit-container</artifactId> + <scope>test</scope> + </dependency> + + <dependency> + <groupId>org.jboss.arquillian.protocol</groupId> + <artifactId>arquillian-protocol-servlet</artifactId> + <scope>test</scope> + </dependency> </dependencies> - + + <profiles> + <profile> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + <properties> + <jndiPattern>java:app/seam-seambay/#{ejbName}</jndiPattern> + <distributable>false</distributable> + </properties> + <build> + <testResources> + <testResource> + <directory>src/test/resources</directory> + <filtering>true</filtering> + </testResource> + </testResources> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>false</skip> + </configuration> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-managed</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + + <profile> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.as</groupId> + <artifactId>jboss-as-arquillian-container-remote</artifactId> + <scope>test</scope> + </dependency> + </dependencies> + </profile> + </profiles> + + <build> + <plugins> + <!-- Skip tests by default --> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-surefire-plugin</artifactId> + <configuration> + <skip>true</skip> + </configuration> + </plugin> + </plugins> + </build> </project> Added: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/seam/example/seambay/test/AuctionTest.java =================================================================== --- branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/seam/example/seambay/test/AuctionTest.java (rev 0) +++ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/java/org/jboss/seam/example/seambay/test/AuctionTest.java 2013-06-03 17:07:17 UTC (rev 15530) @@ -0,0 +1,261 @@ +package org.jboss.seam.example.seambay.test; + +import java.io.File; +import java.util.List; + +import javax.faces.model.DataModel; +import org.jboss.arquillian.container.test.api.Deployment; +import org.jboss.arquillian.container.test.api.OverProtocol; +import org.jboss.arquillian.junit.Arquillian; + +import org.jboss.seam.contexts.Contexts; +import org.jboss.seam.example.seambay.Auction; +import org.jboss.seam.example.seambay.Category; +import org.jboss.seam.mock.AbstractSeamTest.FacesRequest; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.asset.StringAsset; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.jboss.shrinkwrap.resolver.api.maven.Maven; +import org.junit.Test; +import org.junit.runner.RunWith; + + +(a)RunWith(Arquillian.class) +public class AuctionTest extends JUnitSeamTest +{ + @Deployment(name="AuctionTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + File[] libs = Maven.resolver().loadPomFromFile("pom.xml") + .importCompileAndRuntimeDependencies() + // force resolve jboss-seam, because it is provided-scoped in the pom, but we need it bundled in the WAR + .resolve("org.jboss.seam:jboss-seam") + .withTransitivity().asFile(); + + WebArchive war = ShrinkWrap.create(WebArchive.class, "seam-seambay.war") + .addPackages(true, "org.jboss.seam.example.seambay") + + .addAsWebInfResource("org/jboss/seam/example/seambay/soap-handlers.xml", "classes/org/jboss/seam/example/seambay/soap-handlers.xml") + + // already in EJB module + .addAsWebInfResource("import.sql", "classes/import.sql") + .addAsWebInfResource("seam.properties", "classes/seam.properties") + + .addAsWebInfResource("META-INF/ejb-jar.xml", "ejb-jar.xml") + .addAsWebInfResource("META-INF/security-rules.drl", "security-rules.drl") + + // Test specific persistence.xml + .addAsWebInfResource("persistence.xml", "classes/META-INF/persistence.xml") + + // manually copied from Web module + .addAsWebInfResource("pages.xml", "pages.xml") + + // manually copied from Web module, modified + .addAsWebInfResource("web.xml", "web.xml") // only contains MockSeamListener definition + .addAsWebInfResource("components.xml", "components.xml") // corrected ejb component jndi-name references from java:app/jboss-seam to java:app/seam-blog + + // manually copied from EAR module + .addAsWebInfResource("jboss-deployment-structure.xml", "jboss-deployment-structure.xml") + .addAsLibraries(libs); + + return war; + } + + @Test + public void testCreateAuction() throws Exception + { + new FacesRequest() + { + @Override + protected void invokeApplication() throws Exception + { + setValue("#{identity.username}", "demo"); + setValue("#{identity.password}", "demo"); + invokeAction("#{identity.login}"); + assert getValue("#{identity.loggedIn}").equals(true); + } + }.run(); + + String cid = new FacesRequest() + { + @Override + protected void invokeApplication() throws Exception + { + invokeAction("#{auctionAction.createAuction}"); + } + + @Override + protected void renderResponse() + { + Auction auction = (Auction) getValue("#{auctionAction.auction}"); + assert auction != null; + } + }.run(); + + new FacesRequest("/sell.xhtml", cid) + { + @Override + protected void updateModelValues() throws Exception + { + setValue("#{auctionAction.auction.title}", "A Widget"); + } + }.run(); + + + new FacesRequest("/sell2.xhtml", cid) + { + @Override + protected void updateModelValues() throws Exception + { + List<Category> categories = (List<Category>) getValue("#{allCategories}"); + + setValue("#{auctionAction.auction.category}", categories.get(0)); + } + }.run(); + + new FacesRequest("/sell3.xhtml", cid) + { + @Override + protected void updateModelValues() throws Exception + { + setValue("#{auctionAction.duration}", 3); + setValue("#{auctionAction.auction.startingPrice}", 100.0); + } + + }.run(); + + new FacesRequest("/sell5.xhtml", cid) + { + @Override + protected void updateModelValues() throws Exception + { + setValue("#{auctionAction.auction.description}", "foo"); + } + }.run(); + + new FacesRequest("/preview.xhtml", cid) + { + @Override + protected void invokeApplication() throws Exception + { + Auction auction = (Auction) getValue("#{auctionAction.auction}"); + invokeAction("#{auctionAction.confirm}"); + assert auction.getStatus() == Auction.STATUS_LIVE; + } + }.run(); + + new FacesRequest() + { + @Override + protected void invokeApplication() throws Exception + { + invokeAction("#{identity.logout}"); + assert getValue("#{identity.loggedIn}").equals(false); + } + }.run(); + } + + @Test + public void testBidding() throws Exception + { + new FacesRequest() + { + @Override + protected void invokeApplication() throws Exception + { + setValue("#{identity.username}", "demo"); + setValue("#{identity.password}", "demo"); + invokeAction("#{identity.login}"); + assert getValue("#{identity.loggedIn}").equals(true); + } + }.run(); + + new FacesRequest() + { + @Override + protected void invokeApplication() throws Exception + { + invokeAction("#{auctionAction.createAuction}"); + setValue("#{auctionAction.auction.title}", "BidTestZZZ"); + setValue("#{auctionAction.auction.startingPrice}", 1); + setValue("#{auctionAction.auction.description}", "bar"); + setValue("#{auctionAction.categoryId}", 1001); + + Auction auction = (Auction) getValue("#{auctionAction.auction}"); + + assert auction.getStatus() == Auction.STATUS_UNLISTED; + + invokeAction("#{auctionAction.confirm}"); + + assert auction.getStatus() == Auction.STATUS_LIVE; + assert auction.getHighBid() == null; + } + }.run(); + + new FacesRequest() + { + @Override + protected void updateModelValues() throws Exception + { + setValue("#{auctionSearch.searchTerm}", "BidTestZZZ"); + } + + @Override + protected void invokeApplication() throws Exception + { + assert invokeAction("#{auctionSearch.queryAuctions}") == null; + } + + @Override + protected void renderResponse() throws Exception + { + DataModel auctions = (DataModel) Contexts.getSessionContext().get("auctions"); + assert auctions.getRowCount() == 1; + Auction auction = ((Auction) auctions.getRowData()); + assert auction.getTitle().equals("BidTestZZZ"); + assert auction.getHighBid() == null; + } + + }.run(); + + new FacesRequest() + { + @Override + protected void invokeApplication() throws Exception + { + Contexts.getEventContext().set("auction", getValue("#{auctionSearch.auctions[0]}")); + + assert invokeAction("#{bidAction.placeBid}") == null; + assert getValue("#{bidAction.outcome}").equals("required"); + Contexts.getEventContext().set("bidAmount", "5.00"); + + assert invokeAction("#{bidAction.placeBid}") == null; + assert getValue("#{bidAction.outcome}").equals("confirm"); + + assert invokeAction("#{bidAction.confirmBid}").equals("success"); + } + }.run(); + + new FacesRequest() + { + @Override + protected void invokeApplication() throws Exception + { + assert invokeAction("#{auctionSearch.queryAuctions}") == null; + } + + protected void renderResponse() throws Exception + { + DataModel auctions = (DataModel) Contexts.getSessionContext().get("auctions"); + Auction auction = ((Auction) auctions.getRowData()); + assert auction.getHighBid() != null; + } + }.run(); + + + } + +} Added: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/arquillian.xml =================================================================== (Binary files differ) Property changes on: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/arquillian.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/components.xml =================================================================== (Binary files differ) Property changes on: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/components.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/jboss-deployment-structure.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/jboss-deployment-structure.xml (rev 0) +++ branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/jboss-deployment-structure.xml 2013-06-03 17:07:17 UTC (rev 15530) @@ -0,0 +1,11 @@ +<jboss-deployment-structure xmlns="urn:jboss:deployment-structure:1.0"> + <deployment> + <dependencies> + <module name="org.antlr" export="true"/> + <module name="org.apache.commons.collections" export="true"/> + <module name="javax.faces.api" export="true"/> + <module name="com.sun.jsf-impl" export="true"/> + <module name="org.dom4j" export="true"/> + </dependencies> + </deployment> +</jboss-deployment-structure> Added: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/pages.xml =================================================================== (Binary files differ) Property changes on: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/pages.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/persistence.xml =================================================================== (Binary files differ) Property changes on: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/persistence.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/urlrewrite.xml =================================================================== (Binary files differ) Property changes on: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/urlrewrite.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Added: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/web.xml =================================================================== (Binary files differ) Property changes on: branches/enterprise/WFK-2_1/examples/seambay/seambay-ejb/src/test/resources/web.xml ___________________________________________________________________ Added: svn:mime-type + application/xml Modified: branches/enterprise/WFK-2_1/examples/seambay/seambay-web/pom.xml =================================================================== --- branches/enterprise/WFK-2_1/examples/seambay/seambay-web/pom.xml 2013-06-03 17:00:28 UTC (rev 15529) +++ branches/enterprise/WFK-2_1/examples/seambay/seambay-web/pom.xml 2013-06-03 17:07:17 UTC (rev 15530) @@ -76,6 +76,7 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-war-plugin</artifactId> + <version>${version.war.plugin}</version> <configuration> <webResources> <resource>