Changeset 246450 in webkit


Ignore:
Timestamp:
Jun 14, 2019 4:12:14 PM (5 years ago)
Author:
dbates@webkit.org
Message:

[iOS] Split up fast/events/ios/key-events-meta-alt-combinations.html and add more tests
​https://bugs.webkit.org/show_bug.cgi?id=198834
<rdar://problem/50103348>

Reviewed by Brent Fulgham.

The test fast/events/ios/key-events-meta-alt-combinations.html frequently times out. Let's try
to break up this test into multiple files. Also add more modifier combination tests and group
all these combination tests under a new direcdtory: fast/events/ios/key-events-comprehensive.

  • fast/events/ios/key-events-comprehensive/key-events-control-expected.txt: Renamed from LayoutTests/fast/events/ios/key-events-control-expected.txt.
  • fast/events/ios/key-events-comprehensive/key-events-control-option-expected.txt: Added.
  • fast/events/ios/key-events-comprehensive/key-events-control-option.html: Copied from LayoutTests/fast/events/ios/key-events-control.html.
  • fast/events/ios/key-events-comprehensive/key-events-control-shift-expected.txt: Added.
  • fast/events/ios/key-events-comprehensive/key-events-control-shift.html: Copied from LayoutTests/fast/events/ios/key-events-control.html.
  • fast/events/ios/key-events-comprehensive/key-events-control.html: Renamed from LayoutTests/fast/events/ios/key-events-control.html.
  • fast/events/ios/key-events-comprehensive/key-events-meta-control-expected.txt: Added.
  • fast/events/ios/key-events-comprehensive/key-events-meta-control.html: Copied from LayoutTests/fast/events/ios/key-events-meta.html.
  • fast/events/ios/key-events-comprehensive/key-events-meta-expected.txt: Renamed from LayoutTests/fast/events/ios/key-events-meta-expected.txt.
  • fast/events/ios/key-events-comprehensive/key-events-meta-option-expected.txt: Added.
  • fast/events/ios/key-events-comprehensive/key-events-meta-option.html: Renamed from LayoutTests/fast/events/ios/key-events-meta-alt-combinations.html.
  • fast/events/ios/key-events-comprehensive/key-events-meta-shift-expected.txt: Added.
  • fast/events/ios/key-events-comprehensive/key-events-meta-shift.html: Copied from LayoutTests/fast/events/ios/key-events-meta.html.
  • fast/events/ios/key-events-comprehensive/key-events-meta.html: Renamed from LayoutTests/fast/events/ios/key-events-meta.html.
  • fast/events/ios/key-events-comprehensive/key-events-option-expected.txt: Added.
  • fast/events/ios/key-events-comprehensive/key-events-option-shift-expected.txt: Added.
  • fast/events/ios/key-events-comprehensive/key-events-option-shift.html: Added.
  • fast/events/ios/key-events-comprehensive/key-events-option.html: Added.
  • fast/events/ios/key-events-comprehensive/key-events-shift-expected.txt: Added.
  • fast/events/ios/key-events-comprehensive/key-events-shift.html: Added.
  • fast/events/ios/key-events-meta-alt-combinations-expected.txt: Removed.
Location:
trunk/LayoutTests
Files:
12 added
1 deleted
1 edited
4 copied
5 moved

Legend:

