Support rich line output in both speech and braille

chrome/browser/resources/chromeos/chromevox/braille/expanding_braille_translator_test.unitjs

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 // Include test fixture.
 GEN_INCLUDE(['../testing/chromevox_unittest_base.js',
             '../testing/assert_additions.js']);
 
 /**
  * Test fixture.
  * @constructor
  * @extends {ChromeVoxUnitTestBase}
  */
 function CvoxExpandingBrailleTranslatorUnitTest() {}
 
 CvoxExpandingBrailleTranslatorUnitTest.prototype = {
   __proto__: ChromeVoxUnitTestBase.prototype,
 
   /** @override */
   closureModuleDeps: [
     'Spannable',
+    'cvox.BrailleTextStyleSpan',
     'cvox.ExpandingBrailleTranslator',
     'cvox.LibLouis',
     'cvox.ValueSelectionSpan',
     'cvox.ValueSpan',
   ]
 };
 
 /**
  * An implementation of {@link cvox.LibLouis.Translator} whose translation
  * output is an array buffer of the same byte length as the input and where
  * each byte is equal to the character code of {@code resultChar}.  The
  * position mappings are one to one in both directions.
  * @param {string} resultChar A one character string used for each byte of the
  *     result.
  * @constructor
  * @extends {cvox.LibLouis.Translator}
  */
-function FakeTranslator(resultChar) {
+function FakeTranslator(resultChar, opt_styleMap) {
   /** @private {string} */
   this.resultChar_ = resultChar;
+  /** @private {!Object} */
+  this.styleMap_ = opt_styleMap || {};
 }
 
 FakeTranslator.prototype = {
   /** @Override */
-  translate: function(text, callback) {
+  translate: function(text, formTypeMap, callback) {
     var result = new Uint8Array(text.length);
     var textToBraille = [];
     var brailleToText = [];
     for (var i = 0; i < text.length; ++i) {
-      result[i] = this.resultChar_.charCodeAt(0);
+      var formType = this.styleMap_[formTypeMap[i]];
+      if (formType)
+        formType = formType.charCodeAt(0);
+      result[i] = formType || this.resultChar_.charCodeAt(0);
       textToBraille.push(i);
       brailleToText.push(i);
     }
     callback(result.buffer, textToBraille, brailleToText);
   }
 };
 
 /**
  * Asserts that a array buffer, viewed as an uint8 array, matches
  * the contents of a string.  The character code of each character of the
@@ skipping 10 matching lines @@
   }
 }
 
 TEST_F('CvoxExpandingBrailleTranslatorUnitTest', 'TranslationError',
     function() {
   var text = new Spannable('error ok', new cvox.ValueSpan());
   text.setSpan(new cvox.ValueSelectionSpan, 0, 0);
   var contractedTranslator = new FakeTranslator('c');
   // Translator that always results in an error.
   var uncontractedTranslator = {
-    translate: function(text, callback) {
+    translate: function(text, formTypeMap, callback) {
       callback(null, null, null);
     }
   };
   var translationResult = null;
 
   var expandingTranslator = new cvox.ExpandingBrailleTranslator(
         contractedTranslator, uncontractedTranslator);
   expandingTranslator.translate(
       text, cvox.ExpandingBrailleTranslator.ExpansionType.SELECTION,
       function(cells, textToBraille, brailleToText) {
@@ skipping 41 matching lines @@
     var expectedTextToBraille = [];
     var expectedBrailleToText = [];
     for (var i = 0, pos = 0; i < text.length; ++i, ++pos) {
       if (i === extraCellsSpanPos)
         ++pos;
       expectedTextToBraille.push(pos);
       expectedBrailleToText.push(i);
     }
     if (extraCellsSpan)
       expectedBrailleToText.splice(extraCellsSpanPos, 0, extraCellsSpanPos);
-  
+
     expandingTranslator.translate(
         text, valueExpansion, function(cells, textToBraille, brailleToText) {
           assertArrayBufferMatches(expectedOutput, cells, name);
           assertEqualsJSON(expectedTextToBraille, textToBraille, name);
           assertEqualsJSON(expectedBrailleToText, brailleToText, name);
         });
   } catch (e) {
     console.error('Subtest ' + name + ' failed.');
     throw e;
   }
@@ skipping 64 matching lines @@
                    surroundedText, surroundedExpectedOutput);
 }
 
 /**
  * Creates a spannable text with optional selection.
  * @param {string} text The text.
  * @param {=opt_selectionStart} Selection start or caret position.  No
  *     selection is added if undefined.
  * @param {=opt_selectionEnd} Selection end if selection is not a caret.
  */
-function createText(text, opt_selectionStart, opt_selectionEnd) {
+function createText(text, opt_selectionStart, opt_selectionEnd, opt_style) {
   var result = new Spannable(text);
 
   result.setSpan(new cvox.ValueSpan, 0, text.length);
   if (goog.isDef(opt_selectionStart)) {
     result.setSpan(
         new cvox.ValueSelectionSpan,
         opt_selectionStart,
         goog.isDef(opt_selectionEnd) ? opt_selectionEnd : opt_selectionStart);
   }
+
+  if (goog.isDef(opt_style)) {
+    result.setSpan(
+        new cvox.BrailleTextStyleSpan(opt_style.formType),
+        opt_style.start,
+        opt_style.end);
+  }
   return result;
 }
 
 
 var TEXT = 'Hello, world!';
 
 TEST_F('CvoxExpandingBrailleTranslatorUnitTest', 'successfulTranslations',
        function() {
   /**
    * Dictionary of test strings, keyed on a descriptive name for the
@@ skipping 43 matching lines @@
   }
   for (var i = 0, testCase; testCase = TESTDATA_WITH_SELECTION[i]; ++i)
     runTranslationTestVariants(testCase, true, expType.SELECTION, true);
 
   // Make sure that the logic above runs the tests, adjust when adding more
   // test variants.
   var totalExpectedTranslationTests =
       2 * (TESTDATA.length * 4 + TESTDATA_WITH_SELECTION.length);
   assertEquals(totalExpectedTranslationTests, totalRunTranslationTests);
 });
+
+TEST_F('CvoxExpandingBrailleTranslatorUnitTest', 'StyleTranslations',
+       function() {
+  var formTypeMap = {};
+  formTypeMap[cvox.LibLouis.FormType.BOLD] = 'b';
+  formTypeMap[cvox.LibLouis.FormType.ITALIC] = 'i';
+  formTypeMap[cvox.LibLouis.FormType.UNDERLINE] = 'u';
+  var translator = new cvox.ExpandingBrailleTranslator(
+      new FakeTranslator('c', formTypeMap),
+      new FakeTranslator('u'));
+  translator.translate(createText('a test of text', undefined, undefined, {
+     start: 2, end: 6, formType: cvox.LibLouis.FormType.BOLD}),
+      cvox.ExpandingBrailleTranslator.ExpansionType.NONE,
+      function(cells) {
+        assertArrayBufferMatches('ccbbbbcccccccc', cells);
+      });
+});