Changes to run tests on Dartium content shell on Android.

tools/testing/dart/browser_controller.dart

 // Copyright (c) 2013, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 library browser;
 
 import "dart:async";
 import "dart:convert" show LineSplitter, UTF8;
 import "dart:core";
 import "dart:io";
 
@@ skipping 513 matching lines @@
       return _adbDevice.forceStop(chromePackage).then((_) {
         return _adbDevice.killAll().then((_) => true);
       });
     }
     return new Future.value(true);
   }
 
   String toString() => "chromeOnAndroid";
 }
 
+
+class drtOnAndroid extends Browser {

[kustermann, 2013/10/24 09:36:00]

drtOnAndroid => DrtOnAndroid

Since drt has been replaced by content_shell, we may want to rename it to
ContentShellOnAndroid or something like that?

[zra, 2013/10/24 15:34:50]

Renamed ContentShellOnAndroid

+  static const String viewAction = 'android.intent.action.VIEW';
+  static const String contentShellPackage = 'org.chromium.content_shell_apk';
+
+  AndroidEmulator _emulator;

[kustermann, 2013/10/24 09:36:00]

Where is this _emulator set / used ?

Did you try running it on an emulator?

[zra, 2013/10/24 15:34:50]

Removed

+  AdbDevice _adbDevice;
+
+  drtOnAndroid(this._adbDevice);
+
+  Future<bool> start(String url) {
+    var contentShellIntent = new Intent(
+        viewAction, contentShellPackage, '.ContentShellActivity', url);
+
+    return _adbDevice.waitForBootCompleted().then((_) {
+      return _adbDevice.forceStop(contentShellIntent.package);
+    }).then((_) {
+      return _adbDevice.killAll();
+    }).then((_) {
+      return _adbDevice.setProp("DART_FORWARDING_PRINT", "1");

[kustermann, 2013/10/24 09:36:00]

Are you sure that a 'adb shell setprop' is setting environment variables?

I'm not sure, but I think "system properties != environment variables".

(Anton has added support for this a while ago in the dartium code, but it
expects it to be a normal environment variable)

[zra, 2013/10/24 15:34:50]

In a separate CL (https://codereview.chromium.org/38323002/) I modify to use
system properties.

+    }).then((_) {
+      return _adbDevice.startActivity(contentShellIntent).then((_) => true);
+    });
+  }
+
+  Future<bool> close() {
+    if (_adbDevice != null) {
+      return _adbDevice.forceStop(contentShellPackage).then((_) {
+        return _adbDevice.killAll().then((_) => true);
+      });
+    }
+    return new Future.value(true);
+  }
+
+  String toString() => "drtOnAndroid";
+}
+
+
 class Firefox extends Browser {
   static const String enablePopUp =
       'user_pref("dom.disable_open_during_load", false);';
   static const String disableDefaultCheck =
       'user_pref("browser.shell.checkDefaultBrowser", false);';
   static const String disableScriptTimeLimit =
       'user_pref("dom.max_script_run_time", 0);';
 
   static String _binary = _getBinary();
 
@@ skipping 139 matching lines @@
   BrowserTestRunner(this.globalConfiguration,
                     this.localIp,
                     this.browserName,
                     this.maxNumBrowsers);
 
   Future<bool> start() {
     // If [browserName] doesn't support opening new windows, we use new iframes
     // instead.
     bool useIframe =
         !Browser.BROWSERS_WITH_WINDOW_SUPPORT.contains(browserName);
-    testingServer = new BrowserTestingServer(localIp, useIframe);
+    testingServer = new BrowserTestingServer(
+        globalConfiguration, localIp, useIframe);
     return testingServer.start().then((_) {
       testingServer.testDoneCallBack = handleResults;
       testingServer.testStartedCallBack = handleStarted;
       testingServer.nextTestCallBack = getNextTest;
       return getBrowsers().then((browsers) {
         var futures = [];
         for (var browser in browsers) {
           var url = testingServer.getDriverUrl(browser.id);
           var future = browser.start(url).then((success) {
             if (success) {
@@ skipping 25 matching lines @@
             var browser = new AndroidChrome(device);
             browsers.add(browser);
             // We store this in case we need to kill the browser.
             browser.id = id;
           }
           browsersCompleter.complete(browsers);
         } else {
           throw new StateError("No android devices found.");
         }
       });
+    } else if (browserName == 'drtOnAndroid') {

[kustermann, 2013/10/24 09:36:00]

There is no reason to duplicate this code. You could do something like:

var androidBrowserCreationMapping = {
  'chromeOnAndroid' : (AdbDevice device) => new AndroidChrome(device),
  'drtOnAndroid' : (AdbDevice device) => new DrtOnAndroid(device),
}

if (androidBrowserCreationMapping.containsKey(browserName)) {
  ...
  var browser = androidBrowserCreationMapping[browserName](device);
  ....
}

[zra, 2013/10/24 15:34:50]

Done.

+      AdbHelper.listDevices().then((deviceIds) {
+        if (deviceIds.length > 0) {
+          var browsers = [];
+          for (int i = 0; i < deviceIds.length; i++) {
+            var id = "BROWSER$i";
+            var device = new AdbDevice(deviceIds[i]);
+            adbDeviceMapping[id] = device;
+            var browser = new drtOnAndroid(device);
+            browsers.add(browser);
+            // We store this in case we need to kill the browser.
+            browser.id = id;
+          }
+          browsersCompleter.complete(browsers);
+        } else {
+          throw new StateError("No android devices found.");
+        }
+      });
     } else {
       var browsers = [];
       for (int i = 0; i < maxNumBrowsers; i++) {
         var id = "BROWSER$browserIdCount";
         browserIdCount++;
         var browser = getInstance();
         browsers.add(browser);
         // We store this in case we need to kill the browser.
         browser.id = id;
       }
@@ skipping 83 matching lines @@
           didTimeout: true);
       status.currentTest.doneCallback(browserTestOutput);
       status.currentTest = null;
 
       // We don't want to start a new browser if we are terminating.
       if (underTermination) return;
       var browser;
       var new_id = id;
       if (browserName == 'chromeOnAndroid') {
         browser = new AndroidChrome(adbDeviceMapping[id]);
+      } else if (browserName == 'drtOnAndroid') {
+        browser = new drtOnAndroid(adbDeviceMapping[id]);
       } else {
         browserStatus.remove(id);
         browser = getInstance();
         new_id = "BROWSER$browserIdCount";
         browserIdCount++;
         browserStatus[new_id] = new BrowserTestingStatus(browser);
       }
       browser.id = new_id;
       browser.start(testingServer.getDriverUrl(new_id)).then((success) {
         // We may have started terminating in the mean time.
@@ skipping 95 matching lines @@
   }
 
   Browser getInstance() {
     var browser = new Browser.byName(browserName, globalConfiguration);
     browser.logger = logger;
     return browser;
   }
 }
 
 class BrowserTestingServer {
+  final Map globalConfiguration;
   /// Interface of the testing server:
   ///
   /// GET /driver/BROWSER_ID -- This will get the driver page to fetch
   ///                           and run tests ...
   /// GET /next_test/BROWSER_ID -- returns "WAIT" "TERMINATE" or "url#id"
   /// where url is the test to run, and id is the id of the test.
   /// If there are currently no available tests the waitSignal is send
   /// back. If we are in the process of terminating the terminateSignal
   /// is send back and the browser will stop requesting new tasks.
   /// POST /report/BROWSER_ID?id=NUM -- sends back the dom of the executed
@@ skipping 11 matching lines @@
   var testCount = 0;
   var httpServer;
   var errorReportingServer;
   bool underTermination = false;
   bool useIframe = false;
 
   Function testDoneCallBack;
   Function testStartedCallBack;
   Function nextTestCallBack;
 
-  BrowserTestingServer(this.localIp, this.useIframe);
+  BrowserTestingServer(this.globalConfiguration, this.localIp, this.useIframe);
 
   Future start() {
-    return HttpServer.bind(localIp, 0).then((createdServer) {
+    int port = int.parse(globalConfiguration['test_driver_port']);
+    return HttpServer.bind(localIp, port).then((createdServer) {
       httpServer = createdServer;
       void handler(HttpRequest request) {
         // Don't allow caching of resources from the browser controller, i.e.,
         // we don't want the browser to cache the result of getNextTest.
         request.response.headers.set("Cache-Control",
                                      "no-cache, no-store, must-revalidate");
         if (request.uri.path.startsWith(reportPath)) {
           var browserId = request.uri.path.substring(reportPath.length + 1);
           var testId =
               int.parse(request.uri.queryParameters["id"].split("=")[1]);
@@ skipping 30 matching lines @@
       });
       }
       void errorHandler(e) {
         if (!underTermination) print("Error occured in httpserver: $e");
       };
 
       httpServer.listen(handler, onError: errorHandler);
 
       // Set up the error reporting server that enables us to send back
       // errors from the browser.
-      return HttpServer.bind(localIp, 0).then((createdReportServer) {
+      port = int.parse(globalConfiguration['test_driver_error_port']);
+      return HttpServer.bind(localIp, port).then((createdReportServer) {
         errorReportingServer = createdReportServer;
         void errorReportingHandler(HttpRequest request) {
           StringBuffer buffer = new StringBuffer();
           request.transform(UTF8.decoder).listen((data) {
             buffer.write(data);
           }, onDone: () {
               String back = buffer.toString();
               request.response.headers.set("Access-Control-Allow-Origin", "*");
               request.response.done.catchError((error) {
                 DebugLogger.error("Error getting error from browser"
@@ skipping 213 matching lines @@
     Dart test driver, number of tests: <div id="number"></div><br>
     Currently executing: <div id="currently_executing"></div><br>
     Unhandled error: <div id="unhandled_error"></div>
     <iframe id="embedded_iframe"></iframe>
   </body>
 </html>
 """;
     return driverContent;
   }
 }