<!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>[164941] 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/164941">164941</a></dd>
<dt>Author</dt> <dd>thiago.lacerda@openbossa.org</dd>
<dt>Date</dt> <dd>2014-03-02 07:36:53 -0800 (Sun, 02 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Updating some WebRTC and MediaStream LayoutTests
https://bugs.webkit.org/show_bug.cgi?id=129442
Reviewed by Eric Carlson.
Due to changes in JavaScriptCore (in <a href="http://trac.webkit.org/projects/webkit/changeset/163562">r163562</a>), some LayoutTests in fast/mediastream needed to be updated:
- MediaStreamTrack.html: checking hasOwnProperty in __proto__ as well, until CustomGetter properties are
moved to the prototype chain.
- RTCIceCandidate.html and RTCSessionDescription.html: JSON.stringify are not considering properties in
__proto__, so remove this for now.
* fast/mediastream/MediaStreamTrack-expected.txt:
* fast/mediastream/MediaStreamTrack.html:
* fast/mediastream/RTCIceCandidate-expected.txt:
* fast/mediastream/RTCIceCandidate.html:
* fast/mediastream/RTCPeerConnection-have-local-answer.html: Removed. Other tests already test what this one was
testing
* fast/mediastream/RTCSessionDescription-expected.txt:
* fast/mediastream/RTCSessionDescription.html:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamTrackexpectedtxt">trunk/LayoutTests/fast/mediastream/MediaStreamTrack-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamMediaStreamTrackhtml">trunk/LayoutTests/fast/mediastream/MediaStreamTrack.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCIceCandidateexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCIceCandidatehtml">trunk/LayoutTests/fast/mediastream/RTCIceCandidate.html</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCSessionDescriptionexpectedtxt">trunk/LayoutTests/fast/mediastream/RTCSessionDescription-expected.txt</a></li>
<li><a href="#trunkLayoutTestsfastmediastreamRTCSessionDescriptionhtml">trunk/LayoutTests/fast/mediastream/RTCSessionDescription.html</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsfastmediastreamRTCPeerConnectionhavelocalanswerhtml">trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-local-answer.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (164940 => 164941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2014-03-02 14:59:47 UTC (rev 164940)
+++ trunk/LayoutTests/ChangeLog 2014-03-02 15:36:53 UTC (rev 164941)
</span><span class="lines">@@ -1,3 +1,25 @@
</span><ins>+2014-03-02 Thiago de Barros Lacerda <thiago.lacerda@openbossa.org>
+
+ Updating some WebRTC and MediaStream LayoutTests
+ https://bugs.webkit.org/show_bug.cgi?id=129442
+
+ Reviewed by Eric Carlson.
+
+ Due to changes in JavaScriptCore (in r163562), some LayoutTests in fast/mediastream needed to be updated:
+ - MediaStreamTrack.html: checking hasOwnProperty in __proto__ as well, until CustomGetter properties are
+ moved to the prototype chain.
+ - RTCIceCandidate.html and RTCSessionDescription.html: JSON.stringify are not considering properties in
+ __proto__, so remove this for now.
+
+ * fast/mediastream/MediaStreamTrack-expected.txt:
+ * fast/mediastream/MediaStreamTrack.html:
+ * fast/mediastream/RTCIceCandidate-expected.txt:
+ * fast/mediastream/RTCIceCandidate.html:
+ * fast/mediastream/RTCPeerConnection-have-local-answer.html: Removed. Other tests already test what this one was
+ testing
+ * fast/mediastream/RTCSessionDescription-expected.txt:
+ * fast/mediastream/RTCSessionDescription.html:
+
</ins><span class="cx"> 2014-03-01 Commit Queue <commit-queue@webkit.org>
</span><span class="cx">
</span><span class="cx"> Unreviewed, rolling out r164929 and r164934.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamTrackexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStreamTrack-expected.txt (164940 => 164941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStreamTrack-expected.txt 2014-03-02 14:59:47 UTC (rev 164940)
+++ trunk/LayoutTests/fast/mediastream/MediaStreamTrack-expected.txt 2014-03-02 15:36:53 UTC (rev 164941)
</span><span class="lines">@@ -37,12 +37,12 @@
</span><span class="cx"> PASS states.sourceType is "camera"
</span><span class="cx"> states.volume = undefined
</span><span class="cx"> states.width = 1920
</span><del>- states.sourceId = 239c24b0-2b15-11e3-8224-0800200c9a66
</del><ins>+ states.aspectRatio = 1.78
</ins><span class="cx"> states.height = 1080
</span><del>- states.sourceType = camera
</del><span class="cx"> states.facingMode = user
</span><span class="cx"> states.frameRate = 30
</span><del>- states.aspectRatio = 1.78
</del><ins>+ states.sourceType = camera
+ states.sourceId = 239c24b0-2b15-11e3-8224-0800200c9a66
</ins><span class="cx">
</span><span class="cx"> audioTrack = mediaStream.getAudioTracks()[0]
</span><span class="cx"> PASS track.readyState is "live"
</span><span class="lines">@@ -58,12 +58,12 @@
</span><span class="cx"> PASS states.sourceType is "microphone"
</span><span class="cx"> states.volume = 50
</span><span class="cx"> states.width = undefined
</span><del>- states.sourceId = 239c24b1-2b15-11e3-8224-0800200c9a66
</del><ins>+ states.aspectRatio = undefined
</ins><span class="cx"> states.height = undefined
</span><del>- states.sourceType = microphone
</del><span class="cx"> states.facingMode = undefined
</span><span class="cx"> states.frameRate = undefined
</span><del>- states.aspectRatio = undefined
</del><ins>+ states.sourceType = microphone
+ states.sourceId = 239c24b1-2b15-11e3-8224-0800200c9a66
</ins><span class="cx">
</span><span class="cx"> videoTrack2 = videoTrack.clone()
</span><span class="cx"> PASS track.readyState is "live"
</span><span class="lines">@@ -97,12 +97,12 @@
</span><span class="cx"> PASS states.sourceType is "camera"
</span><span class="cx"> states.volume = undefined
</span><span class="cx"> states.width = 1920
</span><del>- states.sourceId = 239c24b0-2b15-11e3-8224-0800200c9a66
</del><ins>+ states.aspectRatio = 1.78
</ins><span class="cx"> states.height = 1080
</span><del>- states.sourceType = camera
</del><span class="cx"> states.facingMode = user
</span><span class="cx"> states.frameRate = 30
</span><del>- states.aspectRatio = 1.78
</del><ins>+ states.sourceType = camera
+ states.sourceId = 239c24b0-2b15-11e3-8224-0800200c9a66
</ins><span class="cx"> PASS videoTrack.id is not videoTrack2.id
</span><span class="cx"> PASS videoTrack.kind is videoTrack2.kind
</span><span class="cx"> PASS videoTrack.label is videoTrack2.label
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamMediaStreamTrackhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/MediaStreamTrack.html (164940 => 164941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/MediaStreamTrack.html 2014-03-02 14:59:47 UTC (rev 164940)
+++ trunk/LayoutTests/fast/mediastream/MediaStreamTrack.html 2014-03-02 15:36:53 UTC (rev 164941)
</span><span class="lines">@@ -108,7 +108,10 @@
</span><span class="cx"> else
</span><span class="cx"> shouldBeEqualToString('states.sourceType', 'microphone');
</span><span class="cx"> for (var property in states) {
</span><del>- if (states.hasOwnProperty(property))
</del><ins>+ // When https://webkit.org/b/129375 is fixed, we have to remove
+ // states.hasOwnProperty(property), because all the attributes
+ // will be in the prototype chain.
+ if (states.hasOwnProperty(property) || states.__proto__.hasOwnProperty(property))
</ins><span class="cx"> debug(" states." + property + " = " + limitPrecision(states[property], 2));
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCIceCandidateexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt (164940 => 164941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt 2014-03-02 14:59:47 UTC (rev 164940)
+++ trunk/LayoutTests/fast/mediastream/RTCIceCandidate-expected.txt 2014-03-02 15:36:53 UTC (rev 164941)
</span><span class="lines">@@ -7,11 +7,6 @@
</span><span class="cx"> PASS candidate.candidate is "foo"
</span><span class="cx"> PASS candidate.sdpMid is "bar"
</span><span class="cx"> PASS candidate.sdpMLineIndex is 6
</span><del>-PASS initializer = JSON.parse(JSON.stringify(candidate)); did not throw exception.
-PASS candidate = new RTCIceCandidate(initializer); did not throw exception.
-PASS candidate.candidate is "foo"
-PASS candidate.sdpMid is "bar"
-PASS candidate.sdpMLineIndex is 6
</del><span class="cx"> PASS new RTCIceCandidate({}); did not throw exception.
</span><span class="cx"> PASS new RTCIceCandidate({candidate:"foo"}); did not throw exception.
</span><span class="cx"> PASS new RTCIceCandidate({sdpMid:"bar"}); did not throw exception.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCIceCandidatehtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCIceCandidate.html (164940 => 164941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCIceCandidate.html 2014-03-02 14:59:47 UTC (rev 164940)
+++ trunk/LayoutTests/fast/mediastream/RTCIceCandidate.html 2014-03-02 15:36:53 UTC (rev 164941)
</span><span class="lines">@@ -16,13 +16,6 @@
</span><span class="cx"> shouldBe('candidate.sdpMid', '"bar"');
</span><span class="cx"> shouldBe('candidate.sdpMLineIndex', '6');
</span><span class="cx">
</span><del>- shouldNotThrow('initializer = JSON.parse(JSON.stringify(candidate));');
-
- shouldNotThrow('candidate = new RTCIceCandidate(initializer);');
- shouldBe('candidate.candidate', '"foo"');
- shouldBe('candidate.sdpMid', '"bar"');
- shouldBe('candidate.sdpMLineIndex', '6');
-
</del><span class="cx"> shouldNotThrow('new RTCIceCandidate({});');
</span><span class="cx"> shouldNotThrow('new RTCIceCandidate({candidate:"foo"});');
</span><span class="cx"> shouldNotThrow('new RTCIceCandidate({sdpMid:"bar"});');
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCPeerConnectionhavelocalanswerhtml"></a>
<div class="delfile"><h4>Deleted: trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-local-answer.html (164940 => 164941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-local-answer.html 2014-03-02 14:59:47 UTC (rev 164940)
+++ trunk/LayoutTests/fast/mediastream/RTCPeerConnection-have-local-answer.html 2014-03-02 15:36:53 UTC (rev 164941)
</span><span class="lines">@@ -1,102 +0,0 @@
</span><del>-<!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
-<html>
- <head>
- <script src="../../resources/js-test-pre.js"></script>
- </head>
- <body>
- <script>
- description("Tests RTCPeerConnection remoteDescription.");
-
- var pc = null;
-
- function requestFailed4(reason)
- {
- errorReason = reason;
- testPassed('setRemoteDescription failed.');
- shouldBe('errorReason.name', '"InvalidSessionDescriptionError"');
- check("pranswer", "local", "offer", "remote", '"have-local-pranswer"');
- finishJSTest();
- }
-
- function requestFailed3(reason)
- {
- errorReason = reason;
- testPassed('setRemoteDescription failed.');
- shouldBe('errorReason.name', '"InvalidSessionDescriptionError"');
- check("pranswer", "local", "offer", "remote", '"have-local-pranswer"');
- sessionDescription = new RTCSessionDescription({type:"pranswer", sdp:"remote"});
- shouldNotThrow('pc.setRemoteDescription(sessionDescription, finishIfSucceeded, requestFailed4);');
- }
-
- function requestFailed2(reason)
- {
- errorReason = reason;
- testPassed('setRemoteDescription failed.');
- shouldBe('errorReason.name', '"InvalidSessionDescriptionError"');
- check("pranswer", "local", "offer", "remote", '"have-local-pranswer"');
- sessionDescription = new RTCSessionDescription({type:"answer", sdp:"remote"});
- shouldNotThrow('pc.setRemoteDescription(sessionDescription, finishIfSucceeded, requestFailed3);');
- }
-
- function requestFailed1(reason)
- {
- errorReason = reason;
- testPassed('setRemoteDescription failed.');
- shouldBe('errorReason.name', '"InvalidSessionDescriptionError"');
- check("pranswer", "local", "offer", "remote", '"have-local-pranswer"');
- sessionDescription = new RTCSessionDescription({type:"offer", sdp:"remote"});
- shouldNotThrow('pc.setRemoteDescription(sessionDescription, finishIfSucceeded, requestFailed2);');
- }
-
- function requestSucceeded2()
- {
- testPassed('setLocalDescription succeeded.');
- check("answer", "local", "offer", "remote", '"stable"');
- sessionDescription = new RTCSessionDescription({type:"offer", sdp:"local"});
- shouldNotThrow('pc.setLocalDescription(sessionDescription, finishIfSucceeded, requestFailed1);');
- }
-
- function requestSucceeded1()
- {
- testPassed('setRemoteDescription succeeded.');
- check("", "", "offer", "remote", '"have-remote-offer"');
- sessionDescription = new RTCSessionDescription({type:"answer", sdp:"local"});
- shouldNotThrow('pc.setLocalDescription(sessionDescription, requestSucceeded2, finishIfFailed);');
- }
-
- function finishIfSucceeded()
- {
- testFailed('setRemoteDescription succeeded.');
- finishJSTest();
- }
-
- function finishIfFailed()
- {
- testFailed('setRemoteDescription failed.');
- finishJSTest();
- }
-
- function check(localType, localSdp, remoteType, remoteSdp, signalingState)
- {
- if (localType !== "" && localSdp !== "") {
- shouldBeEqualToString('pc.localDescription.type', localType);
- shouldBeEqualToString('pc.localDescription.sdp', localSdp);
- }
- if (remoteType !== "" && remoteSdp !== "") {
- shouldBeEqualToString('pc.remoteDescription.type', remoteType);
- shouldBeEqualToString('pc.remoteDescription.sdp', remoteSdp);
- }
- shouldBe('pc.signalingState', signalingState);
- }
-
- pc = new webkitRTCPeerConnection({iceServers:[{urls:'stun:foo.com'}]});
- shouldBe('pc.signalingState', '"stable"');
- var sessionDescription = new RTCSessionDescription({type:"offer", sdp:"remote"});
- shouldNotThrow('pc.setRemoteDescription(sessionDescription, requestSucceeded1, finishIfFailed);');
-
- window.jsTestIsAsync = true;
- window.successfullyParsed = true;
- </script>
- <script src="../../resources/js-test-post.js"></script>
- </body>
-</html>
</del></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCSessionDescriptionexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCSessionDescription-expected.txt (164940 => 164941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCSessionDescription-expected.txt 2014-03-02 14:59:47 UTC (rev 164940)
+++ trunk/LayoutTests/fast/mediastream/RTCSessionDescription-expected.txt 2014-03-02 15:36:53 UTC (rev 164941)
</span><span class="lines">@@ -7,10 +7,6 @@
</span><span class="cx"> PASS sessionDescription = new RTCSessionDescription(initializer); did not throw exception.
</span><span class="cx"> PASS sessionDescription.type is "offer"
</span><span class="cx"> PASS sessionDescription.sdp is "foobar"
</span><del>-PASS initializer = JSON.parse(JSON.stringify(sessionDescription)); did not throw exception.
-PASS sessionDescription = new RTCSessionDescription(initializer); did not throw exception.
-PASS sessionDescription.type is "offer"
-PASS sessionDescription.sdp is "foobar"
</del><span class="cx"> PASS new RTCSessionDescription(null); threw exception TypeError: Optional RTCSessionDescription constructor argument must be a valid Dictionary.
</span><span class="cx"> PASS new RTCSessionDescription(5); threw exception TypeError: Optional RTCSessionDescription constructor argument must be a valid Dictionary.
</span><span class="cx"> PASS new RTCSessionDescription('foobar'); threw exception TypeError: Optional RTCSessionDescription constructor argument must be a valid Dictionary.
</span></span></pre></div>
<a id="trunkLayoutTestsfastmediastreamRTCSessionDescriptionhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/fast/mediastream/RTCSessionDescription.html (164940 => 164941)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/fast/mediastream/RTCSessionDescription.html 2014-03-02 14:59:47 UTC (rev 164940)
+++ trunk/LayoutTests/fast/mediastream/RTCSessionDescription.html 2014-03-02 15:36:53 UTC (rev 164941)
</span><span class="lines">@@ -16,12 +16,6 @@
</span><span class="cx"> shouldBe('sessionDescription.type', '"offer"');
</span><span class="cx"> shouldBe('sessionDescription.sdp', '"foobar"');
</span><span class="cx">
</span><del>- shouldNotThrow('initializer = JSON.parse(JSON.stringify(sessionDescription));');
-
- shouldNotThrow("sessionDescription = new RTCSessionDescription(initializer);");
- shouldBe('sessionDescription.type', '"offer"');
- shouldBe('sessionDescription.sdp', '"foobar"');
-
</del><span class="cx"> shouldThrow("new RTCSessionDescription(null);");
</span><span class="cx"> shouldThrow("new RTCSessionDescription(5);");
</span><span class="cx"> shouldThrow("new RTCSessionDescription('foobar');");
</span></span></pre>
</div>
</div>
</body>
</html>