updated webdriver + chromedriver, updated table.html

Author: krausest

webdriver-ts/package.json

@@ -5,7 +5,6 @@
   "main": "index.js",
   "scripts": {
     "test": "echo \"Error: no test specified\" && exit 1",
-    "postinstall": "typings install && tsc",
     "compile": "tsc",
     "build-prod": "tsc",
     "selenium": "node dist/benchmarkRunner.js",
@@ -17,16 +16,19 @@
   "author": "",
   "license": "Apache-2.0",
   "devDependencies": {
-    "typescript": "2.0.3",
-    "typings": "1.4.0"
+    "@types/lodash": "^4.14.55",
+    "@types/node": "^7.0.8",
+    "@types/selenium-webdriver": "^3.0.0",
+    "@types/yargs": "^6.6.0",
+    "typescript": "2.2.1"
   },
   "dependencies": {
-    "chromedriver": "2.27.2",
-    "dot": "1.0.3",
+    "chromedriver": "2.28.0",
+    "dot": "1.1.1",
     "jstat": "1.5.3",
-    "lodash": "4.16.4",
+    "lodash": "4.17.4",
     "rgba-convert": "0.3.0",
-    "selenium-webdriver": "^2.53.3",
-    "yargs": "6.0.0"
+    "selenium-webdriver": "^3.3.0",
+    "yargs": "7.0.2"
   }
 }

webdriver-ts/src/benchmarkRunner.ts

@@ -69,7 +69,6 @@ function buildDriver() {
     options = options.addArguments("--js-flags=--expose-gc");
     options = options.setLoggingPrefs(logPref);
     options = options.setPerfLoggingPrefs(<any>{enableNetwork: false, enablePage: false, enableTimeline: false, traceCategories: "v8,blink.console,disabled-by-default-devtools.timeline,devtools.timeline,blink.user_timing", bufferUsageReportingInterval: 10000});
-
     return new Builder()
         .forBrowser('chrome')
         .setChromeOptions(options)    
@@ -119,7 +118,7 @@ function initBenchmark(driver: WebDriver, benchmark: Benchmark, framework: Frame
         }
     })
     .then(() => clearLogs(driver))
