Refine braille output

chrome/browser/resources/chromeos/chromevox/cvox2/background/output_test.extjs

 // 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.
 
 GEN_INCLUDE(['../../testing/assert_additions.js']);
 GEN_INCLUDE(['../../testing/chromevox_next_e2e_test_base.js']);
 
 /**
  * Gets the braille output and asserts that it matches expected values.
  * Annotations in the output that are primitive strings are ignored.
@@ skipping 260 matching lines @@
       ];
 
       var expectedSpeechValues = [
         '||Edit text',
         '||Edit text, email entry',
         '||Password edit text',
         '||Edit text numeric only',
         ['||Spin button',
          [{value: 'name', start: 0, end: 0},
           {value: new Output.EarconAction('LISTBOX'), start: 0, end: 0},
-          {value: {startIndex: 0, endIndex: 0, offset: 0}, start: 1, end: 1},
+          {value: {startIndex: 0, endIndex: 0}, start: 1, end: 1},
           {value: 'value', start: 1, end: 1},
           {value: 'role', start: 2, end: 13}]
         ],
         ['Time control',
          [{value: 'role', start: 0, end: 12}]
         ],
         ['Date control',
          [{value: 'role', start: 0, end: 12}]
         ],
         ['Choose File|No file chosen|Button',
          [{value: 'name', start: 0, end: 11},
           {value: new Output.EarconAction("BUTTON"), start: 0, end: 11},
           {value: 'value', start: 12, end: 26},
           {value: 'role', start: 27, end: 33}]
         ],
         '||Edit text, search entry',
         '||Edit text'
       ];
       // TODO(plundblad): Some of these are wrong, there should be an initial
       // space for the cursor in edit fields.
       var expectedBrailleValues = [
-        ' ed',
-        ' @ed',
-        ' pwded',
-        ' #ed',
-        ' spnbtn',
+        '  ed',
+        '  @ed',
+        '  pwded',
+        '  #ed',
+        '  spnbtn',
         {string_: 'time'},
         {string_: 'date'},
         {string_: 'Choose File No file chosen btn'},
-        ' srched',
-        ' ed'
+        '  srched',
+        '  ed'
       ];
       assertEquals(expectedSpeechValues.length, expectedBrailleValues.length);
 
       var el = root.firstChild.firstChild;
       expectedSpeechValues.forEach(function(expectedValue) {
         var range = cursors.Range.fromNode(el);
         var o = new Output().withSpeechAndBraille(range, null, 'navigate');
         if (typeof expectedValue == 'object') {
           checkSpeechOutput(expectedValue[0], expectedValue[1], o);
         } else {
           expectedSpans[4].end = expectedValue.length;
           checkSpeechOutput(expectedValue, expectedSpans, o);
         }
         el = el.nextSibling;
       });
 
       el = root.firstChild.firstChild;
       expectedBrailleValues.forEach(function(expectedValue) {
         var range = cursors.Range.fromNode(el);
         var o = new Output().withBraille(range, null, 'navigate');
         if (typeof expectedValue === 'string') {
           checkBrailleOutput(
               expectedValue,
-              [{value: {startIndex: 0, endIndex: 0, offset: 0},
+              [{value: {startIndex: 0, endIndex: 0},
                 start: 0, end: 0},
                {value: new Output.NodeSpan(el), start: 0,
                 end: expectedValue.length}],
               o);
         } else {
           checkBrailleOutput(
               expectedValue.string_,
               [{value: new Output.NodeSpan(el), start: 0,
                 end: expectedValue.string_.length}],
               o);
@@ skipping 314 matching lines @@
       <div role="row" tabindex=0 aria-label="start"></div>
       <div role="row" tabindex=0 aria-label="end"></div>
     */},
     function(root) {
       var r1 = cursors.Range.fromNode(root.firstChild);
       var r2 = cursors.Range.fromNode(root.lastChild);
       assertEquals('start|Row',
           new Output().withSpeech(r1, r2).speechOutputForTest.string_);
   });
 });
+
+TEST_F('OutputE2ETest', 'BraileWhitespace', function() {

[dmazzoni, 2016/11/10 23:31:29]

nit: Braile -> Braille

+  this.runWithLoadedTree(function() {/*!
+    <p>this is a <em>test</em>of emphasized text</p>
+  */},
+  function(root) {
+    var start = root.firstChild.firstChild;
+    var end = root.firstChild.lastChild;
+    var range = new cursors.Range(
+        cursors.Cursor.fromNode(start),
+        cursors.Cursor.fromNode(end)
+        );
+    var o = new Output().withBraille(range, null, 'navigate');
+    checkBrailleOutput(
+        'this is a testof emphasized text',
+        [
+          {value: new Output.NodeSpan(start), start: 0, end: 10},
+          {value: new Output.NodeSpan(start.nextSibling), start: 10, end: 14},
+          {value: new Output.NodeSpan(end), start: 14, end: 32}
+        ],
+        o);
+  });
+});