Author: rmannibucau
Date: Wed Apr 11 06:32:13 2012
New Revision: 1324582
URL: http://svn.apache.org/viewvc?rev=1324582&view=rev
Log:
updating arquillian versions
Modified:
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumTest.java
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/multiple/MultiplePersistenceTest.java
openejb/branches/openejb-4.0.0/arquillian-tomee/pom.xml
Modified:
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java?rev=1324582&r1=1324581&r2=1324582&view=diff
==============================================================================
---
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
(original)
+++
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesEJBTest.java
Wed Apr 11 06:32:13 2012
@@ -16,73 +16,68 @@
*/
package org.superbiz.moviefun;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-
import java.util.List;
-
import javax.ejb.EJB;
-
+import javax.inject.Inject;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ClassLoaderAsset;
import org.junit.After;
import org.junit.Before;
-import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.superbiz.moviefun.setup.ExampleDataProducer;
import org.superbiz.moviefun.setup.Examples;
import org.superbiz.moviefun.setup.Setup;
-import javax.inject.Inject;
-
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertNotNull;
@RunWith(Arquillian.class)
public class MoviesEJBTest {
- @Deployment public static WebArchive createDeployment() {
- return ShrinkWrap.create(WebArchive.class, "test.war")
+ @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")
.addAsResource(new
ClassLoaderAsset("META-INF/persistence.xml"), "META-INF/persistence.xml")
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml");
- }
+ }
- @EJB private Movies movies;
- @Inject private Setup setup;
+ @EJB private Movies movies;
+ @Inject private Setup setup;
@Before @After public void clean() {
movies.clean();
}
- @Test public void shouldBeAbleToAddAMovie() throws Exception {
- assertNotNull("Verify that the ejb was injected", movies);
- assertNotNull("Verify that the setup CDI bean was injected",
setup);
-
- setup.setup();
-
- assertEquals(7, movies.getMovies().size());
-
- Movie movie = new Movie();
- movie.setDirector("Michael Bay");
- movie.setGenre("Action");
- movie.setRating(9);
- movie.setTitle("Bad Boys");
- movie.setYear(1995);
- movies.addMovie(movie);
-
- assertEquals(8, movies.count());
- List<Movie> moviesFound = movies.findByTitle("Bad Boys");
-
- assertEquals(1, moviesFound.size());
- assertEquals("Michael Bay", moviesFound.get(0).getDirector());
- assertEquals("Action", moviesFound.get(0).getGenre());
- assertEquals(9, moviesFound.get(0).getRating());
- assertEquals("Bad Boys", moviesFound.get(0).getTitle());
- assertEquals(1995, moviesFound.get(0).getYear());
- }
+ @Test public void shouldBeAbleToAddAMovie() throws Exception {
+ assertNotNull("Verify that the ejb was injected", movies);
+ assertNotNull("Verify that the setup CDI bean was injected", setup);
+
+ setup.setup();
+
+ assertEquals(7, movies.getMovies().size());
+
+ Movie movie = new Movie();
+ movie.setDirector("Michael Bay");
+ movie.setGenre("Action");
+ movie.setRating(9);
+ movie.setTitle("Bad Boys");
+ movie.setYear(1995);
+ movies.addMovie(movie);
+
+ assertEquals(8, movies.count());
+ List<Movie> moviesFound = movies.findByTitle("Bad Boys");
+
+ assertEquals(1, moviesFound.size());
+ assertEquals("Michael Bay", moviesFound.get(0).getDirector());
+ assertEquals("Action", moviesFound.get(0).getGenre());
+ assertEquals(9, moviesFound.get(0).getRating());
+ assertEquals("Bad Boys", moviesFound.get(0).getTitle());
+ assertEquals(1995, moviesFound.get(0).getYear());
+ }
}
Modified:
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumTest.java?rev=1324582&r1=1324581&r2=1324582&view=diff
==============================================================================
---
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumTest.java
(original)
+++
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumTest.java
Wed Apr 11 06:32:13 2012
@@ -26,9 +26,9 @@ import org.jboss.arquillian.drone.api.an
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.arquillian.test.api.ArquillianResource;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
import org.jboss.shrinkwrap.api.asset.FileAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
-import org.jboss.shrinkwrap.impl.base.asset.ClassLoaderAsset;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -43,85 +43,85 @@ import com.thoughtworks.selenium.Default
@RunWith(Arquillian.class)
@Ignore
public class MoviesSeleniumTest {
-
- @ArquillianResource
- private URL deploymentUrl;
-
- @Drone
- private DefaultSelenium driver;
- @Deployment(testable = false)
+ @ArquillianResource
+ private URL deploymentUrl;
+
+ @Drone
+ private DefaultSelenium driver;
+
+ @Deployment(testable = false)
public static WebArchive createDeployment() {
WebArchive archive = ShrinkWrap.create(WebArchive.class,
"moviefun.war")
- .addClasses(ActionServlet.class, SetupServlet.class,
Movie.class, MovieController.class, Movies.class, MoviesImpl.class,
MoviesRemote.class, JsfUtil.class, PaginationHelper.class,
ExampleDataProducer.class, Examples.class, Setup.class)
- .addAsResource(new
ClassLoaderAsset("META-INF/ejb-jar.xml") , "META-INF/ejb-jar.xml")
- .addAsResource(new
ClassLoaderAsset("META-INF/persistence.xml") , "META-INF/persistence.xml")
- .addAsLibraries(new
File("target/test-libs/commons-beanutils.jar"),
- new
File("target/test-libs/commons-codec.jar"),
- new
File("target/test-libs/commons-collections.jar"),
- new
File("target/test-libs/commons-digester.jar"),
- new
File("target/test-libs/commons-logging.jar"),
- new File("target/test-libs/jstl.jar"),
- new File("target/test-libs/log4j.jar"),
- new
File("target/test-libs/standard.jar"));
-
+ .addClasses(ActionServlet.class, SetupServlet.class,
Movie.class, MovieController.class, Movies.class, MoviesImpl.class,
MoviesRemote.class, JsfUtil.class, PaginationHelper.class,
ExampleDataProducer.class, Examples.class, Setup.class)
+ .addAsResource(new ClassLoaderAsset("META-INF/ejb-jar.xml") ,
"META-INF/ejb-jar.xml")
+ .addAsResource(new
ClassLoaderAsset("META-INF/persistence.xml") , "META-INF/persistence.xml")
+ .addAsLibraries(new
File("target/test-libs/commons-beanutils.jar"),
+ new File("target/test-libs/commons-codec.jar"),
+ new File("target/test-libs/commons-collections.jar"),
+ new File("target/test-libs/commons-digester.jar"),
+ new File("target/test-libs/commons-logging.jar"),
+ new File("target/test-libs/jstl.jar"),
+ new File("target/test-libs/log4j.jar"),
+ new File("target/test-libs/standard.jar"));
+
addResources("src/main/webapp", "", archive);
System.out.println(archive.toString(true));
- return archive;
+ return archive;
}
-
+
private static void addResources(String source, String target, WebArchive
archive) {
- File sourceFile = new File(source);
- if (! sourceFile.exists()) return;
- if (sourceFile.isFile()) {
- archive.add(new FileAsset(sourceFile), target);
- }
-
- if (sourceFile.isDirectory()) {
- for (File file : sourceFile.listFiles()) {
- if (file.getName().startsWith(".")) continue;
- addResources(source + File.separator +
file.getName(), target + File.separator + file.getName(), archive);
- }
- }
- }
+ File sourceFile = new File(source);
+ if (! sourceFile.exists()) return;
+ if (sourceFile.isFile()) {
+ archive.add(new FileAsset(sourceFile), target);
+ }
+
+ if (sourceFile.isDirectory()) {
+ for (File file : sourceFile.listFiles()) {
+ if (file.getName().startsWith(".")) continue;
+ addResources(source + File.separator + file.getName(), target
+ File.separator + file.getName(), archive);
+ }
+ }
+ }
- @Test
+ @Test
public void testShouldMakeSureWebappIsWorking() throws Exception {
- driver.open(deploymentUrl.toString());
- driver.click("link=Setup");
- driver.waitForPageToLoad("30000");
- Assert.assertTrue(driver.isTextPresent("Seeded Database with
the Following movies"));
- Assert.assertTrue(driver.isTextPresent("Wedding Crashers"));
- Assert.assertTrue(driver.isTextPresent("David Dobkin"));
- Assert.assertTrue(driver.isTextPresent("Comedy"));
- Assert.assertTrue(driver.isTextPresent("Starsky & Hutch"));
- Assert.assertTrue(driver.isTextPresent("Shanghai Knights"));
- Assert.assertTrue(driver.isTextPresent("I-Spy"));
- Assert.assertTrue(driver.isTextPresent("The Royal Tenenbaums"));
- Assert.assertTrue(driver.isTextPresent("Zoolander"));
- Assert.assertTrue(driver.isTextPresent("Shanghai Noon"));
- driver.click("link=Go to main app");
- driver.waitForPageToLoad("30000");
- driver.type("name=title", "Bad Boys");
- driver.type("name=director", "Michael Bay");
- driver.type("name=genre", "Action");
- driver.type("name=rating", "9");
- driver.type("name=year", "1995");
- driver.click("//input[@name='action' and @value='Add']");
- driver.waitForPageToLoad("30000");
- driver.click("css=input[name=\"action\"]");
- driver.waitForPageToLoad("30000");
- Assert.assertTrue(driver.isTextPresent("Bad Boys"));
- driver.select("name=action", "label=Genre");
- driver.type("name=key", "Comedy");
- driver.click("css=input[type=\"submit\"]");
- driver.waitForPageToLoad("30000");
- Assert.assertTrue(driver.isTextPresent("Wedding Crashers"));
- Assert.assertTrue(driver.isTextPresent("The Royal Tenenbaums"));
- Assert.assertTrue(driver.isTextPresent("Zoolander"));
- Assert.assertTrue(driver.isTextPresent("Shanghai Noon"));
- Assert.assertTrue(driver.isTextPresent("1 - 4 of 4"));
- driver.close();
+ driver.open(deploymentUrl.toString());
+ driver.click("link=Setup");
+ driver.waitForPageToLoad("30000");
+ Assert.assertTrue(driver.isTextPresent("Seeded Database with the
Following movies"));
+ Assert.assertTrue(driver.isTextPresent("Wedding Crashers"));
+ Assert.assertTrue(driver.isTextPresent("David Dobkin"));
+ Assert.assertTrue(driver.isTextPresent("Comedy"));
+ Assert.assertTrue(driver.isTextPresent("Starsky & Hutch"));
+ Assert.assertTrue(driver.isTextPresent("Shanghai Knights"));
+ Assert.assertTrue(driver.isTextPresent("I-Spy"));
+ Assert.assertTrue(driver.isTextPresent("The Royal Tenenbaums"));
+ Assert.assertTrue(driver.isTextPresent("Zoolander"));
+ Assert.assertTrue(driver.isTextPresent("Shanghai Noon"));
+ driver.click("link=Go to main app");
+ driver.waitForPageToLoad("30000");
+ driver.type("name=title", "Bad Boys");
+ driver.type("name=director", "Michael Bay");
+ driver.type("name=genre", "Action");
+ driver.type("name=rating", "9");
+ driver.type("name=year", "1995");
+ driver.click("//input[@name='action' and @value='Add']");
+ driver.waitForPageToLoad("30000");
+ driver.click("css=input[name=\"action\"]");
+ driver.waitForPageToLoad("30000");
+ Assert.assertTrue(driver.isTextPresent("Bad Boys"));
+ driver.select("name=action", "label=Genre");
+ driver.type("name=key", "Comedy");
+ driver.click("css=input[type=\"submit\"]");
+ driver.waitForPageToLoad("30000");
+ Assert.assertTrue(driver.isTextPresent("Wedding Crashers"));
+ Assert.assertTrue(driver.isTextPresent("The Royal Tenenbaums"));
+ Assert.assertTrue(driver.isTextPresent("Zoolander"));
+ Assert.assertTrue(driver.isTextPresent("Shanghai Noon"));
+ Assert.assertTrue(driver.isTextPresent("1 - 4 of 4"));
+ driver.close();
}
}
Modified:
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java?rev=1324582&r1=1324581&r2=1324582&view=diff
==============================================================================
---
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java
(original)
+++
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/jaxws/dd/JAXWSDDTest.java
Wed Apr 11 06:32:13 2012
@@ -24,17 +24,16 @@ import org.apache.ziplock.JarLocation;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
-import org.jboss.shrinkwrap.impl.base.asset.ClassLoaderAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
import java.net.URL;
-import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@RunWith(Arquillian.class)
Modified:
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/multiple/MultiplePersistenceTest.java
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/multiple/MultiplePersistenceTest.java?rev=1324582&r1=1324581&r2=1324582&view=diff
==============================================================================
---
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/multiple/MultiplePersistenceTest.java
(original)
+++
openejb/branches/openejb-4.0.0/arquillian-tomee/arquillian-tomee-tests/src/test/java/org/apache/openejb/arquillian/tests/persistence/multiple/MultiplePersistenceTest.java
Wed Apr 11 06:32:13 2012
@@ -21,11 +21,11 @@ import org.apache.ziplock.JarLocation;
import org.jboss.arquillian.container.test.api.Deployment;
import org.jboss.arquillian.junit.Arquillian;
import org.jboss.shrinkwrap.api.ShrinkWrap;
+import org.jboss.shrinkwrap.api.asset.ClassLoaderAsset;
import org.jboss.shrinkwrap.api.asset.StringAsset;
import org.jboss.shrinkwrap.api.spec.WebArchive;
import org.jboss.shrinkwrap.descriptor.api.Descriptors;
import org.jboss.shrinkwrap.descriptor.api.spec.servlet.web.WebAppDescriptor;
-import org.jboss.shrinkwrap.impl.base.asset.ClassLoaderAsset;
import org.junit.Test;
import org.junit.runner.RunWith;
Modified: openejb/branches/openejb-4.0.0/arquillian-tomee/pom.xml
URL:
http://svn.apache.org/viewvc/openejb/branches/openejb-4.0.0/arquillian-tomee/pom.xml?rev=1324582&r1=1324581&r2=1324582&view=diff
==============================================================================
--- openejb/branches/openejb-4.0.0/arquillian-tomee/pom.xml (original)
+++ openejb/branches/openejb-4.0.0/arquillian-tomee/pom.xml Wed Apr 11 06:32:13
2012
@@ -32,14 +32,12 @@
<name>OpenEJB :: TomEE Arquillian Adaptor</name>
<properties>
- <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
- <version.arquillian>1.0.0.CR5</version.arquillian>
+ <version.arquillian>1.0.0.Final</version.arquillian>
<version.cdi-api>1.0</version.cdi-api>
- <version.openejb>4.0.0</version.openejb>
- <version.tomee>1.0.0</version.tomee>
+ <version.openejb>4.0.0-beta-3-SNAPSHOT</version.openejb>
+ <version.tomee>1.0.0-beta-3-SNAPSHOT</version.tomee>
<version.shrinkwrap.descriptor>1.1.0-beta-1</version.shrinkwrap.descriptor>
- <version.shrinkwrap.shrinkwrap>1.0.0-beta-6</version.shrinkwrap.shrinkwrap>
- <version.shrinkwrap.resolver>1.0.0-beta-5</version.shrinkwrap.resolver>
+ <version.shrinkwrap.shrinkwrap>1.0.0</version.shrinkwrap.shrinkwrap>
</properties>
<modules>
