Use aria range values for sliders

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 82 matching lines @@
 function OutputE2ETest() {
   ChromeVoxNextE2ETest.call(this);
 }
 
 OutputE2ETest.prototype = {
   __proto__: ChromeVoxNextE2ETest.prototype,
 
   /** @override */
   setUp: function() {
     window.Dir = AutomationUtil.Dir;
+    window.RoleType = chrome.automation.RoleType;
     this.forceContextualLastOutput();   
   }
 };
 
 TEST_F('OutputE2ETest', 'Links', function() {
   this.runWithLoadedTree('<a href="#">Click here</a>',
     function(root) {
       var el = root.firstChild.firstChild;
       var range = cursors.Range.fromNode(el);
       var o = new Output().withSpeechAndBraille(range, null, 'navigate');
@@ skipping 115 matching lines @@
       checkBrailleOutput(
           'play btn begin playback audio tlbar',
           [{value: new Output.NodeSpan(el), start: 0, end: 23},
            {value: new Output.NodeSpan(el.parent), start: 24, end: 35}],
           o);
 
       el = el.nextSibling.nextSibling;
       var prevRange = range;
       range = cursors.Range.fromNode(el);
       var o = new Output().withSpeechAndBraille(range, prevRange, 'navigate');
-      checkSpeechOutput('|0, , slider|audio time scrubber',
+      checkSpeechOutput('0|Min 0|Max 0||Slider|audio time scrubber',
           [
-            {value: new Output.EarconAction('SLIDER'), start: 0, end: 0},
-            {value: 'description', start: 13, end: 32}
+            {value: 'valueForRange', start: 0, end: 1},
+            {value: 'name', start: 14, end: 14},
+            {value: new Output.EarconAction('SLIDER'), start: 14, end: 14},
+            {value: 'role', start: 15, end: 21},
+            {value: 'description', start: 22, end: 41}
           ],
           o);
-      // TODO(plundblad): Investigate this.
       checkBrailleOutput(
-          '0, , slider audio time scrubber',
-          [{value: new Output.NodeSpan(el), start: 0, end: 31}],
+          '0 min:0 max:0 sldr audio time scrubber',
+          [{value: new Output.NodeSpan(el), start: 0, end: 38}],
           o);
   });
 });
 
 TEST_F('OutputE2ETest', 'Input', function() {
   this.runWithLoadedTree(
       '<input type="text"></input>' +
       '<input type="email"></input>' +
       '<input type="password"></input>' +
       '<input type="tel"></input>'          +
@@ skipping 10 matching lines @@
         {value: new Output.SelectionSpan(0, 0, 0), start: 1, end: 1},
         {value: 'value', start: 1, end: 1},
         {value: 'inputType', start: 2}
       ];
 
       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}, start: 1, end: 1},
-          {value: 'value', start: 1, end: 1},
-          {value: 'role', start: 2, end: 13}]
+        ['0|Min 0|Max 0||Spin button',
+         [{value: 'valueForRange', start: 0, end: 1},
+          {value: 'name', start: 14, end: 14},
+          {value: new Output.EarconAction('LISTBOX'), start: 14, end: 14},
+          {value: 'role', start: 15, end: 26}]
         ],
         ['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',
+        {string_: '0 min:0 max:0 spnbtn'},
         {string_: 'time'},
         {string_: 'date'},
         {string_: 'Choose File No file chosen btn'},
         ' srched',
         ' ed'
       ];
       assertEquals(expectedSpeechValues.length, expectedBrailleValues.length);
 
       var el = root.firstChild.firstChild;
       expectedSpeechValues.forEach(function(expectedValue) {
@@ skipping 387 matching lines @@
         [
           {value: new Output.NodeSpan(text), start: 0, end: 4},
           {value: new Output.NodeSpan(link), start: 5, end: 8},
           {value: new Output.NodeSpan(listItem), start: 9, end: 15},
           {value: new Output.NodeSpan(list), start: 16, end: 23}
         ],
 
         o);
   });
 });
+
+TEST_F('OutputE2ETest', 'RangeOutput', function() {
+  this.runWithLoadedTree(function(root) {/*!
+    <div role="slider" aria-valuemin="1" aria-valuemax="10" aria-valuenow="2"
+                       aria-label="volume"></div>
+    <progress aria-valuemin="1" aria-valuemax="10"
+              aria-valuenow="2" aria-label="volume"></progress>
+    <meter aria-valuemin="1" aria-valuemax="10" aria-valuenow="2"
+           aria-label="volume"></meter>
+    <div role="spinbutton" aria-valuemin="1" aria-valuemax="10"
+                           aria-valuenow="2" aria-label="volume"></div>
+  */}, function(root) {
+
+    var obj = root.find({role: RoleType.slider});
+    var o = new Output().withSpeech(cursors.Range.fromNode(obj));
+      checkSpeechOutput('2|Min 1|Max 10|volume|Slider',
+          [
+            {value: 'valueForRange', start: 0, end: 1},
+            {value: 'name', start: 15,end: 21},
+            {value: new Output.EarconAction('SLIDER'), start: 15, end: 21},
+            {value: 'role', start: 22, end: 28}
+          ],
+          o);
+
+    obj = root.find({role: RoleType.progressIndicator});
+    o = new Output().withSpeech(cursors.Range.fromNode(obj));
+      checkSpeechOutput('2|Min 1|Max 10|volume|Progress indicator',
+          [
+            {value: 'valueForRange', start: 0, end: 1},
+            {value: 'name', start: 15,end: 21},
+            {value: 'role', start: 22, end: 40}
+          ],
+          o);
+
+    obj = root.find({role: RoleType.meter});
+    o = new Output().withSpeech(cursors.Range.fromNode(obj));
+      checkSpeechOutput('2|Min 1|Max 10|volume|Meter',
+          [
+            {value: 'valueForRange', start: 0, end: 1},
+            {value: 'name', start: 15,end: 21},
+            {value: 'role', start: 22, end: 27}
+          ],
+          o);
+
+    obj = root.find({role: RoleType.spinButton});
+    o = new Output().withSpeech(cursors.Range.fromNode(obj));
+      checkSpeechOutput('2|Min 1|Max 10|volume|Spin button',
+          [
+            {value: 'valueForRange', start: 0, end: 1},
+            {value: 'name', start: 15,end: 21},
+            {value: new Output.EarconAction('LISTBOX'), start: 15, end: 21},
+            {value: 'role', start: 22, end: 33}
+          ],
+          o);
+  });
+});