This test is testing the argument handling behavior of this API. Now

that we autogenerate this code, we now throw consistent exceptions with
the rest of the platform.  There shouldn't be a compat issue here
because this API hasn't shipped in production releases yet.

* fast/dom/MediaStream/argument-types-expected.txt:
* fast/dom/MediaStream/script-tests/argument-types.js:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@107540 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 508329b..9f2ecc0 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,13 @@
+2012-02-13  Adam Barth  <abarth@webkit.org>
+
+        This test is testing the argument handling behavior of this API.  Now
+        that we autogenerate this code, we now throw consistent exceptions with
+        the rest of the platform.  There shouldn't be a compat issue here
+        because this API hasn't shipped in production releases yet.
+
+        * fast/dom/MediaStream/argument-types-expected.txt:
+        * fast/dom/MediaStream/script-tests/argument-types.js:
+
 2012-02-13  Kangil Han  <kangil.han@samsung.com>
 
         [EFL][DRT] Add new expected layout results come from bug 78091.

diff --git a/LayoutTests/fast/dom/MediaStream/argument-types-expected.txt b/LayoutTests/fast/dom/MediaStream/argument-types-expected.txt
index 407288e..831201a 100644 (file)
--- a/LayoutTests/fast/dom/MediaStream/argument-types-expected.txt
+++ b/LayoutTests/fast/dom/MediaStream/argument-types-expected.txt
@@ -3,17 +3,17 @@ Tests the acceptable types for arguments to navigator.getUserMedia methods.
 On success, you will see a series of "PASS" messages, followed by "TEST COMPLETE".
 
 
