<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[208759] trunk/LayoutTests</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/208759">208759</a></dd>
<dt>Author</dt> <dd>jiewen_tan@apple.com</dd>
<dt>Date</dt> <dd>2016-11-15 14:50:35 -0800 (Tue, 15 Nov 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>js-test-pre.js::shouldReject doesn't need _rejectCallback and _resolveCallback
https://bugs.webkit.org/show_bug.cgi?id=164758
Reviewed by Youenn Fablet.
Since the function returns a promise, it doesn't need _rejectCallback and _resolveCallback.
* crypto/subtle/generate-key-malformed-parameters.html:
* crypto/subtle/rsa-generate-key-malformed-parameters.html:
* crypto/workers/subtle/resources/rsa-generate-key.js:
* crypto/workers/subtle/rsa-generate-key-expected.txt:
* resources/js-test-pre.js:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestscryptosubtlegeneratekeymalformedparametershtml">trunk/LayoutTests/crypto/subtle/generate-key-malformed-parameters.html</a></li>
<li><a href="#trunkLayoutTestscryptosubtlersageneratekeymalformedparametershtml">trunk/LayoutTests/crypto/subtle/rsa-generate-key-malformed-parameters.html</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtleresourcesrsageneratekeyjs">trunk/LayoutTests/crypto/workers/subtle/resources/rsa-generate-key.js</a></li>
<li><a href="#trunkLayoutTestscryptoworkerssubtlersageneratekeyexpectedtxt">trunk/LayoutTests/crypto/workers/subtle/rsa-generate-key-expected.txt</a></li>
<li><a href="#trunkLayoutTestsresourcesjstestprejs">trunk/LayoutTests/resources/js-test-pre.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (208758 => 208759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog        2016-11-15 22:48:01 UTC (rev 208758)
+++ trunk/LayoutTests/ChangeLog        2016-11-15 22:50:35 UTC (rev 208759)
</span><span class="lines">@@ -1,3 +1,18 @@
</span><ins>+2016-11-15 Jiewen Tan <jiewen_tan@apple.com>
+
+ js-test-pre.js::shouldReject doesn't need _rejectCallback and _resolveCallback
+ https://bugs.webkit.org/show_bug.cgi?id=164758
+
+ Reviewed by Youenn Fablet.
+
+ Since the function returns a promise, it doesn't need _rejectCallback and _resolveCallback.
+
+ * crypto/subtle/generate-key-malformed-parameters.html:
+ * crypto/subtle/rsa-generate-key-malformed-parameters.html:
+ * crypto/workers/subtle/resources/rsa-generate-key.js:
+ * crypto/workers/subtle/rsa-generate-key-expected.txt:
+ * resources/js-test-pre.js:
+
</ins><span class="cx"> 2016-11-15 Joseph Pecoraro <pecoraro@apple.com>
</span><span class="cx">
</span><span class="cx"> Web Inspector: inspector/worker/debugger-pause.html fails on WebKit1
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlegeneratekeymalformedparametershtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/generate-key-malformed-parameters.html (208758 => 208759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/generate-key-malformed-parameters.html        2016-11-15 22:48:01 UTC (rev 208758)
+++ trunk/LayoutTests/crypto/subtle/generate-key-malformed-parameters.html        2016-11-15 22:50:35 UTC (rev 208759)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> shouldReject('crypto.subtle.generateKey({name: "AES-CBC", length: 128}, extractable, ["foo"])');
</span><span class="cx"> // Syntax error.
</span><span class="cx"> shouldReject('crypto.subtle.generateKey({name: "AES-CBC", length: 128}, extractable, [ ])');
</span><del>-shouldReject('crypto.subtle.generateKey({name: "RSAES-PKCS1-v1_5", modulusLength: 2048, publicExponent: new Uint8Array([0x01, 0x00, 0x01])}, extractable, [ ])', finishJSTest);
</del><ins>+shouldReject('crypto.subtle.generateKey({name: "RSAES-PKCS1-v1_5", modulusLength: 2048, publicExponent: new Uint8Array([0x01, 0x00, 0x01])}, extractable, [ ])').then(finishJSTest);
</ins><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestscryptosubtlersageneratekeymalformedparametershtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/subtle/rsa-generate-key-malformed-parameters.html (208758 => 208759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/subtle/rsa-generate-key-malformed-parameters.html        2016-11-15 22:48:01 UTC (rev 208758)
+++ trunk/LayoutTests/crypto/subtle/rsa-generate-key-malformed-parameters.html        2016-11-15 22:50:35 UTC (rev 208759)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> shouldReject('crypto.subtle.generateKey({name: "RSA-OAEP", modulusLength: 2048, publicExponent: publicExponent, hash: "sha-1"}, extractable, ["deriveKey"])');
</span><span class="cx"> shouldReject('crypto.subtle.generateKey({name: "RSA-OAEP", modulusLength: 2048, publicExponent: publicExponent, hash: "sha-1"}, extractable, ["deriveBits"])');
</span><span class="cx"> // modulusLength = 0
</span><del>-shouldReject('crypto.subtle.generateKey({name: "RSASSA-PKCS1-v1_5", modulusLength: 0, publicExponent: publicExponent, hash: "sha-1"}, extractable, ["sign", "verify"])', finishJSTest);
</del><ins>+shouldReject('crypto.subtle.generateKey({name: "RSASSA-PKCS1-v1_5", modulusLength: 0, publicExponent: publicExponent, hash: "sha-1"}, extractable, ["sign", "verify"])').then(finishJSTest);
</ins><span class="cx"> </script>
</span><span class="cx">
</span><span class="cx"> <script src="../../resources/js-test-post.js"></script>
</span></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtleresourcesrsageneratekeyjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/workers/subtle/resources/rsa-generate-key.js (208758 => 208759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/resources/rsa-generate-key.js        2016-11-15 22:48:01 UTC (rev 208758)
+++ trunk/LayoutTests/crypto/workers/subtle/resources/rsa-generate-key.js        2016-11-15 22:50:35 UTC (rev 208759)
</span><span class="lines">@@ -7,19 +7,11 @@
</span><span class="cx"> var extractable = true;
</span><span class="cx"> var publicExponent = new Uint8Array([0x01, 0x00, 0x01]);
</span><span class="cx">
</span><del>-var count = 0;
-function finishTest()
-{
- count = count + 1;
- if (count == 2)
- finishJSTest();
-}
-
</del><span class="cx"> shouldReject('crypto.subtle.generateKey({name: "RSA-OAEP", modulusLength: 2048, publicExponent: publicExponent, hash: "sha-1"}, extractable, ["sign"])');
</span><del>-shouldReject('crypto.subtle.generateKey({name: "RSASSA-PKCS1-v1_5", modulusLength: 0, publicExponent: publicExponent, hash: "sha-1"}, extractable, ["sign", "verify"])', finishTest);
-
-debug("Generating a key...");
-crypto.subtle.generateKey({name: "RSA-OAEP", modulusLength: 2048, publicExponent: publicExponent, hash: 'sha-1'}, extractable, ["decrypt", "encrypt", "wrapKey", "unwrapKey"]).then(function(result) {
</del><ins>+shouldReject('crypto.subtle.generateKey({name: "RSASSA-PKCS1-v1_5", modulusLength: 0, publicExponent: publicExponent, hash: "sha-1"}, extractable, ["sign", "verify"])').then(function() {
+ debug("Generating a key...");
+ return crypto.subtle.generateKey({name: "RSA-OAEP", modulusLength: 2048, publicExponent: publicExponent, hash: 'sha-1'}, extractable, ["decrypt", "encrypt", "wrapKey", "unwrapKey"]);
+}).then(function(result) {
</ins><span class="cx"> keyPair = result;
</span><span class="cx"> shouldBe("keyPair.toString()", "'[object CryptoKeyPair]'");
</span><span class="cx"> shouldBe("keyPair.publicKey.type", "'public'");
</span><span class="lines">@@ -37,5 +29,5 @@
</span><span class="cx"> shouldBe("keyPair.privateKey.algorithm.hash.name", "'SHA-1'");
</span><span class="cx"> shouldBe("keyPair.privateKey.usages", "['decrypt', 'unwrapKey']");
</span><span class="cx">
</span><del>- finishTest();
</del><ins>+ finishJSTest();
</ins><span class="cx"> });
</span></span></pre></div>
<a id="trunkLayoutTestscryptoworkerssubtlersageneratekeyexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/crypto/workers/subtle/rsa-generate-key-expected.txt (208758 => 208759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/crypto/workers/subtle/rsa-generate-key-expected.txt        2016-11-15 22:48:01 UTC (rev 208758)
+++ trunk/LayoutTests/crypto/workers/subtle/rsa-generate-key-expected.txt        2016-11-15 22:50:35 UTC (rev 208759)
</span><span class="lines">@@ -4,9 +4,9 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> Starting worker: resources/rsa-generate-key.js
</span><del>-[Worker] Generating a key...
</del><span class="cx"> PASS [Worker] crypto.subtle.generateKey({name: "RSA-OAEP", modulusLength: 2048, publicExponent: publicExponent, hash: "sha-1"}, extractable, ["sign"]) rejected promise with SyntaxError (DOM Exception 12): A required parameter was missing or out-of-range.
</span><span class="cx"> PASS [Worker] crypto.subtle.generateKey({name: "RSASSA-PKCS1-v1_5", modulusLength: 0, publicExponent: publicExponent, hash: "sha-1"}, extractable, ["sign", "verify"]) rejected promise with OperationError (DOM Exception 34): The operation failed for an operation-specific reason.
</span><ins>+[Worker] Generating a key...
</ins><span class="cx"> PASS [Worker] keyPair.toString() is '[object CryptoKeyPair]'
</span><span class="cx"> PASS [Worker] keyPair.publicKey.type is 'public'
</span><span class="cx"> PASS [Worker] keyPair.publicKey.extractable is true
</span></span></pre></div>
<a id="trunkLayoutTestsresourcesjstestprejs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/resources/js-test-pre.js (208758 => 208759)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/resources/js-test-pre.js        2016-11-15 22:48:01 UTC (rev 208758)
+++ trunk/LayoutTests/resources/js-test-pre.js        2016-11-15 22:50:35 UTC (rev 208759)
</span><span class="lines">@@ -633,7 +633,7 @@
</span><span class="cx"> testFailed((_message ? _message : _a) + " should throw " + (typeof _e == "undefined" ? "an exception" : _ev) + ". Was " + _av + ".");
</span><span class="cx"> }
</span><span class="cx">
</span><del>-function shouldReject(_a, _rejectCallback, _resolveCallback, _message)
</del><ins>+function shouldReject(_a, _message)
</ins><span class="cx"> {
</span><span class="cx"> var _exception;
</span><span class="cx"> var _av;
</span><span class="lines">@@ -646,12 +646,8 @@
</span><span class="cx">
</span><span class="cx"> return _av.then(function(result) {
</span><span class="cx"> testFailed((_message ? _message : _a) + " should reject promise. Resolved with " + result + ".");
</span><del>- if (typeof _resolveCallback == "function")
- _resolveCallback();
</del><span class="cx"> }, function(error) {
</span><span class="cx"> testPassed((_message ? _message : _a) + " rejected promise with " + error + ".");
</span><del>- if (typeof _rejectCallback == "function")
- _rejectCallback();
</del><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>