diff options
author | tkent@chromium.org <tkent@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-12-05 11:34:42 +0000 |
---|---|---|
committer | tkent@chromium.org <tkent@chromium.org@bbb929c8-8fbe-4397-9dbb-9b2b20218538> | 2012-12-05 11:34:42 +0000 |
commit | 36965d4bf65f272cc126d5830a81917a4d71f95e (patch) | |
tree | dbadee2d4f81e2668654b31470fa74139d4d314e /third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields | |
parent | 40fdbba151fd5f4b4615761a938d1b89f106cacd (diff) | |
download | chromium_src-36965d4bf65f272cc126d5830a81917a4d71f95e.zip chromium_src-36965d4bf65f272cc126d5830a81917a4d71f95e.tar.gz chromium_src-36965d4bf65f272cc126d5830a81917a4d71f95e.tar.bz2 |
Layout Test fast/forms/*-multiple-fields/*-multiple-fields-preserve-value-after-history-back.html are slow
https://bugs.webkit.org/show_bug.cgi?id=104094
Reviewed by Kentaro Hara.
Make them faster by spliting them into the main frame HTML files
and the sub frame HTML files. The sub frame HTML files are loaded
five times in one test, and don't need to load
js-test-pre/post.js. This change makes them about 2x faster on my
local machine.
* fast/forms/date-multiple-fields/date-multiple-fields-preserve-value-after-history-back.html:
* fast/forms/date-multiple-fields/resources/preserve-value-after-history-back-frame.html: Copied from LayoutTests/fast/forms/date-multiple-fields/date-multiple-fields-preserve-value-after-history-back.html.
* fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-preserve-value-after-history-back.html:
* fast/forms/datetimelocal-multiple-fields/resources/preserve-value-after-history-back-frame.html: Copied from LayoutTests/fast/forms/datetimelocal-multiple-fields/datetimelocal-multiple-fields-preserve-value-after-history-back.html.
* fast/forms/month-multiple-fields/month-multiple-fields-preserve-value-after-history-back.html:
* fast/forms/month-multiple-fields/resources/preserve-value-after-history-back-frame.html: Copied from LayoutTests/fast/forms/month-multiple-fields/month-multiple-fields-preserve-value-after-history-back.html.
* fast/forms/time-multiple-fields/resources/preserve-value-after-history-back-frame.html: Copied from LayoutTests/fast/forms/time-multiple-fields/time-multiple-fields-preserve-value-after-history-back.html.
* fast/forms/time-multiple-fields/time-multiple-fields-preserve-value-after-history-back.html:
* fast/forms/week-multiple-fields/resources/preserve-value-after-history-back-frame.html: Copied from LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-preserve-value-after-history-back.html.
* fast/forms/week-multiple-fields/week-multiple-fields-preserve-value-after-history-back.html:
* platform/chromium/TestExpectations:
git-svn-id: svn://svn.chromium.org/blink/trunk@136665 bbb929c8-8fbe-4397-9dbb-9b2b20218538
Diffstat (limited to 'third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields')
2 files changed, 99 insertions, 103 deletions
diff --git a/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/resources/preserve-value-after-history-back-frame.html b/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/resources/preserve-value-after-history-back-frame.html new file mode 100644 index 0000000..8b82571 --- /dev/null +++ b/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/resources/preserve-value-after-history-back-frame.html @@ -0,0 +1,97 @@ +<!DOCTYPE html> +<body> +<input type="week" id="test1"> +<input type="week" id="test2" min="1999-W01" max="1999-W12"> +<script> +function fieldsText(input) { + return window.internals.oldestShadowRoot(input).textContent; +} + +function back(newState) { + parent.state = newState; + history.back(); +} + +function forward(newState) { + parent.state = newState; + history.forward(); +} + +function keyDown(key) { + eventSender.keyDown(key); +} + +var testInput1 = document.getElementById('test1'); +var testInput2 = document.getElementById('test2'); +var pageName = location.search || '?page1'; + +window.onload = function() { + switch (pageName) { + case '?page1': + switch (parent.state) { + case 'direct': { + testInput1.value = '12012-W10'; + testInput2.focus(); + keyDown('upArrow'); // -> Week [01], yyyy + var nextUri = location.toString().replace('?page1', '?page2'); + setTimeout(function() { window.location.href = nextUri; }, 0); + break; + } + case 'backTo1': + parent.testCases.push( + { + 'description' : 'Went back to a page. Checking a form control which had a full value', + 'actual' : testInput1.value, + 'expected' : '12012-W10' }, + { + 'description' : 'Went back to a page. Checking a form control which had a partial value', + 'actual' : fieldsText(testInput2), + 'expected' : 'Week 01, ----' + }); + forward('forwardTo2'); + break; + case 'backTo1Second': + parent.finishTest(); + break; + default: + parent.failed('Unexpected state(' + parent.state + ')'); + break; + } + break; + + case '?page2': + switch (parent.state) { + case 'direct': + testInput1.value = '0001-W11'; + testInput2.focus(); + keyDown('\t'); // -> Week ww, [yyyy] + keyDown('downArrow'); // -> Week ww, [1999] + back('backTo1'); + break; + case 'forwardTo2': + parent.testCases.push( + { + 'description' : 'Went forward to a page. Checking a form control which had a full value', + 'actual' : testInput1.value, + 'expected' : '0001-W11' + }, + { + 'description' : 'Went forward to a page. Checking a form control which had a partial value', + 'actual' : fieldsText(testInput2), + 'expected' : 'Week --, 1999' + }); + back('backTo1Second'); + break; + default: + parent.failed('Unexpected state(' + parent.state + ')'); + break; + } + break; + + default: + parent.failed('Unexpected page(' + pageName + ')'); + break; + } +}; +</script> +</body> diff --git a/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-preserve-value-after-history-back.html b/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-preserve-value-after-history-back.html index 60e85c8..5fda6d9 100644 --- a/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-preserve-value-after-history-back.html +++ b/third_party/WebKit/LayoutTests/fast/forms/week-multiple-fields/week-multiple-fields-preserve-value-after-history-back.html @@ -4,58 +4,26 @@ <script src="../../../fast/js/resources/js-test-pre.js"></script> </head> <body> -<div id="container"> -<input type="week" id="test1"><br> -<input type="week" id="test2" min="1999-W01" max="1999-W12"><br> -</div> <iframe id="iframe"></iframe> <script> description('Checks input value is preserved after backward and forward'); -if (!window.eventSender) +if (!window.eventSender || !window.internals) debug('Please run within DRT/WTR'); window.jsTestIsAsync = true; -var iframe = document.getElementById('iframe'); -var testInput1 = document.getElementById('test1'); -var testInput2 = document.getElementById('test2'); var state = 'direct'; -var pageName = location.search || '?page0'; var testCases = []; -function back(newState) { - parent.state = newState; - history.back(); -} - function failed(message) { testFailed(message + ' in ' + state); finishJSTest(); } -function fieldsText(input) { - if (!window.internals) - return ""; - var editElement = window.internals.oldestShadowRoot(input); - return editElement.textContent; -} - function finishTest() { runTestCases(); - document.body.removeChild(document.getElementById('container')); finishJSTest(); } -function forward(newState) { - parent.state = newState; - history.forward(); -} - -function keyDown(key, modifiers) { - if (!window.eventSender) - return; - eventSender.keyDown(key, modifiers); -} - function runTestCases() { for (var index = 0; index < testCases.length; ++index) { var testCase = testCases[index]; @@ -66,76 +34,7 @@ function runTestCases() { } window.onload = function() { - switch (pageName) { - case '?page0': - iframe.src = location + '?page1'; - break; - - case '?page1': - switch (parent.state) { - case 'direct': { - testInput1.value = '12012-W10'; - testInput2.focus(); - keyDown('upArrow'); // -> Week [01], yyyy - var nextUri = location.toString().replace('?page1', '?page2'); - setTimeout(function () { window.location.href = nextUri; }, 0); - break; - } - case 'backTo1': - parent.testCases.push( - { - 'description' : 'Went back to a page. Checking a form control which had a full value', - 'actual' : testInput1.value, - 'expected' : '12012-W10' }, - { - 'description' : 'Went back to a page. Checking a form control which had a partial value', - 'actual' : fieldsText(testInput2), - 'expected' : 'Week 01, ----' - }); - forward('forwardTo2'); - break; - case 'backTo1Second': - parent.finishTest(); - break; - default: - failed('Unexpected state(' + parent.state + ')'); - break; - } - break; - - case '?page2': - switch (parent.state) { - case 'direct': - testInput1.value = '0001-W11'; - testInput2.focus(); - keyDown('\t'); // -> Week ww, [yyyy] - keyDown('downArrow'); // -> Week ww, [1999] - back('backTo1'); - break; - case 'forwardTo2': - parent.testCases.push( - { - 'description' : 'Went forward to a page. Checking a form control which had a full value', - 'actual' : testInput1.value, - 'expected' : '0001-W11' - }, - { - 'description' : 'Went forward to a page. Checking a form control which had a partial value', - 'actual' : fieldsText(testInput2), - 'expected' : 'Week --, 1999' - }); - back('backTo1Second'); - break; - default: - failed('Unexpected state(' + parent.state + ')'); - break; - } - break; - - default: - failed('Unexpected page(' + pageName + ')'); - break; - } + document.getElementById('iframe').src = 'resources/preserve-value-after-history-back-frame.html?page1'; }; </script> <script src="../../../fast/js/resources/js-test-post.js"></script> |