Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(89)

Unified Diff: LayoutTests/crypto/aes-ctr-generateKey-parseAlgorithm-failures.html

Issue 215153005: [refactor] Split up generateKey.html into multiple files, and test errors directly. (Closed) Base URL: svn://svn.chromium.org/blink/trunk
Patch Set: Re-upload with --similarity=20 Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: LayoutTests/crypto/aes-ctr-generateKey-parseAlgorithm-failures.html
diff --git a/LayoutTests/crypto/exportKey-badParameters.html b/LayoutTests/crypto/aes-ctr-generateKey-parseAlgorithm-failures.html
similarity index 45%
copy from LayoutTests/crypto/exportKey-badParameters.html
copy to LayoutTests/crypto/aes-ctr-generateKey-parseAlgorithm-failures.html
index 638d8b47b5768c74ed29cbbcb8805ff839957756..f0c38f89061c1702003a72a544f1287b2b0fba4c 100644
--- a/LayoutTests/crypto/exportKey-badParameters.html
+++ b/LayoutTests/crypto/aes-ctr-generateKey-parseAlgorithm-failures.html
@@ -9,41 +9,29 @@
<div id="console"></div>
<script>
-description("Tests exportKey() given bad inputs.");
-
+description("Tests generateKey() with bad AES-CTR parameters.");
jsTestIsAsync = true;
-// Not keys
-shouldThrow("crypto.subtle.exportKey('raw', null)");
-shouldThrow("crypto.subtle.exportKey('raw', 3)");
-
-function importAesKey()
-{
- var keyData = new Uint8Array(16);
- var usages = ['encrypt'];
- var extractable = true;
- var algorithm = {name: 'aes-cbc'};
-
- return crypto.subtle.importKey('raw', keyData, algorithm, extractable, usages);
-}
+extractable = true;
+keyUsages = ['encrypt', 'decrypt'];
-importAesKey().then(function(result) {
- key = result;
+Promise.resolve(null).then(function() {
+ return crypto.subtle.generateKey({ name: 'aes-ctr' }, extractable, keyUsages);
+}).then(failAndFinishJSTest, function(result) {
+ error = result;
+ shouldBeNull("error");
- // Invalid export format
- return crypto.subtle.exportKey(3, key);
+ return crypto.subtle.generateKey({ name: 'aes-ctr', length: 70000 }, extractable, keyUsages);
}).then(failAndFinishJSTest, function(result) {
error = result;
shouldBeNull("error");
- // Invalid export format
- return crypto.subtle.exportKey(null, key);
+ return crypto.subtle.generateKey({ name: 'aes-ctr', length: -3 }, extractable, keyUsages);
}).then(failAndFinishJSTest, function(result) {
error = result;
shouldBeNull("error");
- // Invalid export format
- return crypto.subtle.exportKey('invalid', key);
+ return crypto.subtle.generateKey({ name: 'aes-ctr', length: -Infinity }, extractable, keyUsages);
}).then(failAndFinishJSTest, function(result) {
error = result;
shouldBeNull("error");

Powered by Google App Engine
This is Rietveld 408576698