-    .thenCatch( (err) => {
+    .catch((err:any) => {
         console.log(`error in initBenchmark ${framework} ${benchmark.id}`);
         throw err;
     });
@@ -160,7 +159,7 @@ function runMemOrCPUBenchmark(framework: FrameworkData, benchmark: Benchmark) :
             return driver.get(`http://localhost:8080/${framework.uri}/`)
             .then(() => initBenchmark(driver, benchmark, framework))
             .then(() => runBenchmark(driver, benchmark, framework))
-            .thenCatch((e) => {
+            .catch((e) => {
                 console.error("Benchmark failed",e);
                 driver.takeScreenshot().then(
                     function(image) {
@@ -174,7 +173,7 @@ function runMemOrCPUBenchmark(framework: FrameworkData, benchmark: Benchmark) :
         })
         .then(results => reduceBenchmarkResults(benchmark, results))
         .then(results => writeResult({framework: framework, results: results, benchmark: benchmark}, dir))
-        .thenFinally(() => {console.log("QUIT"); driver.quit();})
+        .then(() => {console.log("QUIT"); driver.quit();}, () => {console.log("QUIT after error"); driver.quit();})
 }
 
 function runStartupBenchmark(framework: FrameworkData, benchmark: Benchmark) : promise.Promise<any> {
@@ -189,18 +188,19 @@ function runStartupBenchmark(framework: FrameworkData, benchmark: Benchmark) : p
             // Check what we measured. Results are pretty similar, though we are measuring a bit longer until the final repaint happened.
             // .then(() => driver.executeScript("return window.performance.timing.loadEventEnd - window.performance.timing.navigationStart"))
             // .then((duration) => console.log(duration, typeof duration))            
-            .thenCatch((e) => {
+            .then(() => {console.log("QUIT"); driver.quit();},
+                (e) => {
                 console.error("Benchmark failed",e);
                 driver.takeScreenshot().then(
                     function(image) {
                         (<any>fs).writeFileSync('error-'+framework+'_startup.png', image, 'base64', function(err:any) {
                             console.log(err);
+                            console.log("QUIT after error"); driver.quit();
                         });
                         throw e;
                     }
                 );                
             })
-            .thenFinally(() => {console.log("QUIT"); driver.quit();})
         })
         .then(() => reduceBenchmarkResults(benchmark, results))
         .then(results => writeResult({framework: framework, results: results, benchmark: benchmark}, dir))

webdriver-ts/src/benchmarks.ts

@@ -1,5 +1,5 @@
 import {testTextContains, testTextNotContained, testClassContains, testElementLocatedByXpath, testElementNotLocatedByXPath, testElementLocatedById, clickElementById, clickElementByXPath, getTextByXPath, forProm} from './webdriverAccess'
-import {WebDriver} from 'selenium-webdriver' 
+import {Builder, WebDriver, promise, logging} from 'selenium-webdriver'
 import {config, FrameworkData} from './common'
 
 export enum BenchmarkType { CPU, MEM, STARTUP };
@@ -9,8 +9,8 @@ export interface Benchmark {
     type: BenchmarkType;
     label: string;
     description: string;
-    init(driver: WebDriver, framework: FrameworkData) : webdriver.promise.Promise<any>;
-    run(driver: WebDriver, framework: FrameworkData) : webdriver.promise.Promise<any>;
+    init(driver: WebDriver, framework: FrameworkData) : promise.Promise<any>;
+    run(driver: WebDriver, framework: FrameworkData) : promise.Promise<any>;
 }
 
 const benchRun: Benchmark = {

webdriver-ts/src/common.ts

@@ -6,7 +6,7 @@ export interface JSONResult {
 
 export let config = {
     REPEAT_RUN: 10,
-    DROP_WORST_RUN: 4,
+    DROP_WORST_RUN: 0,
     WARMUP_COUNT: 5,
     TIMEOUT: 60 * 1000,
     LOG_PROGRESS: true,

webdriver-ts/src/nonKeyed.ts

@@ -154,7 +154,7 @@ function runBench(frameworkNames: string[]) {
                         console.log("ERROR: Framework "+framework.name+" is not correctly categorized in commons.ts");
                     }
             })        
-            .thenFinally(() => {driver.quit();})
+            .then(() => {driver.quit();}, () => {driver.quit();})
     })
 }
 

webdriver-ts/src/webdriverAccess.ts

@@ -1,5 +1,5 @@
 import * as chrome from 'selenium-webdriver/chrome'
-import {By, until, Builder, WebDriver, Locator, promise} from 'selenium-webdriver'
+import {By, until, Builder, WebDriver, Locator, promise, WebElement, Condition} from 'selenium-webdriver'
 import {config} from './common'
 
 interface PathPart {
@@ -35,7 +35,7 @@ function convertPath(path: string): Array<PathPart> {
 }
 
 // Fake findByXPath for simple XPath expressions to allow usage with shadow dom
-function findByXPath(node: webdriver.WebElement, path: string): webdriver.promise.Promise<webdriver.WebElement> {
+function findByXPath(node: WebElement, path: string): promise.Promise<WebElement> {
     // if there wasn't polymer with it's shadow dom useage one would like to use:
 
      let paths = convertPath(path);
@@ -45,7 +45,7 @@ function findByXPath(node: webdriver.WebElement, path: string): webdriver.promis
          n = n.then(nd => nd.findElements(By.css(p.tagName+":nth-child("+(p.index)+")"))).then(elems => {
              if (elems==null || elems.length==0) { console.log("not found"); return null}; 
              return elems[0];
-         }).thenCatch(e => {console.log("REJECTED PROMISE",e); return null;});
+         }).catch(e => {console.log("REJECTED PROMISE",e); return null;});
      }
      return n;    
 
@@ -83,7 +83,7 @@ function elemNull(v: any) {
 // driver.findElement(By.xpath("//tbody/tr[1]/td[1]")).getText().then(...) can throw a stale element error: 
 // thus we're using a safer way here:
 export function testTextContains(driver: WebDriver, xpath: string, text: string) {
-    return driver.wait(new until.Condition<boolean>(`testTextContains ${xpath} ${text}`,
+    return driver.wait(new Condition<boolean>(`testTextContains ${xpath} ${text}`,
         (driver) => shadowRoot(driver).then(elem => findByXPath(elem, xpath))
             .then(elem => elem==null ? elemNull(false) : elem.getText().then(
                 v => v && v.indexOf(text)>-1,
@@ -93,7 +93,7 @@ export function testTextContains(driver: WebDriver, xpath: string, text: string)
 }
 
 export function testTextNotContained(driver: WebDriver, xpath: string, text: string) {
-    return driver.wait(new until.Condition<boolean>(`testTextNotContained ${xpath} ${text}`,
+    return driver.wait(new Condition<boolean>(`testTextNotContained ${xpath} ${text}`,
         (driver) => shadowRoot(driver).then(elem => findByXPath(elem, xpath))
             .then(elem => elem==null ? elemNull(false) : elem.getText().then(
                 v => v && v.indexOf(text)==-1,
@@ -103,7 +103,7 @@ export function testTextNotContained(driver: WebDriver, xpath: string, text: str
 }
 
 export function testClassContains(driver: WebDriver, xpath: string, text: string) {
-    return driver.wait(new until.Condition<boolean>(`testClassContains ${xpath} ${text}`,
+    return driver.wait(new Condition<boolean>(`testClassContains ${xpath} ${text}`,
         (driver) => shadowRoot(driver).then(elem => findByXPath(elem, xpath))
             .then(elem => elem==null ? elemNull(false) : elem.getAttribute("class").then(
             v => v && v.indexOf(text)>-1,
@@ -114,7 +114,7 @@ export function testClassContains(driver: WebDriver, xpath: string, text: string
 
 export function testElementLocatedByXpath(driver: WebDriver, xpath: string) {
     // return driver.wait(until.elementLocated(By.xpath(xpath)), 3000);
-    return driver.wait(new until.Condition<boolean>(`testElementLocatedByXpath ${xpath}`, (driver) => 
+    return driver.wait(new Condition<boolean>(`testElementLocatedByXpath ${xpath}`, (driver) => 
             shadowRoot(driver).then(elem => 
                     elem==null ? elemNull(false) : findByXPath(elem, xpath).then(
                     (v:any) => v,
@@ -125,23 +125,23 @@ export function testElementLocatedByXpath(driver: WebDriver, xpath: string) {
 
 export function testElementNotLocatedByXPath(driver: WebDriver, xpath: string)
 {
-    return driver.wait(new until.Condition<boolean>(`testElementNotLocatedByXPath ${xpath}`,
+    return driver.wait(new Condition<boolean>(`testElementNotLocatedByXPath ${xpath}`,
         (driver) => shadowRoot(driver).then(elem => findByXPath(elem, xpath)).then(
             v => !v,
             err => console.log("ignoring error in testElementNotLocatedByXPath for xpath = "+xpath,err.toString().split("\n")[0]))
         ), config.TIMEOUT);
 }
 
 export function testElementLocatedById(driver: WebDriver, id: string) {
-    return driver.wait(new until.Condition<boolean>(`testElementLocatedById ${id}`,
-        (driver) => shadowRoot(driver).then(elem => elem.isElementPresent(By.id(id))).then(
+    return driver.wait(new Condition<boolean>(`testElementLocatedById ${id}`,
+        (driver) => shadowRoot(driver).then(elem => elem.findElement(By.id(id))).then(
             v => true,
             err => console.log("ignoring error in testElementLocatedById for id = "+id,err.toString().split("\n")[0]))
         )
         , config.TIMEOUT);
 }
 
-function retry<T>(retryCount: number, driver: WebDriver, fun : (driver:  WebDriver) => webdriver.promise.Promise<T>):  webdriver.promise.Promise<T> {
+function retry<T>(retryCount: number, driver: WebDriver, fun : (driver:  WebDriver) => promise.Promise<T>):  promise.Promise<T> {
     return fun(driver).then(
         val => { return val;},
         err => { console.log("retry failed"); 
@@ -154,16 +154,16 @@ function retry<T>(retryCount: number, driver: WebDriver, fun : (driver:  WebDriv
     );
 }
 
-export function forPromRec(priorResults : any[], from: number, to: number, fun : (idx: number) => webdriver.promise.Promise<any>):  webdriver.promise.Promise<any[]> {
+export function forPromRec(priorResults : any[], from: number, to: number, fun : (idx: number) => promise.Promise<any>):  promise.Promise<any[]> {
     if (from >= to) throw "fromProm from (="+from+") >=to (="+to+")";
     else if (from < to-1) return fun(from).then(val => forPromRec(priorResults.concat([val]), from+1, to, fun));
     else return fun(from).then(val => priorResults.concat([val]));
 }
 
-export function forProm(from: number, to: number, fun : (idx: number) => webdriver.promise.Promise<any>):  webdriver.promise.Promise<any[]> {
+export function forProm(from: number, to: number, fun : (idx: number) => promise.Promise<any>):  promise.Promise<any[]> {
     return forPromRec([], from, to, fun);
 }
-// export function forProm(from: number, to: number, fun : (idx: number) => webdriver.promise.Promise<any>):  webdriver.promise.Promise<any[]> {
+// export function forProm(from: number, to: number, fun : (idx: number) => promise.Promise<any>):  promise.Promise<any[]> {
 //     let res: any[] = []; 
 //     let p = fun(from);
 //     for (let i=from+1; i<to; i++) {
@@ -195,7 +195,7 @@ export function clickElementByXPath(driver: WebDriver, xpath: string) {
     // return to(driver.findElement(By.xpath(xpath)).click());
 }
 
-export function getTextByXPath(driver: WebDriver, xpath: string): webdriver.promise.Promise<string> {
+export function getTextByXPath(driver: WebDriver, xpath: string): promise.Promise<string> {
     let count = 0;
     return retry(5, driver, (driver) => { count++; 
             if (count>1 && config.LOG_DETAILS) console.log("getTextByXPath ",xpath," attempt #",count); 
@@ -206,6 +206,6 @@ export function getTextByXPath(driver: WebDriver, xpath: string): webdriver.prom
     // return to(driver.findElement(By.xpath(xpath)).getText());
 }
 
-function shadowRoot(driver: WebDriver) : webdriver.promise.Promise<webdriver.WebElement> {
+function shadowRoot(driver: WebDriver) : promise.Promise<WebElement> {
     return useShadowRoot ? driver.executeScript('return document.querySelector("main-element").shadowRoot') : driver.findElement(By.tagName("body")); 
 }

webdriver-ts/table.html

@@ -10,7 +10,6 @@
         "allowJs": false
     },
     "files": [
-        "typings/index.d.ts",
         "./src/common.ts",
         "./src/benchmarks.ts",
         "./src/webdriverAccess.ts",