[seam-commits] Seam SVN: r14588 - in branches/community/Seam_2_3/examples-ee6/mail/mail-tests: src/test/java/org/jboss/seam/example/mail/test and 1 other directories.
Author: maschmid
Date: 2012-04-16 11:07:04 -0400 (Mon, 16 Apr 2012)
New Revision: 14588
Added:
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/web.xml
Modified:
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/MailTest.java
Log:
fix seamtest
Modified: branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml
===================================================================
--- branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-04-16 14:49:07
UTC (rev 14587)
+++ branches/community/Seam_2_3/examples-ee6/mail/mail-tests/pom.xml 2012-04-16 15:07:04
UTC (rev 14588)
@@ -95,17 +95,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-api-maven</artifactId>
- <scope>test</scope>
- </dependency>
-
- <dependency>
- <groupId>org.jboss.shrinkwrap.resolver</groupId>
- <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>org.jboss.spec.javax.el</groupId>
<artifactId>jboss-el-api_2.2_spec</artifactId>
<scope>runtime</scope>
Modified:
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/MailTest.java
===================================================================
---
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/MailTest.java 2012-04-16
14:49:07 UTC (rev 14587)
+++
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/java/org/jboss/seam/example/mail/test/MailTest.java 2012-04-16
15:07:04 UTC (rev 14588)
@@ -54,7 +54,7 @@
{
EnterpriseArchive er = ShrinkWrap.create(ZipImporter.class,
"seam-mail.ear").importFrom(new
File("../mail-ear/target/seam-mail.ear"))
.as(EnterpriseArchive.class);
- WebArchive web = er.getAsType(WebArchive.class, "mail-web.war");
+ WebArchive web = er.getAsType(WebArchive.class, "mail-web.war");
web.addClasses(MailTest.class);
//web.addAsWebInfResource(new
StringAsset("org.jboss.seam.mock.MockApplicationFactory"),
"classes/META-INF/services/javax.faces.application.ApplicationFactory");
web.addAsWebInfResource(new
StringAsset("org.jboss.seam.mock.MockFacesContextFactory"),
"classes/META-INF/services/javax.faces.context.FacesContextFactory");
@@ -63,7 +63,11 @@
web.addAsWebResource("org/jboss/seam/example/mail/test/errors3.xhtml",
"org/jboss/seam/example/mail/test/errors3.xhtml");
web.addAsWebResource("org/jboss/seam/example/mail/test/errors4.xhtml",
"org/jboss/seam/example/mail/test/errors4.xhtml");
web.addAsWebResource("org/jboss/seam/example/mail/test/sanitization.xhtml",
"org/jboss/seam/example/mail/test/sanitization.xhtml");
-
+
+ // 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/mail/mail-tests/src/test/resources-integration/web.xml
===================================================================
---
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/web.xml
(rev 0)
+++
branches/community/Seam_2_3/examples-ee6/mail/mail-tests/src/test/resources-integration/web.xml 2012-04-16
15:07:04 UTC (rev 14588)
@@ -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>