Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-16 06:45:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Backed out changeset cb03cb33817c (bug 1012662)

Browse Source
This commit is contained in:
Carsten "Tomcat" Book 2015-05-26 13:33:41 +02:00
parent 88f07e5677
commit cc2ccef480
5 changed files with 10 additions and 435 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
dom/tests/mochitest/general/mochitest.ini
View File

@ -36,7 +36,6 @@ support-files =
res8.resource^headers^
resource_timing.js
navigation_timing.html
test_bug1012662_common.js
[test_497898.html]
skip-if = ((buildapp == 'mulet' || buildapp == 'b2g') && toolkit != 'gonk') || toolkit == 'android' #Bug 931116, b2g desktop specific, initial triage
@ -101,6 +100,4 @@ skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop spec
skip-if = (buildapp == 'b2g' && toolkit != 'gonk') #Bug 931116, b2g desktop specific, initial triage
[test_navigation_timing.html]
skip-if = buildapp == 'b2g' || buildapp == 'mulet'
[test_bug1012662_editor.html]
[test_bug1012662_noeditor.html]
[test_bug1161721.html]

340
dom/tests/mochitest/general/test_bug1012662_common.js
View File

@ -1,340 +0,0 @@
/** Test for Bug 1012662 **/
// This test is called from both test_bug1012662_editor.html and test_bug1012662_noeditor.html
// This is to test that the code works both in the presence of a contentEditable node, and in the absense of one
var WATCH_TIMEOUT = 300;
// Some global variables to make the debug messages easier to track down
var gTestN0 = 0, gTestN1 = 0, gTestN2 = 0;
function testLoc() { return " " + gTestN0 + " - " + gTestN1 + " - " + gTestN2; }
// Listen for cut & copy events
var gCopyCount = 0, gCutCount = 0;
document.addEventListener('copy', function() {
gCopyCount++;
});
document.addEventListener('cut', function() {
gCutCount++;
});
// Helper methods
function selectNode(aSelector, aCb) {
var dn = document.querySelector(aSelector);
var range = document.createRange();
range.selectNodeContents(dn);
window.getSelection().removeAllRanges();
window.getSelection().addRange(range);
if (aCb) {
aCb();
}
}
function selectInputNode(aSelector, aCb) {
var dn = document.querySelector(aSelector);
synthesizeMouse(dn, 10, 10, {});
SimpleTest.executeSoon(function() {
synthesizeKey("A", {accelKey: true});
SimpleTest.executeSoon(aCb);
});
}
// Callback functions for attaching to the button
function execCut(aShouldSucceed) {
var cb = function(e) {
e.preventDefault();
document.removeEventListener('keydown', cb);
is(aShouldSucceed, document.execCommand('cut'), "Keydown caused cut invocation" + testLoc());
};
return cb;
}
function execCopy(aShouldSucceed) {
var cb = function(e) {
e.preventDefault();
document.removeEventListener('keydown', cb);
is(aShouldSucceed, document.execCommand('copy'), "Keydown caused copy invocation" + testLoc());
};
return cb;
}
// The basic test set. Tries to cut/copy everything
function cutCopyAll(aDoCut, aDoCopy, aDone, aNegate, aClipOverride, aJustClipboardNegate) {
var execCommandAlwaysSucceed = !!(aClipOverride || aJustClipboardNegate);
function waitForClipboard(aCond, aSetup, aNext, aNegateOne) {
if (aClipOverride) {
aCond = aClipOverride;
aNegateOne = false;
}
if (aNegate || aNegateOne || aJustClipboardNegate) {
SimpleTest.waitForClipboard(null, aSetup, aNext, aNext, "text/unicode", WATCH_TIMEOUT, true);
} else {
SimpleTest.waitForClipboard(aCond, aSetup, aNext, aNext);
}
}
function validateCutCopy(aExpectedCut, aExpectedCopy) {
if (aNegate) {
aExpectedCut = aExpectedCopy = 0;
} // When we are negating - we always expect callbacks not to be run
is(aExpectedCut, gCutCount,
(aExpectedCut > 0 ? "Expect cut callback to run" : "Expect cut callback not to run") + testLoc());
is(aExpectedCopy, gCopyCount,
(aExpectedCopy > 0 ? "Expect copy callback to run" : "Expect copy callback not to run") + testLoc());
gCutCount = gCopyCount = 0;
}
function step(n) {
function nextStep() { step(n + 1); }
document.querySelector('span').textContent = 'span text';
document.querySelector('input[type=text]').value = 'text text';
document.querySelector('input[type=password]').value = 'password text';
document.querySelector('textarea').value = 'textarea text';
var contentEditableNode = document.querySelector('div[contentEditable=true]');
if (contentEditableNode) {
contentEditableNode.textContent = 'contenteditable text';
}
gTestN2 = n;
switch (n) {
case 0:
// copy on readonly selection
selectNode('span');
waitForClipboard("span text", function() {
aDoCopy(true);
}, nextStep);
return;
case 1:
validateCutCopy(0, 1);
// cut on readonly selection
selectNode('span');
waitForClipboard("span text", function() {
aDoCut(execCommandAlwaysSucceed);
}, nextStep, true);
return;
case 2:
validateCutCopy(1, 0);
// copy on textbox selection
selectInputNode('input[type=text]', nextStep);
return;
case 3:
waitForClipboard("text text", function() {
selectInputNode('input[type=text]', function() { aDoCopy(true); });
}, nextStep);
return;
case 4:
validateCutCopy(0, 1);
// cut on textbox selection
selectInputNode('input[type=text]', nextStep);
return;
case 5:
waitForClipboard("text text", function() {
aDoCut(true);
}, nextStep);
return;
case 6:
validateCutCopy(1, 0);
// copy on password selection
selectInputNode('input[type=password]', nextStep);
return;
case 7:
waitForClipboard(null, function() {
aDoCopy(execCommandAlwaysSucceed);
}, nextStep, true);
return;
case 8:
validateCutCopy(0, 1);
// cut on password selection
selectInputNode('input[type=password]', nextStep);
return;
case 9:
waitForClipboard(null, function() {
aDoCut(execCommandAlwaysSucceed);
}, nextStep, true);
return;
case 10:
validateCutCopy(1, 0);
// copy on textarea selection
selectInputNode('textarea', nextStep);
return;
case 11:
waitForClipboard("textarea text", function() {
aDoCopy(true);
}, nextStep);
return;
case 12:
validateCutCopy(0, 1);
// cut on password selection
selectInputNode('textarea', nextStep);
return;
case 13:
waitForClipboard("textarea text", function() {
aDoCut(true);
}, nextStep);
return;
case 14:
validateCutCopy(1, 0);
// copy on no selection
document.querySelector('textarea').blur();
waitForClipboard(null, function() {
aDoCopy(true);
}, nextStep, true);
return;
case 15:
validateCutCopy(0, 1);
// cut on no selection
waitForClipboard(null, function() {
aDoCut(execCommandAlwaysSucceed);
}, nextStep, true);
return;
case 16:
validateCutCopy(1, 0);
if (!document.querySelector('div[contentEditable=true]')) {
// We're done! (no contentEditable node!)
step(-1);
return;
}
break;
case 17:
// copy on contenteditable selection
waitForClipboard("contenteditable text", function() {
selectNode('div[contentEditable=true]', function() {
aDoCopy(true);
});
}, nextStep);
return;
case 18:
validateCutCopy(0, 1);
break;
case 19:
// cut on contenteditable selection
waitForClipboard("contenteditable text", function() {
selectNode('div[contentEditable=true]', function() {
aDoCut(true);
});
}, nextStep);
return;
case 20:
validateCutCopy(1, 0);
break;
default:
aDone();
return;
}
SimpleTest.executeSoon(function() { step(n + 1); });
}
step(0);
}
function allMechanisms(aCb, aClipOverride, aNegateAll) {
function testStep(n) {
gTestN1 = n;
switch (n) {
case 0:
// Keyboard issued
cutCopyAll(function docut(aSucc) {
synthesizeKey("X", {accelKey: true});
}, function docopy(aSucc) {
synthesizeKey("C", {accelKey: true});
}, function done() { testStep(n + 1); }, false, aClipOverride, aNegateAll);
return;
case 1:
// Button issued
cutCopyAll(function docut(aSucc) {
document.addEventListener('keydown', execCut(aSucc));
synthesizeKey("Q", {});
}, function docopy(aSucc) {
document.addEventListener('keydown', execCopy(aSucc));
synthesizeKey("Q", {});
}, function done() { testStep(n + 1); }, false, aClipOverride, aNegateAll);
return;
case 2:
// Button issued
cutCopyAll(function doCut(aSucc) {
is(false, document.execCommand('cut'), "Can't directly execCommand not in a user callback");
}, function doCopy(aSucc) {
is(false, document.execCommand('copy'), "Can't directly execCommand not in a user callback");
}, function done() { testStep(n + 1); }, true, aClipOverride, aNegateAll);
return;
default:
aCb();
return;
}
SimpleTest.executeSoon(function() { testStep(n + 1); });
}
testStep(0);
}
// Run the tests
SimpleTest.waitForExplicitFinish();
SimpleTest.waitForFocus(function() {
function justCancel(aEvent) {
aEvent.preventDefault();
}
function override(aEvent) {
aEvent.clipboardData.setData('text/plain', 'overridden');
aEvent.preventDefault();
}
allMechanisms(function() {
gTestN0 = 1;
document.addEventListener('cut', override);
document.addEventListener('copy', override);
allMechanisms(function() {
gTestN0 = 2;
document.removeEventListener('cut', override);
document.removeEventListener('copy', override);
document.addEventListener('cut', justCancel);
document.addEventListener('copy', justCancel);
allMechanisms(function() {
SimpleTest.finish();
}, null, true);
}, 'overridden');
});
});

