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

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

Revision: 4445
          http://mxquery.svn.sourceforge.net/mxquery/?rev=4445&view=rev
Author:   etterth
Date:     2011-09-20 23:30:20 +0000 (Tue, 20 Sep 2011)
Log Message:
-----------
- Adjusted classpath for eclipse project
- Fixed a test in chrome

Modified Paths:
--------------
    trunk/XQIB_Testing/.classpath
    trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Style.java
    trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java

Modified: trunk/XQIB_Testing/.classpath
===================================================================
--- trunk/XQIB_Testing/.classpath	2011-09-16 23:15:55 UTC (rev 4444)
+++ trunk/XQIB_Testing/.classpath	2011-09-20 23:30:20 UTC (rev 4445)
@@ -4,8 +4,7 @@
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.junit.JUNIT_CONTAINER/4"/>
-	<classpathentry kind="lib" path="lib/selenium-java-2.0rc3.jar"/>
-	<classpathentry kind="lib" path="lib/selenium-server-2.0rc3.jar"/>
-	<classpathentry kind="lib" path="lib/selenium-server-standalone-2.0rc3.jar"/>
+	<classpathentry kind="lib" path="lib/selenium-server-standalone-2.5.0.jar"/>
+	<classpathentry kind="lib" path="lib/selenium-2.5.0/selenium-java-2.5.0.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Style.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Style.java	2011-09-16 23:15:55 UTC (rev 4444)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/browsertests/Style.java	2011-09-20 23:30:20 UTC (rev 4445)
@@ -24,7 +24,8 @@
 		
 		WebElement element = driver.findElementByTagName("p");
 		String style = element.getAttribute("style");
-		
+		if (style.endsWith(" "))
+			style = style.substring(0, style.length()-1);
 		Assert.assertEquals("color: red;", style);
 	}
 

Modified: trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java
===================================================================
--- trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java	2011-09-16 23:15:55 UTC (rev 4444)
+++ trunk/XQIB_Testing/src/ch/ethz/mxquery/testsuite/XQueryTestBase.java	2011-09-20 23:30:20 UTC (rev 4445)
@@ -9,6 +9,7 @@
 import org.openqa.selenium.chrome.ChromeDriver;
 import org.openqa.selenium.chrome.ChromeDriverService;
 import org.openqa.selenium.firefox.FirefoxDriver;
+import org.openqa.selenium.ie.InternetExplorerDriver;
 import org.openqa.selenium.remote.DesiredCapabilities;
 import org.openqa.selenium.remote.RemoteWebDriver;
 
@@ -18,11 +19,8 @@
 	@BeforeClass
 	public static void setUp() {
 		try {
-			System.out.println("Starting firefox driver");
 			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());
 		} catch (Throwable e) {
 			e.printStackTrace();
 			// TODO: handle exception
@@ -47,6 +45,9 @@
 			return new RemoteWebDriver(crap.getUrl(),capabilities);
 			
 		}
+		else if ("ie".equals(browsername)) {
+			return new InternetExplorerDriver();
+		}
 			return new FirefoxDriver();
 	}
 	

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