test(adb): add some adb tests

.gitignore

@@ -17,3 +17,4 @@ jest-report.json
 drivers/
 /docs/api.json
 .android-sdk/
+.gradle/

android-types-internal.d.ts

@@ -26,7 +26,7 @@ export interface AndroidDevice<BrowserContextOptions, BrowserContext, Page> exte
   serial(): string;
   model(): string;
   webViews(): AndroidWebView<Page>[];
-  webView(selector: { pkg: string }): Promise<AndroidWebView<Page>>;
+  webView(selector: { pkg: string }, options?: { timeout?: number }): Promise<AndroidWebView<Page>>;
   shell(command: string): Promise<string>;
   launchBrowser(options?: BrowserContextOptions & { packageName?: string  }): Promise<BrowserContext>;
   close(): Promise<void>;

docs-src/api-body.md

@@ -1405,7 +1405,7 @@ Shortcut for main frame's [frame.focus()]().
 ## method: Page.frame
 - returns: <[null]|[Frame]>
 
-Returns frame matching the criteria. Returns `null` if no frame matches.
+Returns frame matching the specified criteria. Either `name` or `url` must be specified.
 
 ```js
 const frame = page.frame('frame-name');
@@ -1415,8 +1415,6 @@ const frame = page.frame('frame-name');
 const frame = page.frame({ url: /.*domain.*/ });
 ```
 
-Returns frame matching the specified criteria. Either `name` or `url` must be specified.
-
 ### param: Page.frame.frameSelector
 - `frameSelector` <[string]|[Object]>
   - `name` <[string]> frame name specified in the `iframe`'s `name` attribute

docs/api.md

@@ -1608,7 +1608,7 @@ Shortcut for main frame's [frame.focus(selector[, options])](#framefocusselector
   - `url` <[string]|[RegExp]|[Function]> A glob pattern, regex pattern or predicate receiving frame's `url` as a [URL] object.
 - returns: <[null]|[Frame]>
 
-Returns frame matching the criteria. Returns `null` if no frame matches.
+Returns frame matching the specified criteria. Either `name` or `url` must be specified.
 
 ```js
 const frame = page.frame('frame-name');
@@ -1618,8 +1618,6 @@ const frame = page.frame('frame-name');
 const frame = page.frame({ url: /.*domain.*/ });
 ```
 
-Returns frame matching the specified criteria. Either `name` or `url` must be specified.
-
 #### page.frames()
 - returns: <[Array]<[Frame]>>
 

package.json

@@ -30,7 +30,8 @@
     "typecheck-tests": "tsc -p ./test/",
     "roll-browser": "node utils/roll_browser.js",
     "coverage": "node test/checkCoverage.js",