29
dom/tests/mochitest/general/test_bug1012662_editor.html
View File

@ -1,29 +0,0 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=1012662
-->
<head>
<title>Test for Bug 1012662</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/WindowSnapshot.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1012662">Mozilla Bug 1012662</a>
<p id="display"></p>
<div id="content">
<span>span text</span>
<input type="text" value="text text">
<input type="password" value="password text">
<textarea>textarea text</textarea>
<div contentEditable="true">contenteditable text</div>
</div>
<pre id="test">
<script type="application/javascript" src="test_bug1012662_common.js"></script>
</pre>
</body>
</html>

28
dom/tests/mochitest/general/test_bug1012662_noeditor.html
View File

@ -1,28 +0,0 @@
<!DOCTYPE HTML>
<html>
<!--
https://bugzilla.mozilla.org/show_bug.cgi?id=1012662
-->
<head>
<title>Test for Bug 1012662</title>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/EventUtils.js"></script>
<script type="text/javascript" src="/tests/SimpleTest/WindowSnapshot.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
</head>
<body>
<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=1012662">Mozilla Bug 1012662</a>
<p id="display"></p>
<div id="content">
<span>span text</span>
<input type="text" value="text text">
<input type="password" value="password text">
<textarea>textarea text</textarea>
</div>
<pre id="test">
<script type="application/javascript" src="test_bug1012662_common.js"></script>
</pre>
</body>
</html>