Unmodified
Added
Removed

  • trunk/LayoutTests/ChangeLog

    r246445 r246450  
     12019-06-14  Daniel Bates  <dabates@apple.com>
     2
     3        [iOS] Split up fast/events/ios/key-events-meta-alt-combinations.html and add more tests
     4        https://bugs.webkit.org/show_bug.cgi?id=198834
     5        <rdar://problem/50103348>
     6
     7        Reviewed by Brent Fulgham.
     8
     9        The test fast/events/ios/key-events-meta-alt-combinations.html frequently times out. Let's try
     10        to break up this test into multiple files. Also add more modifier combination tests and group
     11        all these combination tests under a new direcdtory: fast/events/ios/key-events-comprehensive.
     12
     13        * fast/events/ios/key-events-comprehensive/key-events-control-expected.txt: Renamed from LayoutTests/fast/events/ios/key-events-control-expected.txt.
     14        * fast/events/ios/key-events-comprehensive/key-events-control-option-expected.txt: Added.
     15        * fast/events/ios/key-events-comprehensive/key-events-control-option.html: Copied from LayoutTests/fast/events/ios/key-events-control.html.
     16        * fast/events/ios/key-events-comprehensive/key-events-control-shift-expected.txt: Added.
     17        * fast/events/ios/key-events-comprehensive/key-events-control-shift.html: Copied from LayoutTests/fast/events/ios/key-events-control.html.
     18        * fast/events/ios/key-events-comprehensive/key-events-control.html: Renamed from LayoutTests/fast/events/ios/key-events-control.html.
     19        * fast/events/ios/key-events-comprehensive/key-events-meta-control-expected.txt: Added.
     20        * fast/events/ios/key-events-comprehensive/key-events-meta-control.html: Copied from LayoutTests/fast/events/ios/key-events-meta.html.
     21        * fast/events/ios/key-events-comprehensive/key-events-meta-expected.txt: Renamed from LayoutTests/fast/events/ios/key-events-meta-expected.txt.
     22        * fast/events/ios/key-events-comprehensive/key-events-meta-option-expected.txt: Added.
     23        * fast/events/ios/key-events-comprehensive/key-events-meta-option.html: Renamed from LayoutTests/fast/events/ios/key-events-meta-alt-combinations.html.
     24        * fast/events/ios/key-events-comprehensive/key-events-meta-shift-expected.txt: Added.
     25        * fast/events/ios/key-events-comprehensive/key-events-meta-shift.html: Copied from LayoutTests/fast/events/ios/key-events-meta.html.
     26        * fast/events/ios/key-events-comprehensive/key-events-meta.html: Renamed from LayoutTests/fast/events/ios/key-events-meta.html.
     27        * fast/events/ios/key-events-comprehensive/key-events-option-expected.txt: Added.
     28        * fast/events/ios/key-events-comprehensive/key-events-option-shift-expected.txt: Added.
     29        * fast/events/ios/key-events-comprehensive/key-events-option-shift.html: Added.
     30        * fast/events/ios/key-events-comprehensive/key-events-option.html: Added.
     31        * fast/events/ios/key-events-comprehensive/key-events-shift-expected.txt: Added.
     32        * fast/events/ios/key-events-comprehensive/key-events-shift.html: Added.
     33        * fast/events/ios/key-events-meta-alt-combinations-expected.txt: Removed.
     34
    1352019-06-14  Antoine Quint  <graouts@apple.com>
    236

  • trunk/LayoutTests/fast/events/ios/key-events-comprehensive/key-events-control-option.html

    r246449 r246450  
    22<html>
    33<head>
    4 <script src="../../../resources/ui-helper.js"></script>
    5 <script src="../resources/compute-subsets.js"></script>
    6 <script src="resources/key-tester.js"></script>
     4<script src="../../../../resources/ui-helper.js"></script>
     5<script src="../../resources/compute-subsets.js"></script>
     6<script src="../resources/key-tester.js"></script>
    77<script>
    8 const modiferKeySubsetsToTest = computeSubsets(["ctrlKey"]);
     8const modiferKeySubsetsToTest = [["ctrlKey", "altKey"]];
    99for (const k of keysExcludingDeadAndSkippedKeys) {
    1010    for (const modifiers of modiferKeySubsetsToTest)
    … …  
    1414</head>
    1515<body>
    16 <p>This logs DOM keydown, keyup, keypress events that are dispatched when pressing key commands of the form <key>Control<key> + <key>X</key>. Must be run in WebKitTestRunner.</p>
     16<p>This logs DOM keydown, keyup, keypress events that are dispatched when pressing key commands of the form <key>Control<key> + <key>Option<key> + <key>X</key>. Must be run in WebKitTestRunner.</p>
    1717<pre id="console"></pre>
    1818</body>

  • trunk/LayoutTests/fast/events/ios/key-events-comprehensive/key-events-control-shift.html

    r246449 r246450  
    22<html>
    33<head>
    4 <script src="../../../resources/ui-helper.js"></script>
    5 <script src="../resources/compute-subsets.js"></script>
    6 <script src="resources/key-tester.js"></script>
     4<script src="../../../../resources/ui-helper.js"></script>
     5<script src="../../resources/compute-subsets.js"></script>
     6<script src="../resources/key-tester.js"></script>
    77<script>
    8 const modiferKeySubsetsToTest = computeSubsets(["ctrlKey"]);
     8const modiferKeySubsetsToTest = [["ctrlKey", "shiftKey"]];
    99for (const k of keysExcludingDeadAndSkippedKeys) {
    1010    for (const modifiers of modiferKeySubsetsToTest)
    … …  
    1414</head>
    1515<body>
    16 <p>This logs DOM keydown, keyup, keypress events that are dispatched when pressing key commands of the form <key>Control<key> + <key>X</key>. Must be run in WebKitTestRunner.</p>
     16<p>This logs DOM keydown, keyup, keypress events that are dispatched when pressing key commands of the form <key>Control<key> + <key>Shift<key> + <key>X</key>. Must be run in WebKitTestRunner.</p>
    1717<pre id="console"></pre>
    1818</body>

  • trunk/LayoutTests/fast/events/ios/key-events-comprehensive/key-events-control.html

    r246449 r246450  
    22<html>
    33<head>
    4 <script src="../../../resources/ui-helper.js"></script>
    5 <script src="../resources/compute-subsets.js"></script>
    6 <script src="resources/key-tester.js"></script>
     4<script src="../../../../resources/ui-helper.js"></script>
     5<script src="../../resources/compute-subsets.js"></script>
     6<script src="../resources/key-tester.js"></script>
    77<script>
    8 const modiferKeySubsetsToTest = computeSubsets(["ctrlKey"]);
     8const modiferKeySubsetsToTest = [["ctrlKey"]];
    99for (const k of keysExcludingDeadAndSkippedKeys) {
    1010    for (const modifiers of modiferKeySubsetsToTest)

  • trunk/LayoutTests/fast/events/ios/key-events-comprehensive/key-events-meta-control.html

    r246449 r246450  
    22<html>
    33<head>
    4 <script src="../../../resources/ui-helper.js"></script>
    5 <script src="../resources/compute-subsets.js"></script>
    6 <script src="resources/key-tester.js"></script>
     4<script src="../../../../resources/ui-helper.js"></script>
     5<script src="../../resources/compute-subsets.js"></script>
     6<script src="../resources/key-tester.js"></script>
    77<script>
    8 const modiferKeySubsetsToTest = computeSubsets(["metaKey", "altKey"]);
     8const modiferKeySubsetsToTest = [["metaKey", "ctrlKey"]];
    99for (const k of keysExcludingDeadAndSkippedKeys) {
    1010    for (const modifiers of modiferKeySubsetsToTest)
    … …  
    1414</head>
    1515<body>
    16 <p>This logs DOM keydown, keyup, keypress events that are dispatched when pressing key commands of the form <key>Command<key> + <key>X</key>, <key>Option<key> + <key>X</key> and <key>Command<key> + <key>Option<key> + <key>X</key>. Must be run in WebKitTestRunner.</p>
     16<p>This logs DOM keydown, keyup, keypress events that are dispatched when pressing key commands of the form <key>Command<key> + <key>Control<key> + <key>X</key>. Must be run in WebKitTestRunner.</p>
    1717<pre id="console"></pre>
    1818</body>

  • trunk/LayoutTests/fast/events/ios/key-events-comprehensive/key-events-meta-expected.txt

    r246449 r246450  
    147147Test Command + .:
    148148type: keydown, key: Meta, code: MetaLeft, keyIdentifier: Meta, keyCode: 91, charCode: 0, keyCode: 91, which: 91, altKey: false, ctrlKey: false, metaKey: true, shiftKey: false, location: 1, keyLocation: 1
    149 type: keydown, key: ., code: Period, keyIdentifier: U+002E, keyCode: 190, charCode: 0, keyCode: 190, which: 190, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, location: 0, keyLocation: 0
    150 type: keypress, key: ., code: Period, keyIdentifier: , keyCode: 46, charCode: 46, keyCode: 46, which: 46, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, location: 0, keyLocation: 0
    151 type: keyup, key: ., code: Period, keyIdentifier: U+002E, keyCode: 190, charCode: 0, keyCode: 190, which: 190, altKey: false, ctrlKey: false, metaKey: true, shiftKey: false, location: 0, keyLocation: 0
     149type: keydown, key: Escape, code: Period, keyIdentifier: U+001B, keyCode: 27, charCode: 0, keyCode: 27, which: 27, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, location: 0, keyLocation: 0
     150type: keypress, key: Escape, code: Period, keyIdentifier: , keyCode: 27, charCode: 27, keyCode: 27, which: 27, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, location: 0, keyLocation: 0
    152151type: keyup, key: Meta, code: MetaLeft, keyIdentifier: Meta, keyCode: 91, charCode: 0, keyCode: 91, which: 91, altKey: false, ctrlKey: false, metaKey: false, shiftKey: false, location: 1, keyLocation: 1
    153152

  • trunk/LayoutTests/fast/events/ios/key-events-comprehensive/key-events-meta-option.html

    r246449 r246450  
    22<html>
    33<head>
    4 <script src="../../../resources/ui-helper.js"></script>
    5 <script src="../resources/compute-subsets.js"></script>
    6 <script src="resources/key-tester.js"></script>
     4<script src="../../../../resources/ui-helper.js"></script>
     5<script src="../../resources/compute-subsets.js"></script>
     6<script src="../resources/key-tester.js"></script>
    77<script>
    8 const modiferKeySubsetsToTest = computeSubsets(["metaKey"]);
     8const modiferKeySubsetsToTest = [["metaKey", "altKey"]];
    99for (const k of keysExcludingDeadAndSkippedKeys) {
    1010    for (const modifiers of modiferKeySubsetsToTest)
    … …  
    1414</head>
    1515<body>
    16 <p>This logs DOM keydown, keyup, keypress events that are dispatched when pressing key commands of the form <key>Command<key> + <key>X</key>. Must be run in WebKitTestRunner.</p>
     16<p>This logs DOM keydown, keyup, keypress events that are dispatched when pressing key commands of the form <key>Command<key> + <key>Option<key> + <key>X</key>. Must be run in WebKitTestRunner.</p>
    1717<pre id="console"></pre>
    1818</body>

  • trunk/LayoutTests/fast/events/ios/key-events-comprehensive/key-events-meta-shift.html

    r246449 r246450  
    22<html>
    33<head>
    4 <script src="../../../resources/ui-helper.js"></script>
    5 <script src="../resources/compute-subsets.js"></script>
    6 <script src="resources/key-tester.js"></script>
     4<script src="../../../../resources/ui-helper.js"></script>
     5<script src="../../resources/compute-subsets.js"></script>
     6<script src="../resources/key-tester.js"></script>
    77<script>
    8 const modiferKeySubsetsToTest = computeSubsets(["metaKey"]);
     8const modiferKeySubsetsToTest = [["metaKey", "shiftKey"]];
    99for (const k of keysExcludingDeadAndSkippedKeys) {
    1010    for (const modifiers of modiferKeySubsetsToTest)
    … …  
    1414</head>
    1515<body>
    16 <p>This logs DOM keydown, keyup, keypress events that are dispatched when pressing key commands of the form <key>Command<key> + <key>X</key>. Must be run in WebKitTestRunner.</p>
     16<p>This logs DOM keydown, keyup, keypress events that are dispatched when pressing key commands of the form <key>Command<key> + <key>Shift<key> + <key>X</key>. Must be run in WebKitTestRunner.</p>
    1717<pre id="console"></pre>
    1818</body>

  • trunk/LayoutTests/fast/events/ios/key-events-comprehensive/key-events-meta.html

    r246449 r246450  
    22<html>
    33<head>
    4 <script src="../../../resources/ui-helper.js"></script>
    5 <script src="../resources/compute-subsets.js"></script>
    6 <script src="resources/key-tester.js"></script>
     4<script src="../../../../resources/ui-helper.js"></script>
     5<script src="../../resources/compute-subsets.js"></script>
     6<script src="../resources/key-tester.js"></script>
    77<script>
    8 const modiferKeySubsetsToTest = computeSubsets(["metaKey"]);
     8const modiferKeySubsetsToTest = [["metaKey"]];
    99for (const k of keysExcludingDeadAndSkippedKeys) {
    1010    for (const modifiers of modiferKeySubsetsToTest)
Note: See TracChangeset for help on using the changeset viewer.