commit c88f6b62986f525fe6cf593dbc888a07c4d590e7
author commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Jun 18 20:18:04 2011 +0000
committer commit-queue@webkit.org <commit-queue@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc> Sat Jun 18 20:18:04 2011 +0000
tree 050e3fd23d5b5efaa099f8d286b7773cef0c824b
parent c3b07335d5966fbad37ad9ff6c4a074d79e7de9d

2011-06-18  Adam Bergkvist  <adam.bergkvist@ericsson.com>

        Reviewed by Tony Gentilcore.

        Media Stream no-interface-object test should not have ReferenceError message in expected results
        https://bugs.webkit.org/show_bug.cgi?id=60391

        Fixed no-interface-object test to not include ReferenceError message in expected results

        * fast/dom/MediaStream/no-interface-object-expected.txt:
        * fast/dom/MediaStream/script-tests/no-interface-object.js:
        (shouldThrowReferenceError):
        (test):

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

LayoutTests/ChangeLog

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index af2ff34..39ea188 100644
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,3 +1,17 @@
+2011-06-18  Adam Bergkvist  <adam.bergkvist@ericsson.com>
+
+        Reviewed by Tony Gentilcore.
+
+        Media Stream no-interface-object test should not have ReferenceError message in expected results
+        https://bugs.webkit.org/show_bug.cgi?id=60391
+
+        Fixed no-interface-object test to not include ReferenceError message in expected results
+
+        * fast/dom/MediaStream/no-interface-object-expected.txt:
+        * fast/dom/MediaStream/script-tests/no-interface-object.js:
+        (shouldThrowReferenceError):
+        (test):
+
 2011-06-18  Jeremy Moskovich  <jeremy@chromium.org>
 
         Reviewed by Eric Seidel.

LayoutTests/fast/dom/MediaStream/no-interface-object-expected.txt

diff --git a/LayoutTests/fast/dom/MediaStream/no-interface-object-expected.txt b/LayoutTests/fast/dom/MediaStream/no-interface-object-expected.txt
index b004275..d3c45ce 100644
--- a/LayoutTests/fast/dom/MediaStream/no-interface-object-expected.txt
+++ b/LayoutTests/fast/dom/MediaStream/no-interface-object-expected.txt
@@ -4,13 +4,13 @@
 
 
 PASS typeof NavigatorUserMedia is "undefined"
-PASS NavigatorUserMedia.prototype threw exception ReferenceError: NavigatorUserMedia is not defined.
+PASS NavigatorUserMedia.prototype threw exception ReferenceError
 PASS typeof NavigatorUserMediaError is "undefined"
-PASS NavigatorUserMediaError.prototype threw exception ReferenceError: NavigatorUserMediaError is not defined.
+PASS NavigatorUserMediaError.prototype threw exception ReferenceError
 PASS typeof NavigatorUserMediaSuccessCallback is "undefined"
-PASS NavigatorUserMediaSuccessCallback.prototype threw exception ReferenceError: NavigatorUserMediaSuccessCallback is not defined.
+PASS NavigatorUserMediaSuccessCallback.prototype threw exception ReferenceError
 PASS typeof NavigatorUserMediaErrorCallback is "undefined"
-PASS NavigatorUserMediaErrorCallback.prototype threw exception ReferenceError: NavigatorUserMediaErrorCallback is not defined.
+PASS NavigatorUserMediaErrorCallback.prototype threw exception ReferenceError
 PASS successfullyParsed is true
 
 TEST COMPLETE

LayoutTests/fast/dom/MediaStream/script-tests/no-interface-object.js

diff --git a/LayoutTests/fast/dom/MediaStream/script-tests/no-interface-object.js b/LayoutTests/fast/dom/MediaStream/script-tests/no-interface-object.js
index 6817f0f..396e56f 100644
--- a/LayoutTests/fast/dom/MediaStream/script-tests/no-interface-object.js
+++ b/LayoutTests/fast/dom/MediaStream/script-tests/no-interface-object.js
@@ -1,9 +1,25 @@
 description("Tests that the following classes are not manipulable by JavaScript (NoInterfaceObject).");
 
+function shouldThrowReferenceError(expr)
+{
+    var e;
+    try {
+        eval(expr);
+    } catch (_e) {
+        e = _e;
+    }
+
+    var msg = expr + (e ? " threw exception " + e.name : " did not throw");
+    if (e && e.name == "ReferenceError")
+        testPassed(msg);
+    else
+        testFailed(msg);
+}
+
 function test(name)
 {
     shouldBe('typeof ' + name, '"undefined"');
-    shouldThrow(name + '.prototype');
+    shouldThrowReferenceError(name + '.prototype');
 }
 
 test('NavigatorUserMedia');