-PASS navigator.webkitGetUserMedia() threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.webkitGetUserMedia(undefined) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.webkitGetUserMedia(null) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.webkitGetUserMedia({}) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.webkitGetUserMedia(objectThrowingException) threw exception Error: toString threw exception.
-PASS navigator.webkitGetUserMedia("video") threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.webkitGetUserMedia(true) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.webkitGetUserMedia(42) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.webkitGetUserMedia(Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.webkitGetUserMedia(-Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.webkitGetUserMedia(emptyFunction) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS navigator.webkitGetUserMedia() threw exception TypeError: Not enough arguments.
+PASS navigator.webkitGetUserMedia(undefined) threw exception TypeError: Not enough arguments.
+PASS navigator.webkitGetUserMedia(null) threw exception TypeError: Not enough arguments.
+PASS navigator.webkitGetUserMedia({}) threw exception TypeError: Not enough arguments.
+PASS navigator.webkitGetUserMedia(objectThrowingException) threw exception TypeError: Not enough arguments.
+PASS navigator.webkitGetUserMedia("video") threw exception TypeError: Not enough arguments.
+PASS navigator.webkitGetUserMedia(true) threw exception TypeError: Not enough arguments.
+PASS navigator.webkitGetUserMedia(42) threw exception TypeError: Not enough arguments.
+PASS navigator.webkitGetUserMedia(Infinity) threw exception TypeError: Not enough arguments.
+PASS navigator.webkitGetUserMedia(-Infinity) threw exception TypeError: Not enough arguments.
+PASS navigator.webkitGetUserMedia(emptyFunction) threw exception TypeError: Not enough arguments.
 PASS navigator.webkitGetUserMedia("video", emptyFunction) did not throw exception.
 PASS navigator.webkitGetUserMedia(undefined, emptyFunction) threw exception Error: NOT_SUPPORTED_ERR: DOM Exception 9.
 PASS navigator.webkitGetUserMedia(null, emptyFunction) threw exception Error: NOT_SUPPORTED_ERR: DOM Exception 9.
@@ -27,8 +27,8 @@ PASS navigator.webkitGetUserMedia(emptyFunction, emptyFunction) threw exception
 PASS navigator.webkitGetUserMedia("video", "video") threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
 PASS navigator.webkitGetUserMedia("video", undefined) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
 PASS navigator.webkitGetUserMedia("video", null) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.webkitGetUserMedia("video", {}) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.webkitGetUserMedia("video", objectThrowingException) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS navigator.webkitGetUserMedia("video", {}) did not throw exception.
+PASS navigator.webkitGetUserMedia("video", objectThrowingException) did not throw exception.
 PASS navigator.webkitGetUserMedia("video", true) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
 PASS navigator.webkitGetUserMedia("video", 42) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
 PASS navigator.webkitGetUserMedia("video", Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
@@ -40,9 +40,9 @@ PASS navigator.webkitGetUserMedia("audio, somethingelse,,video", emptyFunction,
 PASS navigator.webkitGetUserMedia("audio, video user", emptyFunction, undefined) did not throw exception.
 PASS navigator.webkitGetUserMedia("audio, video environment", emptyFunction, undefined) did not throw exception.
 PASS navigator.webkitGetUserMedia("video", emptyFunction, "video") threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.webkitGetUserMedia("video", emptyFunction, null) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.webkitGetUserMedia("video", emptyFunction, {}) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
-PASS navigator.webkitGetUserMedia("video", emptyFunction, objectThrowingException) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
+PASS navigator.webkitGetUserMedia("video", emptyFunction, null) did not throw exception.
+PASS navigator.webkitGetUserMedia("video", emptyFunction, {}) did not throw exception.
+PASS navigator.webkitGetUserMedia("video", emptyFunction, objectThrowingException) did not throw exception.
 PASS navigator.webkitGetUserMedia("video", emptyFunction, true) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
 PASS navigator.webkitGetUserMedia("video", emptyFunction, 42) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.
 PASS navigator.webkitGetUserMedia("video", emptyFunction, Infinity) threw exception Error: TYPE_MISMATCH_ERR: DOM Exception 17.

diff --git a/LayoutTests/fast/dom/MediaStream/script-tests/argument-types.js b/LayoutTests/fast/dom/MediaStream/script-tests/argument-types.js
index 20a9a1d..b8105d4 100644 (file)
--- a/LayoutTests/fast/dom/MediaStream/script-tests/argument-types.js
+++ b/LayoutTests/fast/dom/MediaStream/script-tests/argument-types.js
@@ -15,7 +15,7 @@ function test(expression, expressionShouldThrow, expectedException) {
         if (expectedException)
             shouldThrow(expression, '(function() { return "' + expectedException + '"; })();');
         else
-            shouldThrow(expression, '(function() { return "Error: TYPE_MISMATCH_ERR: DOM Exception 17"; })();');
+            shouldThrow(expression, '(function() { return "TypeError: Not enough arguments"; })();');
     } else {
         shouldNotThrow(expression);
     }
@@ -23,6 +23,7 @@ function test(expression, expressionShouldThrow, expectedException) {
 
 var toStringError = new Error('toString threw exception');
 var notSupportedError = new Error('NOT_SUPPORTED_ERR: DOM Exception 9');
+var typeMismatchError = new Error('TYPE_MISMATCH_ERR: DOM Exception 17');
 var emptyFunction = function() {};
 
 function ObjectThrowingException() {};
@@ -38,7 +39,7 @@ test('navigator.webkitGetUserMedia()', true);
 test('navigator.webkitGetUserMedia(undefined)', true);
 test('navigator.webkitGetUserMedia(null)', true);
 test('navigator.webkitGetUserMedia({})', true);
-test('navigator.webkitGetUserMedia(objectThrowingException)', true, toStringError);
+test('navigator.webkitGetUserMedia(objectThrowingException)', true);
 test('navigator.webkitGetUserMedia("video")', true);
 test('navigator.webkitGetUserMedia(true)', true);
 test('navigator.webkitGetUserMedia(42)', true);
@@ -58,15 +59,15 @@ test('navigator.webkitGetUserMedia(Infinity, emptyFunction)', true, notSupported
 test('navigator.webkitGetUserMedia(-Infinity, emptyFunction)', true, notSupportedError);
 test('navigator.webkitGetUserMedia(emptyFunction, emptyFunction)', true, notSupportedError);
 
-test('navigator.webkitGetUserMedia("video", "video")', true);
-test('navigator.webkitGetUserMedia("video", undefined)', true);
-test('navigator.webkitGetUserMedia("video", null)', true);
-test('navigator.webkitGetUserMedia("video", {})', true);
-test('navigator.webkitGetUserMedia("video", objectThrowingException)', true);
-test('navigator.webkitGetUserMedia("video", true)', true);
-test('navigator.webkitGetUserMedia("video", 42)', true);
-test('navigator.webkitGetUserMedia("video", Infinity)', true);
-test('navigator.webkitGetUserMedia("video", -Infinity)', true);
+test('navigator.webkitGetUserMedia("video", "video")', true, typeMismatchError);
+test('navigator.webkitGetUserMedia("video", undefined)', true, typeMismatchError);
+test('navigator.webkitGetUserMedia("video", null)', true, typeMismatchError);
+test('navigator.webkitGetUserMedia("video", {})', false);
+test('navigator.webkitGetUserMedia("video", objectThrowingException)', false);
+test('navigator.webkitGetUserMedia("video", true)', true, typeMismatchError);
+test('navigator.webkitGetUserMedia("video", 42)', true, typeMismatchError);
+test('navigator.webkitGetUserMedia("video", Infinity)', true, typeMismatchError);
+test('navigator.webkitGetUserMedia("video", -Infinity)', true, typeMismatchError);
 
 // 3 Arguments.
 test('navigator.webkitGetUserMedia("video", emptyFunction, emptyFunction)', false);
@@ -75,13 +76,13 @@ test('navigator.webkitGetUserMedia("audio, video", emptyFunction, undefined)', f
 test('navigator.webkitGetUserMedia("audio, somethingelse,,video", emptyFunction, undefined)', false);
 test('navigator.webkitGetUserMedia("audio, video user", emptyFunction, undefined)', false);
 test('navigator.webkitGetUserMedia("audio, video environment", emptyFunction, undefined)', false);
-test('navigator.webkitGetUserMedia("video", emptyFunction, "video")', true);
-test('navigator.webkitGetUserMedia("video", emptyFunction, null)', true);
-test('navigator.webkitGetUserMedia("video", emptyFunction, {})', true);
-test('navigator.webkitGetUserMedia("video", emptyFunction, objectThrowingException)', true);
-test('navigator.webkitGetUserMedia("video", emptyFunction, true)', true);
-test('navigator.webkitGetUserMedia("video", emptyFunction, 42)', true);
-test('navigator.webkitGetUserMedia("video", emptyFunction, Infinity)', true);
-test('navigator.webkitGetUserMedia("video", emptyFunction, -Infinity)', true);
+test('navigator.webkitGetUserMedia("video", emptyFunction, "video")', true, typeMismatchError);
+test('navigator.webkitGetUserMedia("video", emptyFunction, null)', false );
+test('navigator.webkitGetUserMedia("video", emptyFunction, {})', false);
+test('navigator.webkitGetUserMedia("video", emptyFunction, objectThrowingException)', false);
+test('navigator.webkitGetUserMedia("video", emptyFunction, true)', true, typeMismatchError);
+test('navigator.webkitGetUserMedia("video", emptyFunction, 42)', true, typeMismatchError);
+test('navigator.webkitGetUserMedia("video", emptyFunction, Infinity)', true, typeMismatchError);
+test('navigator.webkitGetUserMedia("video", emptyFunction, -Infinity)', true, typeMismatchError);
 
 window.jsTestIsAsync = false;