svn commit: r1184826 - in /openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example: pom.xml src/test/java/org/superbiz/moviefun/MoviesSeleniumIT.java src/test/java/org/superbiz/moviefun/MoviesSeleniumTest.java

[jg...@apache.org]

Author: jgallimore
Date: Sun Oct 16 14:10:38 2011
New Revision: 1184826

URL: http://svn.apache.org/viewvc?rev=1184826&view=rev
Log:
Selenium test now working against both adapters

Added:
    openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumIT.java
      - copied, changed from r1184823, openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumTest.java
Removed:
    openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumTest.java
Modified:
    openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml

Modified: openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml?rev=1184826&r1=1184825&r2=1184826&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/pom.xml Sun Oct 16 14:10:38 2011
@@ -154,8 +154,8 @@
     </dependency>
     <dependency>
       <groupId>org.jboss.arquillian.extension</groupId>
-      <artifactId>arquillian-drone</artifactId>
-	  <version>1.0.0.Alpha5</version>
+      <artifactId>arquillian-drone-selenium</artifactId>
+      <version>${version.arquillian}</version>
       <scope>test</scope>
     </dependency>
     <dependency>
@@ -177,6 +177,20 @@
     	<type>jar</type>
     	<scope>test</scope>
     </dependency>
+    <dependency>
+    	<groupId>org.jboss.arquillian.extension</groupId>
+    	<artifactId>arquillian-drone-impl</artifactId>
+    	<version>${version.arquillian}</version>
+    	<type>jar</type>
+    	<scope>compile</scope>
+    </dependency>
+    <dependency>
+    	<groupId>org.jboss.arquillian.extension</groupId>
+    	<artifactId>arquillian-drone-selenium-server</artifactId>
+    	<version>${version.arquillian}</version>
+    	<type>jar</type>
+    	<scope>compile</scope>
+    </dependency>
   </dependencies>
   <!-- This section allows you to configure where to publish libraries for 
     sharing. It is not required and may be deleted. For more information see: 

Copied: openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumIT.java (from r1184823, openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumTest.java)
URL: http://svn.apache.org/viewvc/openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumIT.java?p2=openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumIT.java&p1=openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumTest.java&r1=1184823&r2=1184826&rev=1184826&view=diff
==============================================================================
--- openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumTest.java (original)
+++ openejb/trunk/arquillian-tomee/arquillian-tomee-moviefun-example/src/test/java/org/superbiz/moviefun/MoviesSeleniumIT.java Sun Oct 16 14:10:38 2011
@@ -22,7 +22,7 @@ import java.net.URL;
 import junit.framework.Assert;
 
 import org.jboss.arquillian.container.test.api.Deployment;
-import org.jboss.arquillian.drone.annotation.Drone;
+import org.jboss.arquillian.drone.api.annotation.Drone;
 import org.jboss.arquillian.junit.Arquillian;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
@@ -35,7 +35,7 @@ import org.junit.runner.RunWith;
 import com.thoughtworks.selenium.DefaultSelenium;
 
 @RunWith(Arquillian.class)
-public class MoviesSeleniumTest {
+public class MoviesSeleniumIT {
 	
 	@ArquillianResource
 	private URL deploymentUrl;
@@ -81,7 +81,7 @@ public class MoviesSeleniumTest {
 
 	@Test
     public void testShouldMakeSureWebappIsWorking() throws Exception {
-		driver.open(deploymentUrl + "/moviefun/");
+		driver.open(deploymentUrl.toString());
 		driver.click("link=Setup");
 		driver.waitForPageToLoad("30000");
 		Assert.assertTrue(driver.isTextPresent("Seeded Database with the Following movies"));
@@ -115,6 +115,7 @@ public class MoviesSeleniumTest {
 		Assert.assertTrue(driver.isTextPresent("Zoolander"));
 		Assert.assertTrue(driver.isTextPresent("Shanghai Noon"));
 		Assert.assertTrue(driver.isTextPresent("1 - 4 of 4"));
+		driver.close();
     }
 
 }