Upstream version 7.36.149.0

[platform/framework/web/crosswalk.git] / src / third_party / WebKit / LayoutTests / crypto / aes-cbc-generateKey-parseAlgorithm-failures.html

diff --git a/src/third_party/WebKit/LayoutTests/crypto/aes-cbc-generateKey-parseAlgorithm-failures.html b/src/third_party/WebKit/LayoutTests/crypto/aes-cbc-generateKey-parseAlgorithm-failures.html
index bbc16d3..ef0b91d 100644 (file)
--- a/src/third_party/WebKit/LayoutTests/crypto/aes-cbc-generateKey-parseAlgorithm-failures.html
+++ b/src/third_party/WebKit/LayoutTests/crypto/aes-cbc-generateKey-parseAlgorithm-failures.html
@@ -15,36 +15,37 @@ jsTestIsAsync = true;
 extractable = true;
 keyUsages = ['encrypt', 'decrypt'];
 
-// Invalid keyUsages
-shouldThrow("crypto.subtle.generateKey({ name: 'aes-cbc', length: 1024 }, extractable, -1)");
-shouldThrow("crypto.subtle.generateKey({ name: 'aes-cbc', length: 1024 }, extractable, null)");
-
 Promise.resolve(null).then(function() {
+    // Invalid keyUsages
+    return crypto.subtle.generateKey({ name: 'aes-cbc', length: 1024 }, extractable, -1);
+}).then(failAndFinishJSTest, function(result) {
+    logError(result);
+
+    // Invalid keyUsages
+    return crypto.subtle.generateKey({ name: 'aes-cbc', length: 1024 }, extractable, null);
+}).then(failAndFinishJSTest, function(result) {
+    logError(result);
+
     // Bad key usage "boo".
     return crypto.subtle.generateKey({ name: 'aes-cbc', length: 1024 }, extractable, ['boo']);
 }).then(failAndFinishJSTest, function(result) {
-    error = result;
-    shouldBeNull("error");
+    logError(result);
 
     return crypto.subtle.generateKey({ name: 'aes-cbc' }, extractable, keyUsages);
 }).then(failAndFinishJSTest, function(result) {
-    error = result;
-    shouldBeNull("error");
+    logError(result);
 
     return crypto.subtle.generateKey({ name: 'aes-cbc', length: 70000 }, extractable, keyUsages);
 }).then(failAndFinishJSTest, function(result) {
-    error = result;
-    shouldBeNull("error");
+    logError(result);
 
     return crypto.subtle.generateKey({ name: 'aes-cbc', length: -3 }, extractable, keyUsages);
 }).then(failAndFinishJSTest, function(result) {
-    error = result;
-    shouldBeNull("error");
+    logError(result);
 
     return crypto.subtle.generateKey({ name: 'aes-cbc', length: -Infinity }, extractable, keyUsages);
 }).then(failAndFinishJSTest, function(result) {
-    error = result;
-    shouldBeNull("error");
+    logError(result);
 }).then(finishJSTest, failAndFinishJSTest);
 
 </script>