[Mxquery-commit] SF.net SVN: mxquery:[4441] trunk/XQIB_Testing

[<et...@us...>]

Revision: 4441
          http://mxquery.svn.sourceforge.net/mxquery/?rev=4441&view=rev
Author:   etterth
Date:     2011-09-13 13:41:58 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
- Updated Selenium
- Added chromedriver
- Added ant build flag test.browser to launch e.g. chrome

Modified Paths:
--------------
    trunk/XQIB_Testing/build.xml
    trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java

Added Paths:
-----------
    trunk/XQIB_Testing/lib/chromedriver
    trunk/XQIB_Testing/lib/selenium-2.5.0/
    trunk/XQIB_Testing/lib/selenium-2.5.0/selenium-java-2.5.0.jar
    trunk/XQIB_Testing/lib/selenium-server-standalone-2.5.0.jar

Removed Paths:
-------------
    trunk/XQIB_Testing/lib/selenium-java-2.0rc3.jar
    trunk/XQIB_Testing/lib/selenium-server-2.0rc3.jar
    trunk/XQIB_Testing/lib/selenium-server-standalone-2.0rc3.jar

Modified: trunk/XQIB_Testing/build.xml
===================================================================
--- trunk/XQIB_Testing/build.xml	2011-08-31 15:47:06 UTC (rev 4440)
+++ trunk/XQIB_Testing/build.xml	2011-09-13 13:41:58 UTC (rev 4441)
@@ -26,9 +26,8 @@
 	<path id="XQIB_Testing.classpath">
 		<pathelement location="bin"/>
 		<path refid="JUnit 4.libraryclasspath"/>
-		<pathelement location="lib/selenium-java-2.0rc3.jar"/>
-		<pathelement location="lib/selenium-server-2.0rc3.jar"/>
-		<pathelement location="lib/selenium-server-standalone-2.0rc3.jar"/>
+		<pathelement location="lib/selenium-2.5.0/selenium-java-2.5.0.jar"/>
+		<pathelement location="lib/selenium-server-standalone-2.5.0.jar"/>
 	</path>
 	<target name="init">
 		<mkdir dir="bin"/>
@@ -104,6 +103,8 @@
 	<target name="testsuite">
 		 <mkdir dir="${junit.output.dir}"/>
 		        <junit fork="yes" printsummary="withOutAndErr">
+		        	<sysproperty key="test.browser" value="${test.browser}"/>
+		        	
 		            <formatter type="xml" />
 		            <test name="ch.ethz.mxquery.Appendices.Annex_Eclass" todir="${junit.output.dir}"/>
 		            <test name="ch.ethz.mxquery.Appendices.Appendix_A4class" todir="${junit.output.dir}"/>
@@ -410,6 +411,7 @@
 		</copy>
 		<mkdir dir="${junit.output.dir}" />
 		<junit printsummary="withOutAndErr">
+			<sysproperty key="test.browser" value="${test.browser}"/>
 			<formatter type="xml" />
 			<batchtest todir="${junit.output.dir}" >
 				<fileset dir="bin" >

Added: trunk/XQIB_Testing/lib/chromedriver
===================================================================
(Binary files differ)


Property changes on: trunk/XQIB_Testing/lib/chromedriver
___________________________________________________________________
Added: svn:executable
   + *
Added: svn:mime-type
   + application/octet-stream

Added: trunk/XQIB_Testing/lib/selenium-2.5.0/selenium-java-2.5.0.jar
===================================================================
(Binary files differ)


Property changes on: trunk/XQIB_Testing/lib/selenium-2.5.0/selenium-java-2.5.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Deleted: trunk/XQIB_Testing/lib/selenium-java-2.0rc3.jar
===================================================================
(Binary files differ)

Deleted: trunk/XQIB_Testing/lib/selenium-server-2.0rc3.jar
===================================================================
(Binary files differ)

Deleted: trunk/XQIB_Testing/lib/selenium-server-standalone-2.0rc3.jar
===================================================================
(Binary files differ)

Added: trunk/XQIB_Testing/lib/selenium-server-standalone-2.5.0.jar
===================================================================
(Binary files differ)


Property changes on: trunk/XQIB_Testing/lib/selenium-server-standalone-2.5.0.jar
___________________________________________________________________
Added: svn:mime-type
   + application/octet-stream

Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java	2011-08-31 15:47:06 UTC (rev 4440)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java	2011-09-13 13:41:58 UTC (rev 4441)
@@ -1,10 +1,15 @@
 package ch.ethz.mxquery.testsuite;
 
+import java.io.File;
+
 import junit.framework.TestSuite;
 
 import org.junit.AfterClass;
 import org.junit.BeforeClass;
+import org.openqa.selenium.chrome.ChromeDriver;
+import org.openqa.selenium.chrome.ChromeDriverService;
 import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
 public class XQueryTestBase extends TestSuite {
@@ -14,7 +19,7 @@
 	public static void setUp() {
 		try {
 			System.out.println("Starting firefox driver");
-			driver = new FirefoxDriver();
+			driver = createDriver();
 			System.out.println("firefox driver started");
 			driver.get("http://127.0.0.1:8090/test/test.html");
 			System.out.println("loaded page with title " + driver.getTitle());
@@ -25,6 +30,26 @@
 		// driver.get("http://127.0.0.1:8888/asyncREST.html?gwt.codesvr=127.0.0.1:9997");
 	}
 
+	private static RemoteWebDriver createDriver() throws Throwable {
+		String browsername = System.getProperty("test.browser");
+		if ("firefox".equals(browsername)) {
+			return new FirefoxDriver();
+			
+		} else if ("chrome".equals(browsername)) {
+			ChromeDriverService crap = new ChromeDriverService.Builder()
+			        .usingChromeDriverExecutable(new File("lib/chromedriver"))
+			        .usingAnyFreePort()
+			        .build();
+crap.start();
+DesiredCapabilities capabilities = DesiredCapabilities.chrome();
+capabilities.setCapability("chrome.binary", "/usr/bin/google-chrome");
+
+			return new RemoteWebDriver(crap.getUrl(),capabilities);
+			
+		}
+			return new FirefoxDriver();
+	}
+
 	@AfterClass
 	public static void tearDown() throws Exception {
 		driver.close();

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.