Revision: 5355
Author: [email protected]
Date: Mon Apr 15 15:07:57 2013
Log: report browser version being tested
https://codereview.appspot.com/8779043
R=kpreid2
http://code.google.com/p/google-caja/source/detail?r=5355
Modified:
/trunk/tests/com/google/caja/plugin/WebDriverHandle.java
=======================================
--- /trunk/tests/com/google/caja/plugin/WebDriverHandle.java Mon Apr 15
14:18:10 2013
+++ /trunk/tests/com/google/caja/plugin/WebDriverHandle.java Mon Apr 15
15:07:57 2013
@@ -14,10 +14,14 @@
package com.google.caja.plugin;
+import java.io.FileDescriptor;
+import java.io.FileOutputStream;
+import java.io.PrintStream;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.concurrent.TimeUnit;
+import org.openqa.selenium.Capabilities;
import org.openqa.selenium.JavascriptExecutor;
import org.openqa.selenium.UnsupportedCommandException;
import org.openqa.selenium.WebDriver;
@@ -51,7 +55,7 @@
private static final String BROWSER_PATH = "caja.test.browserPath";
private static final String REMOTE = "caja.test.remote";
- private static WebDriver driver = null;
+ private static RemoteWebDriver driver = null;
private static int refCount = 0;
private static String firstWindow = null;
private static int windowSeq = 1;
@@ -67,6 +71,7 @@
WebDriver makeWindow() {
if (driver == null) {
driver = makeDriver();
+ reportVersion(driver);
firstWindow = driver.getWindowHandle();
try {
driver.manage().timeouts().pageLoadTimeout(15, TimeUnit.SECONDS);
@@ -84,6 +89,27 @@
}
return driver;
}
+
+ void reportVersion(RemoteWebDriver driver) {
+ Capabilities caps = driver.getCapabilities();
+ String name = caps.getBrowserName();
+ if (name == null) { name = "unknown"; }
+ String version = caps.getVersion();
+ if (version == null) { version = "unknown"; }
+ log("- webdriver browser " + name + " version " + version);
+ }
+
+ void log(String s) {
+ // System.err is captured by junit and goes into ant-reports
+ System.err.println(s);
+
+ // FileDescriptor.err is captured by ant and goes to stdout.
+ // We don't close err since that would close FileDescriptor.err
+ @SuppressWarnings("resource")
+ PrintStream err = new PrintStream(
+ new FileOutputStream(FileDescriptor.err), true);
+ err.println(s);
+ }
String getBrowserType() {
return browserType;
@@ -119,7 +145,7 @@
}
}
- private WebDriver makeDriver() {
+ private RemoteWebDriver makeDriver() {
String browserPath = System.getProperty(BROWSER_PATH);
String remote = System.getProperty(REMOTE, "");
DesiredCapabilities dc = new DesiredCapabilities();
--
---
You received this message because you are subscribed to the Google Groups "Google Caja Discuss" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/groups/opt_out.
