Commit 89945d69 authored by Geoff Brown's avatar Geoff Brown
Browse files

Bug 986738 - End robocop tests with nsIAppStartup.quit(); r=snorp

parent 133ee8b9

mobile/android/base/tests/BaseTest.java

+5 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import org.mozilla.gecko.Element; 
import org.mozilla.gecko.FennecNativeActions;

import org.mozilla.gecko.FennecNativeDriver;

import org.mozilla.gecko.GeckoAppShell;

import org.mozilla.gecko.GeckoEvent;

import org.mozilla.gecko.GeckoThread;

import org.mozilla.gecko.GeckoThread.LaunchState;

import org.mozilla.gecko.R;
@@ -137,6 +138,10 @@ abstract class BaseTest extends BaseRobocopTest { 
    public void tearDown() throws Exception {

        try {

            mAsserter.endTest();

            // request a force quit of the browser and wait for it to take effect

            GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Robocop:Quit", null));

            mSolo.sleep(7000);

            // if still running, finish activities as recommended by Robotium

            mSolo.finishOpenedActivities();

        } catch (Throwable e) {

            e.printStackTrace();

mobile/android/base/tests/UITest.java

+6 −0
Original line number Diff line number Diff line
@@ -11,6 +11,8 @@ import org.mozilla.gecko.Assert; 
import org.mozilla.gecko.Driver;

import org.mozilla.gecko.FennecNativeActions;

import org.mozilla.gecko.FennecNativeDriver;

import org.mozilla.gecko.GeckoAppShell;

import org.mozilla.gecko.GeckoEvent;

import org.mozilla.gecko.tests.components.AboutHomeComponent;

import org.mozilla.gecko.tests.components.AppMenuComponent;

import org.mozilla.gecko.tests.components.BaseComponent;
@@ -78,6 +80,10 @@ abstract class UITest extends BaseRobocopTest 
    public void tearDown() throws Exception {

        try {

            mAsserter.endTest();

            // request a force quit of the browser and wait for it to take effect

            GeckoAppShell.sendEventToGecko(GeckoEvent.createBroadcastEvent("Robocop:Quit", null));

            mSolo.sleep(7000);

            // if still running, finish activities as recommended by Robotium

            mSolo.finishOpenedActivities();

        } catch (Throwable e) {

            e.printStackTrace();

testing/mochitest/roboextender/bootstrap.js

+9 −1
Original line number Diff line number Diff line 


var Cc = Components.classes;

var Ci = Components.interfaces;

var Cu = Components.utils;



Cu.import("resource://gre/modules/Services.jsm");



function loadIntoWindow(window) {}

function unloadFromWindow(window) {}
@@ -41,6 +44,11 @@ function startup(aData, aReason) { 


  // Load into any new windows

  wm.addListener(windowListener);

  Services.obs.addObserver(function observe(aSubject, aTopic, aData) {

      dump("Robocop:Quit received -- requesting quit");

      let appStartup = Cc["@mozilla.org/toolkit/app-startup;1"].getService(Ci.nsIAppStartup);

      appStartup.quit(Ci.nsIAppStartup.eForceQuit);

  }, "Robocop:Quit", false);

}



function shutdown(aData, aReason) {
@@ -48,7 +56,6 @@ function shutdown(aData, aReason) { 
  if (aReason == APP_SHUTDOWN) return;



  let wm = Cc["@mozilla.org/appshell/window-mediator;1"].getService(Ci.nsIWindowMediator);

  let obs = Cc["@mozilla.org/observer-service;1"].getService(Ci.nsIObserverService);



  // Stop watching for new windows

  wm.removeListener(windowListener);
@@ -56,3 +63,4 @@ function shutdown(aData, aReason) { 


function install(aData, aReason) { }

function uninstall(aData, aReason) { }