45
testing/mochitest/tests/SimpleTest/SimpleTest.js
View File

@ -896,45 +896,19 @@ SimpleTest.waitForClipboard_polls = 0;
* A function called if the expected value isn't found on the clipboard
* within 5s. It can also be called if the known value can't be found.
* @param aFlavor [optional] The flavor to look for. Defaults to "text/unicode".
* @param aTimeout [optional]
* The timeout (in milliseconds) to wait for a clipboard change.
* Defaults to 5000.
* @param aExpectFailure [optional]
* If true, fail if the clipboard contents are modified within the timeout
* interval defined by aTimeout. When aExpectFailure is true, the argument
* aExpectedStringOrValidatorFn must be null, as it won't be used.
* Defaults to false.
*/
SimpleTest.__waitForClipboardMonotonicCounter = 0;
SimpleTest.__defineGetter__("_waitForClipboardMonotonicCounter", function () {
return SimpleTest.__waitForClipboardMonotonicCounter++;
});
SimpleTest.waitForClipboard = function(aExpectedStringOrValidatorFn, aSetupFn,
aSuccessFn, aFailureFn, aFlavor, aTimeout, aExpectFailure) {
aSuccessFn, aFailureFn, aFlavor) {
var requestedFlavor = aFlavor || "text/unicode";
// The known value we put on the clipboard before running aSetupFn
var initialVal = SimpleTest._waitForClipboardMonotonicCounter +
"-waitForClipboard-known-value";
var inputValidatorFn;
if (aExpectFailure) {
// If we expect failure, the aExpectedStringOrValidatorFn should be null
if (aExpectedStringOrValidatorFn !== null) {
SimpleTest.ok(false, "When expecting failure, aExpectedStringOrValidatorFn must be null");
}
inputValidatorFn = function(aData) {
return aData != initialVal;
};
} else {
// Build a default validator function for common string input.
inputValidatorFn = typeof(aExpectedStringOrValidatorFn) == "string"
? function(aData) { return aData == aExpectedStringOrValidatorFn; }
: aExpectedStringOrValidatorFn;
}
var maxPolls = aTimeout ? aTimeout / 100 : 50;
// Build a default validator function for common string input.
var inputValidatorFn = typeof(aExpectedStringOrValidatorFn) == "string"
? function(aData) { return aData == aExpectedStringOrValidatorFn; }
: aExpectedStringOrValidatorFn;
// reset for the next use
function reset() {
@ -942,9 +916,9 @@ SimpleTest.waitForClipboard = function(aExpectedStringOrValidatorFn, aSetupFn,
}
function wait(validatorFn, successFn, failureFn, flavor) {
if (++SimpleTest.waitForClipboard_polls > maxPolls) {
if (++SimpleTest.waitForClipboard_polls > 50) {
// Log the failure.
SimpleTest.ok(aExpectFailure, "Timed out while polling clipboard for pasted data");
SimpleTest.ok(false, "Timed out while polling clipboard for pasted data.");
reset();
failureFn();
return;
@ -957,7 +931,7 @@ SimpleTest.waitForClipboard = function(aExpectedStringOrValidatorFn, aSetupFn,
if (preExpectedVal)
preExpectedVal = null;
else
SimpleTest.ok(!aExpectFailure, "Clipboard has the given value");
SimpleTest.ok(true, "Clipboard has the correct value");
reset();
successFn();
} else {
@ -966,7 +940,8 @@ SimpleTest.waitForClipboard = function(aExpectedStringOrValidatorFn, aSetupFn,
}
// First we wait for a known value different from the expected one.
var preExpectedVal = initialVal;
var preExpectedVal = SimpleTest._waitForClipboardMonotonicCounter +
"-waitForClipboard-known-value";
SpecialPowers.clipboardCopyString(preExpectedVal);
wait(function(aData) { return aData == preExpectedVal; },
function() {