[seam-commits] Seam SVN: r14605 - in branches/community/Seam_2_3/examples-ee6: seambay/seambay-tests and 20 other directories.

Author: rsmeral Date: 2012-04-19 08:04:27 -0400 (Thu, 19 Apr 2012) New Revision: 14605 Added: branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/resources-integration/arquillian.xml branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/resources-integration/web.xml branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/java/org/jboss/seam/example/seampay/test/Deployments.java branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/resources-integration/arquillian.xml branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/resources-integration/web.xml branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/java/org/jboss/seam/example/seamspace/test/Deployments.java branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/resources-integration/arquillian.xml branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/resources-integration/web.xml branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources-integration/arquillian.xml branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources-integration/web.xml Removed: branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/resources-integration/testng.xml branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/resources-integration/testng.xml branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/resources-integration/testng.xml branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources-integration/testng.xml Modified: branches/community/Seam_2_3/examples-ee6/ branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/ branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/pom.xml branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test/ branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test/AuctionTest.java branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/ branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/pom.xml branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/java/org/jboss/seam/example/seampay/test/AccountTest.java branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/java/org/jboss/seam/example/seampay/test/PaymentProcessorTest.java branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-ear/ branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-ejb/ branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/ branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/pom.xml branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/java/org/jboss/seam/example/seamspace/test/ branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/java/org/jboss/seam/example/seamspace/test/BlogTest.java branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/java/org/jboss/seam/example/seamspace/test/RegisterTest.java branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-web/ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear/ branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb/ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/pom.xml branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/CategoryResourceTest.java branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/ResolvedTaskResourceQueryTest.java branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources-integration/ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources/WEB-INF/components.xml branches/community/Seam_2_3/examples-ee6/tasks/tasks-web/ branches/community/Seam_2_3/examples-ee6/tasks/tasks-web/src/main/webapp/ branches/community/Seam_2_3/examples-ee6/tasks/tasks-web/src/main/webapp/WEB-INF/ branches/community/Seam_2_3/examples-ee6/tasks/tasks-web/src/main/webapp/WEB-INF/pages.xml Log: seambay, seampay, seamspace, tasks(broken) tests migrated Property changes on: branches/community/Seam_2_3/examples-ee6 ___________________________________________________________________ Added: svn:ignore + .pom.xml.kate-swp Property changes on: branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests ___________________________________________________________________ Added: svn:ignore + target Modified: branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/pom.xml 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/pom.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -14,22 +14,17 @@ <dependencies> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - </dependency> - <dependency> <groupId>org.jboss.seam.examples-ee6.seambay</groupId> <artifactId>seambay-ejb</artifactId> <type>ejb</type> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -40,6 +35,11 @@ <artifactId>jboss-jsf-api_2.0_spec</artifactId> </dependency> <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + <dependency> <groupId>org.seleniumhq.selenium.server</groupId> <artifactId>selenium-server</artifactId> <classifier>standalone</classifier> @@ -53,7 +53,24 @@ <artifactId>functional-tests</artifactId> <scope>test</scope> </dependency> - <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> + + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.el</groupId> <artifactId>jboss-el-api_2.2_spec</artifactId> </dependency> @@ -66,17 +83,8 @@ <filtering>true</filtering> </testResource> <testResource> - <directory>${basedir}/../seambay-ear/src/main/application</directory> - <filtering>true</filtering> + <directory>src/test/resources-integration</directory> </testResource> - <testResource> - <directory>${basedir}/../seambay-ear/src/main/resources</directory> - <filtering>true</filtering> - </testResource> - <testResource> - <directory>${basedir}/../seambay-web/src/main/resources</directory> - <filtering>true</filtering> - </testResource> </testResources> <plugins> <plugin> @@ -91,32 +99,46 @@ <profiles> <profile> - <id>ftest-jbossas</id> - <properties> - <example.context.path>/seam-seambay</example.context.path> - </properties> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + </profile> + + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> <build> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>selenium-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>failsafe-maven-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> + <artifactId>maven-dependency-plugin</artifactId> </plugin> </plugins> </build> </profile> + <profile> - <id>ftest-tomcat</id> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + </profile> + + <profile> + <id>ftest-jbossas</id> <properties> - <example.context.path>/jboss-seam-seambay</example.context.path> - <testng.suite>testng-tomcat.xml</testng.suite> + <example.context.path>/seam-seambay</example.context.path> </properties> <build> <plugins> Property changes on: branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test ___________________________________________________________________ Added: svn:ignore + .AuctionTest.java.kate-swp Modified: branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test/AuctionTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test/AuctionTest.java 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/java/org/jboss/seam/example/seambay/test/AuctionTest.java 2012-04-19 12:04:27 UTC (rev 14605) @@ -1,19 +1,47 @@ 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.SeamTest; -import org.testng.annotations.Test; -import org.junit.Ignore; +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.importer.ZipImporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; +import org.junit.runner.RunWith; -@Ignore -public class AuctionTest extends SeamTest + +(a)RunWith(Arquillian.class) +public class AuctionTest extends JUnitSeamTest { + @Deployment(name="AuctionTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive ear = ShrinkWrap.create(ZipImporter.class, "seam-seambay.ear").importFrom(new File("../seambay-ear/target/seam-seambay.ear")).as(EnterpriseArchive.class); + + // Install org.jboss.seam.mock.MockSeamListener + WebArchive web = ear.getAsType(WebArchive.class, "seambay-web.war"); + web.delete("/WEB-INF/web.xml"); + web.addAsWebInfResource("web.xml"); + + web.addClasses(AuctionTest.class); + + return ear; + } + @Test public void testCreateAuction() throws Exception { Added: branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/resources-integration/arquillian.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/resources-integration/arquillian.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/resources-integration/arquillian.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://jboss.org/schema/arquillian" + xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"> + + <engine> + <property name="deploymentExportPath">target/</property> + </engine> + + <container qualifier="jboss" default="true"> + <configuration> + <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property> + <property name="jbossHome">target/jboss-as-${version.jbossas7}</property> + </configuration> + </container> + +</arquillian> Deleted: branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/resources-integration/testng.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/resources-integration/testng.xml 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/resources-integration/testng.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -1,11 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > - -<suite name="SeamBay" verbose="2" parallel="false"> - - <test name="SeamBay Create Auction"> - <classes> - <class name="org.jboss.seam.example.seambay.test.AuctionTest"/> - </classes> - </test> - -</suite> Added: branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/resources-integration/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/resources-integration/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/seambay/seambay-tests/src/test/resources-integration/web.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -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> Property changes on: branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests ___________________________________________________________________ Added: svn:ignore + target Modified: branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/pom.xml 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/pom.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -14,22 +14,17 @@ <dependencies> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - </dependency> - <dependency> <groupId>org.jboss.seam.examples-ee6.seampay</groupId> <artifactId>seampay-ejb</artifactId> <type>ejb</type> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -40,15 +35,11 @@ <artifactId>jboss-jsf-api_2.0_spec</artifactId> </dependency> <dependency> - <groupId>org.jboss.spec.javax.el</groupId> - <artifactId>jboss-el-api_2.2_spec</artifactId> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> </dependency> <dependency> - <groupId>org.hibernate.javax.persistence</groupId> - <artifactId>hibernate-jpa-2.0-api</artifactId> - <scope>provided</scope> - </dependency> - <dependency> <groupId>org.seleniumhq.selenium.server</groupId> <artifactId>selenium-server</artifactId> <classifier>standalone</classifier> @@ -62,6 +53,27 @@ <artifactId>functional-tests</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> + + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> + <groupId>org.jboss.spec.javax.el</groupId> + <artifactId>jboss-el-api_2.2_spec</artifactId> + </dependency> </dependencies> <build> @@ -70,14 +82,9 @@ <directory>src/test/resources</directory> <filtering>true</filtering> </testResource> - <testResource> <!-- this takes datasource seampay-ds.xml --> - <directory>${basedir}/../seampay-ear/src/main/resources</directory> - <filtering>true</filtering> - </testResource> - <testResource> <!-- this takes themes aka *.properties --> - <directory>${basedir}/../seampay-web/src/main/resources</directory> - <filtering>true</filtering> - </testResource> + <testResource> + <directory>src/test/resources-integration</directory> + </testResource> </testResources> <plugins> <plugin> @@ -92,31 +99,46 @@ <profiles> <profile> - <id>ftest-jbossas</id> - <properties> - <example.context.path>seam-seampay</example.context.path> - </properties> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + </profile> + + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> <build> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>selenium-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>failsafe-maven-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> + <artifactId>maven-dependency-plugin</artifactId> </plugin> </plugins> </build> </profile> + <profile> - <id>ftest-tomcat</id> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + </profile> + + <profile> + <id>ftest-jbossas</id> <properties> - <example.context.path>jboss-seam-seampay</example.context.path> + <example.context.path>seam-seampay</example.context.path> </properties> <build> <plugins> Modified: branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/java/org/jboss/seam/example/seampay/test/AccountTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/java/org/jboss/seam/example/seampay/test/AccountTest.java 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/java/org/jboss/seam/example/seampay/test/AccountTest.java 2012-04-19 12:04:27 UTC (rev 14605) @@ -2,20 +2,36 @@ import java.math.BigDecimal; import java.util.List; +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.example.seampay.Account; import org.jboss.seam.example.seampay.Payment; import org.jboss.seam.example.seampay.Payment.Frequency; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; -import org.junit.Ignore; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; +import org.junit.runner.RunWith; /** * embedded ejb3 doesn't support timer service, so we are fairly limited on what we can test. */ -@Ignore +(a)RunWith(Arquillian.class) public class AccountTest - extends SeamTest + extends JUnitSeamTest { + @Deployment(name="AccountTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive er = Deployments.seamPayDeployment(); + WebArchive web = er.getAsType(WebArchive.class, "seampay-web.war"); + web.addClasses(AccountTest.class); + return er; + } + @Test public void listAccounts() throws Exception { String id = new FacesRequest("/search.xhtml") { Added: branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/java/org/jboss/seam/example/seampay/test/Deployments.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/java/org/jboss/seam/example/seampay/test/Deployments.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/java/org/jboss/seam/example/seampay/test/Deployments.java 2012-04-19 12:04:27 UTC (rev 14605) @@ -0,0 +1,22 @@ +package org.jboss.seam.example.seampay.test; + +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.importer.ZipImporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; + +import java.io.File; + +public class Deployments { + public static EnterpriseArchive seamPayDeployment() { + EnterpriseArchive ear = ShrinkWrap.create(ZipImporter.class, "seam-seampay.ear").importFrom(new File("../seampay-ear/target/seam-seampay.ear")) + .as(EnterpriseArchive.class); + + // Install org.jboss.seam.mock.MockSeamListener + WebArchive web = ear.getAsType(WebArchive.class, "seampay-web.war"); + web.delete("/WEB-INF/web.xml"); + web.addAsWebInfResource("web.xml"); + + return ear; + } +} Modified: branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/java/org/jboss/seam/example/seampay/test/PaymentProcessorTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/java/org/jboss/seam/example/seampay/test/PaymentProcessorTest.java 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/java/org/jboss/seam/example/seampay/test/PaymentProcessorTest.java 2012-04-19 12:04:27 UTC (rev 14605) @@ -2,23 +2,39 @@ import java.math.BigDecimal; import java.util.Date; +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.example.seampay.Account; import org.jboss.seam.example.seampay.Payment; import org.jboss.seam.example.seampay.PaymentProcessor; import org.jboss.seam.example.seampay.Payment.Frequency; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; -import org.junit.Ignore; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; +import org.junit.runner.RunWith; -@Ignore +(a)RunWith(Arquillian.class) public class PaymentProcessorTest - extends SeamTest + extends JUnitSeamTest { static final String ACCOUNT_NUMBER = "X12345"; static final BigDecimal INITIAL_BALANCE = new BigDecimal("1000"); - @Test + @Deployment(name="PaymentProcessorTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive er = Deployments.seamPayDeployment(); + WebArchive web = er.getAsType(WebArchive.class, "seampay-web.war"); + web.addClasses(PaymentProcessorTest.class); + return er; + } + + @Test public void testInactive() { PaymentProcessor processor = new PaymentProcessor(); Added: branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/resources-integration/arquillian.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/resources-integration/arquillian.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/resources-integration/arquillian.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://jboss.org/schema/arquillian" + xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"> + + <engine> + <property name="deploymentExportPath">target/</property> + </engine> + + <container qualifier="jboss" default="true"> + <configuration> + <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property> + <property name="jbossHome">target/jboss-as-${version.jbossas7}</property> + </configuration> + </container> + +</arquillian> Deleted: branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/resources-integration/testng.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/resources-integration/testng.xml 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/resources-integration/testng.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -1,12 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > - -<suite name="seampay" verbose="2" parallel="false"> - <test name="seampay"> - <classes> - <class - name="org.jboss.seam.example.seampay.test.PaymentProcessorTest" /> - <class - name="org.jboss.seam.example.seampay.test.AccountTest" /> - </classes> - </test> -</suite> Added: branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/resources-integration/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/resources-integration/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/seampay/seampay-tests/src/test/resources-integration/web.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -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> Property changes on: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-ear ___________________________________________________________________ Added: svn:ignore + target Property changes on: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-ejb ___________________________________________________________________ Added: svn:ignore + target Property changes on: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests ___________________________________________________________________ Added: svn:ignore + target Modified: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/pom.xml 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/pom.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -14,22 +14,17 @@ <dependencies> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - </dependency> - <dependency> <groupId>org.jboss.seam.examples-ee6.seamspace</groupId> <artifactId>seamspace-ejb</artifactId> <type>ejb</type> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> @@ -40,6 +35,11 @@ <artifactId>jboss-jsf-api_2.0_spec</artifactId> </dependency> <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + <dependency> <groupId>javax.mail</groupId> <artifactId>mail</artifactId> </dependency> @@ -57,10 +57,27 @@ <artifactId>functional-tests</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> + + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.el</groupId> <artifactId>jboss-el-api_2.2_spec</artifactId> - </dependency> + </dependency> </dependencies> <build> @@ -69,14 +86,9 @@ <directory>src/test/resources</directory> <filtering>true</filtering> </testResource> - <testResource> <!-- this takes datasource seamspace-ds.xml --> - <directory>${basedir}/../seamspace-ear/src/main/resources</directory> - <filtering>true</filtering> + <testResource> + <directory>src/test/resources-integration</directory> </testResource> - <testResource> <!-- this takes themes aka *.properties --> - <directory>${basedir}/../seamspace-web/src/main/resources</directory> - <filtering>true</filtering> - </testResource> </testResources> <plugins> <plugin> @@ -91,31 +103,46 @@ <profiles> <profile> - <id>ftest-jbossas</id> - <properties> - <example.context.path>seam-seamspace</example.context.path> - </properties> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + </profile> + + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> <build> <plugins> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>selenium-maven-plugin</artifactId> - </plugin> - <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>failsafe-maven-plugin</artifactId> - </plugin> - <plugin> <groupId>org.apache.maven.plugins</groupId> - <artifactId>maven-antrun-plugin</artifactId> + <artifactId>maven-dependency-plugin</artifactId> </plugin> </plugins> </build> </profile> + <profile> - <id>ftest-tomcat</id> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + </profile> + + <profile> + <id>ftest-jbossas</id> <properties> - <example.context.path>jboss-seam-seamspace</example.context.path> + <example.context.path>seam-seamspace</example.context.path> </properties> <build> <plugins> Property changes on: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/java/org/jboss/seam/example/seamspace/test ___________________________________________________________________ Added: svn:ignore + .Deployments.java.kate-swp Modified: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/java/org/jboss/seam/example/seamspace/test/BlogTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/java/org/jboss/seam/example/seamspace/test/BlogTest.java 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/java/org/jboss/seam/example/seamspace/test/BlogTest.java 2012-04-19 12:04:27 UTC (rev 14605) @@ -1,12 +1,29 @@ package org.jboss.seam.example.seamspace.test; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; -import org.junit.Ignore; +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.mock.AbstractSeamTest.FacesRequest; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; +import org.junit.runner.RunWith; -@Ignore -public class BlogTest extends SeamTest +(a)RunWith(Arquillian.class) +public class BlogTest extends JUnitSeamTest { + @Deployment(name="BlogTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive er = Deployments.seamSpaceDeployment(); + WebArchive web = er.getAsType(WebArchive.class, "seamspace-web.war"); + web.addClasses(BlogTest.class); + return er; + } + @Test public void testCreateBlog() throws Exception { Added: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/java/org/jboss/seam/example/seamspace/test/Deployments.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/java/org/jboss/seam/example/seamspace/test/Deployments.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/java/org/jboss/seam/example/seamspace/test/Deployments.java 2012-04-19 12:04:27 UTC (rev 14605) @@ -0,0 +1,23 @@ +package org.jboss.seam.example.seamspace.test; + +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.importer.ZipImporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; + +import java.io.File; +import org.jboss.shrinkwrap.api.asset.StringAsset; + +public class Deployments { + public static EnterpriseArchive seamSpaceDeployment() { + EnterpriseArchive ear = ShrinkWrap.create(ZipImporter.class, "seam-seamspace.ear").importFrom(new File("../seamspace-ear/target/seam-seamspace.ear")) + .as(EnterpriseArchive.class); + + // Install org.jboss.seam.mock.MockSeamListener + WebArchive web = ear.getAsType(WebArchive.class, "seamspace-web.war"); + web.delete("/WEB-INF/web.xml"); + web.addAsWebInfResource("web.xml"); + + return ear; + } +} Modified: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/java/org/jboss/seam/example/seamspace/test/RegisterTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/java/org/jboss/seam/example/seamspace/test/RegisterTest.java 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/java/org/jboss/seam/example/seamspace/test/RegisterTest.java 2012-04-19 12:04:27 UTC (rev 14605) @@ -1,15 +1,33 @@ package org.jboss.seam.example.seamspace.test; import java.util.Date; +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.core.Manager; -import org.jboss.seam.mock.SeamTest; -import org.testng.annotations.Test; -import org.junit.Ignore; +import org.jboss.seam.mock.AbstractSeamTest.FacesRequest; +import org.jboss.seam.mock.JUnitSeamTest; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; +import org.junit.runner.RunWith; -@Ignore -public class RegisterTest extends SeamTest +(a)RunWith(Arquillian.class) +public class RegisterTest extends JUnitSeamTest { + + @Deployment(name="RegisterTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive er = Deployments.seamSpaceDeployment(); + WebArchive web = er.getAsType(WebArchive.class, "seamspace-web.war"); + web.addClasses(RegisterTest.class); + return er; + } + @Test public void testRegister() throws Exception { Added: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/resources-integration/arquillian.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/resources-integration/arquillian.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/resources-integration/arquillian.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://jboss.org/schema/arquillian" + xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"> + + <engine> + <property name="deploymentExportPath">target/</property> + </engine> + + <container qualifier="jboss" default="true"> + <configuration> + <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property> + <property name="jbossHome">target/jboss-as-${version.jbossas7}</property> + </configuration> + </container> + +</arquillian> Deleted: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/resources-integration/testng.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/resources-integration/testng.xml 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/resources-integration/testng.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -1,17 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://beust.com/testng/testng-1.0.dtd" > - -<suite name="SeamSpace" verbose="2" parallel="false"> - - <test name="SeamSpace Register"> - <classes> - <class name="org.jboss.seam.example.seamspace.test.RegisterTest"/> - </classes> - </test> - - <test name="SeamSpace Blog"> - <classes> - <class name="org.jboss.seam.example.seamspace.test.BlogTest"/> - </classes> - </test> - -</suite> Added: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/resources-integration/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/resources-integration/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-tests/src/test/resources-integration/web.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -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> Property changes on: branches/community/Seam_2_3/examples-ee6/seamspace/seamspace-web ___________________________________________________________________ Added: svn:ignore + target Property changes on: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ear ___________________________________________________________________ Added: svn:ignore + target Property changes on: branches/community/Seam_2_3/examples-ee6/tasks/tasks-ejb ___________________________________________________________________ Added: svn:ignore + target Property changes on: branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests ___________________________________________________________________ Added: svn:ignore + target Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/pom.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/pom.xml 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/pom.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -12,34 +12,39 @@ <artifactId>tasks-tests</artifactId> <name>Tasks Integration Tests Module (EE6)</name> + <properties> + <!-- filtering property for components.xml --> + <jndiPattern>java:app/tasks-ejb/#{ejbName}</jndiPattern> + </properties> + <dependencies> <dependency> - <groupId>org.testng</groupId> - <artifactId>testng</artifactId> - <classifier>jdk15</classifier> - </dependency> - <dependency> <groupId>org.jboss.seam.examples-ee6.tasks</groupId> <artifactId>tasks-ejb</artifactId> <type>ejb</type> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam</artifactId> <type>ejb</type> <scope>test</scope> - </dependency> + </dependency> <dependency> <groupId>org.slf4j</groupId> <artifactId>slf4j-log4j12</artifactId> <scope>test</scope> </dependency> <dependency> - <groupId>com.sun.faces</groupId> - <artifactId>jsf-api</artifactId> + <groupId>org.jboss.spec.javax.faces</groupId> + <artifactId>jboss-jsf-api_2.0_spec</artifactId> </dependency> <dependency> + <groupId>org.testng</groupId> + <artifactId>testng</artifactId> + <classifier>jdk15</classifier> + </dependency> + <dependency> <groupId>org.seleniumhq.selenium.server</groupId> <artifactId>selenium-server</artifactId> <classifier>standalone</classifier> @@ -53,11 +58,29 @@ <artifactId>functional-tests</artifactId> <scope>test</scope> </dependency> + <dependency> <groupId>org.jboss.seam</groupId> <artifactId>jboss-seam-resteasy</artifactId> </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> + + <dependency> + <groupId>org.hibernate.javax.persistence</groupId> + <artifactId>hibernate-jpa-2.0-api</artifactId> + </dependency> + <dependency> <groupId>org.jboss.spec.javax.el</groupId> <artifactId>jboss-el-api_2.2_spec</artifactId> </dependency> @@ -70,13 +93,8 @@ <filtering>true</filtering> </testResource> <testResource> - <directory>${basedir}/../tasks-ear/src/main/resources</directory> - <filtering>true</filtering> + <directory>src/test/resources-integration</directory> </testResource> - <testResource> - <directory>${basedir}/../tasks-web/src/main/resources</directory> - <filtering>true</filtering> - </testResource> </testResources> <plugins> <plugin> @@ -91,6 +109,43 @@ <profiles> <profile> + <id>integration-tests</id> + <activation> + <property> + <name>arquillian</name> + </property> + </activation> + </profile> + + <profile> + <id>arq-jbossas-7-managed</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-managed-7</value> + </property> + </activation> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + </plugin> + </plugins> + </build> + </profile> + + <profile> + <id>arq-jbossas-7-remote</id> + <activation> + <property> + <name>arquillian</name> + <value>jbossas-remote-7</value> + </property> + </activation> + </profile> + + <profile> <id>ftest-jbossas</id> <properties> <example.context.path>seam-tasks</example.context.path> Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/CategoryResourceTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/CategoryResourceTest.java 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/CategoryResourceTest.java 2012-04-19 12:04:27 UTC (rev 14605) @@ -21,56 +21,69 @@ */ package org.jboss.seam.example.tasks.test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; +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.mock.SeamTest; import static org.jboss.seam.mock.ResourceRequestEnvironment.Method; import static org.jboss.seam.mock.ResourceRequestEnvironment.ResourceRequest; import org.jboss.seam.mock.EnhancedMockHttpServletRequest; import org.jboss.seam.mock.EnhancedMockHttpServletResponse; +import org.jboss.seam.mock.JUnitSeamTest; import org.jboss.seam.mock.ResourceRequestEnvironment; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; -import org.junit.Ignore; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import org.junit.Test; +import org.junit.runner.RunWith; /** * Test class for /category part of API * @author Jozef Hartinger * */ -@Ignore -public class CategoryResourceTest extends SeamTest +(a)RunWith(Arquillian.class) +public class CategoryResourceTest extends JUnitSeamTest { - @DataProvider(name = "query") - public String[][] getQueryData() + @Deployment(name="CategoryResourceTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() { - return new String[][] { new String[] { "application/xml", "<category><name>School</name></category>" }, new String[] { "application/json", "{\"category\":{\"name\":\"School\"}}" } }; + EnterpriseArchive er = Deployments.tasksDeployment(); + WebArchive web = er.getAsType(WebArchive.class, "tasks-web.war"); + web.addClasses(CategoryResourceTest.class); + return er; } - @Test(dataProvider = "query") - public void getCategoryListTest(final String contentType, final String expectedResponse) throws Exception + @Test + public void getCategoryListTest() throws Exception { - new ResourceRequest(new ResourceRequestEnvironment(this), Method.GET, "/v1/auth/category") - { + String[][] data = new String[][] { new String[] { "application/xml", "<category><name>School</name></category>" }, new String[] { "application/json", "{\"category\":{\"name\":\"School\"}}" } }; + + for (final String[] caseData : data) { + new ResourceRequest(new ResourceRequestEnvironment(this), Method.GET, "/v1/auth/category") + { - @Override - protected void prepareRequest(EnhancedMockHttpServletRequest request) - { - super.prepareRequest(request); - request.addHeader("Accept", contentType); - request.addHeader("Authorization", "Basic ZGVtbzpkZW1v"); // demo:demo - } + @Override + protected void prepareRequest(EnhancedMockHttpServletRequest request) + { + super.prepareRequest(request); + request.addHeader("Accept", caseData[0]); + request.addHeader("Authorization", "Basic ZGVtbzpkZW1v"); // demo:demo + } - @Override - protected void onResponse(EnhancedMockHttpServletResponse response) - { - super.onResponse(response); - assertEquals(response.getStatus(), 200, "Unexpected response code."); - assertTrue(response.getContentAsString().contains(expectedResponse), "Unexpected response."); - } + @Override + protected void onResponse(EnhancedMockHttpServletResponse response) + { + super.onResponse(response); + assertEquals("Unexpected response code.", 200, response.getStatus()); + assertTrue("Unexpected response.", response.getContentAsString().contains(caseData[1])); + } - }.run(); + }.run(); + } } @Test @@ -91,7 +104,7 @@ protected void onResponse(EnhancedMockHttpServletResponse response) { super.onResponse(response); - assertEquals(response.getStatus(), 204, "Unexpected response code."); + assertEquals("Unexpected response code.", 204, response.getStatus()); } }.run(); @@ -119,7 +132,7 @@ protected void onResponse(EnhancedMockHttpServletResponse response) { super.onResponse(response); - assertEquals(response.getStatus(), 201, "Unexpected response code."); + assertEquals("Unexpected response code.", 201, response.getStatus()); } }.run(); @@ -139,8 +152,8 @@ protected void onResponse(EnhancedMockHttpServletResponse response) { super.onResponse(response); - assertEquals(response.getStatus(), 200, "Unexpected response code."); - assertEquals(response.getContentAsString(), expectedResponse, "Unexpected response."); + assertEquals("Unexpected response code.", 200, response.getStatus()); + assertEquals("Unexpected response.", expectedResponse, response.getContentAsString()); } }.run(); @@ -163,7 +176,7 @@ protected void onResponse(EnhancedMockHttpServletResponse response) { super.onResponse(response); - assertEquals(response.getStatus(), 401, "Unexpected response code."); + assertEquals("Unexpected response code.", 401, response.getStatus()); } }.run(); Added: branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java (rev 0) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/Deployments.java 2012-04-19 12:04:27 UTC (rev 14605) @@ -0,0 +1,23 @@ +package org.jboss.seam.example.tasks.test; + +import org.jboss.shrinkwrap.api.ShrinkWrap; +import org.jboss.shrinkwrap.api.importer.ZipImporter; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; + +import java.io.File; +import org.jboss.shrinkwrap.api.asset.StringAsset; + +public class Deployments { + public static EnterpriseArchive tasksDeployment() { + EnterpriseArchive ear = ShrinkWrap.create(ZipImporter.class, "seam-tasks.ear").importFrom(new File("../tasks-ear/target/seam-tasks.ear")) + .as(EnterpriseArchive.class); + + // Install org.jboss.seam.mock.MockSeamListener + WebArchive web = ear.getAsType(WebArchive.class, "tasks-web.war"); + web.delete("/WEB-INF/web.xml"); + web.addAsWebInfResource("web.xml"); + + return ear; + } +} Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/ResolvedTaskResourceQueryTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/ResolvedTaskResourceQueryTest.java 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/ResolvedTaskResourceQueryTest.java 2012-04-19 12:04:27 UTC (rev 14605) @@ -21,31 +21,46 @@ */ package org.jboss.seam.example.tasks.test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; +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.mock.SeamTest; import static org.jboss.seam.mock.ResourceRequestEnvironment.Method; import static org.jboss.seam.mock.ResourceRequestEnvironment.ResourceRequest; import org.jboss.seam.mock.EnhancedMockHttpServletRequest; import org.jboss.seam.mock.EnhancedMockHttpServletResponse; +import org.jboss.seam.mock.JUnitSeamTest; import org.jboss.seam.mock.ResourceRequestEnvironment; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.DataProvider; -import org.testng.annotations.Test; -import org.junit.Ignore; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import org.junit.Before; +import org.junit.runner.RunWith; /** * Test class for /user/{username}/tasks/resolved part of API. * @author Jozef Hartinger * */ -@Ignore -public class ResolvedTaskResourceQueryTest extends SeamTest +(a)RunWith(Arquillian.class) +public class ResolvedTaskResourceQueryTest extends JUnitSeamTest { + @Deployment(name="ResolvedTaskResourceQueryTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive er = Deployments.tasksDeployment(); + WebArchive web = er.getAsType(WebArchive.class, "tasks-web.war"); + web.addClasses(ResolvedTaskResourceQueryTest.class); + return er; + } + // We could do this BeforeClass only once but we can't do ResourceRequests there - @BeforeMethod + @Before public void resolveTask() throws Exception { final String mimeType = "application/xml"; @@ -68,42 +83,41 @@ protected void onResponse(EnhancedMockHttpServletResponse response) { super.onResponse(response); - assertEquals(response.getStatus(), 204, "Unexpected response code."); + assertEquals("Unexpected response code.", 204, response.getStatus()); } }.run(); } - @DataProvider(name="data") - public String[][] getData() { - return new String[][] { + @Test + public void editTaskTest() throws Exception + { + String[][] data = new String[][] { new String[] {"application/xml", "<name>Get a haircut</name>"}, new String[] {"application/json", "\"name\":\"Get a haircut\""}, new String[] {"application/atom+xml", "<atom:title>Get a haircut</atom:title>"} - }; - } - - @Test(dataProvider="data") - public void editTaskTest(final String mimeType, final String expectedResponsePart) throws Exception - { - new ResourceRequest(new ResourceRequestEnvironment(this), Method.GET, "/v1/user/demo/tasks/resolved") - { + }; + + for(final String[] caseData : data) { + new ResourceRequest(new ResourceRequestEnvironment(this), Method.GET, "/v1/user/demo/tasks/resolved") + { - @Override - protected void prepareRequest(EnhancedMockHttpServletRequest request) - { - super.prepareRequest(request); - request.addHeader("Accept", mimeType); - } + @Override + protected void prepareRequest(EnhancedMockHttpServletRequest request) + { + super.prepareRequest(request); + request.addHeader("Accept", caseData[0]); + } - @Override - protected void onResponse(EnhancedMockHttpServletResponse response) - { - super.onResponse(response); - assertEquals(response.getStatus(), 200, "Unexpected response code."); - assertTrue(response.getContentAsString().contains(expectedResponsePart), "Unexpected response."); - } + @Override + protected void onResponse(EnhancedMockHttpServletResponse response) + { + super.onResponse(response); + assertEquals("Unexpected response code.", 200, response.getStatus()); + assertTrue("Unexpected response.", response.getContentAsString().contains(caseData[1])); + } - }.run(); + }.run(); + } } } Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/java/org/jboss/seam/example/tasks/test/TaskResourceTest.java 2012-04-19 12:04:27 UTC (rev 14605) @@ -21,26 +21,42 @@ */ package org.jboss.seam.example.tasks.test; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; +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.mock.SeamTest; import static org.jboss.seam.mock.ResourceRequestEnvironment.Method; import static org.jboss.seam.mock.ResourceRequestEnvironment.ResourceRequest; import org.jboss.seam.mock.EnhancedMockHttpServletRequest; import org.jboss.seam.mock.EnhancedMockHttpServletResponse; +import org.jboss.seam.mock.JUnitSeamTest; import org.jboss.seam.mock.ResourceRequestEnvironment; -import org.testng.annotations.Test; -import org.junit.Ignore; +import org.jboss.shrinkwrap.api.Archive; +import org.jboss.shrinkwrap.api.spec.EnterpriseArchive; +import org.jboss.shrinkwrap.api.spec.WebArchive; +import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; +import org.junit.runner.RunWith; /** * Test class for TaskResourceHome and TaskResourceQuery components. * @author Jozef Hartinger * */ -@Ignore -public class TaskResourceTest extends SeamTest +(a)RunWith(Arquillian.class) +public class TaskResourceTest extends JUnitSeamTest { + @Deployment(name="TaskResourceTest") + @OverProtocol("Servlet 3.0") + public static Archive<?> createDeployment() + { + EnterpriseArchive er = Deployments.tasksDeployment(); + WebArchive web = er.getAsType(WebArchive.class, "tasks-web.war"); + web.addClasses(TaskResourceTest.class); + return er; + } + @Test public void createTaskTest() throws Exception { @@ -64,7 +80,7 @@ protected void onResponse(EnhancedMockHttpServletResponse response) { super.onResponse(response); - assertEquals(response.getStatus(), 201, "Unexpected response code."); + assertEquals("Unexpected response code.", 201, response.getStatus()); } }.run(); @@ -93,7 +109,7 @@ protected void onResponse(EnhancedMockHttpServletResponse response) { super.onResponse(response); - assertEquals(response.getStatus(), 204, "Unexpected response code."); + assertEquals("Unexpected response code.", 204, response.getStatus()); } }.run(); @@ -113,8 +129,8 @@ protected void onResponse(EnhancedMockHttpServletResponse response) { super.onResponse(response); - assertEquals(response.getStatus(), 200, "Unexpected response code."); - assertTrue(response.getContentAsString().contains("Learn new English vocabulary"), "Unexpected response."); + assertEquals("Unexpected response code.", 200, response.getStatus()); + assertTrue("Unexpected response.", response.getContentAsString().contains("Learn new English vocabulary")); } }.run(); @@ -137,7 +153,7 @@ protected void onResponse(EnhancedMockHttpServletResponse response) { super.onResponse(response); - assertEquals(response.getStatus(), 204, "Unexpected response code."); + assertEquals("Unexpected response code.", 204, response.getStatus()); } }.run(); Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources/WEB-INF/components.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources/WEB-INF/components.xml 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources/WEB-INF/components.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -14,7 +14,7 @@ http://jboss.com/products/seam/web http://jboss.com/products/seam/web-2.3.xsd http://jboss.com/products/seam/resteasy http://jboss.com/products/seam/resteasy-2.3.xsd"> - <core:init jndi-pattern="#{ejbName}/local" debug="false" /> + <core:init jndi-pattern="@jndiPattern@" debug="false" /> <core:manager conversation-timeout="120000" concurrent-request-timeout="500" conversation-id-parameter="cid" /> @@ -56,4 +56,6 @@ <security:identity authenticate-method="#{authenticator.authenticate}" /> + <component class="org.jboss.seam.transaction.EjbSynchronizations" jndi-name="java:app/jboss-seam/EjbSynchronizations"/> + </components> Property changes on: branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources-integration ___________________________________________________________________ Added: svn:ignore + .web.xml.kate-swp Added: branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources-integration/arquillian.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources-integration/arquillian.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources-integration/arquillian.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="UTF-8"?> +<arquillian xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xmlns="http://jboss.org/schema/arquillian" + xsi:schemaLocation="http://jboss.org/schema/arquillian http://jboss.org/schema/arquillian/arquillian_1_0.xsd"> + + <engine> + <property name="deploymentExportPath">target/</property> + </engine> + + <container qualifier="jboss" default="true"> + <configuration> + <property name="javaVmArguments">-Xmx1024m -XX:MaxPermSize=512m</property> + <property name="jbossHome">target/jboss-as-${version.jbossas7}</property> + </configuration> + </container> + +</arquillian> Deleted: branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources-integration/testng.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources-integration/testng.xml 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources-integration/testng.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -1,12 +0,0 @@ -<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" > - -<suite name="Tasks" verbose="2" parallel="false"> - - <test name="Tasks"> - <classes> - <class name="org.jboss.seam.example.tasks.test.CategoryResourceTest"/> - <class name="org.jboss.seam.example.tasks.test.TaskResourceTest"/> - <class name="org.jboss.seam.example.tasks.test.ResolvedTaskResourceQueryTest"/> - </classes> - </test> -</suite> \ No newline at end of file Added: branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources-integration/web.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources-integration/web.xml (rev 0) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-tests/src/test/resources-integration/web.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="UTF-8"?> +<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> Property changes on: branches/community/Seam_2_3/examples-ee6/tasks/tasks-web ___________________________________________________________________ Added: svn:ignore + target Property changes on: branches/community/Seam_2_3/examples-ee6/tasks/tasks-web/src/main/webapp ___________________________________________________________________ Added: svn:ignore + .categories.js.kate-swp Property changes on: branches/community/Seam_2_3/examples-ee6/tasks/tasks-web/src/main/webapp/WEB-INF ___________________________________________________________________ Added: svn:ignore + .pages.xml.kate-swp Modified: branches/community/Seam_2_3/examples-ee6/tasks/tasks-web/src/main/webapp/WEB-INF/pages.xml =================================================================== --- branches/community/Seam_2_3/examples-ee6/tasks/tasks-web/src/main/webapp/WEB-INF/pages.xml 2012-04-18 10:42:39 UTC (rev 14604) +++ branches/community/Seam_2_3/examples-ee6/tasks/tasks-web/src/main/webapp/WEB-INF/pages.xml 2012-04-19 12:04:27 UTC (rev 14605) @@ -38,7 +38,7 @@ </exception> <exception - class="org.jboss.seam.example.tasks.exceptions.ResourceNotFoundException" + class="org.jboss.seam.example.tasks.ResourceNotFoundException" log-level="debug"> <http-error error-code="404"> <message>Not Found</message>