Author: rmannibucau
Date: Wed Aug 7 15:52:02 2013
New Revision: 1511369
URL: http://svn.apache.org/r1511369
Log:
maven + profile + version resolution is just a mess, forcing version for
arquillian moviefun
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/pom.xml
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
Modified: tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/pom.xml
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/pom.xml?rev=1511369&r1=1511368&r2=1511369&view=diff
==============================================================================
--- tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/pom.xml
(original)
+++ tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/pom.xml Wed
Aug 7 15:52:02 2013
@@ -41,10 +41,10 @@
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-surefire-plugin</artifactId>
- <version>2.13</version>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.15</version>
<configuration> <!-- see ARQ-282 -->
- <forkMode>always</forkMode>
+ <forkCount>1</forkCount>
</configuration>
</plugin>
<plugin>
@@ -132,6 +132,12 @@
<scope>test</scope>
</dependency>
<dependency>
+ <groupId>org.jboss.arquillian.config</groupId>
+ <artifactId>arquillian-config-api</artifactId>
+ <version>${version.arquillian}</version>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
<groupId>org.jboss.arquillian.junit</groupId>
<artifactId>arquillian-junit-container</artifactId>
<version>${version.arquillian}</version>
@@ -140,7 +146,7 @@
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-drone-selenium</artifactId>
- <version>1.0.0.Final</version>
+ <version>${version.arquillian}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -174,7 +180,7 @@
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-drone-impl</artifactId>
- <version>1.0.0.Final</version>
+ <version>${version.arquillian}</version>
<scope>test</scope>
<exclusions>
<exclusion>
@@ -186,7 +192,7 @@
<dependency>
<groupId>org.jboss.arquillian.extension</groupId>
<artifactId>arquillian-drone-selenium-server</artifactId>
- <version>1.0.0.Final</version>
+ <version>${version.arquillian}</version>
<scope>test</scope>
</dependency>
<dependency>
Modified:
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java?rev=1511369&r1=1511368&r2=1511369&view=diff
==============================================================================
---
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
(original)
+++
tomee/tomee/trunk/arquillian/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
Wed Aug 7 15:52:02 2013
@@ -38,7 +38,8 @@ import static org.junit.Assert.assertNot
@RunWith(Arquillian.class)
public class MoviesEJBTest {
- @Deployment public static WebArchive createDeployment() {
+ @Deployment
+ public static WebArchive createDeployment() {
return ShrinkWrap.create(WebArchive.class, "test.war")
.addClasses(Movie.class, MoviesImpl.class, Movies.class,
MoviesRemote.class, MoviesEJBTest.class, Setup.class, Examples.class,
ExampleDataProducer.class)
.addAsResource(new ClassLoaderAsset("META-INF/ejb-jar.xml"),
"META-INF/ejb-jar.xml")
@@ -46,14 +47,20 @@ public class MoviesEJBTest {
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
}
- @EJB private Movies movies;
- @Inject private Setup setup;
+ @EJB
+ private Movies movies;
- @Before @After public void clean() {
+ @Inject
+ private Setup setup;
+
+ @Before
+ @After
+ public void clean() {
movies.clean();
}
- @Test public void shouldBeAbleToAddAMovie() throws Exception {
+ @Test
+ public void shouldBeAbleToAddAMovie() throws Exception {
assertNotNull("Verify that the ejb was injected", movies);
assertNotNull("Verify that the setup CDI bean was injected",
setup);