Bug 990150 - Give AccessFu content tests debug output. r=yzen

dothq · Apr 1, 2014 · 0df2e9e · 0df2e9e
1 parent 12f06d4
commit 0df2e9e
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 6 deletions.
diff --git a/accessible/src/jsat/content-script.js b/accessible/src/jsat/content-script.js
@@ -128,6 +128,10 @@ function adjustRange(aMessage) {
 addMessageListener(
   'AccessFu:Start',
   function(m) {
+    if (m.json.logLevel) {
+      Logger.logLevel = Logger[m.json.logLevel];
+    }
+
     Logger.debug('AccessFu:Start');
     if (m.json.buildApp)
       Utils.MozBuildApp = m.json.buildApp;

diff --git a/accessible/tests/mochitest/jsat/jsatcommon.js b/accessible/tests/mochitest/jsat/jsatcommon.js
@@ -164,6 +164,7 @@ AccessFuContentTest.prototype = {
   currentPair: null,
 
   start: function(aFinishedCallback) {
+    Logger.logLevel = Logger.DEBUG;
     this.finishedCallback = aFinishedCallback;
     var self = this;
 
@@ -194,6 +195,16 @@ AccessFuContentTest.prototype = {
     });
   },
 
+  finish: function() {
+    Logger.logLevel = Logger.INFO;
+    for (var mm of this.mms) {
+        mm.sendAsyncMessage('AccessFu:Stop');
+      }
+    if (this.finishedCallback) {
+      this.finishedCallback();
+    }
+  },
+
   setupMessageManager:  function (aMessageManager, aCallback) {
     function contentScript() {
       addMessageListener('AccessFuTest:Focus', function (aMessage) {
@@ -213,7 +224,9 @@ AccessFuContentTest.prototype = {
     aMessageManager.addMessageListener('AccessFu:Ready', function () {
       aMessageManager.addMessageListener('AccessFu:ContentStarted', aCallback);
       aMessageManager.sendAsyncMessage('AccessFu:Start',
-        { buildApp: 'browser', androidSdkVersion: Utils.AndroidSdkVersion});
+        { buildApp: 'browser',
+          androidSdkVersion: Utils.AndroidSdkVersion,
+          logLevel: 'DEBUG' });
     });
 
     aMessageManager.loadFrameScript(
@@ -236,11 +249,8 @@ AccessFuContentTest.prototype = {
       if (!this.currentPair[1]) {
        this.pump();
      }
-    } else if (this.finishedCallback) {
-      for (var mm of this.mms) {
-        mm.sendAsyncMessage('AccessFu:Stop');
-      }
-      this.finishedCallback();
+    } else {
+      this.finish();
     }
   },
 
@@ -301,6 +311,10 @@ AccessFuContentTest.prototype = {
   },
 
   extractUtterance: function(aData) {
+    if (!aData) {
+      return null;
+    }
+
     for (var output of aData) {
       if (output && output.type === 'Speech') {
         for (var action of output.details.actions) {