-    "check-deps": "node utils/check_deps.js"
+    "check-deps": "node utils/check_deps.js",
+    "build-android-driver": "./utils/build_android_driver.sh"
   },
   "author": {
     "name": "Microsoft Corporation"

packages/build_package.js

@@ -65,7 +65,7 @@ const PACKAGES = {
     files: [...PLAYWRIGHT_CORE_FILES, ...FFMPEG_FILES, 'electron-types.d.ts'],
   },
   'playwright-android': {
-    version: '0.0.7', // Manually manage playwright-android version.
+    version: '0.0.8', // Manually manage playwright-android version.
     description: 'A high-level API to automate Chrome for Android',
     browsers: [],
     files: [...PLAYWRIGHT_CORE_FILES, ...FFMPEG_FILES, 'android-types.d.ts', 'android-types-internal.d.ts', 'bin/android-driver.apk', 'bin/android-driver-target.apk'],

src/install/browserFetcher.ts

@@ -78,7 +78,7 @@ function getDownloadUrl(browserName: BrowserName, revision: number, platform: Br
         ['mac10.14', '%s/builds/chromium/%s/chromium-mac.zip'],
         ['mac10.15', '%s/builds/chromium/%s/chromium-mac.zip'],
         ['mac11.0', '%s/builds/chromium/%s/chromium-mac.zip'],
-        ['mac11.0-arm64', '%s/builds/chromium/%s/chromium-mac.zip'],
+        ['mac11.0-arm64', '%s/builds/chromium/%s/chromium-mac-arm64.zip'],
         ['win32', '%s/builds/chromium/%s/chromium-win32.zip'],
         ['win64', '%s/builds/chromium/%s/chromium-win64.zip'],
       ]).get(platform);

src/server/android/android.ts

@@ -54,6 +54,7 @@ export interface SocketBackend extends EventEmitter {
 
 export class Android {
   private _backend: Backend;
+  private _devices = new Map<string, AndroidDevice>();
   readonly _timeoutSettings: TimeoutSettings;
 
   constructor(backend: Backend) {
@@ -67,7 +68,19 @@ export class Android {
 
   async devices(): Promise<AndroidDevice[]> {
     const devices = (await this._backend.devices()).filter(d => d.status === 'device');
-    return await Promise.all(devices.map(d => AndroidDevice.create(this, d)));
+    const newSerials = new Set<string>();
+    for (const d of devices) {
+      newSerials.add(d.serial);
+      if (this._devices.has(d.serial))
+        continue;
+      const device = await AndroidDevice.create(this, d);
+      this._devices.set(d.serial, device);
+    }
+    for (const d of this._devices.keys()) {
+      if (!newSerials.has(d))
+        this._devices.delete(d);
+    }
+    return [...this._devices.values()];
   }
 }
 

src/server/android/driver/app/src/androidTest/java/com/microsoft/playwright/androiddriver/InstrumentedTest.java

@@ -154,11 +154,14 @@ private static Direction parseDirection(JSONObject params) throws JSONException
   }
 
   private static UiObject2 wait(UiDevice device, JSONObject params) throws JSONException {
-    return device.wait(Until.findObject(parseSelector(params)), parseTimeout(params));
+    UiObject2 result = device.wait(Until.findObject(parseSelector(params)), parseTimeout(params));
+    if (result == null)
+      throw new RuntimeException("Timed out waiting for selector");
+    return result;
   }
 
   private static void fill(UiDevice device, JSONObject params) throws JSONException {
-    device.wait(Until.findObject(parseSelector(params)), parseTimeout(params)).setText(params.getString("text"));
+    wait(device, params).setText(params.getString("text"));
   }
 
   private static void click(UiDevice device, JSONObject params) throws JSONException {

src/server/page.ts

@@ -149,6 +149,7 @@ export class Page extends EventEmitter {
 
   constructor(delegate: PageDelegate, browserContext: BrowserContext) {
     super();
+    this.setMaxListeners(0);
     this._delegate = delegate;
     this._closedCallback = () => {};
     this._closedPromise = new Promise(f => this._closedCallback = f);

test/android/android.fixtures.ts

@@ -0,0 +1,34 @@
+/**
+ * Copyright 2020 Microsoft Corporation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import type { Android, AndroidDevice } from '../../android-types';
+import { folio as baseFolio } from '../fixtures';
+
+const fixtures = baseFolio.extend<{
+    device: AndroidDevice
+  }, {
+    android: Android,
+  }>();
+
+fixtures.device.init(async ({ playwright }, runTest) => {
+  const [device] = await playwright._android.devices();
+  await device.shell('am force-stop org.chromium.webview_shell');
+  await device.shell('am force-stop com.android.chrome');
+  await runTest(device);
+  device.close();
+});
+
+export const folio = fixtures.build();

test/android/browser.spec.ts

@@ -0,0 +1,32 @@
+/**
+ * Copyright 2020 Microsoft Corporation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { folio } from './android.fixtures';
+const { it, expect } = folio;
+
+if (process.env.PW_ANDROID_TESTS) {
+  it('should discover device', async function({ device }) {
+    expect(device.model()).toBe('sdk_gphone_x86_arm');
+  });
+
+  it('should launch browser', async function({ device }) {
+    const context = await device.launchBrowser();
+    const [page] = context.pages();
+    await page.goto('data:text/html,<title>Hello world!</title>');
+    expect(await page.title()).toBe('Hello world!');
+    await context.close();
+  });
+}

test/android/webview.spec.ts

@@ -0,0 +1,58 @@
+/**
+ * Copyright 2020 Microsoft Corporation. All rights reserved.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+import { folio } from './android.fixtures';
+const { it, expect } = folio;
+
+if (process.env.PW_ANDROID_TESTS) {
+  it('should discover webviews', async function({ device }) {
+    expect(device.webViews().length).toBe(0);
+    await device.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
+    const webview = await device.webView({ pkg: 'org.chromium.webview_shell' });
+    expect(webview.pkg()).toBe('org.chromium.webview_shell');
+  });
+
+  it('should connect to page', async function({ device }) {
+    expect(device.webViews().length).toBe(0);
+    await device.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
+    const webview = await device.webView({ pkg: 'org.chromium.webview_shell' });
+    const page = await webview.page();
+    expect(page.url()).toBe('about:blank');
+  });
+
+  it('should navigate page externally', async function({ device, server }) {
+    expect(device.webViews().length).toBe(0);
+    await device.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
+    const webview = await device.webView({ pkg: 'org.chromium.webview_shell' });
+    const page = await webview.page();
+    await page.goto('data:text/html,<title>Hello world!</title>');
+    expect(await page.title()).toBe('Hello world!');
+  });
+
+  it('should navigate page externally', async function({ device, server }) {
+    expect(device.webViews().length).toBe(0);
+    await device.shell('am start org.chromium.webview_shell/.WebViewBrowserActivity');
+    const webview = await device.webView({ pkg: 'org.chromium.webview_shell' });
+    const page = await webview.page();
+
+    await device.fill({ res: 'org.chromium.webview_shell:id/url_field' }, 'data:text/html,<title>Hello world!</title>');
+    await Promise.all([
+      page.waitForNavigation(),
+      device.press({ res: 'org.chromium.webview_shell:id/url_field' }, 'Enter')
+    ]);
+    expect(await page.title()).toBe('Hello world!');
+  });
+}

test/electron/electron.fixture.ts

@@ -15,7 +15,7 @@
  */
 
 import { folio as base } from '../fixtures';
-import type { ElectronApplication, ElectronLauncher, ElectronPage } from '../../electron-types';
+import type { ElectronApplication, ElectronPage } from '../../electron-types';
 import path from 'path';
 
 const electronName = process.platform === 'win32' ? 'electron.cmd' : 'electron';
@@ -42,7 +42,3 @@ fixtures.window.init(async ({ application }, run) => {
 });
 
 export const folio = fixtures.build();
-
-declare module '../../index' {
-  const _electron: ElectronLauncher;
-}

test/fixtures.ts

@@ -27,6 +27,8 @@ import { installCoverageHooks } from './coverage';
 import { folio as httpFolio } from './http.fixtures';
 import { folio as playwrightFolio } from './playwright.fixtures';
 import { PlaywrightClient } from '../lib/remote/playwrightClient';
+import type { Android } from '../android-types';
+import type { ElectronLauncher } from '../electron-types';
 export { expect, config } from 'folio';
 
 const removeFolderAsync = util.promisify(require('rimraf'));
@@ -189,3 +191,9 @@ export const beforeEach = folio.beforeEach;
 export const afterEach = folio.afterEach;
 export const beforeAll = folio.beforeAll;
 export const afterAll = folio.afterAll;
+
+
+declare module '../index' {
+  const _android: Android;
+  const _electron: ElectronLauncher;
+}

utils/avd_install.sh

@@ -10,8 +10,8 @@ mkdir ${SDKDIR}/cmdline-tools
 
 echo Downloading Android SDK...
 cd ${SDKDIR}/cmdline-tools
-curl https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip -o commandlinetools-linux-6858069_latest.zip
-unzip commandlinetools-linux-6858069_latest.zip
+curl https://dl.google.com/android/repository/commandlinetools-mac-6858069_latest.zip -o commandlinetools-mac-6858069_latest.zip
+unzip commandlinetools-mac-6858069_latest.zip
 mv cmdline-tools latest
 
 echo Installing emulator...

utils/avd_start.sh

@@ -5,4 +5,4 @@ export ANDROID_SDK_ROOT=${SDKDIR}
 export ANDROID_HOME=${SDKDIR}
 export ANDROID_AVD_HOME=${SDKDIR}/avd
 
-${SDKDIR}/emulator/emulator -avd android30 -gpu guest
+${SDKDIR}/emulator/emulator -avd android30 -gpu swiftshader_indirect

utils/build_android_driver.sh

@@ -0,0 +1,14 @@
+#!/bin/bash
+
+(cd src/server/android/driver ; ./gradlew assemble)
+if [ "$?" -ne "0" ]; then
+  exit 1
+fi
+
+(cd src/server/android/driver ; ./gradlew assembleAndroidTest)
+if [ "$?" -ne "0" ]; then
+  exit 1
+fi
+
+cp src/server/android/driver/app/build/outputs/apk/debug/app-debug.apk ./bin/android-driver-target.apk
+cp src/server/android/driver/app/build/outputs/apk/androidTest/debug/app-debug-androidTest.apk ./bin/android-driver.apk